From nobody Mon Feb 2 02:20:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f49MW4Pldz6RDH4 for ; Mon, 02 Feb 2026 02:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f49MW3hvyz3tKw for ; Mon, 02 Feb 2026 02:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769998855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x67tzIZPinrvzolBUQVKfli2fqysFZXLXzG5s8At5ww=; b=TDpcUnpgMDrqVgg25Q/fJUzps6q1zU/WoLS69Z2lEGgoPSVmllTeg9YH28TwkhCbqdhdNI KPe065vE9tXeb6CXPupMAqxUoE20hthh4df/c7sa4fSRww0vxq/peJZc3dM7/agL8a0gsI 4hf6Y3Gu4qg4Tr4tz9nSrUaNzBU4lavC2X2ZJId5wB9yPysIFsWNJjXhXLLTq5J+LgLiAT ggdelNllU3FeI+Ixxs+x2vdV50hIPUbVHes3bYaV0/AmYvqglLqXXiYuz1bxVntPxfSivr 6Gx5d3c13DwhCAtxjlZBA5undZt/mpjOxIX6zIUXlOgDSpHpApyvLY8DJSerKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769998855; a=rsa-sha256; cv=none; b=yOIqZytPeqrdwoQZHf7nmhGp/SeW4WG5cZiZeLKcn1n449WLsN4VNjnkE3/PA+k7j1hN15 S4AoaifxdfyPWr2CKRY3Nfmez8K7BItCeHAfuAw4WCbirR32ulAB292RMKgieR3Xkr4NXr JA/8a48jr5+g75NWl1jlbBreMqDM0RFitvioe39L2vsiZKXFGV73Vu2SlHKgNYptr1Krqb i0+D8GxoV7i04tczcxu8yY89uxXXLunhZA/3eP0ISRl3UxhYXo6KdHHH9o4R9yYkF9YMgS s/boiguvT6mUvYahAI2DIHAmDnEXh6ZiQ3iDLloJGK7jlVT/OERcfnBhGTVmgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769998855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x67tzIZPinrvzolBUQVKfli2fqysFZXLXzG5s8At5ww=; b=f/5/TCoQqISRxxA0UWj/KS786CgUi419J/EE1CciEEO7YM55SJns+Cwdm/LZ58DQ/4R8X0 UJWtsF0ZsEhylp8pL31PCB2TF9Iy2cASUr4mENWonrYE8ocrUnr9+KN5DlvzPZC40p/Y6D +Zt8hUzOgZfm+oeArjs1xMzzhASMTEJKWZ2dFosl6NOw+8pvqaCjH05aMX3auUlDDG7ryr 2s/yzn7558t/tMUeHOjfnk0uWRDMxDooYkfE8DR101ATs+aebPgG+zb+p/5o3Cp2XYGolE 1Qf3etj2zrOgq1aAnoFKyiMeFkzHiI3EioorPLe3tg6gk50O1k+Bk3J7Zkh4+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f49MW3FWxz157P for ; Mon, 02 Feb 2026 02:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b2f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 02:20:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Defenso-EBO From: Warner Losh Subject: git: 851dffef532a - main - ig4: Add support for Lunar Lake-M I2C List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 851dffef532ad9611fcaf02318744c8de9f397b0 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 02:20:55 +0000 Message-Id: <69800a07.3b2f2.7d5f17c3@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=851dffef532ad9611fcaf02318744c8de9f397b0 commit 851dffef532ad9611fcaf02318744c8de9f397b0 Author: Defenso-EBO AuthorDate: 2026-01-29 09:47:13 +0000 Commit: Warner Losh CommitDate: 2026-02-01 21:22:15 +0000 ig4: Add support for Lunar Lake-M I2C this patch adds PCI IDs to the ig4(4) driver: - Lunar Lake-M (0xa878, 0xa879, 0xa87a, 0xa87b) These controllers use the Tiger Lake hardware revision of the I2C IP. Adding these IDs enables support for peripherals connected to the I2C Bus. Tested on: Intel Lunar Lake (LENOVO_MT_21QX_BU_Think_FM_ThinkPad T14s Gen 6) Signed-off-by: Defenso-EBO MFC after: 2 weeks Sponsored by: Defenso Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1995 --- sys/dev/ichiic/ig4_pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/ichiic/ig4_pci.c b/sys/dev/ichiic/ig4_pci.c index 3a49e220e335..49036c6dabc9 100644 --- a/sys/dev/ichiic/ig4_pci.c +++ b/sys/dev/ichiic/ig4_pci.c @@ -192,6 +192,10 @@ static int ig4iic_pci_detach(device_t dev); #define PCI_CHIP_ARROWLAKE_U_I2C_3 0x777b8086 #define PCI_CHIP_ARROWLAKE_U_I2C_4 0x77508086 #define PCI_CHIP_ARROWLAKE_U_I2C_5 0x77518086 +#define PCI_CHIP_LUNARLAKE_M_I2C_0 0xa8788086 +#define PCI_CHIP_LUNARLAKE_M_I2C_1 0xa8798086 +#define PCI_CHIP_LUNARLAKE_M_I2C_2 0xa87a8086 +#define PCI_CHIP_LUNARLAKE_M_I2C_3 0xa87b8086 struct ig4iic_pci_device { uint32_t devid; @@ -328,6 +332,10 @@ static struct ig4iic_pci_device ig4iic_pci_devices[] = { { PCI_CHIP_ARROWLAKE_U_I2C_3, "Intel Arrow Lake-H/U I2C Controller-3", IG4_TIGERLAKE}, { PCI_CHIP_ARROWLAKE_U_I2C_4, "Intel Arrow Lake-H/U I2C Controller-4", IG4_TIGERLAKE}, { PCI_CHIP_ARROWLAKE_U_I2C_5, "Intel Arrow Lake-H/U I2C Controller-5", IG4_TIGERLAKE}, + { PCI_CHIP_LUNARLAKE_M_I2C_0, "Intel Lunar Lake-M I2C Controller-0", IG4_TIGERLAKE}, + { PCI_CHIP_LUNARLAKE_M_I2C_1, "Intel Lunar Lake-M I2C Controller-1", IG4_TIGERLAKE}, + { PCI_CHIP_LUNARLAKE_M_I2C_2, "Intel Lunar Lake-M I2C Controller-2", IG4_TIGERLAKE}, + { PCI_CHIP_LUNARLAKE_M_I2C_3, "Intel Lunar Lake-M I2C Controller-3", IG4_TIGERLAKE}, }; static int From nobody Mon Feb 2 02:20:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f49MY0HTvz6RDDj for ; Mon, 02 Feb 2026 02:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f49MX4gnbz3tVf for ; Mon, 02 Feb 2026 02:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769998856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yadTd/pAlIxfcDGTeN6DbAX5l6XCTlQn3WBS2thHba8=; b=JjIaHSrubi7OiThqBK992cAANeMuIYxNdlmSHVOzMQ62RA+JdLGC3yLfcXnXPXgQEcx1zX BI7Byk0iaXrghdsyUQsvFzFbgxFfF8NFaTQbK6coUW6sWD8++tgwHABQ4ZnlnTZvwQqX4h qHygH1c871LxQpEK0yag+v8+xLtzB4RIjgACo2WsxgEhddy7B2tnLs5qmakKnpuEv7U2iF n8JnPb95E8yaAUeX70WA8NZD0UFUVsiEEg9kLRfEcPvbz6bnQ6A6yyBo4WPgwX7uu8suw5 d408DpvsaDZAzdM4vxYw/y9lXdUX/dJjGMH/mrL/Ok3p06F8ncjsRsN0cEMumQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769998856; a=rsa-sha256; cv=none; b=fTN3+ObEzNI4DUZqQptdWb3SfEN3mMdZdL4RPZuVELGecU0TORBVpup6ItTjIdRe+V03+T NW5kR757lD/DQkIQEkk05hF3B+3gbWJVGC6OSI+724cfseJo30GcyoeNY76gdyX9iZry+t Bq9gy5N9xy0LEXzaFTvpMjBdQW+/M8kGi9LYIz1KJWtx8owb3lOzQvXqIDxs5RDGhwCtQq 55+3vD0E7eGQhXYA0mLkU/95D5k9y+BGF6b6aqszzfMEKPmkN/z6tz9DZVjfAmkS/KofBD F7kqEnslREXmOSpklSoSkFnpJR7ssWFpzoep/l5qk+qTA7IByI1WMIBmg5lE0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769998856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yadTd/pAlIxfcDGTeN6DbAX5l6XCTlQn3WBS2thHba8=; b=LL5e9oPQ+NnT7eI8IUT2tZh4rdD4X1GBJh4tpMmCRKNTbv2Z9REcyhAVqdvCe/WbZxEwbe i/LiO6cy4MoaMeElG+G4JBrlI3J0RZefRSqSDfOTo4OefrAtDhqXxrKnLoZJga3C/nTGop /Rg9oljwODO2YqmDlEKOvBf0exdHNwBJxILcasQBtAZwVvoe8/pDIQO4ZUPKh4WHtO8Dgr OvMkz7oS8Rohb3jkCDsgXfFF5SJp6hLsoau7aVC0MFniIJBOwwNi+/oDbu99hrDwAu9rhP GPnLFGWYcg8VULmE0+5kSk2lH7VNEsh75+WJ/OvjTqtzkI9iNRyEzfOHf5ngPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f49MX44Hpz16BJ for ; Mon, 02 Feb 2026 02:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b39c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 02:20:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ali Mashtizadeh From: Warner Losh Subject: git: 37bba2ad92d8 - main - hwpmc_amd: Add support for additional counters. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37bba2ad92d8fa81d70f7a8243b2f42981f44454 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 02:20:56 +0000 Message-Id: <69800a08.3b39c.45d9227@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=37bba2ad92d8fa81d70f7a8243b2f42981f44454 commit 37bba2ad92d8fa81d70f7a8243b2f42981f44454 Author: Ali Mashtizadeh AuthorDate: 2026-01-23 05:34:44 +0000 Commit: Warner Losh CommitDate: 2026-02-01 21:26:48 +0000 hwpmc_amd: Add support for additional counters. Rather than provide a static table of counters, this change computes the number of counters that are available by checking several CPUID leafs and falling back to defaults on older processors. The limits are set to support the maximum number of counters of each type. Sponsored by: Netflix Reviewed by: imp, mhorne Pull Request: https://github.com/freebsd/freebsd-src/pull/1983 --- sys/dev/hwpmc/hwpmc_amd.c | 182 +++++++++++++++++++++++++++------------------- sys/dev/hwpmc/hwpmc_amd.h | 61 ++++++++-------- 2 files changed, 137 insertions(+), 106 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index d2fb17549990..801b75b39595 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -53,43 +53,14 @@ DPCPU_DEFINE_STATIC(uint32_t, nmi_counter); /* AMD K8 PMCs */ struct amd_descr { - struct pmc_descr pm_descr; /* "base class" */ - uint32_t pm_evsel; /* address of EVSEL register */ - uint32_t pm_perfctr; /* address of PERFCTR register */ + struct pmc_descr pm_descr; /* "base class" */ + uint32_t pm_evsel; /* address of EVSEL register */ + uint32_t pm_perfctr; /* address of PERFCTR register */ + enum sub_class pm_subclass; /* register subclass */ }; -/* Counter hardware. */ -#define PMCDESC(evsel, perfctr) \ - { \ - .pm_descr = { \ - .pd_name = "", \ - .pd_class = PMC_CLASS_K8, \ - .pd_caps = AMD_PMC_CAPS, \ - .pd_width = 48 \ - }, \ - .pm_evsel = (evsel), \ - .pm_perfctr = (perfctr) \ - } - -static struct amd_descr amd_pmcdesc[AMD_NPMCS] = -{ - PMCDESC(AMD_PMC_EVSEL_0, AMD_PMC_PERFCTR_0), - PMCDESC(AMD_PMC_EVSEL_1, AMD_PMC_PERFCTR_1), - PMCDESC(AMD_PMC_EVSEL_2, AMD_PMC_PERFCTR_2), - PMCDESC(AMD_PMC_EVSEL_3, AMD_PMC_PERFCTR_3), - PMCDESC(AMD_PMC_EVSEL_4, AMD_PMC_PERFCTR_4), - PMCDESC(AMD_PMC_EVSEL_5, AMD_PMC_PERFCTR_5), - PMCDESC(AMD_PMC_EVSEL_EP_L3_0, AMD_PMC_PERFCTR_EP_L3_0), - PMCDESC(AMD_PMC_EVSEL_EP_L3_1, AMD_PMC_PERFCTR_EP_L3_1), - PMCDESC(AMD_PMC_EVSEL_EP_L3_2, AMD_PMC_PERFCTR_EP_L3_2), - PMCDESC(AMD_PMC_EVSEL_EP_L3_3, AMD_PMC_PERFCTR_EP_L3_3), - PMCDESC(AMD_PMC_EVSEL_EP_L3_4, AMD_PMC_PERFCTR_EP_L3_4), - PMCDESC(AMD_PMC_EVSEL_EP_L3_5, AMD_PMC_PERFCTR_EP_L3_5), - PMCDESC(AMD_PMC_EVSEL_EP_DF_0, AMD_PMC_PERFCTR_EP_DF_0), - PMCDESC(AMD_PMC_EVSEL_EP_DF_1, AMD_PMC_PERFCTR_EP_DF_1), - PMCDESC(AMD_PMC_EVSEL_EP_DF_2, AMD_PMC_PERFCTR_EP_DF_2), - PMCDESC(AMD_PMC_EVSEL_EP_DF_3, AMD_PMC_PERFCTR_EP_DF_3) -}; +static int amd_npmcs; +static struct amd_descr amd_pmcdesc[AMD_NPMCS_MAX]; struct amd_event_code_map { enum pmc_event pe_ev; /* enum value */ @@ -203,7 +174,7 @@ const int amd_event_codes_size = nitems(amd_event_codes); * Per-processor information */ struct amd_cpu { - struct pmc_hw pc_amdpmcs[AMD_NPMCS]; + struct pmc_hw pc_amdpmcs[AMD_NPMCS_MAX]; }; static struct amd_cpu **amd_pcpu; @@ -219,7 +190,7 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] illegal row-index %d", __LINE__, ri)); KASSERT(amd_pcpu[cpu], ("[amd,%d] null per-cpu, cpu %d", __LINE__, cpu)); @@ -264,7 +235,7 @@ amd_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] illegal row-index %d", __LINE__, ri)); pd = &amd_pmcdesc[ri]; @@ -293,7 +264,7 @@ amd_config_pmc(int cpu, int ri, struct pmc *pm) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] illegal row-index %d", __LINE__, ri)); phw = &amd_pcpu[cpu]->pc_amdpmcs[ri]; @@ -362,7 +333,7 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, enum pmc_event pe; int i; - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] illegal row index %d", __LINE__, ri)); pd = &amd_pmcdesc[ri].pm_descr; @@ -379,14 +350,7 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, PMCDBG2(MDP, ALL, 1,"amd-allocate ri=%d caps=0x%x", ri, caps); /* Validate sub-class. */ - if ((ri >= 0 && ri < 6) && a->pm_md.pm_amd.pm_amd_sub_class != - PMC_AMD_SUB_CLASS_CORE) - return (EINVAL); - if ((ri >= 6 && ri < 12) && a->pm_md.pm_amd.pm_amd_sub_class != - PMC_AMD_SUB_CLASS_L3_CACHE) - return (EINVAL); - if ((ri >= 12 && ri < 16) && a->pm_md.pm_amd.pm_amd_sub_class != - PMC_AMD_SUB_CLASS_DATA_FABRIC) + if (amd_pmcdesc[ri].pm_subclass != a->pm_md.pm_amd.pm_amd_sub_class) return (EINVAL); if (strlen(pmc_cpuid) != 0) { @@ -455,7 +419,7 @@ amd_release_pmc(int cpu, int ri, struct pmc *pmc __unused) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] illegal row-index %d", __LINE__, ri)); phw = &amd_pcpu[cpu]->pc_amdpmcs[ri]; @@ -477,13 +441,18 @@ amd_start_pmc(int cpu __diagused, int ri, struct pmc *pm) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] illegal row-index %d", __LINE__, ri)); pd = &amd_pmcdesc[ri]; PMCDBG2(MDP, STA, 1, "amd-start cpu=%d ri=%d", cpu, ri); + /* + * Triggered by DF counters because all DF MSRs are shared. We need to + * change the code to honor the per-package flag in the JSON event + * definitions. + */ KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel), ("[amd,%d] pmc%d,cpu%d: Starting active PMC \"%s\"", __LINE__, ri, cpu, pd->pm_descr.pd_name)); @@ -509,7 +478,7 @@ amd_stop_pmc(int cpu __diagused, int ri, struct pmc *pm) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] illegal row-index %d", __LINE__, ri)); pd = &amd_pmcdesc[ri]; @@ -578,7 +547,10 @@ amd_intr(struct trapframe *tf) * a single interrupt. Check all the valid pmcs for * overflow. */ - for (i = 0; i < AMD_CORE_NPMCS; i++) { + for (i = 0; i < amd_npmcs; i++) { + if (amd_pmcdesc[i].pm_subclass != PMC_AMD_SUB_CLASS_CORE) + break; + if ((pm = pac->pc_amdpmcs[i].phw_pmc) == NULL || !PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) { continue; @@ -654,7 +626,7 @@ amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU %d", __LINE__, cpu)); - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] row-index %d out of range", __LINE__, ri)); phw = &amd_pcpu[cpu]->pc_amdpmcs[ri]; @@ -680,7 +652,7 @@ amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) static int amd_get_msr(int ri, uint32_t *msr) { - KASSERT(ri >= 0 && ri < AMD_NPMCS, + KASSERT(ri >= 0 && ri < amd_npmcs, ("[amd,%d] ri %d out of range", __LINE__, ri)); *msr = amd_pmcdesc[ri].pm_perfctr - AMD_PMC_PERFCTR_0; @@ -715,7 +687,7 @@ amd_pcpu_init(struct pmc_mdep *md, int cpu) KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu pointer", __LINE__)); - for (n = 0, phw = pac->pc_amdpmcs; n < AMD_NPMCS; n++, phw++) { + for (n = 0, phw = pac->pc_amdpmcs; n < amd_npmcs; n++, phw++) { phw->phw_state = PMC_PHW_FLAG_IS_ENABLED | PMC_PHW_CPU_TO_STATE(cpu) | PMC_PHW_INDEX_TO_STATE(n); phw->phw_pmc = NULL; @@ -733,7 +705,6 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) { struct amd_cpu *pac; struct pmc_cpu *pc; - uint32_t evsel; int first_ri, i; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), @@ -741,15 +712,6 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) PMCDBG1(MDP, INI, 1, "amd-cleanup cpu=%d", cpu); - /* - * First, turn off all PMCs on this CPU. - */ - for (i = 0; i < 4; i++) { /* XXX this loop is now not needed */ - evsel = rdmsr(AMD_PMC_EVSEL_0 + i); - evsel &= ~AMD_PMC_ENABLE; - wrmsr(AMD_PMC_EVSEL_0 + i, evsel); - } - /* * Next, free up allocated space. */ @@ -759,7 +721,7 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) amd_pcpu[cpu] = NULL; #ifdef HWPMC_DEBUG - for (i = 0; i < AMD_NPMCS; i++) { + for (i = 0; i < AMD_NPMCS_K8; i++) { KASSERT(pac->pc_amdpmcs[i].phw_pmc == NULL, ("[amd,%d] CPU%d/PMC%d in use", __LINE__, cpu, i)); KASSERT(AMD_PMC_IS_STOPPED(AMD_PMC_EVSEL_0 + i), @@ -775,7 +737,7 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) /* * Reset pointers in the MI 'per-cpu' state. */ - for (i = 0; i < AMD_NPMCS; i++) + for (i = 0; i < amd_npmcs; i++) pc->pc_hwpmcs[i + first_ri] = NULL; free(pac, M_PMC); @@ -793,6 +755,8 @@ pmc_amd_initialize(void) enum pmc_cputype cputype; int error, i, ncpus; int family, model, stepping; + int amd_core_npmcs, amd_l3_npmcs, amd_df_npmcs; + struct amd_descr *d; /* * The presence of hardware performance counters on the AMD @@ -823,6 +787,80 @@ pmc_amd_initialize(void) return (NULL); } + /* + * From PPR for AMD Family 1Ah, a new cpuid leaf specifies the maximum + * number of PMCs of each type. If we do not have that leaf, we use + * the prior default values that are only valid if we have the feature + * bit enabled in CPU. + */ + if ((amd_feature2 & AMDID2_PCXC) != 0) { + amd_core_npmcs = AMD_PMC_CORE_DEFAULT; + } else { + amd_core_npmcs = AMD_NPMCS_K8; + } + amd_l3_npmcs = AMD_PMC_L3_DEFAULT; + amd_df_npmcs = AMD_PMC_DF_DEFAULT; + + if (cpu_exthigh >= CPUID_EXTPERFMON) { + u_int regs[4]; + do_cpuid(CPUID_EXTPERFMON, regs); + if (regs[1] != 0) { + amd_core_npmcs = EXTPERFMON_CORE_PMCS(regs[1]); + amd_df_npmcs = EXTPERFMON_DF_PMCS(regs[1]); + } + } + + /* Enable the newer core counters */ + for (i = 0; i < amd_core_npmcs; i++) { + d = &amd_pmcdesc[i]; + snprintf(d->pm_descr.pd_name, PMC_NAME_MAX, + "K8-%d", i); + d->pm_descr.pd_class = PMC_CLASS_K8; + d->pm_descr.pd_caps = AMD_PMC_CAPS; + d->pm_descr.pd_width = 48; + if ((amd_feature2 & AMDID2_PCXC) != 0) { + d->pm_evsel = AMD_PMC_CORE_BASE + 2 * i; + d->pm_perfctr = AMD_PMC_CORE_BASE + 2 * i + 1; + } else { + d->pm_evsel = AMD_PMC_EVSEL_0 + i; + d->pm_perfctr = AMD_PMC_PERFCTR_0 + i; + } + d->pm_subclass = PMC_AMD_SUB_CLASS_CORE; + } + amd_npmcs = amd_core_npmcs; + + if ((amd_feature2 & AMDID2_PTSCEL2I) != 0) { + /* Enable the LLC/L3 counters */ + for (i = 0; i < amd_l3_npmcs; i++) { + d = &amd_pmcdesc[amd_npmcs + i]; + snprintf(d->pm_descr.pd_name, PMC_NAME_MAX, + "K8-L3-%d", i); + d->pm_descr.pd_class = PMC_CLASS_K8; + d->pm_descr.pd_caps = AMD_PMC_CAPS; + d->pm_descr.pd_width = 48; + d->pm_evsel = AMD_PMC_L3_BASE + 2 * i; + d->pm_perfctr = AMD_PMC_L3_BASE + 2 * i + 1; + d->pm_subclass = PMC_AMD_SUB_CLASS_L3_CACHE; + } + amd_npmcs += amd_l3_npmcs; + } + + if ((amd_feature2 & AMDID2_PNXC) != 0) { + /* Enable the data fabric counters */ + for (i = 0; i < amd_df_npmcs; i++) { + d = &amd_pmcdesc[amd_npmcs + i]; + snprintf(d->pm_descr.pd_name, PMC_NAME_MAX, + "K8-DF-%d", i); + d->pm_descr.pd_class = PMC_CLASS_K8; + d->pm_descr.pd_caps = AMD_PMC_CAPS; + d->pm_descr.pd_width = 48; + d->pm_evsel = AMD_PMC_DF_BASE + 2 * i; + d->pm_perfctr = AMD_PMC_DF_BASE + 2 * i + 1; + d->pm_subclass = PMC_AMD_SUB_CLASS_DATA_FABRIC; + } + amd_npmcs += amd_df_npmcs; + } + /* * Allocate space for pointers to PMC HW descriptors and for * the MDEP structure used by MI code. @@ -848,16 +886,10 @@ pmc_amd_initialize(void) pcd->pcd_caps = AMD_PMC_CAPS; pcd->pcd_class = PMC_CLASS_K8; - pcd->pcd_num = AMD_NPMCS; + pcd->pcd_num = amd_npmcs; pcd->pcd_ri = pmc_mdep->pmd_npmc; pcd->pcd_width = 48; - /* fill in the correct pmc name and class */ - for (i = 0; i < AMD_NPMCS; i++) { - snprintf(amd_pmcdesc[i].pm_descr.pd_name, PMC_NAME_MAX, "K8-%d", - i); - } - pcd->pcd_allocate_pmc = amd_allocate_pmc; pcd->pcd_config_pmc = amd_config_pmc; pcd->pcd_describe = amd_describe; @@ -876,7 +908,7 @@ pmc_amd_initialize(void) pmc_mdep->pmd_switch_in = amd_switch_in; pmc_mdep->pmd_switch_out = amd_switch_out; - pmc_mdep->pmd_npmc += AMD_NPMCS; + pmc_mdep->pmd_npmc += amd_npmcs; PMCDBG0(MDP, INI, 0, "amd-initialize"); diff --git a/sys/dev/hwpmc/hwpmc_amd.h b/sys/dev/hwpmc/hwpmc_amd.h index d72fbc4878b6..be484a1111a2 100644 --- a/sys/dev/hwpmc/hwpmc_amd.h +++ b/sys/dev/hwpmc/hwpmc_amd.h @@ -31,8 +31,12 @@ #ifndef _DEV_HWPMC_AMD_H_ #define _DEV_HWPMC_AMD_H_ 1 -/* AMD K8 PMCs */ +/* CPUIDs */ +#define CPUID_EXTPERFMON 0x80000022 +#define EXTPERFMON_CORE_PMCS(x) ((x) & 0x0F) +#define EXTPERFMON_DF_PMCS(x) (((x) >> 10) & 0x3F) +/* AMD K8 PMCs */ #define AMD_PMC_EVSEL_0 0xC0010000 #define AMD_PMC_EVSEL_1 0xC0010001 #define AMD_PMC_EVSEL_2 0xC0010002 @@ -42,40 +46,35 @@ #define AMD_PMC_PERFCTR_1 0xC0010005 #define AMD_PMC_PERFCTR_2 0xC0010006 #define AMD_PMC_PERFCTR_3 0xC0010007 + +/* + * For older AMD processors we have hard coded the original four core counters. + * For newer processors we use the cpuid bits to setup the counter table. The + * counts below are the default number of registers assuming that you do not + * have CPUID leaf 0x80000022. The maximum number of counters is computed + * based on the available bits in the CPUID leaf and reserved MSR space. + * + * Refer to the PPRs for AMD Family 1Ah. + */ + /* CORE */ -#define AMD_PMC_EVSEL_4 0xC0010208 -#define AMD_PMC_EVSEL_5 0xC001020A +#define AMD_PMC_CORE_BASE 0xC0010200 +#define AMD_PMC_CORE_DEFAULT 6 +#define AMD_PMC_CORE_MAX 16 -#define AMD_PMC_PERFCTR_4 0xC0010209 -#define AMD_PMC_PERFCTR_5 0xC001020B /* L3 */ -#define AMD_PMC_EVSEL_EP_L3_0 0xC0010230 -#define AMD_PMC_EVSEL_EP_L3_1 0xC0010232 -#define AMD_PMC_EVSEL_EP_L3_2 0xC0010234 -#define AMD_PMC_EVSEL_EP_L3_3 0xC0010236 -#define AMD_PMC_EVSEL_EP_L3_4 0xC0010238 -#define AMD_PMC_EVSEL_EP_L3_5 0xC001023A - -#define AMD_PMC_PERFCTR_EP_L3_0 0xC0010231 -#define AMD_PMC_PERFCTR_EP_L3_1 0xC0010233 -#define AMD_PMC_PERFCTR_EP_L3_2 0xC0010235 -#define AMD_PMC_PERFCTR_EP_L3_3 0xC0010237 -#define AMD_PMC_PERFCTR_EP_L3_4 0xC0010239 -#define AMD_PMC_PERFCTR_EP_L3_5 0xC001023B -/* DF */ -#define AMD_PMC_EVSEL_EP_DF_0 0xC0010240 -#define AMD_PMC_EVSEL_EP_DF_1 0xC0010242 -#define AMD_PMC_EVSEL_EP_DF_2 0xC0010244 -#define AMD_PMC_EVSEL_EP_DF_3 0xC0010246 +#define AMD_PMC_L3_BASE 0xC0010230 +#define AMD_PMC_L3_DEFAULT 6 +#define AMD_PMC_L3_MAX 6 -#define AMD_PMC_PERFCTR_EP_DF_0 0xC0010241 -#define AMD_PMC_PERFCTR_EP_DF_1 0xC0010243 -#define AMD_PMC_PERFCTR_EP_DF_2 0xC0010245 -#define AMD_PMC_PERFCTR_EP_DF_3 0xC0010247 - -#define AMD_NPMCS 16 -#define AMD_CORE_NPMCS 6 +/* DF */ +#define AMD_PMC_DF_BASE 0xC0010240 +#define AMD_PMC_DF_DEFAULT 4 +#define AMD_PMC_DF_MAX 64 +#define AMD_NPMCS_K8 4 +#define AMD_NPMCS_MAX (AMD_PMC_CORE_MAX + AMD_PMC_L3_MAX + \ + AMD_PMC_DF_MAX) #define AMD_PMC_COUNTERMASK 0xFF000000 #define AMD_PMC_TO_COUNTER(x) (((x) << 24) & AMD_PMC_COUNTERMASK) @@ -118,7 +117,7 @@ #define AMD_RELOAD_COUNT_TO_PERFCTR_VALUE(V) (-(V)) #define AMD_PERFCTR_VALUE_TO_RELOAD_COUNT(P) (-(P)) -enum sub_class{ +enum sub_class { PMC_AMD_SUB_CLASS_CORE, PMC_AMD_SUB_CLASS_L3_CACHE, PMC_AMD_SUB_CLASS_DATA_FABRIC From nobody Mon Feb 2 02:20:57 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f49MZ0wlBz6RDVl for ; Mon, 02 Feb 2026 02:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f49MY5Vfxz3tL6 for ; Mon, 02 Feb 2026 02:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769998857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EiUVzCdabkRLVXCoqWxWcKY2yMYYvHK3w81dnNWkZNg=; b=nKnRSpwb1kVGk+2zDK78jNwD6eb6kFaveJr8m1zv/lEddRaGW8so+JiEiG/hUjU7E6XWsS CHbsDCfWrIQX7579q0Y1HU2iPgadt2LOkIEyZgBVux9YD8aphbBH7+TgahwM6wliUsZ+4W NV9bE4EYOvjRnQxKKeNlSBaw+MEHVRcGJj6ni01AkvjrUvqmj+qPiMzrlQ52HBylVlADCP CAo9ox8g6WGy+rTql6xvokmNyReHWgSvWKUxdw7j5s3KRnZm3yZPruYaKfDwvy1uRFkukO t4XC6b7vMW+1GHrJVcQe3U+qF0wpHhdB63DscyPexCbYTibJPIkTXJ6cvzcVHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769998857; a=rsa-sha256; cv=none; b=bO7HzzyxVSdZxAw56+Hud7D4dZGsWroRnVztKgvNSPRnVo3By7xvc4+RYAW8ijipGlRWiU v0nk0Puj+pMUayNXGeQat6iPWhsEP0ZsQv2V3mpLFin5BUime3y9KStmSVK6lMKVFQ1Oby dct1A5PR/+ckHoi+8D7CgySDnaYwvYa9HR4uxFCKkF3sVI5N/rzpJKNKLpVg4p5bHjD2Vb QFuGfe8u41aJvbog6wc3whk3oWYQg9GAJq9B1vSbz7yM+8KngAMBTTMU8BhuKAFK86MhDl Mv6L+xaO6mWoxR8TIxMF/c6rw/zXaNclNVdFa6u3O1VfUO78M6FI339NlHlwyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769998857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EiUVzCdabkRLVXCoqWxWcKY2yMYYvHK3w81dnNWkZNg=; b=tgfLUax7SczTm0Ybt71UZE+abCVK5aKjoBI1cYXvDV/frvlmhTrnW9OJagu2sIWOZArjUd 8tMtCTeT6nV/yi46nUCTKfBLcNQrJgS3+T62joO4RvbX08EgMVIp5SFX965JCzeOx4tyvj ytZ+cqd1YER0UCcSASctUc1PuLywv+hepvrcOCAwFet1KZtWLeiwRR5BVDoko/skSpCZH/ gUItUbpjlvOi4CfSQSpyJyHL11eGpjU1kUdi+bOtw4zWTg/XABMZuhVXZ711P7GBymWLqK AsPSYuazgGoTU0Bh158O37flxEHNm+U24pLVrK9VXC1eVQdKB2Gb5rbMG4kheA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f49MY4rSSz161q for ; Mon, 02 Feb 2026 02:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad59 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 02:20:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: zxbv3 From: Warner Losh Subject: git: 638fb31a75f6 - main - pkgbase-stage.lua: Add *-jail metapackages to the offline repo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 638fb31a75f69d8ed243a93eea0aa4a7510916f9 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 02:20:57 +0000 Message-Id: <69800a09.3ad59.6bd365c5@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=638fb31a75f69d8ed243a93eea0aa4a7510916f9 commit 638fb31a75f69d8ed243a93eea0aa4a7510916f9 Author: zxbv3 AuthorDate: 2026-01-27 16:24:14 +0000 Commit: Warner Losh CommitDate: 2026-02-01 21:51:10 +0000 pkgbase-stage.lua: Add *-jail metapackages to the offline repo Having *-jail metapackage variants on the installation media allows convenient offline jail creation. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1991 --- release/scripts/pkgbase-stage.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua index efc4f8af0cbf..80d215d0e82f 100755 --- a/release/scripts/pkgbase-stage.lua +++ b/release/scripts/pkgbase-stage.lua @@ -46,12 +46,14 @@ local function select_packages(pkg, media, all_libcompats) end assert(components["kernel"]) assert(components["base"]) + assert(components["base-jail"]) assert(components["pkg"]) local selected = {} if media == "disc" then table.insert(selected, components["pkg"]) table.insert(selected, components["base"]) + table.insert(selected, components["base-jail"]) table.insert(selected, components["kernel"]) table.insert(selected, components["kernel-dbg"]) table.insert(selected, components["src"]) @@ -63,6 +65,7 @@ local function select_packages(pkg, media, all_libcompats) assert(media == "dvd") table.insert(selected, components["pkg"]) table.insert(selected, components["base"]) + table.insert(selected, components["base-jail"]) table.insert(selected, components["base-dbg"]) table.insert(selected, components["kernel"]) table.insert(selected, components["kernel-dbg"]) From nobody Mon Feb 2 02:20:58 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f49Mb6cycz6RDVn for ; Mon, 02 Feb 2026 02:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f49MZ5t6Gz3tF3 for ; Mon, 02 Feb 2026 02:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769998858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+Dtrw6wqkbBlghN1lytE5m7x46xP/govqdmqcl6keE=; b=K2dDbkDAeWuKvAVqfLN5R89PJqe34+D1wlSRXriWLWpKgb/Lv4w92H2KjndviJyzF2+Ekq LQjIF+jO15zxPYSvz2j9OTqKA5eApPFha/GkT63deNOcXoiVfpiPAZXQanVcg8wcCB/D3T Ma0Ybc4LDxaj/A2waxuPxYqOxG9mftsVSj2CdYRC9MeaeLDNRrtMRr3UDOvoWz7q9qrKmR YejjuWl9ccDkIWOKupy3e8lPS3gcWySSXOAUpFVGIiwv4xwkaRSMAB4DAWzIX3dAGB414F +Ai06mlxbtNm5O9o0iqLtIeW8JdQF9gsOwKdigaUSlx6Oi2DDISBgJEBMT2DFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769998858; a=rsa-sha256; cv=none; b=pQRIAzDrgGSKNedl4wfc5t9gEPIL1RCNDnLfjxoo+YfNy3R/hX87AwNZ18rC+aHhQTfUc4 LPPe9IS8uCw2zpdZdcy6llqrFwyiDfx31NgnIq/UZcuEZbn/rsS1JY3Mf0Kff9lbQisSLg fYLRUp3aRV/i4QHvUAvAwCRpQJvZovoygZDmgIvynzgpMSoPe4Yk/neU8+UZsXmriHG/jc GWDRHf5Sei14itsXei5SFUV9xnhwFJ1Fn01WvohnuFB0LOGb9Kr1AMeLan8E/DewW2vFBO EYJDShIRBHXGytPwTHWytTxl7aQobB+rpUEN9nkPn6vvKTCmGAMcjQIK8l/b/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769998858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+Dtrw6wqkbBlghN1lytE5m7x46xP/govqdmqcl6keE=; b=T77MN3cOLD1oTxNAi9/JFfKvYWKJJNMhcHITiAgPbm5n1qy8U5PW2jUGgO6+Binkm/Wmvx Gbi1/49Vmi4UPh0fLyGUF7P0AZRqcMegyDmMH9FvsGCtXHZSGUWielld974FsVlx+qs4kT J/WoZm03ZeyW4iQ/32U3mu7nMhWuOL3VdZekj+llCceYn9GGVRz3oM73vLDYINEhvV9Feq m1d01Lw5JUgv0Dd1hrHR+MjSJpIzyrcph+qZOGMYCyva0z1ZouE4KP6CEn6tHMWHzzl/2/ oDSzFm72hgPFbmwPBfY/P8P5sDsytnqkD5qXZFB9YgdywPPQQbcSZFYKSgLeBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f49MZ5JcRz163T for ; Mon, 02 Feb 2026 02:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b697 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 02:20:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: zxbv3 From: Warner Losh Subject: git: 49d75d93206a - main - pkgbase-stage.lua: Add '*-jail-dbg' variant to dvd1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49d75d93206a9f3e92a5c6ff9cddb80c6cf77581 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 02:20:58 +0000 Message-Id: <69800a0a.3b697.522cfb50@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=49d75d93206a9f3e92a5c6ff9cddb80c6cf77581 commit 49d75d93206a9f3e92a5c6ff9cddb80c6cf77581 Author: zxbv3 AuthorDate: 2026-01-29 06:07:57 +0000 Commit: Warner Losh CommitDate: 2026-02-01 21:51:11 +0000 pkgbase-stage.lua: Add '*-jail-dbg' variant to dvd1 - Add *-jail-dbg variant to dvd1 to match the non-jail variant; - Remove assertion introduced in the previous commit for consistency with existing code. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1991 --- release/scripts/pkgbase-stage.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua index 80d215d0e82f..5e65f0f998c6 100755 --- a/release/scripts/pkgbase-stage.lua +++ b/release/scripts/pkgbase-stage.lua @@ -46,7 +46,6 @@ local function select_packages(pkg, media, all_libcompats) end assert(components["kernel"]) assert(components["base"]) - assert(components["base-jail"]) assert(components["pkg"]) local selected = {} @@ -65,8 +64,9 @@ local function select_packages(pkg, media, all_libcompats) assert(media == "dvd") table.insert(selected, components["pkg"]) table.insert(selected, components["base"]) - table.insert(selected, components["base-jail"]) table.insert(selected, components["base-dbg"]) + table.insert(selected, components["base-jail"]) + table.insert(selected, components["base-jail-dbg"]) table.insert(selected, components["kernel"]) table.insert(selected, components["kernel-dbg"]) table.insert(selected, components["src"]) From nobody Mon Feb 2 07:01:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4Hbj2Df9z6PRCk for ; Mon, 02 Feb 2026 07:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4Hbj0ZXXz3Q9x for ; Mon, 02 Feb 2026 07:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770015713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgIFxFSuL9lff73Vlu4C8q9yzDqaVtFbWaVAVLMwZ20=; b=aEIVc3MnGVv78U7KrfM3OcQ8Jy8PubIIBcs9Fl/BK1lW36L1WHurm7uxt4XYscGt8BwShm 33yEksRTAPPjgJdzMojB575nMSRQrlR4uQQqQSgxbwshH21hmj+CiXHqviLRNaAY77yx6G iPOseVEfelV37qf7X6+ctiNyaPd2eC3EZjL+lZjPklmFJhMqgpUfzFh+d2kg22lhs8llYp h/CnO3GoTJEowfj2Msg0YWrrXZWwciCa6I0BVdMMAjEC4zSzU/qk4lE/obp3Cmhr7HbUlh gHt/5bTJVxJshlWHX6rzQOaop4Ip87Wu+l+JeaWFHhDiXcu4vTJar5IEUw3TdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770015713; a=rsa-sha256; cv=none; b=roBPWciNUPYUILYSnDBswChh4prK2MrvKhWXY41Le9Ct6sO96d8KFovWNdJxPLyrOVO6Ml ZscKFdsav5MbFOQyoMPiLPrgHBBCjngheO2UMp1GzD8gqJvR/kLwnTVd94XaAH44uI5e++ XFG7cUEQ1UydTblmr8JFNBsXPvX/8MEzA6BvNQrIozCrrimEZy3I9dNvAdU6wPrkLa9rY0 IAZI2tKhWK8LDqz0d8hs4HD1pnvlR8+0L7kv8RJHjUjN2vYlHd1el2dak3KyEMtDyIHm41 HgaLb8bEx2qjWb30+HAJUIiEhyJC6x4Ezflve5q6Q3XVO240tNnQ9MCHdqkbVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770015713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgIFxFSuL9lff73Vlu4C8q9yzDqaVtFbWaVAVLMwZ20=; b=hPCsEVBLnJQX5ZopHBwiJVMBlCWr8A5NOKd7/EZqLy8b18Jv5psBmkmRtHa5Dd1O2+wqGz L0bKSexBzG0fuIsc7sBu9p8nKdPUpoomHgNSJkL6uLM9GcUPID6p1kdnXF6UDOwQhlym3Z m3rS0aYi/xC4RJkqxTkoUMyytQZyLfeTR4HjGifhQy9P43HEFfkZ+p91Qa4f5xXxbYSCk2 gd/D3cWm1Ma0d59n52UWjmCXHRJ00QkBJZU3M+l+xURhIqWoelIJZVviN/DVSNIMvRpxVP ZxK1WAeSqt8zDNDuuAwfZB2cZnZn8zaswui4p8cN1SPrngP6ZU1XuFoCfDuiJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4Hbh70YZz1Ht for ; Mon, 02 Feb 2026 07:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31298 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 07:01:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 6d37c3db62ba - main - bcmp(3): update manpage to following the Posix Standard List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d37c3db62ba32a1e95f390e8570722bfa8ff8a5 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 07:01:52 +0000 Message-Id: <69804be0.31298.434088f@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=6d37c3db62ba32a1e95f390e8570722bfa8ff8a5 commit 6d37c3db62ba32a1e95f390e8570722bfa8ff8a5 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-02 06:51:38 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-02 06:58:26 +0000 bcmp(3): update manpage to following the Posix Standard Reviewed by: glebius Approved by: glebius (mentor) Differential Revision: https://reviews.freebsd.org/D52980 --- lib/libc/string/bcmp.3 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3 index 954e10bfdeab..ec3caa0f1c9f 100644 --- a/lib/libc/string/bcmp.3 +++ b/lib/libc/string/bcmp.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 15, 2016 +.Dd October 8, 2025 .Dt BCMP 3 .Os .Sh NAME @@ -73,3 +73,11 @@ before it was moved to for .St -p1003.1-2001 compliance. +.Pp +.St -p1003.1-2008 +removes the specification of +.Fn bcmp +and it is marked as LEGACY in +.St -p1003.1-2004 . +For portability with other systems new programs should use +.Xr memcmp 3 . From nobody Mon Feb 2 12:28:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4QrZ0QMFz6QR4p for ; Mon, 02 Feb 2026 12:28: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4QrY6qsGz3vYS for ; Mon, 02 Feb 2026 12:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770035310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSFlPpf6n5tClcn9TUH4JicrCJngWnHX9pg96tkCiXk=; b=rbYSc0po8yF6QJQtMgEcTzKUe+79hpI/b+Kn9vjWfkUwXrEs/PfwCFqsbAF7gNzSZ24pPd 5cBGkXX4Rbt8ujFoCOZ+W/+U5tG/+O5scMLkL5A8icU/1eXpnjC/FMH7X4dYxUVG2hW0NF HNSo5kn0ct6IzYHiYuDFosDDxIW3bmz6hxU28YoaY6mkPsVIbiCHSY/9sO2+zlWk80FpLh 2NRF+drVg6yJjkux9NvpTE+gy/hz1c7LkkZC/KDjEDujZsZnFPIK4entZfx5o4MAKI9eOq d91oruv4W+dhVQX94nMeAaVwYDY51smOG0bwiVz3yvkrTEo1Y3ZEFBn+VzGqGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770035310; a=rsa-sha256; cv=none; b=rIFC9MpTOEC6JsiU7l89l/Eug/tvVw3BsCR7BuAXnnIDONT5ATdYkM6soJ6slr1+YGAp4P O/LaHiSYBRfPewT3sAbIG4QZJAB+j3Y2xT71cg3Y+2WM3tXWzH7sOK2tcwWfO5J7ZZS1lr c8JsiN3rE8wSIvfNqErHOQb5tmsa8oHZ3MYPKAmZn3JKnKeZXB8BxiQLXbjmB6LHkTtRDH lHOCFX7HBQL8Dvr29d1NAorESs9ry/P+0J2NhmV8eTrO882rfd6KI++TtuNURixvg7ujy8 oT9Wy+NolW8NPBKbXiIh8WNrpqCHsyblhOMDRdOUZSnWiquarZ4hitalLPmuyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770035310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSFlPpf6n5tClcn9TUH4JicrCJngWnHX9pg96tkCiXk=; b=CfvHoSs2dLZzZbDMAtpBuQA+pFBcRvnmon7//ep5atRegWkekTBZL5NppVfxDIbW4GhsTI NjAVefuxxK1SrnRyDeOH/b69LA0kLAWNnTsS1ugoAqxQxz6bvP76gs+8xXuO4aYDK1l0kj 8tbns5jl9QdY4lF/I1GJ4QuNn2czaUs0U3koH++hVrTcqWNqrnEBZjnN2u6pCTaVt+ekgd ixCnmz77eRORYYzEckPY7MjBXSVbCCvy8h60tdSAAMyg4R4/7D9Zi0nklnMBsL2mewNe0y lIDWQh5QQOSSkuyNsQTG5VFpOGm+PzRWPIhEQ7bzdVVTqpjh/gKiQmQjmLOVfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4QrY6Mf1z9bX for ; Mon, 02 Feb 2026 12:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20f39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 12:28:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: e63ee5fedb8d - main - e1000: Fix setting the promiscuous mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e63ee5fedb8dab51f1bd6d24cc650b68d9663db5 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 12:28:29 +0000 Message-Id: <6980986d.20f39.48711372@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e63ee5fedb8dab51f1bd6d24cc650b68d9663db5 commit e63ee5fedb8dab51f1bd6d24cc650b68d9663db5 Author: Zhenlei Huang AuthorDate: 2026-02-02 12:26:31 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-02 12:26:31 +0000 e1000: Fix setting the promiscuous mode The variable reg_rctl stores the value read from reg E1000_RCTL. It may contain bits E1000_RCTL_VFE and E1000_RCTL_CFIEN which control VLAN hardware filter feature. The promiscuous mode implies all tagged or untagged packets should be accepted, so the VLAN hardware filter feature should be disabled when enabling the promiscuous mode. Calling em_if_vlan_filter_disable() did the task, but later writing the value of reg_rctl back to the reg E1000_RCTL may restore the feature. Move the calling of em_if_vlan_filter_disable() after writing the reg to fix that. PR: 292759 Reviewed by: kbowling Tested by: vova@zote.me Fixes: 2796f7cab107 e1000: Fix up HW vlan ops MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54973 --- sys/dev/e1000/if_em.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 7d7655a7ae6f..4d7bc794a0b2 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2106,11 +2106,11 @@ em_if_set_promisc(if_ctx_t ctx, int flags) if (flags & IFF_PROMISC) { reg_rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE); - em_if_vlan_filter_disable(sc); /* Turn this on if you want to see bad packets */ if (em_debug_sbp) reg_rctl |= E1000_RCTL_SBP; E1000_WRITE_REG(&sc->hw, E1000_RCTL, reg_rctl); + em_if_vlan_filter_disable(sc); } else { if (flags & IFF_ALLMULTI) { reg_rctl |= E1000_RCTL_MPE; From nobody Mon Feb 2 13:31:23 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4SF741zmz6QVXF for ; Mon, 02 Feb 2026 13:31: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4SF731y9z415T for ; Mon, 02 Feb 2026 13:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770039083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WefFLAo6FOmnJIzJZRkzOrAS7WseRIBj723LBqHvReo=; b=CXsQuT7NqAKNS4hZJIOQa/Kxjwq/vkCuORQgK3gfZVYJ9jEE7L9AQB69l+8S72C535M0Su 3vLn2iH0h1j3MGRIKQY20x1jgm849EEl7G7P/uat19xShgd3CifSBZn9oaWTwirIxXz60T 75Tm3XgtXcCuYs0aBukaZEXukmqc+h4ZhItB6Qam28WBpDYEf76sxWntLhYiHz//CKmgQ/ xQDyZPvbUlAUwXntvzovfjLNHdcuG4awUeFdHnI5CMjZtV2IjwSYWMxF8zg7rj821g5rLC /1scwgW435EgasVz4NdkYsKn1rSK+ISB0bV49oneCefkvEQbuWPk0vGuoa1STA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770039083; a=rsa-sha256; cv=none; b=QtTawiHm9eysPsDFJCtg7ZhlHfmZjVealpdZEPWrYQFVi6oOCbRBQ7dzJyRRywV+zqJylQ PxslZLxglezIVreDD07J1SOt8jeLkDNDWQY7xjKFFkw9vmn/bQVxgzCBByYf+kY5tcvdNx 2Olv+2QF0y8N5TfCfrwzJwso+THcMTAkImoNZ6uky1J8yW+tQ6Be27F0yxyaaa3bN8PV7N 7zdLJQ/E8uh9AOrLCH2AWgY2yqGHSVmxI6BudtAOgYiPmpeZV0tdUzJoTlwnNMy0B1emDZ B/y6UAcNGQQ5nchZRirNaZCFUM5qDTn89yQqiJKPbSRDbK+HlCxTTNPNI04Z8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770039083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WefFLAo6FOmnJIzJZRkzOrAS7WseRIBj723LBqHvReo=; b=MIiImoiUmy5Oq9UrrnFrswc0jPh3Vczk9K8DtL5V+k5hnKA+XHFhwQW4M58USjquPOwrtQ 3bm3qWrHdOgBftL6MCM10szx0CHTXWa8v2d6Gz8rFsCbwjEDsMNaWxfenJFSATKkMBWlsA /aloIpNlEgJCMydAqUUoOzEEmlMO9A7vMmjdKQ7zBJ+mlTS2dJG74kOV+kc3RzOp93nKbZ ntvJ9PFdxycqOgP6zGigwkAqhhQlRajkS7FDp2n5EXUujcucTUi9RfVRLXvdRBTh3drnBD l0T7HluSQPx+57ZEx5R9uFpzdlQW+mtjYabOv2AoYR6dZ/4Cuz+c2NKJ3UC1QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4SF72Wg2zBtx for ; Mon, 02 Feb 2026 13:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 319d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 13:31:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 05322eec86ae - main - nvmecontrol: Always set the RAE bit on telemetry-log requests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05322eec86ae42a8f873ba10d8da61bd61b5b48f Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 13:31:23 +0000 Message-Id: <6980a72b.319d3.5a2586e0@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05322eec86ae42a8f873ba10d8da61bd61b5b48f commit 05322eec86ae42a8f873ba10d8da61bd61b5b48f Author: Warner Losh AuthorDate: 2026-02-02 13:30:08 +0000 Commit: Warner Losh CommitDate: 2026-02-02 13:31:21 +0000 nvmecontrol: Always set the RAE bit on telemetry-log requests nvme-cli, as well as some vendor scripts, always set the RAE bit of the GET LOG PAGE request when retrieving telemetry logs to avoid the log getting reset to something new. Adopt that praactice here (nvme-cli telemetry-log does have a --rae option, but that just turns on the rae bit which defaults to being on: there's no way to turn it off). Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D55017 --- sbin/nvmecontrol/telemetry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/telemetry.c b/sbin/nvmecontrol/telemetry.c index 72c304229a80..bfa1325974d5 100644 --- a/sbin/nvmecontrol/telemetry.c +++ b/sbin/nvmecontrol/telemetry.c @@ -136,7 +136,7 @@ telemetry_log(const struct cmd *f, int argc, char *argv[]) /* Read the log page */ size = sizeof(tlp); off = 0; - read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, 0, + read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, true, off, 0, 0, 0, &tlp, size); switch(opt.da) { case 1: @@ -158,7 +158,7 @@ telemetry_log(const struct cmd *f, int argc, char *argv[]) do { if (chunk > size) chunk = size; - read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, 0, + read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, true, off, 0, 0, 0, &buf, chunk); if (off == 0) { /* From nobody Mon Feb 2 13:31:24 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4SF91mTZz6QVRX for ; Mon, 02 Feb 2026 13:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4SF85Yl5z418K for ; Mon, 02 Feb 2026 13:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770039084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEe+sD4iqRFy8SJalSBILLxd6Ak86msOXxlYMfB+Ot0=; b=flp47czn3tyPK/1RIBm0aZuNhPTZjzqiv+PeDePKOJaLxrV090ynbn2X02na7mvH8/XR8/ 6HMLGsnyKkU9hwPTy7ZZVU4/lYKVztKYDdZs/iEMS7iru2+tgCRW3U/ciPU/Oo8RtkBHzW xDzYuAXZu+U9YMXOXCLJFAa3lLZcEcFXmxmQaxduBpQgrkaDHMdPND5lfYxCl60SupDAXq zL2fLWzJ70VN926C6uR939xt68zsm7fvgWZeoDb9DAj2kB3kE0S4TMX6UM5kD+I7YcpE1Z SylNxdcnLkhepDUx+Z27uXLx40wQgv2Oa8/W8pa3j8OZRF94pih+H0VgYBmmKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770039084; a=rsa-sha256; cv=none; b=oZA3QDnDli12Ue/+/bhvpYzS0vyBCl16QHJVNk/MxiseCFYAJsUGO9/vhRqCe6+WRwv9PH wFdioFhPffVjt3W0douFlmiTuwtPtRoDOcjNG4tJvJkwIC3t//GrNf9UlTrC6eQZbJlb0G PAXsH2oTl9bjhGmjBBX+o2AIIBlyNOBKgxEki2nzjzB12bK3KlVLBBd/IL5Y2jQpm/KUhc 9iWuS8RIv12fairGImbI5wE6r1DKGz2Bob0Ht1fTXmKiWNTY7kp6uGG2MKmzkua6RQuBYE M8YlJTOWeVLLkDiMZPxNsFC+ee0E0z6LmbO9h7mjJF8bvm46DAE0xft9QTEnzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770039084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEe+sD4iqRFy8SJalSBILLxd6Ak86msOXxlYMfB+Ot0=; b=DaXfuB/h6L/wXEiVJEpc9L0i1zAwAyf8gcUycT9oufUkcJR5u008abqAqvRXZq4+09qkqO 6EcnOW59KqXRK9ZN1u/5f9vNocfb/VgK3pwUGsUevmQw+Y3bBAR3kUB1csZzWyuET6tp5q JfgULwK8bZSKsWZgNYFbfk6XxOeqXxa+l+NjP5VCRE1t3/Ogiqw1kysz33TN+00VozIDTT HMQSrZecnwO1w7Db7/zI5AYUD70Vpu2GplHxvqGlfKgDoXqigxPxWy9yDgrX0pR6LYHqqs wvqmayWvIepDK9lpaDtOR1Hi85cbxjEVsYADlBNrc6zdo8UYcpCF4lMRRiBNqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4SF83FctzCbM for ; Mon, 02 Feb 2026 13:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31385 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 13:31:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ff9fe85ff245 - main - nvmecontrol: telemetry-log don't sanity check host generation number List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff9fe85ff245bfbf6f54f98175282be5cf500cb3 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 13:31:24 +0000 Message-Id: <6980a72c.31385.4fe39fee@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ff9fe85ff245bfbf6f54f98175282be5cf500cb3 commit ff9fe85ff245bfbf6f54f98175282be5cf500cb3 Author: Warner Losh AuthorDate: 2026-02-02 13:30:22 +0000 Commit: Warner Losh CommitDate: 2026-02-02 13:31:21 +0000 nvmecontrol: telemetry-log don't sanity check host generation number Don't sanity check the host initiated generation number. It's not necessarily constant between the two log page fetches. nvme-cli doesn't do this stanity check and it generates a lot of false positives. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D55018 --- sbin/nvmecontrol/telemetry.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sbin/nvmecontrol/telemetry.c b/sbin/nvmecontrol/telemetry.c index bfa1325974d5..c22d53ecdfed 100644 --- a/sbin/nvmecontrol/telemetry.c +++ b/sbin/nvmecontrol/telemetry.c @@ -160,16 +160,6 @@ telemetry_log(const struct cmd *f, int argc, char *argv[]) chunk = size; read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, true, off, 0, 0, 0, &buf, chunk); - if (off == 0) { - /* - * Sanity check to make sure that the generation number - * didn't change between the two reads. - */ - if (tlp.hi_gen != buf.hi_gen) - warnx( - "Generation number changed from %d to %d", - tlp.hi_gen, buf.hi_gen); - } if (write(fdout, &buf, chunk) != chunk) err(EX_IOERR, "Error writing %s", opt.outfn); off += chunk; From nobody Mon Feb 2 13:31:25 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4SFB09lwz6QVRY for ; Mon, 02 Feb 2026 13:31: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4SF94z01z41hc for ; Mon, 02 Feb 2026 13:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770039085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIVzR9/VXBCB9nNvlarQIXMzUJMXzIEIP7gdXNv1W8A=; b=wenw/Op5X3QviCCFo1iO718Z16PEhxgxTLd0fMf4rInIooDeN1TfrzeYZ1ChAe5RGxCQCR byLOZGMxxx2ZjnKy8TYxwb6t6YSxftoSRMtdbdJg1xy44pdUSqZwhKDk9aUEPJl3l9LlXI zjkKIPQ5tcCmgnrcM9XZrezHzrMTAhpiRuo9MGJOLjQD002EAY5cgYgnxNkK41k4NGzHWl kbgwaqT3c7bftcfUpvZxYSAFpFskSs+6a/LuNKsVXnc2rSEFp3ZgKBRbENlpdoMtgZan/6 BOWGpfKjIi099n/Tev5FcVe/l5B9UfnxirPPxJtw7da7VsCSHrCoybC3v2/v6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770039085; a=rsa-sha256; cv=none; b=r6XtIb2DRH1K6tNCyeofHFn6C40bHtrQWEI/itSCA4kGQvyoWma+49RtqRxNtVTtozMb/r wAcKGkIKwYOnndfDYcXoRr3xpDUaIjBRwa3iV6cDpfyZ/lWZfa/bpq131TDSnUXP6GBc3f knz6GPZrQ78H7u7Pcv93xni5sd6f+fngS1b1uMJsZDc0jtTN5vsPFhryAi0Z7OeHvjsUkt zHf1PNhh7tqVGnsBymIqcniDhlAeCLUkpu8ysrY7mMZ85GNy5bl2dmBhuFerbPknYvCXie SoqiG/JxfiyHTQODFU0tQnkK8ygSFIu+8ArwqSQXpxHXn5kNl6hEId+aL6/GzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770039085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIVzR9/VXBCB9nNvlarQIXMzUJMXzIEIP7gdXNv1W8A=; b=IFzwAHYHjFbrzqAYS6S99RKvSvu6yFoUIRXwojBUmtGOUVL1KKPCJpTcd8Lryz6dBOomdr tErm/tQfKLAbHyLbdidtFooOO1k1/P6bfEnYPMEu0Ziuvuu86hRGcBsy6BYLVLwv43+vFO dXTK7r9Bw2VhW2kWN/9b9Lt3zKf1slQQstYcKapUqp2UF3ChArDc7xpNLeTwD5lDOuelKh qJdXxZbnI2BPOhf/y6AnwH310otydrIUl3Uay01nEXdi7HXbRv/kosnCpJeSb/N9bGnIDp A9wdPhUUV1e+tmm2fCN+jili4QKEUQWDMJxxncOKtAI85JPk5aXR2ww6g19Fag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4SF93dHvzBwg for ; Mon, 02 Feb 2026 13:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 305f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 13:31:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 350c1232a57a - main - nvmecontrol: telemetry-log --verbose List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 350c1232a57a64b955a3ae7f9b92dde164d1eb65 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 13:31:25 +0000 Message-Id: <6980a72d.305f3.5f7bf47b@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=350c1232a57a64b955a3ae7f9b92dde164d1eb65 commit 350c1232a57a64b955a3ae7f9b92dde164d1eb65 Author: Warner Losh AuthorDate: 2026-02-02 13:30:28 +0000 Commit: Warner Losh CommitDate: 2026-02-02 13:31:21 +0000 nvmecontrol: telemetry-log --verbose Add -v / --verbose to report status report since these things can take minutes to retrieve. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D55019 --- sbin/nvmecontrol/nvmecontrol.8 | 6 +++++- sbin/nvmecontrol/telemetry.c | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index dc757bcf90c3..61574715a26c 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -33,7 +33,7 @@ .\" .\" Author: Jim Harris .\" -.Dd July 9, 2025 +.Dd January 31, 2026 .Dt NVMECONTROL 8 .Os .Sh NAME @@ -256,6 +256,7 @@ .Ic telemetry-log .Fl O Ar output-file .Op Fl d Ar data-area +.Op Fl v .Aq Ar device-id .Sh DESCRIPTION NVM Express (NVMe) is a storage protocol standard for SSDs and other @@ -875,6 +876,9 @@ Output file for the data. This parameter is mandatory. .It Fl d Ar data-area The data area is either 1, 2 or 3. +.It Fl v +Verbose output reporing progress. +This log can be quite large and take minutes to retrieve. .El .Sh DEVICE NAMES Where diff --git a/sbin/nvmecontrol/telemetry.c b/sbin/nvmecontrol/telemetry.c index c22d53ecdfed..60bd3e025f3d 100644 --- a/sbin/nvmecontrol/telemetry.c +++ b/sbin/nvmecontrol/telemetry.c @@ -51,6 +51,7 @@ static struct options { const char *outfn; const char *dev; uint8_t da; + bool verbose; } opt = { .outfn = NULL, .dev = NULL, @@ -63,6 +64,8 @@ static const struct opts telemetry_log_opts[] = { "output file for telemetry data"), OPT("data-area", 'd', arg_uint8, opt, da, "output file for telemetry data"), + OPT("verbose", 'v', arg_none, opt, verbose, + "Be verbose about process"), { NULL, 0, arg_none, NULL, NULL } }; #undef OPT @@ -96,7 +99,7 @@ telemetry_log(const struct cmd *f, int argc, char *argv[]) int fd, fdout; char *path; uint32_t nsid; - ssize_t size; + ssize_t size, blocks; uint64_t off; ssize_t chunk; struct nvme_controller_data cdata; @@ -151,13 +154,23 @@ telemetry_log(const struct cmd *f, int argc, char *argv[]) default: errx(EX_USAGE, "Impossible data area %d", opt.da); } - size = (size + 1) * 512; /* The count of additional pages */ + blocks = size + 1; + size = blocks * 512; /* The count of additional pages */ chunk = 4096; - printf("Extracting %llu bytes\n", (unsigned long long)size); + if (opt.verbose) + printf("Extracting %llu bytes %llu blocks\n", (unsigned long long)size, + (unsigned long long)size / 512); + else + printf("Extracting %llu bytes\n", (unsigned long long)size); do { if (chunk > size) chunk = size; + if (opt.verbose && off % 10240 == 0) { + printf("%s: %llu / %llu\r", opt.dev, (unsigned long long)off / 512, + (unsigned long long)blocks); + fflush(stdout); + } read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, true, off, 0, 0, 0, &buf, chunk); if (write(fdout, &buf, chunk) != chunk) @@ -165,6 +178,11 @@ telemetry_log(const struct cmd *f, int argc, char *argv[]) off += chunk; size -= chunk; } while (size > 0); + if (opt.verbose) { + printf("%s: %llu / %llu\n", opt.dev, (unsigned long long)off / 512, + (unsigned long long)blocks); + fflush(stdout); + } close(fdout); close(fd); From nobody Mon Feb 2 15:51:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4WMD6D75z6Qdvl for ; Mon, 02 Feb 2026 15:51: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4WMD5SMTz3G2B for ; Mon, 02 Feb 2026 15:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770047512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FLA4fRFvNxAejRmcb2LPQHSyTl2k0FfcJVgb6p+Wbzw=; b=F2qJlEuDu2qwc6zH+6GnBrP5mNBk7HyzEsQ87vuevZ8nu+HQIpt0RKz2I9LI/Pi+Y/gAL2 YTDNCO/XiKzGlfEfFeB7IZHe0uvtDVyrhE/9/zDBFWicXbtO9KtIUwTpYsGPX1H7AfydC2 /9ruxkaeIukFadyYuOXwVmpkZiQIihHhqgw1DU2s+kb5G1VXnMPI7FQJtGUZ2ajg6ExAsO QXuqw68tVwo0ak19ojkHOHnHMEOZ8I/tCMxxlF1KUP5wS16kt0vdBMo5umM9fnwF/8BR7y q1KJpmO2sQj//t9l6IRZ7OsHswLd3LmZnTJ0sJb6tx/rHLSHztXeMamasqe60g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770047512; a=rsa-sha256; cv=none; b=YiSXqnaF29VWcU9cXgPDq2PiypoPRNOUtFwmLj4Emj/cL40fHwS0kgnbn+yw9kbEKWacuX C93jgXBvPcdFM9njRFekg/TTY5NeM79UHMw+JWM0uVkGl17ubyvjVHPKKYb8W37YfE7GOz HFQzabRKvs54N4YqCsm3nZdQaXn79OdJW+r+t74YcBpPMq+t8APG5e53zO+6KGegSJ8Y/9 65bPLnzSl9ZjS0UXwJvpZAry02wB0Y+kOLkBVFIiXYIJ9GWmc/8NH5B+iQXW46qMxEq4Zv JsKUhv7Rzhv9nV4oPzytOgyPkHmKtslrABDc6Q0H5cnEs8O2FIAhzfqeNMCIhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770047512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FLA4fRFvNxAejRmcb2LPQHSyTl2k0FfcJVgb6p+Wbzw=; b=FsMXI0sskEuLiRIez9DlkHelj0gNboJ+8Dy89DAPTbN/RgRMMZ+M9oHwEeBGy0eLGuGxvX tKcDIk5pGmGlTnRAFeJ56SKMj5fQhPxOjrXMPE9RikmUy9naKvuNfRI7w9WESL7QCKmd8N INIZ8rr8n7DE7t/+oT8ylvmOy67JUI3TfZOEx/XN0gzIFt4bmsgiOIyXQZZctRqPTuSwuW 2U+8g9lSq3bAjfoBAZPnp+z90FhV+IYWbm+24Z0eP2lU7bdcI4Rcc1adI0CMk+fG+JHNww c9F86/7+awL6Y6iET8iH53aGPaGPf/R6IE2hc+8orm89p3t8kGRUdpvcnqx48A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4WMD4lJyzYs2 for ; Mon, 02 Feb 2026 15:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ebff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 15:51:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 387ae6390534 - main - libc: Clean up *dir() code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 387ae6390534b6e9b48931840e7bc76eeb0b258d Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 15:51:52 +0000 Message-Id: <6980c818.3ebff.7ddbf27@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=387ae6390534b6e9b48931840e7bc76eeb0b258d commit 387ae6390534b6e9b48931840e7bc76eeb0b258d Author: Dag-Erling Smørgrav AuthorDate: 2026-02-02 15:46:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-02 15:46:53 +0000 libc: Clean up *dir() code Fix style nits (mostly whitespace issues) and clean up the manual page. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55024 --- lib/libc/gen/closedir.c | 1 - lib/libc/gen/directory.3 | 78 +++++++++++++++++++++++++----------------------- lib/libc/gen/dirfd.c | 3 -- lib/libc/gen/fdopendir.c | 1 + lib/libc/gen/opendir.c | 1 - lib/libc/gen/opendir2.c | 1 - lib/libc/gen/rewinddir.c | 1 - lib/libc/gen/scandir.c | 2 -- lib/libc/gen/telldir.c | 4 +-- 9 files changed, 43 insertions(+), 49 deletions(-) diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c index 6015114d6c47..73070d171cd1 100644 --- a/lib/libc/gen/closedir.c +++ b/lib/libc/gen/closedir.c @@ -68,6 +68,5 @@ fdclosedir(DIR *dirp) int closedir(DIR *dirp) { - return (_close(fdclosedir(dirp))); } diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3 index 263dfdd6eb95..ccbc60b03776 100644 --- a/lib/libc/gen/directory.3 +++ b/lib/libc/gen/directory.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 1, 2020 +.Dd January 31, 2026 .Dt DIRECTORY 3 .Os .Sh NAME @@ -86,13 +86,6 @@ and returns a pointer to be used to identify the .Em directory stream in subsequent operations. -The pointer -.Dv NULL -is returned if -.Fa filename -cannot be accessed, or if it cannot -.Xr malloc 3 -enough memory to hold the whole thing. .Pp The .Fn fdopendir @@ -134,14 +127,6 @@ or .Fn closedir on the same .Em directory stream . -The function returns -.Dv NULL -upon reaching the end of the directory or on error. -In the event of an error, -.Va errno -may be set to any of the values documented for the -.Xr getdirentries 2 -system call. .Pp The .Fn readdir_r @@ -166,10 +151,6 @@ upon reaching the end of the directory .Fa result is set to .Dv NULL . -The -.Fn readdir_r -function -returns 0 on success or an error number to indicate failure. .Pp The .Fn telldir @@ -179,12 +160,9 @@ returns a token representing the current location associated with the named Values returned by .Fn telldir are good only for the lifetime of the -.Dv DIR -pointer, -.Fa dirp , +.Em directory stream from which they are derived. -If the directory is closed and then -reopened, prior values returned by +If the directory is closed and then reopened, prior values returned by .Fn telldir will no longer be valid. Values returned by @@ -217,28 +195,22 @@ The function closes the named .Em directory stream -and frees the structure associated with the -.Fa dirp -pointer, -returning 0 on success. -On failure, \-1 is returned and the global variable -.Va errno -is set to indicate the error. +and frees the structure associated with +.Fa dirp . .Pp The .Fn fdclosedir function is equivalent to the .Fn closedir -function except that this function returns directory file descriptor instead of -closing it. +function except that it returns the file descriptor associated with +.Fa dirp +instead of closing it. .Pp The .Fn dirfd function -returns the integer file descriptor associated with the named -.Em directory stream , -see -.Xr open 2 . +returns the file descriptor associated with +.Fa dirp . .Sh EXAMPLES Sample code which searches a directory for entry ``name'' is: .Bd -literal -offset indent @@ -255,6 +227,36 @@ while ((dp = readdir(dirp)) != NULL) { (void)closedir(dirp); return (NOT_FOUND); .Ed +.Sh RETURN VALUES +The +.Fn opendir +and +.Fn fdopendir +functions return a pointer to the new +.Em directory stream +on success and +.Dv NULL +on failure. +.Pp +The +.Fn readdir +function returns a pointer to a directory entry on success and +.Dv NULL +on failure. +The +.Fn readdir_r +function returns 0 on success and an error number on failure. +.Pp +The +.Fn telldir +function returns a nonnegative value on success and -1 on failure. +.Pp +The +.Fn closedir +function returns 0 on success and -1 on failure. +The +.Fn fdclosedir +function returns an open file descriptor on success and -1 on failure. .Sh ERRORS The .Fn opendir diff --git a/lib/libc/gen/dirfd.c b/lib/libc/gen/dirfd.c index 85090bd4da6c..ba8f52845b4e 100644 --- a/lib/libc/gen/dirfd.c +++ b/lib/libc/gen/dirfd.c @@ -27,8 +27,6 @@ */ #include "namespace.h" -#include - #include #include "un-namespace.h" @@ -37,6 +35,5 @@ int dirfd(DIR *dirp) { - return (_dirfd(dirp)); } diff --git a/lib/libc/gen/fdopendir.c b/lib/libc/gen/fdopendir.c index 9393cbe28f85..05e1a09fd00c 100644 --- a/lib/libc/gen/fdopendir.c +++ b/lib/libc/gen/fdopendir.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "un-namespace.h" #include "gen-private.h" diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c index 08d9eb10eaa2..4c08b7156055 100644 --- a/lib/libc/gen/opendir.c +++ b/lib/libc/gen/opendir.c @@ -42,6 +42,5 @@ DIR * opendir(const char *name) { - return (__opendir2(name, DTF_HIDEW | DTF_NODUP)); } diff --git a/lib/libc/gen/opendir2.c b/lib/libc/gen/opendir2.c index c5c2e662efd8..321cb2261b8c 100644 --- a/lib/libc/gen/opendir2.c +++ b/lib/libc/gen/opendir2.c @@ -68,7 +68,6 @@ __opendir2(const char *name, int flags) static int opendir_compar(const void *p1, const void *p2) { - return (strcmp((*(const struct dirent * const *)p1)->d_name, (*(const struct dirent * const *)p2)->d_name)); } diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c index df829e98d138..5cead2adc6d4 100644 --- a/lib/libc/gen/rewinddir.c +++ b/lib/libc/gen/rewinddir.c @@ -43,7 +43,6 @@ void rewinddir(DIR *dirp) { - if (__isthreaded) _pthread_mutex_lock(&dirp->dd_lock); dirp->dd_flags &= ~__DTF_SKIPREAD; /* current contents are invalid */ diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c index fb589f4b36b6..84b20fbafa03 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -232,14 +232,12 @@ scandirat(int dirfd, const char *dirname, struct dirent ***namelist, int alphasort(const struct dirent **d1, const struct dirent **d2) { - return (strcoll((*d1)->d_name, (*d2)->d_name)); } int versionsort(const struct dirent **d1, const struct dirent **d2) { - return (strverscmp((*d1)->d_name, (*d2)->d_name)); } diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c index 1731cc4d7a2c..d71b7bed158c 100644 --- a/lib/libc/gen/telldir.c +++ b/lib/libc/gen/telldir.c @@ -53,7 +53,7 @@ telldir(DIR *dirp) if (__isthreaded) _pthread_mutex_lock(&dirp->dd_lock); - /* + /* * Outline: * 1) If the directory position fits in a packed structure, return that. * 2) Otherwise, see if it's already been recorded in the linked list @@ -95,7 +95,7 @@ telldir(DIR *dirp) LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe); } ddloc.i.is_packed = 0; - /* + /* * Technically this assignment could overflow on 32-bit architectures, * but we would get ENOMEM long before that happens. */ From nobody Mon Feb 2 15:51:53 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4WMG1GVWz6Qf5N for ; Mon, 02 Feb 2026 15:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4WMF6G2Yz3FwH for ; Mon, 02 Feb 2026 15:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770047513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7khgSONj7GasGCSm+hZPLweaubfTRClTO8/Pa0vSBE=; b=uTyFOPZsKc78QCAF1IhUoJ85UzOuMu9Zj/jlKZ4xZQ4837L/NRuzUqkRHDmlLO+rp6zlYO TpqAdfHEHtme+7+3/YXWSAF281ieGYDQ2fnK3NO5YDi/oaRk2SJAFgLIQ2VuK4ODeOt9ai 5UklTebwqcvrdfLAU1V8EFtfsZO5hNhfMGd92e8Szw/YTsADb4Jq5qE2LrTR8xmeEROuJk oOsAeThqDxyC6jsDerO7HFwxPTYfUzaVM+qFD0kIR8fciYcGgfexQ/M7RwCyGJfE6PPvL4 od6T+2ZumQnat0Q5qh/1jS+Os86U5EVWueFw5WhHlxQ7qOEjWRkN11I364WWsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770047513; a=rsa-sha256; cv=none; b=B/HJ5MwemVX48I/R7PDY4Hly1hyeVfDoSX+62w2Zpd6Q7+Q5SH1RKhvr9o6IRWt0Aw0QpK hgC7C55R/CBf9uLpcBtGl6sTU90+8VLGP688CqUeYMEXI2wunQ+gehgTX/u4sRrD9Yy9eb bYf1mc9GESEVp1qsl2EqhX8lmLDtAwiHhKj1rXNrp8iysf6FgOAh85aHOI9LBQ6cwaSeY7 NINJOzXQBzOOAB7jQ41bk4CbNgy8c15Yw6SGNZHhiahCqCx5hjRTUq+KPo0k6QtFLUimts zubuFTt9sOhrRic0YyQIReit+gg3tVVRZBWScWDuRkmvusdMXpkH0hKiq/BNhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770047513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7khgSONj7GasGCSm+hZPLweaubfTRClTO8/Pa0vSBE=; b=FtdS9hn+zrWfU+EJN2IOkfpcZTEMTZ+gNj6DzZrQfsDPyLWBMKVHU2PxUjj8we124zpyxT zN9XaOKdQBoAtKi1+lQD/x6vTXaj9tUuYcetsvjG2nFRSiS4z1usByjKLVBb0PKYtmemyZ BOJPlNwmfiXMpva0VQdUyROOnlJLMwJBhInNr2wzD6JSQFQvZIktlRcr1BhWZfQ0s7lNLT Z7Kv1VPZIiPlEtdER5A+0wbnXD/Y4Gwflb7Op4g+S4EUvSVi9U/l5Y0/LNDEY/07Nx1io5 DxOZfKQId0gclxkNVcy7qucdE59OMoYut3cI1asBOXZQWzaL2XFg2+92IhMVWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4WMF5dSBzYwG for ; Mon, 02 Feb 2026 15:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d16e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 15:51:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5074d5c9845e - main - libc: Improve POSIX conformance of dirfd() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5074d5c9845e142883cdbb9ad212be66e57615d0 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 15:51:53 +0000 Message-Id: <6980c819.3d16e.11cc28f9@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5074d5c9845e142883cdbb9ad212be66e57615d0 commit 5074d5c9845e142883cdbb9ad212be66e57615d0 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-02 15:46:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-02 15:46:57 +0000 libc: Improve POSIX conformance of dirfd() POSIX states that dirfd() should set errno to EINVAL and return -1 if dirp does not refer to a valid directory stream. Our interpretation is that this applies if dirp is null or the file descriptor associated with it is negative. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55025 --- lib/libc/gen/directory.3 | 14 +++++++++++++- lib/libc/gen/dirfd.c | 5 +++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3 index ccbc60b03776..270abb2d2371 100644 --- a/lib/libc/gen/directory.3 +++ b/lib/libc/gen/directory.3 @@ -256,7 +256,9 @@ The function returns 0 on success and -1 on failure. The .Fn fdclosedir -function returns an open file descriptor on success and -1 on failure. +and +.Fn dirfd +functions return an open file descriptor on success and -1 on failure. .Sh ERRORS The .Fn opendir @@ -327,6 +329,16 @@ function may also fail and set .Va errno for any of the errors specified for the routine .Xr close 2 . +.Pp +The +.Fn dirfd +function will fail if: +.Bl -tag -width Er +.It Bq Er EINVAL +The +.Fa dirp +argument does not refer to a valid directory stream. +.El .Sh SEE ALSO .Xr close 2 , .Xr lseek 2 , diff --git a/lib/libc/gen/dirfd.c b/lib/libc/gen/dirfd.c index ba8f52845b4e..fbbf703b5a2e 100644 --- a/lib/libc/gen/dirfd.c +++ b/lib/libc/gen/dirfd.c @@ -28,6 +28,7 @@ #include "namespace.h" #include +#include #include "un-namespace.h" #include "gen-private.h" @@ -35,5 +36,9 @@ int dirfd(DIR *dirp) { + if (dirp == NULL || _dirfd(dirp) < 0) { + errno = EINVAL; + return (-1); + } return (_dirfd(dirp)); } From nobody Mon Feb 2 16:13:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4Wr73Wjnz6Qgr9 for ; Mon, 02 Feb 2026 16:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4Wr72g2hz3JKQ for ; Mon, 02 Feb 2026 16:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770048807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3qsrjW8s+GnmjVaTy43FyAVgtsBosFbdRWWnMu4yThM=; b=m589aA4TzAKBJ2R8Q43twrlURZ3ZI4UdaqJmzEiAqQ4AiQ1Rl4lXVvoJ8ri6Vb9s83Gose ZZqetcdmlRkWLfBACDKOCO9CfUXDL8CFfW3e7TztNDZod9LPso83W6PIA7eFYI2oqlQcC5 4Hp5VLXMN76W8xer+25WgAayyzh5StrmThyoRerawoUhSy3LBXk3eWupR43sCExFKphdWz 2lTNgxm8FGFsSbHEkp8FGuA+6t7eZwO86cR3JVHZixXta/rUYhn3cyd4P2SNNU79h7+kxH znJQCDy9dqlU3FJ1rlvtQi18D0D+D5VZy+thKuOvGJhbIBSn52NHLr0C4uXEyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770048807; a=rsa-sha256; cv=none; b=arzrvHXKrtRbL4Zei4hdQ/LIGtSHBLPYshuE6g+k6B2+51NHR3rMvpiejdR15wo1oIjbN/ FRUNzDeuzpqd1QpnABo1I7sZaD6Ggi+BoixQYV41kn8u6vc+q2FxUIafnWnsgC7IahzjIJ tPlyADYA3gGDPyxgT9jRaPCQ7BnXMT0kMfmf6T5HXojwMc5QXd7gUX2Wm5Wd/54uGgDKGN Z856Uk488DjiLNp+LchvoORfzuPetrmdiFPa5l7o6wQ2S0TQH3MmKGUIpu2KsrGBvolhAX TeKUdM7ApGOuNmDFxVBufZGSi/M93+I1+GPMdqgWGAtBZgkYF4RCL+0OtqObXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770048807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3qsrjW8s+GnmjVaTy43FyAVgtsBosFbdRWWnMu4yThM=; b=YaIk77E9OUxIHlGlOAKfchXnNO4awjgedk4EJ1zpcMtAQ92o6ZiKmOTyvW9ISdFAoSfqig NbVPqrFMeyAJ0yg3OUBSnX5A5GBU9zgUAkweLbxECoCC+dJMa96+R9F92CGTXW0t5K+QYF fwvR2CoAeukpkyouOmgaD4cqnMQPAsI/NT7NCq0c1CEkDUhFBiYVOQZe4ZY9LRzU8Gxt7O O41lzgJc9Ts/4BdEB8a5NyGnkxiCKwS9Lij8k2IcdVh8t/Gtp6vCZEb5bHWszuIJ6iQmxh biR7oUic0Iss7rOLeiwfR4lQoikKOChWbf0i7aJHVAje54iGv7dO9dPAEnYZ6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4Wr72BDDzZSb for ; Mon, 02 Feb 2026 16:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 190ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:13:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4d73b07d02d1 - main - diff: fix support for -l with new diff algorithm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d73b07d02d12cdff0558d3ca6c4b3224cae831f Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:13:27 +0000 Message-Id: <6980cd27.190ef.35cb2e92@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4d73b07d02d12cdff0558d3ca6c4b3224cae831f commit 4d73b07d02d12cdff0558d3ca6c4b3224cae831f Author: Baptiste Daroussin AuthorDate: 2026-02-02 15:43:29 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-02 16:13:16 +0000 diff: fix support for -l with new diff algorithm MFC After: 3 days Reviewed by: des Differential Revision: https://reviews.freebsd.org/D55052 --- usr.bin/diff/diff.c | 1 + usr.bin/diff/diff.h | 1 + usr.bin/diff/diffreg_new.c | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 83aa20c52cf3..1aba09f7a5f7 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -249,6 +249,7 @@ main(int argc, char **argv) usage(); break; case 'l': + dflags |= D_PAGINATION; lflag = true; break; case 'N': diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index 74be55db8a33..4bea23db1ab8 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -80,6 +80,7 @@ #define D_STRIPCR 0x400 /* Strip trailing cr */ #define D_SKIPBLANKLINES 0x800 /* Skip blank lines */ #define D_MATCHLAST 0x1000 /* Display last line matching provided regex */ +#define D_PAGINATION 0x2000 /* Paginate via pr(1) */ /* Features supported by new algorithms */ #define D_NEWALGO_FLAGS (D_FORCEASCII | D_PROTOTYPE | D_IGNOREBLANKS) diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index f54cd554ccad..d932764bb6da 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -33,6 +33,7 @@ #include #include +#include "pr.h" #include "diff.h" #include #include @@ -146,6 +147,7 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) { char *str1, *str2; FILE *f1, *f2; + struct pr *pr = NULL; struct stat st1, st2; struct diff_input_info info; struct diff_data left = {}, right = {}; @@ -178,6 +180,9 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) f1 = openfile(file1, &str1, &st1); f2 = openfile(file2, &str2, &st2); + if (flags & D_PAGINATION) + pr = start_pr(file1, file2); + if (capsicum) { cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); if (caph_rights_limit(fileno(f1), &rights_ro) < 0) @@ -271,6 +276,8 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) status |= 1; } done: + if (pr != NULL) + stop_pr(pr); diff_result_free(result); diff_data_free(&left); diff_data_free(&right); From nobody Mon Feb 2 16:13:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4Wr852zWz6Qgp7 for ; Mon, 02 Feb 2026 16:13: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4Wr83NVJz3J5c for ; Mon, 02 Feb 2026 16:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770048808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/EHLmjeUAeDJ77snn4hpxwFY/IpVIwgVym98gt14/sg=; b=B0mbibTzNmpYbrr1Uw1tC+QO/V9AefaaT8nwy0yg+VuSiJtMsdqe6PAjRSPvDHV9qxrGKq T4KInOooVHVqhCh7034b/rWqTLLqTcHEu/+zxTIUUyg9hY5HDZbr6SMJnvJCVx8v8lbVBY 0oSCmzuT+HFAIbRb6scIvMdkUfTbtl3ZPiuHV8fmSQaiWHxrIv4qwClDH/nZUhI4CneT93 iOjv8HGKg6nbxFYqx6ZrkE3EmoDLBIA5mOPEQgBey8zSnzEFcx2ZZ0jK/cEhvJNwoSFOfe LgFPyzv/TJAIguNTG23O1zQLHqndoBvpwTgmcreHBSEtKI/xfqqk9GRuCRkiEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770048808; a=rsa-sha256; cv=none; b=ploiH0UxKUe9iw8y46tq4W2a+TnvfZdc6Oj2A2WXivmNH7F9sOiYk8QOgtXN7Cwi1MntIT UmBTF3B+Xga9aEA/L1vksKodxzuuHaLRS5qdFlNS9BwrjH1hJxoZaRRmRR4tT39ThD4Jfy TCGijyNn9LoZJHqDdABKWkvfGtPryfYg5xTsejESFw/azA/H0PFtBD2BJS4qSvfpasW9YX q6L2Cl+soBHuS8n8CXKqXB1eep6288zhY+4e9MnZXf2ZvQoH2qodQfvSJ2lPAcypuAtzMF BrozSWzU5JvVQPMRcgYeFAZNPXs00wXRh+ZGvwrr5kZhr77MaMRVF1jXgkN5rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770048808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/EHLmjeUAeDJ77snn4hpxwFY/IpVIwgVym98gt14/sg=; b=BH7fQ+FvBv0exT9mlnPO90XeRoGGeef7B6DIQkJdnzRb0+9nAuQ8KPVsoR+VEabFF+9G9r LrPJDRDe5eOBUm7fI0WzHASFt/4yAusT+QQuJIkCb9tGy5sisZM62CE17oDzPxM7JcGcJC RduFh0B1p+QJGXS7gzyWGEZ5+SAKX7V/rq0qLds68MaFiDkuLd+b76Q0BD/GIgzUwiinqL qR7UGD0eFbyDRiJZqr5+2c3c/XvGwwUeNCq7xwnph7gF6bL0yCKDvZZ/tPg3Watw/8d7I8 25a/CKGtGwhfkjstinIjV3rMYK1tiedHgySsXArIhATTFObMorn02XYJXXJtzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4Wr82z0NzZPy for ; Mon, 02 Feb 2026 16:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19610 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:13:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0ec58e7c2e53 - main - diff: use pdwait(2) instead of homemade one List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ec58e7c2e533a15eabfe8dca4a14e9ae93de4b5 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:13:28 +0000 Message-Id: <6980cd28.19610.2e2a59d0@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0ec58e7c2e533a15eabfe8dca4a14e9ae93de4b5 commit 0ec58e7c2e533a15eabfe8dca4a14e9ae93de4b5 Author: Baptiste Daroussin AuthorDate: 2026-02-02 15:44:34 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-02 16:13:16 +0000 diff: use pdwait(2) instead of homemade one MFC After: 3 days Reviewed by: des Differential Revision: https://reviews.freebsd.org/D55053 --- usr.bin/diff/pr.c | 19 ++++++------------- usr.bin/diff/pr.h | 3 +-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index c3ea280073af..f254fbab28b7 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -72,7 +73,7 @@ start_pr(char *file1, char *file2) execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); _exit(127); default: - + pr->pidfd = pr_pd; /* parent */ if (pfd[1] != STDOUT_FILENO) { pr->ostdout = dup(STDOUT_FILENO); @@ -82,14 +83,6 @@ start_pr(char *file1, char *file2) close(pfd[0]); rewind(stdout); free(header); - pr->kq = kqueue(); - if (pr->kq == -1) - err(2, "kqueue"); - pr->e = xmalloc(sizeof(struct kevent)); - EV_SET(pr->e, pr_pd, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, - NULL); - if (kevent(pr->kq, pr->e, 1, NULL, 0, NULL) == -1) - err(2, "kevent"); } return (pr); } @@ -109,10 +102,10 @@ stop_pr(struct pr *pr) dup2(pr->ostdout, STDOUT_FILENO); close(pr->ostdout); } - if (kevent(pr->kq, NULL, 0, pr->e, 1, NULL) == -1) - err(2, "kevent"); - wstatus = pr->e[0].data; - close(pr->kq); + while (pdwait(pr->pidfd, &wstatus, WEXITED, NULL, NULL) == -1) { + if (errno != EINTR) + err(2, "pdwait"); + } free(pr); if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) != 0) errx(2, "pr exited abnormally"); diff --git a/usr.bin/diff/pr.h b/usr.bin/diff/pr.h index 2ff5949f282f..80f20ca7c329 100644 --- a/usr.bin/diff/pr.h +++ b/usr.bin/diff/pr.h @@ -28,8 +28,7 @@ struct pr { int ostdout; - int kq; - struct kevent *e; + int pidfd; }; struct pr *start_pr(char *file1, char *file2); From nobody Mon Feb 2 16:14:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4WsR2tG0z6QgT7 for ; Mon, 02 Feb 2026 16:14: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4WsR2FTZz3KDF for ; Mon, 02 Feb 2026 16:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770048875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fLNhvSLo74cv5gLeu4uUTbksfa5+P+Q8ounHUY8eeQY=; b=lotEwALOeA0N97bvVhl4dJpldVEquWBynNzTFYVM6AfHrV5k4VAuJiKsXGHllB8Tad0D45 j+Dtt/3rBSYfYw/eUGNhMle3V+c6zrYOyyDLjwFEsar/tRF84xBTVkVpUoT9ZGex33Mu82 PYYoTjfr73hdkhi123b53oLV1NpwtkoJl9z3sTczN66ZmpvPNQvDTADhleqlm8sEM4Zzsz 8JTNw2cppVPjHa5QC29R8E4t7mz0GWuJxvVjBPpgMS7BFnAm5gl2uqJnI0L3iqj9yWjMVo hq6lsTey8Y/122ak2YHSl6REDwgjEYW/OQJIRa27tlMhxLA0hbsAq4LLnj5QXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770048875; a=rsa-sha256; cv=none; b=nm6eoR+cT24xz7/wFlEkhadxmX4KHwDo5vmxgMzMDBeqB0TDpem33zxj1o5XHv/fMVPpIf cAH082sANniUWKCM78uYtR/+zYFP92rTwEQoMbnCAK/IDnWcNCrpsWd+Coen8zkhNeEyT2 n30CWlJPZNYcGHJcEOC4cMPsgj9bgg6yIc5i7zAwWVY+YYBAkZzP8t2j1vhH8i652EBkyT lQTnuStxzRw2TXYZifKrqode8sKjITCJwCOAjmYxFmWJoSYaPbR2liHA0D4+qSnGeTxWUA DknjigcJa/UqugX5vg9hgIxpVkeHEH43v/Hi2cnTE/ncOzYkLQQt5as5w5aL2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770048875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fLNhvSLo74cv5gLeu4uUTbksfa5+P+Q8ounHUY8eeQY=; b=D8DtBd2o6mpYRS8Mt1thlC1j/XgR7QyFWG7oEbnzdlzitSRGWgPyh5q2p6EcWSRL3zs+Hu 3hG7GeN9PUxoHA8EJNnQlfRClEj6WQxh2kMViOsJO7ucdz1XSyRCDqM+KNmp6rzS2/sO+2 j3IE8OeXmHx99CA+inpawvgm7iQvLveFp/lgx9l+mxKm1L1Hs04fEYh8vERQhJoxYamE/i DnOuMWS30XAW1TzbNgrkfKSL2pAsOQQwLywCsBTUFIO7n9WnoFLC1nglMeRZKJ4xkUvEXH Vx9wblnO+eEFbpZiR55/AFL9ZROB3sfiOptLQ15Z/jz78EXkjEFE95YsZF4d2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4WsR1gy6zZSg for ; Mon, 02 Feb 2026 16:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 185a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:14:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: c479817f30b2 - main - diff: remove useless include as kevent is not used anymore List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c479817f30b2d2500c9663a1a07c74ba19321416 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:14:35 +0000 Message-Id: <6980cd6b.185a3.1aa3720d@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c479817f30b2d2500c9663a1a07c74ba19321416 commit c479817f30b2d2500c9663a1a07c74ba19321416 Author: Baptiste Daroussin AuthorDate: 2026-02-02 16:13:55 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-02 16:13:55 +0000 diff: remove useless include as kevent is not used anymore MFC After: 3 days --- usr.bin/diff/pr.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.bin/diff/pr.h b/usr.bin/diff/pr.h index 80f20ca7c329..b2ff7e5d6798 100644 --- a/usr.bin/diff/pr.h +++ b/usr.bin/diff/pr.h @@ -24,8 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - struct pr { int ostdout; int pidfd; From nobody Mon Feb 2 16:37:06 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XMR0zsPz6Qhx4 for ; Mon, 02 Feb 2026 16:37: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XMQ5JpVz3NJ6 for ; Mon, 02 Feb 2026 16:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770050226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aeZnbIV7JuITxmyZNHWKCHFXezv/euKj65gB1HCbtDo=; b=IusgtgmHTuYr9oGZLJAGunEzJMmasbofkox4T764tmPz6kNeFzx3rqcwDJDMr3KBWkXaCI +HtJ8eMxJf75qkbSnAYQ3ktJlwzrlij7pLq4C3cIJ8slyddgvB6UMH3B+LYonybPVdmhQ6 FjFE9R80pkstOKGHsT8M2NGGf0CiPrCdiVV4M7tR2aroG8Lgvt15HP9u6et1i31M77Ossz yz3hqdiknHv921YQd0OASk/RHeYJvIO2hhx/MvKpoWDSQIXtF3ei6s0eSgqvc7Za71fHn0 nmTFNqQI0K6K4iGU1ucrM9oHj217lqoe2LxroBFOtqnJytgmUg1CAR2op34dwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770050226; a=rsa-sha256; cv=none; b=a/uLTvf/ygFN7Oei/Nh0XLE8EzFjjP6A2Pu28YVOl6YIq8Uw8EDwyzM/tnfNkJ3M4Rz9Z4 Q1CJNFVFYol7/o15H5VIykan4cbQFhhEpyTChG4sWnQG5ch268O+CQ1VoMZQfkSeije14z O+k0cglDjJKh4FcIryCM5Qv9LpGSQ2yBKi/7YgYsfRNawI+PzR/tVQqcPjG4x6mjJMbd9g Wd65aQxgwYHgnvW8H+fXN+58xbwI1JtcZ7LL5uNtqENu4w1D0VlTXFSuMDn36ZMfEZPL2t hGNOYrLZrgXmqCduNOfnUc6WYudItK9Z06KGb9ECFVAjMZb+5i54oCLprePs6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770050226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aeZnbIV7JuITxmyZNHWKCHFXezv/euKj65gB1HCbtDo=; b=tf4Y5NIjxZn7bEO78U7Sr04wQcyK7Lr+v4Z0uTXWP+E/D+1GQdHviaodvnINUhGmJSmAHr zEzXPWf/zTngUVHCKRk7pOA778c2Kd7SiKL2q9HDet8qzeAU9e1sODDhxnWrT889NtJo/X oBk5ivqBfRWc5SLFSqSSdTK80grqH3wkAiXaec9EO+vWfVVIQxsMuXXZj5a++cGGzrZYIw wYDl0BiPPw9hn6b8ia5x+1LjVdI4gq1Rpy+S/xYc2uawunHje5x5EKTw1/oYv96OGxZiT7 8LzllTHbAg/QzdvV/EfKn7Tr+GSSYd8+jLYRdeeMM7A0nZuoEw2RzPJde8qBVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XMQ4drJzb7Q for ; Mon, 02 Feb 2026 16:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c290 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:37:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 404753664a5e - main - diff3: use pdwait instead of homemade one List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 404753664a5e145d98f1749d1c7bc046c8aa32c3 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:37:06 +0000 Message-Id: <6980d2b2.1c290.17bea253@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=404753664a5e145d98f1749d1c7bc046c8aa32c3 commit 404753664a5e145d98f1749d1c7bc046c8aa32c3 Author: Baptiste Daroussin AuthorDate: 2026-02-02 16:29:49 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-02 16:36:42 +0000 diff3: use pdwait instead of homemade one MFC After: 3 days --- usr.bin/diff3/diff3.c | 56 +++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 39523f6e6b38..d010a0b1d067 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -65,7 +65,6 @@ #include #include #include -#include #include #include @@ -921,11 +920,26 @@ increase(void) szchanges = newsz; } +static void +wait_and_check(int pd) +{ + int status; + + while (pdwait(pd, &status, WEXITED, NULL, NULL) == -1) { + if (errno != EINTR) + err(2, "pdwait"); + } + + if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) + errx(2, "diff exited abnormally"); + if (WIFSIGNALED(status)) + errx(2, "diff killed by signal %d", WTERMSIG(status)); +} int main(int argc, char **argv) { - int ch, nblabels, status, m, n, kq, nke, nleft, i; + int ch, nblabels, m, n; char *labels[] = { NULL, NULL, NULL }; const char *diffprog = DIFF_PATH; char *file1, *file2, *file3; @@ -934,7 +948,6 @@ main(int argc, char **argv) int fd13[2], fd23[2]; int pd13, pd23; cap_rights_t rights_ro; - struct kevent *e; nblabels = 0; eflag = EFLAG_NONE; @@ -1016,14 +1029,6 @@ main(int argc, char **argv) cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); - kq = kqueue(); - if (kq == -1) - err(2, "kqueue"); - - e = malloc(2 * sizeof(*e)); - if (e == NULL) - err(2, "malloc"); - /* TODO stdio */ file1 = argv[0]; file2 = argv[1]; @@ -1069,20 +1074,10 @@ main(int argc, char **argv) diffargv[diffargc] = file1; diffargv[diffargc + 1] = file3; diffargv[diffargc + 2] = NULL; - - nleft = 0; pd13 = diffexec(diffprog, diffargv, fd13); - EV_SET(e + nleft , pd13, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); - if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) - err(2, "kevent1"); - nleft++; diffargv[diffargc] = file2; pd23 = diffexec(diffprog, diffargv, fd23); - EV_SET(e + nleft , pd23, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); - if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) - err(2, "kevent2"); - nleft++; caph_cache_catpages(); if (caph_enter() < 0) @@ -1093,22 +1088,9 @@ main(int argc, char **argv) m = readin(fd13[0], &d13); n = readin(fd23[0], &d23); - /* waitpid cooked over pdforks */ - while (nleft > 0) { - nke = kevent(kq, NULL, 0, e, nleft, NULL); - if (nke == -1) - err(2, "kevent"); - for (i = 0; i < nke; i++) { - status = e[i].data; - if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) - errx(2, "diff exited abnormally"); - else if (WIFSIGNALED(status)) - errx(2, "diff killed by signal %d", - WTERMSIG(status)); - } - nleft -= nke; - } - free(e); + wait_and_check(pd13); + wait_and_check(pd23); + merge(m, n); return (EXIT_SUCCESS); From nobody Mon Feb 2 16:41:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XSZ3MlMz6QjB0 for ; Mon, 02 Feb 2026 16:41: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XSZ0YyJz3PXp for ; Mon, 02 Feb 2026 16:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770050494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H9lXDCb0SoD4rWycoWKoSYFS1zsQc1Qw/jnZ5CWrZlY=; b=VwIzPaVOzKlufS54SnU74/EGMs0aB1G9RY1JisEMC+1RHhzyijtxw08OR4cm03PrdQwVze qNdEyfgxAUbJIX7AqkuuB7UmjBAIcCntnkk/RgEnlr9U166CFPA5EqSLprzg3mu+zR7JSG 6CEGf028MgHfq/8nbX6Lz/SHKxC2ThxuQ2fOAGXsJJQ5w0gsnklnH4K/o3tjnYpSPI4Hup lRtBmS35zh6eQNVg0IBRg8HXHwc5cJWdsVm66xu3AX3Q4Yubup/g/rHOeJgv1O3h5BpoQ/ Z0jIE8zsJZyzAgEOy1kK97fhm7B9empfl/Gi5YL+qquqEcUQhG3a/1md3Wszbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770050494; a=rsa-sha256; cv=none; b=mW6ArbVJPezbTdA33QAWYhxz0IE8bZ4qlu4YAya6ChrRmU/boN5uyIHua2Szdl8AuBxJJ2 Dcum3d5JWAtN/22H+3t60aYOsAiugTNT4zQcJJYZ27aFjZzKjVem3aEjMaG+mIFx1S7wET DlxhIe4JxnsG/aAR+fgXmlTwC37pixOAl3mUX1lFnpgOHrECbO+lqIrzN53ZWsE4nKrMQm pvunZIX7Na8ouk5irjXpMzkdl3MTgYVhmWyAmmabb4npqucMYQi43dmK3TjsMwvbTmLIxJ 1X3ZLQ9FpDK0wu7tlH2XOahXkePxc0FO/6qw71/SWsKcPA2aZRO/hTcG8FTJOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770050494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H9lXDCb0SoD4rWycoWKoSYFS1zsQc1Qw/jnZ5CWrZlY=; b=JmLKkAGDr1/7Wmv2MBHJgYkiqMUZMSDFTiABLyQ5Kq0A9ZBf5ye+4sV9ejgbMgFDYyXcmE JzodqJENFCOFOVew2Q38R4BvZMFFC5Z1OQ/LrNeSHWhj6l5oBOy3/OP/IZz/DOrnJZlNRN itIHeXkVeHwQWFRlw6gK1K6F59Q+8QuWdAxL2UakMrtOGGJoP8Bwi6lrIEGMVChmrHGWft LDnxeF5kQaawquT6SffDkl5fPmnR3qR2BBkBoIWR4n+9DkWgIzOu6fn6nJEHOxMQrLpypM oIiI8U/D/9cTuuDzAr26tVFfSz+80aTa2eVD2+lSgHyY8DuRpGN2Wx4Y/4C0AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XSZ05HNzb7g for ; Mon, 02 Feb 2026 16:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 197eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:41:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 1c00d5a3b234 - main - libc: Fix missing include List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c00d5a3b234ef937d848956027e9de5ea8010f9 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:41:29 +0000 Message-Id: <6980d3b9.197eb.2e5be698@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1c00d5a3b234ef937d848956027e9de5ea8010f9 commit 1c00d5a3b234ef937d848956027e9de5ea8010f9 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-02 16:26:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-02 16:41:18 +0000 libc: Fix missing include Although not needed on FreeBSD due to namespace pollution, we should technically #include to secure a definition of NULL. Fixes: 5074d5c9845e ("libc: Improve POSIX conformance of dirfd()") --- lib/libc/gen/dirfd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/gen/dirfd.c b/lib/libc/gen/dirfd.c index fbbf703b5a2e..984e69b9ae9a 100644 --- a/lib/libc/gen/dirfd.c +++ b/lib/libc/gen/dirfd.c @@ -29,6 +29,7 @@ #include "namespace.h" #include #include +#include #include "un-namespace.h" #include "gen-private.h" From nobody Mon Feb 2 16:47:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4Xbt5Kdsz6QjZp for ; Mon, 02 Feb 2026 16:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4Xbt2T7Mz3QrY for ; Mon, 02 Feb 2026 16:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770050874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFqCfxOIaHSLwTeP91k5LNYSmZxZ/znzqw3xDvsyoqM=; b=I/iFeOVmE0VeidwRYL2MAP6zbiaLNIIjQJlYqyhk/FWMt1KzNIgjRUqJlCl6l4guJE55N+ gHl+kKPnwd8lJp1OM/z8uUSiZSUQWau75UwA5Y/FepjV7AtpbhHVkkcVLPCyxgixTFc8Bk TIYJmFFDcOhD8FjiUe8WLyvjozqsQFMeI/9GajF9nDcS/xvJO5d1PcXhxmh1pApkVuVJI3 yTjz/tJLBAPiu9NRvUIrgUGm6201v5Ky0Boh6zL8d07K0HLEoqDG+/8gmbM1gM45eR3SqL rwHcKfYxO1AyvxMTGOsGLupDmMphDH86c/jwS6QLvcQFzfkOUyI6fpKn2np/zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770050874; a=rsa-sha256; cv=none; b=jXpSHKkGdbLm/4v8Iz39vXDfw0A1lyLYOEXSBtqUvSRXgKpWTH7DECOfnG2TAbnkWTT272 iSXZ0+UMpHoFA5wj1hfKkbkTmwP2jucP+5ak0JfB9q64WOXkuFaJxZP+iJEF4C2n204De4 /lS8rP4BIUCXiKZ2GczG1T9DPKbRk7W8xce2WKgVxYQsPhRqoDlemXWhd7ZcOSBLI3YOX2 NBXpfZPDF8ELoBpewYQEoGThiv1oVAjyRAVgC6rLSOuduPSDDWJ3TrPcFvO5sFCe+KiFIX SXMaThrL7hJ3qTrMl2BoGPeUIf5gy4Amdt5rteBy3ZNr6+cV7jOjYRj4kPegcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770050874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFqCfxOIaHSLwTeP91k5LNYSmZxZ/znzqw3xDvsyoqM=; b=a98/pgOEOlQ8lSGZd4UDguAK6egmwxqjLf0z1wU9XxXgsPYxlC/pjF0B+z/oDAUA1HZAEl xGJX3vjD05aqN3Lp0F0qSgGn5qI4UsDpeHF3gHLFUYmlUXqVJCyr8fmrVKhB7jfsD0JYVJ BhCKWZf3MCLdnOhLE1+3T87gQ/KYaWr1jnBNZNhlzsHAzjlNbPcOjSPl8xE/9C+BimnrX6 /iOKa2RumTx99DZuxFadkuuuSOWBeZ9TBmdaUcNRDM/26SPep9KdaigDG+3QF+YQqrjR3G snwBdoFBlMm+e9mYQk834/8AkOjRNxJfieTQyPlysBWyRNw94u1BI0tu87qOeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4Xbt1CrWzZXS for ; Mon, 02 Feb 2026 16:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bdad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:47:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: d0309745e621 - main - ObsoleteFiles.mk: Remove obsolete MIT KRB5 plugins List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0309745e621dd0554f271f4b7e2bc5e8ff597e4 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:47:54 +0000 Message-Id: <6980d53a.1bdad.7beefaf0@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d0309745e621dd0554f271f4b7e2bc5e8ff597e4 commit d0309745e621dd0554f271f4b7e2bc5e8ff597e4 Author: Cy Schubert AuthorDate: 2026-01-19 15:51:47 +0000 Commit: Cy Schubert CommitDate: 2026-02-02 16:47:21 +0000 ObsoleteFiles.mk: Remove obsolete MIT KRB5 plugins Fixes: 1f9da4793cb1, dd0ec030f8fd MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54780 --- ObsoleteFiles.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 5231cbb3fe13..1bd4339f5cc2 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,15 @@ # xargs -n1 | sort | uniq -d; # done + +# 20260120: remove obsolete MIT KRB5 plugin files +OLD_LIBS+=usr/lib/krb5/plugins/kdb/db2.so.121 +OLD_LIBS+=usr/lib/krb5/plugins/preauth/otp.so.121 +OLD_LIBS+=usr/lib/krb5/plugins/preauth/pkinit.so.121 +OLD_LIBS+=usr/lib/krb5/plugins/preauth/spake.so.121 +OLD_LIBS+=usr/lib/krb5/plugins/preauth/test.so.121 +OLD_LIBS+=usr/lib/krb5/plugins/tls/k5tls.so.121 + # 20260120: Made libkrb5profile INTERNALLIB OLD_LIBS+=usr/lib/libkrb5profile.so.122 OLD_FILES+=usr/lib/libkrb5profile.so From nobody Mon Feb 2 16:55:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmM57vjz6Qjyk for ; Mon, 02 Feb 2026 16:55: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XmM3f8mz3STr for ; Mon, 02 Feb 2026 16:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qpIpHEKND5iRPf85zM7C8PvZ7WC3A4tVKLbQDFsuw/4=; b=lq1imVSBJ0obDZeTuRVJf8MR85Pugd0pOIVI2UL8MltNHNdgDgIGu3Us7RofoGUPrlTBUc 0lTcTFurRpNr4M/mROKcR65HeOIh6e8T8DUYMUOb9iSxRELhc8RPSq1fjaknKCWftKheUd JRy0RyuvYDmkmNZ6IrluW9ZGexLW5HxJRBRyahBBbVWY+x09J9MQxzAqqLpfr2C936/9P9 /xaiWCL8LVzsA8G15T2MLgxBWKXEWQkUuZfe7P/zyJ8L+cbjD54UVCoYZtHyFYOmuzWwut BVL+s7qyiiqdJr04alJ59YRKaRupgZ/Q5h778nkH88k5lDzloQVbd1rNriLTWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770051315; a=rsa-sha256; cv=none; b=ePF0kMe/klrWoCPi20U9X5OCC57NS5fyhzr4w2z5bQ5cQ4CfUijFNODmrxMvfqrzI89wSh p4OdGpoLQ/pEjzmzTHfDtK2fLM+I+xArx4OADvgLj5ndsk+Als057da6ezTTaq44sSbKHZ 1Aa+JCjh6O2m1DDmrjvuPvkvZ10uEGJyvqwUDJJ6CEsFSN9cirhqGop4eb0sx6H33LBaAm HX4eTpAWMuqjqXHPVGnF+o2Bg51fz0RoEg3cvS5XBac+NX+uEXoFW/j11kTNgJe2/OMMi+ WZuNm4HAT3WowWcV+1wMa3MB6O1fC+r9OFfmPjLlXEdcCO8jD9cEzm7THKRpfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qpIpHEKND5iRPf85zM7C8PvZ7WC3A4tVKLbQDFsuw/4=; b=aTWXsGphtOOEsANzJvzFVQ0uqITvVaNfqIXbK0BsGpyzo90cDJJ6am6Yy4l5ij0CTSlY9P bBaPFdRyJ4IVdCDSw/3dm3PjQtip0/anUJBiAu+lwh4SyCs0yYFki9CajiE8J64S8/0d3j Ll7DAUb0pQ/r4nA6l20tdK5doq+pZlzxZECdEvJuq9IAj8nA28JlCCBVfa3fk29Bspxbl4 z+XKp0u4DxyGSzCaOZNuzZlIG+mnQ0rVNIU0cmZ1qHVqftfdAtk8NYC/VPjPtzUcfqDGIj fPJBAAmi1FFasXRG10mXbUd5bOff1WBSRjoluwDscBZ0/UPIaW28zhfHLtoxRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmM3Fjfzb8m for ; Mon, 02 Feb 2026 16:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cc42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:55:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 07940d1d85eb - main - atf_python: Run vnet handlers in $HOME List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07940d1d85eb338853fcba0697c6b9a96412a7f2 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:55:15 +0000 Message-Id: <6980d6f3.1cc42.1678c52d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=07940d1d85eb338853fcba0697c6b9a96412a7f2 commit 07940d1d85eb338853fcba0697c6b9a96412a7f2 Author: Mark Johnston AuthorDate: 2026-02-02 14:52:43 +0000 Commit: Mark Johnston CommitDate: 2026-02-02 16:54:54 +0000 atf_python: Run vnet handlers in $HOME When kyua runs a test, it creates a temp directory and sets $HOME to point to it. Tests are run with the cwd set to that temp directory. When a process attaches to a jail, its cwd is set to the root of the jail. Modify atf_python to cd to $HOME instead, so that it's easier for tests to share files. Reviewed by: zlei, ngie MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54971 --- tests/atf_python/sys/net/vnet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py index 93bfa4437940..a6e620b49d59 100644 --- a/tests/atf_python/sys/net/vnet.py +++ b/tests/atf_python/sys/net/vnet.py @@ -357,6 +357,7 @@ class VnetTestTemplate(BaseTest): vnetX_handler() after setting up interface addresses """ vnet.attach() + os.chdir(os.getenv("HOME")) print("# setup_vnet({})".format(vnet.name)) if pipe is not None: vnet.set_pipe(pipe) From nobody Mon Feb 2 16:55:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmN5j6gz6Qk6p for ; Mon, 02 Feb 2026 16:55: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XmN4cwpz3SP3 for ; Mon, 02 Feb 2026 16:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jh4WfV7ZqRvMuvaLTj0RmaH7+ZPl6l4nVHgWgN8HBWQ=; b=IhkBRBq+XLbe42AN9Qk+CvzeGaKmKjSTGaMZ8f/738MhBYmI8AfkGjheCbOxxNa2cOUJFl q0p7LeSPTeP62mT+1+1+0nBu7+2wsfB/DyOwLtiDn37PqA2CZht0i4X9jkuGhcRLfDNON3 clXOFrCC7GMcf+cJsj3JyS3/OXZoH4evM04Pu5AQjUJSzhu0Guj5fXTqLVgPjWfMTXA2LS SFNIM1Jxc1LMwEtwKgKrjo4FdoWHgwH7I7caLMBtYWbvIAkjj9+LWjQLLPhlbsMEXgnbYL anILUJOpEWm2rrxKixB+93I0NsolrZmKH3Pd1XgqlgaOcL+LzY3ATplUGd+U7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770051316; a=rsa-sha256; cv=none; b=C95j+36ggSf/TN94m3EhslnL94pCUl6s5+Q5pUXsJLPeiF8I7604d4r9dwfxLPBJswXclJ qMmclnFaO01YeyGPgechoLQ/peCk5CbojBjZilNoq6MTfItatbDUzAeVCfKKFyoqpQkGU5 dnKinobFB4jReIV/ktUiO/eOBbfs7IK4UIXrKh5cI8zxIJyCgzHuALSh/o6Gtf4hVTVaZS JYlvhoSrmvTrnsYve2fqz/JlX5oxkeQZTNDFb2JeOoS1XO5l6Z8t9Ro0OpCsW09Tuy3Fqk ksPbGDddxC0e6T4S7VsyuDyDapgBQ/PWQqHUFm90V/ij0pELD4uxLwhfZ3xdXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jh4WfV7ZqRvMuvaLTj0RmaH7+ZPl6l4nVHgWgN8HBWQ=; b=SQFryS1MddCcMBTuN1/7N37o8QDfh8RWlzJYmZ/+11bTPuF+ok1gSZYb6Am5qLgTy8a2Xo 6q59wsq+/GtAiNUX1mBo2pTWEgHL8I2VyTaqhbGB+iiZKSW+fDm260HtkQcgoV0FUQnHXt mdj4apkxBqH3sZ0Rpbvy1mMJUonyVaj1BHhnzsxdvqIhKpx/YEYVQ/VZZy6oUhOr1Qrbn2 uhVJQiarYWUIT11PAGk3c6DliNjmZd32UbcMDhvJy6bbFTwlr3+L0Rw2mymS1agTRpqy+r wJbMEoYzqHwQ29ynPK4yV4ZH3L6dqzWHqHvSHV5Kv483EIXt/jAulX3t2VmSCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmN479WzZvb for ; Mon, 02 Feb 2026 16:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e961 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:55:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 74839871be36 - main - ip_mroute: Make privilege checking more consistent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74839871be363c5c2ac7ccd3396f36bdb58d19de Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:55:16 +0000 Message-Id: <6980d6f4.1e961.4995e633@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74839871be363c5c2ac7ccd3396f36bdb58d19de commit 74839871be363c5c2ac7ccd3396f36bdb58d19de Author: Mark Johnston AuthorDate: 2026-02-02 14:53:35 +0000 Commit: Mark Johnston CommitDate: 2026-02-02 16:54:54 +0000 ip_mroute: Make privilege checking more consistent - The v6 socket option and ioctl handlers had no privilege checks at all. The socket options, I believe, can only be reached via a raw socket, but a jailed root user with a raw socket shouldn't be able to configure multicast routing in a non-VNET jail. The ioctls can only be used to fetch stats. - Delete a bogus comment in X_mrt_ioctl(), one can issue multicast routing ioctls against any socket. Note that the call path is soo_ioctl()->rtioctl_fib()->mrt_ioctl(). I think all of the mroute privilege checks should be done within the ip(6)_mroute code, but let's first make the v4 and v6 modules consistent. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54982 --- sys/netinet/ip_mroute.c | 5 ----- sys/netinet6/ip6_mroute.c | 15 +++++++++------ sys/netinet6/raw_ip6.c | 6 ++++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index ca32f381ff51..196ae5292909 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -546,11 +546,6 @@ X_mrt_ioctl(u_long cmd, caddr_t data, int fibnum __unused) { int error; - /* - * Currently the only function calling this ioctl routine is rtioctl_fib(). - * Typically, only root can create the raw socket in order to execute - * this ioctl method, however the request might be coming from a prison - */ error = priv_check(curthread, PRIV_NETINET_MROUTE); if (error) return (error); diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 5a60a3ed368f..6ca17774784b 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -89,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -458,24 +459,26 @@ X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt) static int X_mrt6_ioctl(u_long cmd, caddr_t data) { - int ret; - - ret = EINVAL; + int error; + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error) + return (error); + error = EINVAL; switch (cmd) { case SIOCGETSGCNT_IN6: - ret = get_sg_cnt((struct sioc_sg_req6 *)data); + error = get_sg_cnt((struct sioc_sg_req6 *)data); break; case SIOCGETMIFCNT_IN6: - ret = get_mif6_cnt((struct sioc_mif_req6 *)data); + error = get_mif6_cnt((struct sioc_mif_req6 *)data); break; default: break; } - return (ret); + return (error); } /* diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index c90a1213bd66..7deb605c07a2 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -604,6 +604,9 @@ rip6_ctloutput(struct socket *so, struct sockopt *sopt) case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error != 0) + return (error); if (inp->inp_ip_p != IPPROTO_ICMPV6) return (EOPNOTSUPP); error = ip6_mrouter_get ? ip6_mrouter_get(so, sopt) : @@ -627,6 +630,9 @@ rip6_ctloutput(struct socket *so, struct sockopt *sopt) case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: + error = priv_check(curthread, PRIV_NETINET_MROUTE); + if (error != 0) + return (error); if (inp->inp_ip_p != IPPROTO_ICMPV6) return (EOPNOTSUPP); error = ip6_mrouter_set ? ip6_mrouter_set(so, sopt) : From nobody Mon Feb 2 16:55:17 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmQ0wv6z6QjvV for ; Mon, 02 Feb 2026 16:55: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XmP5DRSz3Rtf for ; Mon, 02 Feb 2026 16:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=go7lxuUbzwhf9DAEIiP8emVKdyPmUA5cEPRYTe8CaSQ=; b=LOH+TlO9KjKD5PzxPMCYP9wjT1+AthcRW846NGcMmIt+kcvODhCTxb3ZDF5HAIL9ArHQkB UtxQVHfJzcZcT//kb3yQKQL+T3qhWaE5KFa6Tv2mi1UVBFS0S2n33TdsDdnUqH/6/IXKeo ZvxRNxwDBp7YNwgQ806U8iM9mwrWLHZ66xYZ+3duYp1wtbpquhOV9cBawfNlQNpC+u8hpM cWjiPR0FICWn9lE/ODtEa9qY2Ep01m4nb892X9jRmYydV/4bbKV2C6++/DOJPVG5zXABrW wpgj7gg/hSPcOioRubZwRyIvq3papHd5zS1JRldieuOGfwhDVVfsJBzqPyPRIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770051317; a=rsa-sha256; cv=none; b=OhJJNiizsBbLAlFiidXDN11t1YVTLaBkfuBte5/y8GoQNPLLUdnLRe812bOvpS+Ze0fUTg VbXAhrG+WAQt5NZF9i3dMqTMJ7X/GEU8cxgFAl9pIRMmu0h77j5mGcgIWvfTo7pJojzPDV i62o2oghnHHXqxQb+nGOQGjxeAHWiL/rTTFBg64eAB+fzSu23Oq1KNOZhbzdkP+V6Is981 GK5i6TsvEQNIjiDy0ZGkKqxG8sXIwegye7JARBiCKRMRN5xuTTF8LDUGxw+TOQXJxPt5I0 JgaR7O/QF8Cm4dKVAUlGeDjGxFvp+u7JYt+oaT1DP4DotCV1EOLyLcTHSvM66g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=go7lxuUbzwhf9DAEIiP8emVKdyPmUA5cEPRYTe8CaSQ=; b=V08FD2h41gfT3EwXe2jXz7VtGEjYTL6+xCUHg+ABhrh3a+oxnelJuKHJmOcRjthusujZhF iS3Jrh8v++lqyb+phmPnNxC14IdMiCnaf8ekwuHJn5y6DzH74wvwQvWe1MnA25xskT/+TH nPZah0k4cEOU5R+Px40snDukKdaLcsKqL+gvNyCgOPfgugQCLAMT92p9BV7+R4LvNHmFuT leb2+FsiS839MLPCkczJVUTPUJ9sZnDM3svdgLvEA6L/uX4kTsDZM/t8ybB6FEbBt5JFnb 3PbzUpg67FOFBkwnXlqKWLLFPIFQHkfIHUeBdiiyskZTfmou6aqQp8I6XekY1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmP4b95zbgs for ; Mon, 02 Feb 2026 16:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bbe1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:55:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b370fcc716b9 - main - ip6_mroute: Make MF6CFIND a regular function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b370fcc716b9cfd4d08e291f0009f02452c84d64 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:55:17 +0000 Message-Id: <6980d6f5.1bbe1.5f30729c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b370fcc716b9cfd4d08e291f0009f02452c84d64 commit b370fcc716b9cfd4d08e291f0009f02452c84d64 Author: Mark Johnston AuthorDate: 2026-02-02 14:57:20 +0000 Commit: Mark Johnston CommitDate: 2026-02-02 16:54:54 +0000 ip6_mroute: Make MF6CFIND a regular function This is more natural and corresponds more closely to the v4 multicast routing code. No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54983 --- sys/netinet6/ip6_mroute.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 6ca17774784b..705aba0bfa94 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -296,26 +296,6 @@ VNET_DEFINE_STATIC(int, pim6); (g).s6_addr32[0] ^ (g).s6_addr32[1] ^ \ (g).s6_addr32[2] ^ (g).s6_addr32[3]) -/* - * Find a route for a given origin IPv6 address and Multicast group address. - */ -#define MF6CFIND(o, g, rt) do { \ - struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \ - rt = NULL; \ - while (_rt) { \ - if (IN6_ARE_ADDR_EQUAL(&_rt->mf6c_origin.sin6_addr, &(o)) && \ - IN6_ARE_ADDR_EQUAL(&_rt->mf6c_mcastgrp.sin6_addr, &(g)) && \ - (_rt->mf6c_stall == NULL)) { \ - rt = _rt; \ - break; \ - } \ - _rt = _rt->mf6c_next; \ - } \ - if (rt == NULL) { \ - MRT6STAT_INC(mrt6s_mfc_misses); \ - } \ -} while (/*CONSTCOND*/ 0) - /* * Macros to compute elapsed time efficiently * Borrowed from Van Jacobson's scheduling code @@ -366,6 +346,22 @@ static int X_ip6_mrouter_set(struct socket *, struct sockopt *); static int X_ip6_mrouter_get(struct socket *, struct sockopt *); static int X_mrt6_ioctl(u_long, caddr_t); +static struct mf6c * +mf6c_find(const struct in6_addr *origin, const struct in6_addr *group) +{ + MFC6_LOCK_ASSERT(); + + for (struct mf6c *rt = mf6ctable[MF6CHASH(*origin, *group)]; rt != NULL; + rt = rt->mf6c_next) { + if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr, origin) && + IN6_ARE_ADDR_EQUAL(&rt->mf6c_mcastgrp.sin6_addr, group) && + rt->mf6c_stall == NULL) + return (rt); + } + MRT6STAT_INC(mrt6s_mfc_misses); + return (NULL); +} + /* * Handle MRT setsockopt commands to modify the multicast routing tables. */ @@ -494,7 +490,7 @@ get_sg_cnt(struct sioc_sg_req6 *req) MFC6_LOCK(); - MF6CFIND(req->src.sin6_addr, req->grp.sin6_addr, rt); + rt = mf6c_find(&req->src.sin6_addr, &req->grp.sin6_addr); if (rt == NULL) { ret = ESRCH; } else { @@ -817,9 +813,8 @@ add_m6fc(struct mf6cctl *mfccp) MFC6_LOCK(); - MF6CFIND(mfccp->mf6cc_origin.sin6_addr, - mfccp->mf6cc_mcastgrp.sin6_addr, rt); - + rt = mf6c_find(&mfccp->mf6cc_origin.sin6_addr, + &mfccp->mf6cc_mcastgrp.sin6_addr); /* If an entry already exists, just update the fields */ if (rt) { MRT6_DLOG(DEBUG_MFC, "no upcall o %s g %s p %x", @@ -1114,7 +1109,7 @@ X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) /* * Determine forwarding mifs from the forwarding cache table */ - MF6CFIND(ip6->ip6_src, ip6->ip6_dst, rt); + rt = mf6c_find(&ip6->ip6_src, &ip6->ip6_dst); MRT6STAT_INC(mrt6s_mfc_lookups); /* Entry exists, so forward if necessary */ From nobody Mon Feb 2 16:55:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmR3V3Pz6Qjc5 for ; Mon, 02 Feb 2026 16:55: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XmR0smkz3SV4 for ; Mon, 02 Feb 2026 16:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tjiFEvf9eVNy8Mk0Zu7E57D0UqUja3mn1ivd7hi8Ri8=; b=ZzOuS7JF7IOUo1DKlsjWB5GTFUuWJsuJ2y+zEq3AtvONPOiVoe6r0yinNXjQYh55KjBfyl v3c4vLADKpF4xWJZ8Z7GB0X4P/Vg28B5VBYEr7OKt3ljhtEPQ3E+IU2R3jDXJNmQU+26Ri pSibUZgdTtTbTXAV0kn9rnE5yS/z7CtcVOaTZdtEaGI1XCiYHratcj1zjs/OKY1uzRErt/ vnyvTBNyelq8LsF1DajBA/uPEfy6xSyVxsPXPgs+xR06gWtobVz2s/cXNolpJlI3Z9X7wk bStQ3YrmzPHcMHNMvZ5DHbXijf9c4W7C8rdRyUZgvpqEi4RMDtGQpAoeR1J1XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770051319; a=rsa-sha256; cv=none; b=MHtRFCOU+ve1TtQ0aUg2/8SG+QJDfVcjKT1xztdVI9IPc0TTlD/JXE5m70RyZzGYQpdf9b pbkEwtqBKn/dcnWpUv4ruG640irKGqcJLdStpPk7XN9AT3rhaKCsrDYKNqu6KORS1DwJt7 V5D6UizJ1BO1uFtgv3HAgQrkijvflle2XUXVBd1oKL9KLzwFSAVtEC565L5YExigUebX83 M8FdP/Rw5WsVfPcTc6pCydlce4EHNdKEcpS/lr1fnMJ33Madn1pggu2VjlKioUub02Uqlr 6poyRo62U0Y3sGQMdLZSujJb+8kK0wHr2T26m1m/4FpAUGffKItm8VeUsrAXJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tjiFEvf9eVNy8Mk0Zu7E57D0UqUja3mn1ivd7hi8Ri8=; b=jKXiqwQ+ajryMnzPiSdMsTOLSb2gBq9AgVh++Ipb4L+iwWi/yqnot2nKufBdBkTg1LbcGo OcVCIuiMqGvhc3YRzbhEhDeVnpyvRyuEehBssaMo5N86lnrxW5ghyjhJwHHxrVMDwR4tQQ A/hQfyojxCYkNosCgdyQb4FVdbokA95a69wptSgxAb4CnF71mLXoJP5FGCzgR+DuCRfdEk CUiw6W7n+tUiKV3P8TIW/h3cZLlbOnFj9SzP8lkeKNA0hXrlcQqdBavfczMx+TU6WO/lzb XniCve0zH0BpPqnmHL5VxrxxVzIKPovi7kjidQ6H0qcxKAXmF/ES/+sVF37t3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmQ5KW7zbRM for ; Mon, 02 Feb 2026 16:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 197f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:55:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5bb953b09546 - main - ip6_mroute: Fix the UPCALL_TIMING build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bb953b095461b488b102ab3025f42cd2ef61f9d Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:55:18 +0000 Message-Id: <6980d6f6.197f0.49c3b5f6@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5bb953b095461b488b102ab3025f42cd2ef61f9d commit 5bb953b095461b488b102ab3025f42cd2ef61f9d Author: Mark Johnston AuthorDate: 2026-02-02 14:57:49 +0000 Commit: Mark Johnston CommitDate: 2026-02-02 16:54:54 +0000 ip6_mroute: Fix the UPCALL_TIMING build MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. --- sys/netinet6/ip6_mroute.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 705aba0bfa94..9e15b71814bd 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -326,7 +326,7 @@ VNET_DEFINE_STATIC(int, pim6); #ifdef UPCALL_TIMING #define UPCALL_MAX 50 static u_long upcall_data[UPCALL_MAX + 1]; -static void collate(); +static void collate(struct timeval *); #endif /* UPCALL_TIMING */ static int ip6_mrouter_init(struct socket *, int, int); From nobody Mon Feb 2 16:55:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmS1mclz6Qjc6 for ; Mon, 02 Feb 2026 16:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XmR6987z3SMq for ; Mon, 02 Feb 2026 16:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h7NK44tEWIeUutYGdJJnfDWq9jEc7e29JNaXk74I5/w=; b=pP0WBAN0z6lMfba8ErZUxPMq/8GVz5Os8bygdY/60IT8pSZJ33IB+eVT4aYKk6NVPYN3Xw xgU7qIiTqOpvKcFUyTeEINEWEW/2iX/MRxuAmqgIm2HZ1ILWwrlr5+xdFMuQ69i2Lv2fnI +eNVxvQKcMFvfHGR2a3o51/hydXPF0tw6qZ/NpFh27UNFMq1hfN/U7EfbmOr2A74vtP/py rhhaRl/pdEcO9/DAEF6mV+3S/uSyDcnUDxudsabEmwqscKQF+mPXz71wn70TMmWQybvuPS veKNwBo0nZiFPJfMHUbhd2ck9jLJrFUTLN3TrhvghHhmOCV8/jJC0PDVcA2hig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770051319; a=rsa-sha256; cv=none; b=rH1sTsCdJC7pGLD/DpX97noTCP9vCvc61wiSw4MdyL7NuxwiyWhP0+eFAD9C1m+evl7jWE bJB7QSYDzSDVY0/0hZUQZfUOluzTStWqjbeU+hiw+Fb59BiI9Xdr1fA+tQ9Ca3EK6uiMS8 6uqwbj6mHeYkli/bk6VAORyPaISgOqwJZTPufWTbcLRatwR8q+tlaNFPAkDEI54EP9DBka 64GJM5lkIR2URZy+r8NrnFUMxMEz3PWhNeiMNrN+1B2ytmoTRshqsSlfRNYpGYxTpHM9fh GyXKNxpkJmUJLYm1AGpsIu8c2vQO2oM5LXDP01lYkl3texIEjLsXuPY8kTvc0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h7NK44tEWIeUutYGdJJnfDWq9jEc7e29JNaXk74I5/w=; b=Y4QZ3bC2b5bed/qpE1swG2r6rEChP/8MZmjbtvBHfidKncPCZCdzQtELxtsFWo3iJrsjui L18rKd0lEhc8QTlrhNSkeZJJEs9zvrxhK9gpiKoGNVB/cE82BtwsMJQBdNM6foCEXrPbxE unL50HBYRVT97ifOfo+6wSDsO5FDvrdSTpo6fjFFW/Z12YfiKrMNP5R/rs59SC2+O0FppF NgCXxKk+rFIrUdMLIF94r6gbvDetxu3atf1xgn7fBCr7YWYwtRO9D5/+cundqQMkRHV2Te 7HQ9nvzg22X/WSJ5G2EJap89z0pVmc/HaNDU+fbN+0KNgjYLSqCvqbIeaRthZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmR5ZWMzbck for ; Mon, 02 Feb 2026 16:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e984 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:55:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b320e89e6909 - main - ip6_mroute: Remove an unused constant List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b320e89e6909c0c3f29542976df0381990866988 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:55:19 +0000 Message-Id: <6980d6f7.1e984.67482e0f@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b320e89e6909c0c3f29542976df0381990866988 commit b320e89e6909c0c3f29542976df0381990866988 Author: Mark Johnston AuthorDate: 2026-02-02 14:58:38 +0000 Commit: Mark Johnston CommitDate: 2026-02-02 16:54:54 +0000 ip6_mroute: Remove an unused constant No functional change intended. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. --- sys/netinet6/ip6_mroute.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 9e15b71814bd..d64c2f641e24 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -271,8 +271,6 @@ static void expire_upcalls(void *); */ static struct ifnet *multicast_register_if6; -#define ENCAP_HOPS 64 - /* * Private variables. */ From nobody Mon Feb 2 16:55:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmT1mq2z6Qk9V for ; Mon, 02 Feb 2026 16:55: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XmS6ZNgz3SZx for ; Mon, 02 Feb 2026 16:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JfcghS9qiWBS73MvfUHWazqOvk8/kuu33l00v5CR3Xs=; b=Vg2ggFfyWJ8YzZa2Ttsl/mIKqJHV9NlYgWPRiD3+v0BvZsNHGyuffIz1RQ2Yu5Dk31McU7 K9RCM8GnzgyXuJvOZqw6GUFKrRzafZ0KaHKOUDMxpEjlL83jw+zQHw2v6zotiD867bS+ik DtFOZDl1hVQyF5UOZ7KmTOZFg82hzBLE4tWOcHG+/x2ELn+qijNaB6MjmRM8rhpxUq0L8p G3Pz1BOElhn2CVy9DP8DQSY9VIIXMZWZBg21vpP34x4GW0jxHw7Y6PNt8Eap9VzhmEbkmJ GWeQO2vPva0ZdkGNKXYTgra78YQc6qLS0iYD93kyUogHEMoCn4rSFg0+n9LXyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770051320; a=rsa-sha256; cv=none; b=eEvkIz1f9B5qxyzruSk/mndyXrq+ne0lFy2hBQa8384WcJU/xZr9D6v2YP9Zxg67WCqFvW TSLuZ93sV+VgyhhvNVvQgrPYxER4iDdH/GmunCy9LxNaeSr1SkZZgQQSAguK2VLic+NBa/ s/IG3ViYdxVXk6ETMxaeicZEf9LwF4bV6tD0FGo6LTndhttkHdKKNik8v/Z9/vyGV8A1iG WpMD5E+mu8WQwXI3XkKSLTxZz6kiE1ARCNv3n2VVsovA7JsVtLV2ny5W/gUrlwZykkPWQU Ujm0yvMXFd4h0NsLrsxgBcJ/AAgmD4+Hh9PWH7YXndXKdGvyAlp1DV2fQRp/JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JfcghS9qiWBS73MvfUHWazqOvk8/kuu33l00v5CR3Xs=; b=Yjjti022gHTpT/sBRNjN5NVMJKlER4sTolXmi9FApihRwquy09LXfaUJ9TNUZJuuFuUaby kj2avWKeJwf1uYgy6Me+aGlqnqpKA98NJiyMDSr3tjulgNf74LmhSUS5sQg3SdXrfD8UzL efJN+wspqhmpITUxEVMqQRkHRzB27J8hZBpaNpwXNvoZAiTBLBIDdVdqsY+cItqTG2JqKb 0fWsMWcOGZBCl4DS7KY2ZSbXNJ1ZVC85COsiTlTSR1oOiwJu/sA+CaiqkdFRIKDpV2Vldf PLGQ54XsdpTVJjB9C3M8osD5RnL7BcdUGTnRGGXLqCoP8EQxjuFr5yanhGz41g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmS686vzbcm for ; Mon, 02 Feb 2026 16:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e988 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:55:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a45fb94801df - main - ip6_mroute: Remove an unhelpful comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a45fb94801dffd414bdb1981def0e977ef0c774f Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:55:20 +0000 Message-Id: <6980d6f8.1e988.6c48626a@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a45fb94801dffd414bdb1981def0e977ef0c774f commit a45fb94801dffd414bdb1981def0e977ef0c774f Author: Mark Johnston AuthorDate: 2026-02-02 14:59:20 +0000 Commit: Mark Johnston CommitDate: 2026-02-02 16:54:54 +0000 ip6_mroute: Remove an unhelpful comment ifnets already track if_allmulti() calls in the if_amcount field. That field is older than the comment, so I'm not exactly sure what the intent was; let's just remove it. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. --- sys/netinet6/ip6_mroute.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index d64c2f641e24..5706c12fc5e4 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -254,10 +254,6 @@ static void expire_upcalls(void *); #define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */ #define UPCALL_EXPIRE 6 /* number of timeouts */ -/* - * XXX TODO: maintain a count to if_allmulti() calls in struct ifnet. - */ - /* * 'Interfaces' associated with decapsulator (so we can tell * packets that went through it from ones that get reflected From nobody Mon Feb 2 16:55:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmV2dH2z6Qk9Y for ; Mon, 02 Feb 2026 16:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4XmV00wVz3SS6 for ; Mon, 02 Feb 2026 16:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2c6WtLzR2/HuavRAo/VQhqj5+8sfH7YzpZhFvCgqTK4=; b=FeoJjeEFbbO1aTvt+IVQGEkU1bdS1Xenecqian4+AbonrQuz5nYUfi39lScfwlfZIkJYid o93FvKMU2PSLtl1ACSzPcmudg5xUxj/BN4e70ZoAgDVMW8m1fDahD9/NdZzG7/AcCjemu3 +EduI5Z9VfT8IcpYb3ef4UXvVccbUZGz+net+wEZjpteHkcUb8El5boD7BTK5gPh6VLJkC k1PKBLjytiOQ2TXFpQf3T7BEo3vTe7gzb0T4+1vjatCIPKt0R88608p+J7oPA/sODOJN3D SDjlybpIqn5+6eHbQyb84ZDP3q2NcWoPgMHPVipyZ0ZIHOa/COLMJxgZWBJQTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770051322; a=rsa-sha256; cv=none; b=waLDMhD8I5s0fAMS9U7piGf5AJZcWbabF+0QJO8tdug7pdidT02xkBkNiAsUwj6MdLkeRB o/EVdrFcDUVS2By4raUqYiFynCjUAy8BRAGKQTEVwaOf1udK12RSM1i3a+i2wJ0rmTz8eo K/y+bve4S1sK00gmr886clPA4ZOqjw5ZVbfKdH6Drt1ldRto6GkwEHsN86UX8RDTYjnJBc AbVdSNbQ+bCWVs3TI/4rXWtXGIn4zbkvUv/01ls4nghe2mDgxcBtkTP409BjOUgYIuCNyi F3X5TW9oSxXRLP7aODpxE2xuL5eebeu85pwQqKk9hp1i0lZHnzrDFEJ73Fpz+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2c6WtLzR2/HuavRAo/VQhqj5+8sfH7YzpZhFvCgqTK4=; b=hJmQtILwWrGH70F30pz2dClPqVxoMge0Vg2pX2EDa/e5tcU5HIX40zisdL1tbtCvYgWb56 wIfgB9JbMSPFepHMyUuYVdfWKIs3cUyItcih5gZiKc08FudzEBPj7glFEOvwaajV2QHTH7 u3O4+bGX/XLYR8cTz8Jy+DKvPXNav4ru2r8AlHp7wexYKsXMcXfQJrJqxxhg7//AI50PHj KntlC82cmJ1mKATL3hyYFZIqdd+Ie//xCwc7VJgjchK4sUpGzsfT9PFv1nxtJsDH4YnrEd 0Ne+kZH4OwTe2hebyfbf3nbVSGfPmGjICrDUVvUrwqPYm/XWh+j8rdnSJerRXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4XmT6fdHzbFK for ; Mon, 02 Feb 2026 16:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e32a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 16:55:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Mark Johnston Subject: git: d0474eda504c - main - socket.2: Cross-reference netintro(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0474eda504c8e1dd784c1cde4b65a42adc4e28e Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 16:55:21 +0000 Message-Id: <6980d6f9.1e32a.522f3e5c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0474eda504c8e1dd784c1cde4b65a42adc4e28e commit d0474eda504c8e1dd784c1cde4b65a42adc4e28e Author: Artem Bunichev AuthorDate: 2026-02-02 15:11:05 +0000 Commit: Mark Johnston CommitDate: 2026-02-02 16:54:54 +0000 socket.2: Cross-reference netintro(4) netintro(4) is a great manual page that provides a basic introduction to network facilities, I think it is well worth mentioning in the socket(2). I also think we can incorporate this reference somewhere in the text as well, but I'm not sure, maybe the reference in the SEE ALSO section would be enough. Reviewed by: glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55032 --- lib/libsys/socket.2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libsys/socket.2 b/lib/libsys/socket.2 index fbf6b4e12df0..3e4936b091be 100644 --- a/lib/libsys/socket.2 +++ b/lib/libsys/socket.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 17, 2026 +.Dd February 1, 2026 .Dt SOCKET 2 .Os .Sh NAME @@ -503,6 +503,7 @@ The socket type is not supported by the protocol. .Xr ip 4 , .Xr ip6 4 , .Xr ipsec 4 , +.Xr netintro 4 , .Xr netlink 4 , .Xr ng_socket 4 , .Xr route 4 , From nobody Mon Feb 2 17:02:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4Xwb3qZJz6QkLR for ; Mon, 02 Feb 2026 17:02: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4Xwb3N37z3WH2 for ; Mon, 02 Feb 2026 17:02:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3hKOQK7n/pdwPjPduThZERnI/OqNFxdtS3pfjslcHcE=; b=uC7+EzcLMTbDgGdSFznGdg1H+e3ftTcCsWrJB3XdVnaK8zmhj8gIOdOFxpU9fZ9oVqS8NS ZUV+tk9z8IXt9oy8nv2AMfwasiyBn8+/F2OttjsYA/HbKCtEGOM6g8KWw7Jx+p3q7m0sfK QBRHN9U1oHkA7A5ihD0Iz+qPqresQTLNAYWaR0327FlrPaouBLqDQWyHj1oxO/u/977eO0 sW27Sp65OH4i1jb2FT1sdxvmRyQIx2mekb/T9/a5HGhW8kGAyqnYrNKjyPUKTrInF1ZmyU cO5IDEnIcWpV31wiBYFH0lgWrwjCHVLOrYyBmBksrBI05tU9Kb6U+I95dmxdkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770051743; a=rsa-sha256; cv=none; b=IqGG7ZKYimz7aCEvhGgjXsbkoDDVQzzYLWZ6mZQwQqQnYhQte9cDoUBPd4PMAixUvVaLfY 8Brm3SbCba386iZsUzJM1VHiZ6/K+mrVaizFQgvTBnAHMb8v86f+6LtM3o8nhF+sq3xOIG vo6IvIk8WA8nBFAjYYM9FksPQeDDMi+OESeW445F3q1Wi5ibYYlTxGbOFXpvzjXEz/zeSF k0R+3fyLsOoGR40WMS3F7/NIxha0+C9R6jMChULGhN/c1AEI6uYSP6ylI0j4oASt6d4NvY ZvUPwBW0SBvNymjFeg36TdoXB3evKQPP197tq4ZgNRKZXZN1KSn7dbapcUHBew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770051743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3hKOQK7n/pdwPjPduThZERnI/OqNFxdtS3pfjslcHcE=; b=yEtNuZiJDAi5QheN+2+m5aqxeFsNWjiL9GROKNxf7nFyMJ53zw0TScGi1fnqv+vJn0MLmG jMgiD05My1hYo4Z9F9mE9/2ECrWoJPe5XsS8BdgLwHMddawyBYBaASqkQLZs5+H9rGKlgt XflWaumuq1dVO7ojmolAvYl6vCBYwjz5aqPZ1HpN+fspg+7hjCC76cm8K0aRbM5oGkCrRT 1F8xtPAF6Q2SBQFXDXszuZaf7ySLkiIzjva2TOlavdTlO9ktIXtlqLCaFpxH8pWH0WR+lO gLzq19FSV5k9RdnBdWJMQ2/4BZAnwTeY6rbl0TY1F1gOR6SU2ifK2VXaraA3Ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4Xwb2lDlzbFl for ; Mon, 02 Feb 2026 17:02:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fa2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 17:02:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Hall Subject: git: 7f54c65abc67 - main - smartpqi: Update to vendor version 14.4690.0.2008 - 15.2.0.2008 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrhall X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f54c65abc67f50363bbd2a68a980d23e69c9ef0 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 17:02:18 +0000 Message-Id: <6980d89a.1fa2f.264662f7@gitrepo.freebsd.org> The branch main has been updated by jrhall: URL: https://cgit.FreeBSD.org/src/commit/?id=7f54c65abc67f50363bbd2a68a980d23e69c9ef0 commit 7f54c65abc67f50363bbd2a68a980d23e69c9ef0 Author: John Hall AuthorDate: 2026-02-02 15:44:23 +0000 Commit: John Hall CommitDate: 2026-02-02 17:01:30 +0000 smartpqi: Update to vendor version 14.4690.0.2008 - 15.2.0.2008 Update to versions: FreeBSD14 14.4690.2008 FreeBSD15 15.2.0.2008 Included in this update are: - Support for new controllers - Add code that utilizes the new BIG_IOCTL_Command_struct and allows the I/O buffer size for a single passthrough ioctl to be stored as a 32 bit integer instead of the original 16 bit integer. - Update occurrences of Microsemi to Microchip - Some format changes including converting comments from C++ to C style, remove instances of /* $FreeBSD$ */, and updating copyright dates. Update to versions: FreeBSD14 14.4690.2008 FreeBSD15 15.2.0.2008 Included in this update are: - Support for new controllers _ Add code that utilizes the new BIG_IOCTL_Command_struct and allows the I/O buffer size for a single passthrough ioctl to be stored as a 32 bit integer instead of the original 16 bit integer. - Update occurrences of Microsemi to Microchip - Some format changes including converting comments from C++ to C style, remove instances of /* $FreeBSD$ */, and updating copyright dates. Reviewed by: imp Approved by: imp MFC after: 1 week Sponsored by: Microchip Technology Inc. Differential Revision: https://reviews.freebsd.org/D54787 --- sys/dev/smartpqi/smartpqi_cam.c | 2 +- sys/dev/smartpqi/smartpqi_controllers.h | 8 +- sys/dev/smartpqi/smartpqi_defines.h | 11 +- sys/dev/smartpqi/smartpqi_event.c | 4 +- sys/dev/smartpqi/smartpqi_features.c | 2 +- sys/dev/smartpqi/smartpqi_helper.c | 4 +- sys/dev/smartpqi/smartpqi_helper.h | 2 +- sys/dev/smartpqi/smartpqi_includes.h | 2 +- sys/dev/smartpqi/smartpqi_ioctl.c | 199 ++++++++++++++++++++++++++++++++ sys/dev/smartpqi/smartpqi_ioctl.h | 9 +- sys/dev/smartpqi/smartpqi_main.c | 2 +- sys/dev/smartpqi/smartpqi_mem.c | 2 +- sys/dev/smartpqi/smartpqi_prototypes.h | 1 + sys/dev/smartpqi/smartpqi_queue.c | 4 +- sys/dev/smartpqi/smartpqi_request.c | 2 +- sys/dev/smartpqi/smartpqi_tag.c | 2 +- 16 files changed, 237 insertions(+), 19 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_cam.c b/sys/dev/smartpqi/smartpqi_cam.c index 93043a296c5d..690b38c9f855 100644 --- a/sys/dev/smartpqi/smartpqi_cam.c +++ b/sys/dev/smartpqi/smartpqi_cam.c @@ -54,7 +54,7 @@ update_sim_properties(struct cam_sim *sim, struct ccb_pathinq *cpi) cpi->initiator_id = 255; strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN-1); cpi->sim_vid[sizeof(cpi->sim_vid)-1] = '\0'; - strncpy(cpi->hba_vid, "Microsemi", HBA_IDLEN-1); + strncpy(cpi->hba_vid, "Microchip", HBA_IDLEN-1); cpi->hba_vid[sizeof(cpi->hba_vid)-1] = '\0'; strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN-1); cpi->dev_name[sizeof(cpi->dev_name)-1] = '\0'; diff --git a/sys/dev/smartpqi/smartpqi_controllers.h b/sys/dev/smartpqi/smartpqi_controllers.h index 6356159fd5f7..d5276f01a7e1 100644 --- a/sys/dev/smartpqi/smartpqi_controllers.h +++ b/sys/dev/smartpqi/smartpqi_controllers.h @@ -122,6 +122,7 @@ struct pqi_ident {0x9005, 0x028f, 0x1f51, 0x1044, PQI_HWIF_SRCV, "SmartHBA P6500-8i"}, {0x9005, 0x028f, 0x1f3f, 0x0610, PQI_HWIF_SRCV, "3SNIC SSSRAID 3S610"}, {0x9005, 0x028f, 0x207d, 0x4840, PQI_HWIF_SRCV, "HRDT TrustHBA H3100s-8i"}, + {0x9005, 0x028f, 0x207d, 0x4940, PQI_HWIF_SRCV, "HRDT TrustRAID D3102s-8i"}, /* (SRCx MSCC FVB 24x12G based) */ {0x9005, 0x028f, 0x103c, 0x1001, PQI_HWIF_SRCV, "MSCC FVB"}, @@ -151,11 +152,13 @@ struct pqi_ident {0x9005, 0x028f, 0x1cf2, 0x0B27, PQI_HWIF_SRCV, "ZTE SmartROC3100 SDPSA/B-18i 4G"}, {0x9005, 0x028f, 0x1cf2, 0x0B45, PQI_HWIF_SRCV, "ZTE SmartROC3100 SDPSA/B_L-18i 2G"}, {0x9005, 0x028f, 0x1cf2, 0x5445, PQI_HWIF_SRCV, "ZTE SmartROC3100 RM241-18i 2G"}, + {0x9005, 0x028f, 0x1cf2, 0x544D, PQI_HWIF_SRCV, "ZTE SmartROC3100 RM241B-18i 2G"}, {0x9005, 0x028f, 0x1cf2, 0x5446, PQI_HWIF_SRCV, "ZTE SmartROC3100 RM242-18i 4G"}, + {0x9005, 0x028f, 0x1cf2, 0x544E, PQI_HWIF_SRCV, "ZTE SmartROC3100 RM242B-18i 4G"}, + {0x9005, 0x028f, 0x1cf2, 0x5451, PQI_HWIF_SRCV, "ZTE SmartROC3100 RS231-8i 2G"}, + {0x9005, 0x028f, 0x1cf2, 0x5452, PQI_HWIF_SRCV, "ZTE SmartROC3100 RS232-8i 4G"}, {0x9005, 0x028f, 0x1cf2, 0x5449, PQI_HWIF_SRCV, "ZTE SmartROC3100 RS241-18i 2G"}, {0x9005, 0x028f, 0x1cf2, 0x544A, PQI_HWIF_SRCV, "ZTE SmartROC3100 RS242-18i 4G"}, - {0x9005, 0x028f, 0x1cf2, 0x544D, PQI_HWIF_SRCV, "ZTE SmartROC3100 RM241B-18i 2G"}, - {0x9005, 0x028f, 0x1cf2, 0x544E, PQI_HWIF_SRCV, "ZTE SmartROC3100 RM242B-18i 4G"}, {0x9005, 0x028f, 0x1bd4, 0x006F, PQI_HWIF_SRCV, "RS0804M5R16i"}, {0x9005, 0x028f, 0x1ff9, 0x006F, PQI_HWIF_SRCV, "RS0804M5R16i"}, {0x9005, 0x028f, 0x1f51, 0x1010, PQI_HWIF_SRCV, "SmartRAID P7504N-16i"}, @@ -178,6 +181,7 @@ struct pqi_ident {0x9005, 0x028f, 0x1458, 0x1000, PQI_HWIF_SRCV, "GIGABYTE SmartHBA CLN1832"}, {0x9005, 0x028f, 0x1cf2, 0x0B29, PQI_HWIF_SRCV, "ZTE SmartIOC2100 SDPSA/B_I-18i"}, {0x9005, 0x028f, 0x1cf2, 0x5447, PQI_HWIF_SRCV, "ZTE SmartIOC2100 RM243-18i"}, + {0x9005, 0x028f, 0x1cf2, 0x5453, PQI_HWIF_SRCV, "ZTE SmartIOC2100 RS233-8i"}, {0x9005, 0x028f, 0x1cf2, 0x544B, PQI_HWIF_SRCV, "ZTE SmartIOC2100 RS243-18i"}, {0x9005, 0x028f, 0x1cf2, 0x544F, PQI_HWIF_SRCV, "ZTE SmartIOC2100 RM243B-18i"}, {0x9005, 0x028f, 0x1bd4, 0x0071, PQI_HWIF_SRCV, "RS0800M5H16i"}, diff --git a/sys/dev/smartpqi/smartpqi_defines.h b/sys/dev/smartpqi/smartpqi_defines.h index fe2edf7a74a9..0277abd3e318 100644 --- a/sys/dev/smartpqi/smartpqi_defines.h +++ b/sys/dev/smartpqi/smartpqi_defines.h @@ -911,9 +911,14 @@ static inline uint64_t CALC_PERCENT_TOTAL(uint64_t val, uint64_t total) #define CCISS_GETDRIVVER _IOWR(SMARTPQI_IOCTL_BASE, 0, driver_info) #define CCISS_GETPCIINFO _IOWR(SMARTPQI_IOCTL_BASE, 1, pqi_pci_info_t) #define SMARTPQI_PASS_THRU _IOWR(SMARTPQI_IOCTL_BASE, 2, IOCTL_Command_struct) +#define SMARTPQI_BIG_PASS_THRU _IOWR(SMARTPQI_IOCTL_BASE, 3, BIG_IOCTL_Command_struct) #define CCISS_PASSTHRU _IOWR('C', 210, IOCTL_Command_struct) #define CCISS_REGNEWD _IO(CCISS_IOC_MAGIC, 14) +#if !defined(SMARTPQI_BIG_PASSTHRU_SUPPORTED) +#define SMARTPQI_BIG_PASSTHRU_SUPPORTED _IO(SMARTPQI_IOCTL_BASE, 4) +#endif + /*IOCTL pci_info structure */ typedef struct pqi_pci_info { @@ -939,12 +944,12 @@ typedef uint8_t *passthru_buf_type_t; #define PQISRC_DRIVER_MAJOR __FreeBSD__ #if __FreeBSD__ <= 14 -#define PQISRC_DRIVER_MINOR 4660 +#define PQISRC_DRIVER_MINOR 4690 #else -#define PQISRC_DRIVER_MINOR 0 +#define PQISRC_DRIVER_MINOR 2 #endif #define PQISRC_DRIVER_RELEASE 0 -#define PQISRC_DRIVER_REVISION 2002 +#define PQISRC_DRIVER_REVISION 2008 #define STR(s) # s #define PQISRC_VERSION(a, b, c, d) STR(a.b.c-d) diff --git a/sys/dev/smartpqi/smartpqi_event.c b/sys/dev/smartpqi/smartpqi_event.c index 761bb5588ff9..77a70f9fb031 100644 --- a/sys/dev/smartpqi/smartpqi_event.c +++ b/sys/dev/smartpqi/smartpqi_event.c @@ -417,7 +417,7 @@ pqisrc_report_event_config(pqisrc_softstate_t *softs) softs->event_config.num_event_descriptors = MIN(event_config_p->num_event_descriptors, PQI_MAX_EVENT_DESCRIPTORS) ; - for (i = 0; i < softs->event_config.num_event_descriptors; i++) { + for (i=0; i < softs->event_config.num_event_descriptors; i++) { softs->event_config.descriptors[i].event_type = event_config_p->descriptors[i].event_type; } @@ -477,7 +477,7 @@ pqisrc_set_event_config(pqisrc_softstate_t *softs) event_config_p->num_event_descriptors = softs->event_config.num_event_descriptors; - for (i = 0; i < softs->event_config.num_event_descriptors; i++) { + for (i=0; i < softs->event_config.num_event_descriptors; i++) { event_config_p->descriptors[i].event_type = softs->event_config.descriptors[i].event_type; if( pqisrc_event_type_to_event_index(event_config_p->descriptors[i].event_type) != -1) diff --git a/sys/dev/smartpqi/smartpqi_features.c b/sys/dev/smartpqi/smartpqi_features.c index 2a53dbe654b1..ae6114ef066b 100644 --- a/sys/dev/smartpqi/smartpqi_features.c +++ b/sys/dev/smartpqi/smartpqi_features.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/smartpqi/smartpqi_helper.c b/sys/dev/smartpqi/smartpqi_helper.c index 0a4bf6ec21cb..9454fa8b63ab 100644 --- a/sys/dev/smartpqi/smartpqi_helper.c +++ b/sys/dev/smartpqi/smartpqi_helper.c @@ -333,6 +333,8 @@ check_struct_sizes(void) 64 bit and 32 bit system*/ ASSERT(sizeof(IOCTL_Command_struct)== 86 || sizeof(IOCTL_Command_struct)== 82); + ASSERT(sizeof(BIG_IOCTL_Command_struct)== 88 || + sizeof(BIG_IOCTL_Command_struct)== 84); ASSERT(sizeof(struct bmic_host_wellness_driver_version)== 44); ASSERT(sizeof(struct bmic_host_wellness_time)== 20); ASSERT(sizeof(struct pqi_dev_adminq_cap)== 8); @@ -386,7 +388,7 @@ void check_device_pending_commands_to_complete(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) { uint32_t tag = softs->max_outstanding_io, active_requests; - uint64_t timeout = 0, delay_in_usec = 1000; /* In micro Seconds */ + uint64_t timeout = 0, delay_in_usec = 1000; /* In microseconds */ rcb_t* rcb; DBG_FUNC("IN\n"); diff --git a/sys/dev/smartpqi/smartpqi_helper.h b/sys/dev/smartpqi/smartpqi_helper.h index 507caeb9b0b6..362eb0d05379 100644 --- a/sys/dev/smartpqi/smartpqi_helper.h +++ b/sys/dev/smartpqi/smartpqi_helper.h @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/smartpqi/smartpqi_includes.h b/sys/dev/smartpqi/smartpqi_includes.h index a8682e8a848d..30846b1a1d6c 100644 --- a/sys/dev/smartpqi/smartpqi_includes.h +++ b/sys/dev/smartpqi/smartpqi_includes.h @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/smartpqi/smartpqi_ioctl.c b/sys/dev/smartpqi/smartpqi_ioctl.c index 0517c0513cce..7fd68b1a3263 100644 --- a/sys/dev/smartpqi/smartpqi_ioctl.c +++ b/sys/dev/smartpqi/smartpqi_ioctl.c @@ -169,6 +169,13 @@ smartpqi_ioctl(struct cdev *cdev, u_long cmd, caddr_t udata, pqi_status = pqisrc_passthru_ioctl(softs, udata, 0); bsd_status = pqi_status_to_bsd_ioctl_status(pqi_status); break; + case SMARTPQI_BIG_PASS_THRU: + pqi_status = pqisrc_big_passthru_ioctl(softs, udata, 0); + bsd_status = pqi_status_to_bsd_ioctl_status(pqi_status); + break; + case SMARTPQI_BIG_PASSTHRU_SUPPORTED: + bsd_status = BSD_SUCCESS; + break; case CCISS_REGNEWD: pqi_status = pqisrc_scan_devices(softs); bsd_status = pqi_status_to_bsd_ioctl_status(pqi_status); @@ -422,3 +429,195 @@ out: DBG_FUNC("Failed OUT\n"); return PQI_STATUS_FAILURE; } + +/* + * Function used to send big passthru commands to adapter + * to support management tools. For eg. ssacli, sscon. + */ +int +pqisrc_big_passthru_ioctl(struct pqisrc_softstate *softs, void *arg, int mode) +{ + int ret; + char *drv_buf = NULL; + uint32_t tag = 0; + BIG_IOCTL_Command_struct *iocommand = (BIG_IOCTL_Command_struct *)arg; + dma_mem_t ioctl_dma_buf; + pqisrc_raid_req_t request; + raid_path_error_info_elem_t error_info; + ib_queue_t *ib_q = &softs->op_raid_ib_q[PQI_DEFAULT_IB_QUEUE]; + ob_queue_t const *ob_q = &softs->op_ob_q[PQI_DEFAULT_IB_QUEUE]; + rcb_t *rcb = NULL; + + memset(&request, 0, sizeof(request)); + memset(&error_info, 0, sizeof(error_info)); + + DBG_FUNC("IN\n"); + + if (pqisrc_ctrl_offline(softs)) + return PQI_STATUS_FAILURE; + + if (!arg) + return PQI_STATUS_FAILURE; + + if (iocommand->buf_size < 1 && + iocommand->Request.Type.Direction != PQIIOCTL_NONE) + return PQI_STATUS_FAILURE; + if (iocommand->Request.CDBLen > sizeof(request.cmd.cdb)) + return PQI_STATUS_FAILURE; + + switch (iocommand->Request.Type.Direction) { + case PQIIOCTL_NONE: + case PQIIOCTL_WRITE: + case PQIIOCTL_READ: + case PQIIOCTL_BIDIRECTIONAL: + break; + default: + return PQI_STATUS_FAILURE; + } + + if (iocommand->buf_size > 0) { + memset(&ioctl_dma_buf, 0, sizeof(struct dma_mem)); + os_strlcpy(ioctl_dma_buf.tag, "Ioctl_PassthruCmd_Buffer", sizeof(ioctl_dma_buf.tag)); + ioctl_dma_buf.size = iocommand->buf_size; + ioctl_dma_buf.align = PQISRC_DEFAULT_DMA_ALIGN; + /* allocate memory */ + ret = os_dma_mem_alloc(softs, &ioctl_dma_buf); + if (ret) { + DBG_ERR("Failed to Allocate dma mem for Ioctl PassthruCmd Buffer : %d\n", ret); + goto out; + } + + DBG_IO("ioctl_dma_buf.dma_addr = %p\n",(void*)ioctl_dma_buf.dma_addr); + DBG_IO("ioctl_dma_buf.virt_addr = %p\n",(void*)ioctl_dma_buf.virt_addr); + + drv_buf = (char *)ioctl_dma_buf.virt_addr; + if (iocommand->Request.Type.Direction & PQIIOCTL_WRITE) { + ret = os_copy_from_user(softs, (void *)drv_buf, (void *)iocommand->buf, iocommand->buf_size, mode); + if (ret != 0) { + goto free_mem; + } + } + } + + request.header.iu_type = PQI_IU_TYPE_RAID_PATH_IO_REQUEST; + request.header.iu_length = offsetof(pqisrc_raid_req_t, sg_descriptors[1]) - + PQI_REQUEST_HEADER_LENGTH; + memcpy(request.lun_number, iocommand->LUN_info.LunAddrBytes, + sizeof(request.lun_number)); + memcpy(request.cmd.cdb, iocommand->Request.CDB, iocommand->Request.CDBLen); + request.additional_cdb_bytes_usage = PQI_ADDITIONAL_CDB_BYTES_0; + + switch (iocommand->Request.Type.Direction) { + case PQIIOCTL_NONE: + request.data_direction = SOP_DATA_DIR_NONE; + break; + case PQIIOCTL_WRITE: + request.data_direction = SOP_DATA_DIR_FROM_DEVICE; + break; + case PQIIOCTL_READ: + request.data_direction = SOP_DATA_DIR_TO_DEVICE; + break; + case PQIIOCTL_BIDIRECTIONAL: + request.data_direction = SOP_DATA_DIR_BIDIRECTIONAL; + break; + } + + request.task_attribute = SOP_TASK_ATTRIBUTE_SIMPLE; + if (iocommand->buf_size > 0) { + request.buffer_length = iocommand->buf_size; + request.sg_descriptors[0].addr = ioctl_dma_buf.dma_addr; + request.sg_descriptors[0].len = iocommand->buf_size; + request.sg_descriptors[0].flags = SG_FLAG_LAST; + } + tag = pqisrc_get_tag(&softs->taglist); + if (INVALID_ELEM == tag) { + DBG_ERR("Tag not available\n"); + goto free_mem; + } + request.request_id = tag; + request.response_queue_id = ob_q->q_id; + request.error_index = request.request_id; + if (softs->timeout_in_passthrough) { + request.timeout_in_sec = iocommand->Request.Timeout; + } + + rcb = &softs->rcb[tag]; + rcb->success_cmp_callback = pqisrc_process_internal_raid_response_success; + rcb->error_cmp_callback = pqisrc_process_internal_raid_response_error; + rcb->tag = tag; + rcb->req_pending = true; + /* Submit Command */ + ret = pqisrc_submit_cmnd(softs, ib_q, &request); + if (ret != PQI_STATUS_SUCCESS) { + DBG_ERR("Unable to submit command\n"); + goto err_out; + } + + ret = pqisrc_wait_on_condition(softs, rcb, PQISRC_PASSTHROUGH_CMD_TIMEOUT); + if (ret != PQI_STATUS_SUCCESS) { + DBG_ERR("Passthru IOCTL cmd timed out !!\n"); + goto err_out; + } + + memset(&iocommand->error_info, 0, sizeof(iocommand->error_info)); + + + if (rcb->status) { + size_t sense_data_length; + + memcpy(&error_info, rcb->error_info, sizeof(error_info)); + iocommand->error_info.ScsiStatus = error_info.status; + sense_data_length = error_info.sense_data_len; + + if (!sense_data_length) + sense_data_length = error_info.resp_data_len; + + if (sense_data_length && + (sense_data_length > sizeof(error_info.data))) + sense_data_length = sizeof(error_info.data); + + if (sense_data_length) { + if (sense_data_length > + sizeof(iocommand->error_info.SenseInfo)) + sense_data_length = + sizeof(iocommand->error_info.SenseInfo); + memcpy (iocommand->error_info.SenseInfo, + error_info.data, sense_data_length); + iocommand->error_info.SenseLen = sense_data_length; + } + + if (error_info.data_out_result == PQI_RAID_DATA_IN_OUT_UNDERFLOW) { + rcb->status = PQI_STATUS_SUCCESS; + } + } + + if (rcb->status == PQI_STATUS_SUCCESS && iocommand->buf_size > 0 && + (iocommand->Request.Type.Direction & PQIIOCTL_READ)) { + + ret = os_copy_to_user(softs, (void*)iocommand->buf, (void*)drv_buf, iocommand->buf_size, mode); + if (ret != 0) { + DBG_ERR("Failed to copy the response\n"); + goto err_out; + } + } + + os_reset_rcb(rcb); + pqisrc_put_tag(&softs->taglist, request.request_id); + if (iocommand->buf_size > 0) + os_dma_mem_free(softs,&ioctl_dma_buf); + + DBG_FUNC("OUT\n"); + return PQI_STATUS_SUCCESS; + +err_out: + os_reset_rcb(rcb); + pqisrc_put_tag(&softs->taglist, request.request_id); + +free_mem: + if (iocommand->buf_size > 0) + os_dma_mem_free(softs, &ioctl_dma_buf); + +out: + DBG_FUNC("Failed OUT\n"); + return PQI_STATUS_FAILURE; +} \ No newline at end of file diff --git a/sys/dev/smartpqi/smartpqi_ioctl.h b/sys/dev/smartpqi/smartpqi_ioctl.h index 633465aeb8cd..ef4678ad5a3b 100644 --- a/sys/dev/smartpqi/smartpqi_ioctl.h +++ b/sys/dev/smartpqi/smartpqi_ioctl.h @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -137,5 +137,12 @@ typedef struct pqi_ioctl_passthruCmd_struct { }OS_ATTRIBUTE_PACKED IOCTL_Command_struct; +typedef struct _BIG_IOCTL_Command_struct { + LUNAddr_struct LUN_info; + RequestBlock_struct Request; + ErrorInfo_struct error_info; + DWORD buf_size; /* size in bytes of the buf */ + passthru_buf_type_t buf; +}OS_ATTRIBUTE_PACKED BIG_IOCTL_Command_struct; #endif /* _PQI_IOCTL_H_ */ diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c index 6274ecc957d4..dea7809a1b8e 100644 --- a/sys/dev/smartpqi/smartpqi_main.c +++ b/sys/dev/smartpqi/smartpqi_main.c @@ -25,7 +25,7 @@ /* - * Driver for the Microsemi Smart storage controllers + * Driver for the Microchip Smart storage controllers */ #include "smartpqi_includes.h" diff --git a/sys/dev/smartpqi/smartpqi_mem.c b/sys/dev/smartpqi/smartpqi_mem.c index 239d619968d2..08f806681dce 100644 --- a/sys/dev/smartpqi/smartpqi_mem.c +++ b/sys/dev/smartpqi/smartpqi_mem.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/smartpqi/smartpqi_prototypes.h b/sys/dev/smartpqi/smartpqi_prototypes.h index fdf69e38fa59..7abce9c3789d 100644 --- a/sys/dev/smartpqi/smartpqi_prototypes.h +++ b/sys/dev/smartpqi/smartpqi_prototypes.h @@ -251,6 +251,7 @@ int pqisrc_process_task_management_response(pqisrc_softstate_t *, /* smartpqi_ioctl.c*/ int pqisrc_passthru_ioctl(struct pqisrc_softstate *, void *, int); +int pqisrc_big_passthru_ioctl(struct pqisrc_softstate *, void *, int); /* Functions Prototypes */ /* smartpqi_mem.c */ diff --git a/sys/dev/smartpqi/smartpqi_queue.c b/sys/dev/smartpqi/smartpqi_queue.c index 22bc2db572f8..e8a467531aa4 100644 --- a/sys/dev/smartpqi/smartpqi_queue.c +++ b/sys/dev/smartpqi/smartpqi_queue.c @@ -688,7 +688,7 @@ pqisrc_create_op_obq(pqisrc_softstate_t *softs, int i = 0; DBG_WARN("Error Status Descriptors\n"); for (i = 0; i < 4; i++) - DBG_WARN(" %x ",admin_resp.resp_type.create_op_oq.status_desc[i]); + DBG_WARN(" %x\n",admin_resp.resp_type.create_op_oq.status_desc[i]); } DBG_FUNC("OUT ret : %d\n", ret); @@ -731,7 +731,7 @@ pqisrc_create_op_ibq(pqisrc_softstate_t *softs, int i = 0; DBG_WARN("Error Status Decsriptors\n"); for (i = 0; i < 4; i++) - DBG_WARN(" %x ",admin_resp.resp_type.create_op_iq.status_desc[i]); + DBG_WARN(" %x\n",admin_resp.resp_type.create_op_iq.status_desc[i]); } DBG_FUNC("OUT ret : %d\n", ret); diff --git a/sys/dev/smartpqi/smartpqi_request.c b/sys/dev/smartpqi/smartpqi_request.c index e6ba41a814b2..c5f8ac3c41ba 100644 --- a/sys/dev/smartpqi/smartpqi_request.c +++ b/sys/dev/smartpqi/smartpqi_request.c @@ -1180,7 +1180,7 @@ fill_lba_for_scsi_rw(pqisrc_softstate_t *softs, uint8_t *cdb, aio_req_locator_t /* determine whether writes to certain types of RAID are supported. */ -static inline boolean_t +static boolean_t pqisrc_is_supported_write(pqisrc_softstate_t const *softs, pqi_scsi_dev_t const *device) { diff --git a/sys/dev/smartpqi/smartpqi_tag.c b/sys/dev/smartpqi/smartpqi_tag.c index 214b1bd3ce7d..d9680a65f265 100644 --- a/sys/dev/smartpqi/smartpqi_tag.c +++ b/sys/dev/smartpqi/smartpqi_tag.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2023 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From nobody Mon Feb 2 17:18:31 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4YHC2CNBz6QlZQ for ; Mon, 02 Feb 2026 17:18: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4YHC1WRkz3Y1c for ; Mon, 02 Feb 2026 17:18:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770052711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ElL3AiuOViMo/oP0k3zOPAGs+opXd7dbNih6Ey9m0r4=; b=L/RXLJ3ltCZuMZ9Ftyz1/LhFtN4UGiVb0SUpATDZYC6xhIPkrHldfxWw8A7XgvCskjUzK9 zYdo7L8TKs8NihhaB9TPHfqI9Fy47DUKAhxVerVfegcXyKI1zpYR2Kzrj/oODiUsq+A/OX DbG6D+g8WclfDpqsPaPh7MDNmgliXZzY+vYA0Jj1dw40mltbJwpQI3lJQF9pgvgT5x/t6D dH9kc6PoxGC7DI4/aBkL8qnPujZ5/poEopGXX0ZzvJiSickuezUd8axeORje4wFXO7cihT O1vMcl2ZapL0i479omv9o7QUZ2eV/wNB/Ntf6DNepZSiGH8yhUylRNU6H6rhKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770052711; a=rsa-sha256; cv=none; b=sRWf1cxa8mpQVgAzSDc2Ic3k/QWq9Yrinsx9M3dW+u/H5JmVDsmfEj+EfHQgQkDzH1p5fv XROiBC4+kaQLTy8kT0YXZmPWefKbe9n8zUhpMA1bDiH6zn+hcuV7gvugkBKcOVXIW22Edn wOnYXY2L3nDdUL3PQn/fIkuMWymHFIa7RkNPEfLlBuvvow70VrcWzQF0vbuFMXNKXRItGi gZFL7Evzq8cXVffymu8gQBSvY5PeqKncoBL3OG9tfpQmOxc22Y5ub6Mk4BO0owKlIOfPpK PMX06gPpVa7iU7wio10O0XtRCloBaL0BP1mHgh2GJfhzBLOmmnauoTe7zFY4HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770052711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ElL3AiuOViMo/oP0k3zOPAGs+opXd7dbNih6Ey9m0r4=; b=iu7UbaYpV7338c1nXn7d9ZtWDR5rBGB8vIP4iTwDeWg+RH9FMHWKqVc9Ql8h6ZAzsKEwHM HfEIOLzlWanL9FOoC5ZhttpuvYdUh2CeB+zANVEAVsE8+/wTzAbVvhowJfwaZzPd59hvlh ofpOlha4N0RSQzZuwHUXz6RuikNOMdmACyv7+0JE4G6hwNe1G+etdmnJjjrtA+vxsNXNxs acPge9mtgPdkcd7rMFHIKKIZkvBEu5Y8+N09qWWIlcFO70YXLVvGnjpBFQmqi2/3id+gMw WNyV4bnr2vz+qD+wQm8vmF66XTKJTb9Io4ZqEvjHaE6i05XnEyzAxW3/WQ5Tew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4YHC15vJzbgH for ; Mon, 02 Feb 2026 17:18:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ebca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 17:18:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 03d8ac948b1a - main - heimdal: Pass the correct pointer to realloc when growing a string buffer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03d8ac948b1ad9c419b294c3129b7da58d818363 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 17:18:31 +0000 Message-Id: <6980dc67.1ebca.59c053b@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=03d8ac948b1ad9c419b294c3129b7da58d818363 commit 03d8ac948b1ad9c419b294c3129b7da58d818363 Author: John Baldwin AuthorDate: 2026-02-02 17:18:11 +0000 Commit: John Baldwin CommitDate: 2026-02-02 17:18:11 +0000 heimdal: Pass the correct pointer to realloc when growing a string buffer The realloc in my_fgetln was trying to grow the pointer to the string buffer, not the string buffer itself. In function 'my_fgetln', inlined from 'mit_prop_dump' at crypto/heimdal/kdc/mit_dump.c:156:19: crypto/heimdal/kdc/mit_dump.c:119:13: error: 'realloc' called on unallocated object 'line' [-Werror=free-nonheap-object] 119 | n = realloc(buf, *sz + (*sz >> 1)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ crypto/heimdal/kdc/mit_dump.c: In function 'mit_prop_dump': crypto/heimdal/kdc/mit_dump.c:139:11: note: declared here 139 | char *line = NULL; | ^~~~ Reviewed by: rmacklem, cy Fixes: a93e1b731ae4 ("heimdal-kadmin: Add support for the -f dump option") Differential Revision: https://reviews.freebsd.org/D54933 --- crypto/heimdal/kdc/mit_dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/heimdal/kdc/mit_dump.c b/crypto/heimdal/kdc/mit_dump.c index 4397d1ad897d..d790b145af11 100644 --- a/crypto/heimdal/kdc/mit_dump.c +++ b/crypto/heimdal/kdc/mit_dump.c @@ -116,7 +116,7 @@ my_fgetln(FILE *f, char **buf, size_t *sz, size_t *len) return 0; } *len += strlen(&(*buf)[*len]); /* *len should be == *sz */ - n = realloc(buf, *sz + (*sz >> 1)); + n = realloc(*buf, *sz + (*sz >> 1)); if (!n) { free(*buf); *buf = NULL; From nobody Mon Feb 2 17:20:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4YJy15Ccz6Qlc5 for ; Mon, 02 Feb 2026 17:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4YJy0fFFz3YLg for ; Mon, 02 Feb 2026 17:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770052802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ixec5M5D+8/Zh3hiGoJCKpJasskCrghydTkS3tcUCA=; b=jwi8KNnlS1F9ERQjPhfDrq3HWnfe3XVMht32yamGdA+UaYH3vp3WoIy4N5EykLzNLCdFd2 DU+LsJWi8TeGQQQtdkD6NrvANj1oID58sPx2bTPG4eS2AVJFcrSg9GHzuNvyDv+dtgoQen RURzyIUSbPJBeA1rvMJQO72EV3imnGHgcNEuUZE9vN1n0sZzf1pwUVT6m+AfWStFW5JdlF jwDkrTJbOSk3Xf3mxO1PvDg+9RR83Z2911Is0P3o3zW7r/P8V6N5oXqoHAInL7dnylQO/i ocMAWhWzKjQdr0Li7Qr+lLddNIWau/IBg1GZnu3/iGWhDYRjgilBtmNjgKaRCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770052802; a=rsa-sha256; cv=none; b=vF78ceZhQvGsMi1GbfjXzRX2796o4v1abXOn7HK2Mw3Z0U3gadvivw0391P2GAzvum04JP CirtbgCcBCvQaI0NjQQz4FfoQNk3SCjcpO1NKj+Cfaf0FHjgD5ZsRC3/MrYJy2s0ChRZ7W FV40oXhAmA9Sp3xfgY3TcYpmkaT7pIT1LHWT41yc2mvGvB0kap43LFYe5WAPCLWI1M8GFI z/opxxPeqiAWmGoFK764BPSX0oURySaGz0l0qYw4JNXqFrCRLx1Ur20YZxKTNtXK68Ys1f whAwQTkjzL5US34jt0N636yt3B3bTKapz5KYotvLEF/Hm4SZnOVZ1qqnyKK1rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770052802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ixec5M5D+8/Zh3hiGoJCKpJasskCrghydTkS3tcUCA=; b=G/uMqVOP1PDuqe3CDq/zNGIuaAKdEQCpxC6e5eJgz67/wJRdxirCtMiN5GMeBNKsL2+c2r gHIcN9TjJ8J5Qo6Fp4ciVsx9S/xokpvg8oKfH3Sq7VYYKDaglKm+xItbuFc2nWY0SFyM7/ GGdFJDM0QXZxO+FE112AYYAQni9H1MEXwA/anmMHu/xqEdPSd+fJCF2CCjwqgRWiYSWAuk gOpHVIyQQxeA8zGdOCE44HoB3fuaxMVan48khzCpasOg2+3X363uiUqH+hSq3b6Hz4PzCX vAK6GKrcgONTmrbm7GEkhmtQby+4Rmmaz9SlmgYUiGY/7xigbvWjAJP21D8yLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4YJy01N7zc0d for ; Mon, 02 Feb 2026 17:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2191a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 17:20:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f7144a9c4a11 - main - sdt: Use the "cc" operand modifier for the address of probes for GCC 15+ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7144a9c4a11214a71a3091ce1b232a8243b83ea Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 17:20:02 +0000 Message-Id: <6980dcc2.2191a.ebc239a@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f7144a9c4a11214a71a3091ce1b232a8243b83ea commit f7144a9c4a11214a71a3091ce1b232a8243b83ea Author: John Baldwin AuthorDate: 2026-02-02 17:19:51 +0000 Commit: John Baldwin CommitDate: 2026-02-02 17:19:51 +0000 sdt: Use the "cc" operand modifier for the address of probes for GCC 15+ This is required for GCC on RISC-V. The GCC 15 docs claim that "cc" is similar to "c" except that it "tries harder". NB: I have not yet found a way to make the DTrace probes compile on RISC-V with older versions of GCC. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54964 --- sys/sys/sdt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h index f705be915684..0be4e9ba6240 100644 --- a/sys/sys/sdt.h +++ b/sys/sys/sdt.h @@ -194,8 +194,12 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype); #define _SDT_ASM_PROBE_CONSTRAINT "i" #endif #ifndef _SDT_ASM_PROBE_OPERAND +#if !defined(__clang__) && __GNUC_PREREQ__(15, 0) +#define _SDT_ASM_PROBE_OPERAND "cc" +#else #define _SDT_ASM_PROBE_OPERAND "c" #endif +#endif /* * The asm below generates records corresponding to the structure's layout, so From nobody Mon Feb 2 17:27:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4YV21PTMz6Qlm8; Mon, 02 Feb 2026 17:27:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4YV20jJBz3cvq; Mon, 02 Feb 2026 17:27:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770053274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YMAWTDqJ2xavGOHyNs+au+VY2paDo/bUrppZpynv0Ig=; b=lFxc8FObq+wd6bX5/U+N3aYP5kj+ETw6tlH/2aBo5xrecr/vE71UoiIjhu+HigTZjK1Ari Lu56hiwCUE0gXUhB7jzzJ5nsDhiqSqjkwfFeWWlLoDBPV64ytO/8OCiC5wkExs6AniOFMI 25tDoOJNF/ApbDlOUG/E3nnZkSdManWYkfgYByr/EqUhkc7PShNpbBWgV8AlFfQUlVs3Qy MGg3jcFqTiP1po4YZAXcnmD6vfZkGlK3HhIauHcNIw90vTOnOvVzNZUWvYxMHg5MWaKFek 5IHbS687P4YYLUfeK9tqlITcUsblZtQ87pbRIneQs3zHmSGs/Oz7pXBcFzDCTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770053274; a=rsa-sha256; cv=none; b=Ab/++axDeNcFBhtoyv6ZS9TKfaoJLNftwETN8E9iLzsjVwE0XjO3n6mjgB8PAFnWU08RIA mj++XDzrpSVm9en6J4YTpP0hpCONVWpQlPLn80beqpmYrGPiL3YimTOYVu5EqgM8wTI9+E 1NL16hjKsdyiB7w3DxRn+KxcTMDDXbu5jXGB6fl9zbqlEc0VWvT/k7MXjg+uDl9Afxtj9s gxE+nijwbtSlA2Y+CaJBL4sJArcfFoem04Cxe2VbTkfmZnFe1F0MMkg1o7TXuednHk2Myf +w9eB8XhKVpoRlfcOhJklO4ZchIUkwiGp2n5LjwzFKWwp6AZDilpiaIbffTnXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770053274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YMAWTDqJ2xavGOHyNs+au+VY2paDo/bUrppZpynv0Ig=; b=bAXHN8jQXykDhYkRtZ7/EXLrl3Rs5PHoLkfTN4eGp7ygBVcd1E92jIA6C3eqBPliaQilza r7mjx9wzQV9jj0MOKhwcu8wqb+Yz5moh7BhmUioVUgNO4oLBrg+/fR2P/wo0Oy4xegYCEC yAxgUI0WvfJV1t4tj6H66QPKVZyrXfeDe64Qfoqqin29+yEsPZDjNfiKCVB1GbP1m8zkJp MXCR8x5M9DVdnxoHOB+7HvN1KiKKWqANYdrxfHC5xGkVsOhU3Vnb0S/MGJBRQk/hA8wktA JPyXkK313ngxkDO4MvcE3Yuqr3SxZ1ytqnN8mt6DG7xsma++G0YHcZH32AI61A== Received: from [IPV6:2601:5c0:4202:5670:dc0:8ca1:dc00:634e] (unknown [IPv6:2601:5c0:4202:5670:dc0:8ca1:dc00:634e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f4YV16KZVzjs3; Mon, 02 Feb 2026 17:27:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <37283782-ce52-48ec-9d20-6e43606f2919@FreeBSD.org> Date: Mon, 2 Feb 2026 12:27:52 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f7144a9c4a11 - main - sdt: Use the "cc" operand modifier for the address of probes for GCC 15+ Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <6980dcc2.2191a.ebc239a@gitrepo.freebsd.org> In-Reply-To: <6980dcc2.2191a.ebc239a@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/2/26 12:20, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f7144a9c4a11214a71a3091ce1b232a8243b83ea > > commit f7144a9c4a11214a71a3091ce1b232a8243b83ea > Author: John Baldwin > AuthorDate: 2026-02-02 17:19:51 +0000 > Commit: John Baldwin > CommitDate: 2026-02-02 17:19:51 +0000 > > sdt: Use the "cc" operand modifier for the address of probes for GCC 15+ > > This is required for GCC on RISC-V. The GCC 15 docs claim that "cc" is > similar to "c" except that it "tries harder". > > NB: I have not yet found a way to make the DTrace probes compile on > RISC-V with older versions of GCC. > > Reviewed by: markj > Differential Revision: https://reviews.freebsd.org/D54964 Once I land an update to the freebsd-gccXX ports to support %#b with printf(9) (in review at https://reviews.freebsd.org/D55016 if any ports person wants to review), RISC-V kernels and worlds can be built with GCC 15. GCC 14 and earlier can't compile SDT probes. :( Also, Someone(tm) should document # support for %b in printf(9). It would also be really great if we could document %r and %y in printf(9) as well. %y prints signed hex values, so printf("%y", -1) is output as "-0x1". %r uses a custom radix defined in a global 'radix' variable (I think this is really only for DDB), and if "+" is passed it assumes the argument is signed rather than unsigned. (This last part is a bit of a hack really. Probably we should use separate letters for signed vs unsigned. Or maybe stop using %r.) -- John Baldwin From nobody Mon Feb 2 17:46:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4Ytw5bkCz6QJ9r for ; Mon, 02 Feb 2026 17:46: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4Ytw3c61z3gZ8 for ; Mon, 02 Feb 2026 17:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770054360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbSlj7EFgZjtzgt3zmOKF2vmrpXnotl7ScFV7t6XJJg=; b=kqlltzC6tY8AabOtnCewDRcoH68vNzXCei9bSq2K5mcE+FQnndHyerere7bdGz8NWG1Exz f9YbVBGdZCiMaP69r4Fm0TztgwRkiZJp1gUfsJNN/O7Rn0Fa5XK3gy9+aVcxP4IjVvENBa pvKFdIXejbVfQGiUYwRiXdVjUVRa/TApR5w4iypPKGI99/KdfXpPpghGrwQiyxaY3dRTSm Wwq6yfJ7l9/WISoSJyu7cSfLH4ft1NGUwevH2oUa03frJEksxY1grTqg0rMuNPF/a5yyae pEOmODxdyPuaME4d9UhUwQbVdKWqDnln2W7zbUhQVuSOYva0X0AuDu4SYLypiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770054360; a=rsa-sha256; cv=none; b=SLaz8/9034renNyGP3UzKFqxhp4eU0TQJBNsLx0iCiwy2iqiGYtLYzLHi45+U8qLy9qqV4 FZ0gW/dQxJO9zJWHvSVz4iQaioCnpaV39CeITgYSk6yeYSKSmyEfwENtdkK8ts9nR1LoND dkqe3+rH0SkoeBeG3LkTXHSSkLL3x3lgtoXjiz5EhO0IDUb8I5mQk/hy2IjHtqFCd+L7rH ZgvdA5fkGu449nslkcr2wukOlvH871HEQeS1CXJU1H2LZoXFc+3T+YYCXHTXTZf7GOVXu4 IcwgKDRZVaCJ7xv3mI6Jk3AjAJvjDfu7JqAhJZv+dBqCs5IhY1lT81MWBzTB3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770054360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbSlj7EFgZjtzgt3zmOKF2vmrpXnotl7ScFV7t6XJJg=; b=vxeCmaoKqye5AlxcYVGtIkGNWgYnD+rxKa5va3plGKaFS2bmOjnFZ4Se/1Rq4S6VOz9BUG zC5Juln/Fkif0z758FPI2l0I3X/tVlDgbSaV3f70URUWDm0OcJIuLLGD5y8VfBtc4anpqy fKr+sHGSI9YuTcTj4YSxUPCuffOAbNWWT8EHWOLquoSs1nXzjWwXrWUa7sOEfoPpnpq/7c 7+7Vmi3aM/X8fc/3bp/SHdXShE22qA+gi/t7OhAefM9qYaUFKPuVA086Uhv3Qgn01y1tK7 IdCJEPBXq43D8qWG0JcAL4N3MVlSXaDQLioi8GgxIwTzU/aYRD2wnn2ymYF8AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4Ytw32z3zcgd for ; Mon, 02 Feb 2026 17:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 230df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 17:46:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 9e0fe126714c - main - i386: Fix build and remove empty unused macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e0fe126714cc0b2045bec16fe8d06dbcd663144 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 17:46:00 +0000 Message-Id: <6980e2d8.230df.272690e8@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9e0fe126714cc0b2045bec16fe8d06dbcd663144 commit 9e0fe126714cc0b2045bec16fe8d06dbcd663144 Author: Jessica Clarke AuthorDate: 2026-02-02 17:43:50 +0000 Commit: Jessica Clarke CommitDate: 2026-02-02 17:43:50 +0000 i386: Fix build and remove empty unused macro When inlining the macro, reg was not substituted with the %ecx argument previously passed in. One of the definitions was also left behind as an empty macro. PR: 292883 Fixes: 377c053a43f3 ("cpu_switch(): unconditionally wait on the blocked mutex transient") MFC after: 1 week --- sys/i386/i386/swtch.S | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/i386/i386/swtch.S b/sys/i386/i386/swtch.S index cb03c847fbc9..ad7c1d16c788 100644 --- a/sys/i386/i386/swtch.S +++ b/sys/i386/i386/swtch.S @@ -34,8 +34,6 @@ #include "assym.inc" -#define BLOCK_SPIN(reg) \ - /*****************************************************************************/ /* Scheduling */ /*****************************************************************************/ @@ -170,7 +168,7 @@ sw1: 100: lock - cmpxchgl %eax,TD_LOCK(reg) + cmpxchgl %eax,TD_LOCK(%ecx) jne 101f pause jmp 100b From nobody Mon Feb 2 19:28:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4c8q05rkz6QQ3Y; Mon, 02 Feb 2026 19:28:11 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4c8p6dmQz3tCw; Mon, 02 Feb 2026 19:28:10 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770060490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rnBQS6Drl0rgOnLTjRf2YelDV0ez2ijYrFpunhjb274=; b=yUULO2uc/uP6soNK3UfiVDLTMONzkqC98V5GTkNesbf7cs7qyMY27swOulV44mTAND2Jwf 978O73pWdOx4Rdjt3JmCz4dAEa//aAXYzdX8PNCFBb+eOkfiDDYf54znL7kTCx+RyO3mcW 4V9nPLd7VG4Dc6nRpTmBrDJuDbtuSVjjcKZNalqfRNqpEQ9wJJI2EpVRmdmieJ7xexanBP ynYvcYbfBN+7KMtU5s0GzWwH296tr3y5hXx7asCl+no/xsl4juMXTGZcye8ksXG+sKoPs0 8hydsAItpae8V8p8XR9b5jFo1p53uo9U8fe+V69LVz5wGSmXcKvS7YNxGLqBZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770060490; a=rsa-sha256; cv=none; b=Fixm4JGfNKPRCDpsXKEGq4CYcvT2O+GKMEnBVs2s1JZvVAGmx2bc9zyiin+t+4nBexn6yP Jk+x5ZhWpYm1tY9w+9T6dzT3wqJquE2khwebl5/VKSyK7c3oE+D3ALINOAj8/knFG5hd+A 733iDfa0u/6PPBQN5uK0WRG221C7a8RH7hdEKCILEHGaCDJHwaAdWNwJDcwbtnHsZ3fynb /OKYmH73h5T0bsfzc4p7GNIW3FHRURKw/KBeyW329TtJu7w6dQjLv4kBK/C43qD7FWtzlL jPUHkdlfq1o3uUHRvpBTRTb+x81PkZsd1JJaMmjkZyjBhaTg5kWUW57bJwj6cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770060490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rnBQS6Drl0rgOnLTjRf2YelDV0ez2ijYrFpunhjb274=; b=t30OWvjW4JXLh6Tk0iPxWCqq98xRzdLeeb7+FEWDv/5kk7EU45TgrMP95fMV2wW2MQTRX7 TUzsGMaWUcT7s94InDvDx0c8C79TXeEjLPAk8RJOvRia4dE9ZkFWzD3GH0UCJMZ3S+Qr79 qqQ30TSYgHs12cbUvK/wTyB8zZK5zvtC8l73S/JK1bV/Get4Oftx+ABWZUiFit5eSsZO1a DCdUJRc4n+vBuIPq0MK0b0aNXSvumwxq0SMasZcXFmlNGN78kUAAwL0xSqMnT6loR+KWSg pt9OI5ariNrEY60eEPr+wYp4pwFPZdWWfBnwg3jemUGfOfmKNHdYu3z4CW15eQ== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f4c8p20Blzmhq; Mon, 02 Feb 2026 19:28:10 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Mon, 2 Feb 2026 11:28:07 -0800 From: Gleb Smirnoff To: Michael Tuexen Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: d195b3783fa4 - main - sctp: fix socket type created by sctp_peeloff() Message-ID: References: <697e46e9.2271d.66b41ecf@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <697e46e9.2271d.66b41ecf@gitrepo.freebsd.org> Michael, On Sat, Jan 31, 2026 at 06:16:09PM +0000, Michael Tuexen wrote: M> commit d195b3783fa4de5c1a95f6d95eb9444abce6778b M> Author: Michael Tuexen M> AuthorDate: 2026-01-31 18:11:08 +0000 M> Commit: Michael Tuexen M> CommitDate: 2026-01-31 18:11:08 +0000 M> M> sctp: fix socket type created by sctp_peeloff() M> M> When calling sctp_peeloff() on a SOCK_SEQPACKET socket, the created M> and returned socket has the type SOCK_STREAM. M> This is specified in section 9.2 of RFC 6458. M> M> Reported by: Xin Long M> MFC after: 3 days M> --- M> sys/kern/uipc_socket.c | 6 ++++-- M> 1 file changed, 4 insertions(+), 2 deletions(-) M> M> diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c M> index efc8ebfcece2..4014006ce2e5 100644 M> --- a/sys/kern/uipc_socket.c M> +++ b/sys/kern/uipc_socket.c M> @@ -1292,7 +1292,7 @@ solisten_enqueue(struct socket *so, int connstatus) M> M> #if defined(SCTP) || defined(SCTP_SUPPORT) M> /* M> - * Socket part of sctp_peeloff(). Detach a new socket from an M> + * Socket part of sctp_peeloff(). Create a new socket for an M> * association. The new socket is returned with a reference. M> * M> * XXXGL: reduce copy-paste with solisten_clone(). M> @@ -1304,6 +1304,8 @@ sopeeloff(struct socket *head) M> M> VNET_ASSERT(head->so_vnet != NULL, ("%s:%d so_vnet is NULL, head=%p", M> __func__, __LINE__, head)); M> + KASSERT(head->so_type == SOCK_SEQPACKET, M> + ("%s: unexpecte so_type: %d", __func__, head->so_type)); M> so = soalloc(head->so_vnet); M> if (so == NULL) { M> log(LOG_DEBUG, "%s: pcb %p: New socket allocation failure: " M> @@ -1311,7 +1313,7 @@ sopeeloff(struct socket *head) M> __func__, head->so_pcb); M> return (NULL); M> } M> - so->so_type = head->so_type; M> + so->so_type = SOCK_STREAM; M> so->so_options = head->so_options; M> so->so_linger = head->so_linger; M> so->so_state = (head->so_state & SS_NBIO) | SS_ISCONNECTED; This creates a socket where: so->so_type != so->so_proto->pr_type. I'm not sure this is a good idea. I was actually looking into removing so_type at all. What does SCTP idea is about this peel-off thing? If the resulting socket is a stream one, shouldn't its so_proto point at sctp_stream_protosw? -- Gleb Smirnoff From nobody Mon Feb 2 19:51:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4cgX6tbvz6QR66 for ; Mon, 02 Feb 2026 19: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4cgX65Tlz3vyD for ; Mon, 02 Feb 2026 19: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=1770061880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcty59WImHchDj5nR1P5+GB/YhV7BsRHY8vSopQS9tA=; b=c/1fjL7m11fbbWrzA60XrcqSrLHO530Dw/U1e/hzKdTFMD4EQROHFCltgdEqAPiVftRNk1 NyphC+f8Rckka8P7FfGCq0Yp09hg1LDuOkYmFiL+S4O0+gdjUUJ/Ruvbi46EtnoONo73Sl xYbKFm+tEorumiTpDLNZ5AtMjLTzO7CrpW12c3Lx2UKbJWLo59gqyWq9QJxT+HD643bouw sv1jSmUFxVy+mj5FsvBFLXrrn2rglI4tIZHwF8KrJW5GCRru/5sMOhcI1ewgz981VUTlDR yFtm4XEyz14jZ3TdJc1TNNRWvx0HdEYR9a/F6uW/DFTO9yi6BTtworSSkkUP8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770061880; a=rsa-sha256; cv=none; b=hBfwQUvDHd0ZvKa57UjbaWX3OnCOcw2IX+hMyMkNZr15GCGYB8dlvVpogZrwt7OrN5FkaO H6MU+v/4KBZtO6V8+XQ34N3mq1iYk32XEz6+ZGBUWFMXAOQqBPi9GugvQ+btMBem8YzIgN WK3EMx9W/fR8gEPB05wpYPJKQioaouEVh+tUWLv/huKwcRxxwtPknN7ZfQt89rKyLnN95h T6JhdJUGshL0GVRVMLBiT+zexPCgo6XK5dA3H1JLGW4BESY+/17yfBf83ZvUnwLmhV2ZJi gwC5Is87F7Dv7NBUXuO8FFLe9miuxHyqg6d6H3zP+RQQEQy+q2D83YCICgbzsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770061880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcty59WImHchDj5nR1P5+GB/YhV7BsRHY8vSopQS9tA=; b=XVnPOVFaglHMgvE/bTsqsHSNJ6GzEMZj85k1s5w0IRjbj2t52q4bnHwzbyT+MDfCFge00V xoEgixpWofoxqzm5HZGjlHT6skwKudHEltZIoGDA8xuTChUGrEHbDPREFXQNZCGU7IOxYg tl3BWKmcQB0MZYhq/Vq1N4P8qfPomuhPzbIbm/BROtr/Jjmnk6AAOOCeJriun4fDXnoUJO lNjneV4CmAP9TOaKrK8JrQBT0OrW4/4azbn3FNleENHB1AQANn341Dh9yiTuRwWjugiiSh 3TjorVns+QhyuXaS2pWlDVv/Z0wcKiXHZMdvfsfIOYcZt+VBg9/02R410hwscA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4cgX5Y0Jzgyb for ; Mon, 02 Feb 2026 19:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38a1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 19:51:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a8e92198f854 - main - devfs: unlock the directory vnode around the call to dev_clone handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8e92198f854c2766eedec5a2ea3cc23c64d7b12 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 19:51:20 +0000 Message-Id: <69810038.38a1b.716c7132@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e92198f854c2766eedec5a2ea3cc23c64d7b12 commit a8e92198f854c2766eedec5a2ea3cc23c64d7b12 Author: Konstantin Belousov AuthorDate: 2026-01-26 01:49:32 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-02 19:48:25 +0000 devfs: unlock the directory vnode around the call to dev_clone handler The lock around dev_clone is unfortunate because cloner might need to take its own locks that establish the order with devfs vnodes, and then transiently participates in further VFS locks order. For instance, this way the proctree_lock or allproc_lock become involved. Unlock dvp, we can unwind if the vnode become doomed while cloner was called. Reported and tested by: pho Reviewed by: kevans, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55028 --- sys/fs/devfs/devfs_vnops.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 323f1e0fa961..d594b1584757 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -367,6 +367,9 @@ devfs_populate_vp(struct vnode *vp) ASSERT_VOP_LOCKED(vp, "devfs_populate_vp"); + if (VN_IS_DOOMED(vp)) + return (ENOENT); + dmp = VFSTODEVFS(vp->v_mount); if (!devfs_populate_needed(dmp)) { sx_xlock(&dmp->dm_lock); @@ -1128,8 +1131,25 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlock) cdev = NULL; DEVFS_DMP_HOLD(dmp); sx_xunlock(&dmp->dm_lock); + dvplocked = VOP_ISLOCKED(dvp); + + /* + * Invoke the dev_clone handler. Unlock dvp around it + * to simplify the cloner operations. + * + * If dvp is reclaimed while we unlocked it, we return + * with ENOENT by some of the paths below. If cloner + * returned cdev, then devfs_populate_vp() notes the + * reclamation. Otherwise, note that either our devfs + * mount is being unmounted, then DEVFS_DMP_DROP() + * returns true, and we return ENOENT this way. Or, + * because de == NULL, the check for it after the loop + * returns ENOENT. + */ + VOP_UNLOCK(dvp); EVENTHANDLER_INVOKE(dev_clone, td->td_ucred, pname, strlen(pname), &cdev); + vn_lock(dvp, dvplocked | LK_RETRY); if (cdev == NULL) sx_xlock(&dmp->dm_lock); From nobody Mon Feb 2 20:15:50 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4dCp3QgBz6QSg3 for ; Mon, 02 Feb 2026 20:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4dCp2b94z414G for ; Mon, 02 Feb 2026 20:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770063350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PIXGp5QqW2PQrLj35XY/UhA1hmcEeOzCfBVlse44pTs=; b=W+kRbBeIPirRTSMtIb4qbgXR6BUUxOXYFa3sGIg0woe2FKXs+oJeDg8yDxgsqcOMtMIPlC 1PYVa/MSBEbXIMaJYv3fLvxE/Z1jm5QsGMoom0XUWUbgtwsKnXyfuWzWZ8imAgqid/yGme aZFN+a+Mg68jI+bcqLgKIy3DJZ3YViMl5sdtCg4+aytuG5UuivWcQzZJ8DgmUxp8wHRJGk NvfqOjYd4naQKky/FOsyebLgSkdy0B2SWQT8Hmx15hO9x4Ik+ogIw3fYkD5l04NO2zQPuG JZgSMy4sBiCzu9t72ZOy2kN1z8wXwZuulne5FfMA784BnFhXtS7qUlQJArmQUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770063350; a=rsa-sha256; cv=none; b=Z3PUVL1fzSDLw18ggdz3CX9b12t/xLVD+fMwlc8tfsoBVUr+A3RyJa/57UH8sUgiFs32IA OSOjv77SJXzLl2clgoRoIvfMcFa/NM4kzd1Uy52TY2Xya6stXNvBwDxvAZKw/yyA/HtSJ2 BwvvHI4nI9D//l77VDmNArxFpuw7WvQ5QWDim/BPrVPFFx9JyjzXjT2XBPRJEF11B/ebRe uwyLCu7N9Uz0zRQBOvbuwcQkWixorIpd6cJtg3Ty6SOKG134cV8/0SExChHsEjwBu7GqM7 ZFeTUHlW7sijqO8FQHt7iKR1jfDkb37AE1vBI3ST0tslMp23baIcKGr99R9giQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770063350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PIXGp5QqW2PQrLj35XY/UhA1hmcEeOzCfBVlse44pTs=; b=UH1kvkwgxRXXJ8vWrC1o5tW8AWfxzJUbkXGmTHCaeBEMXCOHSaKmzYQ2rfj8OYkz1y2vc7 V77ID3Gs0pVQWL2WmFKSMkZUonDJ1ChTgqctW9rmPFfONjrlDxwnwuV+j/xgBFlimrDFZs U6vIDn+g7LvwS3irzA4Pl97xmcCyvyTpaoFw5jo3eVrJuBQEi9Dw05/tCuwejStD6tp7dy O2Y1zWTyGQ3QJdJw5guOdJeLCrFT5t5HsosWLB/U2hhoUZW6nivCDePeSBCfu8QcUBNFF8 cVgB07vnEJpp9WlaE55pp39fycB+ehTrUpJgz5xqzIz7hRtYX9KOLBzC9dsu8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4dCp1vBjzhLd for ; Mon, 02 Feb 2026 20:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38957 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 20:15:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 32c3723f0655 - main - tests/netgraph: fix tests that depended on connect(in6addr_any) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32c3723f06554db7d0da49c6f361c7b8f1a394c1 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 20:15:50 +0000 Message-Id: <698105f6.38957.c7dd361@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=32c3723f06554db7d0da49c6f361c7b8f1a394c1 commit 32c3723f06554db7d0da49c6f361c7b8f1a394c1 Author: Gleb Smirnoff AuthorDate: 2026-02-02 20:15:26 +0000 Commit: Gleb Smirnoff CommitDate: 2026-02-02 20:15:26 +0000 tests/netgraph: fix tests that depended on connect(in6addr_any) Fixes: 627e126dbb07b167b028380ef61bb45f10493938 --- tests/sys/netgraph/ksocket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/netgraph/ksocket.c b/tests/sys/netgraph/ksocket.c index a60c17bd337f..356639256253 100644 --- a/tests/sys/netgraph/ksocket.c +++ b/tests/sys/netgraph/ksocket.c @@ -119,6 +119,8 @@ ATF_TC_BODY(udp6_connect, tc) }; struct sockaddr_in6 sin6 = { .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = in6addr_loopback, }; socklen_t slen = sizeof(sin6); int cs, ds, us; @@ -148,6 +150,7 @@ ATF_TC_BODY(udp6_bind, tc) struct sockaddr_in6 sin6 = { .sin6_family = AF_INET6, .sin6_len = sizeof(sin6), + .sin6_addr = in6addr_loopback, }; struct ng_mesg *rep; int cs, ds, us; From nobody Mon Feb 2 20:37:41 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4dj20C1qz6QTwh for ; Mon, 02 Feb 2026 20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4dj16fSFz441N for ; Mon, 02 Feb 2026 20:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770064662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P9zxRQeKQOWNo2gadvMcdyK7bWE1HF4VxB6XwQL9Kyk=; b=O235eWy24jnps0InjYrVGN/6hrzNDflv5OVmknp8QG3kS+ak8Gg+nac1E1z1EtKRP+GtcI aAVKur+vbPld2HEExAfYKCF3WoyItXb9+Dw2RpOPTz453/Jzjf5wI16nLEZ3ZJVUgiwV7t rE9tc4H4o1PN/y1QHHt1GGCfcEYrW4MeXv4CUBYmDxkEirBUuBHRbuvUhJ+fcEE06JJuJr /cfzkKTY5LATcq/PY37J/2wVep7VUfm5Htmte65m7NunObxA9W122JlUffx1rIjDFBBAAO S4PXjLwAg2AZLxHmLKwDS1jJGZk8Xt631AaWQEyLeJWq+TRsFZ8z7knGEqnOAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770064662; a=rsa-sha256; cv=none; b=C/XSE/7zaAxz7Lbzov9mdqtDopjgmdW0vr8Q2CX+TY9J+CVhh7IJd0UjklZVVSJrt3wvM4 aQ50ZDZwqTK4AkomgVQXoBWJmZznvlrNyZqXW5OGtzg1SmJ0rluVPR3u5i9LqcENZbIuuL tHvaKqfbsLM0G7ZWRcahXWtFXF8zFVjzvMuzLEFAEPDjUmm8OqAhHcEdkZmdYN+IMfm0HW IZJ/hNFQmRJD97gFipD5rwRybHwy9detj8z2io4HBv5fdOhVECOkG49tygYOEfQLj9JO45 dttYtjxQfMBgiSCstV6cQsh+noeKj/AxJyZxZnDop7OhXddA9wung5RfKP7trg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770064662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P9zxRQeKQOWNo2gadvMcdyK7bWE1HF4VxB6XwQL9Kyk=; b=CqYAJus/+TCyxlI941qyZsypyrVt/10ci0kyXWIIB/+W7r/KCLVeG/wlwkN3bYZEP+yM3P VCdM+TfnzuHiZyQ9x2WwJwA0afYMxy2BGalwvEuwaUOw/Hi8tRghdr9HT29hfSVKZiVL9M bpuDMp/1pJjp41G6kZMl2kJekaCmFxAovgxlH7uaZbQBGy5ux6a4wXlmeXHXV0Ik86Jwax 3a6YwGfxmSy4y2W+ARIDAg7phdZ+HNmVlx+lHB6uSMNGRpnbyySuurz2m0TxAnbInYNPg2 s+9Yo/OA8n6/X+/3ErsK39ai6aPROWhKOcxUxSp2aBI4u2Xle+5HFXUaKX+p2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4dj15k5bzhpg for ; Mon, 02 Feb 2026 20:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c618 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 20:37:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Hall Subject: git: 69f535564125 - main - RELNOTES: Add entry for 7f54c65abc67 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrhall X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69f535564125f6c59b02616c806ab7fcf9563878 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 20:37:41 +0000 Message-Id: <69810b15.3c618.32bb036d@gitrepo.freebsd.org> The branch main has been updated by jrhall: URL: https://cgit.FreeBSD.org/src/commit/?id=69f535564125f6c59b02616c806ab7fcf9563878 commit 69f535564125f6c59b02616c806ab7fcf9563878 Author: John Hall AuthorDate: 2026-02-02 20:35:19 +0000 Commit: John Hall CommitDate: 2026-02-02 20:37:15 +0000 RELNOTES: Add entry for 7f54c65abc67 --- RELNOTES | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RELNOTES b/RELNOTES index 18649952c7cd..9ccece997074 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,13 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +7f54c65abc67: + Update smartpqi(4) to vendor version 14.4690.0.2008 - 15.2.0.2008 + for the SmartArray storage controllers. This adds support for new + controllers, adds code that utilizes the new BIG_IOCTL_Command_struct + and allows the I/O buffer size for a single passthrough ioctl to be + stored as a 32 bit integer instead of the original 16 bit integer. + b0d997095022: The pf firewall now supports passing IPv6 packets to divert(4) sockets via divert-to actions. From nobody Mon Feb 2 20:51:59 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4f1W6sfZz6QWW3 for ; Mon, 02 Feb 2026 20:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4f1W62QZz45JP for ; Mon, 02 Feb 2026 20:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770065519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoiKCWHraXbz3m2kj99pXaBrOx5adpg1ZhrFqSBE4JM=; b=KvGiTT4fyoZbicHS647207IJCbWheXWhL8oyisXKLUCJKb4tBircYzhE2ae2VBy0aJBHi4 IsK3Njt4bfQ7cUBpljyOq+sOJ0vuKVYVR712FPcAITHjWZo7BWJPFpXV8dM+GZGsRd7D4L Z3SCrvXuuLXf/I/EqpXzsC+vM8RXp+03oqzxNYw1UoLx/QGU39Q7zZOMknx4wtjnAaojnw IfUhfSmJlKWAocLm0B3q7iYHnkgDBujPwlQ2RbQi2KMWW2Y6MFuD7c4SoN80/531VZ+Fkf 5hK+3IUoBxw66tZs1k9nxvKUQloJlmgw626dKTNuzmfzkNO+JhyyeEbfPkP+vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770065519; a=rsa-sha256; cv=none; b=iak2rh162zIeK+mRhugsT2jGd588lohe4roE2QT6SoEZuKM5V0Cbnb+dXF73M5h4LUc2Bp BnH2YCOfJzq11eE3o+y+5NqwFdV9sx4OPRh65BgxKcDlYus8UG+bUQ/Wa2eeyT4w4q4C4h USr0pgdTy6N7WVBSCSHiKiKd5m9TvYJ2rjKn2N3NMMDK8nVY8m9zB1sIJVck0WUIP5JWPD NNZDA+n+fqLBnyZsfW6mQzdJADny5U7cB0jCM4YFeo4LkS8IH8wCDfvIOM5gzk7IIkns9N SdALf7yazDeAeC+wnfjjQJHotVA6MGDU2i8V7Y5jSRxUt+tskHBfU1sYIXOlZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770065519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoiKCWHraXbz3m2kj99pXaBrOx5adpg1ZhrFqSBE4JM=; b=A+/00S9IpCzSjs6IyZqxP0eC9GsJt7oiCmp00E/iUzmemL3zGs8VVMwVvOftfbkvFNFVGk gcJNQmwiV9ht13aUrj2SVDac4q6H5pmNxN583FdEb49uH8a9ZgQKKH3tW/mLP7l+vo6BLy BRRlxaASFzFijBCQ6Nmp8BRdpxqI9F4y1iA1zpdEEs/OYmQwGMhnPYE4z3qkXfAA8W7eWv qUKx++9fUM+yZUG5TA6AWi924aoQJwONQ03x/j+X9vpZQB/iEOP5JosU5cNUqQ1GyIPzHh mxHrbo2RMCJ8X/1z0YDwoAsjGo+dKY0zwKr9SkQgYmCB9vvfBe3jjLTwboVT3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4f1W5Lbhzjk2 for ; Mon, 02 Feb 2026 20:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e40d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 20:51:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: dafba19e42e7 - main - MFV less v691 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dafba19e42e78cd3d7c9264ece49ddd3d7d70da5 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 20:51:59 +0000 Message-Id: <69810e6f.3e40d.3f762f14@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=dafba19e42e78cd3d7c9264ece49ddd3d7d70da5 commit dafba19e42e78cd3d7c9264ece49ddd3d7d70da5 Merge: 69f535564125 c408e7413bcf Author: Xin LI AuthorDate: 2026-02-02 20:50:35 +0000 Commit: Xin LI CommitDate: 2026-02-02 20:50:35 +0000 MFV less v691 Relnotes: yes MFC after: 2 weeks contrib/less/NEWS | 62 ++ contrib/less/README | 60 +- contrib/less/ch.c | 12 +- contrib/less/charset.c | 14 +- contrib/less/cmd.h | 22 + contrib/less/cmdbuf.c | 136 ++-- contrib/less/command.c | 85 +-- contrib/less/compose.uni | 14 +- contrib/less/decode.c | 101 ++- contrib/less/edit.c | 14 +- contrib/less/filename.c | 13 +- contrib/less/fmt.uni | 2 +- contrib/less/forwback.c | 35 +- contrib/less/funcs.h | 75 ++- contrib/less/help.c | 5 +- contrib/less/ifile.c | 10 +- contrib/less/input.c | 1 - contrib/less/jump.c | 16 +- contrib/less/lang.h | 3 + contrib/less/less.h | 17 +- contrib/less/less.hlp | 3 + contrib/less/less.nro | 1487 ++++++++++++++++++++++++++++-------------- contrib/less/lessecho.nro | 37 +- contrib/less/lesskey.nro | 357 ++++++---- contrib/less/lesskey_parse.c | 26 +- contrib/less/line.c | 37 +- contrib/less/lsystem.c | 20 +- contrib/less/main.c | 53 +- contrib/less/mark.c | 152 +++-- contrib/less/omit.uni | 2 +- contrib/less/optfunc.c | 128 ++-- contrib/less/option.c | 132 ++-- contrib/less/opttbl.c | 7 + contrib/less/os.c | 63 +- contrib/less/output.c | 36 +- contrib/less/pckeys.h | 41 +- contrib/less/position.c | 14 +- contrib/less/prompt.c | 36 +- contrib/less/screen.c | 486 +++++++++----- contrib/less/search.c | 21 +- contrib/less/signal.c | 28 +- contrib/less/tags.c | 7 +- contrib/less/ttyin.c | 4 +- contrib/less/ubin.uni | 2 +- contrib/less/version.c | 15 +- contrib/less/wide.uni | 23 +- contrib/less/xbuf.c | 3 +- contrib/less/xbuf.h | 2 +- usr.bin/less/defines.h | 116 ++-- 49 files changed, 2651 insertions(+), 1384 deletions(-) diff --cc contrib/less/README index 4bfdc5e5a67f,000000000000..a6954eb67c1e mode 100644,000000..100644 --- a/contrib/less/README +++ b/contrib/less/README @@@ -1,254 -1,0 +1,242 @@@ +************************************************************************** +************************************************************************** +** ** +** The FreeBSD Project has chosen to redistribute and modify Less under ** +** the 'Less License' (as described in the 'LICENSE' file). ** +** ** +************************************************************************** +************************************************************************** + + This is the source code distribution of "less". + This program is part of the GNU project (https://www.gnu.org). + + This program is free software. You may redistribute it and/or + modify it under the terms of either: + + 1. The GNU General Public License, as published by the Free + Software Foundation; either version 3, or (at your option) any + later version. A copy of this license is in the file COPYING. + or + 2. The Less License, in the file LICENSE. + + Please report any problems at https://github.com/gwsw/less/issues. + See https://greenwoodsoftware.com/less for the latest info. + Source repository is at https://github.com/gwsw/less.git. + +========================================================================= + +You should build from a clone of a git repository +ONLY IF you are doing development on the less source itself. +If you are merely using less as a tool, you should download a release +from https://greenwoodsoftware.com and NOT from github. + +The formatted manual page is in less.man. +The manual page nroff source is in less.nro. +Major changes made since the last posted version are in NEWS. + +======================================================================= +INSTALLATION (Unix & Linux systems only): + +1. Move the distributed source to its own directory and unpack it, + if you have not already done so. + +2. If you are building from a clone of a git repository, + type "make -f Makefile.aut distfiles". + If you are building from a numbered release package (a tar or + zip file with a name like less-999.tar.gz or less-999.zip downloaded + from greenwoodsoftware.com, not from github), you should skip this step. + +3. Type "sh configure". + This will generate a Makefile and a defines.h. + Warning: if you have a GNU sed, make sure it is version 2.05 or later. + + The file INSTALL describes the usage of the configure program in + general. In addition, these options to configure are supported: + + --with-editor=program + Specifies the default editor program used by the "v" command. + The default is "vi". + + --with-regex=lib + Specifies the regular expression library used by less for pattern + matching. The default is "auto", which means the configure program + finds a regular expression library automatically. Other values are: + gnu Use the GNU regex library. + pcre Use the PCRE library. + pcre2 Use the PCRE2 library. + posix Use the POSIX-compatible regcomp. + regcmp Use the regcmp library. + re_comp Use the re_comp library. + regcomp Use the V8-compatible regcomp. + regcomp-local Use Henry Spencer's V8-compatible regcomp + (source is supplied with less). + none No regular expressions, only simple string matching. + + --with-secure + Builds a "secure" version of less, with some features disabled + to prevent users from viewing other files, accessing shell + commands, etc. + + +4. It is a good idea to look over the generated Makefile and defines.h + and make sure they look ok. If you know of any peculiarities of + your system that configure might not have detected, you may fix the + Makefile now. Take particular notice of the list of "terminal" + libraries in the LIBS definition in the Makefile; these may need + to be edited. The terminal libraries will be some subset of - -lncurses -lcurses -ltermcap -ltermlib ++ -ltinfo -ltinfow -lxcurses -lncursesw -lncurses -lcurses -ltermcap -ltermlib + + If you wish, you may edit defines.h to remove some optional features. + If you choose not to include some features in your version, you may + wish to edit the manual page "less.nro" and the help page "less.hlp" + to remove the descriptions of the features which you are removing. + If you edit less.hlp, you should run "make -f Makefile.aut help.c". + +5. Type "make" and watch the fun. + +6. If the make succeeds, it will generate the programs "less", + "lesskey" and "lessecho" in your current directory. Test the + generated programs. + +7. When satisfied that it works, if you wish to install it + in a public place, type "make install". + + The default install destinations are: + Executables (less, lesskey, lessecho) in /usr/local/bin + Documentation (less.nro, lesskey.nro) in /usr/local/man/man1 + If you want to install any of these files elsewhere, define + bindir and/or mandir to the appropriate directories. + + +Note to hackers: comments noting possible improvements are enclosed +in double curly brackets {{ like this }}. + +(Note that the above note was originally written at a time when +"hackers" most commonly meant "enthusiastic and dedicated computer +programmers", not "persons who attempt to circumvent computer security".) + + + ++======================================================================= ++INSTALLATION (Windows-95, Windows-98 and Windows-NT systems only, ++ with Microsoft Visual C++, mingw, or Borland C) ++ ++1. Move the distributed source to its own directory. ++ ++2. If you wish, you may edit defines.wn to remove some optional features. ++ If you choose not to include some features in your version, you may ++ wish to edit the manual page less.man and the help page help.c ++ to remove the descriptions of the features which you are removing. ++ ++3. If you are using Microsoft Visual C++, run "nmake -f Makefile.wnm". ++ If you are using mingw, run "make -f Makefile.wng". ++ If you are using Borland C, run "make -f Makefile.wnb". ++ ++ If the environment variable SECURE_COMPILE is to 1 during the make, ++ a "secure" version of less is built, with some features disabled. ++ ++4. If the make succeeds, it will generate the programs "less.exe" and ++ "lesskey.exe" in your current directory. Test the generated programs. ++ ++ ++ +======================================================================= +INSTALLATION (MS-DOS systems only, + with Microsoft C, Borland C, or DJGPP) + +1. Move the distributed source to its own directory. + Depending on your compiler, you may need to convert the source + to have CR-LF rather than LF as line terminators. + +2. If you are using Microsoft C, rename MAKEFILE.DSU to MAKEFILE. + If you are using Borland C, rename MAKEFILE.DSB to MAKEFILE. + If you are using DJGPP, rename MAKEFILE.DSG to MAKEFILE. + +3. Look at MAKEFILE to make sure that the definitions for CC and LIBDIR + are correct. CC should be the name of your C compiler and + LIBDIR should be the directory where the C libraries reside (for + Microsoft C only). If these definitions need to be changed, you can + either modify the definitions directly in MAKEFILE, or set your + environment variables CC and/or LIBDIR to override the definitions + in MAKEFILE. + +4. If you wish, you may edit DEFINES.DS to remove some optional features. + If you choose not to include some features in your version, you may + wish to edit the manual page LESS.MAN and the help page HELP.C + to remove the descriptions of the features which you are removing. + +5. Run your "make" program and watch the fun. + If your "make" requires a flag to import environment variables, + you should use that flag. + If your compiler runs out of memory, try running "make -n >cmds.bat" + and then run cmds.bat. + +6. If the make succeeds, it will generate the programs "LESS.EXE" and + "LESSKEY.EXE" in your current directory. Test the generated programs. + +7. When satisfied that it works, you may wish to install LESS.EXE and + LESSKEY.EXE in a directory which is included in your PATH. + + + - ======================================================================= - INSTALLATION (Windows-95, Windows-98 and Windows-NT systems only, - with Borland C or Microsoft Visual C++) - - 1. Move the distributed source to its own directory. - - 2. If you are using Borland C, rename Makefile.wnb to Makefile. - If you are using Microsoft Visual C++, rename Makefile.wnm to Makefile. - - 3. Check the Makefile to make sure the definitions look ok. - - 4. If you wish, you may edit defines.wn to remove some optional features. - If you choose not to include some features in your version, you may - wish to edit the manual page less.man and the help page help.c - to remove the descriptions of the features which you are removing. - - 5. Type "make" and watch the fun. - - 6. If the make succeeds, it will generate the programs "less.exe" and - "lesskey.exe" in your current directory. Test the generated programs. - - 7. When satisfied that it works, if you wish to install it - in a public place, type "make install". - See step 6 of the Unix installation instructions for details - on how to change the default installation directories. - - - +======================================================================= +INSTALLATION (OS/2 systems only, + with EMX C) + +1. Move the distributed source to its own directory. + +2. Rename Makefile.o2e to Makefile. + +3. Check the Makefile to make sure the definitions look ok. + +4. If you wish, you may edit defines.o2 to remove some optional features. + If you choose not to include some features in your version, you may + wish to edit the manual page less.man and the help page help.c + to remove the descriptions of the features which you are removing. + +5. Type "make" and watch the fun. + +6. If the make succeeds, it will generate the programs "less.exe" and + "lesskey.exe" in your current directory. Test the generated programs. + +7. Make sure you have the emx runtime installed. You need the emx DLLs + emx.dll and emxlibcs.dll and also the termcap database, termcap.dat. + Make sure you have termcap.dat either in the default location or + somewhere in a directory listed in the PATH or INIT environment + variables. + +8. When satisfied that it works, you may wish to install less.exe, + lesskey.exe and scrsize.exe in a directory which is included in + your PATH. scrsize.exe is required only if you use a terminal + emulator such as xterm or rxvt. + + + +======================================================================= +INSTALLATION (OS-9 systems only, + with Microware C or Ultra C) + +1. Move the distributed source to its own directory. + +2. If you are using Microware C, rename Makefile.o9c to Makefile. + If you are using Ultra C, rename Makefile.o9u to Makefile. + +3. Check the Makefile to make sure the definitions look ok. + +4. If you wish, you may edit defines.o9 to remove some optional features. + If you choose not to include some features in your version, you may + wish to edit the manual page less.man and the help page help.c + to remove the descriptions of the features which you are removing. + +5. Type "dmake" and watch the fun. + The standard OS-9 "make" will probably not work. If you don't + have dmake, you can get a copy from os9archive.rtsi.com. + +6. If the make succeeds, it will generate the programs "less" and + "lesskey" in your current directory. Test the generated programs. + +7. When satisfied that it works, if you wish to install it + in a public place, type "dmake install". + See step 6 of the Unix installation instructions for details + on how to change the default installation directories. + - ======================================================================= - ACKNOWLEDGMENTS: - Some versions of the less distribution are packaged using - Info-ZIP's compression utility. - Info-ZIP's software is free and can be obtained as source - code or executables from various anonymous-ftp sites, - including ftp.uu.net:/pub/archiving/zip. diff --cc contrib/less/command.c index 390385547385,000000000000..4784cf45daa6 mode 100644,000000..100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@@ -1,2360 -1,0 +1,2365 @@@ +/* + * Copyright (C) 1984-2025 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ + + +/* + * User-level command processor. + */ + +#include "less.h" +#if MSDOS_COMPILER==WIN32C +#include +#endif +#include "position.h" +#include "option.h" +#include "cmd.h" + +extern int erase_char, erase2_char, kill_char; +extern int sigs; +extern int quit_if_one_screen; +extern int one_screen; +extern int sc_width; +extern int sc_height; +extern char *kent; +extern int swindow; +extern int jump_sline; +extern lbool quitting; +extern int wscroll; +extern int top_scroll; - extern int ignore_eoi; ++extern lbool ignore_eoi; +extern int hshift; +extern int bs_mode; +extern int proc_backspace; +extern int show_attn; +extern int less_is_more; +extern int chopline; +extern POSITION highest_hilite; +extern char *every_first_cmd; +extern char version[]; +extern struct scrpos initial_scrpos; +extern IFILE curr_ifile; +extern void *ml_search; +extern void *ml_examine; +extern int wheel_lines; +extern int def_search_type; +extern lbool search_wrapped; - extern lbool no_poll; +extern int no_paste; +extern lbool pasting; +extern int no_edit_warn; +extern POSITION soft_eof; +extern POSITION search_incr_start; +extern char *first_cmd_at_prompt; +#if SHELL_ESCAPE || PIPEC +extern void *ml_shell; +#endif +#if EDITOR +extern constant char *editproto; +#endif +#if OSC8_LINK +extern char *osc8_uri; +#endif +extern int shift_count; +extern int forw_prompt; +extern int incr_search; +extern int full_screen; +#if MSDOS_COMPILER==WIN32C +extern int utf_mode; +extern unsigned less_acp; +#endif + +#if SHELL_ESCAPE +static char *shellcmd = NULL; /* For holding last shell command for "!!" */ +#endif +static int mca; /* The multicharacter command (action) */ +static int search_type; /* The previous type of search */ +static int last_search_type; /* Type of last executed search */ +static LINENUM number; /* The number typed by the user */ +static long fraction; /* The fractional part of the number */ +static struct loption *curropt; +static lbool opt_lower; +static int optflag; +static lbool optgetname; +static POSITION bottompos; +static int save_hshift; +static int save_bs_mode; +static int save_proc_backspace; +static int screen_trashed_value = 0; +static lbool literal_char = FALSE; +static lbool ignoring_input = FALSE; +static struct scrpos search_incr_pos = { NULL_POSITION, 0 }; +static int search_incr_hshift; +#if HAVE_TIME +static time_type ignoring_input_time; +#endif +#if PIPEC +static char pipec; +#endif + +/* Stack of ungotten chars (via ungetcc) */ +struct ungot { + struct ungot *ug_next; + char ug_char; + lbool ug_end_command; +}; +static struct ungot* ungot = NULL; + +static void multi_search(constant char *pattern, int n, int silent); + +/* + * Move the cursor to start of prompt line before executing a command. + * This looks nicer if the command takes a long time before + * updating the screen. + */ +public void cmd_exec(void) +{ + clear_attn(); + clear_bot(); + flush(); +} + +/* + * Indicate we are reading a multi-character command. + */ +static void set_mca(int action) +{ + mca = action; + clear_bot(); + clear_cmd(); +} + +/* + * Indicate we are not reading a multi-character command. + */ +static void clear_mca(void) +{ + if (mca == 0) + return; + mca = 0; +} + +/* + * Set up the display to start a new multi-character command. + */ +static void start_mca(int action, constant char *prompt, void *mlist, int cmdflags) +{ + set_mca(action); + cmd_putstr(prompt); + set_mlist(mlist, cmdflags); +} + - public int in_mca(void) ++public lbool in_mca(void) +{ + return (mca != 0 && mca != A_PREFIX); +} + +/* + * Set up the display to start a new search command. + */ +static void mca_search1(void) +{ + int i; + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + set_mca(A_FILTER); + else +#endif + if (search_type & SRCH_FORW) + set_mca(A_F_SEARCH); + else + set_mca(A_B_SEARCH); + + if (search_type & SRCH_NO_MATCH) + cmd_putstr("Non-match "); + if (search_type & SRCH_FIRST_FILE) + cmd_putstr("First-file "); + if (search_type & SRCH_PAST_EOF) + cmd_putstr("EOF-ignore "); + if (search_type & SRCH_NO_MOVE) + cmd_putstr("Keep-pos "); + if (search_type & SRCH_NO_REGEX) + cmd_putstr("Regex-off "); + if (search_type & SRCH_WRAP) + cmd_putstr("Wrap "); + for (i = 1; i <= NUM_SEARCH_COLORS; i++) + { + if (search_type & SRCH_SUBSEARCH(i)) + { + char buf[INT_STRLEN_BOUND(int)+8]; + SNPRINTF1(buf, sizeof(buf), "Sub-%d ", i); + cmd_putstr(buf); + } + } + if (literal_char) + cmd_putstr("Lit "); + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + cmd_putstr("&/"); + else +#endif + if (search_type & SRCH_FORW) + cmd_putstr("/"); + else + cmd_putstr("?"); + forw_prompt = 0; +} + +static void mca_search(void) +{ + if (incr_search) + { + /* Remember where the incremental search started. */ + get_scrpos(&search_incr_pos, TOP); + search_incr_start = search_pos(search_type); + search_incr_hshift = hshift; + } + mca_search1(); + set_mlist(ml_search, 0); +} + +/* + * Set up the display to start a new toggle-option command. + */ +static void mca_opt_toggle(void) +{ + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + constant char *dash = (flag == OPT_NO_TOGGLE) ? "_" : "-"; + + set_mca(A_OPT_TOGGLE); + cmd_putstr(dash); + if (optgetname) + cmd_putstr(dash); + if (no_prompt) + cmd_putstr("(P)"); + switch (flag) + { + case OPT_UNSET: + cmd_putstr("+"); + break; + case OPT_SET: + cmd_putstr("!"); + break; + } + forw_prompt = 0; + set_mlist(NULL, CF_OPTION); +} + +/* + * Execute a multicharacter command. + */ +static void exec_mca(void) +{ + constant char *cbuf; + + cmd_exec(); + cbuf = get_cmdbuf(); + if (cbuf == NULL) + return; + + switch (mca) + { + case A_F_SEARCH: + case A_B_SEARCH: + multi_search(cbuf, (int) number, 0); + break; +#if HILITE_SEARCH + case A_FILTER: + search_type ^= SRCH_NO_MATCH; + set_filter_pattern(cbuf, search_type); + soft_eof = NULL_POSITION; + break; +#endif + case A_FIRSTCMD: + /* + * Skip leading spaces or + signs in the string. + */ + while (*cbuf == '+' || *cbuf == ' ') + cbuf++; + if (every_first_cmd != NULL) + free(every_first_cmd); + if (*cbuf == '\0') + every_first_cmd = NULL; + else + every_first_cmd = save(cbuf); + break; + case A_OPT_TOGGLE: + toggle_option(curropt, opt_lower, cbuf, optflag); + curropt = NULL; + break; + case A_F_BRACKET: + match_brac(cbuf[0], cbuf[1], 1, (int) number); + break; + case A_B_BRACKET: + match_brac(cbuf[1], cbuf[0], 0, (int) number); + break; +#if EXAMINE + case A_EXAMINE: { + char *p; + if (!secure_allow(SF_EXAMINE)) + break; + p = save(cbuf); + edit_list(p); + free(p); +#if TAGS + /* If tag structure is loaded then clean it up. */ + cleantags(); +#endif + break; } +#endif +#if SHELL_ESCAPE + case A_SHELL: { + /* + * !! just uses whatever is in shellcmd. + * Otherwise, copy cmdbuf to shellcmd, + * expanding any special characters ("%" or "#"). + */ + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "!done"; + if (done_msg == NULL) + ++cbuf; + if (*cbuf != '!') + { + if (shellcmd != NULL) + free(shellcmd); + shellcmd = fexpand(cbuf); + } + if (!secure_allow(SF_SHELL)) + break; + if (shellcmd == NULL) + shellcmd = ""; + lsystem(shellcmd, done_msg); + break; } + case A_PSHELL: { + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "#done"; + if (done_msg == NULL) + ++cbuf; + if (!secure_allow(SF_SHELL)) + break; + lsystem(pr_expand(cbuf), done_msg); + break; } +#endif +#if PIPEC + case A_PIPE: { + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "|done"; + if (done_msg == NULL) + ++cbuf; + if (!secure_allow(SF_PIPE)) + break; + (void) pipe_mark(pipec, cbuf); + if (done_msg != NULL) + error(done_msg, NULL_PARG); + break; } +#endif + } +} + +/* + * Is a character an erase or kill char? + */ +static lbool is_erase_char(char c) +{ + return (c == erase_char || c == erase2_char || c == kill_char); +} + +/* + * Is a character a carriage return or newline? + */ +static lbool is_newline_char(char c) +{ + return (c == '\n' || c == '\r'); +} + +/* + * Handle the first char of an option (after the initial dash). + */ +static int mca_opt_first_char(char c) +{ + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + if (flag == OPT_NO_TOGGLE) + { + switch (c) + { + case '_': + /* "__" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } else + { + switch (c) + { + case '+': + /* "-+" = UNSET. */ + optflag = no_prompt | ((flag == OPT_UNSET) ? + OPT_TOGGLE : OPT_UNSET); + mca_opt_toggle(); + return (MCA_MORE); + case '!': + /* "-!" = SET */ + optflag = no_prompt | ((flag == OPT_SET) ? + OPT_TOGGLE : OPT_SET); + mca_opt_toggle(); + return (MCA_MORE); + case CONTROL('P'): + optflag ^= OPT_NO_PROMPT; + mca_opt_toggle(); + return (MCA_MORE); + case '-': + /* "--" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } + /* Char was not handled here. */ + return (NO_MCA); +} + +/* + * Add a char to a long option name. + * See if we've got a match for an option name yet. + * If so, display the complete name and stop + * accepting chars until user hits RETURN. + */ +static int mca_opt_nonfirst_char(char c) +{ + constant char *p; + constant char *oname; + lbool ambig; + struct loption *was_curropt; + + if (curropt != NULL) + { + /* Already have a match for the name. */ + if (is_erase_char(c)) + return (MCA_DONE); + /* {{ Checking for TAB here is ugly. + * Also doesn't extend well -- can't do BACKTAB this way + * because it's a multichar sequence. }} */ + if (c != '\t') + return (MCA_MORE); + } + /* + * Add char to cmd buffer and try to match + * the option name. + */ + if (cmd_char(c) == CC_QUIT) + return (MCA_DONE); + p = get_cmdbuf(); + if (p == NULL || p[0] == '\0') + return (MCA_MORE); + opt_lower = ASCII_IS_LOWER(p[0]); + was_curropt = curropt; + curropt = findopt_name(&p, &oname, &ambig); + if (curropt != NULL) + { + if (was_curropt == NULL) + { + /* + * Got a match. + * Remember the option and + * display the full option name. + */ + cmd_reset(); + mca_opt_toggle(); + cmd_setstring(oname, !opt_lower); + } + } else if (!ambig) + { - bell(); ++ lbell(); + } + return (MCA_MORE); +} + +/* + * Handle a char of an option toggle command. + */ +static int mca_opt_char(char c) +{ + PARG parg; + + /* + * This may be a short option (single char), + * or one char of a long option name, + * or one char of the option parameter. + */ + if (curropt == NULL && cmdbuf_empty()) + { + int ret = mca_opt_first_char(c); + if (ret != NO_MCA) + return (ret); + } + if (optgetname) + { + /* We're getting a long option name. */ + if (!is_newline_char(c) && c != '=') + return (mca_opt_nonfirst_char(c)); + if (curropt == NULL) + { + parg.p_string = get_cmdbuf(); + if (parg.p_string == NULL) + return (MCA_MORE); + error("There is no --%s option", &parg); + return (MCA_DONE); + } + optgetname = FALSE; + cmd_reset(); + } else + { + if (is_erase_char(c)) + return (NO_MCA); + if (curropt != NULL) + /* We're getting the option parameter. */ + return (NO_MCA); + curropt = findopt(c); + if (curropt == NULL) + { + parg.p_string = propt(c); + error("There is no %s option", &parg); + return (MCA_DONE); + } + opt_lower = ASCII_IS_LOWER(c); + } + /* + * If the option which was entered does not take a + * parameter, toggle the option immediately, + * so user doesn't have to hit RETURN. + */ + if ((optflag & ~OPT_NO_PROMPT) != OPT_TOGGLE || + !opt_has_param(curropt)) + { + toggle_option(curropt, opt_lower, "", optflag); + return (MCA_DONE); + } + /* + * Display a prompt appropriate for the option parameter. + */ + start_mca(A_OPT_TOGGLE, opt_prompt(curropt), NULL, CF_OPTION); + return (MCA_MORE); +} + +/* + * Normalize search type. + */ +public int norm_search_type(int st) +{ + /* WRAP and PAST_EOF are mutually exclusive. */ + if ((st & (SRCH_PAST_EOF|SRCH_WRAP)) == (SRCH_PAST_EOF|SRCH_WRAP)) + st ^= SRCH_PAST_EOF; + return st; +} + +/* + * Handle a char of a search command. + */ +static int mca_search_char(char c) +{ + int flag = 0; + + /* + * Certain characters as the first char of + * the pattern have special meaning: + * ! Toggle the NO_MATCH flag + * * Toggle the PAST_EOF flag + * @ Toggle the FIRST_FILE flag + */ + if (!cmdbuf_empty() || literal_char) + { ++ lbool was_literal_char = literal_char; + literal_char = FALSE; ++ if (was_literal_char) ++ mca_search1(); + return (NO_MCA); + } + + switch (c) + { + case '*': + if (less_is_more) + break; + case CONTROL('E'): /* ignore END of file */ + if (mca != A_FILTER) + flag = SRCH_PAST_EOF; + search_type &= ~SRCH_WRAP; + break; + case '@': + if (less_is_more) + break; + case CONTROL('F'): /* FIRST file */ + if (mca != A_FILTER) + flag = SRCH_FIRST_FILE; + break; + case CONTROL('K'): /* KEEP position */ + if (mca != A_FILTER) + flag = SRCH_NO_MOVE; + break; + case CONTROL('S'): { /* SUBSEARCH */ + char buf[INT_STRLEN_BOUND(int)+24]; + SNPRINTF1(buf, sizeof(buf), "Sub-pattern (1-%d):", NUM_SEARCH_COLORS); + clear_bot(); + cmd_putstr(buf); + flush(); + c = getcc(); + if (c >= '1' && c <= '0'+NUM_SEARCH_COLORS) + flag = SRCH_SUBSEARCH(c-'0'); + else + flag = -1; /* calls mca_search() below to repaint */ + break; } + case CONTROL('W'): /* WRAP around */ + if (mca != A_FILTER) + flag = SRCH_WRAP; + break; + case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */ + flag = SRCH_NO_REGEX; + break; + case CONTROL('N'): /* NOT match */ + case '!': + flag = SRCH_NO_MATCH; *** 3370 LINES SKIPPED *** From nobody Mon Feb 2 21:20:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4ffX2xy3z6QYBY for ; Mon, 02 Feb 2026 21:20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4ffX1WsHz4735 for ; Mon, 02 Feb 2026 21:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770067236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=quvrJPELMRYrAxXP51f8kWsnYOg3NQ8zm++xBK6FUO4=; b=xSXOdj2VI5bSJzUaLeDJU8YsJ0178TB23tsOG903z22KERqrjlzFcsZkDlRXhTBkuPoQmt i5p4+LlRtrqACP2Aa++XW5RgHWeAUZlE8SA/dmfRwvsnxxpU9qwXCwO3P5j0r9/ad6bqU2 CRzf7R/Oz+d7MRkVaJdVeQ5DnP2ec6WAHrhMPPZeFeNZA90CQ1tfBE0FQRxb+3mN26nCQi MUhKsBsgUdCz91nn8+gFxnkxkTKCHHVR3YMwvrxNxuS/2RRL+zWAd285Qvtk/yXwdLLIUT UTJ1aWfvwUB+GEcL0v2EVJvR/+izkOIHWsHAENUDCOTnojynwlO0l1uODsy+aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770067236; a=rsa-sha256; cv=none; b=bmabzx58hnikY+J9iFH3nwCRjF9pRnAnSVLVqIz6fPL9DMPdoJ/yDGQxWMRKNtC5MP05pk uJ6B/JoHae1sDyFqwtIXluamk1gSbIxdR/WZ+a1Mfk0gRNcFqRM66+jM5drzmyMYwmxg0P 2OpvNEyRoIYA6FaZhh/IT5A6OK4prog8o9ycvV7nGwK95GUGDvbXYvBUofPQXk5p1THlVl rGfHpOZX5Q1QdKcKIkAxEofgtlti+nwcG6+aFIBtCm4izAOnfOrIzMCbg+EVhSROTtwePz sj9FFbENIhFA/cMk0mhwY88emCzskxcWtIWRqKnOefwjioe393XKrn2UNgO7hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770067236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=quvrJPELMRYrAxXP51f8kWsnYOg3NQ8zm++xBK6FUO4=; b=j/mYRQhyUDjMfh5CUNUrj/q5I9jfQStKDzy45FhZmlE/E1IOli0sN2FbKudyH29gPng2qM CLPyIe2xk38t4ncEfmrZDMVNaUC0jOW0q/uYNw15QjCti0/qJUkLR8xFE76fsTTj8Rfr6L UxRDG9abSLW4DYcSA+IzLPSur32sgM1K6f0sKV4LsH+Lk7UFCo3V6WKRY/V+O7FevJYAx8 E/qSD2lUyNxxzq9oIKx/dVJKvqgdss4JPAvFKtirt7o3ZqkTLyVje/NvNIY9Yhp60ObItJ Vqwn5tyd7Sqb3/hgqeenl813IFNQwj9CXbZJJFLOdSF/Ke4ImRlQxKrRBSgz5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4ffX17Y7zk3V for ; Mon, 02 Feb 2026 21:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4057c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 21:20:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 18d47c1856f4 - main - rpc: correct resultproc_t's type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18d47c1856f4ec3f7a2f9a726bba2ebe64d63dd7 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 21:20:36 +0000 Message-Id: <69811524.4057c.2aae73fb@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=18d47c1856f4ec3f7a2f9a726bba2ebe64d63dd7 commit 18d47c1856f4ec3f7a2f9a726bba2ebe64d63dd7 Author: Brooks Davis AuthorDate: 2026-02-02 21:20:16 +0000 Commit: Brooks Davis CommitDate: 2026-02-02 21:20:16 +0000 rpc: correct resultproc_t's type It takes exactly three arguments of known type. Tweak the types of various resultproc_t functions to match the type (mostly added const to struct pointers) allowing us to drop casts. Effort: CHERI upstreaming Reviewed by: vangyzen, glebius Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D54941 --- contrib/netbsd-tests/lib/libc/rpc/t_rpc.c | 5 +++-- include/rpc/clnt.h | 3 ++- lib/libc/rpc/rpc_soc.c | 8 +++++--- usr.bin/rpcinfo/rpcinfo.c | 8 +++++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c b/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c index 3000f6aec98b..2737151826bf 100644 --- a/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c +++ b/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c @@ -39,7 +39,8 @@ __RCSID("$NetBSD: t_rpc.c,v 1.10 2016/08/27 14:36:22 christos Exp $"); #define RPCBPROC_NULL 0 static int -reply(caddr_t replyp, struct netbuf * raddrp, struct netconfig * nconf) +reply(caddr_t replyp, const struct netbuf * raddrp, + const struct netconfig * nconf) { char host[NI_MAXHOST]; struct sockaddr *sock = raddrp->buf; @@ -244,7 +245,7 @@ allhosts(const char *transp) clnt_stat = rpc_broadcast(RPCBPROG, RPCBVERS, RPCBPROC_NULL, (xdrproc_t)xdr_void, NULL, (xdrproc_t)xdr_void, - NULL, (resultproc_t)reply, transp); + NULL, reply, transp); if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT) ERRX(EXIT_FAILURE, "%s", clnt_sperrno(clnt_stat)); } diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index eb5e1f5b350f..d7b3e2beb8c0 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -514,7 +514,8 @@ __END_DECLS * const char *nettype; -- Transport type */ -typedef bool_t (*resultproc_t)(caddr_t, ...); +typedef bool_t (*resultproc_t)(caddr_t, const struct netbuf *, + const struct netconfig *); __BEGIN_DECLS extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t, diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c index e986593badf4..24a19624d366 100644 --- a/lib/libc/rpc/rpc_soc.c +++ b/lib/libc/rpc/rpc_soc.c @@ -72,7 +72,8 @@ static CLIENT *clnt_com_create(struct sockaddr_in *, rpcprog_t, rpcvers_t, int *, u_int, u_int, char *); static SVCXPRT *svc_com_create(int, u_int, u_int, char *); -static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *); +static bool_t rpc_wrap_bcast(char *, const struct netbuf *, + const struct netconfig *); /* XXX */ #define IN4_LOCALHOST_STRING "127.0.0.1" @@ -318,7 +319,8 @@ static _Thread_local clnt_broadcast_resultproc_t clnt_broadcast_result; */ /* ARGSUSED */ static bool_t -rpc_wrap_bcast(char *resultp, struct netbuf *addr, struct netconfig *nconf) +rpc_wrap_bcast(char *resultp, const struct netbuf *addr, + const struct netconfig *nconf) /* * char *resultp; // results of the call * struct netbuf *addr; // address of the guy who responded @@ -355,7 +357,7 @@ clnt_broadcast(u_long prog, u_long vers, u_long proc, xdrproc_t xargs, ret = rpc_broadcast((rpcprog_t)prog, (rpcvers_t)vers, (rpcproc_t)proc, xargs, argsp, xresults, resultsp, - (resultproc_t) rpc_wrap_bcast, "udp"); + rpc_wrap_bcast, "udp"); clnt_broadcast_result = NULL; return (ret); diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c index 5f2dd4433292..5156dd2db4e0 100644 --- a/usr.bin/rpcinfo/rpcinfo.c +++ b/usr.bin/rpcinfo/rpcinfo.c @@ -125,7 +125,8 @@ static void pmapdump(int, char **); static void get_inet_address(struct sockaddr_in *, char *); #endif -static bool_t reply_proc(void *, struct netbuf *, struct netconfig *); +static bool_t reply_proc(char *, const struct netbuf *, + const struct netconfig *); static void brdcst(int, char **); static void addrping(char *, char *, int, char **); static void progping(char *, int, char **); @@ -584,7 +585,8 @@ get_inet_address(struct sockaddr_in *addr, char *host) /*ARGSUSED*/ static bool_t -reply_proc(void *res, struct netbuf *who, struct netconfig *nconf) +reply_proc(char *res __unused, const struct netbuf *who, + const struct netconfig *nconf) /* void *res; Nothing comes back */ /* struct netbuf *who; Who sent us the reply */ /* struct netconfig *nconf; On which transport the reply came */ @@ -621,7 +623,7 @@ brdcst(int argc, char **argv) vers = getvers(argv[1]); rpc_stat = rpc_broadcast(prognum, vers, NULLPROC, (xdrproc_t) xdr_void, (char *)NULL, (xdrproc_t) xdr_void, - (char *)NULL, (resultproc_t) reply_proc, NULL); + (char *)NULL, reply_proc, NULL); if ((rpc_stat != RPC_SUCCESS) && (rpc_stat != RPC_TIMEDOUT)) errx(1, "broadcast failed: %s", clnt_sperrno(rpc_stat)); exit(0); From nobody Mon Feb 2 21:20:33 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4ffV5Zq5z6QXrQ for ; Mon, 02 Feb 2026 21:20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4ffV11Xfz474x for ; Mon, 02 Feb 2026 21:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770067234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pP5ICkolVxKBhTPbdvIhDOTxO9HwPSxMoAq14EAZc7Q=; b=ZWB6DYVQPMVqeNOBRC8vWe5ki/1SRXKQk30VIXqZKaA1xlY5aF5SlPkasUqnhx+nMgVUUh wrgBudq/XdLOxsJrJ+HzGpdrUZgmq2EQahm9/j8wwWP3/Ds7UcDkge1UyOUQKGEnyp5sdO 6Jl8KvOviTBkfB+j7B4SVbi8T2n3nFbgPM/mxKS0JvKPgXbXdonQkjuoI7G9kSx66lBWzo 1WMUzMG0FCRuOOy1rRLo8SUX2Wm8qkSvV34Z/InqeV7WYQPMXmoh7XcUsrELvSqIYPHBkm Spp35QzRILiwySaGdsZ1w4BWFvKv0COUsTEhUJB4cX/MKCKsDTMGtUZKjiWaGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770067234; a=rsa-sha256; cv=none; b=YHzDOEw+DNH1xoaO3mGGlu50Vh5S4HeXq1d6ZwOWlAZ3INAkAExTjCFzGh6CI8edxzk6us 3jCw7Aqx8Gir/tqbvSKIrv8127dKPaZV0a6phjvmL+dkLmwe2CwxTTeGyuXCPTHLsevQ9r wsyEKarSYKo14O0ysC5fQhOpqFnVLDWQupeUeKb80DZ6gQxQcVa6Pg9P5EbBoeLCqLgv+i d2QL9I6wQ1/j+WyYIBS5R+E2JOM18QS9Fd2gI0UREE51l+vx8oJBRP4zozcRRCubggXFRh zlGVimjn9WiwIW5fT4WxkU1rjhXRmga+oCMEQ6g8BJ7qQEkCvohkiw09WqOU/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770067234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pP5ICkolVxKBhTPbdvIhDOTxO9HwPSxMoAq14EAZc7Q=; b=OPOfXiDq6M04VU4Lp+7XvjsgQIQIyeWIm20+KLBmNCF7lRF8bZ2B7sPNQ2cZMNhevUan/c E2lFVHr+GNS7mwJVFXpgqV21sYY5vbWEes/A2VAKZNtVuuQ+0t0sUmJpFiTGYBD61RcL4q URnAtPsftSVyzaXrpSrefXZ/p89zgZuAyLu09B7YZYQCbFZXdtO8Gl4n+yIi2frP5M0pJ3 LkkKTqAEjh43DssCr337lHRx/+luR4wzdELB9gGYqEIe1chYvU2GIX3qIjmvmX9+eHATF6 7N/3t1SF+UjRiS5EcJkuo7n0KeSoEMFqdywjWHml/BcOeTuaNFskPwqzvcAN4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4ffT6wRZzjlJ for ; Mon, 02 Feb 2026 21:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40578 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 21:20:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 47413f23e503 - main - clnt_broadcast(3): don't free function pointers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47413f23e503e796989b35dfb04e453c5b6e2d01 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 21:20:33 +0000 Message-Id: <69811521.40578.6fc3b83a@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=47413f23e503e796989b35dfb04e453c5b6e2d01 commit 47413f23e503e796989b35dfb04e453c5b6e2d01 Author: Brooks Davis AuthorDate: 2026-02-02 21:20:01 +0000 Commit: Brooks Davis CommitDate: 2026-02-02 21:20:01 +0000 clnt_broadcast(3): don't free function pointers Replace use of thr_getspecific/thr_setspecific to stash the function pointer we're smuggling between clnt_broadcast and rpc_wrap_bcast with a simple thread local variable. Clear it after use so the reference doesn't linger. In the relatively unlikely event clnt_broadcast was called from threads that exited prior to program termination, the previous code called free on a function pointer, which is undefined and might corrupted allocator state. Effort: CHERI upstreaming Reviewed by: glebius, jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D54939 --- lib/libc/rpc/rpc_soc.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c index c63b89594ce6..21a36cedf69f 100644 --- a/lib/libc/rpc/rpc_soc.c +++ b/lib/libc/rpc/rpc_soc.c @@ -307,19 +307,10 @@ registerrpc(int prognum, int versnum, int procnum, } /* - * All the following clnt_broadcast stuff is convulated; it supports - * the earlier calling style of the callback function + * Support the earlier calling style of the callback function with a + * per-thread temporary copy of the real callback. */ -static thread_key_t clnt_broadcast_key; -static resultproc_t clnt_broadcast_result_main; -static once_t clnt_broadcast_once = ONCE_INITIALIZER; - -static void -clnt_broadcast_key_init(void) -{ - - thr_keycreate(&clnt_broadcast_key, free); -} +static _Thread_local resultproc_t clnt_broadcast_result; /* * Need to translate the netbuf address into sockaddr_in address. @@ -334,14 +325,8 @@ rpc_wrap_bcast(char *resultp, struct netbuf *addr, struct netconfig *nconf) * struct netconfig *nconf; // Netconf of the transport */ { - resultproc_t clnt_broadcast_result; - if (strcmp(nconf->nc_netid, "udp")) return (FALSE); - if (thr_main()) - clnt_broadcast_result = clnt_broadcast_result_main; - else - clnt_broadcast_result = (resultproc_t)thr_getspecific(clnt_broadcast_key); return (*clnt_broadcast_result)(resultp, (struct sockaddr_in *)addr->buf); } @@ -363,16 +348,16 @@ clnt_broadcast(u_long prog, u_long vers, u_long proc, xdrproc_t xargs, * resultproc_t eachresult; // call with each result obtained */ { + enum clnt_stat ret; - if (thr_main()) - clnt_broadcast_result_main = eachresult; - else { - thr_once(&clnt_broadcast_once, clnt_broadcast_key_init); - thr_setspecific(clnt_broadcast_key, (void *) eachresult); - } - return rpc_broadcast((rpcprog_t)prog, (rpcvers_t)vers, + clnt_broadcast_result = eachresult; + + ret = rpc_broadcast((rpcprog_t)prog, (rpcvers_t)vers, (rpcproc_t)proc, xargs, argsp, xresults, resultsp, (resultproc_t) rpc_wrap_bcast, "udp"); + + clnt_broadcast_result = NULL; + return (ret); } /* From nobody Mon Feb 2 21:20:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4ffW479Wz6QYBV for ; Mon, 02 Feb 2026 21:20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4ffW0wXtz47J8 for ; Mon, 02 Feb 2026 21:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770067235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ns/tmPf5xBmQ3dzQs1W0fXBYTnlaLTqfE1A9kwaf5A=; b=dyCgxzGsEGnuWbM9x+eSKGWynBL4Av/uAi0XQgI0smXas9ZAUc6AZ91pefKL3cpWZa7WAK /aJqob7M7i28Q9vfZZGCLd1xMcmpXceB0ZIPvqAkl7uFM0I3ptiB5IZ7ZDpvzPbs7v3jVL fwLDB0Bpyvv4Hbs++lSgg0FV1/jE2/8aZqaIcj7SM7oBpWGfs/nCGkMJWglYnR/lO1dlaL t4AhBk/9pGPsaJ8GiZGkyPss1QH9xTeE5zcf1+jznDREDoztFZSCP/D5YRW7M/pYQyN3or tFMypGnoC5Ve7NsnP+oROyku3Yjv6EzyDBJvqBze55ASKEifGc8Y/+QvdoX1hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770067235; a=rsa-sha256; cv=none; b=ROP+9e/ASXuvB+Wg7DbiXUgChISYeu6/miq5EqrrldQ76i4zXC124XeyNS9O0TnRFdChzu sjQ2BpdtSW3BHciY70Jp1qmyOXMUW4bKFzzBK7T4UwK5UvJ4b39I0osWFnkwDDjk+VqbkH 3D/Y2rtGxRHFTDhcDILe6EYjnT8C1b2ALyIivIdl5zf5PEaAXJOUlI180ZMdF1+ImuxBim NpJA0HwhEh1pT0RfDdtJzhzAbswTNQv9QufEny3lHPy2tPSyUDzO3MPj5Kp7rHDENQGisD EHzZ/d4fN9EIsE7pEPaAfzoEb6oSShSB+kcmVG9y+LEGw4Q9kWbZTblAPFkG2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770067235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ns/tmPf5xBmQ3dzQs1W0fXBYTnlaLTqfE1A9kwaf5A=; b=ulWZiwS5PSuBjMguofgD/AeXWBFEsWZqEnDinsBhdK+6sGtu9DOQjNMd0VK/m0M8uIxhfg WEI38VhRO3OS4xw/d5DlqFif6Cx8SzxORD4y4hHCGO6bwBQnR73Fv5tLqRwzEbL/InfaQJ nqalnnW5riS9CELvi71pGBLhX6VTMirBdPpU/+mi6ALKPisGMoEe+hW0+YHXWxFrixD4Eg WiEyiXgZmtZlzyQiHTa+C8BIFZsC+9ORXfgeQ7dLzIjpmcAklER/RIufyyiHkH/qBtZQbi OqjIyYBV5Zo5bnR4WTBzb9wm4bowiXTWCrbOPnzt0xbbnLSgkHqnA+oVC//JQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4ffW0Wtrzk11 for ; Mon, 02 Feb 2026 21:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41327 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 21:20:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e236502a997d - main - clnt_broadcast(3): fix eachresult argument type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e236502a997da6bc94d018d5c5f79bfe17f0f1e7 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 21:20:35 +0000 Message-Id: <69811523.41327.6964471e@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e236502a997da6bc94d018d5c5f79bfe17f0f1e7 commit e236502a997da6bc94d018d5c5f79bfe17f0f1e7 Author: Brooks Davis AuthorDate: 2026-02-02 21:20:10 +0000 Commit: Brooks Davis CommitDate: 2026-02-02 21:20:10 +0000 clnt_broadcast(3): fix eachresult argument type The `eachresult` argument is documented to take a function pointer of type: bool_t (*)(caddr_t, struct sockaddr_in *) It was declared to take a resultproc_t which has historically been declared to be: bool_t (*resultproc_t)(caddr_t, ...); This overlapped well enough for currently supported ABIs where variadic arguments are passed in registers, but this declaration is misaligned with the documentation (resultproc_t takes three arguments) and will be fixed in a followup commit. Fix the type to be non-variadic, matching callbacks, and define a convenience type of as most callbacks take something other than a char * as their first argument and need to be cast. Effort: CHERI upstreaming Reviewed by: ngie, glebius, jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D54940 --- include/rpc/pmap_clnt.h | 4 +++- lib/libc/rpc/rpc_soc.c | 5 +++-- usr.bin/rup/rup.c | 2 +- usr.bin/rusers/rusers.c | 2 +- usr.sbin/bootparamd/callbootd/callbootd.c | 4 ++-- usr.sbin/ypbind/ypbind.c | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index d3a67778530b..7d6cee307573 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -64,6 +64,8 @@ #include __BEGIN_DECLS +typedef bool_t (*clnt_broadcast_resultproc_t)(caddr_t, struct sockaddr_in *); + extern bool_t pmap_set(u_long, u_long, int, int); extern bool_t pmap_unset(u_long, u_long); extern struct pmaplist *pmap_getmaps(struct sockaddr_in *); @@ -75,7 +77,7 @@ extern enum clnt_stat pmap_rmtcall(struct sockaddr_in *, extern enum clnt_stat clnt_broadcast(u_long, u_long, u_long, xdrproc_t, void *, xdrproc_t, void *, - resultproc_t); + clnt_broadcast_resultproc_t); extern u_short pmap_getport(struct sockaddr_in *, u_long, u_long, u_int); __END_DECLS diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c index 21a36cedf69f..e986593badf4 100644 --- a/lib/libc/rpc/rpc_soc.c +++ b/lib/libc/rpc/rpc_soc.c @@ -310,7 +310,7 @@ registerrpc(int prognum, int versnum, int procnum, * Support the earlier calling style of the callback function with a * per-thread temporary copy of the real callback. */ -static _Thread_local resultproc_t clnt_broadcast_result; +static _Thread_local clnt_broadcast_resultproc_t clnt_broadcast_result; /* * Need to translate the netbuf address into sockaddr_in address. @@ -336,7 +336,8 @@ rpc_wrap_bcast(char *resultp, struct netbuf *addr, struct netconfig *nconf) */ enum clnt_stat clnt_broadcast(u_long prog, u_long vers, u_long proc, xdrproc_t xargs, - void *argsp, xdrproc_t xresults, void *resultsp, resultproc_t eachresult) + void *argsp, xdrproc_t xresults, void *resultsp, + clnt_broadcast_resultproc_t eachresult) /* * u_long prog; // program number * u_long vers; // version number diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c index 5f605f55b413..d53d4ebcd28e 100644 --- a/usr.bin/rup/rup.c +++ b/usr.bin/rup/rup.c @@ -206,7 +206,7 @@ allhosts(void) clnt_stat = clnt_broadcast(RSTATPROG, RSTATVERS_TIME, RSTATPROC_STATS, (xdrproc_t)xdr_void, NULL, (xdrproc_t)xdr_statstime, &host_stat, - (resultproc_t)rstat_reply); + (clnt_broadcast_resultproc_t)rstat_reply); if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT) errx(1, "%s", clnt_sperrno(clnt_stat)); } diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c index 413de53c304b..c23b79240fad 100644 --- a/usr.bin/rusers/rusers.c +++ b/usr.bin/rusers/rusers.c @@ -208,7 +208,7 @@ allhosts(void) clnt_stat = clnt_broadcast(RUSERSPROG, RUSERSVERS_IDLE, RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL, (xdrproc_t)xdr_utmpidlearr, (char *)&up, - (resultproc_t)rusers_reply); + (clnt_broadcast_resultproc_t)rusers_reply); if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT) errx(1, "%s", clnt_sperrno(clnt_stat)); } diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c index f9939d83cab9..69d62f0c4bee 100644 --- a/usr.sbin/bootparamd/callbootd/callbootd.c +++ b/usr.sbin/bootparamd/callbootd/callbootd.c @@ -111,7 +111,7 @@ main(int argc, char **argv) (char *)&whoami_arg, (xdrproc_t)xdr_bp_whoami_res, (char *)&stat_whoami_res, - (resultproc_t)eachres_whoami); + (clnt_broadcast_resultproc_t)eachres_whoami); exit(0); } @@ -134,7 +134,7 @@ main(int argc, char **argv) (char *)&getfile_arg, (xdrproc_t)xdr_bp_getfile_res, (char *)&stat_getfile_res, - (resultproc_t)eachres_getfile); + (clnt_broadcast_resultproc_t)eachres_getfile); exit(0); } diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c index 2aacfa5c87d6..6ed45eeb8dc6 100644 --- a/usr.sbin/ypbind/ypbind.c +++ b/usr.sbin/ypbind/ypbind.c @@ -748,7 +748,7 @@ broadcast(struct _dom_binding *ypdb) stat = clnt_broadcast(YPPROG, YPVERS, YPPROC_DOMAIN_NONACK, (xdrproc_t)xdr_domainname, &ptr, (xdrproc_t)xdr_bool, &out, - (resultproc_t)broadcast_result); + (clnt_broadcast_resultproc_t)broadcast_result); } if (stat != RPC_SUCCESS) { From nobody Mon Feb 2 22:01:51 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4gZ753n8z6Qc0V for ; Mon, 02 Feb 2026 22:01: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4gZ73cb5z4Ffg for ; Mon, 02 Feb 2026 22:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770069711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hqEdHL3Il867TgAlghEY7C/n9w0N+Gkx6aMeFkhHRSM=; b=LAfLPnEmfCXMBLUu8EK2uFWjf5mZW/T4lnfRNK2mLeeKeoROC21Lxk4C6XxLOo1UhmdAzU kziDHBGaAqjeus4lrGZon3XMcId1a698k1yWZ3QoDqceDYGoniFnKr/4/D4/KpmEL03Byw xpiBIeyv8nWNcK+f0uqip9cKL/Nkxrgj9yaGgoWLkwtcDclAMPQhsdlAMdrtiWjiuy62dH x/FhJrtYDJmibrzT5vn4QNseL0fsuX3++N5JR1Xuvlb9PPZVomf/DjM70rfaiyFLBpmNZP ssa8Fae3GJzb8YeOTwgp+yautCV2oYsqyk4D9DDyKggMDbEfZpv7jmXo/HaqZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770069711; a=rsa-sha256; cv=none; b=VRBgkzg4ZIwxXr/zxFucvt5p9VqeNjC/rT2jvIG/ylqYuB21acFxLycz2w9Tfqf3kNKw0O gjrOr/h3HUcu66ba2bPoelCul4SMCGja5nn0PzQW6teu6z/v5S3FbyBC8iem91YM3d25pS lG8Z1phjJl/7mDoe/NFRyt/4Pss+5gMm6DnWscSLo9i+GOCgdnUaMEr6uCyWhICEpxkiEz 66O7mtSuq/j3hnrArLdYfAzmPkH3Ekh0BWDLC8z9vzKdGXOOJF68XOAA0gfNW6vPCS//FO F1lHLmwSmRhKg7xh7k1aQpfbGWXgughXYV4sC1NtoRh4QnEvFk5OCtMApxyFTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770069711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hqEdHL3Il867TgAlghEY7C/n9w0N+Gkx6aMeFkhHRSM=; b=BwrR76nmVLOa/Le1YhRyMrG78/s12k6XIEm7E2e4QZmdS28unPDFD/upFFbR7PmXRG0v94 +RGIG+ZkiSWz960Dz2awHzTqbzt4dgiZzku920DOQCLTKVDNx4zjTI/MxD71lvA1aKDmGz TLla8NbYz408lssxN2XEpn+e9lbZfVsWoYdNAshtRnahNEzimleGfEqRpakEc3yWErJclT X0aJqdm2bBwHY/iFE/RxQxErOwKVzg4o3Pso30V7DwTwN6XFtsBhdSE2KsuaWtVJwW0RWs qgPGDEzR2ShmpOBw3l4GQVwMpEbkuCvdvHbFqY7iwr9TY96pIA+ScPDB8BNdfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4gZ73CF9zl22 for ; Mon, 02 Feb 2026 22:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4439e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 22:01:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: bfbcd310bd49 - main - Revert "sym(4): Employ memory barriers also on x86" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfbcd310bd4997c4ddb21bb81d61f2f29c68937c Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 22:01:51 +0000 Message-Id: <69811ecf.4439e.6c2a24fc@gitrepo.freebsd.org> The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=bfbcd310bd4997c4ddb21bb81d61f2f29c68937c commit bfbcd310bd4997c4ddb21bb81d61f2f29c68937c Author: Marius Strobl AuthorDate: 2026-01-28 21:20:42 +0000 Commit: Marius Strobl CommitDate: 2026-02-02 21:53:13 +0000 Revert "sym(4): Employ memory barriers also on x86" The problem will be avoided in a different way. This reverts commit e769bc77184312b6137a9b180c97b87c0760b849. --- sys/dev/sym/sym_hipd.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index f78d595a73ce..0e51607fb07a 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -58,6 +58,7 @@ */ #include +#define SYM_DRIVER_NAME "sym-1.6.5-20000902" /* #define SYM_DEBUG_GENERIC_SUPPORT */ @@ -113,16 +114,27 @@ typedef u_int32_t u32; #include /* - * Architectures may implement weak ordering that requires memory barriers - * to be used for LOADS and STORES to become globally visible (and also IO - * barriers when they make sense). - */ -#ifdef __powerpc__ -#define MEMORY_READ_BARRIER() __asm__ volatile("eieio; sync" : : : "memory") -#define MEMORY_WRITE_BARRIER() MEMORY_READ_BARRIER() + * IA32 architecture does not reorder STORES and prevents + * LOADS from passing STORES. It is called `program order' + * by Intel and allows device drivers to deal with memory + * ordering by only ensuring that the code is not reordered + * by the compiler when ordering is required. + * Other architectures implement a weaker ordering that + * requires memory barriers (and also IO barriers when they + * make sense) to be used. + */ +#if defined __i386__ || defined __amd64__ +#define MEMORY_BARRIER() do { ; } while(0) +#elif defined __powerpc__ +#define MEMORY_BARRIER() __asm__ volatile("eieio; sync" : : : "memory") +#elif defined __arm__ +#define MEMORY_BARRIER() dmb() +#elif defined __aarch64__ +#define MEMORY_BARRIER() dmb(sy) +#elif defined __riscv +#define MEMORY_BARRIER() fence() #else -#define MEMORY_READ_BARRIER() rmb() -#define MEMORY_WRITE_BARRIER() wmb() +#error "Not supported platform" #endif /* @@ -880,13 +892,13 @@ struct sym_nvram { */ #define OUTL_DSP(v) \ do { \ - MEMORY_WRITE_BARRIER(); \ + MEMORY_BARRIER(); \ OUTL (nc_dsp, (v)); \ } while (0) #define OUTONB_STD() \ do { \ - MEMORY_WRITE_BARRIER(); \ + MEMORY_BARRIER(); \ OUTONB (nc_dcntl, (STD|NOCOM)); \ } while (0) @@ -2896,7 +2908,7 @@ static void sym_put_start_queue(hcb_p np, ccb_p cp) if (qidx >= MAX_QUEUE*2) qidx = 0; np->squeue [qidx] = cpu_to_scr(np->idletask_ba); - MEMORY_WRITE_BARRIER(); + MEMORY_BARRIER(); np->squeue [np->squeueput] = cpu_to_scr(cp->ccb_ba); np->squeueput = qidx; @@ -2908,7 +2920,7 @@ static void sym_put_start_queue(hcb_p np, ccb_p cp) * Script processor may be waiting for reselect. * Wake it up. */ - MEMORY_WRITE_BARRIER(); + MEMORY_BARRIER(); OUTB (nc_istat, SIGP|np->istat_sem); } @@ -3049,7 +3061,7 @@ static int sym_wakeup_done (hcb_p np) cp = sym_ccb_from_dsa(np, dsa); if (cp) { - MEMORY_READ_BARRIER(); + MEMORY_BARRIER(); sym_complete_ok (np, cp); ++n; } else @@ -3847,7 +3859,7 @@ static void sym_intr1 (hcb_p np) * On paper, a memory barrier may be needed here. * And since we are paranoid ... :) */ - MEMORY_READ_BARRIER(); + MEMORY_BARRIER(); /* * First, interrupts we want to service cleanly. From nobody Mon Feb 2 22:01:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4gZ92hwWz6QbdH for ; Mon, 02 Feb 2026 22:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4gZ84RYpz4FnR for ; Mon, 02 Feb 2026 22:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770069712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfC1nGRLMVWvTn5QZVJtnxyL/PJ/l9H/zv3YfigCOVM=; b=QmRVEp4LLY/KGKHgQjPdFcgXjaW2eAKtXnDE0L4HfJpmb2+2d47FLPl1c5Zk9KiJPeFeXv Dv3Lc1VJs1zGcLznkoSpawywiTydBxeGVE4z6c5EH/V4SFtZqN094YAhFxQUCcA3eEACwf DeGtw7NIBPh8OjbU6i1w37eKDa9kZlg5yGpp1aaJRIonbetW4t4pwJ7t+Dm5Q8ToRAVC6B /F5MuFMTHJ4tQFtIXpfA3qQ+8+wdaBzIQz7h0arjqdQ/pvUBYul6kwi82IuPMPOIikG4Hy yUVEV5Dr9h6XRPpuzzjV+kqAWbxiV6HATa2pR1J0Dt0UGJ+H3OeSCgnO6Lue9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770069712; a=rsa-sha256; cv=none; b=GEJHUc5xE6s0hnI5y7kl4dWGzi9E3zJzPJtJkiauFh9iKbpL5YmEU5C9zHWAgh6323nT55 3p+ty87ScauRswtc0nln6gUyaGmm6LXTOGCzn2JslYxGYiU16EIIaZpAGM1gUBJ97OMj4W Ozi9IiRumBQdQG47NJ6NF1htFnz/aDiAyXE+s9XrotVVlJEhYop8lhdIkA2RdWE/ktfdRV zDHNE3CHiv6q9L/60NfoURDcVm4g7QrBdlLC0RXpS2GBtV8zNfyTy/GCAlYsVbst/8WVve uqfyUJbcIvwVn1zZdZsVULNFhXadsU9Vz6GLOB0QWm5S5374tAptfAfiio/5JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770069712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfC1nGRLMVWvTn5QZVJtnxyL/PJ/l9H/zv3YfigCOVM=; b=ra+SJ4I1lzG+ImW3GlnUxYJkUBIE6soMXCw8Nw91t6qdYT/scMaeTC4ppPJENR5xm7FuOy SA/II4qy70SMTrGaMhMOSrg27gTZQahvOeRX1O97NhR4m59uuMztGgYqOqf2zqaxXC/yJq w/ziNjogCDYgbllZm0sLqCXYpcmYZ+nGdN276G+7Hm0Edb1pReEVGHw6GGS88mEh60r3aw oUBQgx3+PDjXRhbiLJBD/TDJaEsEbRUQFLAS9VhixUoI1NRIUnRieuEumRM2F96mjLa+YC OO9noq/XMdUg4150070nW5aKfqmPfohzAR/loZB5oYtHCiQQJz7KfAUtAkptJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4gZ83t7KzkJh for ; Mon, 02 Feb 2026 22:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45437 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 22:01:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: b941d1c64e58 - main - sym(4): Map HCB memory as uncacheable also on x86 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b941d1c64e58708c93621cc07ed1c8e5e709cd48 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 22:01:52 +0000 Message-Id: <69811ed0.45437.6b347bb1@gitrepo.freebsd.org> The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=b941d1c64e58708c93621cc07ed1c8e5e709cd48 commit b941d1c64e58708c93621cc07ed1c8e5e709cd48 Author: Marius Strobl AuthorDate: 2026-02-02 21:30:42 +0000 Commit: Marius Strobl CommitDate: 2026-02-02 21:57:56 +0000 sym(4): Map HCB memory as uncacheable also on x86 As part of making the chip-specific mix and match of different accesses (DMA/bus space) work as desired, the intent is to map the HCB memory as uncacheable. Prior to VM_MEMATTR_*, the !x86 way of indicating this to bus_dmamem_alloc(9) was BUS_DMA_COHERENT. Then later on in 2db99100a4, BUS_DMA_NOCACHE was hooked up to VM_MEMATTR_UNCACHEABLE for x86. As it turns out, still as of today bus_dmamem_alloc(9) differs in this regard across architectures. On arm, it still supports BUS_DMA_COHERENT only for requesting uncacheable DMA and x86 still uses BUS_DMA_NOCACHE only. On arm64 and riscv, BUS_DMA_COHERENT seems to effectively be an alias for BUS_DMA_NOCACHE. Thus, allocate the HCB memory with BUS_DMA_COHERENT | BUS_DMA_NOCACHE, so we get uncacheable memory on all architectures including x86 and so loads and stores from/to HCB won't get reordered. However, even on x86 we still need to use at least compiler barriers to achieve the desired program order. This change should also fix panics due to out-of-sync data seen with FreeBSD VMs on top of OpenStack and HBAs of type lsiLogic as a result of loads and stores getting reordered. [1] While at it: - Nuke the unused SYM_DRIVER_NAME macro. - Remove unused/redundant HCB members and correct a comment typo. PR: 270816 [1] MFC after: 3 days --- sys/dev/sym/sym_hipd.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 0e51607fb07a..1399eadb21fb 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -58,7 +58,6 @@ */ #include -#define SYM_DRIVER_NAME "sym-1.6.5-20000902" /* #define SYM_DEBUG_GENERIC_SUPPORT */ @@ -114,17 +113,15 @@ typedef u_int32_t u32; #include /* - * IA32 architecture does not reorder STORES and prevents - * LOADS from passing STORES. It is called `program order' - * by Intel and allows device drivers to deal with memory - * ordering by only ensuring that the code is not reordered - * by the compiler when ordering is required. - * Other architectures implement a weaker ordering that - * requires memory barriers (and also IO barriers when they - * make sense) to be used. + * With uncacheable memory, x86 does not reorder STORES and prevents LOADS + * from passing STORES. For ensuring this program order, we still need to + * employ compiler barriers, though, when the ordering of LOADS and STORES + * matters. + * Other architectures may implement weaker ordering guarantees and, thus, + * require memory barriers (and also IO barriers) to be used. */ #if defined __i386__ || defined __amd64__ -#define MEMORY_BARRIER() do { ; } while(0) +#define MEMORY_BARRIER() __compiler_membar() #elif defined __powerpc__ #define MEMORY_BARRIER() __asm__ volatile("eieio; sync" : : : "memory") #elif defined __arm__ @@ -594,10 +591,10 @@ static m_addr_t ___dma_getp(m_pool_s *mp) goto out_err; if (bus_dmamem_alloc(mp->dmat, &vaddr, - BUS_DMA_COHERENT | BUS_DMA_WAITOK, &vbp->dmamap)) + BUS_DMA_COHERENT | BUS_DMA_NOCACHE | BUS_DMA_WAITOK, &vbp->dmamap)) goto out_err; - bus_dmamap_load(mp->dmat, vbp->dmamap, vaddr, - MEMO_CLUSTER_SIZE, getbaddrcb, &baddr, BUS_DMA_NOWAIT); + bus_dmamap_load(mp->dmat, vbp->dmamap, vaddr, MEMO_CLUSTER_SIZE, + getbaddrcb, &baddr, BUS_DMA_NOWAIT); if (baddr) { int hc = VTOB_HASH_CODE(vaddr); vbp->vaddr = (m_addr_t) vaddr; @@ -1484,7 +1481,7 @@ struct sym_hcb { u32 scr_ram_seg; /* - * Chip and controller indentification. + * Chip and controller identification. */ device_t device; @@ -1534,7 +1531,6 @@ struct sym_hcb { struct resource *io_res; struct resource *mmio_res; struct resource *ram_res; - int ram_id; void *intr; /* @@ -1558,8 +1554,6 @@ struct sym_hcb { * BUS addresses of the chip */ vm_offset_t mmio_ba; /* MMIO BUS address */ - int mmio_ws; /* MMIO Window size */ - vm_offset_t ram_ba; /* RAM BUS address */ int ram_ws; /* RAM window size */ @@ -8528,16 +8522,15 @@ sym_pci_attach(device_t dev) * Alloc/get/map/retrieve the corresponding resources. */ if (np->features & (FE_RAM|FE_RAM8K)) { - int regs_id = SYM_PCI_RAM; + i = SYM_PCI_RAM; if (np->features & FE_64BIT) - regs_id = SYM_PCI_RAM64; - np->ram_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - ®s_id, RF_ACTIVE); + i = SYM_PCI_RAM64; + np->ram_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &i, + RF_ACTIVE); if (!np->ram_res) { device_printf(dev,"failed to allocate RAM resources\n"); goto attach_failed; } - np->ram_id = regs_id; np->ram_ba = rman_get_start(np->ram_res); } @@ -8772,16 +8765,15 @@ sym_pci_detach(device_t dev) */ if (np->ram_res) bus_release_resource(np->device, SYS_RES_MEMORY, - np->ram_id, np->ram_res); + rman_get_rid(np->ram_res), np->ram_res); if (np->mmio_res) bus_release_resource(np->device, SYS_RES_MEMORY, - SYM_PCI_MMIO, np->mmio_res); + rman_get_rid(np->mmio_res), np->mmio_res); if (np->io_res) bus_release_resource(np->device, SYS_RES_IOPORT, - SYM_PCI_IO, np->io_res); + rman_get_rid(np->io_res), np->io_res); if (np->irq_res) - bus_release_resource(np->device, SYS_RES_IRQ, - 0, np->irq_res); + bus_release_resource(np->device, SYS_RES_IRQ, 0, np->irq_res); if (np->scriptb0) sym_mfree_dma(np->scriptb0, np->scriptb_sz, "SCRIPTB0"); From nobody Mon Feb 2 22:40:33 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4hQn63y9z6Qdqx for ; Mon, 02 Feb 2026 22:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4hQn5SBRz4Kt8 for ; Mon, 02 Feb 2026 22:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770072033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5JvRnnPTggSRFFS2oOZNYbv7HoWiiN43kafm2KNmTZA=; b=FcBjIZDMxwbOaPHGta9ctC5M4MLGO3WNzbAJon4P5wrPo0zft/INzAKjwzByC8YBm4jF/r txd8g2W6OrhIlDMdbJJsxm2FjOgC9olBXghCTGPJe/VqKqdraD+QICaYySC/woEb8KVtXs lIXwDRBr8VQXGOatGZmwDnkDxo72QPwO0HoaUOmnQPZSZW6/oDh168vu7Gai6sY/Yx4y7d 6adjFW92pubZM1vJlSgLqIUYRAhjo4cLDlJaT026Oz614JLVNBNW0gyQ386LiAjW7MtZDC a/uQEuguyuSdLVzE+eslwS26QJjYUoW4gwmLnBHVdOCbDUKbK23u/2+jYoEwRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770072033; a=rsa-sha256; cv=none; b=naCJo/6XZQTZzRuyjzBr3ssmgLK2bnKJtz1K6H64EibfCEB5KWiHR3yFeNp+ENvHnmQqIc b653Zgarz2JU6v6frm+yQcpMB/D8cXApCbyb11qCzRfn87c+crKNkdo90dtvV7uiOEATjo k6eN1TAjt94kRu+lzE/yKVqxDuGTCksV+0exax7p1G5TcOgVzUDPbGGFz+GD7Tee2NaOz1 NgiYmDrGOYsUDy2qtt0opLh4IYaiOtg4HlrhmyVe2bDJPkDJXMg5/AjTh+ofXrD/fG0GLy W87KXX23ivmn4mHEeqHMEiRMENJFfnnu7yyTl+opk25MVo9H8MJcuv2Watt9Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770072033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5JvRnnPTggSRFFS2oOZNYbv7HoWiiN43kafm2KNmTZA=; b=DSVuGEz92BSMI9fh0nc/O6bv9Bc45jvRsGQc0Ps/V0T7IsFk/BP/IB8NNqm1RrSh4R2QmP LVj9CiBv/1XBa8q7rNlQMBg4leVU6DpZw3uiSUhzm/9RrSgCNJ7C1ImP4OuowcxmgXZzTS Gg/JtQWJMsyqySAbHnRKyd+npVvimvDVRCJX3w2mCJ24rxs+vYNu59kG3qGRJHQvJtoJcn eJaaHTlja4vaWZUMrD9CQWnzkDsAyMEaFAx7aPVTPvqj7uH2tXvVH/uumzRjx1VwFINsdN 45FHI3IkyyViohxbjI0sU4lGnL19IWKVQ+haXYd5l4VGSberrzkA/Kw0QJ+JsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4hQn4ZTbzl3c for ; Mon, 02 Feb 2026 22:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19599 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 22:40:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 4bfb7cfb70e6 - main - runat: Add -h to manipulate a symlink's named attribute dir List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bfb7cfb70e62bc316de9e73cfd63a5c85541154 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 22:40:33 +0000 Message-Id: <698127e1.19599.44d1351c@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4bfb7cfb70e62bc316de9e73cfd63a5c85541154 commit 4bfb7cfb70e62bc316de9e73cfd63a5c85541154 Author: Rick Macklem AuthorDate: 2026-02-02 22:38:13 +0000 Commit: Rick Macklem CommitDate: 2026-02-02 22:38:13 +0000 runat: Add -h to manipulate a symlink's named attribute dir Lionel Cons requested that a new option be added to runat(1) so that it could be used to manipulate named attributes associated with a symbolic link and not the file the symbolic link refers to). This patch adds the option -h/--nofollow to do this. Requested by: Lionel Cons Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55023 --- usr.bin/runat/runat.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/usr.bin/runat/runat.c b/usr.bin/runat/runat.c index 99437f3472f4..eb30ef87f2f9 100644 --- a/usr.bin/runat/runat.c +++ b/usr.bin/runat/runat.c @@ -8,17 +8,25 @@ #include #include #include +#include #include #include +#include #include #include #include #include +static struct option longopts[] = { + { "nofollow", no_argument, NULL, 'h' }, + { "-", no_argument, NULL, '-' }, + { NULL, 0, NULL, 0} +}; + static void usage(void) { - (void)fprintf(stderr, "usage: runat " + (void)fprintf(stderr, "usage: runat [-h/--nofollow] [--] " "\n"); exit(1); } @@ -26,15 +34,28 @@ usage(void) int main(int argc, char *argv[]) { - int i, file_fd, nameddir_fd, outsiz; + int ch, file_fd, flags, i, longindex, nameddir_fd, outsiz; char *buf; long named_enabled; size_t pos, siz; + bool done_args; - if (argc <= 2) - usage(); - argv++; - argc--; + flags = O_RDONLY | O_CLOEXEC | O_PATH; + done_args = false; + while (!done_args && (ch = getopt_long(argc, argv, "h-", longopts, + &longindex)) != -1) + switch (ch) { + case 'h': + flags |= O_NOFOLLOW; + break; + case '-': + done_args = true; + break; + default: + usage(); + } + argv += optind; + argc -= optind; if (argc < 2) usage(); @@ -61,7 +82,7 @@ main(int argc, char *argv[]) } buf[pos - 1] = '\0'; - file_fd = open(argv[0], O_RDONLY | O_CLOEXEC, 0); + file_fd = open(argv[0], flags, 0); if (file_fd < 0) err(1, "Cannot open %s", argv[0]); nameddir_fd = openat(file_fd, ".", O_RDONLY | O_CLOEXEC | O_NAMEDATTR, From nobody Mon Feb 2 23:51:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4k0m5n1Yz6Qk8b for ; Mon, 02 Feb 2026 23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4k0m4dFLz3Hmp for ; Mon, 02 Feb 2026 23:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770076296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jK2HlBBUrOgTtQu7gjwAdyhWcBXd5QG29Kg+DRSY8bc=; b=RRGZ+dN969zLzhM5hxnMHy3RmlAf00zh8mg/SzShj0x//DgqaHyVkRq/s3KwEBdq+eeGHl HEYJ/seBX3Z5nuEBkQSCnNJAxR/MKDZmY0IwpwtUn5jibcWzmOuQ6fc6YyyDWncIh+9NpU kH2B/F2OKtD6MhHu9lwTXkL39qJXruedBkYYn41n7JvTM3gCd6yWXnlxjRH+cVwEvGhluG fzmlJ6qPICRkMN8kv9QMxRjgsxeiWDY+9LGpNObcndfWXnYfPpelPZE+w1CUUt8Db1hK81 dgTw0NJu0TLyXUJgqTJPydSAyWryDZHcO5BKu78K9VTTEYP+M3upJSxrtDPyPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770076296; a=rsa-sha256; cv=none; b=E0ZfHArQJ3RHg2SGl7S/gHpYD9OG+uCbDeJgj0CoaR3D7ALOfWuLLgPUw5YXFyjokea+gv XEF2F5FAC4/chYiTis0Wv4bi2kaDXUBaLLvWjL+DcmKJ+N+kH4NokLdZ7HRrE8lCkXmUmL RqF3tiFmI5caHypsnD+yGeoGLPzK4cw49UMBDip7dN5/OoLby1dPG51GX2EJp4om1rieuf Z9XJ2kh91LlVTjRO3oIbkaxi5IQPIYr3q99iBsJRTIWn5Npib0cvBCj4vL56wlMRQfG1P0 yVCDhdhSSxH2wcgzX8EMbNHT3RZnBIdLZfapmDDM8qe9YDARagIgW9JCOk/dJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770076296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jK2HlBBUrOgTtQu7gjwAdyhWcBXd5QG29Kg+DRSY8bc=; b=CwNMn2//X8qxlqoE5wuhR/e9L+2B8MYqK+fcr8IAFiGANhB3T8Vt4CrRakmtWqP+n2sFVf 7KSMh4O+aOrD7WC4xPRpeN3wnYmnGjvpAv2uCYsYS6p6gjkqQVToMeQ7xRvYtYsm918xDj hq6Ba/YOtD7AJq4bwI4iDCOBwjBzs+Ta2h9u2UvIf7MnxNxzbzRjRpmu1ay0cBH/89s/Xp j1r3YqmJcIsZFnI6bwzGxG01fZ4cAnnYSg6OLS5AqSXfaYy2o27CPOlMxbeiSKEXeHmp9a 0fMe4pQ+h2Eb/PZaVr78JcPVwCPUXYR16cGSivA0CB3AfPVU75MTmsrA/KNsDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4k0m46kxzp81 for ; Mon, 02 Feb 2026 23:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22020 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 23:51:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: fedc9746bd37 - main - acpi_spmc: Register SPMC suspend/resume routines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fedc9746bd37340a06dfcafea28904cf401127cf Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 23:51:36 +0000 Message-Id: <69813888.22020.13207046@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=fedc9746bd37340a06dfcafea28904cf401127cf commit fedc9746bd37340a06dfcafea28904cf401127cf Author: Aymeric Wibo AuthorDate: 2026-02-02 23:49:23 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-02 23:51:17 +0000 acpi_spmc: Register SPMC suspend/resume routines SPMC suspend runs after the device tree is suspended using the acpi_post_dev_suspend eventhandler, and SPMC resume runs before the device tree is resumed using the acpi_pre_dev_suspend eventhandler. Reviewed by: olce Approved by: olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48735 --- sys/dev/acpica/acpi_spmc.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index d8d28d59340d..e8ed14fdcb1b 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -8,12 +8,12 @@ */ #include -#include -#include #include +#include +#include #include +#include #include -#include #include @@ -158,6 +158,9 @@ struct acpi_spmc_softc { ACPI_OBJECT *obj; enum dsm_set_flags dsm_sets; + struct eventhandler_entry *eh_suspend; + struct eventhandler_entry *eh_resume; + bool constraints_populated; size_t constraint_count; struct acpi_spmc_constraint *constraints; @@ -168,6 +171,9 @@ static void acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, static int acpi_spmc_get_constraints(device_t dev); static void acpi_spmc_free_constraints(struct acpi_spmc_softc *sc); +static void acpi_spmc_suspend(device_t dev, enum power_stype stype); +static void acpi_spmc_resume(device_t dev, enum power_stype stype); + static int acpi_spmc_probe(device_t dev) { @@ -207,9 +213,8 @@ acpi_spmc_probe(device_t dev) static int acpi_spmc_attach(device_t dev) { - struct acpi_spmc_softc *sc; + struct acpi_spmc_softc *sc = device_get_softc(dev); - sc = device_get_softc(dev); sc->dev = dev; sc->handle = acpi_get_handle(dev); @@ -221,7 +226,12 @@ acpi_spmc_attach(device_t dev) sc->constraints = NULL; /* Get device constraints. We can only call this once so do this now. */ - acpi_spmc_get_constraints(sc->dev); + acpi_spmc_get_constraints(dev); + + sc->eh_suspend = EVENTHANDLER_REGISTER(acpi_post_dev_suspend, + acpi_spmc_suspend, dev, 0); + sc->eh_resume = EVENTHANDLER_REGISTER(acpi_pre_dev_resume, + acpi_spmc_resume, dev, 0); return (0); } @@ -229,6 +239,11 @@ acpi_spmc_attach(device_t dev) static int acpi_spmc_detach(device_t dev) { + struct acpi_spmc_softc *sc = device_get_softc(dev); + + EVENTHANDLER_DEREGISTER(acpi_post_dev_suspend, sc->eh_suspend); + EVENTHANDLER_DEREGISTER(acpi_pre_dev_resume, sc->eh_resume); + acpi_spmc_free_constraints(device_get_softc(dev)); return (0); } @@ -586,22 +601,24 @@ acpi_spmc_exit_notif(device_t dev) } } -static int -acpi_spmc_suspend(device_t dev) +static void +acpi_spmc_suspend(device_t dev, enum power_stype stype) { + if (stype != POWER_STYPE_SUSPEND_TO_IDLE) + return; + acpi_spmc_display_off_notif(dev); acpi_spmc_entry_notif(dev); - - return (0); } -static int -acpi_spmc_resume(device_t dev) +static void +acpi_spmc_resume(device_t dev, enum power_stype stype) { + if (stype != POWER_STYPE_SUSPEND_TO_IDLE) + return; + acpi_spmc_exit_notif(dev); acpi_spmc_display_on_notif(dev); - - return (0); } static device_method_t acpi_spmc_methods[] = { From nobody Mon Feb 2 23:51:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4k0r5Lncz6QkQ3 for ; Mon, 02 Feb 2026 23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4k0r4Lyzz3Hcv for ; Mon, 02 Feb 2026 23: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=1770076300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6FSTjYp/B9SmEiPrJ9HXwmFHkBteVLC3EASjpIGK/po=; b=yulbXsekGaopH6UsjVscnrh613H5kFVM4H6UJSxJ2m2mZ1GobYGe2WLKsjhzeCf/Lzuvw+ t0wbmzhI5IpMFpV9ADZIcZfOh2FYHXVadWm1Y+HDTgnsg6g90kFxqRdc5mMXYQaE8yXVUb kTqnESqSXVzouJ9jwhlJQA+lmw3f+633wiFup1ZxNuUGSuiPB5sB+rzTYNi38JSqcnjycN wZQ/hokgrPFFw5YXXLIBLNXiWZjuZX2AIjr+U2tFn9ehzGS6e3WEmi8Qxe6Z9Pih5v2SRe TxJ402slKiGTLrz62JrYBrE6Qx0bbOh3gEBemfcka0lDJlUbBCiXdmaFcStWpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770076300; a=rsa-sha256; cv=none; b=hUZck1FgKi7xex9RjK7Hj0I9rEYRoqCBAAY8c1MgV/JPhlayTGuavz+9W05HIiTt/b5qrQ mm7LSKMY35dVcA1Dn2swGQkqHirJLUzlBihDcFx0nJ+SYDevYfVhAXl1AOSM9NsH4yAfhI XfE80rSQlEGXnxZM94CZEZ7OoV0atAd/01gT+Gtq+dkI5VpuqtjkykaZhEsBNpV78bP9Bi U9oTmqXoM05O2s7+LSXyP5dOISl9JG13lCoDRE4DxLtVanB5InHWJJWJuiYIFDXd0uMFJE HcjcLN3w2Mz8RBPVYx9CnBasM0t5ZZjNRRKiR9/DqNjKqu1qzsxo+PAl8be3/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770076300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6FSTjYp/B9SmEiPrJ9HXwmFHkBteVLC3EASjpIGK/po=; b=sEb9CmaWAXwEzH7FjvbDJTWrJaZcbSkvF9x2rAZ3q2K1DsKtsUy/OvWRwhwOSOfXA3eUes KFpAMDThuEAnDVzCS7AiqRzC4GAubU7REbNwwnE9Oe2K1tHwZC8qHAi+P0L6tp5oTwXEAH y3IIc2zxkq5eOgkfjgf11dhK3983dDIEEx2LOwEK0zZzbf9dKVSN4bSasiB7HOnzbndTtq i/muSPnsBieFSWgsZ1u7XJ/4B6RVnn3Q/uzVod0Wg3mWS9U78bw7SRIVddOZhxmGUQiQAj uVriceF2RkuHgQmPY7RFq4DWpxM7FAtvyW4XjRk7i59RcyLi4dBeyi2zybUkCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4k0r3dGzzp9W for ; Mon, 02 Feb 2026 23:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2201c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 23:51:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 4a71fc3b5ceb - main - acpi: Post/pre device suspend/resume eventhandlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a71fc3b5cebdf3e6227470d50cf559bab28f26b Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 23:51:35 +0000 Message-Id: <69813887.2201c.5b0c76e@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=4a71fc3b5cebdf3e6227470d50cf559bab28f26b commit 4a71fc3b5cebdf3e6227470d50cf559bab28f26b Author: Aymeric Wibo AuthorDate: 2026-02-02 23:46:44 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-02 23:51:17 +0000 acpi: Post/pre device suspend/resume eventhandlers These eventhandlers are called after suspending the device tree and before resuming it. This is useful for PMC (power management controller) drivers. Reviewed by: olce Approved by: olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48735 --- sys/dev/acpica/acpi.c | 2 ++ sys/dev/acpica/acpivar.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 6944adafed8e..60a2dba91b05 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -3634,6 +3634,7 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) device_printf(sc->acpi_dev, "device_suspend failed\n"); goto backout; } + EVENTHANDLER_INVOKE(acpi_post_dev_suspend, stype); slp_state |= ACPI_SS_DEV_SUSPEND; if (stype != POWER_STYPE_SUSPEND_TO_IDLE) { @@ -3683,6 +3684,7 @@ backout: slp_state &= ~ACPI_SS_GPE_SET; } if ((slp_state & ACPI_SS_DEV_SUSPEND) != 0) { + EVENTHANDLER_INVOKE(acpi_pre_dev_resume, stype); DEVICE_RESUME(root_bus); slp_state &= ~ACPI_SS_DEV_SUSPEND; } diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 0ffb9f7c7cc3..eea54178060f 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -482,12 +482,14 @@ UINT32 acpi_event_sleep_button_wake(void *context); #define ACPI_EVENT_PRI_DEFAULT 10000 #define ACPI_EVENT_PRI_LAST 20000 -typedef void (*acpi_event_handler_t)(void *, int); +typedef void (*acpi_event_handler_t)(void *, enum power_stype); EVENTHANDLER_DECLARE(acpi_sleep_event, acpi_event_handler_t); EVENTHANDLER_DECLARE(acpi_wakeup_event, acpi_event_handler_t); EVENTHANDLER_DECLARE(acpi_acad_event, acpi_event_handler_t); EVENTHANDLER_DECLARE(acpi_video_event, acpi_event_handler_t); +EVENTHANDLER_DECLARE(acpi_post_dev_suspend, acpi_event_handler_t); +EVENTHANDLER_DECLARE(acpi_pre_dev_resume, acpi_event_handler_t); /* Device power control. */ ACPI_STATUS acpi_pwr_wake_enable(ACPI_HANDLE consumer, int enable); From nobody Tue Feb 3 01:52:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4mgj0Lt7z6QtQh for ; Tue, 03 Feb 2026 01:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4mgh6GFJz3Z15 for ; Tue, 03 Feb 2026 01:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770083520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1kbiCqZPSYtUOCotFpflhOU/QvZRwJ5ULRw748JaTBE=; b=OnRadBp2Xn39xs2k0f/bTYpCzyQf27Hk7YSAKGRJqXLMY2JDlAKz4AvsC5Dy3aSQp45w8k M5/dwCpm+ps4zvdStmZ+FDLXU64LU47Hxl4bCnxx+3Rvio7FMTl1jADvWtdBsUgJ/6efHD szmgcs2Fq/Fh85x0QHVn3xvqaX+5G2Ft1nnLk0mF3to0AVOR4V4X62f4brHU2Wx+L4+Yqw Xgpj15hf2XGlvdrNsnbWpiVgRdoEWlO519bshcDm/9utIWuZIpmsPqi0KijjnzNqYSMOAn cQbVRZMuxfHTKHiRvh0/1RNt3H7w3UlXXeBkMxNiiwUpb1iF/0IYGk89ENSWeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770083520; a=rsa-sha256; cv=none; b=O7v+9B6liBLiDQiGm/OHulOKn0jpLjg2gqQuYFWnlGem2i5ptZlEzE0s+/wYKw7GYzRYSQ bs54oWfm4KoY7yjWZqCbmGJfIbUbH01W00IcBy8zk4TC0t3oOcvbStCu0TheWQ9d686dHM 3CfxE5OcFn5tlaEeRM6wMgq/pXW/pNcoErKmNx/GHjN3MwXvU+Bm3Flm/AdM6w8sKDkMc+ 6uwitp/xyUDkMSfhck9Luea+1XyYONh/SyGnJXEB5I0hXWLysf4cna/OESdl8npQS5pEQA pia1IJCEuZuSVNcU0BBhzamnYSm7IbMH+c8kzddIjzoBOEmcLtAx4ndOXTBWsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770083520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1kbiCqZPSYtUOCotFpflhOU/QvZRwJ5ULRw748JaTBE=; b=wlhbMjWf/+HWTFPoEii7adLWmzaIPx29cZONEg5BugvjovFimJtITaeNZPhbjPQLFcPBWA raOn3UDMe68TE95ivwSGZ37yTcdk/gxFNwCzxS+TzmgJPkSCaTdcbc/mTrMhP2fpUqi/b6 ULWy7kyNLoSU3n4yWK3YDo12qeddkr1S3zjfnN3T7ClrT/SJOfSwN8d2p7j3CgLLeTKdae 823wtZBaobNXp3hpfnKpQQ1BiuRWZURVP3HzXrw/RhMQJykTgiT2oFx607dhVRfbhS6EMU /HIhf695MCCTH16pvPnAuQrLwKwKLlCxexnOwQXnRj0UqlV5G68Aw9xLqjVVMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4mgh5sB1zs3h for ; Tue, 03 Feb 2026 01:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e9d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 01:52:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 052a791b00555805f19ccc38a04d42d48b54104b Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 01:52:00 +0000 Message-Id: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=052a791b00555805f19ccc38a04d42d48b54104b commit 052a791b00555805f19ccc38a04d42d48b54104b Author: Abdelkader Boudih AuthorDate: 2026-02-03 01:43:00 +0000 Commit: Adrian Chadd CommitDate: 2026-02-03 01:51:37 +0000 acpi: add Darwin OSI quirk for Apple Mac hardware Mac firmware hides the Intel integrated GPU (iGPU) on dual GPU x86 systems, i.e., with AMD/NVIDIA dGPUs, when the Darwin OSI is not installed via ACPI. Prior to this change, FreeBSD always used the dGPU. This is fine in practice, but consumed more power than when the iGPU is used, resulting in reduced battery life. Linux handles this in `drivers/acpi/osi.c` by detecting Apple hardware via DMI, disabling all Windows OSI strings, and by explicitly installing the Darwin OSI ACPI handler. This change applies equivalent logic to the acpi(4) driver on FreeBSD. This feature can be enabled/disabled using the `hw.acpi.apple_darwin_osi` tunable. Setting this tunable to `0` restores the previous behavior by explicitly disabling the added support. Reviewed by: obiwac, ngie, adrian Differential Revision: https://reviews.freebsd.org/D54762 --- sys/dev/acpica/acpi.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 60a2dba91b05..8cdb73333462 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -293,6 +293,17 @@ static char acpi_remove_interface[256]; TUNABLE_STR("hw.acpi.remove_interface", acpi_remove_interface, sizeof(acpi_remove_interface)); +/* + * Automatically apply the Darwin OSI on Apple Mac hardware to obtain + * access to full ACPI hardware support on supported platforms. + * + * This flag automatically overrides any values set by + * `hw.acpi.acpi_install_interface` and unset by + * `hw.acpi.acpi_remove_interface`. + */ +static int acpi_apple_darwin_osi = 1; +TUNABLE_INT("hw.acpi.apple_darwin_osi", &acpi_apple_darwin_osi); + /* Allow users to dump Debug objects without ACPI debugger. */ static int acpi_debug_objects; TUNABLE_INT("debug.acpi.enable_debug_objects", &acpi_debug_objects); @@ -4903,6 +4914,67 @@ acpi_reset_interfaces(device_t dev) } acpi_free_interfaces(&list); } + + /* + * Apple Mac hardware quirk: install Darwin OSI. + * + * On Apple hardware, install the Darwin OSI and remove the Windows OSI + * to match Linux behavior. + * + * This is required for dual-GPU MacBook Pro systems + * (Intel iGPU + AMD/NVIDIA dGPU) where the iGPU is hidden when the + * firmware doesn't see Darwin OSI, but it also unlocks additional ACPI + * support on non-MacBook Pro Apple platforms. + * + * Apple's ACPI firmware checks _OSI("Darwin") and sets OSYS=10000 + * for macOS. Many device methods use OSDW() which checks OSYS==10000 + * for macOS-specific behavior including GPU visibility and power + * management. + * + * Linux enables Darwin OSI by default on Apple hardware and disables + * all Windows OSI strings (drivers/acpi/osi.c). Users can override + * this behavior with acpi_osi=!Darwin to get Windows-like behavior, + * in general, but this logic makes that process unnecessary. + * + * Detect Apple via SMBIOS and enable Darwin while disabling Windows + * vendor strings. This makes both GPUs visible on dual-GPU MacBook Pro + * systems (Intel iGPU + AMD dGPU) and unlocks full platform + * ACPI support. + */ + if (acpi_apple_darwin_osi) { + char *vendor = kern_getenv("smbios.system.maker"); + if (vendor != NULL) { + if (strcmp(vendor, "Apple Inc.") == 0 || + strcmp(vendor, "Apple Computer, Inc.") == 0) { + /* Disable all other OSI vendor strings. */ + status = AcpiUpdateInterfaces( + ACPI_DISABLE_ALL_VENDOR_STRINGS); + /* Install Darwin */ + if (ACPI_SUCCESS(status)) { + status = AcpiInstallInterface("Darwin"); + } + if (bootverbose) { + if (ACPI_SUCCESS(status)) { + device_printf(dev, + "Apple hardware: installed Darwin " + "OSI and removed other vendor OSI " + "(Windows, etc)\n"); + } else { + device_printf(dev, + "Apple hardware: failed to install " + "Darwin OSI: %s\n", + AcpiFormatException( + status)); + } + } + } else if (bootverbose) { + device_printf(dev, + "Not installing Darwin OSI on unsupported platform: %s\n", + vendor); + } + freeenv(vendor); + } + } } static int From nobody Tue Feb 3 02:43:25 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4nq22HKgz6QxPF for ; Tue, 03 Feb 2026 02:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4nq204qHz3g0m for ; Tue, 03 Feb 2026 02:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770086606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+bNbdV4Zkje9qMIdI387nDt0aVkoa+mWt5XvARBMtg=; b=MG0KnUs9YMd3LfOF4OfGTVZnTUxCQnNovozwl4CNVTu/TftWc2CiGx3AuuUuIeGRMoxpdM WrTEtNQonA283tIJm7t/IXAJukYE4ZQCkKZQ5BBkD3wx4wQEp50K8ISgZKJGSpo5StWbTz r2DTuRSnFBEnqZ/kXFdDRBovxAC3v1tiisYriXBH5bw3xadRZTz6+nvbJ4y7PGlCIOvSII qd5WtArclchY131KCkGvDTG7NjJsRj2atf32WIjCOvXRQyRPRJCvoduVe/Ae6ZGRyRjexw GaiOdqLLDeNBMGjEq+puQiyFlc2DA78jxGbd0J1NR2kHLLoL434XGmBsQmHwmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770086606; a=rsa-sha256; cv=none; b=OpcwADJs6nSgtiAMGN4NUciLpSPJWeJSbA4hKXAje3+2BRNsqKLy82p89FHupndcrHwQt8 +2hA7Pm9kBKDZ0ccYqf7Gd+zleU2bxFu/b6SH5A4y5lfSqjJRp7h931IUl8h8HEDV7HpXZ 4GkEEGkneBdfcW97QIwCr4aDzvWk/xbXvPYUwoCOzCOiLVqpO7ZC6mrRjOJ62TeikFDGqc iUWGPDZ4ZrUu46vB1iUC5dza4afgxZUQHggzX5fPlIkNzm+5bO0DPqrkaej/xvi7yVRhqD 2WPQU/JrDvrWfmegZC12tDkF1S0iMOZd2Q87KVDSFn6qF2bzcS59wWK51KyNzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770086606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+bNbdV4Zkje9qMIdI387nDt0aVkoa+mWt5XvARBMtg=; b=GLzYxfjN5JgG2blk7Hk41vGQlDmDbwQT3lrGM3iX6vokRNeayDGMKlfEtdBGp8M+SsnqQi El13HzaeHXWihRnxxTRVaVwZmPU1XV5AQZZRerJR+h7Z1o98vOnK3RB9hBgJ0FY66ThwI1 UKBlFlCQSzMRGpfwcvCrWe7fAs/sYgiaydsRQjzPGo1i4ap7pSFRjwwyP0esaQRcHkaSkJ W41QougbkTykcsdDntKXExjPoP6KUYiCVS9+ww4cAQsOC5DQJw0YjhC4HPEZVxXkd+d2rC 1timjPlVdp/rDgAiSW4vuUqboow+9G8R4pV3/Tz8iAuONso+5dhK5VRDWiVJNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4nq16VS7ztsv for ; Tue, 03 Feb 2026 02:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ac93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 02:43:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 120ca8d74b46 - main - Re-introduce kern.sched.topology_spec List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 120ca8d74b46caa260702485e30fe5f9f9984682 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 02:43:25 +0000 Message-Id: <698160cd.3ac93.4cb02c9b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=120ca8d74b46caa260702485e30fe5f9f9984682 commit 120ca8d74b46caa260702485e30fe5f9f9984682 Author: Konstantin Belousov AuthorDate: 2026-02-02 20:22:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-03 02:43:18 +0000 Re-introduce kern.sched.topology_spec Move it back from kern.sched.ule.topology_spec. Make it scheduler-agnostic. Provide trivial report for UP kernels. Apparently the MIB is used by some third-party software. Obviously it did not worked on UP or 4BSD configs. PR: 292574 Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55062 --- sys/kern/sched_shim.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ sys/kern/sched_ule.c | 92 --------------------------------------------------- sys/kern/subr_smp.c | 81 ++++++++++++++++++++++++++------------------- sys/sys/smp.h | 9 +++-- 4 files changed, 144 insertions(+), 129 deletions(-) diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c index ec5c42c37aab..83e4412494d3 100644 --- a/sys/kern/sched_shim.c +++ b/sys/kern/sched_shim.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -171,9 +172,12 @@ schedinit(void) active_sched->init(); } +struct cpu_group __read_mostly *cpu_top; /* CPU topology */ + static void sched_setup(void *dummy) { + cpu_top = smp_topo(); active_sched->setup(); } SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL); @@ -232,3 +236,90 @@ SYSCTL_PROC(_kern_sched, OID_AUTO, available, fixpt_t ccpu; SYSCTL_UINT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, "Decay factor used for updating %CPU"); + +/* + * Build the CPU topology dump string. Is recursively called to collect + * the topology tree. + */ +static int +sysctl_kern_sched_topology_spec_internal(struct sbuf *sb, + struct cpu_group *cg, int indent) +{ + char cpusetbuf[CPUSETBUFSIZ]; + int i, first; + + if (cpu_top == NULL) { + sbuf_printf(sb, "%*s\n", + indent, ""); + sbuf_printf(sb, "%*s\n", indent, ""); + return (0); + } + + sbuf_printf(sb, "%*s\n", indent, + "", 1 + indent / 2, cg->cg_level); + sbuf_printf(sb, "%*s ", indent, "", + cg->cg_count, cpusetobj_strprint(cpusetbuf, &cg->cg_mask)); + first = TRUE; + for (i = cg->cg_first; i <= cg->cg_last; i++) { + if (CPU_ISSET(i, &cg->cg_mask)) { + if (!first) + sbuf_cat(sb, ", "); + else + first = FALSE; + sbuf_printf(sb, "%d", i); + } + } + sbuf_cat(sb, "\n"); + + if (cg->cg_flags != 0) { + sbuf_printf(sb, "%*s ", indent, ""); + if ((cg->cg_flags & CG_FLAG_HTT) != 0) + sbuf_cat(sb, "HTT group"); + if ((cg->cg_flags & CG_FLAG_THREAD) != 0) + sbuf_cat(sb, "THREAD group"); + if ((cg->cg_flags & CG_FLAG_SMT) != 0) + sbuf_cat(sb, "SMT group"); + if ((cg->cg_flags & CG_FLAG_NODE) != 0) + sbuf_cat(sb, "NUMA node"); + sbuf_cat(sb, "\n"); + } + + if (cg->cg_children > 0) { + sbuf_printf(sb, "%*s \n", indent, ""); + for (i = 0; i < cg->cg_children; i++) + sysctl_kern_sched_topology_spec_internal(sb, + &cg->cg_child[i], indent + 2); + sbuf_printf(sb, "%*s \n", indent, ""); + } + sbuf_printf(sb, "%*s\n", indent, ""); + return (0); +} + +/* + * Sysctl handler for retrieving topology dump. It's a wrapper for + * the recursive sysctl_kern_smp_topology_spec_internal(). + */ +static int +sysctl_kern_sched_topology_spec(SYSCTL_HANDLER_ARGS) +{ + struct sbuf *topo; + int err; + + topo = sbuf_new_for_sysctl(NULL, NULL, 512, req); + if (topo == NULL) + return (ENOMEM); + + sbuf_cat(topo, "\n"); + err = sysctl_kern_sched_topology_spec_internal(topo, cpu_top, 1); + sbuf_cat(topo, "\n"); + + if (err == 0) + err = sbuf_finish(topo); + sbuf_delete(topo); + return (err); +} + +SYSCTL_PROC(_kern_sched, OID_AUTO, topology_spec, CTLTYPE_STRING | + CTLFLAG_MPSAFE | CTLFLAG_RD, NULL, 0, + sysctl_kern_sched_topology_spec, "A", + "XML dump of detected CPU topology"); diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index ccad7947c4f5..c6bfe15e768b 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -304,7 +304,6 @@ struct tdq { atomic_load_short(&(tdq)->tdq_switchcnt) + 1)) #ifdef SMP -struct cpu_group __read_mostly *cpu_top; /* CPU topology */ #define SCHED_AFFINITY_DEFAULT (max(1, hz / 1000)) /* @@ -398,9 +397,6 @@ static void sched_balance(void); static bool sched_balance_pair(struct tdq *, struct tdq *); static inline struct tdq *sched_setcpu(struct thread *, int, int); static inline void thread_unblock_switch(struct thread *, struct mtx *); -static int sysctl_kern_sched_ule_topology_spec(SYSCTL_HANDLER_ARGS); -static int sysctl_kern_sched_ule_topology_spec_internal(struct sbuf *sb, - struct cpu_group *cg, int indent); #endif /* @@ -1590,7 +1586,6 @@ sched_setup_smp(void) struct tdq *tdq; int i; - cpu_top = smp_topo(); CPU_FOREACH(i) { tdq = DPCPU_ID_PTR(i, tdq); tdq_setup(tdq, i); @@ -3452,89 +3447,6 @@ struct sched_instance sched_ule_instance = { }; DECLARE_SCHEDULER(ule_sched_selector, "ULE", &sched_ule_instance); -#ifdef SMP - -/* - * Build the CPU topology dump string. Is recursively called to collect - * the topology tree. - */ -static int -sysctl_kern_sched_ule_topology_spec_internal(struct sbuf *sb, - struct cpu_group *cg, int indent) -{ - char cpusetbuf[CPUSETBUFSIZ]; - int i, first; - - sbuf_printf(sb, "%*s\n", indent, - "", 1 + indent / 2, cg->cg_level); - sbuf_printf(sb, "%*s ", indent, "", - cg->cg_count, cpusetobj_strprint(cpusetbuf, &cg->cg_mask)); - first = TRUE; - for (i = cg->cg_first; i <= cg->cg_last; i++) { - if (CPU_ISSET(i, &cg->cg_mask)) { - if (!first) - sbuf_cat(sb, ", "); - else - first = FALSE; - sbuf_printf(sb, "%d", i); - } - } - sbuf_cat(sb, "\n"); - - if (cg->cg_flags != 0) { - sbuf_printf(sb, "%*s ", indent, ""); - if ((cg->cg_flags & CG_FLAG_HTT) != 0) - sbuf_cat(sb, "HTT group"); - if ((cg->cg_flags & CG_FLAG_THREAD) != 0) - sbuf_cat(sb, "THREAD group"); - if ((cg->cg_flags & CG_FLAG_SMT) != 0) - sbuf_cat(sb, "SMT group"); - if ((cg->cg_flags & CG_FLAG_NODE) != 0) - sbuf_cat(sb, "NUMA node"); - sbuf_cat(sb, "\n"); - } - - if (cg->cg_children > 0) { - sbuf_printf(sb, "%*s \n", indent, ""); - for (i = 0; i < cg->cg_children; i++) - sysctl_kern_sched_ule_topology_spec_internal(sb, - &cg->cg_child[i], indent+2); - sbuf_printf(sb, "%*s \n", indent, ""); - } - sbuf_printf(sb, "%*s\n", indent, ""); - return (0); -} - -/* - * Sysctl handler for retrieving topology dump. It's a wrapper for - * the recursive sysctl_kern_smp_topology_spec_internal(). - */ -static int -sysctl_kern_sched_ule_topology_spec(SYSCTL_HANDLER_ARGS) -{ - struct sbuf *topo; - int err; - - if (cpu_top == NULL) - return (ENOTTY); - - topo = sbuf_new_for_sysctl(NULL, NULL, 512, req); - if (topo == NULL) - return (ENOMEM); - - sbuf_cat(topo, "\n"); - err = sysctl_kern_sched_ule_topology_spec_internal(topo, cpu_top, 1); - sbuf_cat(topo, "\n"); - - if (err == 0) { - err = sbuf_finish(topo); - } - sbuf_delete(topo); - return (err); -} - -#endif - static int sysctl_kern_quantum(SYSCTL_HANDLER_ARGS) { @@ -3597,8 +3509,4 @@ SYSCTL_INT(_kern_sched_ule, OID_AUTO, trysteal_limit, CTLFLAG_RWTUN, SYSCTL_INT(_kern_sched_ule, OID_AUTO, always_steal, CTLFLAG_RWTUN, &always_steal, 0, "Always run the stealer from the idle thread"); -SYSCTL_PROC(_kern_sched_ule, OID_AUTO, topology_spec, CTLTYPE_STRING | - CTLFLAG_MPSAFE | CTLFLAG_RD, NULL, 0, - sysctl_kern_sched_ule_topology_spec, "A", - "XML dump of detected CPU topology"); #endif diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 353a69435971..2256ba648e4d 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -50,9 +50,43 @@ #include "opt_sched.h" -#ifdef SMP MALLOC_DEFINE(M_TOPO, "toponodes", "SMP topology data"); +struct cpu_group * +smp_topo_alloc(u_int count) +{ + static struct cpu_group *group = NULL; + static u_int index; + u_int curr; + + if (group == NULL) { + group = mallocarray((mp_maxid + 1) * MAX_CACHE_LEVELS + 1, + sizeof(*group), M_DEVBUF, M_WAITOK | M_ZERO); + } + curr = index; + index += count; + return (&group[curr]); +} + +struct cpu_group * +smp_topo_none(void) +{ + struct cpu_group *top; + + top = smp_topo_alloc(1); + top->cg_parent = NULL; + top->cg_child = NULL; + top->cg_mask = all_cpus; + top->cg_count = mp_ncpus; + top->cg_children = 0; + top->cg_level = CG_SHARE_NONE; + top->cg_flags = 0; + + return (top); +} + +#ifdef SMP + volatile cpuset_t stopped_cpus; volatile cpuset_t started_cpus; volatile cpuset_t suspended_cpus; @@ -731,39 +765,6 @@ smp_topo(void) return (top); } -struct cpu_group * -smp_topo_alloc(u_int count) -{ - static struct cpu_group *group = NULL; - static u_int index; - u_int curr; - - if (group == NULL) { - group = mallocarray((mp_maxid + 1) * MAX_CACHE_LEVELS + 1, - sizeof(*group), M_DEVBUF, M_WAITOK | M_ZERO); - } - curr = index; - index += count; - return (&group[curr]); -} - -struct cpu_group * -smp_topo_none(void) -{ - struct cpu_group *top; - - top = smp_topo_alloc(1); - top->cg_parent = NULL; - top->cg_child = NULL; - top->cg_mask = all_cpus; - top->cg_count = mp_ncpus; - top->cg_children = 0; - top->cg_level = CG_SHARE_NONE; - top->cg_flags = 0; - - return (top); -} - static int smp_topo_addleaf(struct cpu_group *parent, struct cpu_group *child, int share, int count, int flags, int start) @@ -901,6 +902,18 @@ smp_rendezvous(void (*setup_func)(void *), arg); } +struct cpu_group * +smp_topo(void) +{ + static struct cpu_group *top = NULL; + + if (top != NULL) + return (top); + + top = smp_topo_none(); + return (top); +} + /* * Provide dummy SMP support for UP kernels. Modules that need to use SMP * APIs will still work using this dummy support. diff --git a/sys/sys/smp.h b/sys/sys/smp.h index fdb69b13c0d4..493dc91043bd 100644 --- a/sys/sys/smp.h +++ b/sys/sys/smp.h @@ -89,6 +89,8 @@ struct cpu_group { typedef struct cpu_group *cpu_group_t; +extern cpu_group_t cpu_top; + /* * Defines common resources for CPUs in the group. The highest level * resource should be used when multiple are shared. @@ -147,9 +149,6 @@ int topo_analyze(struct topo_node *topo_root, int all, #define TOPO_FOREACH(i, root) \ for (i = root; i != NULL; i = topo_next_node(root, i)) -struct cpu_group *smp_topo(void); -struct cpu_group *smp_topo_alloc(u_int count); -struct cpu_group *smp_topo_none(void); struct cpu_group *smp_topo_1level(int l1share, int l1count, int l1flags); struct cpu_group *smp_topo_2level(int l2share, int l2count, int l1share, int l1count, int l1flags); @@ -166,6 +165,10 @@ extern cpuset_t hlt_cpus_mask; /* XXX 'mask' is detail in old impl */ extern cpuset_t logical_cpus_mask; #endif /* SMP */ +struct cpu_group *smp_topo(void); +struct cpu_group *smp_topo_alloc(u_int count); +struct cpu_group *smp_topo_none(void); + extern u_int mp_maxid; extern int mp_maxcpus; extern int mp_ncores; From nobody Tue Feb 3 03:22:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4pgX4vvvz6R0V5 for ; Tue, 03 Feb 2026 03:22: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4pgX41Hmz3kQ5 for ; Tue, 03 Feb 2026 03:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770088920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u8L5fGTx1ET5LcUQkUqJotaNKPp81DwYtAXYXtiBWvU=; b=hc1BaimFZ+TyGyZ62dFXyBwotocSEeLO69RzCM31wtHEZOjboAfK95z7FM8lZ3bmpyegGA gjCIm1UyEu9J7nJpXEphM7i6Y2MhepnoI/DTorGwWPzsp48EGHaBRRSE+Q7i1Ak5qvBAzy LznPej/WbcReH7ZDqWDLidTEk3g5/IwBQB8ZhiWI2Nt40eaWe+E6+GcHaHSJkWojqcUZVB lBFF17+cxlY/vHflOHL8zOtrEt8n+ARoeUrhPXYV87D5Hn+SFXQ1PJY7lmhC8O4maKuNC9 d6ZhaZScbJ3Ak6uKdSgr5Ye1i3ecVyz6KNWMlBcHcPM3hBY81JIo+kY6JwLJfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770088920; a=rsa-sha256; cv=none; b=eZQm8cmfgtD8P1q0Ezbyknpz/HcKtpDTyLA3UweM8LkuCmKyh8X62/eFYse4mn4JcrGUOy pRNictaJBuujUGLnnqSKxlK1uzNqRw7tmomzH36zaPq/jyezbeYkklhIHFfKt5iSpGqC9H bM1s7H33YzmOLzD0THPssteiPHhIhT9u5KPzprWXGJ5o7GYWo6rqOWgRyhQlpoGajQWRGa hmBqV7aapcdmdNoeiNYuFzsXWLzzx2rG3VZmzjQtUpZoQTloxAZjm3lzXDyjHHc+KqCr4T pPfhGZPD9SmDYfmq88UDUcfYEjJJcMkuOwlhnWsBUMhlGHTIrX8O4wv9it+esw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770088920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u8L5fGTx1ET5LcUQkUqJotaNKPp81DwYtAXYXtiBWvU=; b=BtuqJyRVlBvHdWeNI+khL32WNWbiEedVPt8MrIybiLDjBohfCyIO1S1w4WYatHGjk45hjd DXIgSitkvA28HHFYUDtaAwIjGwhbMeA2R2Bwc4FA19wcnwRkyjUqMXJWFd/pY+1Onh9e0W SmM8bH+FLRYngEtSO3QCXA+DuJedwwjAE3wvkQg/ygAaV0Or3sRfGSzgee86wLAN+UKv1x sF74DD+ftTLdbNT2s/x/zX9uSEWRVpKeoKf2PBAivQbKHrp+fZZZlf2QWayDM47U3rSUMv ctXGkiFRHoTsE2U9wW/YuPloYVlyAXP8WO7rhdIGFiu8puz/YWLUgYSNh+uKWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4pgX2kmYzvTq for ; Tue, 03 Feb 2026 03:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e247 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 03:22:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Kyle Evans Subject: git: ed3a2469a71e - main - uart: fix sleeping while holding mutex in uart_tty_detach() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed3a2469a71e0ef48cf8e636c35e64a011756da3 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 03:22:00 +0000 Message-Id: <698169d8.3e247.38c763e5@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ed3a2469a71e0ef48cf8e636c35e64a011756da3 commit ed3a2469a71e0ef48cf8e636c35e64a011756da3 Author: Abdelkader Boudih AuthorDate: 2026-02-03 03:21:43 +0000 Commit: Kyle Evans CommitDate: 2026-02-03 03:21:43 +0000 uart: fix sleeping while holding mutex in uart_tty_detach() Move swi_remove() call before acquiring the tty lock. swi_remove() calls intr_event_remove_handler() which may sleep via msleep(), causing a lock order violation when called with the tty mutex held. The software interrupt handler removal operates on the interrupt event structure independently and does not require the tty lock. This matches the pattern used in other drivers such as tcp_hpts.c where swi_remove() is called without holding other locks. Reviewed by: imp, kevans MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54953 --- sys/dev/uart/uart_tty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c index d15d1d0c6ac2..7f0f730b3b6e 100644 --- a/sys/dev/uart/uart_tty.c +++ b/sys/dev/uart/uart_tty.c @@ -447,8 +447,9 @@ uart_tty_detach(struct uart_softc *sc) tp = sc->sc_u.u_tty.tp; - tty_lock(tp); swi_remove(sc->sc_softih); + + tty_lock(tp); tty_rel_gone(tp); return (0); From nobody Tue Feb 3 03:21:59 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4pgW3YKMz6R05s for ; Tue, 03 Feb 2026 03:21:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4pgW2TDkz3kg1 for ; Tue, 03 Feb 2026 03:21:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770088919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WkOEk/CQLEnAsfwinK0AauJFXG73uEyF9t+0kUHEJwc=; b=ZFS1DSKpMtdBsA24p5cf6zL9wswUqHdC7irmsNKMnvCVlzioTq54DpyHi0dd8+VYP4c4HO 1pSjg6Qnt6r696SZ9p937RMIQfQjj1B/3fvSFy0SsDsNSBIti3gSRIeQ1NB+8q6iDkjGEP v+gIotdQEI8/LdCJ+E4UFXIWS+d+IPZkdp7XDpby1v/wcBUaBk6QHXNNQ0qvTv/tTXB8kw 3RQ2ez0BM7UxUUyIkoKzZhYsEx4urCSnXuhdOB+2t12U+65PIVDM0Z3z8As9YLNJEjpQTW 8A3ocicGqNq8w60U11ZlYJIxXPENWcg7NrV5ZC4jR+HI6B6iBxplg2jjs0Heyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770088919; a=rsa-sha256; cv=none; b=v7HSnFmGJsYgeW8h+PzFaoO4fSyYcbFrmMSPTtKESa+9LoGbM4JuxenvP/niiMmCiUI7QH ktTvJ1r+nu9UYWeDQMliQD7mbCwvrtZrPMsGfwj8/Wc1BR/yojIdWAC2aUWeibteuR8qJ4 qPA5y7Z2Bbwxh4M3NNLScCIra3eRS7s5cqMZKZvzQyeZfk2BY/7QytDYGSdHaNCq20aHdr VreCH1MHR1znDeV+6eu7j2F7nB7GU3XtGcvs6Z9ei9DSWw/QNAOGRpGI1w7xeAlwFjFEBD /nEVEsJpglPl1yDdigwWzWlz4LDdAV84AmKCK9UCGRraBb/Rj6WX/P6afxu+VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770088919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WkOEk/CQLEnAsfwinK0AauJFXG73uEyF9t+0kUHEJwc=; b=weyylUwClpde/GgrVvPOvjj/AUSllvjzHQkAdYKE+mPIySpaliErYdgVnCutVgaPKCipDE F5nZXiAWbJizmoOO/sC+GHneZA1QPSPmZbUspDv/mMQw0rCkR+nlJ/6Q6snm6PZmchKG1P PoaI5wOmHjc+j22skXbAA8h5HwH8rSecY8y2t1PGkpYcd1g/tVxqlXEvDaJQKMomfOF9PY yDov1ZOG99VdgPQav4dUhS6N1KpdD9bei0wbLat4xFF6podQku0/X4aUNhST+Eu1aguy0S viwvzUS4bof6/ue3orxFbL3gnQ0uHcnmfI4dviFa7IhvmOAVWpcwH2X9e4WPqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4pgW1w5lzvc5 for ; Tue, 03 Feb 2026 03:21:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e99a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 03:21:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d3f21856aa72 - main - rc: run the zfs rc script before tmp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3f21856aa72c28408660ed40ce76bbd0716a991 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 03:21:59 +0000 Message-Id: <698169d7.3e99a.3edb74c@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d3f21856aa72c28408660ed40ce76bbd0716a991 commit d3f21856aa72c28408660ed40ce76bbd0716a991 Author: Kyle Evans AuthorDate: 2026-02-03 03:21:42 +0000 Commit: Kyle Evans CommitDate: 2026-02-03 03:21:42 +0000 rc: run the zfs rc script before tmp The tmp rc script has much the same problem that the var does: it wants to test if /tmp is writable, and mount a tmpfs if it's not. This means that we actually want our zfs datasets mounted first, because we might have a /tmp dataset that changes the story. The ordering problem is particularly noticable with a r/o zfs root, since the write test will fail and we'll mount a tmpfs that later gets covered by our /tmp dataset. If that /tmp dataset inherited readonly, then we're still in trouble. This also fixes `tmpmfs=yes`, which would again get covered by a zfs dataset with the existing ordering. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D54995 --- libexec/rc/rc.d/zfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/zfs b/libexec/rc/rc.d/zfs index f88f65c2ec18..99156332e47b 100755 --- a/libexec/rc/rc.d/zfs +++ b/libexec/rc/rc.d/zfs @@ -4,7 +4,7 @@ # PROVIDE: zfs # REQUIRE: zfsbe -# BEFORE: FILESYSTEMS var +# BEFORE: FILESYSTEMS tmp var . /etc/rc.subr From nobody Tue Feb 3 04:33:51 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4rGR5n9Nz6R5Mv for ; Tue, 03 Feb 2026 04:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4rGR39gmz3rSG for ; Tue, 03 Feb 2026 04:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770093231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lo/4rfy3efk5ra6MW0g5P0+Z5TzQHQvkdPzoPjaG+0g=; b=UuWsmM6rCWYjyzuHARk9DFc8iwwu8H6SZUmCVf3rMR/gjCslf38tzPKyXIK/HIKecULP/q rj3RhaSnf9qUW5N4cYR92f7IiR+EqTQeiSXQMvsfeD3gdP1KhlCZJBMQl8MxnUcM0HvTTY LNqFK+Ogeiq1Pu9ApRfFnKFSGNK2hkh+l1/bF2O6UH94pmTyUUo900+Z8r4KJc1/elG9n6 qSyHol5Hx1Y/iQvu8znB1rhg9OED+kVkgnncT5rEMXc7yYcRs1RV+ht/8J7YphlQk6uHdC nSuebBWXjCEMCUQ0KZRPaYjYv7WexCAVhw4N9AlzDfK3EMWhe4sr5woIpzuH9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770093231; a=rsa-sha256; cv=none; b=ZfJYKRICIgcaZzE+XHIKaAFfjIg4miKyc2NgHai4I+SM/mPbfSgJnlIFotwQYe9vctMiXC IcfhBk4/0RfBzTzlbBnDSmFjJd4erHSEYyd/PoEKZ74cKZ116vkK+56lpi09pyqCTauyEz Nwbj1ncNoKBD9X0uTCEckDY55NmS1oDH58qTMq4UvLhUgtC8BTc+/bd35c7JugP0RczU6Z g6PsiPVfgkpg0kiKqIpXnbnZCHTEl1Y9HYUCZdSm2ZpcFCMGnVsI/Z3XM+WBD3QUQhTy4y qO0bzpv6x8wu4Kkz4MV5qpKbofBdhrV4fLtQGz5IV4PRY8mRGMMO1Y6QNO4YmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770093231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lo/4rfy3efk5ra6MW0g5P0+Z5TzQHQvkdPzoPjaG+0g=; b=e2u6rusl34wWMw04NJKXTR+Lbz580YblUNjyocFL7GNhrOKpyRMeqql3kuexKuGOzsCIrt Fm9bYjW8lzYAVEZ7LJh7kh/WLnB8GWrtiOXbJT0DtdmRpLKXWDK865m1zDa/AP0OS0vF5P htIklZ8/LuRdwGCKuz8B18XmXl7ahehmNwLTMXHXbijTigKa7rYh5C0Zz4Vqb+Nx0MUya1 vb++l+id5AHZGJ2+za+u93fKiwGXQ1J5xOwlvdpj+F2+dteZy5daSXTPXbcskvmgg/kGw1 mGmxNBnFQbMwsNciGFYBb5oZ7ApSHptwpQkdvwiDNtXpT4X1431QVIWRIRfCCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4rGR2dQMzxh4 for ; Tue, 03 Feb 2026 04:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4454f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 04:33:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 7f885581d5bb - main - powerpc/pmap: Mark more CPUs as lockless TLBIE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f885581d5bb3eff191661f321d3a097acb0f39d Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 04:33:51 +0000 Message-Id: <69817aaf.4454f.640d04e8@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=7f885581d5bb3eff191661f321d3a097acb0f39d commit 7f885581d5bb3eff191661f321d3a097acb0f39d Author: Justin Hibbits AuthorDate: 2026-02-03 02:50:15 +0000 Commit: Justin Hibbits CommitDate: 2026-02-03 04:33:20 +0000 powerpc/pmap: Mark more CPUs as lockless TLBIE Add POWER10 and POWER11 to the list of lockless TLBIE capable CPUs. According to Linux, anything POWER5 and later should be able to do this, but that hasn't been tested with FreeBSD. POWER10 and POWER11, being derived after the POWER9, implicitly have this capability per the ISA spec. MFC after: 1 week --- sys/powerpc/aim/moea64_native.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c index 20beccbdf935..0ea44b1097b6 100644 --- a/sys/powerpc/aim/moea64_native.c +++ b/sys/powerpc/aim/moea64_native.c @@ -568,9 +568,9 @@ moea64_bootstrap_native(vm_offset_t kernelstart, vm_offset_t kernelend) case IBMPOWER8: case IBMPOWER8E: case IBMPOWER8NVL: - moea64_need_lock = false; - break; case IBMPOWER9: + case IBMPOWER10: + case IBMPOWER11: moea64_need_lock = false; break; case IBMPOWER4: From nobody Tue Feb 3 04:33:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4rGS6NNMz6R5Bg for ; Tue, 03 Feb 2026 04:33: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4rGS3smKz3rsk for ; Tue, 03 Feb 2026 04:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770093232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9L2bl0K7ZDSjO8oVbukKLM8R3Lf4Nju2mBq42RsZmG4=; b=lMsgUuo1JE9v5BxL2An2q5T+lmO1p5m3y28cgRdeaHa7OvxtFvdlnfSUDsFV7eO9Phipst xsFvoL2mf/MgZuLeYiYX7J1snK2e6k4E+dqCayCWmTRF7sQl8TiLUbEsRzWa6LXZDiD8T6 Hahmx/Rg0dciUJwhRAOGMdWULNflSyghG3nszrpQogbTOGZDwAovKIc6F1MAacyT9OJNf8 edUnS8PhHv2UV9DFw4idx3C1v/53CN/Vc8eqBEgKLwu08EcL/kXwm0vWj0tSw3XW9maaq5 GOmJ7AMiwvMjr9VV6UlAYuhMhq2wvr5cFFk8MObVzSzCXBeUxzEdk+ERGW33TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770093232; a=rsa-sha256; cv=none; b=iyeyB1aRMMTv9ALzRDSL5/++Dwi9Zj/Nz7aVZKD/jRCMqv+phczC+WILQFls7NwGv2EUsb 1246/3rPqOZEAJ+LObEk+sjHy8EhCKw8gtKsN+XjZxQ6kACZ8LFf1/0TNaX/Wnlb/8URL5 mAcmLXQIlJFvPBpcSZyy2y11sr2oqiikn9FmevZvm0A9bpvHJgDVrLQ4PydM2ZE/KL5X+p 6OLnal9h2BjE722BauwdHvi71RpRSiIpZQgWUN2xRgAotcwnO1wB8CM46zceOOVj8rpU4O xU6jE7TcHAOcV1H95DMvwmZGgWe0h2Ih6QFPrzXgrH/9c9Mf57Mvyhyk5U1r2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770093232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9L2bl0K7ZDSjO8oVbukKLM8R3Lf4Nju2mBq42RsZmG4=; b=kthsMOAYjNgE9Gfbt7NQ0cxybglEe4w6fU0dtRmjS6B+fHKE47AgTeX00moYwzAUHWJ/Lg s3DtGMW+E4ERQiqPxMurxwiG5hp8vr1BnFF4dQQn6j6NvIffR6H/xq2DCp/jrWgtYyZZv7 W5Hq6EysH1c5khwe5NJM03VtyptRIGCBx47MxKyVOqv/ztp0SpQhNdhotbU0Xy0RNONvC4 792zcnf748WGW1OkU0uowrcA33Hlj0i8/z24bcq5MFYf2Hpi/yg2WjgpSzw+YDN273fXT+ xshJjLAkaiWwAQhBc2HDAkf2N9TYfH7eiS3LCQtkDMajMHyrLW8+wrmyQwRUmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4rGS3PwyzxgV for ; Tue, 03 Feb 2026 04:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44dd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 04:33:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 1bc75d77e9d4 - main - powerpc/pmap/oea64: Make PV_LOCK superpage sized List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bc75d77e9d45d4ccfe2f146b37c08f41e49a082 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 04:33:52 +0000 Message-Id: <69817ab0.44dd7.2481f73b@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=1bc75d77e9d45d4ccfe2f146b37c08f41e49a082 commit 1bc75d77e9d45d4ccfe2f146b37c08f41e49a082 Author: Justin Hibbits AuthorDate: 2026-02-03 03:48:16 +0000 Commit: Justin Hibbits CommitDate: 2026-02-03 04:33:36 +0000 powerpc/pmap/oea64: Make PV_LOCK superpage sized HPT superpages are 16MB, not 2MB. Taking 8 locks to lock a super page almost defeats the purpose of using the super page. Expanding the PV_LOCK scope to cover 16MB (24 bit shift) reduces this to a single lock. MFC after: 3 weeks --- sys/powerpc/aim/mmu_oea64.c | 48 +++------------------------------------------ 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 62bbb6ddaf9b..4757e469b5d7 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -125,7 +125,7 @@ uintptr_t moea64_get_unique_vsid(void); #define PV_LOCK_COUNT MAXCPU static struct mtx_padalign pv_lock[PV_LOCK_COUNT]; -#define PV_LOCK_SHIFT 21 +#define PV_LOCK_SHIFT HPT_SP_SIZE #define pa_index(pa) ((pa) >> PV_LOCK_SHIFT) /* @@ -146,48 +146,6 @@ static struct mtx_padalign pv_lock[PV_LOCK_COUNT]; #define PV_PAGE_UNLOCK(m) PV_UNLOCK(VM_PAGE_TO_PHYS(m)) #define PV_PAGE_LOCKASSERT(m) PV_LOCKASSERT(VM_PAGE_TO_PHYS(m)) -/* Superpage PV lock */ - -#define PV_LOCK_SIZE (1 << PV_LOCK_SHIFT) - -static __always_inline void -moea64_sp_pv_lock(vm_paddr_t pa) -{ - vm_paddr_t pa_end; - - /* Note: breaking when pa_end is reached to avoid overflows */ - pa_end = pa + (HPT_SP_SIZE - PV_LOCK_SIZE); - for (;;) { - mtx_lock_flags(PV_LOCKPTR(pa), MTX_DUPOK); - if (pa == pa_end) - break; - pa += PV_LOCK_SIZE; - } -} - -static __always_inline void -moea64_sp_pv_unlock(vm_paddr_t pa) -{ - vm_paddr_t pa_end; - - /* Note: breaking when pa_end is reached to avoid overflows */ - pa_end = pa; - pa += HPT_SP_SIZE - PV_LOCK_SIZE; - for (;;) { - mtx_unlock_flags(PV_LOCKPTR(pa), MTX_DUPOK); - if (pa == pa_end) - break; - pa -= PV_LOCK_SIZE; - } -} - -#define SP_PV_LOCK_ALIGNED(pa) moea64_sp_pv_lock(pa) -#define SP_PV_UNLOCK_ALIGNED(pa) moea64_sp_pv_unlock(pa) -#define SP_PV_LOCK(pa) moea64_sp_pv_lock((pa) & ~HPT_SP_MASK) -#define SP_PV_UNLOCK(pa) moea64_sp_pv_unlock((pa) & ~HPT_SP_MASK) -#define SP_PV_PAGE_LOCK(m) SP_PV_LOCK(VM_PAGE_TO_PHYS(m)) -#define SP_PV_PAGE_UNLOCK(m) SP_PV_UNLOCK(VM_PAGE_TO_PHYS(m)) - struct ofw_map { cell_t om_va; cell_t om_len; @@ -3736,7 +3694,7 @@ moea64_sp_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, } } - SP_PV_LOCK_ALIGNED(spa); + PV_LOCK(spa); PMAP_LOCK(pmap); /* Note: moea64_remove_locked() also clears cached REF/CHG bits. */ @@ -3775,7 +3733,7 @@ moea64_sp_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, } PMAP_UNLOCK(pmap); - SP_PV_UNLOCK_ALIGNED(spa); + PV_UNLOCK(spa); sync = (sm->a.flags & PGA_EXECUTABLE) == 0; /* Note: moea64_pvo_cleanup() also clears page prot. flags. */ From nobody Tue Feb 3 04:48:39 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4rbc6tZMz6R64X for ; Tue, 03 Feb 2026 04:48: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4rbc4MNDz3tL6 for ; Tue, 03 Feb 2026 04:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770094124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NTQPYV8fNTivexi1GBJRlJHylNRkSJ6HUbhOXMTWf/g=; b=O7gqzhpx478C8zAfye8pA/zeWdPV5AYW6wM00rpU5Jq0lSDIvl2NJiz0B6hdpVRjcop59t XyEHzhu2H7uxtBw33SUiU+SpKET+C1F1MLajMZYIZW79hknhCu34QWNUXwcAn02jqCeOwR ogKWeNujaM0AY3pg59G+sEEUIIiJ38n9E93/Jcc4BrxCvhIeFG/DYYNyDST5+0J+5YdACK BuN3eQbMfjySX+65wGGQ4MH6TPm2TRX513dUFbHKgL9i5hAxY/x2Uqj5a119IPHBo/G9+O GBwK1MVVq8tdH2g0URF3KLbFE0+T5ru3y6ge2FK6vJVnUL+7Dzkq36jjY8sk1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770094124; a=rsa-sha256; cv=none; b=OAcaq5PzZGvfHSs+tfMis3PUbX4lrlNOD61HsBkFoT/FawH5neNClI/xvBAMjexKz1E/JF hbNaX9HXGWrVBsXCLVsdwjZzfWKFFR65HX7gFXdqKNDlYqLxHS6ujy/2irlvoL+I47/vXN 4I1WSquNI10TDBc65snElRzPZuTp/0ObKWRpNTtUkeBF1DHcLJPv2ZqCg5untOSUE5ZBp3 2ED8iZze3cD7ReeV4KIrO53N0fO4g8SrQBnPhsfqzIawRrGHk5Xa5yrqJj9DylcPMSvDoA 300Ym5LvNM9F4mEAuAsxMnvDWle+a54BaiQ/21+i2IgbAd9Pz81nu9rvyBUC3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770094124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NTQPYV8fNTivexi1GBJRlJHylNRkSJ6HUbhOXMTWf/g=; b=wRWvfXTgFfzk6JIKZIi3Qz92BHP3ejclX0raAC98MH1O8T+jScshGEK1BY+h7z6gMtUFE+ vVLDVEJxeN4xQD19Y8bxC29rtziJQoBnECRGX4S9bu/RmU4EiJyVfLFlLNhZdzkOF8rR15 XZRvdAGlu6AY6BriNXao8dMSixd9txdWknI+Wo8xII3DB+1MMvJ9em5kK6RwDEZ+Ny2/0V H3kAIYLcRothVm45D+ebFzWJlpQBm5BbUipASx6+LSQTY1lxTD7pPoD1xqPMXdrfv8mSpS w7sq5AHE+1UVnRmcPpNU7YUASJv1+NZREtN3j1tE8UlvVx41kTIPWze25gXcDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4rbc3PSvzxQq for ; Tue, 03 Feb 2026 04:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 469e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 04:48:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: e6fa918c4a3e - main - tpm: crb: add support for the Pluton startmethod List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6fa918c4a3ebeb4bcae7614dbb281bda35e06e1 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 04:48:39 +0000 Message-Id: <69817e27.469e9.1b5f3e6b@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e6fa918c4a3ebeb4bcae7614dbb281bda35e06e1 commit e6fa918c4a3ebeb4bcae7614dbb281bda35e06e1 Author: Kyle Evans AuthorDate: 2026-02-03 04:48:22 +0000 Commit: Kyle Evans CommitDate: 2026-02-03 04:48:32 +0000 tpm: crb: add support for the Pluton startmethod The Pluton startmethod uses a simple doorbell mechanism to wakeup the TPM unit after we've issued various forms of state change, with the registers to use specified in the startmethod-specific segment of the TPM2 table (up to 12 bytes after the StartMethod). At the very least, this is the kind of TPM in use by my AMD Zen 4-based Minisforum machine. Differential Revision: https://reviews.freebsd.org/D53683 --- sys/dev/tpm/tpm_crb.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 207 insertions(+), 5 deletions(-) diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 28b4f21eccfb..26b53e7a621d 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -75,8 +75,52 @@ #define TPM_CRB_INT_ENABLE_BIT BIT(31) +struct tpmcrb_sc; +/* Attach */ +typedef bool (sm_attach_t)(struct tpmcrb_sc *, void *, size_t); +/* State change notification (timeout == 0 for 'no timeout') */ +typedef bool (sm_statechange_t)(struct tpmcrb_sc *, int); + +struct tpmcrb_sm_cfg { + sm_attach_t *sm_attach; + sm_statechange_t *sm_statechange; + sm_statechange_t *sm_cmdready; +}; + +static sm_attach_t pluton_attach; +static sm_statechange_t pluton_doorbell; + +static const struct tpmcrb_sm_cfg_map { + int acpi_sm; + const char *desc; + const struct tpmcrb_sm_cfg sm_cfg; +} tpmcrb_sm_cfg_map[] = { + { + .acpi_sm = TPM2_START_METHOD_CRB, + .desc = "Trusted Platform Module 2.0, CRB mode", + .sm_cfg = { NULL }, /* No notifications required */ + }, + { + .acpi_sm = ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON, + .desc = "Trusted Platform Module 2.0, CRB mode (Pluton)", + .sm_cfg = { + .sm_attach = &pluton_attach, + .sm_statechange = &pluton_doorbell, + .sm_cmdready = &pluton_doorbell, + }, + }, +}; + struct tpmcrb_sc { struct tpm_sc base; + const struct tpmcrb_sm_cfg *sm_cfg; + union { + /* StartMethod data */ + struct { + uint64_t start_reg; + uint64_t reply_reg; + } pluton; + }; bus_size_t cmd_off; bus_size_t rsp_off; size_t cmd_buf_size; @@ -99,23 +143,46 @@ static bool tpmcrb_cancel_cmd(struct tpm_sc *sc); char *tpmcrb_ids[] = {"MSFT0101", NULL}; +static const struct tpmcrb_sm_cfg_map * +tpmcrb_acpi_startmethod_cfg(int method) +{ + const struct tpmcrb_sm_cfg_map *entry; + + for (size_t i = 0; i < nitems(tpmcrb_sm_cfg_map); i++) { + entry = &tpmcrb_sm_cfg_map[i]; + + if (method == entry->acpi_sm) + return (entry); + } + + return (NULL); +} + static int tpmcrb_acpi_probe(device_t dev) { - int err; + int err, smethod; + const struct tpmcrb_sm_cfg_map *sm_cfg_map; ACPI_TABLE_TPM23 *tbl; ACPI_STATUS status; + err = ACPI_ID_PROBE(device_get_parent(dev), dev, tpmcrb_ids, NULL); if (err > 0) return (err); /*Find TPM2 Header*/ status = AcpiGetTable(ACPI_SIG_TPM2, 1, (ACPI_TABLE_HEADER **) &tbl); - if(ACPI_FAILURE(status) || - tbl->StartMethod != TPM2_START_METHOD_CRB) + if (ACPI_FAILURE(status)) + return (ENXIO); + + smethod = tbl->StartMethod; + AcpiPutTable((ACPI_TABLE_HEADER *)tbl); + + sm_cfg_map = tpmcrb_acpi_startmethod_cfg(smethod); + if (sm_cfg_map == NULL) return (ENXIO); - device_set_desc(dev, "Trusted Platform Module 2.0, CRB mode"); - return (err); + device_set_desc(dev, sm_cfg_map->desc); + return (0); } static ACPI_STATUS @@ -141,6 +208,40 @@ tpmcrb_fix_buff_offsets(ACPI_RESOURCE *res, void *arg) return (AE_OK); } +static bool +tpmcrb_attach_startmethod(struct tpmcrb_sc *crb_sc) +{ + const struct tpmcrb_sm_cfg_map *sm_cfg_map; + const struct tpmcrb_sm_cfg *sm_cfg; + ACPI_TABLE_TPM23 *tbl; + void *smdata; + ACPI_STATUS status; + bool ret; + + /* + * Grab what we need from the StartMethod. + */ + status = AcpiGetTable(ACPI_SIG_TPM2, 1, (ACPI_TABLE_HEADER **)(void **)&tbl); + if (ACPI_FAILURE(status)) + return (false); + + sm_cfg_map = tpmcrb_acpi_startmethod_cfg(tbl->StartMethod); + MPASS(sm_cfg_map != NULL); + sm_cfg = &sm_cfg_map->sm_cfg; + + crb_sc->sm_cfg = sm_cfg; + smdata = tbl + 1; + if (sm_cfg->sm_attach != NULL) { + ret = (*sm_cfg->sm_attach)(crb_sc, smdata, + tbl->Header.Length - sizeof(*tbl)); + } else { + ret = true; + } + + AcpiPutTable((ACPI_TABLE_HEADER *)tbl); + return (ret); +} + static int tpmcrb_attach(device_t dev) { @@ -166,6 +267,11 @@ tpmcrb_attach(device_t dev) return (ENXIO); } + if (!tpmcrb_attach_startmethod(crb_sc)) { + tpmcrb_detach(dev); + return (ENXIO); + } + if(!tpmcrb_request_locality(sc, 0)) { tpmcrb_detach(dev); return (ENXIO); @@ -301,6 +407,30 @@ tpmcrb_cancel_cmd(struct tpm_sc *sc) return (true); } +static bool +tpmcrb_notify_cmdready(struct tpmcrb_sc *crb_sc, int timeout) +{ + sm_statechange_t *cmdready_fn; + + cmdready_fn = crb_sc->sm_cfg->sm_cmdready; + if (cmdready_fn == NULL) + return (true); + + return ((*cmdready_fn)(crb_sc, timeout)); +} + +static bool +tpmcrb_notify_state_changing(struct tpmcrb_sc *crb_sc, int timeout) +{ + sm_statechange_t *statechange_fn; + + statechange_fn = crb_sc->sm_cfg->sm_statechange; + if (statechange_fn == NULL) + return (true); + + return ((*statechange_fn)(crb_sc, timeout)); +} + static bool tpmcrb_state_idle(struct tpmcrb_sc *crb_sc, bool wait) { @@ -312,6 +442,9 @@ tpmcrb_state_idle(struct tpmcrb_sc *crb_sc, bool wait) sc = &crb_sc->base; OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_IDLE); + if (!tpmcrb_notify_state_changing(crb_sc, timeout)) + return (false); + if (timeout > 0) { mask = TPM_CRB_CTRL_STS_IDLE_BIT; if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_STS, mask, mask, @@ -333,6 +466,9 @@ tpmcrb_state_ready(struct tpmcrb_sc *crb_sc, bool wait) sc = &crb_sc->base; OR4(sc, TPM_CRB_CTRL_REQ, TPM_CRB_CTRL_REQ_GO_READY); + if (!tpmcrb_notify_state_changing(crb_sc, timeout)) + return (false); + if (timeout > 0) { mask = TPM_CRB_CTRL_REQ_GO_READY; if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_STS, mask, !mask, @@ -406,6 +542,13 @@ tpmcrb_transmit(device_t dev, size_t length) TPM_WRITE_4(dev, TPM_CRB_CTRL_START, TPM_CRB_CTRL_START_CMD); TPM_WRITE_BARRIER(dev, TPM_CRB_CTRL_START, 4); + if (!tpmcrb_notify_cmdready(crb_sc, timeout)) { + device_printf(dev, + "Timeout while waiting for device to ready\n"); + if (!tpmcrb_cancel_cmd(sc)) + return (EIO); + } + mask = ~0; if (!tpm_wait_for_u32(sc, TPM_CRB_CTRL_START, mask, ~mask, timeout)) { device_printf(dev, @@ -429,6 +572,10 @@ tpmcrb_transmit(device_t dev, size_t length) bus_read_region_stream_1(sc->mem_res, crb_sc->rsp_off + TPM_HEADER_SIZE, &sc->buf[TPM_HEADER_SIZE], bytes_available - TPM_HEADER_SIZE); + /* + * No need to wait for the transition to idle on the way out, we can + * relinquish locality right away. + */ if (!tpmcrb_state_idle(crb_sc, false)) { device_printf(dev, "Failed to transition to idle state post-send\n"); @@ -442,6 +589,61 @@ tpmcrb_transmit(device_t dev, size_t length) return (0); } +/* StartMethod Implementation Details */ + +/** Pluton **/ +struct tpmcrb_startmethod_pluton { + uint64_t sm_startaddr; + uint64_t sm_replyaddr; +}; + +static bool +pluton_attach(struct tpmcrb_sc *crb_sc, void *smdataregion, size_t datasz) +{ + struct tpmcrb_startmethod_pluton *smdata; + struct tpm_sc *sc; + rman_res_t base_addr, end_addr; + + if (datasz < sizeof(*smdata)) + return (false); + + smdata = smdataregion; + sc = &crb_sc->base; + + base_addr = rman_get_start(sc->mem_res); + end_addr = rman_get_end(sc->mem_res); + /* Sanity check */ + if (smdata->sm_startaddr < base_addr || + smdata->sm_startaddr > end_addr || + smdata->sm_replyaddr < base_addr || + smdata->sm_replyaddr > end_addr) + return (false); + + crb_sc->pluton.start_reg = smdata->sm_startaddr - base_addr; + crb_sc->pluton.reply_reg = smdata->sm_replyaddr - base_addr; + return (true); +} + +static bool +pluton_doorbell(struct tpmcrb_sc *crb_sc, int timeout) +{ + struct tpm_sc *sc; + device_t dev; + + sc = &crb_sc->base; + dev = sc->dev; + TPM_WRITE_4(dev, crb_sc->pluton.start_reg, 1); + TPM_WRITE_BARRIER(dev, crb_sc->pluton.start_reg, 4); + + if (timeout > 0) { + if (!tpm_wait_for_u32(sc, crb_sc->pluton.reply_reg, ~0U, 1, + timeout)) + return (false); + } + + return (true); +} + /* ACPI Driver */ static device_method_t tpmcrb_methods[] = { DEVMETHOD(device_probe, tpmcrb_acpi_probe), From nobody Tue Feb 3 05:13:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4s7q1FtGz6R7P2 for ; Tue, 03 Feb 2026 05:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4s7q05SSz3x6Z for ; Tue, 03 Feb 2026 05:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770095591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSksxlyrOPUrt7QSj6dUo36ogqC6k0Nw1902dNX30pE=; b=m2NWnVeyIaQqcmGE83pXFC93a8Jln2HH6E0FpipJphUVXF1NfHrn6ExWqqdji75mgpKS30 UDWf+PrwrS6U8r6RPGndqdmafjMoTxAy4fl3jK93qumtutkxQ6ofn1ZoPc2crGLOSes9Yc KhLxI2GI4VCvMfrd3EHjqtYkgkHHjt+4VCo8kfJ6BRJqyJeQhSKZcF1mNJue2vrEIYhke9 /rmEaGsGFHmj1SGKiWh6YtGM4kAJMpbZA2CPFQ+JJqGaAvKDEJ3+6dNiJxlKbmxoyIpuHN OXjE8rwnQU7mkMWv1nUY3KekRANJKNasIyJO+gdMm6/SGUAWMu6AOT/kO4lZCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770095591; a=rsa-sha256; cv=none; b=tVOEe8QCfFxx8nCPOzumD5geE1ahu/2XDW/1JZVvU71C8fALjzIZ8Bq2jUnP+P9xnQuS2l vfpzcGtK91D8a8U/2fpv5WwV8wEOLC457RCrstG25jo9ZhajXKftLpZ6GObz1/ETfCS1rH Fyy67MiCJRlIVu5bcclTWnkW9E73Q1li69kPKOHOqoCg7G4TdXvBlNNGWCnceR2mlPUlYX 2yddh6TDH7vqgCSg5IAkIi5oSR0DQ/2vmzGTzAONB7ACfhS2xNd5346V5O97HIxgtL8ttK aCNzjQWZob/BLs2AlMcU5QVV6gu9WoeyRxw6s20l6b7VCMZ1k9MfcP+Chmzhog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770095591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSksxlyrOPUrt7QSj6dUo36ogqC6k0Nw1902dNX30pE=; b=WlyrlkscS276/lYsqntVlFeGT/ihHoBZMaj/3VBWJyMBUDYOu4Nzi5NiqHoMw6ekPWv/0m SyfB8/vO02gLNscRryl6C+EH/PGiOiZlYQ4Bpczg6SsEfcQzpoD/xhiBqGwKtMoZicqP36 DGmomPJnQU8lAb7g0ppJkuV4I/tDNqfQoKlKjDW21LYdiWPA33i1NPaKcS4ZO1Yo5Hg/Vd IO/J1Uy0w3jluBWQ8CXzEV75SwkKOhxeF4MIUHL3D1vX6Qy9jldJzroQWFiak3ePjuI4MW aB+ve1xzeVflaHKfE7Q7fdpU+T2wHwjQEMeCsiBN+6Wbd1BewA4Eb/2R6yCcPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4s7p6XV2zy1Y for ; Tue, 03 Feb 2026 05:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18e2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 05:13:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 51509500acdc - main - Remove bsnmpd tests when MK_BSNMP == no List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51509500acdc5d23285a962e9c55dd9e38d2b30a Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 05:13:10 +0000 Message-Id: <698183e6.18e2f.5afb3e33@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=51509500acdc5d23285a962e9c55dd9e38d2b30a commit 51509500acdc5d23285a962e9c55dd9e38d2b30a Author: Enji Cooper AuthorDate: 2026-02-03 05:12:25 +0000 Commit: Enji Cooper CommitDate: 2026-02-03 05:12:25 +0000 Remove bsnmpd tests when MK_BSNMP == no MFC after: 1 week --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a0d3cf902337..1025eb63fd87 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -748,10 +748,13 @@ OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt +OLD_FILES+=usr/tests/lib/libbsnmp/bsnmpd_test +OLD_FILES+=usr/tests/lib/libbsnmp/Kyuafile OLD_DIRS+=usr/include/bsnmp OLD_DIRS+=usr/share/snmp OLD_DIRS+=usr/share/snmp/defs OLD_DIRS+=usr/share/snmp/mibs +OLD_DIRS+=usr/tests/lib/libbsnmp .endif .if ${MK_CALENDAR} == no From nobody Tue Feb 3 05:19:26 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4sH32swmz6R86D for ; Tue, 03 Feb 2026 05:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4sH26ZzLz43RP for ; Tue, 03 Feb 2026 05:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770095967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+YaxdTaXFVW2uWQmWUhQKPIyngof6Pyg4sfYdj/TpI=; b=j9ZYbTCeC1Sqeie7R0ckDw9sLJkUqQ761yy/0uibeiCpNQyrsMDMQ62aOWTSgwmTwiD1l2 dtqXavVlVO3hbhkU3m73LchmNsqrXUAkv639t1UtILJOQ081z9lveW21DuncIEQAW4F1y+ 8wdEhIXg6KqqLC5HUMFnwFSW2y50YdG35o49G3e7jDCSk3Cfq423/htFH1gIQwzfMUwreV w4xg+V+rOWVuuNu9O/QUrqWOKtJ4U6aCdYQ1MTroWV3650xIsBk6Hmyl0xQBTTMKvs7rSe meRlA16S7fI4ncPYaXTjknWZDa6CaCesEQdhMqt2C5qrWq54DRGHWBv6e7et9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770095967; a=rsa-sha256; cv=none; b=TUN7PSAUdworjewcZCrIGxA0JxfW+795Uum1Rt0NFB55XyuIDAybGisVfrtrw4W5EKh9TH nH+3krgG7i3DfMGfaCxJ99qQi+pJWtjsT6Uj6zmcQYJFt0MER48wQeScUmeJiBW8oj20v7 0O1hvAaFFtnJAuei0ani7tGsdMFRDjNm15RgWXN04sq1TvtJV8qDbb9NZPziE6NZFQ7l0I X7/B9WbucA9eW4QGTheijOKdnP9oidTZAPksX2CYZWne6x5JMaTsVxdDdBhArujwb40QKy 26hOBpkK0rDiMPTGMuAKdFaZyNXHO/BPzH7GZCkSB7GkGI+9Ctf8VbSgrT5Grw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770095967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+YaxdTaXFVW2uWQmWUhQKPIyngof6Pyg4sfYdj/TpI=; b=b/xd13isSm3pFQZw1qDgwqaB2DoN0K7sRyXuSwNGpnNTb0QuSX4LorMyROD2kL+HogtGns eI3xexim/tSnf6VZvylCp+XH4is8n1yaBSYrtd+smGn4oX6cDPTgzbhsZBTWaBVgtY0lHQ DBz2AFMOwxE2JQqeUsD85Zn93heCII1syGCupGADM6U5iMtiuqVieK9u4fAjDhokYpfVu5 QdaVP/3qznEqq7x7uOUHc82XNtaGu8vlimYuFkUIZ09Ml3WCjc5o/CYPX5P5Vm037wQqkc o/EJBex6/fkdK1AC4W5XtqDH2yPKqp/dpmCldcoY7qQ+xElE0rVwn6jvg18Q0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4sH26507zyDG for ; Tue, 03 Feb 2026 05:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a3bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 05:19:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: fd6217075e6a - main - tftpd tests: clean trailing whitespace List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd6217075e6a5926bdc627145b38194b6c5ba8da Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 05:19:26 +0000 Message-Id: <6981855e.1a3bf.43a0480e@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=fd6217075e6a5926bdc627145b38194b6c5ba8da commit fd6217075e6a5926bdc627145b38194b6c5ba8da Author: Enji Cooper AuthorDate: 2026-02-03 05:17:54 +0000 Commit: Enji Cooper CommitDate: 2026-02-03 05:19:08 +0000 tftpd tests: clean trailing whitespace No functional change intended. MFC after: 1 week --- libexec/tftpd/tests/functional.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index 791aa9190a2f..c96abe635e24 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -113,7 +113,7 @@ recv_data(uint16_t blocknum, const char *contents, size_t contents_len) RECV(hdr, msg, sizeof(msg)); \ } while (0) -/* +/* * send a command to tftpd. * @param cmd Command to send, as a char array */ @@ -140,7 +140,7 @@ send_data(uint16_t blocknum, const char *contents, size_t contents_len) send_bytes(buffer, 4 + contents_len); } -/* +/* * send a command to tftpd. * @param cmd Command to send, as a const string * (terminating NUL will be ignored) @@ -170,7 +170,7 @@ send_ack(uint16_t blocknum) */ #define OPTION_STR(name, value) name "\000" value "\000" -/* +/* * send a read request to tftpd. * @param filename filename as a string, absolute or relative * @param mode either "octet" or "netascii" @@ -184,7 +184,7 @@ send_ack(uint16_t blocknum) #define SEND_RRQ_OPT(filename, mode, options) \ SEND_STR("\0\001" filename "\0" mode "\000" options) -/* +/* * send a write request to tftpd. * @param filename filename as a string, absolute or relative * @param mode either "octet" or "netascii" @@ -355,7 +355,7 @@ setup(struct sockaddr_storage *to, uint16_t idx) } ATF_REQUIRE_EQ(pwd, getcwd(pwd, sizeof(pwd))); - + /* Must bind(2) pre-fork so it happens before the client's send(2) */ server_s = socket(protocol, SOCK_DGRAM, 0); if (server_s < 0 && errno == EAFNOSUPPORT) { @@ -678,7 +678,7 @@ TFTPD_TC_DEFINE(rrq_netascii,) { int fd; char contents[] = "foo\nbar\rbaz\n"; - /* + /* * Weirdly, RFC-764 says that CR must be followed by NUL if a line feed * is not intended */ @@ -877,7 +877,7 @@ TFTPD_TC_DEFINE(wrq_dropped_ack,) SEND_WRQ("medium.txt", "octet"); recv_ack(0); send_data(1, (const char *)&contents[0], 512); - /* + /* * Servers "sends" an ACK packet, but network drops it. * Eventually, server should resend the last ACK */ @@ -912,7 +912,7 @@ TFTPD_TC_DEFINE(wrq_dropped_data,) SEND_WRQ("small.txt", "octet"); recv_ack(0); - /* + /* * Client "sends" a DATA packet, but network drops it. * Eventually, server should resend the last ACK */ @@ -1068,7 +1068,7 @@ TFTPD_TC_DEFINE(wrq_netascii,) { int fd; ssize_t r; - /* + /* * Weirdly, RFC-764 says that CR must be followed by NUL if a line feed * is not intended */ From nobody Tue Feb 3 05:25:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4sPV71c3z6R9bS for ; Tue, 03 Feb 2026 05:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4sPV19Mhz3H49 for ; Tue, 03 Feb 2026 05:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770096302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bKzxh8tTGYkisRxvPkAULVdndgMs8ExiRslCZt7oz2c=; b=jfBZrmK9J5Cxn79tcutTMtBjX4tGjAJRWP+CdCyhklyGTSMJlORzqGDQmMgdWI7attRHA2 ZNtlBC4dXah2OpLOcob408oDu/EAkGd9ahtOOJerjzCRH3HkCMyoTeZESBL3wqPivtsyBD HgG0c5moi6UGGPgyjzS/yhFIhE1JfOAL37noVX7aj64mDkR6nVEvzxWm8+CEH68Hj7M85S OIiXx020rwyHG3lJKoIIPtbRMicaYIbEJzTSzq7O5JXqs75xYRPKEQUo2XybdZ8LS+xQxi zBDddvoJosNX0WFUb5kMq5I+YPC5UhlJpsFSUmXOZHdbjyYBScuxPmHYNAaEJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770096302; a=rsa-sha256; cv=none; b=VFqRPuGbbLP8JlHbc0HOBL1UGMPgeBXcVklq1TMkfrAUCfYXO0tzs9fA0tAzCKWygNfpwp fQMe2dDa7SExQOZpFHyF8oGcZR6HBNiJeWi2/6z4et4xNiBqFf34RtHCWr5FiacTEsMj98 ViHHLc6fakVCV1IBt5oh94Psz4hY/r06a+fFNHbLAwPke65j+vwneBmFfwD1YREx1rEaHI 3HV8yO5EYgXpUR2i5fHrpPvj/mPM+FOEc/FmNYCQ0HhkEm6y8BD57+JwKmgJIkjODokzOJ YRZx+hNRx6qPkYTfB1svCc8z90KrI/6ffQ4hhLAHZSDpdHxgHm/IBRuEsn+7YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770096302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bKzxh8tTGYkisRxvPkAULVdndgMs8ExiRslCZt7oz2c=; b=uQEaSMrycKPiF+ODBVx4SETaJJD9c4AFC1O4kRaQ+4P8ruUDTE8PVD4felTTjTrVM8b87x Q37w/PvSY6eeA31PqOJmiEgnPq9Ul8OAeMNbTJdsmBs/8zF/fwfxaa3+nJsSELSAN6oDVV cfqv6dZXmkgW6j6gcOZ4j4nYTK3fQkbsVrBEPr+3qQv2Br2F3CdwyAYOAlVOTSUoglaM7O jEwxOhPqOxQO5Otl2wt4Oiv1r1GoKeL7d9bvkkUzlYeoa8izlWxKrqdKwc2hsXbwXELI+k xgEmG3L6l6ZaIV5SLRQ/sigYFTNvZRq/emAejUT2zEQxbmS3eyhijH1HkIEEog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4sPV0W9Lz10Nj for ; Tue, 03 Feb 2026 05:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ce01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 05:25:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 1ccee516edb6 - main - tftpd: remove tests when MK_TFTP=no List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ccee516edb681b33182f0a57531752eb98ec838 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 05:25:02 +0000 Message-Id: <698186ae.1ce01.df8a654@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1ccee516edb681b33182f0a57531752eb98ec838 commit 1ccee516edb681b33182f0a57531752eb98ec838 Author: Enji Cooper AuthorDate: 2026-02-03 05:24:33 +0000 Commit: Enji Cooper CommitDate: 2026-02-03 05:24:33 +0000 tftpd: remove tests when MK_TFTP=no MFC after: 1 week --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 1025eb63fd87..e4deee31dc77 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8360,6 +8360,9 @@ OLD_FILES+=usr/bin/tftp OLD_FILES+=usr/libexec/tftpd OLD_FILES+=usr/share/man/man1/tftp.1.gz OLD_FILES+=usr/share/man/man8/tftpd.8.gz +OLD_FILES+=usr/tests/libexec/tftpd/functional +OLD_FILES+=usr/tests/libexec/tftpd/Kyuafile +OLD_DIRS+=usr/tests/libexec/tftpd .endif .if ${MK_TOOLCHAIN} == no From nobody Tue Feb 3 05:33:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4sbt4wBJz6RCjv; Tue, 03 Feb 2026 05:34:02 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4sbt12B7z3ZZt; Tue, 03 Feb 2026 05:34:02 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 6135XmgV002957; Tue, 3 Feb 2026 07:33:51 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 6135XmgV002957 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 6135XmkG002955; Tue, 3 Feb 2026 07:33:48 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 3 Feb 2026 07:33:48 +0200 From: Konstantin Belousov To: Adrian Chadd Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Abdelkader Boudih Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware Message-ID: References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f4sbt12B7z3ZZt X-Spamd-Bar: ---- On Tue, Feb 03, 2026 at 01:52:00AM +0000, Adrian Chadd wrote: > The branch main has been updated by adrian: > > URL: https://cgit.FreeBSD.org/src/commit/?id=052a791b00555805f19ccc38a04d42d48b54104b > > commit 052a791b00555805f19ccc38a04d42d48b54104b > Author: Abdelkader Boudih > AuthorDate: 2026-02-03 01:43:00 +0000 > Commit: Adrian Chadd > CommitDate: 2026-02-03 01:51:37 +0000 > > acpi: add Darwin OSI quirk for Apple Mac hardware > > Mac firmware hides the Intel integrated GPU (iGPU) on dual GPU x86 > systems, i.e., with AMD/NVIDIA dGPUs, when the Darwin OSI is not > installed via ACPI. > > Prior to this change, FreeBSD always used the dGPU. This is fine in > practice, but consumed more power than when the iGPU is used, > resulting in reduced battery life. > > Linux handles this in `drivers/acpi/osi.c` by detecting Apple > hardware via DMI, disabling all Windows OSI strings, and > by explicitly installing the Darwin OSI ACPI handler. This change > applies equivalent logic to the acpi(4) driver on FreeBSD. > > This feature can be enabled/disabled using the > `hw.acpi.apple_darwin_osi` tunable. Setting this tunable to `0` > restores the previous behavior by explicitly disabling the added > support. > > Reviewed by: obiwac, ngie, adrian > Differential Revision: https://reviews.freebsd.org/D54762 > --- > sys/dev/acpica/acpi.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c > index 60a2dba91b05..8cdb73333462 100644 > --- a/sys/dev/acpica/acpi.c > +++ b/sys/dev/acpica/acpi.c > @@ -293,6 +293,17 @@ static char acpi_remove_interface[256]; > TUNABLE_STR("hw.acpi.remove_interface", acpi_remove_interface, > sizeof(acpi_remove_interface)); > > +/* > + * Automatically apply the Darwin OSI on Apple Mac hardware to obtain > + * access to full ACPI hardware support on supported platforms. > + * > + * This flag automatically overrides any values set by > + * `hw.acpi.acpi_install_interface` and unset by > + * `hw.acpi.acpi_remove_interface`. > + */ > +static int acpi_apple_darwin_osi = 1; > +TUNABLE_INT("hw.acpi.apple_darwin_osi", &acpi_apple_darwin_osi); > + > /* Allow users to dump Debug objects without ACPI debugger. */ > static int acpi_debug_objects; > TUNABLE_INT("debug.acpi.enable_debug_objects", &acpi_debug_objects); > @@ -4903,6 +4914,67 @@ acpi_reset_interfaces(device_t dev) > } > acpi_free_interfaces(&list); > } > + > + /* > + * Apple Mac hardware quirk: install Darwin OSI. > + * > + * On Apple hardware, install the Darwin OSI and remove the Windows OSI > + * to match Linux behavior. > + * > + * This is required for dual-GPU MacBook Pro systems > + * (Intel iGPU + AMD/NVIDIA dGPU) where the iGPU is hidden when the > + * firmware doesn't see Darwin OSI, but it also unlocks additional ACPI > + * support on non-MacBook Pro Apple platforms. > + * > + * Apple's ACPI firmware checks _OSI("Darwin") and sets OSYS=10000 > + * for macOS. Many device methods use OSDW() which checks OSYS==10000 > + * for macOS-specific behavior including GPU visibility and power > + * management. > + * > + * Linux enables Darwin OSI by default on Apple hardware and disables > + * all Windows OSI strings (drivers/acpi/osi.c). Users can override > + * this behavior with acpi_osi=!Darwin to get Windows-like behavior, > + * in general, but this logic makes that process unnecessary. > + * > + * Detect Apple via SMBIOS and enable Darwin while disabling Windows > + * vendor strings. This makes both GPUs visible on dual-GPU MacBook Pro > + * systems (Intel iGPU + AMD dGPU) and unlocks full platform > + * ACPI support. > + */ > + if (acpi_apple_darwin_osi) { > + char *vendor = kern_getenv("smbios.system.maker"); > + if (vendor != NULL) { > + if (strcmp(vendor, "Apple Inc.") == 0 || > + strcmp(vendor, "Apple Computer, Inc.") == 0) { > + /* Disable all other OSI vendor strings. */ > + status = AcpiUpdateInterfaces( > + ACPI_DISABLE_ALL_VENDOR_STRINGS); > + /* Install Darwin */ > + if (ACPI_SUCCESS(status)) { > + status = AcpiInstallInterface("Darwin"); > + } > + if (bootverbose) { > + if (ACPI_SUCCESS(status)) { > + device_printf(dev, > + "Apple hardware: installed Darwin " > + "OSI and removed other vendor OSI " > + "(Windows, etc)\n"); Why this verbosity is needed? I see no benefit from it, other then consuming kernel memory. > + } else { > + device_printf(dev, > + "Apple hardware: failed to install " > + "Darwin OSI: %s\n", > + AcpiFormatException( > + status)); > + } > + } > + } else if (bootverbose) { > + device_printf(dev, > + "Not installing Darwin OSI on unsupported platform: %s\n", > + vendor); > + } > + freeenv(vendor); > + } > + } > } > > static int From nobody Tue Feb 3 05:42:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4snQ1PJwz6RDhb for ; Tue, 03 Feb 2026 05:42: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4snP5Kqnz3wKN for ; Tue, 03 Feb 2026 05:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770097337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YmTk6kgHyRZNGUHwv0FI5IGEcVVzKV2T9syWYcLogqQ=; b=DiaUO69BRKR4R8p9L2Dd2qyqEKUk7ugLdc7BZ2CzWQqSYhCJ8lmMM49hsZUr6muz2Ym465 ilx6xnqbUekbuNTOUQkEf3oX25CEgTYTJ39R/Zd62ksi52hzynYJJE1IL/NeP3rf7mQtnV wQJ5lXcrGMbn/+ityCxfPR1iJ/H7QY995XVh5tNSe/nkzdQUnEl8Y/Y6aljJ7sDb/5eBh7 pzGjkdSBKy0FsMAzjMCloi7Rbot3GRWuj2LS/GZ9mUu99SL/Q5zDZ7YMm0xKSfEqBD0WW6 Tx9ZUAKIGEw19gSPAsVKq0CokOhKZq496G6n3ZDAU0vrie2OWb40lXeLECmBSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770097337; a=rsa-sha256; cv=none; b=CxZKRsZjKYx5A6CwxBQ9SAJXk/8kfp5mXCozkces6q+sMzdHu+jfvE+wMTH6tRJ2FfBoyt sVzAbjkZey0nkxgvct0f6QJqagLL3Vq1ZJhl6JiIqFwbb5IP6Pgzp09nnUSsjbWs4H6OTS wUEaefS9R9hWl9/cegc+2Brtw7+nJvSAixlhrSVk9c98i5Q3ppRNJC4m7kYuSHMhBM2com gtGi1KUs4AD4ntm5VV0df4H6bemtkeSKdX+lQ6KdbRVFO/dvjRJBda0ZYLnaEkH0PJ0ZMg F2UwM5dEOGF0lSJdd2uPuHOxDVZMBBVj2KCvmDhtxuDtIpNKy7finFeDCzqZ+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770097337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YmTk6kgHyRZNGUHwv0FI5IGEcVVzKV2T9syWYcLogqQ=; b=U2IK86rtNPSUKcB+JjBZ6jWZscO7OvQ23ejdcDh1Mh/QRD3acmxFuJbMtJchwIJ3HwdkQb zMQHD6//oOJnp70QqJb64s3uf8gwYnA8jIIBIEa//BmTV0fgY+lpmj3HsBmcvSJV41hTJ/ HJ9bulv8amHaIz9rSsgzBoQfDMjxx9BFCQu3A8mi7VuVKBh1l3MnHWf7Mh52k73KBsY/ML iVT2wJGjawHAXEAyd8dwefnFzs5S0KGoERasTfV6v5ThJLUjX/+RFSbPjpB8JrqEyj7zeA prRn13COfqroD0Hr2dGldkqxUQi+gE66qJpoxkXFt6s8h9RyHqafzD9XbqJgcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4snP4sVrz118j for ; Tue, 03 Feb 2026 05:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 05:42:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 7baa76c30c83 - main - usr.bin/factor: remove tests when MK_GAMES=no List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7baa76c30c833750007e8d8823c9f5d94f5b2925 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 05:42:12 +0000 Message-Id: <69818ab4.1eb12.50540071@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7baa76c30c833750007e8d8823c9f5d94f5b2925 commit 7baa76c30c833750007e8d8823c9f5d94f5b2925 Author: Enji Cooper AuthorDate: 2026-02-03 05:40:50 +0000 Commit: Enji Cooper CommitDate: 2026-02-03 05:42:03 +0000 usr.bin/factor: remove tests when MK_GAMES=no factor(1) is only installed when MK_GAMES != no. Ergo, remove the tests when that's not true. MFC after: 1 week --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e4deee31dc77..8eeeb25c4fa4 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2149,6 +2149,10 @@ OLD_FILES+=usr/share/man/man6/random.6.gz OLD_FILES+=usr/share/man/man6/rot13.6.gz OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz +OLD_FILES+=usr/tests/usr.bin/factor/factor_tests +OLD_FILES+=usr/tests/usr.bin/factor/primes_tests +OLD_FILES+=usr/tests/usr.bin/factor/Kyuafile +OLD_DIRS+=usr/tests/usr.bin/factor .endif .if ${MK_GOOGLETEST} == no From nobody Tue Feb 3 05:45:34 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4ssC2CjWz6RFWv for ; Tue, 03 Feb 2026 05:45: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4ssB5qV5z44Hd for ; Tue, 03 Feb 2026 05:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770097534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ba57kjkBGTj6huyBxvPL5/5144mAe5ywtJIBAUcpuw=; b=Eu7h8yG9hU8EZD5ZVg8LAODzGnqnkVJnWQbcJepnEpTBtvSalPd1k3nzy5ajz7Pnc92/RX sAM/zBysL8euzV9e+awSgnbNkkprtn9/EMZeYImm/Br/nbexXjPfn02c1+YXi4kcGOSdI1 mGfwHXEH1ZqhR8vH999HbSlKFbu6+/nHbenzT/IW5ovoH57QR8U02pmQn9MqFJi/fbIGeR YKhLz7H5UEfCccvQlDippGvMQL+rx93HUkJ8g6QFOLahPG79Hi+ZpH2MX4jj39s3hIKRZp BdDR9UNua0Tb3Vj3kYhfH1DYo6IsewkmxZXnvwy3dZo9L3e3EYTPQ73IFH/hXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770097534; a=rsa-sha256; cv=none; b=CryZiFvFQDn6o7i2y7y+ZnE7sDPrKaIvG3iCe77/DI09i2MpVwYcyI5mwUYPc/lwzpiirW wLYHPzV/9VYTNwwGDvY4XEfdjGA3N7xCn1o9HX2WP+b1h/ahQqIiGbZK++ABn8Q4Cau4Vq fo+zIv2x4+PEj0ynWX2c8ExqnQXOaJBjpBwlTSZs0lS4taQvxLmg8ouAYr23GjgK5p2+HL r2vLYy3IlXfswym1rwFRsPavux6sd51hHsMox06Jcc9p5gQD9WjKj5uWZADOi4GD/WOrdf y0K3mVHzOLODfS+b9QVxK8xHaafX1Hn3AalpcyzTyRX79Tu2inmmdrqUwB3h4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770097534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ba57kjkBGTj6huyBxvPL5/5144mAe5ywtJIBAUcpuw=; b=CqSZ0bG4lyznSuvEeXtfRTh/AH9v3HZoCH47Y0/HVlhq9SCmJL8sFx/hne2MVqGOk+GLrk +MQ6QMJVLyjzhjSDmNHsgrGq4LT3QFLeZaXL+MaSWS3DkQ9Vx/wx1+AHU+pC+jnbMeWFLD JEyUWIniA28MXiQXY/B6fjaL2TCmPMyQcVFNOMTngmfrBsX9Zci5Pyeuqej++eY/83s/C+ qkbLIS3+4HCP2E9Zfum5rJ4OP1bVtmm6jgnDtRvwqpNosvkVjsSJ24IjVqeA4B6MQUVYIV DHqK/abI10IW81O2RjOjzNMD02A4/C8Hn0zjtY7D9F+AHjm16E9iHHhp7BCLuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4ssB590Lz10bh for ; Tue, 03 Feb 2026 05:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ed19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 05:45:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: e1f36b9db922 - main - usr.bin/tftp: remove tests when MK_TFTP=no List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1f36b9db9220cf51c6c3d2d2ad230fb9490bc3e Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 05:45:34 +0000 Message-Id: <69818b7e.1ed19.638cb367@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e1f36b9db9220cf51c6c3d2d2ad230fb9490bc3e commit e1f36b9db9220cf51c6c3d2d2ad230fb9490bc3e Author: Enji Cooper AuthorDate: 2026-02-03 05:44:47 +0000 Commit: Enji Cooper CommitDate: 2026-02-03 05:44:47 +0000 usr.bin/tftp: remove tests when MK_TFTP=no These tests require the tftp client, which is not installed when `MK_TFTP=no`. Remove them when that's not true. MFC after: 1 week --- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 8eeeb25c4fa4..36b7a26458c1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8366,7 +8366,10 @@ OLD_FILES+=usr/share/man/man1/tftp.1.gz OLD_FILES+=usr/share/man/man8/tftpd.8.gz OLD_FILES+=usr/tests/libexec/tftpd/functional OLD_FILES+=usr/tests/libexec/tftpd/Kyuafile +OLD_FILES+=usr/tests/usr.bin/tftp/tftp_test +OLD_FILES+=usr/tests/usr.bin/tftp/Kyuafile OLD_DIRS+=usr/tests/libexec/tftpd +OLD_DIRS+=usr/tests/usr.bin/tftp .endif .if ${MK_TOOLCHAIN} == no From nobody Tue Feb 3 06:41:58 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4v6f2ltyz6RJRJ for ; Tue, 03 Feb 2026 06:42:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4v6d6Tpsz3xV1 for ; Tue, 03 Feb 2026 06:42:17 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-c61343f82d7so2091615a12.1 for ; Mon, 02 Feb 2026 22:42:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770100931; x=1770705731; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9wZi1XlVP4SASzdIBTO1vzjvgBX12vFKHyhN7bvpP/8=; b=LnShzkYCpblRAt/UDtXW89+oURygjJ5zj2eYbfRLFd+8JJKs8JWr2W4VfDEXHcz4UC I18cPvhjNNBoM+GMOybUDESpphbDBjiC000OqrCMhooXZlTH8kTF/FXSF+TOTe1anbY0 TDdZPzZ/JaixdZt115mfeRAmywhS4sKkOHsDuxhLQ5D5MfhEFz+xJ++SRWo6cEzZAHC3 QvuF3PiklDsrQWL/vltxQBr2UZTIuOpgKuFacM5zqYK4LtGgeg9Z7vNF5ZSH/DmoyBz8 ieUZbIqsjlg+RgAn0hSl3fryzxuk90XBRShpjJiHJgql2G+bJwZwpPTI7PYERpmBjPwd pl9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770100931; x=1770705731; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9wZi1XlVP4SASzdIBTO1vzjvgBX12vFKHyhN7bvpP/8=; b=ULFCPDfv6qNdqzSsBZRjVG/VC0solPD/CoyIrowmMR3HbmMyRZ6+TnC/nr7unm2XXY wi4kH95CXldw7yHa7W0ALHXyGATTjmxFsPYaakBQeblVD8qforKI8ttzbFw91LiRSAjN fpBRWtwwG7NA5w+ya4BN99M8rLUmeeatkVLedN48gh69LRsmJRBPDteEl5iPZY+GYefz RlBf33ZieqcnNvXB1HJ9vAfcTd71ovkbaEPKSLp1blf2bZGo1smNCh4P+tdKurhgFS73 p4lPGAC3U8QrcxIepiVfOdDQtg6k3pvS1S1F7ijsMMg/T73iatnM1KP54uboJXGxVYoQ DjJA== X-Forwarded-Encrypted: i=1; AJvYcCUkBwShlTC1pdBQMr3dsoAdOohJpPVL24svEULEJck9vUbqjt+VR4MGbc9Qik2VzZLCmO0Bd/3ru/ljYvzbmaY6xX4bPg==@freebsd.org X-Gm-Message-State: AOJu0Yw/aHe9C1ObUgeWObt+wlQ7vo/gwh0otMTK85j/o14VhgYVRYrp oIaEeW73ciUEP4gvEemktF1+pOzIDolgzvF3CCztPw6kMtsE3YpIphWh169mqw== X-Gm-Gg: AZuq6aKAw0BfWrcOw1KlKGco/H5UmUgkvbUuyusDjmVJhLIGcA4ypdmOSYFALU+MWir CUCW5A7RQZtwrGiuFGbSculKy1iDxu4Hj8olaetwvUfK61MtdK7M4FddO7V/ImKqWFOHFkfIzO8 iXN/XE+J7c5GtDeWT6UicSBZh1b097zhju9QNml5Kt3K5ID1gq7nM0XN+ILnR4jH0bXk2E+ojd3 iS9fDZo5KyjVpa8eOJjEMSg1TsLoAJJH02B419lGdJiC4ZJTBX3HmPTN/v93Kl4KkwPMo22KtI2 +ecGk8jLocTr03NSxXY/QjWObCBkWYzbitZhHZXMJ2ZLq/coabfYv7T9Nd3C4X7UQUbdrVH0adn Mvel2ylacyU77MuPaw1MMX+kD+n05JV43uiy+rR9KyHRhg7lfzPZxmgE39FPzeaas2rMkFkm3EA s9s8os4eaoWrVImbWSWbYislM6HLI= X-Received: by 2002:a17:903:440c:b0:2a7:80ac:85b0 with SMTP id d9443c01a7336-2a8d7eaadddmr165797665ad.2.1770100931170; Mon, 02 Feb 2026 22:42:11 -0800 (PST) Received: from smtpclient.apple ([176.100.43.7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a88b4c3b94sm158896855ad.48.2026.02.02.22.42.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Feb 2026 22:42:10 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_E4BBDC2D-6C86-4023-8638-9C2993ADB884"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.3\)) Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware From: "Enji Cooper (yaneurabeya)" In-Reply-To: Date: Mon, 2 Feb 2026 22:41:58 -0800 Cc: Adrian Chadd , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Abdelkader Boudih Message-Id: <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4f4v6d6Tpsz3xV1 X-Spamd-Bar: ---- --Apple-Mail=_E4BBDC2D-6C86-4023-8638-9C2993ADB884 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 2, 2026, at 9:33=E2=80=AFPM, Konstantin Belousov = wrote: ... >> + if (ACPI_SUCCESS(status)) { >> + device_printf(dev, >> + "Apple hardware: installed Darwin " >> + "OSI and removed other vendor OSI " >> + "(Windows, etc)\n"); > Why this verbosity is needed? >=20 > I see no benefit from it, other then consuming kernel memory. I added the verbosity. It helped a few of us Apple users determine = whether or not the functionality was working. I can trim down the = verbosity if needed in a followup commit. Cheers, -Enji= --Apple-Mail=_E4BBDC2D-6C86-4023-8638-9C2993ADB884 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmBmLcACgkQGpE5DjPs NJjCkA/8CBYlh19rpXA+CduYKOGUh7af5qdoEVh/tTqO5e4fkE7l4n91U5mSHnk0 gfhETp4uhVxQvTaZSacTKjVhDTrTYhp9Z/qF3jizmKGmHyYxoGyXi36uIs1FNkNG HkEeHHxD183xT9SECQtolbcw6KvNJGKBWbTDm5I6754/1H4P7b+dOSGhq7Gfuq3F Xgp9DQ8K5TSl3BZW5Nl/PBgErNkkJpLLjinEWUhWMf1/0apl93oqnEFfU25P5Vgu rF3R+bY0SQ/fZw4/X3IEpVc6CyuU6WiNuGQzXfZD4vo1RtUWG0mfsuUuygiIRu9H E2N83tfky7D6FjE9h8rdFZKhGcyPOX6uSUSMper3n32TpSyh8DKZJCQp8JBgcOUR MNY0MPGrN5C37gX1CvrmTZwR56iyB2/x8aIJ8A3PBwYaDplZuGOubTFdJi4Tg9As j5L+kNtAI+TSe2gnnl10LhnHiRR2sfLDrlpH1examu3iGCntdIP9OkO/HV1H7M9C SQfhlCGy/zr+s/dFhGvc/zMydyrSWlZsLO/5PC7ocWQvImvpqRXQTeTSzLD5UzYp gzjZ1w/71t9uFOVu9W7+lerL6ABGPgZbXV0Lj9IDwlnTKPQfYBrrSuqh3f6J6Pc0 9dfHKmI/IwZqpCCjVuta8yjiTqv8NEemSByYof+MqKMkWhoDMIA= =RMlW -----END PGP SIGNATURE----- --Apple-Mail=_E4BBDC2D-6C86-4023-8638-9C2993ADB884-- From nobody Tue Feb 3 07:56:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4wmB01Gxz6RNmd; Tue, 03 Feb 2026 07:56:26 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4wm906n3z49Yb; Tue, 03 Feb 2026 07:56:24 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 6137uCld007655; Tue, 3 Feb 2026 09:56:16 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 6137uCld007655 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 6137uCW8007654; Tue, 3 Feb 2026 09:56:12 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 3 Feb 2026 09:56:12 +0200 From: Konstantin Belousov To: "Enji Cooper (yaneurabeya)" Cc: Adrian Chadd , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Abdelkader Boudih Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware Message-ID: References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f4wm906n3z49Yb X-Spamd-Bar: ---- On Mon, Feb 02, 2026 at 10:41:58PM -0800, Enji Cooper (yaneurabeya) wrote: > > > On Feb 2, 2026, at 9:33 PM, Konstantin Belousov wrote: > > ... > > >> + if (ACPI_SUCCESS(status)) { > >> + device_printf(dev, > >> + "Apple hardware: installed Darwin " > >> + "OSI and removed other vendor OSI " > >> + "(Windows, etc)\n"); > > Why this verbosity is needed? > > > > I see no benefit from it, other then consuming kernel memory. > > I added the verbosity. It helped a few of us Apple users determine whether or not the functionality was working. I can trim down the verbosity if needed in a followup commit. Yes, I think that this verbosity is not warranted. If you want something to be printed, much shorter messages would be enough. But I am not sure that any messaging is needed. From nobody Tue Feb 3 10:08:40 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f4zjB1mrYz6PJp8; Tue, 03 Feb 2026 10:09:02 +0000 (UTC) (envelope-from freebsd@seuros.com) Received: from fout-a3-smtp.messagingengine.com (fout-a3-smtp.messagingengine.com [103.168.172.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4zj95vrkz3F56; Tue, 03 Feb 2026 10:09:01 +0000 (UTC) (envelope-from freebsd@seuros.com) Authentication-Results: mx1.freebsd.org; none Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id C19A9EC0096; Tue, 3 Feb 2026 05:09:00 -0500 (EST) Received: from phl-imap-04 ([10.202.2.82]) by phl-compute-06.internal (MEProxy); Tue, 03 Feb 2026 05:09:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seuros.com; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770113340; x=1770199740; bh=HhsIrRE1rD ZRbcbcPOGY8cxP18eT7Nnm6+avoLzh0dk=; b=bAD1oeHyyCqsWkeuLsA3zUY+ZV EdlDR0xD2J0WLPquhuZSRQin9+mAwD+KQ6SLk04ilH4vvB8pdUCgSu8MJU6nJ7Ht UQB2q4AQSF/dIMCa9ShzBg0pZWtJngpOP/nsr6GhUU87GcV+1HdKZp7+mn0KbDLc hzcG6sz3NZgIkeTm5i4AYKB1Y7IIwqwd4mwgLPdt/HwAKbrXSmsdols0xrPZ0Nn7 1WCxaW5ozU7eblWg4wQcVlzOWRftjbZlbUUp2WEKH8zfV7FBtZDQPeiegzSZHBsJ 8F88eSIv5CyeWd2NRJdNeE0UbKgmNbj3xJTSJYrary6NINEi1H2kN7as3pmA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770113340; x=1770199740; bh=HhsIrRE1rDZRbcbcPOGY8cxP18eT7Nnm6+a voLzh0dk=; b=A0JmzPGyZO+YWIAKuwtMbwk2g/mYZYz5idNHnu22taWL7OyYntp i36Hb7ARc1/gQ0cEZGPDHJN8iTPjvBLGYwVDQGcbhbUaS1h2t010Bf+K6En0nGJW +LTtKAgslgtd3MayjR7uzBWkXCg1M9xuavaRpXxTgWOgZfzm0CYoHBWXz4qLbWji 1Rn69NlMOxb3qkueyfXansqEdzp3FJMGs5sH2QOM28K3nMHryg5zNIDu5+yIndsQ Ee+Oa7ztKzPbQnDTef9MapjnfvcIzK6b0BgVSPKsBsl74H8JYxWVQjBrOmOgNw/3 K6WMwDbaaf71cYXUeAOfK0goLdYvo/+K9bw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddujeelleeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepofggfffhvfevkfgjfhfutgesrgdtreerredtjeenucfhrhhomhepfdetsgguvghl khgruggvrhcuuehouhguihhhfdcuoehfrhgvvggsshgusehsvghurhhoshdrtghomheqne cuggftrfgrthhtvghrnheptdetgeegudefjeehkeetleeugfekjeeftdeuheejgedvuefh leefudethfevheetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepfhhrvggvsghsugesshgvuhhrohhsrdgtohhmpdhnsggprhgtphhtthhopeei pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopegrughrihgrnhesfhhrvggvsghsug drohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqdgrlhhlsehfrhgv vggsshgurdhorhhgpdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqmhgrih hnsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepshhrtgdqtghomhhmihhtthgvrhhs sehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepkhhoshhtihhksggvlhesghhmrghilh drtghomhdprhgtphhtthhopeihrghnvghurhgrsggvhigrsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i0381466a:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 92F12B6006E; Tue, 3 Feb 2026 05:09:00 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 X-ThreadId: Ak6CNxIQ9uwR Date: Tue, 03 Feb 2026 11:08:40 +0100 From: "Abdelkader Boudih" To: "Konstantin Belousov" , "Enji Cooper (yaneurabeya)" Cc: "Adrian Chadd" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: <63ee9a06-97bd-4f7f-8bb8-ed39382d94a4@app.fastmail.com> In-Reply-To: References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware Content-Type: multipart/alternative; boundary=7d8754e56aed45bb9312875e66e5ee8a X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:151847, ipnet:103.168.172.0/24, country:AU] X-Rspamd-Queue-Id: 4f4zj95vrkz3F56 X-Spamd-Bar: ---- --7d8754e56aed45bb9312875e66e5ee8a Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I agree that this should not be permanent verbosity. The aim was not to add long-term noise, but to make the behavior observa= ble/greppable to reviewers while this logic is still being validated acr= oss a wide range of Apple models. I'm going to get few Apple devices to try on. Once we confirm that every= model behave the same, we could totally remove verbosity and treating i= t as assumed-working code. On Tue, 3 Feb 2026, at 08:56, Konstantin Belousov wrote: > On Mon, Feb 02, 2026 at 10:41:58PM -0800, Enji Cooper (yaneurabeya) wr= ote: > >=20 > > > On Feb 2, 2026, at 9:33=E2=80=AFPM, Konstantin Belousov wrote: > >=20 > > ... > >=20 > > >> + if (ACPI_SUCCESS(status)) { > > >> + device_printf(dev, > > >> + "Apple hardware: installed Darwin " > > >> + "OSI and removed other vendor OSI " > > >> + "(Windows, etc)\n"); > > > Why this verbosity is needed? > > >=20 > > > I see no benefit from it, other then consuming kernel memory. > >=20 > > I added the verbosity. It helped a few of us Apple users determine w= hether or not the functionality was working. I can trim down the verbosi= ty if needed in a followup commit. >=20 > Yes, I think that this verbosity is not warranted. If you want someth= ing > to be printed, much shorter messages would be enough. But I am not su= re > that any messaging is needed. >=20 --7d8754e56aed45bb9312875e66e5ee8a Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
I agree that this should not be pe= rmanent verbosity.

= The aim was not to add long-term noise, but to make the behavior observa= ble/greppable to reviewers while this logic is still being validated acr= oss a wide range of Apple models.

I'm going to get few Apple devices to try on. Once we confi= rm that every model behave the same, we could totally remove verbosity a= nd treating it as assumed-working code.


On Tue, 3 Feb = 2026, at 08:56, Konstantin Belousov wrote:
On Mon, Feb 02, 2026 at 10:41:58PM -0800, En= ji Cooper (yaneurabeya) wrote:
> 
> > = On Feb 2, 2026, at 9:33=E2=80=AFPM, Konstantin Belousov <kostikbel@gmail.com> wrote:
= > 
> ...
> 
> >&g= t; + if (ACPI_SUCCESS(status)) {
> >> + device_printf= (dev,
> >> +    "Apple hardware: insta= lled Darwin "
> >> +    "OSI and remov= ed other vendor OSI "
> >> +    "(Wind= ows, etc)\n");
> > Why this verbosity is needed?
> > 
> > I see no benefit from it, other t= hen consuming kernel memory.
> 
> I added= the verbosity. It helped a few of us Apple users determine whether or n= ot the functionality was working. I can trim down the verbosity if neede= d in a followup commit.

Yes, I think that this = verbosity is not warranted.  If you want something
to be = printed, much shorter messages would be enough.  But I am not sure<= /div>
that any messaging is needed.


--7d8754e56aed45bb9312875e66e5ee8a-- From nobody Tue Feb 3 10:26:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f504v4tBjz6PL04 for ; Tue, 03 Feb 2026 10:26: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f504v1nKSz3GrM for ; Tue, 03 Feb 2026 10:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770114367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mr/ebt13t+zlXFhLcjVx5z5E0E2ulQLKVGnvMpUBoWA=; b=mmBX5YjSoiXxnASqmQsj3Lj7rmZGfw9jdtQOZmbfG0wR/CHTzNKrFv3kO+0HGI0fzssjM0 8CUSxwd1gPbyIRllNM/hnPvyTFCQwlN9K5WUT+IdZtfIznT1zmZzSk1nV/nsvtvqRAdE/w uhgYQJ0PaLmY16xTa/t4WvrLPxEc6rzELoAfy7icnswxTeWBpq1K/WyRTdb5IpWegvYPEO bSHvYcFw/dWQaMoaLc39KB9OeWPkTVUojBcNUvuuYNttZl0tgLQ+OmpDhgvVoxfgjZSYDH ykkBVbGzgz3wzQhez57G65NuUv6B2v0V5DtahYkDUGBM1vX+sRoelSUX6FxFmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770114367; a=rsa-sha256; cv=none; b=lb91XGdxpR2GQjpqwMjfqOOQ8gWURjrkqTODn4N/la1DyByDaJa4lYaxd36i+3Ad5WD3xP ufVgBH2nWJBP0RCN0Hh10/vR7jOHRn61RSvpruTR3Uc/bKxCIIrAfqLxwQg/Wz/R5M2VEU KlpCM7AlmSn7tCFxyQbyG5wvlS9mpmX3xwf0DmqJLkQooRaB933kdUZlNnn1XLNFqxOo6P 8yMsjbMzK+x5JBgb+XPvIKeLs0OFqGvHPlCQG5CCUUWMnJkO6T4YXlabO9eHJzlL0dELTv TqxPJ6Nh2zQY/B1/JKBOyCPoAHrgLjb2oA08mXP6LvayqSuHpitp1kDFg42+Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770114367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mr/ebt13t+zlXFhLcjVx5z5E0E2ulQLKVGnvMpUBoWA=; b=Li6lYWA2H0geOJlF0eyehQ2UZpVXtzfXW2QIW2ZimegA7DUJs5WNuo6dSvsCpmBAkSLZ1u 2aFnAbiIdtJgp87lebgfRMiNko5e+YBXaSQnV1igqiDRvOifspkj86d/kWxBsBjasRs3yA BkW4jM7WMsPmWdgcEHCO53qcbw0YKC98IAC+FSRbSLKOpAwIzjwslcftA8eAxffhWu390+ 5piQVgOjyI4D8dIcC+r8cC4aLXCTfyFwS9HUryyKW9Va6GsIq4z3PI0fxhFrpX0sDqlTQM oQ5EbC15pbaC74Za0ix6a5XJbw39Y8sbkZ942euVJ6oHyMFNS2CRGhL1pB8UAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f504v1P6mz17w2 for ; Tue, 03 Feb 2026 10:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c27e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 10:26:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cd8d44173adc - main - unmount(2): do not allow MNT_DEFERRED or MNT_RECURSE flags from userspace List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd8d44173adc375b59a24b1363476c086a7c86b4 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 10:26:07 +0000 Message-Id: <6981cd3f.1c27e.1337749@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cd8d44173adc375b59a24b1363476c086a7c86b4 commit cd8d44173adc375b59a24b1363476c086a7c86b4 Author: Konstantin Belousov AuthorDate: 2026-02-02 22:38:32 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-03 10:25:47 +0000 unmount(2): do not allow MNT_DEFERRED or MNT_RECURSE flags from userspace Repprted and tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/vfs_mount.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 13403acacc08..240bf5451a84 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1733,6 +1733,8 @@ kern_unmount(struct thread *td, const char *path, int flags) int error; AUDIT_ARG_VALUE(flags); + if ((flags & (MNT_DEFERRED | MNT_RECURSE)) != 0) + return (EINVAL); if (jailed(td->td_ucred) || usermount == 0) { error = priv_check(td, PRIV_VFS_UNMOUNT); if (error) From nobody Tue Feb 3 10:38:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f50My3w6rz6PM2s; Tue, 03 Feb 2026 10:39:10 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f50Mx3Y78z3Hhk; Tue, 03 Feb 2026 10:39:09 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 613AcuJ4013595; Tue, 3 Feb 2026 12:39:00 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 613AcuJ4013595 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 613AculT013594; Tue, 3 Feb 2026 12:38:56 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 3 Feb 2026 12:38:56 +0200 From: Konstantin Belousov To: Abdelkader Boudih Cc: "Enji Cooper (yaneurabeya)" , Adrian Chadd , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware Message-ID: References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> <63ee9a06-97bd-4f7f-8bb8-ed39382d94a4@app.fastmail.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <63ee9a06-97bd-4f7f-8bb8-ed39382d94a4@app.fastmail.com> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f50Mx3Y78z3Hhk X-Spamd-Bar: ---- On Tue, Feb 03, 2026 at 11:08:40AM +0100, Abdelkader Boudih wrote: > I agree that this should not be permanent verbosity. > > The aim was not to add long-term noise, but to make the behavior observable/greppable to reviewers while this logic is still being validated across a wide range of Apple models. > > I'm going to get few Apple devices to try on. Once we confirm that every model behave the same, we could totally remove verbosity and treating it as assumed-working code. > > > On Tue, 3 Feb 2026, at 08:56, Konstantin Belousov wrote: > > On Mon, Feb 02, 2026 at 10:41:58PM -0800, Enji Cooper (yaneurabeya) wrote: > > > > > > > On Feb 2, 2026, at 9:33 PM, Konstantin Belousov wrote: > > > > > > ... > > > > > > >> + if (ACPI_SUCCESS(status)) { > > > >> + device_printf(dev, > > > >> + "Apple hardware: installed Darwin " > > > >> + "OSI and removed other vendor OSI " > > > >> + "(Windows, etc)\n"); > > > > Why this verbosity is needed? > > > > > > > > I see no benefit from it, other then consuming kernel memory. > > > > > > I added the verbosity. It helped a few of us Apple users determine whether or not the functionality was working. I can trim down the verbosity if needed in a followup commit. > > > > Yes, I think that this verbosity is not warranted. If you want something > > to be printed, much shorter messages would be enough. But I am not sure > > that any messaging is needed. > > Note that there are two things. One is the overly long and IMO unhelpful musing about what happen: what is installed, and what is removed, and especially the 'Windows, etc' part. This can be shortened to simple informational message, that allows to identify the successful action, without musing about its origin and possible effects. Another is the removal of the printing at all. I am sure that the first issue should be fixed now, if some informational printing is going to stay for (limited) time. From nobody Tue Feb 3 14:05:06 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f54xZ5265z6Pc9f for ; Tue, 03 Feb 2026 14:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f54xZ3G9Sz3k1r for ; Tue, 03 Feb 2026 14:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZiiFcfgnj4j6HgVDBry6vl7/AdCInHVzUMzH2ClmWPI=; b=rvkbdWgPFbRXf9QlTzZcJPdFfcI77eeKhWRzTQObdTX0czea+3nEd+kkc5e+CitNXgKOnR 08Wo/WazCGN9dy6Z1Ie16+bzbpKhY2vgPTt6YE+S2Wl+YfJp65LsxZ4Fcl2fjhiY2eKQU7 RoE3GOFWGmGYyqjho/W3/P8kAO2etzDCBxMKnsMXIIxjbGJYcMpg/Wgd8RvAz8lhMqUC6G J+Vf7rKsX9jAe339OVP0caRvKEclKsnhcuMlsqhmhNcyPVlrEsvcDoEmkPaj5Dhvthm3tl QjMJzjaiKyeTtDZtMB4Aarn7g8ifwiJ4xm0JJS63/NVfxqt7QarVWiTX3Dnz/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770127506; a=rsa-sha256; cv=none; b=aybaBww/LhFHo3e2N0S4+XF6VZArsb8lKbiQeWmaqJVQyVhWLNdCqQTYbbCmnjzsSHPh+C skgLr7Qw7ZU1qIXAytKjZ8o3kWc/mR108EghpY34JCQw/mJOeXnXnmz0SvYVSsgvET4KKJ ExCpkv4rLEpW9vBriRUHRYwi6E7txiAnAXtcQ13SOpAHk11tfPfFGF3Y7mHO0ZzvBhAjqP kFKVKtoyP69uqktFLkOObHj+InrqOmHnsEr2JKGpNo/jeG3CW8evYW52H78p1qw5236N6Y 9USY13tgEwLXxyVPX4PHPAkPJgw310vS28VBgY/Ba/JkY3K+beoYPaA883ExbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZiiFcfgnj4j6HgVDBry6vl7/AdCInHVzUMzH2ClmWPI=; b=uceM1IJnb7Vxakhl3POcchZOVhtIcQyPspyz0AvgoxvzeiWWOR+T0oQurVwyY/bI+B46Y/ 8S0kZEW0p0BeMoA5kLcD9NZF6dpnxaygtslho5Io8GFD93sRCjfHoPY5nf15WjS1Vsx/k+ WkUkR0nhj4rBlDVarXYnEbbF7FyL8tcJPje00CUjn0y+wakSLpv6GLKFBcp1sPMTaJIQW3 CdFT00C34zi5ghAY3Ft0E6hVyZyXppqWPu/K3mFDS5icBmncLKeYlHtjGwVmqa1mNTeV8b aQONY+R1L72hDm71X0eqEYzSMIQ3KKp88UO6k7umaHLkkhIkdR0719dyZ4CLRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f54xZ2YJFz205 for ; Tue, 03 Feb 2026 14:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3af07 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:05:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 4b0e09a918fb - main - hwpstate_amd(4): Fix BITS_WITH_VALUE()/SET_BITS_VALUE() to obey the mask List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b0e09a918fbcdb3938ecb8e0efc3313bd3b2308 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:05:06 +0000 Message-Id: <69820092.3af07.37153790@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4b0e09a918fbcdb3938ecb8e0efc3313bd3b2308 commit 4b0e09a918fbcdb3938ecb8e0efc3313bd3b2308 Author: Olivier Certner AuthorDate: 2026-01-29 09:00:02 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 14:03:02 +0000 hwpstate_amd(4): Fix BITS_WITH_VALUE()/SET_BITS_VALUE() to obey the mask While here, rename an argument of BITS_VALUE() to be consistent with the other macros. Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54997 --- sys/x86/cpufreq/hwpstate_amd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 34838753e221..08c833d1a2dd 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -115,9 +115,11 @@ #define HWP_AMD_CLASSNAME "hwpstate_amd" -#define BITS_VALUE(bits, num) (((num) & (bits)) >> (ffsll((bits)) - 1)) -#define BITS_WITH_VALUE(bits, val) ((uintmax_t)(val) << (ffsll((bits)) - 1)) -#define SET_BITS_VALUE(var, bits, val) \ +#define BITS_VALUE(bits, val) \ + (((val) & (bits)) >> (ffsll((bits)) - 1)) +#define BITS_WITH_VALUE(bits, val) \ + (((uintmax_t)(val) << (ffsll((bits)) - 1)) & (bits)) +#define SET_BITS_VALUE(var, bits, val) \ ((var) = ((var) & ~(bits)) | BITS_WITH_VALUE((bits), (val))) #define HWPSTATE_DEBUG(dev, msg...) \ From nobody Tue Feb 3 14:05:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f54xW4hmTz6Pc9Z for ; Tue, 03 Feb 2026 14:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f54xW1MJrz3jwY for ; Tue, 03 Feb 2026 14:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nR5FtI6TBGwrPZA37oYyo25eNh2LgN/Iyg5/ZLBe194=; b=EURZmCk8YjV/364goYKe8tLdoSzfLK7V4XJcwR81HxyazN+U48CUOWaiJSupnk3fxropci xJJh4qcWmHxfTl1cJYG5Y0y1hk0cON1YEE6VkG3tIMltF3FWPo1fNg66yrgoaR6BbuAHXI eTirNPpBK8X7Y1t7RaZ26LhgmBcDpyW00g5FBsvRH5pVVYRY1iMPFgK+M63VU8m0D+TURB La7uQ8F1xmfCtBc60tn6CwdycF0KklZIfqAIhVK1LfwObYX1fDewe5I3mD212ZM9sR7A/2 4e2SIEGlzpI+5anG/RkrtdHwIhrxfSNSlZ4h37gTsFGrX+9RGUxxOTcFg49J+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770127503; a=rsa-sha256; cv=none; b=W40ZpcA1kS7EQaJPVv9VWof6ZyzsZoCce6B+F0DRg+udqFpFBHm9JzzHL3yFa6Zd+fsqt+ VOoTfRcR/lNzaIcnr/fHr/ZuN+vIjf/19inJKc6RWJc1I8jtL+KcnleZM1XFPpd4WLSNqt /0Adfnuegxgg/G8cubH2WTienTstjRSchdoxTEyb4x5zwTjBHeeH7OJZxdWfRczge1S2Ua Lg+Es7nDIDv12NovClRQnsKww9xoo4bYmz8/PpIZXHo3KFOSG/UngP1ps1bBqj/AezCKXk +Jr2sPoKrI5BqbwYrPFBtgdN5BgPVT4XWXjI4+WoAOLRGKTnpP3H9srpOPofUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nR5FtI6TBGwrPZA37oYyo25eNh2LgN/Iyg5/ZLBe194=; b=THfotbVucOfem26YCYE+ivoTye1Zudfgy+kFC8Dp0h0dI+j0sbojiOq4u1TocMFMIXMxBS ySWhvxc7GwS6N1lcSiII5SVLuKY1fLXL0A6uCIN1YtsWRB9uQev6MbQbHLNjZoFO/3H8PF jMCSxT0ttnAetP/7Kc5NjU9S8wQOe4Wv90gsRH0y3yuxBLFqMzYd18fa7xB2yuaPyssv2L +3ge3XVTcyoqNVKNgG9m8imkMzoYaeNxWoY/KO4YnPuD8s1Jb9oR91RPvDzAM/p7EIc3UE Khp2+d4w5aj5Dc3vJBeX4Pxwo/4s95jZP2HrqhyIiGJNRERU4N8Sv3+IZ0PQHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f54xW0CDDz1pS for ; Tue, 03 Feb 2026 14:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aaae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:05:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7acd7ac6385c - main - x86: x86_msr_op(): Move setting mode up, delineate logical blocks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7acd7ac6385c783699a64216198d7f2e244cc3b4 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:05:03 +0000 Message-Id: <6982008f.3aaae.ca793c1@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7acd7ac6385c783699a64216198d7f2e244cc3b4 commit 7acd7ac6385c783699a64216198d7f2e244cc3b4 Author: Olivier Certner AuthorDate: 2026-01-22 14:22:01 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 14:02:55 +0000 x86: x86_msr_op(): Move setting mode up, delineate logical blocks No functional changes (intended). Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54996 --- sys/x86/x86/cpu_machdep.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 067374be4941..b0763d7bd98e 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -161,16 +161,18 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) u_int exmode; int bound_cpu, cpu, i, is_bound; - a.op = op & MSR_OP_OP_MASK; - MPASS(a.op == MSR_OP_ANDNOT || a.op == MSR_OP_OR || - a.op == MSR_OP_WRITE || a.op == MSR_OP_READ); exmode = op & MSR_OP_EXMODE_MASK; MPASS(exmode == MSR_OP_LOCAL || exmode == MSR_OP_SCHED_ALL || exmode == MSR_OP_SCHED_ONE || exmode == MSR_OP_RENDEZVOUS_ALL || exmode == MSR_OP_RENDEZVOUS_ONE); + + a.op = op & MSR_OP_OP_MASK; + MPASS(a.op == MSR_OP_ANDNOT || a.op == MSR_OP_OR || + a.op == MSR_OP_WRITE || a.op == MSR_OP_READ); a.msr = msr; a.arg1 = arg1; a.res = res; + switch (exmode) { case MSR_OP_LOCAL: x86_msr_op_one(&a); From nobody Tue Feb 3 14:05:04 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f54xY2Hd3z6PcDY for ; Tue, 03 Feb 2026 14:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f54xX1WH2z3k11 for ; Tue, 03 Feb 2026 14:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cNW+ocY4jow5eCvePelIjZmzMVN9823mq/DeEsXLIqk=; b=oeuNlxfQDvvTJyFu61p+hfeOb/Ah3PvtfkbROpSMrTf3he5D+/+UDjIbs5IeZHixh/aur9 D+rk7ExwnSMX67sR9piAlDZLVfWPn9VjBBaw5OmQ0xRREYv/56MBdzMxGHYVSR2hkID831 i2DpAOhsC+aZCs5R5YlD6vvXoUzbrro7JIWp6HT8tUodsFQF+0R37IfprQvoKcd3V0iMrA wuRyRd9NCCkFCsTTIZypEs8TM1Wv/caKll7GpV7JE6z1VRhAc7gi/+46+TP3autOhgmPnA kxA+nU3tOP+IxJSXFRtgJjTJUZD4ed1cMlI/v+o1S/ozsWGQZVoX8fwvGny7nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770127504; a=rsa-sha256; cv=none; b=MzFV5HcDF3jJvsW5XbLXya650zla+8zG2GdE/Dt0wGPPvneij9V06jtBv8zRvz9VPzr9G+ fOPy4IX36iX0lgnlkpSXBMbrbghhwf7jTXEgpZ90pb6FQkiqsKCw72eDqhcmzkBfVUbgLc tL9J24mFv7R69tlXR9GC7SjLDBgWepMZebU98pS31uDdaGvDwm6lQ+fvWzxl7NgHwT+Pe2 Tl50jUptPrmi/OEzeXYhJpGLky7V9kgQHg9t6uiPFPi+DGqsa1hS6yKzUUBOLr+4QrvV04 3UfF9krr0nxcwxs/PtcxuNbX3nsrhZqgtTb1UYYU0pMg9rxcEC8A/MgXdPREvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cNW+ocY4jow5eCvePelIjZmzMVN9823mq/DeEsXLIqk=; b=PlKQ0TwrpkgsXgSphlxPcBoFQflMiKjcfCsM92VFkoudXNC8ScmxwwigE7QzelcWAJ+LIw cx34DwnjgNatP8Fn8fSi0GYOSupJI5P9BAH92p1IebsTnlX/efJwjTOT4BqO4NDBhqL7ft 5qbWryeE+Im7WRb+YI6Xs70zBjiJBMRNDX8cAOfE5Ty2Wy8ESt1xQwVqSbaaEkxuKFbsuq t2wRnTMypaabb7weTi6LJu9wMHPzD9SeQCjQ9EiO+s1Twm92A8Q1NfCfEan+ByplZis9T4 2O4REmrf/h+3CfwHG/aAQQXQ9lH7NM37w77Jfy3OdT1t5CBZLYzHc6g3p9sBxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f54xX0xNwz204 for ; Tue, 03 Feb 2026 14:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b12a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:05:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a1a8bcdfde2e - main - x86: x86_msr_op(): Simplify assertions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:05:04 +0000 Message-Id: <69820090.3b12a.69cfbf16@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9 commit a1a8bcdfde2e616cffeb4bf4e1968ba55cf409e9 Author: Olivier Certner AuthorDate: 2026-01-22 14:37:00 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 14:03:01 +0000 x86: x86_msr_op(): Simplify assertions Simplify them by moving them into more natural places, i.e., default cases of 'switch' statements. No functional change (intended). Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54996 --- sys/x86/x86/cpu_machdep.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index b0763d7bd98e..5cbcb40540bb 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -145,6 +145,8 @@ x86_msr_op_one(void *argp) v = rdmsr(a->msr); *a->res = v; break; + default: + __assert_unreachable(); } } @@ -162,13 +164,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) int bound_cpu, cpu, i, is_bound; exmode = op & MSR_OP_EXMODE_MASK; - MPASS(exmode == MSR_OP_LOCAL || exmode == MSR_OP_SCHED_ALL || - exmode == MSR_OP_SCHED_ONE || exmode == MSR_OP_RENDEZVOUS_ALL || - exmode == MSR_OP_RENDEZVOUS_ONE); - a.op = op & MSR_OP_OP_MASK; - MPASS(a.op == MSR_OP_ANDNOT || a.op == MSR_OP_OR || - a.op == MSR_OP_WRITE || a.op == MSR_OP_READ); a.msr = msr; a.arg1 = arg1; a.res = res; @@ -219,6 +215,8 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) smp_rendezvous_cpus(set, smp_no_rendezvous_barrier, x86_msr_op_one, smp_no_rendezvous_barrier, &a); break; + default: + __assert_unreachable(); } } From nobody Tue Feb 3 14:05:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f54xY5cwRz6PcDb for ; Tue, 03 Feb 2026 14:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f54xY2BYcz3k4Z for ; Tue, 03 Feb 2026 14:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCBePsEzq9N/BP0eAwjn/OMIiUkU/lGAQX8ZfNQDTWY=; b=cDFtRHrPc8D/pocdhK+cOmhiXMw+wahjNMr+mobPNQq9qV9lrhacuNCn/x4tzbyWTzkYs5 8uM8h0lFwk2jAcKFOGV5vLQz1mYmijYWAgErwsN5YF3Sqb5IsqOUctNfur9lFuPm+ps/q1 e+8QnqSRqD9YnORW0cGt7qGlauCK07wf6qDaUiLyDX9PxTUMBvuiN9+KqEmtg/nBwlBYSn sfm1t+WD8leGlk/EnKwcq3GKX9p5hTJ6PKqoE8PEZrpRprzzmlcwryUjwsHU/15EvnJcgX P4CApBnF39ymXkTlhx1EhosPfH/W1eDVlIRkOhRzw/imTRB2EcXqPeeNkUJ+pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770127505; a=rsa-sha256; cv=none; b=vC/eS8KLe9GhmFUgpc1/jAqa5cAdCl24QFq97UhFGUnVuNxSBFUrJHQy4+qJLFoUeNlhdm /c6VR0rbECbnhpGdjY1lBOZp0N3Xu6BcbZuk/le8+1L/cBIkpExDNSORu8LonwQ9UnyI0+ woWfCwm/K9+A3JwBpVKoiQRua8zAjO4rEbraPJIZdhdLGrz+jjLh4svjwRM3H2frXATJrE PFfmpCGIuHO1Izu6mqNZ9Javra/cJMIYkFkCDiKYY1XsJilPep4ZAG1vPJYwiK7gfBmp9r V+kvLK/dn0Xyn3wgk7kF8ncvjsh+TmO4KkdOHFPOn6N8rNXpN1gPENxmvwJTeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCBePsEzq9N/BP0eAwjn/OMIiUkU/lGAQX8ZfNQDTWY=; b=o7bFJC+/Ok7nRnZEi9m+8XeoRmGb57kEKBL7P9nuriCn9Hs86XKPCSCw0hrJICg0FbaaC9 0xwcklHiXtRk2qyR5b2ugjuE5rDkJ2/x7dpcwpE3F17pQfv2nnqV4rjsMx85ynwoqUnCzt hqXQqBN1LE4cUEFWgHr7AuxQae3evFHjyFQjcppJFe7WUvWsKlopAfp8FWG2bsw2MMtNTS Ew23UhX62RhHiAqP8bGS0ThUSzE7zVSnN6qTaEBrCLo0ata+Qvnf3iL64MvNLdD7jA1za0 9Hh1y6nLIvBSrMocnB+EEOQqD8B2+mxgcL+LzeevXtpait5r3Stp8H4BoFpQtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f54xY1kfMz1M1 for ; Tue, 03 Feb 2026 14:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39f45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:05:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: e5f8cbb86d58 - main - x86: x86_msr_op(): MSR_OP_LOCAL: Disable interrupts on atomic ops List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5f8cbb86d58f25b5ff168506b78d09dca266fb6 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:05:05 +0000 Message-Id: <69820091.39f45.5f1e54ad@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e5f8cbb86d58f25b5ff168506b78d09dca266fb6 commit e5f8cbb86d58f25b5ff168506b78d09dca266fb6 Author: Olivier Certner AuthorDate: 2026-01-23 20:52:46 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 14:03:01 +0000 x86: x86_msr_op(): MSR_OP_LOCAL: Disable interrupts on atomic ops On MSR_OP_LOCAL and non-naturally-atomic operations (MSR_OP_ANDNOT and MSR_OP_OR), there is no guarantee that we are not interrupted between reading and writing the MSR, and that interruption could actually perform some operation on that MSR, which would be lost. Prevent that problem by temporarily disabling interrupts around MSR manipulation. Reviewed by: kib Discussed with: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54996 --- sys/x86/include/x86_var.h | 2 ++ sys/x86/x86/cpu_machdep.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h index 701b982e6afb..215fe0562465 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -171,6 +171,8 @@ uint64_t rdtsc_ordered(void); /* * Where and which execution mode + * + * All modes cause execution on the target CPU(s) with interrupts disabled. */ #define MSR_OP_LOCAL 0x10000000 #define MSR_OP_SCHED_ALL 0x20000000 diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 5cbcb40540bb..5f8965bd5614 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -160,6 +160,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) struct thread *td; struct msr_op_arg a; cpuset_t set; + register_t flags; u_int exmode; int bound_cpu, cpu, i, is_bound; @@ -171,7 +172,9 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) switch (exmode) { case MSR_OP_LOCAL: + flags = intr_disable(); x86_msr_op_one(&a); + intr_restore(flags); break; case MSR_OP_SCHED_ALL: td = curthread; From nobody Tue Feb 3 14:05:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f54xb6Np5z6PcN3 for ; Tue, 03 Feb 2026 14:05: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f54xb3n7hz3jgd for ; Tue, 03 Feb 2026 14:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1StSS1kWR11rpy93LNRV6Ga4p/Yd3WLIfXGypWnBk0=; b=ECL65RxoD+AuRk733rDBO1Jks91UoZb/awdyY1tiebU2OzwPDEOKCCSk1c0QfxfD7limsV tYN5snHhSUc43YtZuCVyLPzgX3kEQlGOCcEs6RGGHWEM0wA05AHAuqaoT55vumthH5aybx SAhR/lx0LdThAm8LDKYi5bfJZdwDSejDjypE8/j03uES1oV8BbaPlnY4VfMryUcNSkoFkf uAVQ1IeZWioy6BaQGJtVPHwnPIkEBnTWB3Vzw1mi6iJfBkvX6tlbU232zq97OndTugLFtD mNyMVZVFyQ+d+yZmOVjnDVaituXQbScAuiidp5y91Pa45cnFGXKxrmG5wde0og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770127507; a=rsa-sha256; cv=none; b=LafWJcg7tzxreoGQKpoySKdBnoYSzxxdPz7rn/TGWnsJ3ixLwf3uUrnHJHO6uHSn3Cd0Mb Pw7zm8iKvhXVjW5e8x4JUPvI2ur+l4EWz/asRs+hUF5rqD0Hio4SwIfKp7VW/NGaN1dAwe AUP5qsAuVINeobg43MMh4szuzKVVgYvpjhEyiOlTQ95wkPIpEUErkGbyr6qa1L+Djiuzxi GiF4okHFgEoz4PnoxexBGb2GufqdW2CGgJZEx8oMfF6700vfWYn08hS3E6h37W8HbwCrwC NnzrTE1OU5XHFTKXZMMQyjv7YwzgjxHsq71ZL8QS/jAj+Rb9Em201aR2AtTx9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770127507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1StSS1kWR11rpy93LNRV6Ga4p/Yd3WLIfXGypWnBk0=; b=QwwTuT+8LfpZg6gWKjRLlXBUNVtQNQDroNKuhGhvsZ4/eRkHhjA8DZqRtOmtg8QLD5LESR xgwR9reugDHjZwxlQnyEvyasNnCcadQYmah6Cx508zIXizLYyATi6yjD+f/RQBLA2DvIE2 J9esXgW1dcyZIPai8Lm+X/I+kGaSazXD0iGTGLlP9KURIFRObgC/Vhf/3kOkmXwfNTRMFm iofVN2Jc7oLIzkNexqRbf2dgJ7+pl7fQ8EW1NgLZtCdkPfOXVMtOxMMXjmIi/ILBOo+QRV muqfvgC7XL/1roOqDQkNN5X+XfvuCiMG7hlE68qPSISUi5mhk+w/ukiWzZPw8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f54xb3K4vz206 for ; Tue, 03 Feb 2026 14:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ac0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:05:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 9ae367d11de8 - main - hwpstate_amd(4): Rename CPPC register macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ae367d11de8abbdf53884836c9ba30908c5c8db Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:05:07 +0000 Message-Id: <69820093.39ac0.437a9c73@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9ae367d11de8abbdf53884836c9ba30908c5c8db commit 9ae367d11de8abbdf53884836c9ba30908c5c8db Author: Olivier Certner AuthorDate: 2026-01-29 09:08:47 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 14:03:02 +0000 hwpstate_amd(4): Rename CPPC register macros To be closer to AMD's official terminology, except for the "Lowest Non-Linear Performance" field which we label as 'EFFICIENT_PERF' closer to Intel's ("Most Efficient Performance"), and to clear possible confusion. No functional change (intended). Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54998 --- sys/x86/cpufreq/hwpstate_amd.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 08c833d1a2dd..d8ad090a6a58 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -103,12 +103,12 @@ #define AMD_1AH_CUR_FID(msr) ((msr) & 0xFFF) -#define AMD_CPPC_CAPS_1_HIGH_PERF_BITS 0xff000000 +#define AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS 0xff000000 #define AMD_CPPC_CAPS_1_NOMINAL_PERF_BITS 0x00ff0000 -#define AMD_CPPC_CAPS_1_LOW_NONLIN_PERF_BITS 0x0000ff00 -#define AMD_CPPC_CAPS_1_LOW_PERF_BITS 0x000000ff +#define AMD_CPPC_CAPS_1_EFFICIENT_PERF_BITS 0x0000ff00 +#define AMD_CPPC_CAPS_1_LOWEST_PERF_BITS 0x000000ff -#define AMD_CPPC_REQUEST_ENERGY_PERF_BITS 0xff000000 +#define AMD_CPPC_REQUEST_EPP_BITS 0xff000000 #define AMD_CPPC_REQUEST_DES_PERF_BITS 0x00ff0000 #define AMD_CPPC_REQUEST_MIN_PERF_BITS 0x0000ff00 #define AMD_CPPC_REQUEST_MAX_PERF_BITS 0x000000ff @@ -259,13 +259,13 @@ amdhwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) data = request.caps; sbuf_printf(sb, "\tHighest Performance: %03ju\n", - BITS_VALUE(AMD_CPPC_CAPS_1_HIGH_PERF_BITS, data)); + BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, data)); sbuf_printf(sb, "\tGuaranteed Performance: %03ju\n", BITS_VALUE(AMD_CPPC_CAPS_1_NOMINAL_PERF_BITS, data)); sbuf_printf(sb, "\tEfficient Performance: %03ju\n", - BITS_VALUE(AMD_CPPC_CAPS_1_LOW_NONLIN_PERF_BITS, data)); + BITS_VALUE(AMD_CPPC_CAPS_1_EFFICIENT_PERF_BITS, data)); sbuf_printf(sb, "\tLowest Performance: %03ju\n", - BITS_VALUE(AMD_CPPC_CAPS_1_LOW_PERF_BITS, data)); + BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, data)); sbuf_putc(sb, '\n'); data = request.req; @@ -299,9 +299,9 @@ sysctl_epp_select_per_core(device_t hwp_device, uint32_t val) struct hwpstate_softc *sc; sc = device_get_softc(hwp_device); - if (BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, sc->req) == val) + if (BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->req) == val) return; - SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_ENERGY_PERF_BITS, val); + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_EPP_BITS, val); x86_msr_op(MSR_AMD_CPPC_REQUEST, MSR_OP_RENDEZVOUS_ONE | MSR_OP_WRITE | MSR_OP_CPUID(cpu_get_pcpu(hwp_device)->pc_cpuid), @@ -315,7 +315,7 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) devclass_t dc; struct hwpstate_softc *sc; const uint32_t max_energy_perf = - BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, (uint64_t)-1); + BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, (uint64_t)-1); uint32_t val; int ret = 0; int cpu; @@ -326,7 +326,7 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) if (!(sc->flags & PSTATE_CPPC)) return (ENODEV); - val = BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, sc->req) * 100 / + val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->req) * 100 / max_energy_perf; ret = sysctl_handle_int(oidp, &val, 0, req); if (ret != 0 || req->newptr == NULL) @@ -631,11 +631,11 @@ amd_set_autonomous_hwp_cb(void *args) * is the balanced mode. For consistency, we set the same value in AMD's * CPPC driver. */ - SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_ENERGY_PERF_BITS, 0x80); + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_EPP_BITS, 0x80); SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_MIN_PERF_BITS, - BITS_VALUE(AMD_CPPC_CAPS_1_LOW_PERF_BITS, caps)); + BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, caps)); SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_MAX_PERF_BITS, - BITS_VALUE(AMD_CPPC_CAPS_1_HIGH_PERF_BITS, caps)); + BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, caps)); /* enable autonomous mode by setting desired performance to 0 */ SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); From nobody Tue Feb 3 14:39:39 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f55jR3g8bz6Pf7c for ; Tue, 03 Feb 2026 14:39: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f55jR2SJvz3s7N for ; Tue, 03 Feb 2026 14:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770129579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nLOPp4OkZ2H5lgScNW1PJt7PMYJ1/s75qNiForGkE4=; b=eirovhsvk8ikPcxzs/sOeveT36vEh71WEpoSTZoJmyKFu103y1CegMS5vvUTHbgQOiKDmf Fqlo6w6xn/yT512wUqAGiofiYG8NzHXUnev63ebx6VLI1ZagRiHFgUZMA305j8S1xzOzCs 4KQn6tHsqiMhbc/Siaa8ppeAAhLpi0cT5/zMDLmxz6pZsrECR55juybIhXffKix5bUNZDh 9cFZ+D0InTeB/tUuSj5yp5J3xoedpz390/X3qYqA2+uVD6jNRcogxZLe2p+Dgn2WT7Ox+o IKlw/u7Uuenv4Iza7bKP9GWNeZLoaCAe9BNn/wCaggRciffw87v8GoDE6jzh2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770129579; a=rsa-sha256; cv=none; b=Hc8Sys8juTb/545WzHL6aV6rfz3zG+9FrlxZ4osEtXYrJtpdselsaU2kGymCdhp6hazQaG spC5P2Ogn7fD/IbkDWUXXRBrexcD/jI07jyke7kD6MFD43EaZPRCZwayatMxf9uyzyKGLF 53dRIASkD/q6p3tC872mle4v2rSW2R787EGt438SkbHWRivM+UctieJ1wSeaLiwkV5f190 Es2wFk9fa+f8r6OlkJASdZtL/eCBN1eSJZ4zxCSofHWJPs6cTBS6kgaWibkLvAkeVH3NKK mEboM9jibt82KHD3maUw8sIpb4MeJJVxSRlhyLfHGt8Jh+HWFxVngE2dn0h+Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770129579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nLOPp4OkZ2H5lgScNW1PJt7PMYJ1/s75qNiForGkE4=; b=fMvGkbRHlJGJuJqYTC0oESliew9Xw4JuN80Q6ihq8FUD8S7wRtLAiLVgGXQI8xvBOKelBR rT7jZ21pgJWnmqioCX203LmqHryBeG5134aodMOy9zz1bqqkY52pmL2VSu5hXt+PykumDg Zv8Otb7DHQK8vsheFwLBCgKl+xI3Pi3sQWxhqDxxdTNQ2i3ztS5U5wmodMR8vd3RsFI8hM 5tfsCqyjuttv7zSUof0KEfYxLKmVI2y2TR+VtXi2fufMYh1xgaKPrBXw9BskVbV7Y73L3x TVRo5juNQqoeqXnZLeuCqt/ahR0Z2tKFeFZsdZ8Myb+Gx/KdEaXUBAo6/DFI1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f55jR1qWQz2Sk for ; Tue, 03 Feb 2026 14:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ba73 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:39:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d70b9eb74fc4 - main - libc/tests: Clean up *dir() tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d70b9eb74fc4aa430bd2ff4bca37e6a9b6c8004f Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:39:39 +0000 Message-Id: <698208ab.3ba73.5a401c8e@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d70b9eb74fc4aa430bd2ff4bca37e6a9b6c8004f commit d70b9eb74fc4aa430bd2ff4bca37e6a9b6c8004f Author: Dag-Erling Smørgrav AuthorDate: 2026-02-03 14:39:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-03 14:39:32 +0000 libc/tests: Clean up *dir() tests Mainly, avoid reusing the name of one of the functions we should be testing (but aren't) for local variables. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55054 --- lib/libc/tests/gen/dir2_test.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/libc/tests/gen/dir2_test.c b/lib/libc/tests/gen/dir2_test.c index 4ec5a1759d06..dac8ccbe472a 100644 --- a/lib/libc/tests/gen/dir2_test.c +++ b/lib/libc/tests/gen/dir2_test.c @@ -41,7 +41,6 @@ ATF_TC(telldir_after_seekdir); ATF_TC_HEAD(telldir_after_seekdir, tc) { - atf_tc_set_md_var(tc, "descr", "Calling telldir(3) after seekdir(3) " "should return the argument passed to seekdir."); } @@ -50,7 +49,7 @@ ATF_TC_BODY(telldir_after_seekdir, tc) const int NUMFILES = 1000; char template[] = "dXXXXXX"; char *tmpdir; - int i, dirfd; + int i, dd; DIR *dirp; struct dirent *de; long beginning, middle, end, td; @@ -58,8 +57,8 @@ ATF_TC_BODY(telldir_after_seekdir, tc) /* Create a temporary directory */ tmpdir = mkdtemp(template); ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp failed"); - dirfd = open(tmpdir, O_RDONLY | O_DIRECTORY); - ATF_REQUIRE(dirfd > 0); + dd = open(tmpdir, O_RDONLY | O_DIRECTORY); + ATF_REQUIRE(dd > 0); /* * Fill it with files. Must be > 128 to ensure that the directory @@ -70,14 +69,14 @@ ATF_TC_BODY(telldir_after_seekdir, tc) char filename[16]; snprintf(filename, sizeof(filename), "%d", i); - fd = openat(dirfd, filename, O_WRONLY | O_CREAT, 0600); + fd = openat(dd, filename, O_WRONLY | O_CREAT, 0600); ATF_REQUIRE(fd > 0); close(fd); } /* Get some directory bookmarks in various locations */ - dirp = fdopendir(dirfd); - ATF_REQUIRE_MSG(dirfd >= 0, "fdopendir failed"); + dirp = fdopendir(dd); + ATF_REQUIRE_MSG(dd >= 0, "fdopendir failed"); beginning = telldir(dirp); for (i = 0; i < NUMFILES / 2; i = i+1) { de = readdir(dirp); @@ -126,7 +125,7 @@ ATF_TC_BODY(telldir_at_end_of_block, tc) const int NUMFILES = 129; char template[] = "dXXXXXX"; char *tmpdir; - int i, dirfd; + int i, dd; DIR *dirp; struct dirent *de; long td; @@ -135,8 +134,8 @@ ATF_TC_BODY(telldir_at_end_of_block, tc) /* Create a temporary directory */ tmpdir = mkdtemp(template); ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp failed"); - dirfd = open(tmpdir, O_RDONLY | O_DIRECTORY); - ATF_REQUIRE(dirfd > 0); + dd = open(tmpdir, O_RDONLY | O_DIRECTORY); + ATF_REQUIRE(dd > 0); /* * Fill it with files. Must be > 128 to ensure that the directory @@ -147,14 +146,14 @@ ATF_TC_BODY(telldir_at_end_of_block, tc) char filename[16]; snprintf(filename, sizeof(filename), "%d", i); - fd = openat(dirfd, filename, O_WRONLY | O_CREAT, 0600); + fd = openat(dd, filename, O_WRONLY | O_CREAT, 0600); ATF_REQUIRE(fd > 0); close(fd); } /* Read all entries within the first page */ - dirp = fdopendir(dirfd); - ATF_REQUIRE_MSG(dirfd >= 0, "fdopendir failed"); + dirp = fdopendir(dd); + ATF_REQUIRE_MSG(dd >= 0, "fdopendir failed"); for (i = 0; i < NUMFILES - 1; i = i + 1) ATF_REQUIRE_MSG(readdir(dirp) != NULL, "readdir failed"); @@ -178,9 +177,8 @@ ATF_TC_BODY(telldir_at_end_of_block, tc) ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, telldir_after_seekdir); ATF_TP_ADD_TC(tp, telldir_at_end_of_block); - return atf_no_error(); + return (atf_no_error()); } From nobody Tue Feb 3 14:46:13 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f55s65pwnz6PfyL for ; Tue, 03 Feb 2026 14:46: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f55s61XlNz3trV for ; Tue, 03 Feb 2026 14: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=1770129978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TjWmIkufXRsIOjI9L1xBK8A9HFO/iZC2fA8Xxgosnts=; b=ZPauxGvhEdylfEPbh1wDkFPOsKlfPWe6iXmbLxWr172J9L24pxq18M4XoslnT3DEym5Zqn x+TZ7kNDyqMfFZATdmmW+iwUm7hBXEMwLnucss8+YH4MHbq/2WvXZnNuUOaUdw/Y0K3eEG BWoQdk2o8rgQqPr3mXKUzGbAx7XkskEkDrlCoZ7z+VJqWwSP69E+5Wp4rOmjWW9lJQnFfH YddQrLuUIWyUXJh6G/b0YQnYGgtW/RT+pJYAXkKVVzlJzJC8ClPC/csMEoneFx86CbCxXe DoAyY1zDUKgTp9FMbNB/RuJ2jpah94NH8kc+WSV34GJ6EoF24Jx9dyKhbNIu6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770129978; a=rsa-sha256; cv=none; b=UqMTi/F06BnB7Q50oAW8vwobBC3yGBWoU4SBuJK/D1BVSKVlrzubSjXPTqWWnRMzxRkLXU 2UMseWd7taS+6VEfLwvOzbWJ0YR+kA04P6eEa7W3Qr3npvNaNQUluXPUlF7Iez1zGo+dpN VOAXiDMR95u8KHp5Ho26WfuquviyWerjI/E/3yM7s/0vZNY3bsySJPJO2tgNotKtNcDRR9 FlmWH7Mxtu/xUj9Xq3a0KcgkGtNlCyzDwSfCrkhaoT4bmwaF6x5djoGi6uP/3VnPb1H2py klWlseU83gt/V+ewSjZ/ElTsLt2/yB31U7GYNHFuv14Mcv1SDEqf0ue0wXSZqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770129978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TjWmIkufXRsIOjI9L1xBK8A9HFO/iZC2fA8Xxgosnts=; b=sOWsyPgBXtlmKHI9XBn9CKahDvXUO7pK72SRxLZXwSyG6bhe8TmOjNuSqC9l49KWLflDSr enzZPSHvp7s+8eey3pr5XXBOd9ywacAmUTDyomd2tTely7MaAY9Ob0khbDRO/bU7xLwHfz UMP0sa31xFC9a5T/HooUrnwl5VNd313YZZyRq7CYQchltCuevLQSvrAZXMmnARw+zHhLk6 5+UlEB1qKx7DSpwHhNfaUhPH9/l4+S2vL2hHQPN31FY4cgEGAZfTm4TQ65Gc20yx0FLuV6 FJ8xx4HrRPfSBRAPMuauv8e5wpEOWJMMHpCfKl2nZso/G7KGzANnNK6HBShAFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f55s6157mz2qN for ; Tue, 03 Feb 2026 14:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3de54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:46:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 465ba08bb537 - main - vm_phys: Check `RB_FIND()` return value in case it is NULL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 465ba08bb53796b24dceca0d2ccde5a0e2630a2b Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:46:13 +0000 Message-Id: <69820a35.3de54.5385aafc@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=465ba08bb53796b24dceca0d2ccde5a0e2630a2b commit 465ba08bb53796b24dceca0d2ccde5a0e2630a2b Author: Jean-Sébastien Pédron AuthorDate: 2026-02-03 12:04:58 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-02-03 14:44:55 +0000 vm_phys: Check `RB_FIND()` return value in case it is NULL When trying to unregister a fictitious range in `vm_phys_fictitious_unreg_range()`, the function checks the properties of the looked up segment, but it does not check if a segment was found in the first place. This can happen with the amdgpu DRM driver which could call `vm_phys_fictitious_unreg_range()` without a fictitious range registered if the initialisation of the driver failed (for example because firmwares are unavailable). The code in the DRM driver was improved to avoid that, but `vm_phys_fictitious_unreg_range()` should still check the return value of `RB_FIND()` before trying to dereference the segment pointer and panic with a page fault. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55076 --- sys/vm/vm_phys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index ba16ae551093..1737020436c6 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -1213,7 +1213,7 @@ vm_phys_fictitious_unreg_range(vm_paddr_t start, vm_paddr_t end) rw_wlock(&vm_phys_fictitious_reg_lock); seg = RB_FIND(fict_tree, &vm_phys_fictitious_tree, &tmp); - if (seg->start != start || seg->end != end) { + if (seg == NULL || seg->start != start || seg->end != end) { rw_wunlock(&vm_phys_fictitious_reg_lock); panic( "Unregistering not registered fictitious range [%#jx:%#jx]", From nobody Tue Feb 3 14:51:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f55yt5PJ9z6Pg5g; Tue, 03 Feb 2026 14:51:18 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f55yt1zW4z3vf4; Tue, 03 Feb 2026 14:51:18 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770130278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+chB/N2qS4yswu8IApvw4mthvha9ApyxHiBWCJniQyM=; b=JR3crviT5W9HxGnI/4P+6p16iyIEZLIjf6VdU2xLTH9pQaAFNBEC+6DWfOWoG4A1QTQB/P pdAq1DZey2NCxzZKd8l/O1sUWv8YksxcOrllzgxMhLiQsYnyl831NYpKsxulVW7J7wxaXv GIWTBGYxbYUJ52tAR/PyBNeVOqT6w54hENC7TAO8lg6MiprzWp8GNFcEO4LyRLWCN+ACpt lPw+d0dgkvqx0vvUyoM6y4LYZuVHBX+hR4q9quUiSdUKO+C87hCV/xcKsAshYVrTi3ODMa u0C6+QCKo3FAp9tm563XojpMdZQd5mAyhNjpyZUKHszj09Nf0Ycjwf/VFFSfuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770130278; a=rsa-sha256; cv=none; b=KCdTRBUNMc+JaKuptiU1HtpqE4hYNLjdOEGtxpQ1in8uapYGOC+IzS1M/tpTeUtPD7mMbd scnpjNwBrnrrNc7nGZsFE+4pioR6wn8efNjsJLBLuinM5n0FlcrA4hF69a776itsN0aFRj ttxrWSjEbiVgqabwQvnhOUKWuGWyz2wBtKqWhncxikgkcJrm1r9QS9oBd1GlbbIZNsw0h/ JYPhPMxWzWN9yqlHfiOhce+HsyMV25483mcwYUUTtfzehIsMpKp+uFz+CicPobbjWqlL6/ FoiPxmay2AsWYFw2b1+pULyVx1YI0nlwiQYZ5Kkqnek6jy3tJNHaljhIYHcYQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770130278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+chB/N2qS4yswu8IApvw4mthvha9ApyxHiBWCJniQyM=; b=LggO2tqzHPUQ0wYmpO4Idx4JvFYPzN5NgmrkWGdmKMqr0n66G/JB2zVMYHAeodjMM2BTAz nPP0sXt+Tpop/jCW7h8UcSVKMv8ND3sA/8Xcg12xbrVCppEzVSLIK2TRC5s3i6kzf34TJE CQMwkp/4kY5//BpJVoCzlej2rxn+Nb5VJwPEHF3spc1j+J7/IafW4V8vxxtCdO0yCSVIBZ 9mSdzcjIq8vspRfnrHEsuU+ZTZjbclzkveUUHJJeNsMZWXpRm9M71JkZwggGGc1nlo5ejK UuJPviPoYsoMZYuN1UcIhhGKUzgI+VXb3oq64YuQOYKUMC0K4vOvgFX+isfoug== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f55yt0YSjz1C94; Tue, 03 Feb 2026 14:51:18 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 5D7FA72B9E; Tue, 03 Feb 2026 15:51:16 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: ShengYi Hung Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3e6e4e4a0d42 - main - hwpstate: add CPPC support for pstate driver on AMD In-Reply-To: <6958849c.4623e.7b53a822@gitrepo.freebsd.org> (ShengYi Hung's message of "Sat, 03 Jan 2026 02:53:16 +0000") References: <6958849c.4623e.7b53a822@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 03 Feb 2026 15:51:16 +0100 Message-ID: <86ms1pdgnv.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ShengYi Hung writes: > +static bool hwpstate_pkg_ctrl_enable =3D true; > +SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, > + &hwpstate_pkg_ctrl_enable, 0, > + "Set 1 (default) to enable package-level control, 0 to disable"); This doesn't work. You are reusing the same OID already used by the Intel subdriver. The result is that whichever one happens to be first on the linker command line works and the other one doesn't. You have to either use a different OID for each subdriver or have both subdrivers share a single boolean. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Tue Feb 3 14:59:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f567q4G1pz6PgXv for ; Tue, 03 Feb 2026 14:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f567q3N7nz3wrj for ; Tue, 03 Feb 2026 14:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770130743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sFgf5GCp+WXIEozujhYePKvzFBeIZ2K9EnI1gTj23iQ=; b=BOMv1qw54/Kw4K/fvcccuJc6mQfDlrxKoHUIvCajgOw/+UagV/9iHBnEBx7WffurNxIoI5 05gaVCV0BpxrR3B/wkSKoIzdjSBcxJmjrHD5OZuiFEvfx3k+23eJYUfr4SgdxrC7nE32EH kmviGnPBtpwpXteD+PHhl+ws+/f6WzCJr2nRNKbEUT+TPwic4ilorQtAcU/rJYF4NLUo9v sb94TmVN06dxM/uvjh/VTCPXGG40p9Sp967gpbfZLSx+z/lXKM54esGb1pBxw/wMER0abE hcnjH4zE88+gi91bHDMmUh8xEsFekYXWWTSMUxeYK/EHcZcaPdLNH+OP7qIH+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770130743; a=rsa-sha256; cv=none; b=QSP2krPELWSdhxhea+EZt3ssBeTUEhgOw+771SHXvQlrl2dC5oeRZpl8Rc4cqPKSxvTP/7 1TL9feyGrigNmT/D7ciMgkrQoYvInReB3okokXh5dRHGXdpTjmB9BiObV7T3Mz0XFilEGh SMf5C1hZvXY8XpgArY7wns32B+yyNZvqvvMY+spLBw1YNU7M1Dm2Tp3lUMGDBfK3Rma/+1 3H6fLCOqHcXSlZH0efrpQKMKJSo/PGfSZAFQiMvPFIWYLwe6kjEdIIfR3zFqDbfIHkipNv pfbKwcwzTfDyrFbSTpnjoC4TD8JIajjKqScsSWucjjwlHtHe+oRVXLcpth/Wxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770130743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sFgf5GCp+WXIEozujhYePKvzFBeIZ2K9EnI1gTj23iQ=; b=RjpwpzHTqYqmRstb9t2Ub3S1ahPv1Nd7hmWrOYgUZPzBQGjjoqtgCzD2ezSG1qAFwpZLRF 0f5tE9lG3z/eUaPKciTXg/wq1W8ITEiXjA7vZFWU+T3f8vtrGiCTsrX+qz2A30lKOCWArR v12yeVh1ARG0KtyQz5B+sNuZUrSLAcpHbh9tVj05a3vMV8wMNIkR99ZxUpRYHRBCSL9Mk/ LaX8/aaB+Ccv0k0uf8nT8tvVvfhCQItfnQUYo3qAlU73LU0ykjrO3Umv4QnIf8/DE1UfS8 OjRqKKOxXzPb0zoJv2CeGkKHscaC2NiqBZgoaDEnOIvGPIMuRFkMkQSMplZcnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f567q2j6pz3Fq for ; Tue, 03 Feb 2026 14:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fa3c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 14:59:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 9d4bad45e233 - main - EVENTHANDLER.9: EVENTHANDLER_REGISTER never fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d4bad45e233ca7d93666ff1feff6282a88f8a9d Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 14:59:03 +0000 Message-Id: <69820d37.3fa3c.61276cef@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=9d4bad45e233ca7d93666ff1feff6282a88f8a9d commit 9d4bad45e233ca7d93666ff1feff6282a88f8a9d Author: Aymeric Wibo AuthorDate: 2026-01-31 15:54:11 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-03 14:56:40 +0000 EVENTHANDLER.9: EVENTHANDLER_REGISTER never fails Since ecdf4409f910 ("Rework the eventhandler locking [...]"), EVENTHANDLER_REGISTER() can never return NULL. Suggested by: olce Reviewed by: olce, ziaee, zlei Approved by: olce, zlei Fixes: ecdf4409f910 ("Rework the eventhandler locking [...]") Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55014 --- share/man/man9/EVENTHANDLER.9 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man9/EVENTHANDLER.9 b/share/man/man9/EVENTHANDLER.9 index 4bf3eebaa445..c3e7c9519b3b 100644 --- a/share/man/man9/EVENTHANDLER.9 +++ b/share/man/man9/EVENTHANDLER.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 7, 2022 +.Dd January 31, 2025 .Dt EVENTHANDLER 9 .Os .Sh NAME @@ -125,7 +125,6 @@ as its first parameter along with any additional parameters passed in via macro .Fn EVENTHANDLER_INVOKE (see below). -If registration is successful, .Fn EVENTHANDLER_REGISTER returns a cookie of type .Vt eventhandler_tag . From nobody Tue Feb 3 15:14:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f56TV6KdSz6PhTF; Tue, 03 Feb 2026 15:14:22 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f56TV5hcGz41P2; Tue, 03 Feb 2026 15:14:22 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770131662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qHxTb3AjtNunzVQdc5cDj1XUlkK8hA3ZDAfzudrXLQA=; b=qjT9qWveKDJXL8ksaO++yL6nZAoBU95AymQ+O0JUaS1fR6dYyIvogci0w5ReGfAqArtFDB UPS1rwjMuOjxOwDIXNbjMiD/BD4hypoX6Ey9QSkrm9cctm8mbhA1v2foaMrinmVnqOOwlp fvbsSjhy46oHwGnuqt+Z6oJzYUvpHFZTIEEyRgNnhLJUc0wcrTVSGzNojBldDJvnHLCR/h dPys8Y3TZVKfTHjQN8nk6wNagPcTbmNRVU6iD3/6vQWI0ao0XBQF76ajrppo4f6XIi/xos 410xW/AQakxJVVLYlxAFjIX22JSI+jjrjahz2UEtysrmuSQVDG5y1Lo6qBATVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770131662; a=rsa-sha256; cv=none; b=kaxZx5566iajCQcVn98k87A8JZ1UVQKFiPgbtlSuXD/asEuUvKHKkI7+pOgk5+7XmOCd1Z czXeD9dU3Vzfy7K8eSMeTmvva4mFSOQy/uknbDR2DoDVjRtZS1QnUep3BKbeg37dD6lWpr 3gOYjr0dXZSY1xshU4U7EiRXQIPJxfVFBl4szaGJSWvZX/FtK65WLFEMLo3mt2NP4CV2OJ 6TKi8lj0dgB09aQSsDzbsmZ/Mt+tDYqUSnkrZP9Rr0RvayRTXzP/Ic/jhj7gTmiwXvgFwz 78MYP5c4c4FgIyTi1+O/DaIoVRVnvwNH0R0ZvzCPy93N+ZIwsiI3eMod20JNCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770131662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qHxTb3AjtNunzVQdc5cDj1XUlkK8hA3ZDAfzudrXLQA=; b=NHh8R96nCvOk6HZVmO+xz3pazb1/Qt/occPevL7u4d2dW6BBMwZUG7G8GyQed6XAHVnuEQ OanNXfOMZHJzxT54dSsNJbcq10Ky68Fk08PJM5qnOQbfYxKtkueVIz6vL6whL+NyrEx4p9 CWPgv7SuUcTu83zrcFNgPv/j0RzBX/wVtc5HXXEc92JujFHcqEBV+xDTuurdmD3T+vvONd zrVCFqCuVT36lb9XU2uBWyVYXQHww/sR2cOcGMyY9vibwi7pxoUNQq2qrblHABSS/uSwcd +bRyywFAOfREX5/9M7GgLQQOGLgo7aEEjiAEy9Juw8wv8W3uw/50K+UmVmdgDQ== Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f56TT6lSVz1Ch4; Tue, 03 Feb 2026 15:14:21 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= Cc: ShengYi Hung , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3e6e4e4a0d42 - main - hwpstate: add CPPC support for pstate driver on AMD Date: Tue, 03 Feb 2026 16:14:10 +0100 Message-ID: <3081716.hHqAuc6tWs@ravel> In-Reply-To: <86ms1pdgnv.fsf@ltc.des.dev> References: <6958849c.4623e.7b53a822@gitrepo.freebsd.org> <86ms1pdgnv.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2431391.THHZn3L5Ee"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart2431391.THHZn3L5Ee Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= Date: Tue, 03 Feb 2026 16:14:10 +0100 Message-ID: <3081716.hHqAuc6tWs@ravel> In-Reply-To: <86ms1pdgnv.fsf@ltc.des.dev> MIME-Version: 1.0 > This doesn't work. You are reusing the same OID already used by the > Intel subdriver. The result is that whichever one happens to be first > on the linker command line works and the other one doesn't. You have to > either use a different OID for each subdriver or have both subdrivers > share a single boolean. Yes, we are aware. There's already https://reviews.freebsd.org/D54528 about that. We did not feel this was urgent, especially since I intend to retire `machdep.hwpstate_pkg_ctrl` from the AMD driver entirely (and obsolete it in the Intel driver) in favor of an easier to use interface, but this has lasted for a while now and could prevent the same knob from working in existing Intel cases. I'll move D54528 in the coming days. -- Olivier Certner --nextPart2431391.THHZn3L5Ee Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmmCEMIACgkQjKEwQJce JifVdg//W4Vw/AN1ySIS2/ZfJv3ga38fmgoGMOGNoiq9cYiha+qUksXjVwxN91IZ W1NQ9FyfNqfJvI2+TmBo1Ar83jEo9+6qpH5YAuEdKl8jZS8SH22nZXJ6hqL1URuz COx5Yg7puGbq7eyjKV+4b3K2CcnXsp/9ecRXExs7zjTBCfpWpMlYMJLULIAqjhWM kaDrZkcm0Pq+GnZGFBVm8nCHdySJE2TytplrnvBc3xGWSdZpw7pQJqoRltECCrhx 56F7DCKmZ3JyFr0BvZYP0mAT1PNWcmkJzAVeM2U11zwb0/FP6Dre9scts/h/3W3Z p+p7BUE6cAuM2xoxDbl3lDYOubLReGCP04HVk0dxaIFhXmjyyvLiXwuQ2bgncTPv YzmSIjSqJKbaWAV8FsSQOw3xrNNwQMIPr8aHhvC5fYcuXra47B0sJ+L7tUjig16e qXZRMFax3YeCr3RMG04BjnJmoS/F5NG0M/wzBH1GaWZD86lOGtwtB9GrhGsdbtSj okgCDp4EqNhvA6oBDsU+fYuNuU4ejWsqlD/2/KhUGJIALno7bDGn86+KVx888iOV RgfZz9ax1ctCjbfwVRMZP9jnMAiv2FZB4SHHHh6RNtxsktj+1XQvsMS5gqNv4UeY Eg9w7NOXuGtPPI5ypZi5wS29gWQwzD+xRIfi/NejGKOmaqDcE+E= =Y7ih -----END PGP SIGNATURE----- --nextPart2431391.THHZn3L5Ee-- From nobody Tue Feb 3 15:20:40 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f56cn1rrNz6Phqr for ; Tue, 03 Feb 2026 15:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f56cm4lXmz41hg for ; Tue, 03 Feb 2026 15:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770132040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kD0UBSH+ZTOhaK3BpxNOpQwdo+oOzKY6DH3AU6214w4=; b=gm/rVTxzSq+cJ++5iuaJcDOITgv9gueiwQa8SdEFKLlr+lm2RXYVWBOB+8ftHCuGRUZlo1 sL/7xr1YHkOOOVXckqak4ph1cXN1kF+YgEriEjj+vBt6qDaiXZmtdHGQdCOSPBXsDhG8ZP j70Rd9BF6lDSprgEPfaLmRifdU6g62jv7Mk2v/Xx8pk29RzeC1li+UYsSUCiayzAXma8eq g/c1hDpbhdwpywaLMkk2D5GKaELWzEjSD1ZJn4RVdY/q2ITlppK1aqmT3sYLQhkquzMbMc MvNFWaPpOXTV0k6Rxi73L2n2w1D+K45jxXyO4qUSAeZj+QjBZcKuWYtVfrcBNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770132040; a=rsa-sha256; cv=none; b=TWW2l6zeTu31Fm3dfNk0EpMoNHRir51OtffYuzXumQ5Qk1CPj6nCr3IA4FpjuFlVMjzKAr M6HQO4nnqi4rxIDZ5PkUfW7GsDCwzaJdfcNrrgITs9kfyWQCztH+1ULUZE/zDAUIBMFOKG /X9YlMO3/XFLpQScoYnR8biX1cZo7SCXET3NCi0NKiQszKXgdThuLRtm8XiR4wmm5kpWrW bVX/h8fHOixB/gzF8dBGDRZWpCrzbt/iCGsNqkq6OwmN0jGBfcGN4G8lJ6/N41pmojv2fC uj6Uq0k/orWK3Ga16F8v3bmSCtrZy+xCawMHO/ptFQxu1cNA/0/OKeO83WJ4yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770132040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kD0UBSH+ZTOhaK3BpxNOpQwdo+oOzKY6DH3AU6214w4=; b=cHUupzXMGgSDf6c7mBSbIIuts12YrRPRf/CHtXVQg0hdomsNXZRPQEVf1Kx+3O1smPCT8z kKIQCgjFOE/udAkphlgJ2IhzXKi5TczoUGvxNA/INl3ITI3FWdJ/Z6yrKoE1hSP+hZDxQF P9bkoYBLYLyaJ09Q93/L2tcJ61k3JLGmblTdNdyMTStiAUaFiknSPqUOi+h7k/h9cC9CkW 12f0EytoAfyd48GJ/tQJoWkk30GzpEZaMA4kSWfSDjqTZy0JSPA5EXdFcbUusj26AI7pie t++DBWtaC8wBtAquCauS9EGD0fKD7+ZgbIAcc0RP+0TZmHFiU3hABeEmXLOA6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f56cm3nfgz3JR for ; Tue, 03 Feb 2026 15:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41c3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 15:20:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 93450913086e - main - powerpc/pmap: Use a constant for HPT superpage shift List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93450913086e7f0478b609367d5f1d4c740cb941 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 15:20:40 +0000 Message-Id: <69821248.41c3f.2a63f774@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=93450913086e7f0478b609367d5f1d4c740cb941 commit 93450913086e7f0478b609367d5f1d4c740cb941 Author: Justin Hibbits AuthorDate: 2026-02-03 15:11:19 +0000 Commit: Justin Hibbits CommitDate: 2026-02-03 15:15:24 +0000 powerpc/pmap: Use a constant for HPT superpage shift There are no plans to allow multiple sizes of HPT superpages, so just use a constant for it. MFC after: 3 weeks Fixes: 1bc75d77e9 ("powerpc/pmap/oea64: Make PV_LOCK superpage sized") --- sys/powerpc/aim/mmu_oea64.c | 4 ++-- sys/powerpc/include/pte.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 4757e469b5d7..c82c5c539de2 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -125,7 +125,7 @@ uintptr_t moea64_get_unique_vsid(void); #define PV_LOCK_COUNT MAXCPU static struct mtx_padalign pv_lock[PV_LOCK_COUNT]; -#define PV_LOCK_SHIFT HPT_SP_SIZE +#define PV_LOCK_SHIFT HPT_SP_SHIFT #define pa_index(pa) ((pa) >> PV_LOCK_SHIFT) /* @@ -890,7 +890,7 @@ moea64_early_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) int rm_pavail; /* Level 0 reservations consist of 4096 pages (16MB superpage). */ - vm_level_0_order = 12; + vm_level_0_order = VM_LEVEL_0_ORDER_HPT; #ifndef __powerpc64__ /* We don't have a direct map since there is no BAT */ diff --git a/sys/powerpc/include/pte.h b/sys/powerpc/include/pte.h index ed926f80c879..2e8cdacbe165 100644 --- a/sys/powerpc/include/pte.h +++ b/sys/powerpc/include/pte.h @@ -145,10 +145,11 @@ typedef struct lpte lpte_t; #define LPTE_RO LPTE_BR /* HPT superpage definitions */ -#define HPT_SP_SHIFT (VM_LEVEL_0_ORDER + PAGE_SHIFT) +#define VM_LEVEL_0_ORDER_HPT 12 +#define HPT_SP_SHIFT (VM_LEVEL_0_ORDER_HPT + PAGE_SHIFT) #define HPT_SP_SIZE (1 << HPT_SP_SHIFT) #define HPT_SP_MASK (HPT_SP_SIZE - 1) -#define HPT_SP_PAGES (1 << VM_LEVEL_0_ORDER) +#define HPT_SP_PAGES (1 << VM_LEVEL_0_ORDER_HPT) /* POWER ISA 3.0 Radix Table Definitions */ #define RPTE_VALID 0x8000000000000000ULL From nobody Tue Feb 3 15:29:31 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f56q01VpLz6PjBf for ; Tue, 03 Feb 2026 15:29: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f56q00Rgbz446f for ; Tue, 03 Feb 2026 15:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770132572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ke9ytzhvfaZex6aL2t2eXssCfQGbmsdqzOpBIADKZqw=; b=qrLY3FclTY+dgZSzbHqBKYZD6piahyDLjHJJ2KklU0xXdu4qeXYD4fcyE3YK0tIe+gaFFq Ws1Yr5Y/8zo9D6cR9NthlNxdy5/yTqC9B2j4QbsfRT6jZ50QGj5tPc62HliNwEVotIQsrX VEHy8X5y7Untb2+eppxAWC5UAujVD8kHOH/NIYDm5+rNGMDEyMQB1W4LtgM9fkcolA4t5V 7nPFBPxRKy0WwDxPYhenkjqqVAA8Ayq07R6NuMzGZuS92sxdEYodjPQ16B9G6nejU8xQDM PB/ODmtbba/osck2BUge0FqMlLDi0S5S9xqDiHreA+QWn5YAafV2yPZq6vIlpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770132572; a=rsa-sha256; cv=none; b=g1YiLqVNBfmgAp59xT6pyBzlDNVpFXRL4JQh8AMoaJJLep8AZbhNH5tq/jY0BTosvyOj+z vWc7yTAv2zpOqWup1umoU0oHSxnecebhb40hSB4Tw4CUQi805Tgma2gyu/2b76HElB5pM7 Y6sdxTGC7KNByUX2+r1cM7v0pJgl+3cd3CtSK+MhH4/fWbPQNIU3N8bX2bwDjK4IINq0FG pKC1yLzGseU33uaZUDoF0ufGY3tIlPKrgadE5INRGjSgDut31ITJuZuMPiDI163HWc8MO4 vt2bx2ZN2/OIHp1bh34U7UKEFYi1D5o9DCWpjJlqC3EJ/OFjMHCMKQalm6vIpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770132572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ke9ytzhvfaZex6aL2t2eXssCfQGbmsdqzOpBIADKZqw=; b=IT6sCf9eiJSyxgCJV+Rl+4vGG/ByskXia9xWU6iUEfwcdMKfTpKrUiVyoJ3rjN1WJXCHvk Wth6Cu6yN1bB8qetEDdseBErFo+fpKpyVicaBG+ojequom5tjI/ANacHu6WrPJsAtTxRKG JsbWr23y+m2ajE39wbP+ADdx7+itEakBYeBX2JAn8cgLLwOANvkJTbw+W+zjzYTKulsQIN l3jorUpD3CkHYHb01ziy68dvYBawRosWed2cvwXymECGA2oEc8HJFsA7K/QkrS9SzLuoTl WY7V3UoeqmrN5nsgw/L9kC7T+7vMKaPgvBgegqK480zHuZZI1ECPcYAVythsPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f56pz6c8Mz3vd for ; Tue, 03 Feb 2026 15:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 432d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 15:29:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ali Mashtizadeh From: Mitchell Horne Subject: git: c215eef34550 - main - libpmc: Fix the L3 counters for AMD Zen 1-4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c215eef345501ce7dda374909b3195d9d69a4e9f Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 15:29:31 +0000 Message-Id: <6982145b.432d5.1111fadc@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c215eef345501ce7dda374909b3195d9d69a4e9f commit c215eef345501ce7dda374909b3195d9d69a4e9f Author: Ali Mashtizadeh AuthorDate: 2026-01-23 05:34:13 +0000 Commit: Mitchell Horne CommitDate: 2026-02-03 15:21:50 +0000 libpmc: Fix the L3 counters for AMD Zen 1-4 On AMD processors libpmc was using the topic field (based on filename) to determine the counter's subclass. Unfortunately, the JSON definitions for AMD Zen 1-4 have the L3 counters in files shared with other counters. This change has libpmc to use the pmu field (which is derived from the Unit field in JSON) to determine the correct counter subclass. Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Netflix Pull Request: https://github.com/freebsd/freebsd-src/pull/1984 --- lib/libpmc/libpmc_pmu_util.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 74a93ae963d7..de642aa71a18 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -498,18 +498,7 @@ pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, pm->pm_class = PMC_CLASS_K8; pe = pmu_event_get(NULL, event_name, &idx); - if (strcmp("l3cache", pe->topic) == 0){ - amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); - amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_L3_CACHE; - amd->pm_amd_config |= AMD_PMC_TO_L3SLICE(ped->ped_l3_slice); - amd->pm_amd_config |= AMD_PMC_TO_L3CORE(ped->ped_l3_thread); - } - else if (strcmp("data fabric", pe->topic) == 0){ - - amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK_DF(ped->ped_event); - amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_DATA_FABRIC; - } - else{ + if (pe->pmu == NULL) { amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_CORE; if ((pm->pm_caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0 || @@ -526,7 +515,19 @@ pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, amd->pm_amd_config |= AMD_PMC_INVERT; if (pm->pm_caps & PMC_CAP_INTERRUPT) amd->pm_amd_config |= AMD_PMC_INT; + } else if (strcmp("amd_l3", pe->pmu) == 0) { + amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_L3_CACHE; + amd->pm_amd_config |= AMD_PMC_TO_L3SLICE(ped->ped_l3_slice); + amd->pm_amd_config |= AMD_PMC_TO_L3CORE(ped->ped_l3_thread); + } else if (strcmp("amd_df", pe->pmu) == 0) { + amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK_DF(ped->ped_event); + amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_DATA_FABRIC; + } else { + printf("PMC pmu '%s' is not supported!\n", pe->pmu); + return (EOPNOTSUPP); } + return (0); } From nobody Tue Feb 3 16:21:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f57yc3BxNz6PmXC for ; Tue, 03 Feb 2026 16:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f57yb40qsz47R1 for ; Tue, 03 Feb 2026 16:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770135671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0jyyHKZSuy3MBwJcPucD+jdLIwSy/DLij+prSmu1MME=; b=p1Ieg5qEYkIBq6lzrqxksjXPq+ENtN2naQ8TPY7d0FcPJloHiGKkJgKU1CzojK6MlvMgf+ E5pmdKplKCRNJRg9+3kMzec+9jsU9lOqXbcIcPmrQP77XrKqnJnZx4pr0ubRFlZKdVx3K1 ycKsq3j2ZaRRiQTHbQA323O+bTQ0uBcIB/xOajzocLil91FFdu3ZQhruuPLFyJ2onj9Anv 9nAbgVBFUSn7RJ8/BGzo+OqLqdiL/7XQbE7RaIQ6qdhZDEd1JpAItmvErbf1MLhGFLgjJ7 zMkGMYi6W4Tv6+q8PCZDGuv6CA6ilXlYMhiyI/U2xLnbpKfgDp2UACRocgmGjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770135671; a=rsa-sha256; cv=none; b=uHm4getkaxa6GXCkM3hSJKFdc5+dJS+yXY/3OAxZ6swnzsaJPow/cdjiLQgfSZUrVrv+Hn AU36RS+V8TRUY3gqqjgH7xz+AE2SximCjp9umdrW8IMs7zYCkGRKKn5svCjiPw4l4xVaW7 W1BsmyB55+pR7dLdUVrrKVkx2yYfLii0jT+wSyfkAU+pTklyQR5sSrOq8UY/5wbbb2mQ8e b5tztRUklUji4C/3Tt8H3nkdflhIZdhdHGiboHuEy/wQx6CaZv+uhVZ8aBiyC5UBuId1Cb TGnN8a1+kVdju1CaN8OzZzaL/5liPhW35N+2Bc3ABTCDUsBw+fP7wlDi0dK7Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770135671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0jyyHKZSuy3MBwJcPucD+jdLIwSy/DLij+prSmu1MME=; b=rQWQAdEsq+t4JDmocyPln+qphdE/9iDfb5Q87i6hwLzCaxWof+LKZNgM4z29/lHCkbEzyL raxbF03HDe1nm7REkIliBGrYXSOQCVf4FLdxrqf839vPWvmK/yYWth9P7LFl+KYdw2n7lM OHjWOOYFRgHDuxmKaKRENrNyACMPDktyCu6h1cyXWRBi4AWrjnoSafgVOD+xHyaqnyKG2J TlGKiOIG1NxkQB6dD+QHBlhNhhVYO/IAkUMy/vTHVsT7pc0Bz/PAIXJMlblePa8KToDC3y ZYaQtOpIAuZFpIDdeDb2gdEWNStVvKY5YwPsYEpHt/acXVFax4nbFz2V0tQzJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f57yb2pQTz54q for ; Tue, 03 Feb 2026 16:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1830f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 16:21:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 9555d80066c9 - main - sh.1: Fix rendering error due to redundant .El List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9555d80066c919596e152f923d38d58a740cdb5f Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 16:21:11 +0000 Message-Id: <69822077.1830f.1b76a7cb@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=9555d80066c919596e152f923d38d58a740cdb5f commit 9555d80066c919596e152f923d38d58a740cdb5f Author: Artem Bunichev AuthorDate: 2026-02-03 16:14:09 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-03 16:20:26 +0000 sh.1: Fix rendering error due to redundant .El Due to this all the rest of the items in the Built-in Commands section were not rendered at all. Fixes: 2711852bd9ac ("sh.1: Provide detailed job control documentation") MFC after: 3 days Reviewed by: emaste, ziaee Differential Revision: https://reviews.freebsd.org/D55080 --- bin/sh/sh.1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index dc3ebfb17215..3113c1cf6166 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -41,7 +41,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.Dd January 27, 2026 +.Dd February 3, 2026 .Dt SH 1 .Os .Sh NAME @@ -2600,7 +2600,6 @@ write to the terminal while in the background. See .Xr signal 3 for additional information on the meanings of the aforementioned signals. -.El .It Ar command The associated command that was given to the shell. .El From nobody Tue Feb 3 16:56:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f58ln3WTHz6QQVf for ; Tue, 03 Feb 2026 16:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f58ln0kjzz3CxZ for ; Tue, 03 Feb 2026 16:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770137813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Re5AC53mtvg8cQOuJcTKO/40JbkGPVM+Pa0DehlmSSE=; b=BbB8W7jHel8Ugb++JL1I6jRcOWzbKIZQU9bMaPlqV3pA20mslK+Nic2ar8Xx8OyRtqzFFD 6F+PAOAFctF4asXVE8jzAk3q5/gjWTrEliz7hcG2PrkK2+JQ9oJHjiuyc2tXzt3JISo0l/ qaqN79AFJ8WiMiL6IXGE0FdDMV5L1k+KcEOcRxrRx7iP+XswDwJzHzwn9hRY5v/e778e0s 9252ygeZd31GWnH9atfBiqvLsGCgj8zxNr6yIKX1Y7TJ1KfGeQMFyoCN4NKOrsRpQRFvp6 LCpdGECGrlllFsJctG/A7/KIpazNVCojI6+5DgNhLwa2ZK5rmfDCse/JxNvfTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770137813; a=rsa-sha256; cv=none; b=avCFfGEb5BduqjGCoKxVdxL5gTdikmfpI+1exrwdswHdBvSn8dLOPD75wB/+YMCl4SRhDy 9xHvoy/427+qY6W7DLiUmlZvuLiM57PCrPeiNTkMSB4nOWTmdJ0lQAAfFa+0X7FQA8gif8 a2QTx3qG5bFA0R+SF/7uRT23nRLbAcKQxrxD3hT74yYkd9mb4KA4jNBoIk26ssOStvsr1t JeYxuWC9Wt8MyenRWytTcVmr9HEuqEfzfbKbs4/ghAQiCuYiyxTsDVeUaPg0geS3qAIi6C p9EPjW6kh56T9Rdxnf0jyXC86SOUFyG9LWcZnlWZuBvo6iK7hlvY4FAjWOfAAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770137813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Re5AC53mtvg8cQOuJcTKO/40JbkGPVM+Pa0DehlmSSE=; b=t72tLgMZub3MeVnthNl4WVqtwh4rwpp9oh94FZQWFq+VJbwPXO98xVhAlv81ynuwmDVPfU h88f9mQLPX2zelaSu/y4Np4un+iUJxSW+Cr/UgSwMX895rbmX1u3iXpfFpaPtelTThQSKk 8sp7tswFb6pR9F8jkciAJOf8IZJyTisla/ss5s3BDN48n4IS7duC4HUKir+WkJ5EBGUmJB 1dmw4jAMLQOuEM33K2NEGk5VGmT8+2XI7cb7trxUK9hqcTJqSUncNNEjyjpbGcg0zWf78q mREXf/wAcDI9a/oGh1zOmpgrejhnPu+KzWeOmFVjCX6L4p+SoUaIpyW2S++9sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f58lm6btbz6F6 for ; Tue, 03 Feb 2026 16:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a2c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 16:56:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: dbe9fa0be1d6 - main - Makefile.inc1: Don't mark GCC broken for riscv64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbe9fa0be1d627522a532160f6f8780701b86c72 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 16:56:52 +0000 Message-Id: <698228d4.1a2c3.625342e2@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dbe9fa0be1d627522a532160f6f8780701b86c72 commit dbe9fa0be1d627522a532160f6f8780701b86c72 Author: John Baldwin AuthorDate: 2026-02-03 16:56:44 +0000 Commit: John Baldwin CommitDate: 2026-02-03 16:56:44 +0000 Makefile.inc1: Don't mark GCC broken for riscv64 Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D54969 --- Makefile.inc1 | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 598a78b4c767..55b41d76801d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -182,9 +182,6 @@ _GCC_BROKEN=Missing atomic builtins in libc++. .if ${TARGET_ARCH:Mpowerpc64*} _GCC_BROKEN=libsys.so.7.full has a LOAD segment with RWX permissions. .endif -.if ${TARGET} == "riscv" -_GCC_BROKEN=boot code linker script issues. -.endif .if defined(_GCC_BROKEN) .warning Target ${TARGET} is broken with GCC: ${_GCC_BROKEN} .if defined(TRY_GCC_BROKEN) From nobody Tue Feb 3 17:10:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59314y98z6QQxY for ; Tue, 03 Feb 2026 17:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59314PP1z3DYy for ; Tue, 03 Feb 2026 17:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770138605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=36l+MzBAI7gNHzBk092YNH4IfxNuas9gg0YLV/sEYvo=; b=DbpogloQAfi8CkU1lU/5dkJfMFp7f9JtTnMZp1VvfPw+zJrD1c8PzBPbLgHOQsO6o66XwT X3e9MehfRpOCQTlu14rn4cW2P2yVTm3GEZm+ZZ4s/4JXrl6/88ujZwam4gv285JXNj5NDL QNHxTxMeMDbhlMdaQg6FGIqE64lp1QKvXbqLtAKqD7X/2NMHT9Lz7fhskeoxaCy8iVrIA5 hWRQslGvgbKSv/s2XPVwuOmG+plK6vRBITO3rqwzbS/zEF+L+C88VJTaxjZfmDl+sE9DQ/ EottplHsYbrnzHCGhgIugb+M3pKZVRCx9+/I3OkztdNNyugQnxPCEjMzSHf6Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770138605; a=rsa-sha256; cv=none; b=CLfD0YDREYtaZqlMxGBY3AIFCvkYGCdbOd0EfqVEJVOFZjS8X5raanxLtJlllY6Z2mTGCC /qPLMyBEqBaOsUvznUJZxWFe2FMshVTIYrf1ip4a8hYuw0t714h1eTUTwkrS1qWSORgGZw MDARrR1OT+HK9Zg+7zBGuGn5bUaYV31z0GVj1z3CvYXBM2WksqGeLJA29l/Cio6gh087Il QGZwvBsJ3nXC/dQw6sSZtD0KNywMoZtYEvDbBj6ayxD1lxT4lYwDm89XepqY4JLU4bngTB YzHUgzzSNaSZEIf3eakuv7wEHmJidKV2ADNgT9FsJV2GyjdbRWLx+CQxLotbLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770138605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=36l+MzBAI7gNHzBk092YNH4IfxNuas9gg0YLV/sEYvo=; b=H67JfXa+h9zfsFiervHZeIbNk46hF4iDvb0m3YtKH2VO3DpeB042b50Mvo0TW+9ri+qoFO /tTwGLzbagtuQdsgGNvH0mmtj2XYZjoDbRi6xuBTtdg/hvy7FZscnyOIHgOg9XDQTr7XTn S1QMM6gbyHbxpiZ286YRfaEVYdfPllVk2cMBNf6t5wXccd+0dU5Tz03ezQe1BSVJcClJoq rSFqREvbu1/HCKJniulDMhg65sEFyu5qv3Ney5aHUvzJBdAMsL/tYFQ6KrVTVxXOR4lzWB QmbmY2MArAAqNLN0IDJ/L9fle9CzEGIZ5txhQRGLDmhxS9q8OEzpv7aHBoWgng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59313ddrz6Xr for ; Tue, 03 Feb 2026 17:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e88d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:10:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 64f7e3c9c178 - main - sockets: let protocols be responsible for socket buffer mutexes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64f7e3c9c178ab35cb1f8fdf791aec74ede6f6b2 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:10:05 +0000 Message-Id: <69822bed.1e88d.31f30b90@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=64f7e3c9c178ab35cb1f8fdf791aec74ede6f6b2 commit 64f7e3c9c178ab35cb1f8fdf791aec74ede6f6b2 Author: Gleb Smirnoff AuthorDate: 2026-02-03 17:09:49 +0000 Commit: Gleb Smirnoff CommitDate: 2026-02-03 17:09:49 +0000 sockets: let protocols be responsible for socket buffer mutexes Sockets that implement their own socket buffers (marked with PR_SOCKBUF) are now also responsible for initialization of socket buffer mutexes in pr_attach and for destruction in pr_detach (or pr_close). This removes a big bunch of reported LORs, as now WITNESS is able to see that tcp(4) socket buffer mutex and netlink(4) socket buffer mutex are two different things. Distinct names also improve diagnostics for blocked threads. This also removes a hack from unix(4), where we used to mtx_destroy(). Also removes an innocent bug from unix(4) where for accept(2)-ed socket soreserve() was called twice. This one was innocent since first call to soreserve() was asking for 0 bytes of space. This slightly increased amount of pasted code in TCP's syncache_socket(). The problem is that while for sockets created with socket(2) it is pr_attach responsible for call to soreserve() (including !PR_SOCKBUF protocols), but for the sockets created with accept(2) it was solisten_clone() doing soreserve(), combined with the fact that for accept(2) TCP completely bypasses pr_attach. This all should improve once TCP has its own socket buffers. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54984 --- sys/kern/uipc_socket.c | 77 +++++++++++++++++++++++--------------------- sys/kern/uipc_usrreq.c | 17 +++++----- sys/netinet/tcp_syncache.c | 15 +++++++-- sys/netlink/netlink_domain.c | 10 ++++-- 4 files changed, 68 insertions(+), 51 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 4014006ce2e5..73ac2c6efc4e 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -818,8 +818,6 @@ soalloc(struct vnet *vnet) * a feature to change class of an existing lock, so we use DUPOK. */ mtx_init(&so->so_lock, "socket", NULL, MTX_DEF | MTX_DUPOK); - mtx_init(&so->so_snd_mtx, "so_snd", NULL, MTX_DEF); - mtx_init(&so->so_rcv_mtx, "so_rcv", NULL, MTX_DEF); so->so_rcv.sb_sel = &so->so_rdsel; so->so_snd.sb_sel = &so->so_wrsel; sx_init(&so->so_snd_sx, "so_snd_sx"); @@ -893,14 +891,47 @@ sodealloc(struct socket *so) &so->so_snd.sb_hiwat, 0, RLIM_INFINITY); sx_destroy(&so->so_snd_sx); sx_destroy(&so->so_rcv_sx); - mtx_destroy(&so->so_snd_mtx); - mtx_destroy(&so->so_rcv_mtx); } crfree(so->so_cred); mtx_destroy(&so->so_lock); uma_zfree(socket_zone, so); } +/* + * Shim to accomodate protocols that already do their own socket buffers + * management (marked with PR_SOCKBUF) with protocols that yet do not. + * + * Attach via socket(2) is different from attach via accept(2). In case of + * normal socket(2) syscall it is the pr_attach that calls soreserve(), even + * for protocols that don't yet do PR_SOCKBUF. In case of accepted connection + * it is our shim that calls soreserve() and the hiwat values are taken from + * the parent socket. + */ +static int +soattach(struct socket *so, int proto, struct thread *td, struct socket *head) +{ + int error; + + VNET_ASSERT(curvnet == so->so_vnet, + ("%s: %p != %p", __func__, curvnet, so->so_vnet)); + + if ((so->so_proto->pr_flags & PR_SOCKBUF) == 0) { + mtx_init(&so->so_snd_mtx, "so_snd", NULL, MTX_DEF); + mtx_init(&so->so_rcv_mtx, "so_rcv", NULL, MTX_DEF); + so->so_snd.sb_mtx = &so->so_snd_mtx; + so->so_rcv.sb_mtx = &so->so_rcv_mtx; + } + if (head == NULL || (error = soreserve(so, head->sol_sbsnd_hiwat, + head->sol_sbrcv_hiwat)) == 0) + error = so->so_proto->pr_attach(so, proto, td); + if (error != 0 && (so->so_proto->pr_flags & PR_SOCKBUF) == 0) { + mtx_destroy(&so->so_snd_mtx); + mtx_destroy(&so->so_rcv_mtx); + } + + return (error); +} + /* * socreate returns a socket with a ref count of 1 and a file descriptor * reference. The socket should be closed with soclose(). @@ -956,16 +987,8 @@ socreate(int dom, struct socket **aso, int type, int proto, so_rdknl_assert_lock); knlist_init(&so->so_wrsel.si_note, so, so_wrknl_lock, so_wrknl_unlock, so_wrknl_assert_lock); - if ((prp->pr_flags & PR_SOCKBUF) == 0) { - so->so_snd.sb_mtx = &so->so_snd_mtx; - so->so_rcv.sb_mtx = &so->so_rcv_mtx; - } - /* - * Auto-sizing of socket buffers is managed by the protocols and - * the appropriate flags must be set in the pr_attach() method. - */ CURVNET_SET(so->so_vnet); - error = prp->pr_attach(so, proto, td); + error = soattach(so, proto, td, NULL); CURVNET_RESTORE(); if (error) { sodealloc(so); @@ -1192,13 +1215,6 @@ solisten_clone(struct socket *head) so_rdknl_assert_lock); knlist_init(&so->so_wrsel.si_note, so, so_wrknl_lock, so_wrknl_unlock, so_wrknl_assert_lock); - VNET_SO_ASSERT(head); - if (soreserve(so, head->sol_sbsnd_hiwat, head->sol_sbrcv_hiwat)) { - sodealloc(so); - log(LOG_DEBUG, "%s: pcb %p: soreserve() failed\n", - __func__, head->so_pcb); - return (NULL); - } so->so_rcv.sb_lowat = head->sol_sbrcv_lowat; so->so_snd.sb_lowat = head->sol_sbsnd_lowat; so->so_rcv.sb_timeo = head->sol_sbrcv_timeo; @@ -1206,10 +1222,6 @@ solisten_clone(struct socket *head) so->so_rcv.sb_flags = head->sol_sbrcv_flags & SB_AUTOSIZE; so->so_snd.sb_flags = head->sol_sbsnd_flags & (SB_AUTOSIZE | SB_AUTOLOWAT); - if ((so->so_proto->pr_flags & PR_SOCKBUF) == 0) { - so->so_snd.sb_mtx = &so->so_snd_mtx; - so->so_rcv.sb_mtx = &so->so_rcv_mtx; - } return (so); } @@ -1223,7 +1235,7 @@ sonewconn(struct socket *head, int connstatus) if ((so = solisten_clone(head)) == NULL) return (NULL); - if (so->so_proto->pr_attach(so, 0, NULL) != 0) { + if (soattach(so, 0, NULL, head) != 0) { sodealloc(so); log(LOG_DEBUG, "%s: pcb %p: pr_attach() failed\n", __func__, head->so_pcb); @@ -1327,14 +1339,7 @@ sopeeloff(struct socket *head) so_rdknl_assert_lock); knlist_init(&so->so_wrsel.si_note, so, so_wrknl_lock, so_wrknl_unlock, so_wrknl_assert_lock); - VNET_SO_ASSERT(head); - if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat)) { - sodealloc(so); - log(LOG_DEBUG, "%s: pcb %p: soreserve() failed\n", - __func__, head->so_pcb); - return (NULL); - } - if (so->so_proto->pr_attach(so, 0, NULL)) { + if (soattach(so, 0, NULL, head)) { sodealloc(so); log(LOG_DEBUG, "%s: pcb %p: pr_attach() failed\n", __func__, head->so_pcb); @@ -1346,10 +1351,6 @@ sopeeloff(struct socket *head) so->so_snd.sb_timeo = head->so_snd.sb_timeo; so->so_rcv.sb_flags |= head->so_rcv.sb_flags & SB_AUTOSIZE; so->so_snd.sb_flags |= head->so_snd.sb_flags & SB_AUTOSIZE; - if ((so->so_proto->pr_flags & PR_SOCKBUF) == 0) { - so->so_snd.sb_mtx = &so->so_snd_mtx; - so->so_rcv.sb_mtx = &so->so_rcv_mtx; - } soref(so); @@ -1906,6 +1907,8 @@ sofree(struct socket *so) SOCK_SENDBUF_UNLOCK(so); SOCK_RECVBUF_UNLOCK(so); #endif + mtx_destroy(&so->so_snd_mtx); + mtx_destroy(&so->so_rcv_mtx); } seldrain(&so->so_rdsel); seldrain(&so->so_wrsel); diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 60736af5adf6..d56aac883d9c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -479,7 +479,7 @@ uipc_attach(struct socket *so, int proto, struct thread *td) { u_long sendspace, recvspace; struct unpcb *unp; - int error; + int error, rcvmtxopts; bool locked; KASSERT(so->so_pcb == NULL, ("uipc_attach: so_pcb != NULL")); @@ -494,6 +494,7 @@ uipc_attach(struct socket *so, int proto, struct thread *td) * limits to unpdg_recvspace. */ sendspace = recvspace = unpdg_recvspace; + rcvmtxopts = 0; break; case SOCK_STREAM: @@ -505,14 +506,7 @@ uipc_attach(struct socket *so, int proto, struct thread *td) sendspace = unpsp_sendspace; recvspace = unpsp_recvspace; common: - /* - * XXXGL: we need to initialize the mutex with MTX_DUPOK. - * Ideally, protocols that have PR_SOCKBUF should be - * responsible for mutex initialization officially, and then - * this uglyness with mtx_destroy(); mtx_init(); would go away. - */ - mtx_destroy(&so->so_rcv_mtx); - mtx_init(&so->so_rcv_mtx, "so_rcv", NULL, MTX_DEF | MTX_DUPOK); + rcvmtxopts = MTX_DUPOK; knlist_init(&so->so_wrsel.si_note, so, uipc_wrknl_lock, uipc_wrknl_unlock, uipc_wrknl_assert_lock); STAILQ_INIT(&so->so_rcv.uxst_mbq); @@ -520,6 +514,8 @@ common: default: panic("uipc_attach"); } + mtx_init(&so->so_rcv_mtx, "unix so_rcv", NULL, MTX_DEF | rcvmtxopts); + mtx_init(&so->so_snd_mtx, "unix so_snd", NULL, MTX_DEF); error = soreserve(so, sendspace, recvspace); if (error) return (error); @@ -888,6 +884,9 @@ uipc_detach(struct socket *so) MPASS(TAILQ_EMPTY(&so->so_rcv.uxdg_conns)); MPASS(STAILQ_EMPTY(&so->so_snd.uxdg_mb)); } + + mtx_destroy(&so->so_snd_mtx); + mtx_destroy(&so->so_rcv_mtx); } static int diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 8c58be63cd5a..4b501b221bcb 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -772,12 +772,21 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) NET_EPOCH_ASSERT(); /* - * Ok, create the full blown connection, and set things up - * as they would have been set up if we had created the - * connection when the SYN arrived. + * Creation of a socket via solisten_clone() bypasses call to pr_attach. + * That's why there is some pasted code from soattach() and from + * tcp_usr_attach() here. This should improve once TCP is PR_SOCKBUF. */ if ((so = solisten_clone(lso)) == NULL) goto allocfail; + mtx_init(&so->so_snd_mtx, "so_snd", NULL, MTX_DEF); + mtx_init(&so->so_rcv_mtx, "so_rcv", NULL, MTX_DEF); + so->so_snd.sb_mtx = &so->so_snd_mtx; + so->so_rcv.sb_mtx = &so->so_rcv_mtx; + error = soreserve(so, lso->sol_sbsnd_hiwat, lso->sol_sbrcv_hiwat); + if (error) { + sodealloc(so); + goto allocfail; + } #ifdef MAC mac_socketpeer_set_from_mbuf(m, so); #endif diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 74b46114716e..e906e0d635af 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -330,14 +330,17 @@ nl_attach(struct socket *so, int proto, struct thread *td) so, is_linux ? "(linux) " : "", curproc->p_pid, nl_get_proto_name(proto)); - nlp = malloc(sizeof(struct nlpcb), M_PCB, M_WAITOK | M_ZERO); + mtx_init(&so->so_snd_mtx, "netlink so_snd", NULL, MTX_DEF); + mtx_init(&so->so_rcv_mtx, "netlink so_rcv", NULL, MTX_DEF); error = soreserve(so, nl_sendspace, nl_recvspace); if (error != 0) { - free(nlp, M_PCB); + mtx_destroy(&so->so_snd_mtx); + mtx_destroy(&so->so_rcv_mtx); return (error); } TAILQ_INIT(&so->so_rcv.nl_queue); TAILQ_INIT(&so->so_snd.nl_queue); + nlp = malloc(sizeof(struct nlpcb), M_PCB, M_WAITOK | M_ZERO); so->so_pcb = nlp; nlp->nl_socket = so; nlp->nl_proto = proto; @@ -517,6 +520,9 @@ nl_close(struct socket *so) nl_buf_free(nb); } + mtx_destroy(&so->so_snd_mtx); + mtx_destroy(&so->so_rcv_mtx); + NL_LOG(LOG_DEBUG3, "socket %p, detached", so); /* XXX: is delayed free needed? */ From nobody Tue Feb 3 17:20:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gq4Fy4z6QRyW for ; Tue, 03 Feb 2026 17:20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59Gq3K1Xz3G0Q for ; Tue, 03 Feb 2026 17:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+VXj7kBSCDP40+utHNby2h2y7XEEsHZWxCr1I3bB6Q=; b=trRNXYZAYXDHl1lZ5KaSUomH7eWJUfq7WxJDFpWZDxlHxMaIiOLZSJ+AGaj1DCSQ77KFa/ vsSeqPYV0GZx7DUCmLvjbsyXW5Zye1bi7yqaoeRagkyySUQnPgyUD3ETJt90Wko8bIXcTA ljrwxpfXfaGwy4iYiWD1Dq4SggU05Btd/YN1KE6u+72aWKptZOAc18XGYnOyuke65l7cxt Xubnlr30XHyUjbGQwcR5+yV5a42iW7e3qwFmunw1dk4MsOEanqCqwc87w9tDGhCZ6NrUp3 iiRdANwXHHC13akyC7hrKoc81As59/TCjbji40RW5fOebb330bGp6qEIUzmK0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139219; a=rsa-sha256; cv=none; b=SgSD74ghMBUivP2EvsR4ooRF7c2UISThjdis9B0JkoZfPzsYG9uLcyo9ihzKnf9t5zGrzL MYS9tLvyoX36UfBFujzKxm3mmsOrwbu0ueKdedARsffb9FWdlyzusMzYvx6kXe7WdfuerI JFk5Nt8Vags7a3+v7bNrkmn4vpspXGMkKQTb2DlLvgE495vj14+4OWV2N+gSChFTcfbW7p epb2nGxyPeduSXWlyNfd0OPHptIjE1UDbijwYsjLkpnbpWxC7BAPfLrG9+nBFFY8185Tdb 4vBpEkmxu7akG3RvG9nINGabFF2hESKrVYE5Kdf/Q7f+Tp1PD4YvsKZqIQvKVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+VXj7kBSCDP40+utHNby2h2y7XEEsHZWxCr1I3bB6Q=; b=N1IbAvAkjAlP3D+U38eYQ+++BHor25bYcMVDJX06OcGbR6KJXT7H9QTkFdncip6PKZRrDf jjDjE708sa3iNLVLV5jtyauWwC2i80IhAEqzy/O/16312TigjCLf8U5x7ozlrshnRlvFoB 4Mem2O0gfS7tkaP7+VQzKrXXl0epD+vp4FKOIGboKZGrbzU6SVRhnP0HAofiy89Lxvdsz8 NfUI7n/PScLQ8flVsQ/BAtOZPWnI9gruuw8U+rX6Pvljsg8chiG51sI+VhPZg+sYN8uf/Q +IndPUdThempUrPPXSfnZgbz9GqyTWTi57g0qYhrwTIY90OZ/X29U1hWNKTGEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gq2nRjz6Vh for ; Tue, 03 Feb 2026 17:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f814 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:20:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 53bb02015fce - main - amd64: parse_memmap(): Move comment about size at proper place List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53bb02015fce72c79498842b898faefc2da3b0fb Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:20:19 +0000 Message-Id: <69822e53.1f814.60543c12@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=53bb02015fce72c79498842b898faefc2da3b0fb commit 53bb02015fce72c79498842b898faefc2da3b0fb Author: Olivier Certner AuthorDate: 2026-01-30 17:33:12 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 17:19:00 +0000 amd64: parse_memmap(): Move comment about size at proper place While here, declare 'size' only in the relevant block. No functional change (intended). MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/amd64/amd64/machdep.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index e56de986ccba..ae5df475f046 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -827,15 +827,6 @@ native_parse_memmap(vm_paddr_t *physmap, int *physmap_idx) { struct bios_smap *smap; struct efi_map_header *efihdr; - u_int32_t size; - - /* - * Memory map from INT 15:E820. - * - * subr_module.c says: - * "Consumer may safely assume that size value precedes data." - * ie: an int32_t immediately precedes smap. - */ efihdr = (struct efi_map_header *)preload_search_info(preload_kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP); @@ -848,7 +839,15 @@ native_parse_memmap(vm_paddr_t *physmap, int *physmap_idx) add_efi_map_entries(efihdr, physmap, physmap_idx); strlcpy(bootmethod, "UEFI", sizeof(bootmethod)); } else { - size = *((u_int32_t *)smap - 1); + /* + * Memory map from INT 15:E820. + * + * subr_module.c says: + * "Consumer may safely assume that size value precedes data." + * ie: an int32_t immediately precedes smap. + */ + u_int32_t size = *((u_int32_t *)smap - 1); + bios_add_smap_entries(smap, size, physmap, physmap_idx); strlcpy(bootmethod, "BIOS", sizeof(bootmethod)); } From nobody Tue Feb 3 17:20:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gr5zQwz6QS1w for ; Tue, 03 Feb 2026 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59Gr3wvlz3G3J for ; Tue, 03 Feb 2026 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wFj5dxZgBI6cCDLIem2RuNR8yAtTkj+p6HylzuRUY2w=; b=n08hmnAJ5cTY3jdeTkrbQwcycAKljaatfxkNkxWG0HGwfEQ2hoGzpdin+4xznfseGQYVDH T2Z9bfG5aZ3rppsUXP7j8i2vexpxR9zn7cNJ4J+bLlCW2KdmOiCINmOgZQMuWH6I9KKOUT F7pt307Gdfx2BUqt5BRKhKLxDlE7Sqp38og1gJNYV6hiiZ4IL7TuyN92kyS8sUagdkdfcY B99UbxMS/cq+Qb6yOY+t+gc0XzLZ9q5N4P56E4R4MNxzjqz6D3XoUNhDGu5k/wf1pVwzZ6 uiNoKPmg/sjUCwe1OYXJHNeZYWRmbSckDWktw55ORFyrjH0CB7fw/ADj2ECPAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139220; a=rsa-sha256; cv=none; b=iONrF036+iMzIxukUjpWQtNCyOnByhApNeO1L3W0qM7NtZo/x1jrVKdKxtSYEMjcBBQtoZ Nd8oYkTB8mL2DLq1UZP606aeGtLd0QlsjqN00Gdl9F+uUKdMxaV0Ue+OpFQ5rpVzMQZVMm COtT75JQZO9IoTwSGYO1+g67iVnRkkrXAL07FMJcDnleIMsIt+FWptc+gvzTb03tcbalCE 9cVacHKqbg1U835eyFsZuEj98TScvXBlKKEBgcTk4G5KpAu2fLo5CufspbOKaDwbzdHFkQ pWwEOdOHEGn620I/4UL3rrxwoQrG5Ij8rbDkMGeagpWHRZeOCE+mRQA4cT7zRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wFj5dxZgBI6cCDLIem2RuNR8yAtTkj+p6HylzuRUY2w=; b=yWEu0p7FPObU/273dau5dCigwthdfgfKnTSPb7rKWaa8FP5C6fOEQYMJMpv0+9Th1r8MCc +rqvo6kdoBdGeO8jVte2jmNd22d6EIUvp8lSkDvbqlGp4meswuTH+/TpBwrW38UNRmYyvO 6pKVhHv76Vjbm8R6CqHpgcLcf+K4ETZ0DzjToal+SN/BCdVEE5/NHSnCcl8yPCs8bdl2Eu wROc7JAJYy8sZejQ/0LrqcE4qgQc2qsgO76bnNgFAa5OyQivivq1loS326ePV9x37PQwDW V+K5nySY2GP5tjcurZT1Q/wZVFTICEiyXIFzyKOH3PWzsGMuGyu952/HuYBTdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gr39mMz6qj for ; Tue, 03 Feb 2026 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f818 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:20:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 406da392ef8d - main - sysctl(9): Booleans: Accept integers to ease knob conversion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 406da392ef8d77b39fe9bfd36bdb440eb3e5ae0a Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:20:20 +0000 Message-Id: <69822e54.1f818.5f1cdc5e@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=406da392ef8d77b39fe9bfd36bdb440eb3e5ae0a commit 406da392ef8d77b39fe9bfd36bdb440eb3e5ae0a Author: Olivier Certner AuthorDate: 2026-01-27 09:45:03 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 17:19:07 +0000 sysctl(9): Booleans: Accept integers to ease knob conversion In sysctl_handle_bool(), if the output buffer (for the old value) has room for exactly 4 bytes (sizeof(int)), then output the current boolean value as an integer rather than a 'uint8_t'. Conversely, if 4 bytes exactly remain in the input buffer (for the new value), treat them as an integer and derive the new boolean value from it. Doing so allows to convert existing integer syscstl knobs that are interpreted as a boolean into true boolean ones while staying backwards-compatible. That brings no drawback as no code currently uses sysctl_handle_bool() as part of a series of calls to sysctl_handle_*() functions for (de)serialization of some compound structure. If that case ever materializes, it can be easily solved, e.g., by creating a sysctl_handle_bool_strict() variant. In the future, we might want to go further and generally be more liberal in the external type of integers we accept and output, by tolerating any kind of supported integers (8-bit to 64-bit), enabling integer type changes of knob's internal representations without breaking the ABI for consumers hardcoding the passed integers (instead of relying on sysctl knob type information). Reviewed by: jhb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54925 --- sys/kern/kern_sysctl.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 25da134661e9..dbe509b3e8e2 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1619,8 +1619,8 @@ static SYSCTL_NODE(_sysctl, CTL_SYSCTL_OIDLABEL, oidlabel, CTLFLAG_RD | int sysctl_handle_bool(SYSCTL_HANDLER_ARGS) { - uint8_t temp; int error; + uint8_t temp; /* * Attempt to get a coherent snapshot by making a copy of the data. @@ -1630,16 +1630,44 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) else temp = arg2 ? 1 : 0; - error = SYSCTL_OUT(req, &temp, sizeof(temp)); + /* + * In order to support backwards-compatible conversion of integer knobs + * that are used as booleans to true boolean knobs, whose internal state + * is stored as a 'bool' and not an 'int', if exactly 4 bytes remain in + * the output buffer, we assume that the caller expected an 'int' + * instead of a 'uint8_t'. + */ + if (req->oldidx >= req->oldlen) + return (ENOMEM); + if (req->oldlen - req->oldidx == sizeof(int)) { + int temp_int = temp; + + error = SYSCTL_OUT(req, &temp_int, sizeof(temp_int)); + } else + error = SYSCTL_OUT(req, &temp, sizeof(temp)); if (error || !req->newptr) return (error); if (!arg1) error = EPERM; else { - error = SYSCTL_IN(req, &temp, sizeof(temp)); - if (!error) - *(bool *)arg1 = temp ? 1 : 0; + /* + * Conversely, if the input buffer has exactly 4 bytes to read, + * use them all to produce a bool. + */ + if (req->newidx >= req->newlen) + return (ENOMEM); + if (req->newlen - req->newidx == sizeof(int)) { + int temp_int; + + error = SYSCTL_IN(req, &temp_int, sizeof(temp_int)); + if (error == 0) + *(bool *)arg1 = temp_int != 0 ? 1 : 0; + } else { + error = SYSCTL_IN(req, &temp, sizeof(temp)); + if (error == 0) + *(bool *)arg1 = temp != 0 ? 1 : 0; + } } return (error); } From nobody Tue Feb 3 17:20:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gs6vzsz6QRmZ for ; Tue, 03 Feb 2026 17:20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59Gs43Nqz3FxQ for ; Tue, 03 Feb 2026 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EE7bJeS3k0CaQMft2KTwRviTXJJ9WhV7mUyjQD5sRgg=; b=HnRVgGRxTgYNF/nd0VRAvKs+rT3X6wwem6TZTP68dwmcWvzamis8VM1b5PWo2s0pAeCBck bAIHxgnFprklWd9H5Qetdku6EB67r11oa7s4hNjhATs1Wi/C8HH2H43l1V2K47bYrnWJBr rGQMNH2vN7vMLiF3/qrcWliEFR9JMes3aZzcDSurLj+bqvuFK2n95YxaMDOZowfa4DB/Se +CdCn50043ltZeD2cyNAB2eT4bE7LOeR3ac3YDONyqt9pzGzp5wY6gK5E+x+ml1Q1yKYma aF1E6zRWKaEhoH+FTx+75nTSXnk1EBMyKHFv/MWwdiIshlxQlb92N4N4U9vHOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139221; a=rsa-sha256; cv=none; b=GGBfiNUfyW5OWeNDU9nk5lxxZZ52HK7Sp9Oso2AJKut1YVqrUyRN9hcwa6OR6cjKi6WqPv 4ilGHkttkrlgiSi8a6P/OrW3usqIgjEr/bwmWDFgUlJV8Bmcsr5pkhZwWt1eSLmGiDpoMq Mc2sCyybaDFauAZuBek538VXK0lI1o3M4SMj5RNNuudQQbIb4RBmU856zG09NiYIl9z/Pw hOYvcl40ysWxYF+VM2QYKg5NzWCPJ6GIUvt1NUR+pwZAf+oIRANmYgwUloAPRLDc6LVEDf HbDD0OIoGu3ikEsN+1P8HH7sj+s0UFWNlIi5egbRK2FSXsJgKQMB5z7I4cqTMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EE7bJeS3k0CaQMft2KTwRviTXJJ9WhV7mUyjQD5sRgg=; b=HsbMbP7h2OhGevAiOMpVH39e3ZTDedPaVgf9pcySiz7ZmRK+9LuDOe7OcdL969EFEuB8wd 3gJ6qgW2rzUSReot9T9d+A83C3OV3lauSrXSSvA81cpdlYUrzuK6a6TBfpIqb4/JPF1sV0 Aq0yrXkobbOBouKvqEDL46D1vsJ75IGlgt0aiNZiMhPnXsKntBPZGJ6x/GoZMmASgY2dYg 2wpSLmXEqKI7A3FjTPTlmqyCv6G0ccnGgstCDF/2Vw5XrBg4Og3dnMuFQjZwTkblGXe3UV F1nQQSQXg4DDcm2TqZaZI9EOzZrTM07/Ay/vGnqQD7/a0UeKVxXXTKwjnjf8fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gs3c5xz6Yb for ; Tue, 03 Feb 2026 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fe0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:20:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7f031c9f6b9f - main - acpi: Move sysctl tree set up at end of initialization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f031c9f6b9ff8af7c901ff2645124a93b9de284 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:20:21 +0000 Message-Id: <69822e55.1fe0d.6ee59275@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7f031c9f6b9ff8af7c901ff2645124a93b9de284 commit 7f031c9f6b9ff8af7c901ff2645124a93b9de284 Author: Olivier Certner AuthorDate: 2026-01-28 10:07:42 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 17:19:08 +0000 acpi: Move sysctl tree set up at end of initialization Setting up the sysctl tree later: 1. Fixes not de-registering sysctl knobs on failure to attach. 2. Avoids having inconsistent knob values exposed during a brief moment. Reviewed by: imp, obiwac MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54926 --- sys/dev/acpica/acpi.c | 120 +++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 8cdb73333462..47bb47bfb0af 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -598,61 +598,6 @@ acpi_attach(device_t dev) goto out; } - /* - * Setup our sysctl tree. - * - * XXX: This doesn't check to make sure that none of these fail. - */ - sysctl_ctx_init(&sc->acpi_sysctl_ctx); - sc->acpi_sysctl_tree = SYSCTL_ADD_NODE(&sc->acpi_sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_hw), OID_AUTO, device_get_name(dev), - CTLFLAG_RD | CTLFLAG_MPSAFE, 0, ""); - SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "supported_sleep_state", - CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, - 0, 0, acpi_supported_sleep_state_sysctl, "A", - "List supported ACPI sleep states."); - SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "power_button_state", - CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_power_button_stype, 0, acpi_stype_sysctl, "A", - "Power button ACPI sleep state."); - SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "sleep_button_state", - CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_sleep_button_stype, 0, acpi_stype_sysctl, "A", - "Sleep button ACPI sleep state."); - SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "lid_switch_state", - CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_lid_switch_stype, 0, acpi_stype_sysctl, "A", - "Lid ACPI sleep state. Set to s2idle or s2mem if you want to suspend " - "your laptop when you close the lid."); - SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "suspend_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - NULL, 0, acpi_suspend_state_sysctl, "A", - "Current ACPI suspend state. This sysctl is deprecated; you probably " - "want to use kern.power.suspend instead."); - SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "standby_state", - CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, - &sc->acpi_standby_sx, 0, acpi_sleep_state_sysctl, "A", - "ACPI Sx state to use when going standby (usually S1 or S2)."); - SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "sleep_delay", CTLFLAG_RW, &sc->acpi_sleep_delay, 0, - "sleep delay in seconds"); - SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "s4bios", CTLFLAG_RW, &sc->acpi_s4bios, 0, - "Use S4BIOS when hibernating."); - SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "verbose", CTLFLAG_RW, &sc->acpi_verbose, 0, "verbose mode"); - SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "disable_on_reboot", CTLFLAG_RW, - &sc->acpi_do_disable, 0, "Disable ACPI when rebooting/halting system"); - SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "handle_reboot", CTLFLAG_RW, - &sc->acpi_handle_reboot, 0, "Use ACPI Reset Register to reboot"); - #if defined(__amd64__) || defined(__i386__) /* * Enable workaround for incorrect ISA IRQ polarity by default on @@ -660,10 +605,6 @@ acpi_attach(device_t dev) */ if (cpu_vendor_id == CPU_VENDOR_INTEL) acpi_override_isa_irq_polarity = 1; - SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "override_isa_irq_polarity", CTLFLAG_RDTUN, - &acpi_override_isa_irq_polarity, 0, - "Force active-hi polarity for edge-triggered ISA IRQs"); #endif /* @@ -770,6 +711,67 @@ acpi_attach(device_t dev) if ((error = acpi_machdep_init(dev))) goto out; + /* + * Setup our sysctl tree. + * + * XXX: This doesn't check to make sure that none of these fail. + */ + sysctl_ctx_init(&sc->acpi_sysctl_ctx); + sc->acpi_sysctl_tree = SYSCTL_ADD_NODE(&sc->acpi_sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_hw), OID_AUTO, device_get_name(dev), + CTLFLAG_RD | CTLFLAG_MPSAFE, 0, ""); + SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "supported_sleep_state", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, + 0, 0, acpi_supported_sleep_state_sysctl, "A", + "List supported ACPI sleep states."); + SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "power_button_state", + CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, + &sc->acpi_power_button_stype, 0, acpi_stype_sysctl, "A", + "Power button ACPI sleep state."); + SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "sleep_button_state", + CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, + &sc->acpi_sleep_button_stype, 0, acpi_stype_sysctl, "A", + "Sleep button ACPI sleep state."); + SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "lid_switch_state", + CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, + &sc->acpi_lid_switch_stype, 0, acpi_stype_sysctl, "A", + "Lid ACPI sleep state. Set to s2idle or s2mem if you want to suspend " + "your laptop when you close the lid."); + SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "suspend_state", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, + NULL, 0, acpi_suspend_state_sysctl, "A", + "Current ACPI suspend state. This sysctl is deprecated; you probably " + "want to use kern.power.suspend instead."); + SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "standby_state", + CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, + &sc->acpi_standby_sx, 0, acpi_sleep_state_sysctl, "A", + "ACPI Sx state to use when going standby (usually S1 or S2)."); + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "sleep_delay", CTLFLAG_RW, &sc->acpi_sleep_delay, 0, + "sleep delay in seconds"); + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "s4bios", CTLFLAG_RW, &sc->acpi_s4bios, 0, + "Use S4BIOS when hibernating."); + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "verbose", CTLFLAG_RW, &sc->acpi_verbose, 0, "verbose mode"); + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "disable_on_reboot", CTLFLAG_RW, + &sc->acpi_do_disable, 0, "Disable ACPI when rebooting/halting system"); + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "handle_reboot", CTLFLAG_RW, + &sc->acpi_handle_reboot, 0, "Use ACPI Reset Register to reboot"); +#if defined(__amd64__) || defined(__i386__) + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "override_isa_irq_polarity", CTLFLAG_RDTUN, + &acpi_override_isa_irq_polarity, 0, + "Force active-hi polarity for edge-triggered ISA IRQs"); +#endif + /* Register ACPI again to pass the correct argument of pm_func. */ power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, sc, acpi_supported_stypes); From nobody Tue Feb 3 17:20:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gv23YPz6QS23 for ; Tue, 03 Feb 2026 17:20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59Gt4ysSz3G3j for ; Tue, 03 Feb 2026 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZvw/r7KnGOcAs6MaBdYujkemZDKYgs37KRl4/lKnFs=; b=deH2F0DWYD76DxvCRf6BF4urRxCPuwcxdyYQrLkCN3SlO99iTxiCdi6MDBSaj0YAkbTV+p Tsg5x5evIxpL3HO7LQpAxEX2YJfp2pLD3YimwGtuvW54RSB0XCZ1ictELMeSGw2meQKfTQ E689coEuiRj6DJqhIthyg0acJD6y6hMbFmGbyCv16Vzy9RKgudT2wWrsWm98w+dIddCeA+ t6z82Ff59slmJSNUINkyk0ROJhhM+E3xnFYtl/SSg/hPrgKMefQRqmT2sLfrl7V6IjpItI zoQdkQTLM+7LY3DjX2pgVw+sSs/C9EJz1/8u3ddiaGkkmmNpNnQm6k8ccUQftg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139222; a=rsa-sha256; cv=none; b=Vjb1tdTyvx1G1LS0ZGTS31bxbCBX/jMrQETbRcfZO6lintbuucwW5tCJcT7G2Lr4rvUuxm XkNT1Jw2mEWPxVz540kSXTgE9O9mernT9yEtDRmhXEzJlXnb4oI5Tr+PYj3EApMNPHnOfh gWplBHFnQV1pd/FGtYDnF1lZl405yidluEYB0ucq/jtbnqMU5P7q1KAPfzIR3c5KgQvNwf 8jKtp0QuDwe+bT2f5PLeTh9WyZvsoS/VMLo98puErkfWM3MIA7esNN55z/2LBNHcKJdgH0 cKmNOM4eSWgWnVkfvXPGW1UN68dFoUelbQ16v+uCYmvYGGiWHLki0FD660GMVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZvw/r7KnGOcAs6MaBdYujkemZDKYgs37KRl4/lKnFs=; b=kmmBvktdCvxKRp3VaDF65IdM6tUvn/FVoT9mGbUc5BOdVkxZlrmxOTbDLZSQ5emicsVEDA 5mEX9RDYo5cYEsGAAXgAdZXxDtQgkLowrtnXIU2Ug3Qlr61vIYkjqicQ2hMfmJEdB2lsjw Bwj8aldTCfmjq+egs+moBxPTZtzqTMlcntYzki+m1ze1Z7mjVDU7CWzuVIIbTJk9dfjkTQ JRHXlFv8y1MRbsZtdt+0+vS4qsIOxygP68HEJVkEVVGXhi7/L4/0BaWbl9x5j3xi8O72p3 pFpzFsRbZJlHdYSaiQCamRC3Eflx0t2+QSHHJWYmsEf1FLfijEkhvBQXLLN6eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gt4SCgz737 for ; Tue, 03 Feb 2026 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f55b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:20:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: e401e6d3fc91 - main - acpi: 'hw.acpi.s4bios' sysctl: Change type to bool, expand description List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e401e6d3fc91679b16c5cfa4c473dcb8fcadacfa Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:20:22 +0000 Message-Id: <69822e56.1f55b.24bf4aaf@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e401e6d3fc91679b16c5cfa4c473dcb8fcadacfa commit e401e6d3fc91679b16c5cfa4c473dcb8fcadacfa Author: Olivier Certner AuthorDate: 2026-01-09 09:53:39 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 17:19:08 +0000 acpi: 'hw.acpi.s4bios' sysctl: Change type to bool, expand description Another boolean, indicating hardware support, will be introduced in next commit. Thanks to the previous commit modifying sysctl_handle_bool(), this change is backwards-compatible with old programs using an integer in and out of sysctl(3). Reviewed by: obiwac MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54626 --- sys/dev/acpica/acpi.c | 6 +++--- sys/dev/acpica/acpivar.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 47bb47bfb0af..58ddb0a83922 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -626,7 +626,7 @@ acpi_attach(device_t dev) /* Only enable S4BIOS by default if the FACS says it is available. */ if (AcpiGbl_FACS != NULL && AcpiGbl_FACS->Flags & ACPI_FACS_S4_BIOS_PRESENT) - sc->acpi_s4bios = 1; + sc->acpi_s4bios = true; /* * Probe all supported ACPI sleep states. Awake (S0) is always supported, @@ -754,9 +754,9 @@ acpi_attach(device_t dev) SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "sleep_delay", CTLFLAG_RW, &sc->acpi_sleep_delay, 0, "sleep delay in seconds"); - SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + SYSCTL_ADD_BOOL(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "s4bios", CTLFLAG_RW, &sc->acpi_s4bios, 0, - "Use S4BIOS when hibernating."); + "On hibernate, have the firmware save/restore the machine state (S4BIOS)."); SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "verbose", CTLFLAG_RW, &sc->acpi_verbose, 0, "verbose mode"); SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index eea54178060f..51881c580d4b 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -64,7 +64,7 @@ struct acpi_softc { enum power_stype acpi_lid_switch_stype; int acpi_standby_sx; - int acpi_s4bios; + bool acpi_s4bios; int acpi_sleep_delay; int acpi_do_disable; From nobody Tue Feb 3 17:27:43 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59RM5vNmz6QSK2 for ; Tue, 03 Feb 2026 17:27: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59RM5M61z3J23 for ; Tue, 03 Feb 2026 17:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMTKmhmyhLSuxTXVZDeA/jXCmsTonJpaX+s3N8hiavE=; b=x2WNDwidnV3WrpzWBXDtqq2v25AQuMPdhmwXzYPxn0KP9YxlrwEwiKWvU4CsLzcfN4PXGC z/Sdgavq1C8WioALh83kbK1I6uSi3S6KuiBuP+4cHRjMxZZZnl+QYBrwKDGFlTVwLeGJ/Y Ff4CpV38IDrgaFEpz0jTSoPeddc+feHNogcSBijmFiWTbYC6nnF6RlnHW7wP96woYGsLzr dJuuEC2DIesKlTAhVK1UGGH/o8Bw/pXJkcGrk+gmZ7mwjUoX3GF/CJo1SMJkM3Satg+SYv fYYcx2vUiNmeYhb5j85qTAwaZI2Wc8NmwREfBZsMssVd63HA9qYJyDfxw7GXrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139663; a=rsa-sha256; cv=none; b=dNQfaD0oLufyWFroWtHkBlCAz+jx4s0+7mTfE8zdTPubEQZjcynBEjx9PBFfKRU4JSj44Q cIFFjrXVGiK9eULraKBTOCujbX3Ox7oenjLXucnqw0Uzxd1b0qOmI5CoPtbX+P1Wm0E0hW Yww0miauin+lksdMFrNfwcJ8bbcSQLyWrXFCjsaRQDjDCjKJ3mFSohHllG26q9nkfsbtru glJpIuRItR3ZwCzTCinZ6v1Fd9Y+CYYjn+jMqj20QjzJrDLlWwYHMTRG+u4MBrLNuo1kEd HXcsdO0yJbMCroPFreSPf9MGN9WloOWVKvLerw41cjWPF8v3hdtyJDiBL25oRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMTKmhmyhLSuxTXVZDeA/jXCmsTonJpaX+s3N8hiavE=; b=oqrDhrfNfiIUaV3754QKiF+IYY70EN68OWVdZntI4ViLSlFMie8yW9edfaDtbbtiZxB9s6 NDrWjnqr72UuXlTiRnyf7FWLVrSbiOqRYec6uuEBN2mgNQxAjuqLSS7tmsKQVJrG9a+8xq uDec+aMk9g/cLbzLiGvD/AzyQaEZFhvo263LBCGW8/o5z1NGGF/shLW2xrFBt/aXrI6xa8 VbXterLMlksxuWw6eEKRoAk7PYlS/yBSoWWGGAVFGaRr4nirgA3X02Xyzkm/yrdv10olq+ BXAAylWkO+femmnfnlEQXLKbQxoW+1cNFLBKDTdJjNF7m1Kmw3wxUtrVxVd49w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59RM4vf1z6S7 for ; Tue, 03 Feb 2026 17:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f628 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:27:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 00f68392130c - main - libc/aarch64: Add a Makefile.inc dependency List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00f68392130cf597c7c76669c63dab26b31630c1 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:27:43 +0000 Message-Id: <6982300f.1f628.139fd766@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=00f68392130cf597c7c76669c63dab26b31630c1 commit 00f68392130cf597c7c76669c63dab26b31630c1 Author: Andrew Turner AuthorDate: 2026-02-03 14:00:46 +0000 Commit: Andrew Turner CommitDate: 2026-02-03 17:11:50 +0000 libc/aarch64: Add a Makefile.inc dependency If we update Makefile.inc it may be to change the contents of these files. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54774 --- lib/libc/aarch64/string/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/aarch64/string/Makefile.inc b/lib/libc/aarch64/string/Makefile.inc index 528c19574a1c..faf2f4566b30 100644 --- a/lib/libc/aarch64/string/Makefile.inc +++ b/lib/libc/aarch64/string/Makefile.inc @@ -46,8 +46,8 @@ MDSRCS+= \ # override the generated file in these cases. # .for FUNC in ${AARCH64_STRING_FUNCS} -.if !exists(${FUNC}.S) -${FUNC}.S: +.if !exists(${LIBC_SRCTOP}/aarch64/string/${FUNC}.S) +${FUNC}.S: ${LIBC_SRCTOP}/aarch64/string/Makefile.inc printf '/* %sgenerated by libc/aarch64/string/Makefile.inc */\n' @ > ${.TARGET} printf '#define __%s_aarch64 %s\n' ${FUNC} ${FUNC} >> ${.TARGET} printf '#include "aarch64/%s.S"\n' ${FUNC} >> ${.TARGET} From nobody Tue Feb 3 17:27:44 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59RP0tVPz6QSGW for ; Tue, 03 Feb 2026 17:27: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59RN72HHz3J54 for ; Tue, 03 Feb 2026 17:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cqC6Q2qGfnp+cSKva+tLTB9SseIpAmG5JwfuD4qtrbg=; b=anOxdRog/ygy+FqYwku+5dqa0i1+PhWQqgDsKVFXVChe/QQ36EzeoZD4jGGjEshZj74Dp9 iX20UuquhlDAXyGZCtoSZgHDoQ10cfyx+uWO3BdynMD1f1ccW1oLe7bSG43KJowZCg4v4e 6/tRUS/sVeoANSDUc2BmYbqvUHPa1F1NnZB4ZRg4GJt/ske06P7k1G+ZsEgP1NeuMo+VQ0 JuWXHUoe5YitJGXJqgd0FIVz8plMPtFDUjTFCIViWWZCuCKBQ0PtFRkLDv0FwZ1pk7kX0G cxOrCOTGHDH+8OT1P4WTrnru1r4zuPHhjvWOAUjzXxaHfpulCHpleH/pgTOyQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139665; a=rsa-sha256; cv=none; b=DT/FLZ2G2D3vn198amRGOn1u30AO7ZgzwyVUPvP+u4c0KyZhv3rSs+8vOhTCovn5dSX/v8 hOZl5XM7QBL7QGLs/PTUYjkimZahcOyT9wzSpy7N6k/zkofuStOzo+O56QLkGPsHYvAguo 6cu9gbpLlsEC/m856wBmwD80pNDeRXux5PBYhraMuKD0XD5dBGyA0Qna4SIVnkT0o+dzKW tUUNr974LM2Y0Ig6sej26yJAGiseAy5Eme94v0KZc833KpZCStF41a8BEZ8ZqmVJXxhhEH 3TsbFEU1QLMDzmxsa2vyY2et+TLmEXtVdOuUJaZYHFabvCEb03stCPYC7KQWeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cqC6Q2qGfnp+cSKva+tLTB9SseIpAmG5JwfuD4qtrbg=; b=Fe3bhAX+k7f2lljkk5lVZhtxWIEsP5QJz0lUl2+UAwc/8n5P6huaKA+QnED4CYeD7XCIRS 5aYczhqnLJ5XAqL3/7E+J43XNAa9XcnMe7NlcSAEyHiNJmMqYg4tNaYyASGsMOL80BTiTk BY9SxrRfBlR1WI5UbwDIADT85LFUcBO+3QiLsojNarg2aW1+CqlMLTedALbNrDb8uTikKO S+hoD7ye4qHWZRUQKgHeHS0/lo5ITf0gJCEx/mMFND2GGI2u348D0z85ImpxSMfOSeNa00 GtJFVoQblhJWNBPfkRWSR5q3u3efWe4tS9Ck1IgV/eXKB777oAhvA5WEpAIkjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59RN5nJ3z7G3 for ; Tue, 03 Feb 2026 17:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fe12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:27:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f0516ed4652c - main - libc/aarch64: Split out the MOPS functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0516ed4652cfb7435f8c5a16b46dc067779a1a8 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:27:44 +0000 Message-Id: <69823010.1fe12.616663c2@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f0516ed4652cfb7435f8c5a16b46dc067779a1a8 commit f0516ed4652cfb7435f8c5a16b46dc067779a1a8 Author: Andrew Turner AuthorDate: 2026-02-03 14:01:07 +0000 Commit: Andrew Turner CommitDate: 2026-02-03 17:11:50 +0000 libc/aarch64: Split out the MOPS functions This allows static binaries to only include the functions they reference. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54775 --- lib/libc/aarch64/string/Makefile.inc | 14 ++++++++++++++ lib/libc/aarch64/string/memcpy.S | 2 -- lib/libc/aarch64/string/memset.S | 1 - 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/libc/aarch64/string/Makefile.inc b/lib/libc/aarch64/string/Makefile.inc index faf2f4566b30..20a844f80e17 100644 --- a/lib/libc/aarch64/string/Makefile.inc +++ b/lib/libc/aarch64/string/Makefile.inc @@ -14,6 +14,11 @@ AARCH64_STRING_FUNCS= \ strnlen \ strrchr +AARCH64_STRING_IFUNC_FILES= \ + memcpy-mops.S \ + memmove-mops.S \ + memset-mops.S + # SIMD-enhanced routines not derived from Arm's code MDSRCS+= \ memchr.S \ @@ -58,6 +63,15 @@ MDSRCS+= ${FUNC}.S CFLAGS.${FUNC}.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string .endfor +.for FILE in ${AARCH64_STRING_IFUNC_FILES} +${FILE}: ${LIBC_SRCTOP}/aarch64/string/Makefile.inc + printf '/* %sgenerated by libc/aarch64/string/Makefile.inc */\n' @ > ${.TARGET} + printf '#include "aarch64/%s"\n' ${FILE} >> ${.TARGET} +CLEANFILES+= ${FILE} +MDSRCS+= ${FILE} +CFLAGS.${FILE}+=-I${SRCTOP}/contrib/arm-optimized-routines/string +.endfor + # Several files are wrappers in the src tree for the implementation from # arm-optimized-routines CFLAGS.memchr.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string diff --git a/lib/libc/aarch64/string/memcpy.S b/lib/libc/aarch64/string/memcpy.S index 06598d59bcf2..c4601d158d6b 100644 --- a/lib/libc/aarch64/string/memcpy.S +++ b/lib/libc/aarch64/string/memcpy.S @@ -1,3 +1 @@ #include "aarch64/memcpy-advsimd.S" -#include "aarch64/memcpy-mops.S" -#include "aarch64/memmove-mops.S" diff --git a/lib/libc/aarch64/string/memset.S b/lib/libc/aarch64/string/memset.S index dfe1c54273b9..acf707cdb7ec 100644 --- a/lib/libc/aarch64/string/memset.S +++ b/lib/libc/aarch64/string/memset.S @@ -1,2 +1 @@ #include "aarch64/memset.S" -#include "aarch64/memset-mops.S" From nobody Tue Feb 3 17:27:45 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59RQ35XNz6QSGY for ; Tue, 03 Feb 2026 17:27: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59RQ0HWRz3J25 for ; Tue, 03 Feb 2026 17:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MTk0bjCG3wPnYzGFLAICcbUjfQiudNaggPLVfROD4g=; b=SwVxj9SwsozDqGbbR5STwZIb9XZApyTZRrX6mHuY70VNhrf0d1kvIVbzhbxgWXvp/vvLCF aSlLkvgYVPHL6oiEGwxov2bXfgVjLlQFfEnc0spyRVtC2HVPNWo6CjVlUw42Zg4RVT2Tr4 /SxpTBiwZL/X+i7kUT1CsczGP15rv9xG6fVjnlnG3AVa2PCz3BnUjO3V6WZrcbj3Y2OzLx 0+AZfNSdPAy0y/uTczg47WlMDIKf1EsF38VmCiN4YkvFmQA1CTKoi9Q7nDjcqJQTjmWE17 DpeWwu5TqmlGKteo4so9wh0i0FtkMdoLeQfLSXCoz7gN5ns8Ck0xKfy8TxJGdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139666; a=rsa-sha256; cv=none; b=lRq7jEQD267BEbuzJ/TMQK6YZKtjZ1kCs/a4NZIJFI2BQi2qfmyT1GUBB8wHHFMVUgcSwS wIJ/hh4NwrY/kUxVtM4q2EkOp6HkYnOJQt3b2lt4yehP6QPp/SinJ0oIS0pbGptXsbKYR2 XEa9cDVDXUeu+kD/l9++iH+rWAT0+jaSDrAl7Yu4kkKXb9uZ5C5sK6RyvTVWvGcB8P+Mzx hZQo6dHv0MlwW56rDKs9qaVVU/LJr4N4NDK+TxzODtvafqBdPFiX2i7mF9xq7Xnnf5fsT7 ZsAWrQg0azIs7NdAgcoZnWWWujg1HLo8JbtsxYotb/JMKfvZv9rnh3BHQ2+AXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MTk0bjCG3wPnYzGFLAICcbUjfQiudNaggPLVfROD4g=; b=le7xYNeKIGxwoQDu846sFUiBmkezF/biOLdNOkkuoySKMYK5yRVAy8pGK/1sMKd13Wmgwe mxqYu2zmzniZ4Dgbz5iklUISazEsh/IE03QMtmUvtbuN4c/xzEXoIJuXoQX31yBLaLv8k5 WeEhtgeyJP517czcI9TDgz3NWjOUhsYlaMI362ICXk4pFqWXfQwNuTzMRmubyIwxOHLgQZ xI273Nzh6RygjFMTC5OTA+IWTPTPO1rWrGtvUjvjUkxALVFwk54EboGFnzkmlfjkHdvAxd opMW3fKuQyPQx93pcofixSsRVAQgXq3eaTjtW3HJtDY3Xm4q4v3UIApOabWIiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59RP6G86z7G5 for ; Tue, 03 Feb 2026 17:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f62c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:27:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 32d1f18865ab - main - libc/aarch64: Add memset for a 64 byte dc zva List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32d1f18865abe94d351a6f178a93b7195595ec69 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:27:45 +0000 Message-Id: <69823011.1f62c.16765e1b@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=32d1f18865abe94d351a6f178a93b7195595ec69 commit 32d1f18865abe94d351a6f178a93b7195595ec69 Author: Andrew Turner AuthorDate: 2026-02-03 14:01:32 +0000 Commit: Andrew Turner CommitDate: 2026-02-03 17:11:51 +0000 libc/aarch64: Add memset for a 64 byte dc zva On arm64 we can use the "dc zva" instruction to zero memory. The CPU tells software if the instruction is implemented, and if so the size and alignment it will use. When the size is 64-bytes the Arm Optimized Routines implementation of memset can use dc zva to zero memory, and has a build flag to skip checking. Use this flag to build a version of memset that will be used when this assumption is true. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54776 --- lib/libc/aarch64/string/Makefile.inc | 4 +++- lib/libc/aarch64/string/memset_resolver.c | 13 +++++++++++++ lib/libc/aarch64/string/memset_zva64.S | 4 ++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/libc/aarch64/string/Makefile.inc b/lib/libc/aarch64/string/Makefile.inc index 20a844f80e17..bc05e849aa20 100644 --- a/lib/libc/aarch64/string/Makefile.inc +++ b/lib/libc/aarch64/string/Makefile.inc @@ -42,7 +42,8 @@ MDSRCS+= \ memcpy_resolver.c \ memmove_resolver.c \ memset.S \ - memset_resolver.c + memset_resolver.c \ + memset_zva64.S # # Add the above functions. Generate an asm file that includes the needed @@ -77,3 +78,4 @@ CFLAGS.${FILE}+=-I${SRCTOP}/contrib/arm-optimized-routines/string CFLAGS.memchr.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string CFLAGS.memcpy.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string CFLAGS.memset.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string +CFLAGS.memset_zva64.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string diff --git a/lib/libc/aarch64/string/memset_resolver.c b/lib/libc/aarch64/string/memset_resolver.c index 34ca98aa1d34..277e8c177de9 100644 --- a/lib/libc/aarch64/string/memset_resolver.c +++ b/lib/libc/aarch64/string/memset_resolver.c @@ -25,18 +25,31 @@ * SUCH DAMAGE. */ #include + +#include #include #include void *__memset_aarch64(void *, int, size_t); +void *__memset_aarch64_zva64(void *, int, size_t); void *__memset_aarch64_mops(void *, int, size_t); DEFINE_UIFUNC(, void *, memset, (void *, int, size_t)) { + uint64_t dczid; + if (ifunc_arg->_hwcap2 & HWCAP2_MOPS) return (__memset_aarch64_mops); + /* + * Check for the DC ZVA instruction, and it will + * zero 64 bytes (4 * 4byte words). + */ + dczid = READ_SPECIALREG(dczid_el0); + if ((dczid & DCZID_DZP) == 0 && DCZID_BS_SIZE(dczid) == 4) + return (__memset_aarch64_zva64); + return (__memset_aarch64); } diff --git a/lib/libc/aarch64/string/memset_zva64.S b/lib/libc/aarch64/string/memset_zva64.S new file mode 100644 index 000000000000..7f1cf6ba577a --- /dev/null +++ b/lib/libc/aarch64/string/memset_zva64.S @@ -0,0 +1,4 @@ +/* Used when we know we have a 64-byte dc zva instruction */ +#define __memset_aarch64 __memset_aarch64_zva64 +#define SKIP_ZVA_CHECK +#include "aarch64/memset.S" From nobody Tue Feb 3 17:27:46 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59RR4lgDz6QSQ6 for ; Tue, 03 Feb 2026 17:27: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59RR1DbFz3J9p for ; Tue, 03 Feb 2026 17:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hwIsq4mB/SsPGeyU1mT8lACmZIL1A92xTlgZqu9Bwms=; b=Go+v0W9ni2oxQ/MnL2BL8R0L7YHNqPkHZopo6fMfXNznLLde3sFAmr4Bsk8asBhSo5IFxj utbPBZcnC82kKwGvJiKM/ENFloT9FWGMpsFnQzJq/ykYGoHnbS7f1jsnjrI1aI6j74q3uR Xbxfe8YEcyODEbByC2Kz5W98LF0QuWZinyrT8at/oT8OBcZ4uSiJiI7LOvWjAWBrgXf5Gv sOTlKUq9j45XIFlC2lD8rSDhuv6TmxIXSv3C8W+s7bUCvGiqOLqFgo5bcfRaMA0TkXZPNP UAtCTeCvonLDPZmNveS0JNTI/lBtR7/vDvEtV6T5o1KK/fXunKWA64Kdt+EJzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139667; a=rsa-sha256; cv=none; b=UnFWQaoiDLMkoMFBIsj52sbhD9fMaJmlI2DyiPyBNMHqyg4O4XiDiw4rGjaBaMnzKlNhPm PuxFxwYJJE6KMtDp+mLO+SfxnuJk1CwfSI/0LkOVnvQKcxzb+SANumV9zJfy1pPXvMyfzN f2om8hbQ1YHELuqqlrTtcuU1pMxzUqv78RG35VFTokIKMGviuSGGl/TgY0vQgRuX8sMsC7 MVVlC2wm+yQbco+qyjLRocmCdfPPjlji1lQhzyP81epJgSzwNTqrUQTqFHGsM/FmJ6tZCB SAy+Fijo62eveXy7kADgGbi9q7tYPYpq31B5WwmnVsSNBhkuNU7Ke4BI3zLGmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hwIsq4mB/SsPGeyU1mT8lACmZIL1A92xTlgZqu9Bwms=; b=oFtgxSMTBQDjhF2FAzcWkGSTrWPd1blr8RWlMXGQg4J6K+lA/or1pQsT4R5RhUXDy60NSR j5clLGlpfYtOhmcVvQBL4MMGLOmYpT1LiNyD32klKa+7aPpdox9Ipbf8zjQlVgseNXfz4B q2CqiJcr/XvZ23vE3uKFh/Dl6JDOK5ofu88Rt3Gl6rjcBF/uwPtG2S7HKhRqbHkxZqoNji 4cqGhfaVYtk0X7lbQITAyq/rRqmo4X/GKIHkI8AHusetrWnbH2EoemmzonP1T1N2wBBTQe MdCV3HqQP3RBDKMVn55hLMJJd4TDHq0FpQM4gSi6LtbL0/9nDhQ+S08VCffAhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59RQ6mMbz7KD for ; Tue, 03 Feb 2026 17:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f914 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:27:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2f3f5055e7f6 - main - virtio_p9fs: Use VIRTIO_SIMPLE_PNPINFO List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f3f5055e7f69567f7aaca2f5b77655df34c4bb0 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:27:46 +0000 Message-Id: <69823012.1f914.64cc37d0@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2f3f5055e7f69567f7aaca2f5b77655df34c4bb0 commit 2f3f5055e7f69567f7aaca2f5b77655df34c4bb0 Author: Andrew Turner AuthorDate: 2026-02-03 17:13:35 +0000 Commit: Andrew Turner CommitDate: 2026-02-03 17:13:35 +0000 virtio_p9fs: Use VIRTIO_SIMPLE_PNPINFO This allows us to also use the common VIRTIO_SIMPLE_PROBE and to have devmatch load the driver when detected. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54684 --- sys/dev/virtio/p9fs/virtio_p9fs.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index aa84d3970698..2b276a60aa9a 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -84,6 +84,8 @@ static struct virtio_feature_desc virtio_9p_feature_desc[] = { { 0, NULL } }; +VIRTIO_SIMPLE_PNPINFO(virtio_p9fs, VIRTIO_ID_9P, "VirtIO 9P Transport"); + /* We don't currently allow canceling of virtio requests */ static int vt9p_cancel(void *handle, struct p9_req_t *req) @@ -257,13 +259,7 @@ vt9p_alloc_virtqueue(struct vt9p_softc *sc) static int vt9p_probe(device_t dev) { - - /* If the virtio device type is a 9P device, then we claim and attach it */ - if (virtio_get_device_type(dev) != VIRTIO_ID_9P) - return (ENXIO); - device_set_desc(dev, "VirtIO 9P Transport"); - - return (BUS_PROBE_DEFAULT); + return (VIRTIO_SIMPLE_PROBE(dev, virtio_p9fs)); } static void From nobody Tue Feb 3 17:27:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59RS4vyMz6QSgr for ; Tue, 03 Feb 2026 17:27: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59RS1L51z3Hj9 for ; Tue, 03 Feb 2026 17:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DWjDVxjDVgnyH2WNfznkfp59jORxJeDioKEbLQdpZaE=; b=cFEqYMf3UW75YUV98KTvG8K/34RbpLid8eSLKLkQEl44wFs/5Xr9nrcD1bhO9QaJ7XO8YL MbygyQ0dq+rarrrETqp2K+PUzmW0vlfVpqZEGGzp8YpBAV2fT7/Nn+R9AA6pxFoLAWHTcT W34JbaRZOnMAeoKu3Mdi+Dv3FeMnK+fipCyWMrUt5HwUwcca+6T08UKvLnmNpQNz7AVdgZ AN8/0tF68lwwPbsGV+1nivB3AmOGvs4QHnxqdRlJGzG5QLd7N4Xslqh1UERddK9ZPPT+ZB 2DRAM1Ia3tg/KneBTlNfFQAsteh3W79QOJ5hrzqtJDwkGkhBzIk5uGVsJmVIHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139668; a=rsa-sha256; cv=none; b=MF4fgXTLgzg4HhgfMtpp0w4SqvJ//L8sxBKXvdVIlK6Efw0w69ogYSRday+uj3SJp62m52 pTB9DribpT/rZQcI8MvkGpOJLDojYRqCiyRj6ThbOQxHWXL9oGzoY8GRHNUcHhDfeG3hkE xZ3cTYeGIL3pfGp0ErwvIhzFLmWOBdElQVEqL1JfOw1bCI9gL2axU5W37dvPkLPnAbgU6O TIRHx3IMxtOLO6U8FzeN48jyFxb7+JKiwIk5o6apManRzdCgxnndyQUMI/NZesOl/orwSE YdKp3HiYFGjgZ4bWG+3Sjp4s+9zwWoI8dwpbQFnqgxOkDLFDOYr1G3ES3CCD/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DWjDVxjDVgnyH2WNfznkfp59jORxJeDioKEbLQdpZaE=; b=HKd6HgMn6396gSo0KXuB84DwBrM0jXGtlK1IetACsVyabAUPeCZaIWe4DtQmZJ2vt1VIcV 6E49SuRinIEPIEcKoQnsaJJDplv1awxNALTO2pu3D5bqOIUQofMQw0f2vrUzs7Td7JWpgU F1WXnegUpmc9LxPjmtgLivPd6uYyvByAuUzQCXklULk3N0pCp41PnBD/aHXSxRdKlT4aM/ qrOtArl/eftrcnOAoPdtOxhX9mtki7wn9H2ibXKWIk1PxYKzslTBze21Ba9IaxIn/8oanB /tuDmA4VyhuaGlP5Mc45uAi1G3Bpqc6GJPJ8q71XWpLdG6hHKQEg46AbTNlb/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59RS0ctYz757 for ; Tue, 03 Feb 2026 17:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f630 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:27:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4f82ce5191d5 - main - arm64: Add the Fine-Grained Trap registers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f82ce5191d550b875f7f760c83e05167728fe69 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:27:48 +0000 Message-Id: <69823014.1f630.3527e5db@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4f82ce5191d550b875f7f760c83e05167728fe69 commit 4f82ce5191d550b875f7f760c83e05167728fe69 Author: Andrew Turner AuthorDate: 2026-02-03 17:14:03 +0000 Commit: Andrew Turner CommitDate: 2026-02-03 17:14:03 +0000 arm64: Add the Fine-Grained Trap registers Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54685 --- sys/arm64/include/hypervisor.h | 1744 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1744 insertions(+) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index f3d7027269c9..3ee5c12f2265 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -134,6 +134,15 @@ /* Unconditionally valid */ #define CPTR_TCPAC 0x80000000 +/* HAFGRTR_EL2 */ +#define HAFGRTR_EL2_REG MRS_REG_ALT_NAME(HAFGRTR_EL2) +#define HAFGRTR_EL2_op0 3 +#define HAFGRTR_EL2_op1 4 +#define HAFGRTR_EL2_CRn 3 +#define HAFGRTR_EL2_CRm 1 +#define HAFGRTR_EL2_op2 6 +#define HAFGRTR_EL2_TRAP_ALL UL(0x0003fffffffe001f) + /* HCR_EL2 - Hypervisor Config Register */ #define HCR_VM (UL(0x1) << 0) #define HCR_SWIO (UL(0x1) << 1) @@ -234,6 +243,1741 @@ /* Bit 25 is reserved */ #define HCRX_SRMASKEn (UL(0x1) << 26) +/* HDFGRTR2_EL2 */ +#define HDFGRTR2_EL2_REG MRS_REG_ALT_NAME(HDFGRTR2_EL2) +#define HDFGRTR2_EL2_op0 3 +#define HDFGRTR2_EL2_op1 4 +#define HDFGRTR2_EL2_CRn 3 +#define HDFGRTR2_EL2_CRm 1 +#define HDFGRTR2_EL2_op2 0 +#define HDFGRTR2_EL2_nMDSTEPOP_EL1_SHIFT 23 +#define HDFGRTR2_EL2_nMDSTEPOP_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nMDSTEPOP_EL1_SHIFT) +#define HDFGRTR2_EL2_nMDSTEPOP_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nMDSTEPOP_EL1_MASK) +#define HDFGRTR2_EL2_nMDSTEPOP_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nMDSTEPOP_EL1_SHIFT) +#define HDFGRTR2_EL2_nMDSTEPOP_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nMDSTEPOP_EL1_SHIFT) +#define HDFGRTR2_EL2_nTRBMPAM_EL1_SHIFT 22 +#define HDFGRTR2_EL2_nTRBMPAM_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nTRBMPAM_EL1_SHIFT) +#define HDFGRTR2_EL2_nTRBMPAM_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nTRBMPAM_EL1_MASK) +#define HDFGRTR2_EL2_nTRBMPAM_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nTRBMPAM_EL1_SHIFT) +#define HDFGRTR2_EL2_nTRBMPAM_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nTRBMPAM_EL1_SHIFT) +#define HDFGRTR2_EL2_nTRCITECR_EL1_SHIFT 20 +#define HDFGRTR2_EL2_nTRCITECR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nTRCITECR_EL1_SHIFT) +#define HDFGRTR2_EL2_nTRCITECR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nTRCITECR_EL1_MASK) +#define HDFGRTR2_EL2_nTRCITECR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nTRCITECR_EL1_SHIFT) +#define HDFGRTR2_EL2_nTRCITECR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nTRCITECR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMSDSFR_EL1_SHIFT 19 +#define HDFGRTR2_EL2_nPMSDSFR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nPMSDSFR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMSDSFR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nPMSDSFR_EL1_MASK) +#define HDFGRTR2_EL2_nPMSDSFR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nPMSDSFR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMSDSFR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nPMSDSFR_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMDEVAFF_EL1_SHIFT 18 +#define HDFGRTR2_EL2_nSPMDEVAFF_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMDEVAFF_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMDEVAFF_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nSPMDEVAFF_EL1_MASK) +#define HDFGRTR2_EL2_nSPMDEVAFF_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMDEVAFF_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMDEVAFF_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMDEVAFF_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMID_SHIFT 17 +#define HDFGRTR2_EL2_nSPMID_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMID_SHIFT) +#define HDFGRTR2_EL2_nSPMID_VAL(x) ((x) & HDFGRTR2_EL2_nSPMID_MASK) +#define HDFGRTR2_EL2_nSPMID_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMID_SHIFT) +#define HDFGRTR2_EL2_nSPMID_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMID_SHIFT) +#define HDFGRTR2_EL2_nSPMSCR_EL1_SHIFT 16 +#define HDFGRTR2_EL2_nSPMSCR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMSCR_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMSCR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nSPMSCR_EL1_MASK) +#define HDFGRTR2_EL2_nSPMSCR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMSCR_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMSCR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMSCR_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMACCESSR_EL1_SHIFT 15 +#define HDFGRTR2_EL2_nSPMACCESSR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMACCESSR_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMACCESSR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nSPMACCESSR_EL1_MASK) +#define HDFGRTR2_EL2_nSPMACCESSR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMACCESSR_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMACCESSR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMACCESSR_EL1_SHIFT) +#define HDFGRTR2_EL2_nSPMCR_EL0_SHIFT 14 +#define HDFGRTR2_EL2_nSPMCR_EL0_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMCR_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMCR_EL0_VAL(x) ((x) & HDFGRTR2_EL2_nSPMCR_EL0_MASK) +#define HDFGRTR2_EL2_nSPMCR_EL0_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMCR_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMCR_EL0_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMCR_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMOVS_SHIFT 13 +#define HDFGRTR2_EL2_nSPMOVS_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMOVS_SHIFT) +#define HDFGRTR2_EL2_nSPMOVS_VAL(x) ((x) & HDFGRTR2_EL2_nSPMOVS_MASK) +#define HDFGRTR2_EL2_nSPMOVS_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMOVS_SHIFT) +#define HDFGRTR2_EL2_nSPMOVS_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMOVS_SHIFT) +#define HDFGRTR2_EL2_nSPMINTEN_SHIFT 12 +#define HDFGRTR2_EL2_nSPMINTEN_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMINTEN_SHIFT) +#define HDFGRTR2_EL2_nSPMINTEN_VAL(x) ((x) & HDFGRTR2_EL2_nSPMINTEN_MASK) +#define HDFGRTR2_EL2_nSPMINTEN_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMINTEN_SHIFT) +#define HDFGRTR2_EL2_nSPMINTEN_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMINTEN_SHIFT) +#define HDFGRTR2_EL2_nSPMCNTEN_SHIFT 11 +#define HDFGRTR2_EL2_nSPMCNTEN_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMCNTEN_SHIFT) +#define HDFGRTR2_EL2_nSPMCNTEN_VAL(x) ((x) & HDFGRTR2_EL2_nSPMCNTEN_MASK) +#define HDFGRTR2_EL2_nSPMCNTEN_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMCNTEN_SHIFT) +#define HDFGRTR2_EL2_nSPMCNTEN_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMCNTEN_SHIFT) +#define HDFGRTR2_EL2_nSPMSELR_EL0_SHIFT 10 +#define HDFGRTR2_EL2_nSPMSELR_EL0_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMSELR_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMSELR_EL0_VAL(x) ((x) & HDFGRTR2_EL2_nSPMSELR_EL0_MASK) +#define HDFGRTR2_EL2_nSPMSELR_EL0_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMSELR_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMSELR_EL0_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMSELR_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMEVTYPERn_EL0_SHIFT 9 +#define HDFGRTR2_EL2_nSPMEVTYPERn_EL0_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMEVTYPERn_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMEVTYPERn_EL0_VAL(x) ((x) & HDFGRTR2_EL2_nSPMEVTYPERn_EL0_MASK) +#define HDFGRTR2_EL2_nSPMEVTYPERn_EL0_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMEVTYPERn_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMEVTYPERn_EL0_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMEVTYPERn_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMEVCNTRn_EL0_SHIFT 8 +#define HDFGRTR2_EL2_nSPMEVCNTRn_EL0_MASK (UL(0x1) << HDFGRTR2_EL2_nSPMEVCNTRn_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMEVCNTRn_EL0_VAL(x) ((x) & HDFGRTR2_EL2_nSPMEVCNTRn_EL0_MASK) +#define HDFGRTR2_EL2_nSPMEVCNTRn_EL0_TRAP (UL(0x0) << HDFGRTR2_EL2_nSPMEVCNTRn_EL0_SHIFT) +#define HDFGRTR2_EL2_nSPMEVCNTRn_EL0_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nSPMEVCNTRn_EL0_SHIFT) +#define HDFGRTR2_EL2_nPMSSCR_EL1_SHIFT 7 +#define HDFGRTR2_EL2_nPMSSCR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nPMSSCR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMSSCR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nPMSSCR_EL1_MASK) +#define HDFGRTR2_EL2_nPMSSCR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nPMSSCR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMSSCR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nPMSSCR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMSSDATA_SHIFT 6 +#define HDFGRTR2_EL2_nPMSSDATA_MASK (UL(0x1) << HDFGRTR2_EL2_nPMSSDATA_SHIFT) +#define HDFGRTR2_EL2_nPMSSDATA_VAL(x) ((x) & HDFGRTR2_EL2_nPMSSDATA_MASK) +#define HDFGRTR2_EL2_nPMSSDATA_TRAP (UL(0x0) << HDFGRTR2_EL2_nPMSSDATA_SHIFT) +#define HDFGRTR2_EL2_nPMSSDATA_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nPMSSDATA_SHIFT) +#define HDFGRTR2_EL2_nMDSELR_EL1_SHIFT 5 +#define HDFGRTR2_EL2_nMDSELR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nMDSELR_EL1_SHIFT) +#define HDFGRTR2_EL2_nMDSELR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nMDSELR_EL1_MASK) +#define HDFGRTR2_EL2_nMDSELR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nMDSELR_EL1_SHIFT) +#define HDFGRTR2_EL2_nMDSELR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nMDSELR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMUACR_EL1_SHIFT 4 +#define HDFGRTR2_EL2_nPMUACR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nPMUACR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMUACR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nPMUACR_EL1_MASK) +#define HDFGRTR2_EL2_nPMUACR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nPMUACR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMUACR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nPMUACR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMICFILTR_EL0_SHIFT 3 +#define HDFGRTR2_EL2_nPMICFILTR_EL0_MASK (UL(0x1) << HDFGRTR2_EL2_nPMICFILTR_EL0_SHIFT) +#define HDFGRTR2_EL2_nPMICFILTR_EL0_VAL(x) ((x) & HDFGRTR2_EL2_nPMICFILTR_EL0_MASK) +#define HDFGRTR2_EL2_nPMICFILTR_EL0_TRAP (UL(0x0) << HDFGRTR2_EL2_nPMICFILTR_EL0_SHIFT) +#define HDFGRTR2_EL2_nPMICFILTR_EL0_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nPMICFILTR_EL0_SHIFT) +#define HDFGRTR2_EL2_nPMICNTR_EL0_SHIFT 2 +#define HDFGRTR2_EL2_nPMICNTR_EL0_MASK (UL(0x1) << HDFGRTR2_EL2_nPMICNTR_EL0_SHIFT) +#define HDFGRTR2_EL2_nPMICNTR_EL0_VAL(x) ((x) & HDFGRTR2_EL2_nPMICNTR_EL0_MASK) +#define HDFGRTR2_EL2_nPMICNTR_EL0_TRAP (UL(0x0) << HDFGRTR2_EL2_nPMICNTR_EL0_SHIFT) +#define HDFGRTR2_EL2_nPMICNTR_EL0_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nPMICNTR_EL0_SHIFT) +#define HDFGRTR2_EL2_nPMIAR_EL1_SHIFT 1 +#define HDFGRTR2_EL2_nPMIAR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nPMIAR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMIAR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nPMIAR_EL1_MASK) +#define HDFGRTR2_EL2_nPMIAR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nPMIAR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMIAR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nPMIAR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMECR_EL1_SHIFT 0 +#define HDFGRTR2_EL2_nPMECR_EL1_MASK (UL(0x1) << HDFGRTR2_EL2_nPMECR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMECR_EL1_VAL(x) ((x) & HDFGRTR2_EL2_nPMECR_EL1_MASK) +#define HDFGRTR2_EL2_nPMECR_EL1_TRAP (UL(0x0) << HDFGRTR2_EL2_nPMECR_EL1_SHIFT) +#define HDFGRTR2_EL2_nPMECR_EL1_NOTRAP (UL(0x1) << HDFGRTR2_EL2_nPMECR_EL1_SHIFT) + +/* HDFGRTR_EL2 */ +#define HDFGRTR_EL2_REG MRS_REG_ALT_NAME(HDFGRTR_EL2) +#define HDFGRTR_EL2_op0 3 +#define HDFGRTR_EL2_op1 4 +#define HDFGRTR_EL2_CRn 3 +#define HDFGRTR_EL2_CRm 1 +#define HDFGRTR_EL2_op2 4 +#define HDFGRTR_EL2_PMBIDR_EL1_SHIFT 63 +#define HDFGRTR_EL2_PMBIDR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMBIDR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBIDR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMBIDR_EL1_MASK) +#define HDFGRTR_EL2_PMBIDR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMBIDR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBIDR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMBIDR_EL1_SHIFT) +#define HDFGRTR_EL2_nPMSNEVFR_EL1_SHIFT 62 +#define HDFGRTR_EL2_nPMSNEVFR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_nPMSNEVFR_EL1_SHIFT) +#define HDFGRTR_EL2_nPMSNEVFR_EL1_VAL(x) ((x) & HDFGRTR_EL2_nPMSNEVFR_EL1_MASK) +#define HDFGRTR_EL2_nPMSNEVFR_EL1_TRAP (UL(0x0) << HDFGRTR_EL2_nPMSNEVFR_EL1_SHIFT) +#define HDFGRTR_EL2_nPMSNEVFR_EL1_NOTRAP (UL(0x1) << HDFGRTR_EL2_nPMSNEVFR_EL1_SHIFT) +#define HDFGRTR_EL2_nBRBDATA_SHIFT 61 +#define HDFGRTR_EL2_nBRBDATA_MASK (UL(0x1) << HDFGRTR_EL2_nBRBDATA_SHIFT) +#define HDFGRTR_EL2_nBRBDATA_VAL(x) ((x) & HDFGRTR_EL2_nBRBDATA_MASK) +#define HDFGRTR_EL2_nBRBDATA_TRAP (UL(0x0) << HDFGRTR_EL2_nBRBDATA_SHIFT) +#define HDFGRTR_EL2_nBRBDATA_NOTRAP (UL(0x1) << HDFGRTR_EL2_nBRBDATA_SHIFT) +#define HDFGRTR_EL2_nBRBCTL_SHIFT 60 +#define HDFGRTR_EL2_nBRBCTL_MASK (UL(0x1) << HDFGRTR_EL2_nBRBCTL_SHIFT) +#define HDFGRTR_EL2_nBRBCTL_VAL(x) ((x) & HDFGRTR_EL2_nBRBCTL_MASK) +#define HDFGRTR_EL2_nBRBCTL_TRAP (UL(0x0) << HDFGRTR_EL2_nBRBCTL_SHIFT) +#define HDFGRTR_EL2_nBRBCTL_NOTRAP (UL(0x1) << HDFGRTR_EL2_nBRBCTL_SHIFT) +#define HDFGRTR_EL2_nBRBIDR_SHIFT 59 +#define HDFGRTR_EL2_nBRBIDR_MASK (UL(0x1) << HDFGRTR_EL2_nBRBIDR_SHIFT) +#define HDFGRTR_EL2_nBRBIDR_VAL(x) ((x) & HDFGRTR_EL2_nBRBIDR_MASK) +#define HDFGRTR_EL2_nBRBIDR_TRAP (UL(0x0) << HDFGRTR_EL2_nBRBIDR_SHIFT) +#define HDFGRTR_EL2_nBRBIDR_NOTRAP (UL(0x1) << HDFGRTR_EL2_nBRBIDR_SHIFT) +#define HDFGRTR_EL2_PMCEIDn_EL0_SHIFT 58 +#define HDFGRTR_EL2_PMCEIDn_EL0_MASK (UL(0x1) << HDFGRTR_EL2_PMCEIDn_EL0_SHIFT) +#define HDFGRTR_EL2_PMCEIDn_EL0_VAL(x) ((x) & HDFGRTR_EL2_PMCEIDn_EL0_MASK) +#define HDFGRTR_EL2_PMCEIDn_EL0_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMCEIDn_EL0_SHIFT) +#define HDFGRTR_EL2_PMCEIDn_EL0_TRAP (UL(0x1) << HDFGRTR_EL2_PMCEIDn_EL0_SHIFT) +#define HDFGRTR_EL2_PMUSERENR_EL0_SHIFT 57 +#define HDFGRTR_EL2_PMUSERENR_EL0_MASK (UL(0x1) << HDFGRTR_EL2_PMUSERENR_EL0_SHIFT) +#define HDFGRTR_EL2_PMUSERENR_EL0_VAL(x) ((x) & HDFGRTR_EL2_PMUSERENR_EL0_MASK) +#define HDFGRTR_EL2_PMUSERENR_EL0_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMUSERENR_EL0_SHIFT) +#define HDFGRTR_EL2_PMUSERENR_EL0_TRAP (UL(0x1) << HDFGRTR_EL2_PMUSERENR_EL0_SHIFT) +#define HDFGRTR_EL2_TRBTRG_EL1_SHIFT 56 +#define HDFGRTR_EL2_TRBTRG_EL1_MASK (UL(0x1) << HDFGRTR_EL2_TRBTRG_EL1_SHIFT) +#define HDFGRTR_EL2_TRBTRG_EL1_VAL(x) ((x) & HDFGRTR_EL2_TRBTRG_EL1_MASK) +#define HDFGRTR_EL2_TRBTRG_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRBTRG_EL1_SHIFT) +#define HDFGRTR_EL2_TRBTRG_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_TRBTRG_EL1_SHIFT) +#define HDFGRTR_EL2_TRBSR_EL1_SHIFT 55 +#define HDFGRTR_EL2_TRBSR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_TRBSR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBSR_EL1_VAL(x) ((x) & HDFGRTR_EL2_TRBSR_EL1_MASK) +#define HDFGRTR_EL2_TRBSR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRBSR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBSR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_TRBSR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBPTR_EL1_SHIFT 54 +#define HDFGRTR_EL2_TRBPTR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_TRBPTR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBPTR_EL1_VAL(x) ((x) & HDFGRTR_EL2_TRBPTR_EL1_MASK) +#define HDFGRTR_EL2_TRBPTR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRBPTR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBPTR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_TRBPTR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBMAR_EL1_SHIFT 53 +#define HDFGRTR_EL2_TRBMAR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_TRBMAR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBMAR_EL1_VAL(x) ((x) & HDFGRTR_EL2_TRBMAR_EL1_MASK) +#define HDFGRTR_EL2_TRBMAR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRBMAR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBMAR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_TRBMAR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBLIMITR_EL1_SHIFT 52 +#define HDFGRTR_EL2_TRBLIMITR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_TRBLIMITR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBLIMITR_EL1_VAL(x) ((x) & HDFGRTR_EL2_TRBLIMITR_EL1_MASK) +#define HDFGRTR_EL2_TRBLIMITR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRBLIMITR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBLIMITR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_TRBLIMITR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBIDR_EL1_SHIFT 51 +#define HDFGRTR_EL2_TRBIDR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_TRBIDR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBIDR_EL1_VAL(x) ((x) & HDFGRTR_EL2_TRBIDR_EL1_MASK) +#define HDFGRTR_EL2_TRBIDR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRBIDR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBIDR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_TRBIDR_EL1_SHIFT) +#define HDFGRTR_EL2_TRBBASER_EL1_SHIFT 50 +#define HDFGRTR_EL2_TRBBASER_EL1_MASK (UL(0x1) << HDFGRTR_EL2_TRBBASER_EL1_SHIFT) +#define HDFGRTR_EL2_TRBBASER_EL1_VAL(x) ((x) & HDFGRTR_EL2_TRBBASER_EL1_MASK) +#define HDFGRTR_EL2_TRBBASER_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRBBASER_EL1_SHIFT) +#define HDFGRTR_EL2_TRBBASER_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_TRBBASER_EL1_SHIFT) +#define HDFGRTR_EL2_TRCVICTLR_SHIFT 48 +#define HDFGRTR_EL2_TRCVICTLR_MASK (UL(0x1) << HDFGRTR_EL2_TRCVICTLR_SHIFT) +#define HDFGRTR_EL2_TRCVICTLR_VAL(x) ((x) & HDFGRTR_EL2_TRCVICTLR_MASK) +#define HDFGRTR_EL2_TRCVICTLR_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCVICTLR_SHIFT) +#define HDFGRTR_EL2_TRCVICTLR_TRAP (UL(0x1) << HDFGRTR_EL2_TRCVICTLR_SHIFT) +#define HDFGRTR_EL2_TRCSTATR_SHIFT 47 +#define HDFGRTR_EL2_TRCSTATR_MASK (UL(0x1) << HDFGRTR_EL2_TRCSTATR_SHIFT) +#define HDFGRTR_EL2_TRCSTATR_VAL(x) ((x) & HDFGRTR_EL2_TRCSTATR_MASK) +#define HDFGRTR_EL2_TRCSTATR_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCSTATR_SHIFT) +#define HDFGRTR_EL2_TRCSTATR_TRAP (UL(0x1) << HDFGRTR_EL2_TRCSTATR_SHIFT) +#define HDFGRTR_EL2_TRCSSCSRn_SHIFT 46 +#define HDFGRTR_EL2_TRCSSCSRn_MASK (UL(0x1) << HDFGRTR_EL2_TRCSSCSRn_SHIFT) +#define HDFGRTR_EL2_TRCSSCSRn_VAL(x) ((x) & HDFGRTR_EL2_TRCSSCSRn_MASK) +#define HDFGRTR_EL2_TRCSSCSRn_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCSSCSRn_SHIFT) +#define HDFGRTR_EL2_TRCSSCSRn_TRAP (UL(0x1) << HDFGRTR_EL2_TRCSSCSRn_SHIFT) +#define HDFGRTR_EL2_TRCSEQSTR_SHIFT 45 +#define HDFGRTR_EL2_TRCSEQSTR_MASK (UL(0x1) << HDFGRTR_EL2_TRCSEQSTR_SHIFT) +#define HDFGRTR_EL2_TRCSEQSTR_VAL(x) ((x) & HDFGRTR_EL2_TRCSEQSTR_MASK) +#define HDFGRTR_EL2_TRCSEQSTR_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCSEQSTR_SHIFT) +#define HDFGRTR_EL2_TRCSEQSTR_TRAP (UL(0x1) << HDFGRTR_EL2_TRCSEQSTR_SHIFT) +#define HDFGRTR_EL2_TRCPRGCTLR_SHIFT 44 +#define HDFGRTR_EL2_TRCPRGCTLR_MASK (UL(0x1) << HDFGRTR_EL2_TRCPRGCTLR_SHIFT) +#define HDFGRTR_EL2_TRCPRGCTLR_VAL(x) ((x) & HDFGRTR_EL2_TRCPRGCTLR_MASK) +#define HDFGRTR_EL2_TRCPRGCTLR_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCPRGCTLR_SHIFT) +#define HDFGRTR_EL2_TRCPRGCTLR_TRAP (UL(0x1) << HDFGRTR_EL2_TRCPRGCTLR_SHIFT) +#define HDFGRTR_EL2_TRCOSLSR_SHIFT 43 +#define HDFGRTR_EL2_TRCOSLSR_MASK (UL(0x1) << HDFGRTR_EL2_TRCOSLSR_SHIFT) +#define HDFGRTR_EL2_TRCOSLSR_VAL(x) ((x) & HDFGRTR_EL2_TRCOSLSR_MASK) +#define HDFGRTR_EL2_TRCOSLSR_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCOSLSR_SHIFT) +#define HDFGRTR_EL2_TRCOSLSR_TRAP (UL(0x1) << HDFGRTR_EL2_TRCOSLSR_SHIFT) +#define HDFGRTR_EL2_TRCIMSPECn_SHIFT 41 +#define HDFGRTR_EL2_TRCIMSPECn_MASK (UL(0x1) << HDFGRTR_EL2_TRCIMSPECn_SHIFT) +#define HDFGRTR_EL2_TRCIMSPECn_VAL(x) ((x) & HDFGRTR_EL2_TRCIMSPECn_MASK) +#define HDFGRTR_EL2_TRCIMSPECn_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCIMSPECn_SHIFT) +#define HDFGRTR_EL2_TRCIMSPECn_TRAP (UL(0x1) << HDFGRTR_EL2_TRCIMSPECn_SHIFT) +#define HDFGRTR_EL2_TRCID_SHIFT 40 +#define HDFGRTR_EL2_TRCID_MASK (UL(0x1) << HDFGRTR_EL2_TRCID_SHIFT) +#define HDFGRTR_EL2_TRCID_VAL(x) ((x) & HDFGRTR_EL2_TRCID_MASK) +#define HDFGRTR_EL2_TRCID_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCID_SHIFT) +#define HDFGRTR_EL2_TRCID_TRAP (UL(0x1) << HDFGRTR_EL2_TRCID_SHIFT) +#define HDFGRTR_EL2_TRCCNTVRn_SHIFT 37 +#define HDFGRTR_EL2_TRCCNTVRn_MASK (UL(0x1) << HDFGRTR_EL2_TRCCNTVRn_SHIFT) +#define HDFGRTR_EL2_TRCCNTVRn_VAL(x) ((x) & HDFGRTR_EL2_TRCCNTVRn_MASK) +#define HDFGRTR_EL2_TRCCNTVRn_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCCNTVRn_SHIFT) +#define HDFGRTR_EL2_TRCCNTVRn_TRAP (UL(0x1) << HDFGRTR_EL2_TRCCNTVRn_SHIFT) +#define HDFGRTR_EL2_TRCCLAIM_SHIFT 36 +#define HDFGRTR_EL2_TRCCLAIM_MASK (UL(0x1) << HDFGRTR_EL2_TRCCLAIM_SHIFT) +#define HDFGRTR_EL2_TRCCLAIM_VAL(x) ((x) & HDFGRTR_EL2_TRCCLAIM_MASK) +#define HDFGRTR_EL2_TRCCLAIM_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCCLAIM_SHIFT) +#define HDFGRTR_EL2_TRCCLAIM_TRAP (UL(0x1) << HDFGRTR_EL2_TRCCLAIM_SHIFT) +#define HDFGRTR_EL2_TRCAUXCTLR_SHIFT 35 +#define HDFGRTR_EL2_TRCAUXCTLR_MASK (UL(0x1) << HDFGRTR_EL2_TRCAUXCTLR_SHIFT) +#define HDFGRTR_EL2_TRCAUXCTLR_VAL(x) ((x) & HDFGRTR_EL2_TRCAUXCTLR_MASK) +#define HDFGRTR_EL2_TRCAUXCTLR_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCAUXCTLR_SHIFT) +#define HDFGRTR_EL2_TRCAUXCTLR_TRAP (UL(0x1) << HDFGRTR_EL2_TRCAUXCTLR_SHIFT) +#define HDFGRTR_EL2_TRCAUTHSTATUS_SHIFT 34 +#define HDFGRTR_EL2_TRCAUTHSTATUS_MASK (UL(0x1) << HDFGRTR_EL2_TRCAUTHSTATUS_SHIFT) +#define HDFGRTR_EL2_TRCAUTHSTATUS_VAL(x) ((x) & HDFGRTR_EL2_TRCAUTHSTATUS_MASK) +#define HDFGRTR_EL2_TRCAUTHSTATUS_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRCAUTHSTATUS_SHIFT) +#define HDFGRTR_EL2_TRCAUTHSTATUS_TRAP (UL(0x1) << HDFGRTR_EL2_TRCAUTHSTATUS_SHIFT) +#define HDFGRTR_EL2_TRC_SHIFT 33 +#define HDFGRTR_EL2_TRC_MASK (UL(0x1) << HDFGRTR_EL2_TRC_SHIFT) +#define HDFGRTR_EL2_TRC_VAL(x) ((x) & HDFGRTR_EL2_TRC_MASK) +#define HDFGRTR_EL2_TRC_NOTRAP (UL(0x0) << HDFGRTR_EL2_TRC_SHIFT) +#define HDFGRTR_EL2_TRC_TRAP (UL(0x1) << HDFGRTR_EL2_TRC_SHIFT) +#define HDFGRTR_EL2_PMSLATFR_EL1_SHIFT 32 +#define HDFGRTR_EL2_PMSLATFR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMSLATFR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSLATFR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMSLATFR_EL1_MASK) +#define HDFGRTR_EL2_PMSLATFR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMSLATFR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSLATFR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMSLATFR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSIRR_EL1_SHIFT 31 +#define HDFGRTR_EL2_PMSIRR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMSIRR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSIRR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMSIRR_EL1_MASK) +#define HDFGRTR_EL2_PMSIRR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMSIRR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSIRR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMSIRR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSIDR_EL1_SHIFT 30 +#define HDFGRTR_EL2_PMSIDR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMSIDR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSIDR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMSIDR_EL1_MASK) +#define HDFGRTR_EL2_PMSIDR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMSIDR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSIDR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMSIDR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSICR_EL1_SHIFT 29 +#define HDFGRTR_EL2_PMSICR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMSICR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSICR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMSICR_EL1_MASK) +#define HDFGRTR_EL2_PMSICR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMSICR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSICR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMSICR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSFCR_EL1_SHIFT 28 +#define HDFGRTR_EL2_PMSFCR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMSFCR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSFCR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMSFCR_EL1_MASK) +#define HDFGRTR_EL2_PMSFCR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMSFCR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSFCR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMSFCR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSEVFR_EL1_SHIFT 27 +#define HDFGRTR_EL2_PMSEVFR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMSEVFR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSEVFR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMSEVFR_EL1_MASK) +#define HDFGRTR_EL2_PMSEVFR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMSEVFR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSEVFR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMSEVFR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSCR_EL1_SHIFT 26 +#define HDFGRTR_EL2_PMSCR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMSCR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSCR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMSCR_EL1_MASK) +#define HDFGRTR_EL2_PMSCR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMSCR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSCR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMSCR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBSR_EL1_SHIFT 25 +#define HDFGRTR_EL2_PMBSR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMBSR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBSR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMBSR_EL1_MASK) +#define HDFGRTR_EL2_PMBSR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMBSR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBSR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMBSR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBPTR_EL1_SHIFT 24 +#define HDFGRTR_EL2_PMBPTR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMBPTR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBPTR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMBPTR_EL1_MASK) +#define HDFGRTR_EL2_PMBPTR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMBPTR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBPTR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMBPTR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBLIMITR_EL1_SHIFT 23 +#define HDFGRTR_EL2_PMBLIMITR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMBLIMITR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBLIMITR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMBLIMITR_EL1_MASK) +#define HDFGRTR_EL2_PMBLIMITR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMBLIMITR_EL1_SHIFT) +#define HDFGRTR_EL2_PMBLIMITR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMBLIMITR_EL1_SHIFT) +#define HDFGRTR_EL2_PMMIR_EL1_SHIFT 22 +#define HDFGRTR_EL2_PMMIR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_PMMIR_EL1_SHIFT) +#define HDFGRTR_EL2_PMMIR_EL1_VAL(x) ((x) & HDFGRTR_EL2_PMMIR_EL1_MASK) +#define HDFGRTR_EL2_PMMIR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMMIR_EL1_SHIFT) +#define HDFGRTR_EL2_PMMIR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_PMMIR_EL1_SHIFT) +#define HDFGRTR_EL2_PMSELR_EL0_SHIFT 19 +#define HDFGRTR_EL2_PMSELR_EL0_MASK (UL(0x1) << HDFGRTR_EL2_PMSELR_EL0_SHIFT) +#define HDFGRTR_EL2_PMSELR_EL0_VAL(x) ((x) & HDFGRTR_EL2_PMSELR_EL0_MASK) +#define HDFGRTR_EL2_PMSELR_EL0_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMSELR_EL0_SHIFT) +#define HDFGRTR_EL2_PMSELR_EL0_TRAP (UL(0x1) << HDFGRTR_EL2_PMSELR_EL0_SHIFT) +#define HDFGRTR_EL2_PMOVS_SHIFT 18 +#define HDFGRTR_EL2_PMOVS_MASK (UL(0x1) << HDFGRTR_EL2_PMOVS_SHIFT) +#define HDFGRTR_EL2_PMOVS_VAL(x) ((x) & HDFGRTR_EL2_PMOVS_MASK) +#define HDFGRTR_EL2_PMOVS_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMOVS_SHIFT) +#define HDFGRTR_EL2_PMOVS_TRAP (UL(0x1) << HDFGRTR_EL2_PMOVS_SHIFT) +#define HDFGRTR_EL2_PMINTEN_SHIFT 17 +#define HDFGRTR_EL2_PMINTEN_MASK (UL(0x1) << HDFGRTR_EL2_PMINTEN_SHIFT) +#define HDFGRTR_EL2_PMINTEN_VAL(x) ((x) & HDFGRTR_EL2_PMINTEN_MASK) +#define HDFGRTR_EL2_PMINTEN_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMINTEN_SHIFT) +#define HDFGRTR_EL2_PMINTEN_TRAP (UL(0x1) << HDFGRTR_EL2_PMINTEN_SHIFT) +#define HDFGRTR_EL2_PMCNTEN_SHIFT 16 +#define HDFGRTR_EL2_PMCNTEN_MASK (UL(0x1) << HDFGRTR_EL2_PMCNTEN_SHIFT) +#define HDFGRTR_EL2_PMCNTEN_VAL(x) ((x) & HDFGRTR_EL2_PMCNTEN_MASK) +#define HDFGRTR_EL2_PMCNTEN_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMCNTEN_SHIFT) +#define HDFGRTR_EL2_PMCNTEN_TRAP (UL(0x1) << HDFGRTR_EL2_PMCNTEN_SHIFT) +#define HDFGRTR_EL2_PMCCNTR_EL0_SHIFT 15 +#define HDFGRTR_EL2_PMCCNTR_EL0_MASK (UL(0x1) << HDFGRTR_EL2_PMCCNTR_EL0_SHIFT) +#define HDFGRTR_EL2_PMCCNTR_EL0_VAL(x) ((x) & HDFGRTR_EL2_PMCCNTR_EL0_MASK) +#define HDFGRTR_EL2_PMCCNTR_EL0_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMCCNTR_EL0_SHIFT) +#define HDFGRTR_EL2_PMCCNTR_EL0_TRAP (UL(0x1) << HDFGRTR_EL2_PMCCNTR_EL0_SHIFT) +#define HDFGRTR_EL2_PMCCFILTR_EL0_SHIFT 14 +#define HDFGRTR_EL2_PMCCFILTR_EL0_MASK (UL(0x1) << HDFGRTR_EL2_PMCCFILTR_EL0_SHIFT) +#define HDFGRTR_EL2_PMCCFILTR_EL0_VAL(x) ((x) & HDFGRTR_EL2_PMCCFILTR_EL0_MASK) +#define HDFGRTR_EL2_PMCCFILTR_EL0_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMCCFILTR_EL0_SHIFT) +#define HDFGRTR_EL2_PMCCFILTR_EL0_TRAP (UL(0x1) << HDFGRTR_EL2_PMCCFILTR_EL0_SHIFT) +#define HDFGRTR_EL2_PMEVTYPERn_EL0_SHIFT 13 +#define HDFGRTR_EL2_PMEVTYPERn_EL0_MASK (UL(0x1) << HDFGRTR_EL2_PMEVTYPERn_EL0_SHIFT) +#define HDFGRTR_EL2_PMEVTYPERn_EL0_VAL(x) ((x) & HDFGRTR_EL2_PMEVTYPERn_EL0_MASK) +#define HDFGRTR_EL2_PMEVTYPERn_EL0_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMEVTYPERn_EL0_SHIFT) +#define HDFGRTR_EL2_PMEVTYPERn_EL0_TRAP (UL(0x1) << HDFGRTR_EL2_PMEVTYPERn_EL0_SHIFT) +#define HDFGRTR_EL2_PMEVCNTRn_EL0_SHIFT 12 +#define HDFGRTR_EL2_PMEVCNTRn_EL0_MASK (UL(0x1) << HDFGRTR_EL2_PMEVCNTRn_EL0_SHIFT) +#define HDFGRTR_EL2_PMEVCNTRn_EL0_VAL(x) ((x) & HDFGRTR_EL2_PMEVCNTRn_EL0_MASK) +#define HDFGRTR_EL2_PMEVCNTRn_EL0_NOTRAP (UL(0x0) << HDFGRTR_EL2_PMEVCNTRn_EL0_SHIFT) +#define HDFGRTR_EL2_PMEVCNTRn_EL0_TRAP (UL(0x1) << HDFGRTR_EL2_PMEVCNTRn_EL0_SHIFT) +#define HDFGRTR_EL2_OSDLR_EL1_SHIFT 11 +#define HDFGRTR_EL2_OSDLR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_OSDLR_EL1_SHIFT) +#define HDFGRTR_EL2_OSDLR_EL1_VAL(x) ((x) & HDFGRTR_EL2_OSDLR_EL1_MASK) +#define HDFGRTR_EL2_OSDLR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_OSDLR_EL1_SHIFT) +#define HDFGRTR_EL2_OSDLR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_OSDLR_EL1_SHIFT) +#define HDFGRTR_EL2_OSECCR_EL1_SHIFT 10 +#define HDFGRTR_EL2_OSECCR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_OSECCR_EL1_SHIFT) +#define HDFGRTR_EL2_OSECCR_EL1_VAL(x) ((x) & HDFGRTR_EL2_OSECCR_EL1_MASK) +#define HDFGRTR_EL2_OSECCR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_OSECCR_EL1_SHIFT) +#define HDFGRTR_EL2_OSECCR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_OSECCR_EL1_SHIFT) +#define HDFGRTR_EL2_OSLSR_EL1_SHIFT 9 +#define HDFGRTR_EL2_OSLSR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_OSLSR_EL1_SHIFT) +#define HDFGRTR_EL2_OSLSR_EL1_VAL(x) ((x) & HDFGRTR_EL2_OSLSR_EL1_MASK) +#define HDFGRTR_EL2_OSLSR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_OSLSR_EL1_SHIFT) +#define HDFGRTR_EL2_OSLSR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_OSLSR_EL1_SHIFT) +#define HDFGRTR_EL2_DBGPRCR_EL1_SHIFT 7 +#define HDFGRTR_EL2_DBGPRCR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_DBGPRCR_EL1_SHIFT) +#define HDFGRTR_EL2_DBGPRCR_EL1_VAL(x) ((x) & HDFGRTR_EL2_DBGPRCR_EL1_MASK) +#define HDFGRTR_EL2_DBGPRCR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_DBGPRCR_EL1_SHIFT) +#define HDFGRTR_EL2_DBGPRCR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_DBGPRCR_EL1_SHIFT) +#define HDFGRTR_EL2_DBGAUTHSTATUS_EL1_SHIFT 6 +#define HDFGRTR_EL2_DBGAUTHSTATUS_EL1_MASK (UL(0x1) << HDFGRTR_EL2_DBGAUTHSTATUS_EL1_SHIFT) +#define HDFGRTR_EL2_DBGAUTHSTATUS_EL1_VAL(x) ((x) & HDFGRTR_EL2_DBGAUTHSTATUS_EL1_MASK) +#define HDFGRTR_EL2_DBGAUTHSTATUS_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_DBGAUTHSTATUS_EL1_SHIFT) +#define HDFGRTR_EL2_DBGAUTHSTATUS_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_DBGAUTHSTATUS_EL1_SHIFT) +#define HDFGRTR_EL2_DBGCLAIM_SHIFT 5 +#define HDFGRTR_EL2_DBGCLAIM_MASK (UL(0x1) << HDFGRTR_EL2_DBGCLAIM_SHIFT) +#define HDFGRTR_EL2_DBGCLAIM_VAL(x) ((x) & HDFGRTR_EL2_DBGCLAIM_MASK) +#define HDFGRTR_EL2_DBGCLAIM_NOTRAP (UL(0x0) << HDFGRTR_EL2_DBGCLAIM_SHIFT) +#define HDFGRTR_EL2_DBGCLAIM_TRAP (UL(0x1) << HDFGRTR_EL2_DBGCLAIM_SHIFT) +#define HDFGRTR_EL2_MDSCR_EL1_SHIFT 4 +#define HDFGRTR_EL2_MDSCR_EL1_MASK (UL(0x1) << HDFGRTR_EL2_MDSCR_EL1_SHIFT) +#define HDFGRTR_EL2_MDSCR_EL1_VAL(x) ((x) & HDFGRTR_EL2_MDSCR_EL1_MASK) +#define HDFGRTR_EL2_MDSCR_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_MDSCR_EL1_SHIFT) +#define HDFGRTR_EL2_MDSCR_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_MDSCR_EL1_SHIFT) +#define HDFGRTR_EL2_DBGWVRn_EL1_SHIFT 3 +#define HDFGRTR_EL2_DBGWVRn_EL1_MASK (UL(0x1) << HDFGRTR_EL2_DBGWVRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGWVRn_EL1_VAL(x) ((x) & HDFGRTR_EL2_DBGWVRn_EL1_MASK) +#define HDFGRTR_EL2_DBGWVRn_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_DBGWVRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGWVRn_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_DBGWVRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGWCRn_EL1_SHIFT 2 +#define HDFGRTR_EL2_DBGWCRn_EL1_MASK (UL(0x1) << HDFGRTR_EL2_DBGWCRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGWCRn_EL1_VAL(x) ((x) & HDFGRTR_EL2_DBGWCRn_EL1_MASK) +#define HDFGRTR_EL2_DBGWCRn_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_DBGWCRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGWCRn_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_DBGWCRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGBVRn_EL1_SHIFT 1 +#define HDFGRTR_EL2_DBGBVRn_EL1_MASK (UL(0x1) << HDFGRTR_EL2_DBGBVRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGBVRn_EL1_VAL(x) ((x) & HDFGRTR_EL2_DBGBVRn_EL1_MASK) +#define HDFGRTR_EL2_DBGBVRn_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_DBGBVRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGBVRn_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_DBGBVRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGBCRn_EL1_SHIFT 0 +#define HDFGRTR_EL2_DBGBCRn_EL1_MASK (UL(0x1) << HDFGRTR_EL2_DBGBCRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGBCRn_EL1_VAL(x) ((x) & HDFGRTR_EL2_DBGBCRn_EL1_MASK) +#define HDFGRTR_EL2_DBGBCRn_EL1_NOTRAP (UL(0x0) << HDFGRTR_EL2_DBGBCRn_EL1_SHIFT) +#define HDFGRTR_EL2_DBGBCRn_EL1_TRAP (UL(0x1) << HDFGRTR_EL2_DBGBCRn_EL1_SHIFT) + +/* HDFGWTR2_EL2 */ +#define HDFGWTR2_EL2_REG MRS_REG_ALT_NAME(HDFGWTR2_EL2) +#define HDFGWTR2_EL2_op0 3 +#define HDFGWTR2_EL2_op1 4 +#define HDFGWTR2_EL2_CRn 3 +#define HDFGWTR2_EL2_CRm 1 +#define HDFGWTR2_EL2_op2 1 +#define HDFGWTR2_EL2_nMDSTEPOP_EL1_SHIFT 23 +#define HDFGWTR2_EL2_nMDSTEPOP_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nMDSTEPOP_EL1_SHIFT) +#define HDFGWTR2_EL2_nMDSTEPOP_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nMDSTEPOP_EL1_MASK) +#define HDFGWTR2_EL2_nMDSTEPOP_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nMDSTEPOP_EL1_SHIFT) +#define HDFGWTR2_EL2_nMDSTEPOP_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nMDSTEPOP_EL1_SHIFT) +#define HDFGWTR2_EL2_nTRBMPAM_EL1_SHIFT 22 +#define HDFGWTR2_EL2_nTRBMPAM_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nTRBMPAM_EL1_SHIFT) +#define HDFGWTR2_EL2_nTRBMPAM_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nTRBMPAM_EL1_MASK) +#define HDFGWTR2_EL2_nTRBMPAM_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nTRBMPAM_EL1_SHIFT) +#define HDFGWTR2_EL2_nTRBMPAM_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nTRBMPAM_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMZR_EL0_SHIFT 21 +#define HDFGWTR2_EL2_nPMZR_EL0_MASK (UL(0x1) << HDFGWTR2_EL2_nPMZR_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMZR_EL0_VAL(x) ((x) & HDFGWTR2_EL2_nPMZR_EL0_MASK) +#define HDFGWTR2_EL2_nPMZR_EL0_TRAP (UL(0x0) << HDFGWTR2_EL2_nPMZR_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMZR_EL0_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nPMZR_EL0_SHIFT) +#define HDFGWTR2_EL2_nTRCITECR_EL1_SHIFT 20 +#define HDFGWTR2_EL2_nTRCITECR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nTRCITECR_EL1_SHIFT) +#define HDFGWTR2_EL2_nTRCITECR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nTRCITECR_EL1_MASK) +#define HDFGWTR2_EL2_nTRCITECR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nTRCITECR_EL1_SHIFT) +#define HDFGWTR2_EL2_nTRCITECR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nTRCITECR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMSDSFR_EL1_SHIFT 19 +#define HDFGWTR2_EL2_nPMSDSFR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nPMSDSFR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMSDSFR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nPMSDSFR_EL1_MASK) +#define HDFGWTR2_EL2_nPMSDSFR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nPMSDSFR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMSDSFR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nPMSDSFR_EL1_SHIFT) +#define HDFGWTR2_EL2_nSPMSCR_EL1_SHIFT 16 +#define HDFGWTR2_EL2_nSPMSCR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMSCR_EL1_SHIFT) +#define HDFGWTR2_EL2_nSPMSCR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nSPMSCR_EL1_MASK) +#define HDFGWTR2_EL2_nSPMSCR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMSCR_EL1_SHIFT) +#define HDFGWTR2_EL2_nSPMSCR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMSCR_EL1_SHIFT) +#define HDFGWTR2_EL2_nSPMACCESSR_EL1_SHIFT 15 +#define HDFGWTR2_EL2_nSPMACCESSR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMACCESSR_EL1_SHIFT) +#define HDFGWTR2_EL2_nSPMACCESSR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nSPMACCESSR_EL1_MASK) +#define HDFGWTR2_EL2_nSPMACCESSR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMACCESSR_EL1_SHIFT) +#define HDFGWTR2_EL2_nSPMACCESSR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMACCESSR_EL1_SHIFT) +#define HDFGWTR2_EL2_nSPMCR_EL0_SHIFT 14 +#define HDFGWTR2_EL2_nSPMCR_EL0_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMCR_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMCR_EL0_VAL(x) ((x) & HDFGWTR2_EL2_nSPMCR_EL0_MASK) +#define HDFGWTR2_EL2_nSPMCR_EL0_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMCR_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMCR_EL0_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMCR_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMOVS_SHIFT 13 +#define HDFGWTR2_EL2_nSPMOVS_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMOVS_SHIFT) +#define HDFGWTR2_EL2_nSPMOVS_VAL(x) ((x) & HDFGWTR2_EL2_nSPMOVS_MASK) +#define HDFGWTR2_EL2_nSPMOVS_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMOVS_SHIFT) +#define HDFGWTR2_EL2_nSPMOVS_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMOVS_SHIFT) +#define HDFGWTR2_EL2_nSPMINTEN_SHIFT 12 +#define HDFGWTR2_EL2_nSPMINTEN_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMINTEN_SHIFT) +#define HDFGWTR2_EL2_nSPMINTEN_VAL(x) ((x) & HDFGWTR2_EL2_nSPMINTEN_MASK) +#define HDFGWTR2_EL2_nSPMINTEN_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMINTEN_SHIFT) +#define HDFGWTR2_EL2_nSPMINTEN_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMINTEN_SHIFT) +#define HDFGWTR2_EL2_nSPMCNTEN_SHIFT 11 +#define HDFGWTR2_EL2_nSPMCNTEN_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMCNTEN_SHIFT) +#define HDFGWTR2_EL2_nSPMCNTEN_VAL(x) ((x) & HDFGWTR2_EL2_nSPMCNTEN_MASK) +#define HDFGWTR2_EL2_nSPMCNTEN_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMCNTEN_SHIFT) +#define HDFGWTR2_EL2_nSPMCNTEN_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMCNTEN_SHIFT) +#define HDFGWTR2_EL2_nSPMSELR_EL0_SHIFT 10 +#define HDFGWTR2_EL2_nSPMSELR_EL0_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMSELR_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMSELR_EL0_VAL(x) ((x) & HDFGWTR2_EL2_nSPMSELR_EL0_MASK) +#define HDFGWTR2_EL2_nSPMSELR_EL0_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMSELR_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMSELR_EL0_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMSELR_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMEVTYPERn_EL0_SHIFT 9 +#define HDFGWTR2_EL2_nSPMEVTYPERn_EL0_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMEVTYPERn_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMEVTYPERn_EL0_VAL(x) ((x) & HDFGWTR2_EL2_nSPMEVTYPERn_EL0_MASK) +#define HDFGWTR2_EL2_nSPMEVTYPERn_EL0_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMEVTYPERn_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMEVTYPERn_EL0_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMEVTYPERn_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMEVCNTRn_EL0_SHIFT 8 +#define HDFGWTR2_EL2_nSPMEVCNTRn_EL0_MASK (UL(0x1) << HDFGWTR2_EL2_nSPMEVCNTRn_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMEVCNTRn_EL0_VAL(x) ((x) & HDFGWTR2_EL2_nSPMEVCNTRn_EL0_MASK) +#define HDFGWTR2_EL2_nSPMEVCNTRn_EL0_TRAP (UL(0x0) << HDFGWTR2_EL2_nSPMEVCNTRn_EL0_SHIFT) +#define HDFGWTR2_EL2_nSPMEVCNTRn_EL0_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nSPMEVCNTRn_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMSSCR_EL1_SHIFT 7 +#define HDFGWTR2_EL2_nPMSSCR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nPMSSCR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMSSCR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nPMSSCR_EL1_MASK) +#define HDFGWTR2_EL2_nPMSSCR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nPMSSCR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMSSCR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nPMSSCR_EL1_SHIFT) +#define HDFGWTR2_EL2_nMDSELR_EL1_SHIFT 5 +#define HDFGWTR2_EL2_nMDSELR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nMDSELR_EL1_SHIFT) +#define HDFGWTR2_EL2_nMDSELR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nMDSELR_EL1_MASK) +#define HDFGWTR2_EL2_nMDSELR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nMDSELR_EL1_SHIFT) +#define HDFGWTR2_EL2_nMDSELR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nMDSELR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMUACR_EL1_SHIFT 4 +#define HDFGWTR2_EL2_nPMUACR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nPMUACR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMUACR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nPMUACR_EL1_MASK) +#define HDFGWTR2_EL2_nPMUACR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nPMUACR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMUACR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nPMUACR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMICFILTR_EL0_SHIFT 3 +#define HDFGWTR2_EL2_nPMICFILTR_EL0_MASK (UL(0x1) << HDFGWTR2_EL2_nPMICFILTR_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMICFILTR_EL0_VAL(x) ((x) & HDFGWTR2_EL2_nPMICFILTR_EL0_MASK) +#define HDFGWTR2_EL2_nPMICFILTR_EL0_TRAP (UL(0x0) << HDFGWTR2_EL2_nPMICFILTR_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMICFILTR_EL0_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nPMICFILTR_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMICNTR_EL0_SHIFT 2 +#define HDFGWTR2_EL2_nPMICNTR_EL0_MASK (UL(0x1) << HDFGWTR2_EL2_nPMICNTR_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMICNTR_EL0_VAL(x) ((x) & HDFGWTR2_EL2_nPMICNTR_EL0_MASK) +#define HDFGWTR2_EL2_nPMICNTR_EL0_TRAP (UL(0x0) << HDFGWTR2_EL2_nPMICNTR_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMICNTR_EL0_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nPMICNTR_EL0_SHIFT) +#define HDFGWTR2_EL2_nPMIAR_EL1_SHIFT 1 +#define HDFGWTR2_EL2_nPMIAR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nPMIAR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMIAR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nPMIAR_EL1_MASK) +#define HDFGWTR2_EL2_nPMIAR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nPMIAR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMIAR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nPMIAR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMECR_EL1_SHIFT 0 +#define HDFGWTR2_EL2_nPMECR_EL1_MASK (UL(0x1) << HDFGWTR2_EL2_nPMECR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMECR_EL1_VAL(x) ((x) & HDFGWTR2_EL2_nPMECR_EL1_MASK) +#define HDFGWTR2_EL2_nPMECR_EL1_TRAP (UL(0x0) << HDFGWTR2_EL2_nPMECR_EL1_SHIFT) +#define HDFGWTR2_EL2_nPMECR_EL1_NOTRAP (UL(0x1) << HDFGWTR2_EL2_nPMECR_EL1_SHIFT) + +/* HDFGWTR_EL2 */ +#define HDFGWTR_EL2_REG MRS_REG_ALT_NAME(HDFGWTR_EL2) +#define HDFGWTR_EL2_op0 3 +#define HDFGWTR_EL2_op1 4 +#define HDFGWTR_EL2_CRn 3 +#define HDFGWTR_EL2_CRm 1 +#define HDFGWTR_EL2_op2 5 +#define HDFGWTR_EL2_nPMSNEVFR_EL1_SHIFT 62 +#define HDFGWTR_EL2_nPMSNEVFR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_nPMSNEVFR_EL1_SHIFT) +#define HDFGWTR_EL2_nPMSNEVFR_EL1_VAL(x) ((x) & HDFGWTR_EL2_nPMSNEVFR_EL1_MASK) +#define HDFGWTR_EL2_nPMSNEVFR_EL1_TRAP (UL(0x0) << HDFGWTR_EL2_nPMSNEVFR_EL1_SHIFT) +#define HDFGWTR_EL2_nPMSNEVFR_EL1_NOTRAP (UL(0x1) << HDFGWTR_EL2_nPMSNEVFR_EL1_SHIFT) +#define HDFGWTR_EL2_nBRBDATA_SHIFT 61 +#define HDFGWTR_EL2_nBRBDATA_MASK (UL(0x1) << HDFGWTR_EL2_nBRBDATA_SHIFT) +#define HDFGWTR_EL2_nBRBDATA_VAL(x) ((x) & HDFGWTR_EL2_nBRBDATA_MASK) +#define HDFGWTR_EL2_nBRBDATA_TRAP (UL(0x0) << HDFGWTR_EL2_nBRBDATA_SHIFT) +#define HDFGWTR_EL2_nBRBDATA_NOTRAP (UL(0x1) << HDFGWTR_EL2_nBRBDATA_SHIFT) +#define HDFGWTR_EL2_nBRBCTL_SHIFT 60 +#define HDFGWTR_EL2_nBRBCTL_MASK (UL(0x1) << HDFGWTR_EL2_nBRBCTL_SHIFT) +#define HDFGWTR_EL2_nBRBCTL_VAL(x) ((x) & HDFGWTR_EL2_nBRBCTL_MASK) +#define HDFGWTR_EL2_nBRBCTL_TRAP (UL(0x0) << HDFGWTR_EL2_nBRBCTL_SHIFT) +#define HDFGWTR_EL2_nBRBCTL_NOTRAP (UL(0x1) << HDFGWTR_EL2_nBRBCTL_SHIFT) +#define HDFGWTR_EL2_PMUSERENR_EL0_SHIFT 57 +#define HDFGWTR_EL2_PMUSERENR_EL0_MASK (UL(0x1) << HDFGWTR_EL2_PMUSERENR_EL0_SHIFT) +#define HDFGWTR_EL2_PMUSERENR_EL0_VAL(x) ((x) & HDFGWTR_EL2_PMUSERENR_EL0_MASK) +#define HDFGWTR_EL2_PMUSERENR_EL0_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMUSERENR_EL0_SHIFT) +#define HDFGWTR_EL2_PMUSERENR_EL0_TRAP (UL(0x1) << HDFGWTR_EL2_PMUSERENR_EL0_SHIFT) +#define HDFGWTR_EL2_TRBTRG_EL1_SHIFT 56 +#define HDFGWTR_EL2_TRBTRG_EL1_MASK (UL(0x1) << HDFGWTR_EL2_TRBTRG_EL1_SHIFT) +#define HDFGWTR_EL2_TRBTRG_EL1_VAL(x) ((x) & HDFGWTR_EL2_TRBTRG_EL1_MASK) +#define HDFGWTR_EL2_TRBTRG_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRBTRG_EL1_SHIFT) +#define HDFGWTR_EL2_TRBTRG_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_TRBTRG_EL1_SHIFT) +#define HDFGWTR_EL2_TRBSR_EL1_SHIFT 55 +#define HDFGWTR_EL2_TRBSR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_TRBSR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBSR_EL1_VAL(x) ((x) & HDFGWTR_EL2_TRBSR_EL1_MASK) +#define HDFGWTR_EL2_TRBSR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRBSR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBSR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_TRBSR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBPTR_EL1_SHIFT 54 +#define HDFGWTR_EL2_TRBPTR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_TRBPTR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBPTR_EL1_VAL(x) ((x) & HDFGWTR_EL2_TRBPTR_EL1_MASK) +#define HDFGWTR_EL2_TRBPTR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRBPTR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBPTR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_TRBPTR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBMAR_EL1_SHIFT 53 +#define HDFGWTR_EL2_TRBMAR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_TRBMAR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBMAR_EL1_VAL(x) ((x) & HDFGWTR_EL2_TRBMAR_EL1_MASK) +#define HDFGWTR_EL2_TRBMAR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRBMAR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBMAR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_TRBMAR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBLIMITR_EL1_SHIFT 52 +#define HDFGWTR_EL2_TRBLIMITR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_TRBLIMITR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBLIMITR_EL1_VAL(x) ((x) & HDFGWTR_EL2_TRBLIMITR_EL1_MASK) +#define HDFGWTR_EL2_TRBLIMITR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRBLIMITR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBLIMITR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_TRBLIMITR_EL1_SHIFT) +#define HDFGWTR_EL2_TRBBASER_EL1_SHIFT 50 +#define HDFGWTR_EL2_TRBBASER_EL1_MASK (UL(0x1) << HDFGWTR_EL2_TRBBASER_EL1_SHIFT) +#define HDFGWTR_EL2_TRBBASER_EL1_VAL(x) ((x) & HDFGWTR_EL2_TRBBASER_EL1_MASK) +#define HDFGWTR_EL2_TRBBASER_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRBBASER_EL1_SHIFT) +#define HDFGWTR_EL2_TRBBASER_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_TRBBASER_EL1_SHIFT) +#define HDFGWTR_EL2_TRFCR_EL1_SHIFT 49 +#define HDFGWTR_EL2_TRFCR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_TRFCR_EL1_SHIFT) +#define HDFGWTR_EL2_TRFCR_EL1_VAL(x) ((x) & HDFGWTR_EL2_TRFCR_EL1_MASK) +#define HDFGWTR_EL2_TRFCR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRFCR_EL1_SHIFT) +#define HDFGWTR_EL2_TRFCR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_TRFCR_EL1_SHIFT) +#define HDFGWTR_EL2_TRCVICTLR_SHIFT 48 +#define HDFGWTR_EL2_TRCVICTLR_MASK (UL(0x1) << HDFGWTR_EL2_TRCVICTLR_SHIFT) +#define HDFGWTR_EL2_TRCVICTLR_VAL(x) ((x) & HDFGWTR_EL2_TRCVICTLR_MASK) +#define HDFGWTR_EL2_TRCVICTLR_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCVICTLR_SHIFT) +#define HDFGWTR_EL2_TRCVICTLR_TRAP (UL(0x1) << HDFGWTR_EL2_TRCVICTLR_SHIFT) +#define HDFGWTR_EL2_TRCSSCSRn_SHIFT 46 +#define HDFGWTR_EL2_TRCSSCSRn_MASK (UL(0x1) << HDFGWTR_EL2_TRCSSCSRn_SHIFT) +#define HDFGWTR_EL2_TRCSSCSRn_VAL(x) ((x) & HDFGWTR_EL2_TRCSSCSRn_MASK) +#define HDFGWTR_EL2_TRCSSCSRn_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCSSCSRn_SHIFT) +#define HDFGWTR_EL2_TRCSSCSRn_TRAP (UL(0x1) << HDFGWTR_EL2_TRCSSCSRn_SHIFT) +#define HDFGWTR_EL2_TRCSEQSTR_SHIFT 45 +#define HDFGWTR_EL2_TRCSEQSTR_MASK (UL(0x1) << HDFGWTR_EL2_TRCSEQSTR_SHIFT) +#define HDFGWTR_EL2_TRCSEQSTR_VAL(x) ((x) & HDFGWTR_EL2_TRCSEQSTR_MASK) +#define HDFGWTR_EL2_TRCSEQSTR_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCSEQSTR_SHIFT) +#define HDFGWTR_EL2_TRCSEQSTR_TRAP (UL(0x1) << HDFGWTR_EL2_TRCSEQSTR_SHIFT) +#define HDFGWTR_EL2_TRCPRGCTLR_SHIFT 44 +#define HDFGWTR_EL2_TRCPRGCTLR_MASK (UL(0x1) << HDFGWTR_EL2_TRCPRGCTLR_SHIFT) +#define HDFGWTR_EL2_TRCPRGCTLR_VAL(x) ((x) & HDFGWTR_EL2_TRCPRGCTLR_MASK) +#define HDFGWTR_EL2_TRCPRGCTLR_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCPRGCTLR_SHIFT) +#define HDFGWTR_EL2_TRCPRGCTLR_TRAP (UL(0x1) << HDFGWTR_EL2_TRCPRGCTLR_SHIFT) +#define HDFGWTR_EL2_TRCOSLAR_SHIFT 42 +#define HDFGWTR_EL2_TRCOSLAR_MASK (UL(0x1) << HDFGWTR_EL2_TRCOSLAR_SHIFT) +#define HDFGWTR_EL2_TRCOSLAR_VAL(x) ((x) & HDFGWTR_EL2_TRCOSLAR_MASK) +#define HDFGWTR_EL2_TRCOSLAR_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCOSLAR_SHIFT) +#define HDFGWTR_EL2_TRCOSLAR_TRAP (UL(0x1) << HDFGWTR_EL2_TRCOSLAR_SHIFT) +#define HDFGWTR_EL2_TRCIMSPECn_SHIFT 41 +#define HDFGWTR_EL2_TRCIMSPECn_MASK (UL(0x1) << HDFGWTR_EL2_TRCIMSPECn_SHIFT) +#define HDFGWTR_EL2_TRCIMSPECn_VAL(x) ((x) & HDFGWTR_EL2_TRCIMSPECn_MASK) +#define HDFGWTR_EL2_TRCIMSPECn_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCIMSPECn_SHIFT) +#define HDFGWTR_EL2_TRCIMSPECn_TRAP (UL(0x1) << HDFGWTR_EL2_TRCIMSPECn_SHIFT) +#define HDFGWTR_EL2_TRCCNTVRn_SHIFT 37 +#define HDFGWTR_EL2_TRCCNTVRn_MASK (UL(0x1) << HDFGWTR_EL2_TRCCNTVRn_SHIFT) +#define HDFGWTR_EL2_TRCCNTVRn_VAL(x) ((x) & HDFGWTR_EL2_TRCCNTVRn_MASK) +#define HDFGWTR_EL2_TRCCNTVRn_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCCNTVRn_SHIFT) +#define HDFGWTR_EL2_TRCCNTVRn_TRAP (UL(0x1) << HDFGWTR_EL2_TRCCNTVRn_SHIFT) +#define HDFGWTR_EL2_TRCCLAIM_SHIFT 36 +#define HDFGWTR_EL2_TRCCLAIM_MASK (UL(0x1) << HDFGWTR_EL2_TRCCLAIM_SHIFT) +#define HDFGWTR_EL2_TRCCLAIM_VAL(x) ((x) & HDFGWTR_EL2_TRCCLAIM_MASK) +#define HDFGWTR_EL2_TRCCLAIM_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCCLAIM_SHIFT) +#define HDFGWTR_EL2_TRCCLAIM_TRAP (UL(0x1) << HDFGWTR_EL2_TRCCLAIM_SHIFT) +#define HDFGWTR_EL2_TRCAUXCTLR_SHIFT 35 +#define HDFGWTR_EL2_TRCAUXCTLR_MASK (UL(0x1) << HDFGWTR_EL2_TRCAUXCTLR_SHIFT) +#define HDFGWTR_EL2_TRCAUXCTLR_VAL(x) ((x) & HDFGWTR_EL2_TRCAUXCTLR_MASK) +#define HDFGWTR_EL2_TRCAUXCTLR_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRCAUXCTLR_SHIFT) +#define HDFGWTR_EL2_TRCAUXCTLR_TRAP (UL(0x1) << HDFGWTR_EL2_TRCAUXCTLR_SHIFT) +#define HDFGWTR_EL2_TRC_SHIFT 33 +#define HDFGWTR_EL2_TRC_MASK (UL(0x1) << HDFGWTR_EL2_TRC_SHIFT) +#define HDFGWTR_EL2_TRC_VAL(x) ((x) & HDFGWTR_EL2_TRC_MASK) +#define HDFGWTR_EL2_TRC_NOTRAP (UL(0x0) << HDFGWTR_EL2_TRC_SHIFT) +#define HDFGWTR_EL2_TRC_TRAP (UL(0x1) << HDFGWTR_EL2_TRC_SHIFT) +#define HDFGWTR_EL2_PMSLATFR_EL1_SHIFT 32 +#define HDFGWTR_EL2_PMSLATFR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMSLATFR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSLATFR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMSLATFR_EL1_MASK) +#define HDFGWTR_EL2_PMSLATFR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMSLATFR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSLATFR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMSLATFR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSIRR_EL1_SHIFT 31 +#define HDFGWTR_EL2_PMSIRR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMSIRR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSIRR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMSIRR_EL1_MASK) +#define HDFGWTR_EL2_PMSIRR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMSIRR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSIRR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMSIRR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSICR_EL1_SHIFT 29 +#define HDFGWTR_EL2_PMSICR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMSICR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSICR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMSICR_EL1_MASK) +#define HDFGWTR_EL2_PMSICR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMSICR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSICR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMSICR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSFCR_EL1_SHIFT 28 +#define HDFGWTR_EL2_PMSFCR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMSFCR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSFCR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMSFCR_EL1_MASK) +#define HDFGWTR_EL2_PMSFCR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMSFCR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSFCR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMSFCR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSEVFR_EL1_SHIFT 27 +#define HDFGWTR_EL2_PMSEVFR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMSEVFR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSEVFR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMSEVFR_EL1_MASK) +#define HDFGWTR_EL2_PMSEVFR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMSEVFR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSEVFR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMSEVFR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSCR_EL1_SHIFT 26 +#define HDFGWTR_EL2_PMSCR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMSCR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSCR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMSCR_EL1_MASK) +#define HDFGWTR_EL2_PMSCR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMSCR_EL1_SHIFT) +#define HDFGWTR_EL2_PMSCR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMSCR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBSR_EL1_SHIFT 25 +#define HDFGWTR_EL2_PMBSR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMBSR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBSR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMBSR_EL1_MASK) +#define HDFGWTR_EL2_PMBSR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMBSR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBSR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMBSR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBPTR_EL1_SHIFT 24 +#define HDFGWTR_EL2_PMBPTR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMBPTR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBPTR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMBPTR_EL1_MASK) +#define HDFGWTR_EL2_PMBPTR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMBPTR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBPTR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMBPTR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBLIMITR_EL1_SHIFT 23 +#define HDFGWTR_EL2_PMBLIMITR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_PMBLIMITR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBLIMITR_EL1_VAL(x) ((x) & HDFGWTR_EL2_PMBLIMITR_EL1_MASK) +#define HDFGWTR_EL2_PMBLIMITR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMBLIMITR_EL1_SHIFT) +#define HDFGWTR_EL2_PMBLIMITR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_PMBLIMITR_EL1_SHIFT) +#define HDFGWTR_EL2_PMCR_EL0_SHIFT 21 +#define HDFGWTR_EL2_PMCR_EL0_MASK (UL(0x1) << HDFGWTR_EL2_PMCR_EL0_SHIFT) +#define HDFGWTR_EL2_PMCR_EL0_VAL(x) ((x) & HDFGWTR_EL2_PMCR_EL0_MASK) +#define HDFGWTR_EL2_PMCR_EL0_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMCR_EL0_SHIFT) +#define HDFGWTR_EL2_PMCR_EL0_TRAP (UL(0x1) << HDFGWTR_EL2_PMCR_EL0_SHIFT) +#define HDFGWTR_EL2_PMSWINC_EL0_SHIFT 20 +#define HDFGWTR_EL2_PMSWINC_EL0_MASK (UL(0x1) << HDFGWTR_EL2_PMSWINC_EL0_SHIFT) +#define HDFGWTR_EL2_PMSWINC_EL0_VAL(x) ((x) & HDFGWTR_EL2_PMSWINC_EL0_MASK) +#define HDFGWTR_EL2_PMSWINC_EL0_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMSWINC_EL0_SHIFT) +#define HDFGWTR_EL2_PMSWINC_EL0_TRAP (UL(0x1) << HDFGWTR_EL2_PMSWINC_EL0_SHIFT) +#define HDFGWTR_EL2_PMSELR_EL0_SHIFT 19 +#define HDFGWTR_EL2_PMSELR_EL0_MASK (UL(0x1) << HDFGWTR_EL2_PMSELR_EL0_SHIFT) +#define HDFGWTR_EL2_PMSELR_EL0_VAL(x) ((x) & HDFGWTR_EL2_PMSELR_EL0_MASK) +#define HDFGWTR_EL2_PMSELR_EL0_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMSELR_EL0_SHIFT) +#define HDFGWTR_EL2_PMSELR_EL0_TRAP (UL(0x1) << HDFGWTR_EL2_PMSELR_EL0_SHIFT) +#define HDFGWTR_EL2_PMOVS_SHIFT 18 +#define HDFGWTR_EL2_PMOVS_MASK (UL(0x1) << HDFGWTR_EL2_PMOVS_SHIFT) +#define HDFGWTR_EL2_PMOVS_VAL(x) ((x) & HDFGWTR_EL2_PMOVS_MASK) +#define HDFGWTR_EL2_PMOVS_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMOVS_SHIFT) +#define HDFGWTR_EL2_PMOVS_TRAP (UL(0x1) << HDFGWTR_EL2_PMOVS_SHIFT) +#define HDFGWTR_EL2_PMINTEN_SHIFT 17 +#define HDFGWTR_EL2_PMINTEN_MASK (UL(0x1) << HDFGWTR_EL2_PMINTEN_SHIFT) +#define HDFGWTR_EL2_PMINTEN_VAL(x) ((x) & HDFGWTR_EL2_PMINTEN_MASK) +#define HDFGWTR_EL2_PMINTEN_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMINTEN_SHIFT) +#define HDFGWTR_EL2_PMINTEN_TRAP (UL(0x1) << HDFGWTR_EL2_PMINTEN_SHIFT) +#define HDFGWTR_EL2_PMCNTEN_SHIFT 16 +#define HDFGWTR_EL2_PMCNTEN_MASK (UL(0x1) << HDFGWTR_EL2_PMCNTEN_SHIFT) +#define HDFGWTR_EL2_PMCNTEN_VAL(x) ((x) & HDFGWTR_EL2_PMCNTEN_MASK) +#define HDFGWTR_EL2_PMCNTEN_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMCNTEN_SHIFT) +#define HDFGWTR_EL2_PMCNTEN_TRAP (UL(0x1) << HDFGWTR_EL2_PMCNTEN_SHIFT) +#define HDFGWTR_EL2_PMCCNTR_EL0_SHIFT 15 +#define HDFGWTR_EL2_PMCCNTR_EL0_MASK (UL(0x1) << HDFGWTR_EL2_PMCCNTR_EL0_SHIFT) +#define HDFGWTR_EL2_PMCCNTR_EL0_VAL(x) ((x) & HDFGWTR_EL2_PMCCNTR_EL0_MASK) +#define HDFGWTR_EL2_PMCCNTR_EL0_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMCCNTR_EL0_SHIFT) +#define HDFGWTR_EL2_PMCCNTR_EL0_TRAP (UL(0x1) << HDFGWTR_EL2_PMCCNTR_EL0_SHIFT) +#define HDFGWTR_EL2_PMCCFILTR_EL0_SHIFT 14 +#define HDFGWTR_EL2_PMCCFILTR_EL0_MASK (UL(0x1) << HDFGWTR_EL2_PMCCFILTR_EL0_SHIFT) +#define HDFGWTR_EL2_PMCCFILTR_EL0_VAL(x) ((x) & HDFGWTR_EL2_PMCCFILTR_EL0_MASK) +#define HDFGWTR_EL2_PMCCFILTR_EL0_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMCCFILTR_EL0_SHIFT) +#define HDFGWTR_EL2_PMCCFILTR_EL0_TRAP (UL(0x1) << HDFGWTR_EL2_PMCCFILTR_EL0_SHIFT) +#define HDFGWTR_EL2_PMEVTYPERn_EL0_SHIFT 13 +#define HDFGWTR_EL2_PMEVTYPERn_EL0_MASK (UL(0x1) << HDFGWTR_EL2_PMEVTYPERn_EL0_SHIFT) +#define HDFGWTR_EL2_PMEVTYPERn_EL0_VAL(x) ((x) & HDFGWTR_EL2_PMEVTYPERn_EL0_MASK) +#define HDFGWTR_EL2_PMEVTYPERn_EL0_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMEVTYPERn_EL0_SHIFT) +#define HDFGWTR_EL2_PMEVTYPERn_EL0_TRAP (UL(0x1) << HDFGWTR_EL2_PMEVTYPERn_EL0_SHIFT) +#define HDFGWTR_EL2_PMEVCNTRn_EL0_SHIFT 12 +#define HDFGWTR_EL2_PMEVCNTRn_EL0_MASK (UL(0x1) << HDFGWTR_EL2_PMEVCNTRn_EL0_SHIFT) +#define HDFGWTR_EL2_PMEVCNTRn_EL0_VAL(x) ((x) & HDFGWTR_EL2_PMEVCNTRn_EL0_MASK) +#define HDFGWTR_EL2_PMEVCNTRn_EL0_NOTRAP (UL(0x0) << HDFGWTR_EL2_PMEVCNTRn_EL0_SHIFT) +#define HDFGWTR_EL2_PMEVCNTRn_EL0_TRAP (UL(0x1) << HDFGWTR_EL2_PMEVCNTRn_EL0_SHIFT) +#define HDFGWTR_EL2_OSDLR_EL1_SHIFT 11 +#define HDFGWTR_EL2_OSDLR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_OSDLR_EL1_SHIFT) +#define HDFGWTR_EL2_OSDLR_EL1_VAL(x) ((x) & HDFGWTR_EL2_OSDLR_EL1_MASK) +#define HDFGWTR_EL2_OSDLR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_OSDLR_EL1_SHIFT) +#define HDFGWTR_EL2_OSDLR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_OSDLR_EL1_SHIFT) +#define HDFGWTR_EL2_OSECCR_EL1_SHIFT 10 +#define HDFGWTR_EL2_OSECCR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_OSECCR_EL1_SHIFT) +#define HDFGWTR_EL2_OSECCR_EL1_VAL(x) ((x) & HDFGWTR_EL2_OSECCR_EL1_MASK) +#define HDFGWTR_EL2_OSECCR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_OSECCR_EL1_SHIFT) +#define HDFGWTR_EL2_OSECCR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_OSECCR_EL1_SHIFT) +#define HDFGWTR_EL2_OSLAR_EL1_SHIFT 8 +#define HDFGWTR_EL2_OSLAR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_OSLAR_EL1_SHIFT) +#define HDFGWTR_EL2_OSLAR_EL1_VAL(x) ((x) & HDFGWTR_EL2_OSLAR_EL1_MASK) +#define HDFGWTR_EL2_OSLAR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_OSLAR_EL1_SHIFT) +#define HDFGWTR_EL2_OSLAR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_OSLAR_EL1_SHIFT) +#define HDFGWTR_EL2_DBGPRCR_EL1_SHIFT 7 +#define HDFGWTR_EL2_DBGPRCR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_DBGPRCR_EL1_SHIFT) +#define HDFGWTR_EL2_DBGPRCR_EL1_VAL(x) ((x) & HDFGWTR_EL2_DBGPRCR_EL1_MASK) +#define HDFGWTR_EL2_DBGPRCR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_DBGPRCR_EL1_SHIFT) +#define HDFGWTR_EL2_DBGPRCR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_DBGPRCR_EL1_SHIFT) +#define HDFGWTR_EL2_DBGCLAIM_SHIFT 5 +#define HDFGWTR_EL2_DBGCLAIM_MASK (UL(0x1) << HDFGWTR_EL2_DBGCLAIM_SHIFT) +#define HDFGWTR_EL2_DBGCLAIM_VAL(x) ((x) & HDFGWTR_EL2_DBGCLAIM_MASK) +#define HDFGWTR_EL2_DBGCLAIM_NOTRAP (UL(0x0) << HDFGWTR_EL2_DBGCLAIM_SHIFT) +#define HDFGWTR_EL2_DBGCLAIM_TRAP (UL(0x1) << HDFGWTR_EL2_DBGCLAIM_SHIFT) +#define HDFGWTR_EL2_MDSCR_EL1_SHIFT 4 +#define HDFGWTR_EL2_MDSCR_EL1_MASK (UL(0x1) << HDFGWTR_EL2_MDSCR_EL1_SHIFT) +#define HDFGWTR_EL2_MDSCR_EL1_VAL(x) ((x) & HDFGWTR_EL2_MDSCR_EL1_MASK) +#define HDFGWTR_EL2_MDSCR_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_MDSCR_EL1_SHIFT) +#define HDFGWTR_EL2_MDSCR_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_MDSCR_EL1_SHIFT) +#define HDFGWTR_EL2_DBGWVRn_EL1_SHIFT 3 +#define HDFGWTR_EL2_DBGWVRn_EL1_MASK (UL(0x1) << HDFGWTR_EL2_DBGWVRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGWVRn_EL1_VAL(x) ((x) & HDFGWTR_EL2_DBGWVRn_EL1_MASK) +#define HDFGWTR_EL2_DBGWVRn_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_DBGWVRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGWVRn_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_DBGWVRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGWCRn_EL1_SHIFT 2 +#define HDFGWTR_EL2_DBGWCRn_EL1_MASK (UL(0x1) << HDFGWTR_EL2_DBGWCRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGWCRn_EL1_VAL(x) ((x) & HDFGWTR_EL2_DBGWCRn_EL1_MASK) +#define HDFGWTR_EL2_DBGWCRn_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_DBGWCRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGWCRn_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_DBGWCRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGBVRn_EL1_SHIFT 1 +#define HDFGWTR_EL2_DBGBVRn_EL1_MASK (UL(0x1) << HDFGWTR_EL2_DBGBVRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGBVRn_EL1_VAL(x) ((x) & HDFGWTR_EL2_DBGBVRn_EL1_MASK) +#define HDFGWTR_EL2_DBGBVRn_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_DBGBVRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGBVRn_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_DBGBVRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGBCRn_EL1_SHIFT 0 +#define HDFGWTR_EL2_DBGBCRn_EL1_MASK (UL(0x1) << HDFGWTR_EL2_DBGBCRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGBCRn_EL1_VAL(x) ((x) & HDFGWTR_EL2_DBGBCRn_EL1_MASK) +#define HDFGWTR_EL2_DBGBCRn_EL1_NOTRAP (UL(0x0) << HDFGWTR_EL2_DBGBCRn_EL1_SHIFT) +#define HDFGWTR_EL2_DBGBCRn_EL1_TRAP (UL(0x1) << HDFGWTR_EL2_DBGBCRn_EL1_SHIFT) + +/* HFGITR2_EL2 */ +#define HFGITR2_EL2_REG MRS_REG_ALT_NAME(HFGITR2_EL2) +#define HFGITR2_EL2_op0 3 +#define HFGITR2_EL2_op1 4 +#define HFGITR2_EL2_CRn 3 +#define HFGITR2_EL2_CRm 1 +#define HFGITR2_EL2_op2 7 + +/* HFGITR_EL2 */ +#define HFGITR_EL2_REG MRS_REG_ALT_NAME(HFGITR_EL2) +#define HFGITR_EL2_op0 3 +#define HFGITR_EL2_op1 4 +#define HFGITR_EL2_CRn 1 +#define HFGITR_EL2_CRm 1 +#define HFGITR_EL2_op2 6 +#define HFGITR_EL2_ATS1E1A_SHIFT 62 +#define HFGITR_EL2_ATS1E1A_MASK (UL(0x1) << HFGITR_EL2_ATS1E1A_SHIFT) +#define HFGITR_EL2_ATS1E1A_VAL(x) ((x) & HFGITR_EL2_ATS1E1A_MASK) +#define HFGITR_EL2_ATS1E1A_NOTRAP (UL(0x0) << HFGITR_EL2_ATS1E1A_SHIFT) +#define HFGITR_EL2_ATS1E1A_TRAP (UL(0x1) << HFGITR_EL2_ATS1E1A_SHIFT) +#define HFGITR_EL2_COSPRCTX_SHIFT 60 +#define HFGITR_EL2_COSPRCTX_MASK (UL(0x1) << HFGITR_EL2_COSPRCTX_SHIFT) +#define HFGITR_EL2_COSPRCTX_VAL(x) ((x) & HFGITR_EL2_COSPRCTX_MASK) +#define HFGITR_EL2_COSPRCTX_NOTRAP (UL(0x0) << HFGITR_EL2_COSPRCTX_SHIFT) +#define HFGITR_EL2_COSPRCTX_TRAP (UL(0x1) << HFGITR_EL2_COSPRCTX_SHIFT) +#define HFGITR_EL2_nGCSEPP_SHIFT 59 +#define HFGITR_EL2_nGCSEPP_MASK (UL(0x1) << HFGITR_EL2_nGCSEPP_SHIFT) +#define HFGITR_EL2_nGCSEPP_VAL(x) ((x) & HFGITR_EL2_nGCSEPP_MASK) +#define HFGITR_EL2_nGCSEPP_TRAP (UL(0x0) << HFGITR_EL2_nGCSEPP_SHIFT) +#define HFGITR_EL2_nGCSEPP_NOTRAP (UL(0x1) << HFGITR_EL2_nGCSEPP_SHIFT) +#define HFGITR_EL2_nGCSSTR_EL1_SHIFT 58 +#define HFGITR_EL2_nGCSSTR_EL1_MASK (UL(0x1) << HFGITR_EL2_nGCSSTR_EL1_SHIFT) +#define HFGITR_EL2_nGCSSTR_EL1_VAL(x) ((x) & HFGITR_EL2_nGCSSTR_EL1_MASK) +#define HFGITR_EL2_nGCSSTR_EL1_TRAP (UL(0x0) << HFGITR_EL2_nGCSSTR_EL1_SHIFT) +#define HFGITR_EL2_nGCSSTR_EL1_NOTRAP (UL(0x1) << HFGITR_EL2_nGCSSTR_EL1_SHIFT) +#define HFGITR_EL2_nGCSPUSHM_EL1_SHIFT 57 +#define HFGITR_EL2_nGCSPUSHM_EL1_MASK (UL(0x1) << HFGITR_EL2_nGCSPUSHM_EL1_SHIFT) +#define HFGITR_EL2_nGCSPUSHM_EL1_VAL(x) ((x) & HFGITR_EL2_nGCSPUSHM_EL1_MASK) +#define HFGITR_EL2_nGCSPUSHM_EL1_TRAP (UL(0x0) << HFGITR_EL2_nGCSPUSHM_EL1_SHIFT) +#define HFGITR_EL2_nGCSPUSHM_EL1_NOTRAP (UL(0x1) << HFGITR_EL2_nGCSPUSHM_EL1_SHIFT) +#define HFGITR_EL2_nBRBIALL_SHIFT 56 +#define HFGITR_EL2_nBRBIALL_MASK (UL(0x1) << HFGITR_EL2_nBRBIALL_SHIFT) +#define HFGITR_EL2_nBRBIALL_VAL(x) ((x) & HFGITR_EL2_nBRBIALL_MASK) +#define HFGITR_EL2_nBRBIALL_TRAP (UL(0x0) << HFGITR_EL2_nBRBIALL_SHIFT) +#define HFGITR_EL2_nBRBIALL_NOTRAP (UL(0x1) << HFGITR_EL2_nBRBIALL_SHIFT) +#define HFGITR_EL2_nBRBINJ_SHIFT 55 +#define HFGITR_EL2_nBRBINJ_MASK (UL(0x1) << HFGITR_EL2_nBRBINJ_SHIFT) +#define HFGITR_EL2_nBRBINJ_VAL(x) ((x) & HFGITR_EL2_nBRBINJ_MASK) +#define HFGITR_EL2_nBRBINJ_TRAP (UL(0x0) << HFGITR_EL2_nBRBINJ_SHIFT) +#define HFGITR_EL2_nBRBINJ_NOTRAP (UL(0x1) << HFGITR_EL2_nBRBINJ_SHIFT) +#define HFGITR_EL2_DCCVAC_SHIFT 54 +#define HFGITR_EL2_DCCVAC_MASK (UL(0x1) << HFGITR_EL2_DCCVAC_SHIFT) +#define HFGITR_EL2_DCCVAC_VAL(x) ((x) & HFGITR_EL2_DCCVAC_MASK) +#define HFGITR_EL2_DCCVAC_NOTRAP (UL(0x0) << HFGITR_EL2_DCCVAC_SHIFT) +#define HFGITR_EL2_DCCVAC_TRAP (UL(0x1) << HFGITR_EL2_DCCVAC_SHIFT) +#define HFGITR_EL2_SVC_EL1_SHIFT 53 +#define HFGITR_EL2_SVC_EL1_MASK (UL(0x1) << HFGITR_EL2_SVC_EL1_SHIFT) +#define HFGITR_EL2_SVC_EL1_VAL(x) ((x) & HFGITR_EL2_SVC_EL1_MASK) +#define HFGITR_EL2_SVC_EL1_NOTRAP (UL(0x0) << HFGITR_EL2_SVC_EL1_SHIFT) +#define HFGITR_EL2_SVC_EL1_TRAP (UL(0x1) << HFGITR_EL2_SVC_EL1_SHIFT) +#define HFGITR_EL2_SVC_EL0_SHIFT 52 +#define HFGITR_EL2_SVC_EL0_MASK (UL(0x1) << HFGITR_EL2_SVC_EL0_SHIFT) +#define HFGITR_EL2_SVC_EL0_VAL(x) ((x) & HFGITR_EL2_SVC_EL0_MASK) +#define HFGITR_EL2_SVC_EL0_NOTRAP (UL(0x0) << HFGITR_EL2_SVC_EL0_SHIFT) +#define HFGITR_EL2_SVC_EL0_TRAP (UL(0x1) << HFGITR_EL2_SVC_EL0_SHIFT) +#define HFGITR_EL2_ERET_SHIFT 51 +#define HFGITR_EL2_ERET_MASK (UL(0x1) << HFGITR_EL2_ERET_SHIFT) +#define HFGITR_EL2_ERET_VAL(x) ((x) & HFGITR_EL2_ERET_MASK) +#define HFGITR_EL2_ERET_NOTRAP (UL(0x0) << HFGITR_EL2_ERET_SHIFT) +#define HFGITR_EL2_ERET_TRAP (UL(0x1) << HFGITR_EL2_ERET_SHIFT) +#define HFGITR_EL2_CPPRCTX_SHIFT 50 +#define HFGITR_EL2_CPPRCTX_MASK (UL(0x1) << HFGITR_EL2_CPPRCTX_SHIFT) +#define HFGITR_EL2_CPPRCTX_VAL(x) ((x) & HFGITR_EL2_CPPRCTX_MASK) +#define HFGITR_EL2_CPPRCTX_NOTRAP (UL(0x0) << HFGITR_EL2_CPPRCTX_SHIFT) +#define HFGITR_EL2_CPPRCTX_TRAP (UL(0x1) << HFGITR_EL2_CPPRCTX_SHIFT) +#define HFGITR_EL2_DVPRCTX_SHIFT 49 +#define HFGITR_EL2_DVPRCTX_MASK (UL(0x1) << HFGITR_EL2_DVPRCTX_SHIFT) +#define HFGITR_EL2_DVPRCTX_VAL(x) ((x) & HFGITR_EL2_DVPRCTX_MASK) +#define HFGITR_EL2_DVPRCTX_NOTRAP (UL(0x0) << HFGITR_EL2_DVPRCTX_SHIFT) +#define HFGITR_EL2_DVPRCTX_TRAP (UL(0x1) << HFGITR_EL2_DVPRCTX_SHIFT) +#define HFGITR_EL2_CFPRCTX_SHIFT 48 +#define HFGITR_EL2_CFPRCTX_MASK (UL(0x1) << HFGITR_EL2_CFPRCTX_SHIFT) +#define HFGITR_EL2_CFPRCTX_VAL(x) ((x) & HFGITR_EL2_CFPRCTX_MASK) +#define HFGITR_EL2_CFPRCTX_NOTRAP (UL(0x0) << HFGITR_EL2_CFPRCTX_SHIFT) +#define HFGITR_EL2_CFPRCTX_TRAP (UL(0x1) << HFGITR_EL2_CFPRCTX_SHIFT) +#define HFGITR_EL2_TLBIVAALE1_SHIFT 47 +#define HFGITR_EL2_TLBIVAALE1_MASK (UL(0x1) << HFGITR_EL2_TLBIVAALE1_SHIFT) +#define HFGITR_EL2_TLBIVAALE1_VAL(x) ((x) & HFGITR_EL2_TLBIVAALE1_MASK) +#define HFGITR_EL2_TLBIVAALE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIVAALE1_SHIFT) +#define HFGITR_EL2_TLBIVAALE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIVAALE1_SHIFT) +#define HFGITR_EL2_TLBIVALE1_SHIFT 46 +#define HFGITR_EL2_TLBIVALE1_MASK (UL(0x1) << HFGITR_EL2_TLBIVALE1_SHIFT) +#define HFGITR_EL2_TLBIVALE1_VAL(x) ((x) & HFGITR_EL2_TLBIVALE1_MASK) +#define HFGITR_EL2_TLBIVALE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIVALE1_SHIFT) +#define HFGITR_EL2_TLBIVALE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIVALE1_SHIFT) +#define HFGITR_EL2_TLBIVAAE1_SHIFT 45 +#define HFGITR_EL2_TLBIVAAE1_MASK (UL(0x1) << HFGITR_EL2_TLBIVAAE1_SHIFT) +#define HFGITR_EL2_TLBIVAAE1_VAL(x) ((x) & HFGITR_EL2_TLBIVAAE1_MASK) +#define HFGITR_EL2_TLBIVAAE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIVAAE1_SHIFT) +#define HFGITR_EL2_TLBIVAAE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIVAAE1_SHIFT) +#define HFGITR_EL2_TLBIASIDE1_SHIFT 44 +#define HFGITR_EL2_TLBIASIDE1_MASK (UL(0x1) << HFGITR_EL2_TLBIASIDE1_SHIFT) +#define HFGITR_EL2_TLBIASIDE1_VAL(x) ((x) & HFGITR_EL2_TLBIASIDE1_MASK) +#define HFGITR_EL2_TLBIASIDE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIASIDE1_SHIFT) +#define HFGITR_EL2_TLBIASIDE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIASIDE1_SHIFT) +#define HFGITR_EL2_TLBIVAE1_SHIFT 43 +#define HFGITR_EL2_TLBIVAE1_MASK (UL(0x1) << HFGITR_EL2_TLBIVAE1_SHIFT) +#define HFGITR_EL2_TLBIVAE1_VAL(x) ((x) & HFGITR_EL2_TLBIVAE1_MASK) +#define HFGITR_EL2_TLBIVAE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIVAE1_SHIFT) +#define HFGITR_EL2_TLBIVAE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIVAE1_SHIFT) +#define HFGITR_EL2_TLBIVMALLE1_SHIFT 42 +#define HFGITR_EL2_TLBIVMALLE1_MASK (UL(0x1) << HFGITR_EL2_TLBIVMALLE1_SHIFT) +#define HFGITR_EL2_TLBIVMALLE1_VAL(x) ((x) & HFGITR_EL2_TLBIVMALLE1_MASK) +#define HFGITR_EL2_TLBIVMALLE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIVMALLE1_SHIFT) +#define HFGITR_EL2_TLBIVMALLE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIVMALLE1_SHIFT) +#define HFGITR_EL2_TLBIRVAALE1_SHIFT 41 +#define HFGITR_EL2_TLBIRVAALE1_MASK (UL(0x1) << HFGITR_EL2_TLBIRVAALE1_SHIFT) +#define HFGITR_EL2_TLBIRVAALE1_VAL(x) ((x) & HFGITR_EL2_TLBIRVAALE1_MASK) +#define HFGITR_EL2_TLBIRVAALE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIRVAALE1_SHIFT) +#define HFGITR_EL2_TLBIRVAALE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIRVAALE1_SHIFT) +#define HFGITR_EL2_TLBIRVALE1_SHIFT 40 +#define HFGITR_EL2_TLBIRVALE1_MASK (UL(0x1) << HFGITR_EL2_TLBIRVALE1_SHIFT) +#define HFGITR_EL2_TLBIRVALE1_VAL(x) ((x) & HFGITR_EL2_TLBIRVALE1_MASK) +#define HFGITR_EL2_TLBIRVALE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIRVALE1_SHIFT) +#define HFGITR_EL2_TLBIRVALE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIRVALE1_SHIFT) +#define HFGITR_EL2_TLBIRVAAE1_SHIFT 39 +#define HFGITR_EL2_TLBIRVAAE1_MASK (UL(0x1) << HFGITR_EL2_TLBIRVAAE1_SHIFT) +#define HFGITR_EL2_TLBIRVAAE1_VAL(x) ((x) & HFGITR_EL2_TLBIRVAAE1_MASK) +#define HFGITR_EL2_TLBIRVAAE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIRVAAE1_SHIFT) +#define HFGITR_EL2_TLBIRVAAE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIRVAAE1_SHIFT) +#define HFGITR_EL2_TLBIRVAE1_SHIFT 38 +#define HFGITR_EL2_TLBIRVAE1_MASK (UL(0x1) << HFGITR_EL2_TLBIRVAE1_SHIFT) +#define HFGITR_EL2_TLBIRVAE1_VAL(x) ((x) & HFGITR_EL2_TLBIRVAE1_MASK) +#define HFGITR_EL2_TLBIRVAE1_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIRVAE1_SHIFT) +#define HFGITR_EL2_TLBIRVAE1_TRAP (UL(0x1) << HFGITR_EL2_TLBIRVAE1_SHIFT) +#define HFGITR_EL2_TLBIRVAALE1IS_SHIFT 37 +#define HFGITR_EL2_TLBIRVAALE1IS_MASK (UL(0x1) << HFGITR_EL2_TLBIRVAALE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVAALE1IS_VAL(x) ((x) & HFGITR_EL2_TLBIRVAALE1IS_MASK) +#define HFGITR_EL2_TLBIRVAALE1IS_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIRVAALE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVAALE1IS_TRAP (UL(0x1) << HFGITR_EL2_TLBIRVAALE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVALE1IS_SHIFT 36 +#define HFGITR_EL2_TLBIRVALE1IS_MASK (UL(0x1) << HFGITR_EL2_TLBIRVALE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVALE1IS_VAL(x) ((x) & HFGITR_EL2_TLBIRVALE1IS_MASK) +#define HFGITR_EL2_TLBIRVALE1IS_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIRVALE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVALE1IS_TRAP (UL(0x1) << HFGITR_EL2_TLBIRVALE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVAAE1IS_SHIFT 35 +#define HFGITR_EL2_TLBIRVAAE1IS_MASK (UL(0x1) << HFGITR_EL2_TLBIRVAAE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVAAE1IS_VAL(x) ((x) & HFGITR_EL2_TLBIRVAAE1IS_MASK) +#define HFGITR_EL2_TLBIRVAAE1IS_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIRVAAE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVAAE1IS_TRAP (UL(0x1) << HFGITR_EL2_TLBIRVAAE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVAE1IS_SHIFT 34 +#define HFGITR_EL2_TLBIRVAE1IS_MASK (UL(0x1) << HFGITR_EL2_TLBIRVAE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVAE1IS_VAL(x) ((x) & HFGITR_EL2_TLBIRVAE1IS_MASK) +#define HFGITR_EL2_TLBIRVAE1IS_NOTRAP (UL(0x0) << HFGITR_EL2_TLBIRVAE1IS_SHIFT) +#define HFGITR_EL2_TLBIRVAE1IS_TRAP (UL(0x1) << HFGITR_EL2_TLBIRVAE1IS_SHIFT) +#define HFGITR_EL2_TLBIVAALE1IS_SHIFT 33 +#define HFGITR_EL2_TLBIVAALE1IS_MASK (UL(0x1) << HFGITR_EL2_TLBIVAALE1IS_SHIFT) +#define HFGITR_EL2_TLBIVAALE1IS_VAL(x) ((x) & HFGITR_EL2_TLBIVAALE1IS_MASK) *** 793 LINES SKIPPED *** From nobody Tue Feb 3 17:27:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59RT4h61z6QSh5 for ; Tue, 03 Feb 2026 17:27: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59RT2Z6sz3JDc for ; Tue, 03 Feb 2026 17:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cr7uMsgKouHl4V7ImsByi2WxD4uT/ap04NeG6nXEyiM=; b=bslBXb8x0H9LEGhd1EOdDKY9ZUjxtfIrI4Kw70OYDuNZGbSCeSDxYp8eXU9kpzDM+5uLlN UgwA3jNeLla8P4YnC2HXRhD/J3LS+Y75LklxHjYz/tEnW02eRlMQoAv6hLrkYbj3D05sOW 85n9KtM3oyfg4kdLw2BmndC4Mgkp0r3K8OJ/IpSL6faXXkC9s+gz4BBvDtW5ddaMuMyJhy MmIQyN9J+TU/E1M8/408SBAHRgp4CwVn1SWcokOQS1ZiCBeXJUfgKP9VvALSSbp4f4/G/e E12AAkwORm8NSSuxevs6gpGJcPzZVPxVMBua67XwoqHoLcLA/QOnzKqYbSgfuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139669; a=rsa-sha256; cv=none; b=sTWD5w4mvGVHjMyL9jMFNrMKhlhtMucycE5OAOixljt43SjHuOUceFreK9tsLsSIogL7RV LZ7qbwJEjLgojgcWC6An0zQwsQGixHMMDsXMk8rThX0BMXu+P4/fD6lQu3K8+rRcU0gfLG pAggaeS+yqI93eW836jXyzU8sXTJCMRYjqvtECbyuccwTDrT00HbS5PKrfHo7c+v5Wot0B 4u2Q+H3hzuQjL26r5zmZkvyg0xMSNbBOyzeeo0qeQx0O7M3yUzvb26ZVJJDzxUMuTDfBdu X8RVc4ROAHoB4wOLnSZrGm3PPD0Sqf4+WYYbKcB9eeCKnFLsAKDz8tZVW9SsvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cr7uMsgKouHl4V7ImsByi2WxD4uT/ap04NeG6nXEyiM=; b=T0S2mj+zUZc8Y72KJ+F4jb0PgnK31Ihx+dh8XoynBRnR/hBndCnJVq4baK3nz3T9yxHZuq Y7v+orSUmXdUPbROnAA9s5aTLg0OBBnDqFlDAIuwVoqdS08Vo403gUWL07QnbPtK/zyV1x NmQPqTUnicKkL3x726qi4WF742TParJyQeAhgaV5VknPkDTnzNAGzSD1XshSNrwLPlrHSf atNAJoOTyd55wV0JKf2JJnEcEukdd8GtjbpoCJTuV9tvXOG6Qkyn4tu3xORypZk90EoOzd 5OGGA4Kxvr2cMhMOllSYZOff4yy3knPSzIs7Gn7WX9JnG/KhXyFf3DYYQWTFoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59RT1NnHz7BH for ; Tue, 03 Feb 2026 17:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e8db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:27:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 095a7871f432 - main - arm64/vmm: Add HYP_FEAT_FGT{,2} List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 095a7871f4320e7667a644e6e34a27e1f526b053 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:27:49 +0000 Message-Id: <69823015.1e8db.374debff@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=095a7871f4320e7667a644e6e34a27e1f526b053 commit 095a7871f4320e7667a644e6e34a27e1f526b053 Author: Andrew Turner AuthorDate: 2026-02-03 17:14:26 +0000 Commit: Andrew Turner CommitDate: 2026-02-03 17:14:26 +0000 arm64/vmm: Add HYP_FEAT_FGT{,2} Add the macros and detection for Fine-grained traps (FEAT_FGT and FEAT_FGT2). Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54686 --- sys/arm64/vmm/arm64.h | 2 ++ sys/arm64/vmm/vmm_arm64.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h index f530dab05331..1b8762545925 100644 --- a/sys/arm64/vmm/arm64.h +++ b/sys/arm64/vmm/arm64.h @@ -131,6 +131,8 @@ struct hyp { uint64_t feats; /* Which features are enabled */ #define HYP_FEAT_HCX (0x1ul << 0) #define HYP_FEAT_ECV_POFF (0x1ul << 1) +#define HYP_FEAT_FGT (0x1ul << 2) +#define HYP_FEAT_FGT2 (0x1ul << 3) bool vgic_attached; struct vgic_v3 *vgic; struct hypctx *ctx[]; diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index d529f000b828..6643d32684d8 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -525,6 +525,18 @@ vmmops_init(struct vm *vm, pmap_t pmap) if (get_kernel_reg(ID_AA64MMFR0_EL1, &idreg)) { if (ID_AA64MMFR0_ECV_VAL(idreg) >= ID_AA64MMFR0_ECV_POFF) hyp->feats |= HYP_FEAT_ECV_POFF; + + switch (ID_AA64MMFR0_FGT_VAL(idreg)) { + case ID_AA64MMFR0_FGT_NONE: + break; + default: + case ID_AA64MMFR0_FGT_8_9: + hyp->feats |= HYP_FEAT_FGT2; + /* FALLTHROUGH */ + case ID_AA64MMFR0_FGT_8_6: + hyp->feats |= HYP_FEAT_FGT; + break; + } } if (get_kernel_reg(ID_AA64MMFR1_EL1, &idreg)) { From nobody Tue Feb 3 17:27:50 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59RV6r1Lz6QShC for ; Tue, 03 Feb 2026 17:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59RV2Rwyz3J5j for ; Tue, 03 Feb 2026 17:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0HySMma6iJTZfuu/JOCtkx2Ny4v6ANBgeB4lSi89P0E=; b=PqzXm0Az4d0h5ZNtNDHOZqWsEgvJ+8iuPbilMaFmWhtO3W1oTetMgIoPpet0HEB649afUH kgkv7NaM6URWyVxSHG3SP1ZBP6GGYXzK4ZDdu+NoWeS1HLZWUP1l3DwQ41zPyifcJp54bJ NycLqakrU/kjMuyPfQFU99GtHMvxFT1ZRORIk4L2SLmfImWs9ZySqSugN/v7gDgXkg7YXX jmPMtE9we8gDHYDgvLst/awnuIXiAbDGEcNslUl/tR381a17X4qkYLBR6R0pJY8d6T4gCw /JU7C6yfVXWXNEkEMeu0Dk+uE6Rb97hE5MpBs/iORXuD1MIcc9DQHkeF630qKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139670; a=rsa-sha256; cv=none; b=RaypNjxdVFHhg/IehsVoSek2/HcqUhQ4G4nXOXFrOS7MkiiAnq9ORXT1ddFBoXF57vsMiX QvVJx1dvpe8os21nuJxe3lcm0yOkQL75ekU6i6SU1ax6fWns2i7I9M38oU4MEOsqCLgnHt Pv0DDaKT8ZtYsd9C8CNXJ1rQehkJcTXaGJFdTOk9keR+NH5ivjNiL7YcYV196miZWKSeAW wLk0ksIC/u4fjtUWCprVoiBNTWZUKwGPG2gzNsfqz7OXSmR5EMY3/g+EkOKokV4sq0p9ds RYWIQjYw+SIMjGKvzt+94gWxiaB9RdhOMlcgUnZViQozqgcbb5D5zmAEvHNvsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0HySMma6iJTZfuu/JOCtkx2Ny4v6ANBgeB4lSi89P0E=; b=Zh1wLBxTTHOy9GCQopVIBkLxUnnGuQCQSStNVZPmvFB96tU0QFv2MqVwySGvtnJxJQY77k su7sH9gSs1AReoiIhiolp7nBclYlcwtEH725HWlEW9JiRbwmzQC78SPR8P3FYKgAfq2E0T BXr99WprJeqYT4SapSRVYJYA9A2m9RT0OGd5ofnYCnFAFYKqyPV59LQFmJHBult4z7ohfD cbJ6r4wnX0snK04wA9Z1UgQhc0W68Y9BvWDGS2DvUf1lyIJFMb+DakAYZXwmivHW6k07Rg wSNRS4ad6fAjykB7jFQe3NBajcWuV6298tv+5yyKxK2ySurF0/C6wdr3G+mDnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59RV21y9z6nq for ; Tue, 03 Feb 2026 17:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f5b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:27:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a4f0e93c5142 - main - arm64/vmm: Set and use the fine-grained traps List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4f0e93c514280bfd0ff3897e5171ec7bbe4796b Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:27:50 +0000 Message-Id: <69823016.1f5b8.39fa7dc1@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a4f0e93c514280bfd0ff3897e5171ec7bbe4796b commit a4f0e93c514280bfd0ff3897e5171ec7bbe4796b Author: Andrew Turner AuthorDate: 2026-02-03 17:14:44 +0000 Commit: Andrew Turner CommitDate: 2026-02-03 17:14:44 +0000 arm64/vmm: Set and use the fine-grained traps Set the Fine-grained trap registers to trap any features we don't support. These are expected to be more useful when we support nested virtualisation, so for now just the base features and GICv3 are not trapped. As nested virtualisation will require VHE we only set the fine-grained trap registers when VHE is used. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54687 --- sys/arm64/vmm/arm64.h | 16 ++ sys/arm64/vmm/vmm_hyp.c | 22 +++ sys/arm64/vmm/vmm_reset.c | 405 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 443 insertions(+) diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h index 1b8762545925..6062d1c07ae4 100644 --- a/sys/arm64/vmm/arm64.h +++ b/sys/arm64/vmm/arm64.h @@ -100,6 +100,22 @@ struct hypctx { uint64_t mdcr_el2; /* Monitor Debug Configuration Register */ uint64_t vpidr_el2; /* Virtualization Processor ID Register */ uint64_t vmpidr_el2; /* Virtualization Multiprocessor ID Register */ + + /* FEAT_FGT registers */ + /*uint64_t hafgrtr_el2; *//* For FEAT_AMUv1 (not supported) */ + uint64_t hdfgrtr_el2; + uint64_t hdfgwtr_el2; + uint64_t hfgitr_el2; + uint64_t hfgrtr_el2; + uint64_t hfgwtr_el2; + + /* FEAT_FGT2 registers */ + uint64_t hdfgrtr2_el2; + uint64_t hdfgwtr2_el2; + uint64_t hfgitr2_el2; + uint64_t hfgrtr2_el2; + uint64_t hfgwtr2_el2; + uint64_t el2_addr; /* The address of this in el2 space */ struct hyp *hyp; struct vcpu *vcpu; diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index 0ad7930e9a87..75c15f06dd08 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -293,6 +293,28 @@ vmm_hyp_reg_restore(struct hypctx *hypctx, struct hyp *hyp, bool guest, } isb(); +#ifdef VMM_VHE + if (guest) { + /* Fine-grained trap controls */ + if ((hyp->feats & HYP_FEAT_FGT) != 0) { + WRITE_SPECIALREG(HDFGWTR_EL2_REG, hypctx->hdfgwtr_el2); + WRITE_SPECIALREG(HFGITR_EL2_REG, hypctx->hfgitr_el2); + WRITE_SPECIALREG(HFGRTR_EL2_REG, hypctx->hfgrtr_el2); + WRITE_SPECIALREG(HFGWTR_EL2_REG, hypctx->hfgwtr_el2); + } + + if ((hyp->feats & HYP_FEAT_FGT2) != 0) { + WRITE_SPECIALREG(HDFGRTR2_EL2_REG, + hypctx->hdfgrtr2_el2); + WRITE_SPECIALREG(HDFGWTR2_EL2_REG, + hypctx->hdfgwtr2_el2); + WRITE_SPECIALREG(HFGITR2_EL2_REG, hypctx->hfgitr2_el2); + WRITE_SPECIALREG(HFGRTR2_EL2_REG, hypctx->hfgrtr2_el2); + WRITE_SPECIALREG(HFGWTR2_EL2_REG, hypctx->hfgwtr2_el2); + } + } +#endif + WRITE_SPECIALREG(sp_el0, hypctx->sp_el0); WRITE_SPECIALREG(tpidr_el0, hypctx->tpidr_el0); WRITE_SPECIALREG(tpidrro_el0, hypctx->tpidrro_el0); diff --git a/sys/arm64/vmm/vmm_reset.c b/sys/arm64/vmm/vmm_reset.c index 06ac6dec5af8..fd3414ecd066 100644 --- a/sys/arm64/vmm/vmm_reset.c +++ b/sys/arm64/vmm/vmm_reset.c @@ -187,4 +187,409 @@ reset_vm_el2_regs(void *vcpu) el2ctx->tf.tf_spsr = PSR_D | PSR_A | PSR_I | PSR_F; /* Use the EL1 stack when taking exceptions to EL1 */ el2ctx->tf.tf_spsr |= PSR_M_EL1h; + + /* FEAT_FGT traps */ + if ((el2ctx->hyp->feats & HYP_FEAT_FGT) != 0) { +#define HFGT_TRAP_FIELDS(read, write, read_pfx, write_pfx, name, trap) \ +do { \ + el2ctx->read |= read_pfx ## _EL2_ ## name ## _ ## trap; \ + el2ctx->write |= write_pfx ## _EL2_ ## name ## _ ## trap; \ +} while (0) + + + /* + * Traps for special registers + */ + + /* Debug registers */ + el2ctx->hdfgrtr_el2 = 0; + el2ctx->hdfgwtr_el2 = 0; + + /* FEAT_BRBE */ + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + nBRBDATA, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + nBRBCTL, TRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_nBRBIDR_TRAP; + + /* FEAT_TRBE */ + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRBTRG_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRBSR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRBPTR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRBMAR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRBLIMITR_EL1, TRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_TRBIDR_EL1_TRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRBBASER_EL1, TRAP); + + /* FEAT_TRF */ + el2ctx->hdfgwtr_el2 |= HDFGWTR_EL2_TRFCR_EL1_TRAP; + + /* FEAT_ETE */ + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRCVICTLR, TRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_TRCSTATR_TRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRCSSCSRn, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRCSEQSTR, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRCPRGCTLR, TRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_TRCOSLSR_TRAP; + el2ctx->hdfgwtr_el2 |= HDFGWTR_EL2_TRCOSLAR_TRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRCIMSPECn, TRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_TRCID_TRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRCCNTVRn, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRCCLAIM, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRCAUXCTLR, TRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_TRCAUTHSTATUS_TRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + TRC, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMSLATFR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMSIRR_EL1, TRAP); + + /* FEAT_SPE */ + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_PMBIDR_EL1_TRAP; + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_PMSIDR_EL1_TRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMSICR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMSFCR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMSEVFR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMSCR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMBSR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMBPTR_EL1, TRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMBLIMITR_EL1, TRAP); + + /* FEAT_SPE_FnE */ + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + nPMSNEVFR_EL1, TRAP); + + /* FEAT_PMUv3 */ + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_PMCEIDn_EL0_NOTRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMUSERENR_EL0, NOTRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_PMMIR_EL1_NOTRAP; + el2ctx->hdfgwtr_el2 |= HDFGWTR_EL2_PMCR_EL0_NOTRAP; + el2ctx->hdfgwtr_el2 |= HDFGWTR_EL2_PMSWINC_EL0_NOTRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMSELR_EL0, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMOVS, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMINTEN, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMCNTEN, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMCCNTR_EL0, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMCCFILTR_EL0, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMEVTYPERn_EL0, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + PMEVCNTRn_EL0, NOTRAP); + + /* FEAT_DoubleLock */ + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + OSDLR_EL1, TRAP); + + /* Base architecture */ + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + OSECCR_EL1, NOTRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_OSLSR_EL1_NOTRAP; + el2ctx->hdfgwtr_el2 |= HDFGWTR_EL2_OSLAR_EL1_NOTRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + DBGPRCR_EL1, NOTRAP); + el2ctx->hdfgrtr_el2 |= HDFGRTR_EL2_DBGAUTHSTATUS_EL1_NOTRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + DBGCLAIM, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + MDSCR_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + DBGWVRn_EL1, NOTRAP); + el2ctx->hdfgwtr_el2 |= HDFGWTR_EL2_DBGWCRn_EL1_NOTRAP; + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + DBGBVRn_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hdfgrtr_el2, hdfgwtr_el2, HDFGRTR, HDFGWTR, + DBGBCRn_EL1, NOTRAP); + + + /* Non-debug special registers */ + el2ctx->hfgrtr_el2 = 0; + el2ctx->hfgwtr_el2 = 0; + + /* FEAT_AIE */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nAMAIR2_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nMAIR2_EL1, TRAP); + + /* FEAT_S2POE */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nS2POR_EL1, TRAP); + + /* FEAT_S1POE */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nPOR_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nPOR_EL0, TRAP); + + /* FEAT_S1PIE */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nPIR_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nPIRE0_EL1, TRAP); + + /* FEAT_THE */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nRCWMASK_EL1, TRAP); + + /* FEAT_SME */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nTPIDR2_EL0, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nSMPRI_EL1, TRAP); + + /* FEAT_GCS */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nGCS_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nGCS_EL0, TRAP); + + /* FEAT_LS64_ACCDATA */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + nACCDATA_EL1, TRAP); + + /* FEAT_RASv1p1 */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ERXPFGCDN_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ERXPFGCTL_EL1, TRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_ERXPFGF_EL1_TRAP; + + /* FEAT_RAS */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ERXADDR_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ERXMISCn_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ERXSTATUS_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ERXCTLR_EL1, TRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_ERXFR_EL1_TRAP; + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ERRSELR_EL1, TRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_ERRIDR_EL1_TRAP; + + /* GICv3 */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ICC_IGRPENn_EL1, NOTRAP); + + /* FEAT_LOR */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + LORSA_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + LORN_EL1, TRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_LORID_EL1_TRAP; + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + LOREA_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + LORC_EL1, TRAP); + + /* FEAT_PAuth */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + APIBKey, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + APIAKey, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + APGAKey, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + APDBKey, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + APDAKey, TRAP); + + /* Base architecture */ + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + VBAR_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + TTBR1_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + TTBR0_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + TPIDR_EL0, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + TPIDRRO_EL0, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + TPIDR_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + TCR_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + SCXTNUM_EL0, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + SCXTNUM_EL1, TRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + SCTLR_EL1, NOTRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_REVIDR_EL1_NOTRAP; + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + PAR_EL1, NOTRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_MPIDR_EL1_NOTRAP; + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_MIDR_EL1_NOTRAP; + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + MAIR_EL1, NOTRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_ISR_EL1_NOTRAP; + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + FAR_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + ESR_EL1, NOTRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_DCZID_EL0_NOTRAP; + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_CTR_EL0_NOTRAP; + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + CSSELR_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + CPACR_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + CONTEXTIDR_EL1, NOTRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_CLIDR_EL1_NOTRAP; + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_CCSIDR_EL1_NOTRAP; + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + AMAIR_EL1, NOTRAP); + el2ctx->hfgrtr_el2 |= HFGRTR_EL2_AIDR_EL1_NOTRAP; + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + AFSR1_EL1, NOTRAP); + HFGT_TRAP_FIELDS(hfgrtr_el2, hfgwtr_el2, HFGRTR, HFGWTR, + AFSR0_EL1, NOTRAP); + + /* + * Traps for instructions + */ + + /* Enable all TLBI, cache and AT variants */ + el2ctx->hfgitr_el2 = 0; + + /* FEAT_ATS1A */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_ATS1E1A_TRAP; + + /* FEAT_SPECRES2 */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_COSPRCTX_TRAP; + + /* FEAT_GCS */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_nGCSEPP_TRAP | + HFGITR_EL2_nGCSSTR_EL1_TRAP | + HFGITR_EL2_nGCSPUSHM_EL1_TRAP; + + /* FEAT_BRBE */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_nBRBIALL_TRAP | + HFGITR_EL2_nBRBINJ_TRAP; + + /* FEAT_SPECRES */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_CPPRCTX_TRAP | + HFGITR_EL2_DVPRCTX_TRAP | + HFGITR_EL2_CFPRCTX_TRAP; + + /* FEAT_TLBIRANGE */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_TLBIRVAALE1_TRAP | + HFGITR_EL2_TLBIRVALE1_TRAP | + HFGITR_EL2_TLBIRVAAE1_TRAP | + HFGITR_EL2_TLBIRVAE1_TRAP | + HFGITR_EL2_TLBIRVAALE1IS_TRAP | + HFGITR_EL2_TLBIRVALE1IS_TRAP | + HFGITR_EL2_TLBIRVAAE1IS_TRAP | + HFGITR_EL2_TLBIRVAE1IS_TRAP; + + /* FEAT_TLBIRANGE && FEAT_TLBIOS */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_TLBIRVAALE1OS_TRAP | + HFGITR_EL2_TLBIRVALE1OS_TRAP | + HFGITR_EL2_TLBIRVAAE1OS_TRAP | + HFGITR_EL2_TLBIRVAE1OS_TRAP; + + /* FEAT_TLBIOS */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_TLBIVAALE1OS_TRAP | + HFGITR_EL2_TLBIVALE1OS_TRAP | + HFGITR_EL2_TLBIVAAE1OS_TRAP | + HFGITR_EL2_TLBIASIDE1OS_TRAP | + HFGITR_EL2_TLBIVAE1OS_TRAP | + HFGITR_EL2_TLBIVMALLE1OS_TRAP; + + /* FEAT_PAN2 */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_ATS1E1WP_TRAP | + HFGITR_EL2_ATS1E1RP_TRAP; + + /* FEAT_DPB2 */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_DCCVADP_TRAP; + + /* Base architecture */ + el2ctx->hfgitr_el2 |= + HFGITR_EL2_DCCVAC_NOTRAP | + HFGITR_EL2_SVC_EL1_NOTRAP | + HFGITR_EL2_SVC_EL0_NOTRAP | + HFGITR_EL2_ERET_NOTRAP; + + el2ctx->hfgitr_el2 |= + HFGITR_EL2_TLBIVAALE1_NOTRAP | + HFGITR_EL2_TLBIVALE1_NOTRAP | + HFGITR_EL2_TLBIVAAE1_NOTRAP | + HFGITR_EL2_TLBIASIDE1_NOTRAP | + HFGITR_EL2_TLBIVAE1_NOTRAP | + HFGITR_EL2_TLBIVMALLE1_NOTRAP | + HFGITR_EL2_TLBIVAALE1IS_NOTRAP | + HFGITR_EL2_TLBIVALE1IS_NOTRAP | + HFGITR_EL2_TLBIVAAE1IS_NOTRAP | + HFGITR_EL2_TLBIASIDE1IS_NOTRAP | + HFGITR_EL2_TLBIVAE1IS_NOTRAP | + HFGITR_EL2_TLBIVMALLE1IS_NOTRAP; + + el2ctx->hfgitr_el2 |= + HFGITR_EL2_ATS1E0W_NOTRAP | + HFGITR_EL2_ATS1E0R_NOTRAP | + HFGITR_EL2_ATS1E1W_NOTRAP | + HFGITR_EL2_ATS1E1R_NOTRAP | + HFGITR_EL2_DCZVA_NOTRAP | + HFGITR_EL2_DCCIVAC_NOTRAP | + HFGITR_EL2_DCCVAP_NOTRAP | + HFGITR_EL2_DCCVAU_NOTRAP | + HFGITR_EL2_DCCISW_NOTRAP | + HFGITR_EL2_DCCSW_NOTRAP | + HFGITR_EL2_DCISW_NOTRAP | + HFGITR_EL2_DCIVAC_NOTRAP | + HFGITR_EL2_ICIVAU_NOTRAP | + HFGITR_EL2_ICIALLU_NOTRAP | + HFGITR_EL2_ICIALLUIS_NOTRAP; + + } + + /* FEAT_FGT2 traps */ + if ((el2ctx->hyp->feats & HYP_FEAT_FGT2) != 0) { + /* Trap everything here until we support the feature */ + el2ctx->hdfgrtr2_el2 = 0; + el2ctx->hdfgwtr2_el2 = 0; + el2ctx->hfgitr2_el2 = 0; + el2ctx->hfgrtr2_el2 = 0; + el2ctx->hfgwtr2_el2 = 0; + } } From nobody Tue Feb 3 17:34:40 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f59bP1ZbYz6QT5Q for ; Tue, 03 Feb 2026 17:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59bN6Sthz3M32 for ; Tue, 03 Feb 2026 17:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770140080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zA9HmhStF1TNmjvJ45eCgPwjBjRNkXDFa2itdL/WayY=; b=JWV5eaOyK8G3JFjfdnOoqFqdwkkG/JZYo+A25jLIrK4PLL5ctGcLaP16a+bMP5+2qzs1Gy ANJjmXghlE4psxkii9LqF3BWhXe+P/iCGTEI0XFd8QeTt9cVuddSuSEezymhBM+INAY1BU HtsdrjKnk1ApuZu5uTqNDXO1QuQlgVrq2oBZdOhGTh9jSMIb3W2k9gBbVSueXMmhS4wFaI P5zaHfpYh4TKKiuC/muI9y7I0AD35vTYzhkliNe0ujS6r48I5vpwzCM/bDJrpQhY9k5oZ6 cCd8m+BJKTP00bsjT9H6EwZR9WaOD1C4O0jnJvXdYgfBYRmUnUftoSPkhiMF0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770140080; a=rsa-sha256; cv=none; b=Lu50yeIrjFicOcdjZt8rfF8c2woqhHqvOtxP/rnabkpp/9o+QYuUz1va7sRXZ+Ku41mjKW 5AVZyxa7QDzlH7IluBExGSVC7QpvW5+KrQm7+h57NtFgBNQjW4PYHNMAC2TUOQ6QKxbqCw nkwFxi1j6/FsLuBVkZFxxJiW2bUy1eMfVKoONYRBb4g0xym7rEStPqCehzBMbn/ImBiy/e 2ioqFN4uH9MFKBf5i7EXzFLvLgat0LkJaqYt0eQK1Vbv0fJPRKXVzX/+yDOksx40wuufp3 5d/StJJCUfmXZG92WCla+ARpS7gB6Sa8N5Ct0Y2QVRPQMFnb1KEfshwjJFKFzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770140080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zA9HmhStF1TNmjvJ45eCgPwjBjRNkXDFa2itdL/WayY=; b=l84D65XneaJceLry0XBg9FCIGt11DqJwWAcjLgravWA6T9PE1zLlJT0oxZ2jj5tbjvD10x EoCC35BdZ/sYk+AmYihp+oHQSwgwplwvYHVFQRdrwT0+LKQ4tE+imw0zOkwpkFAmrycqjg 12/eAftKbOxSXGnthtKekpBjpe2AWQG3wkoI5+1EMR5m+Bt66IYJSOJFgBeBs3lcIMIRSA uXtIBlIk4K14HIwyyJ4xFH903iuKVT2tzU248HbYWP1nSgY6B3Q5Ls/YwKrmP+nhiI/lmy DN7eoXtC7pzAvOhc4aD9nik9qrt1PJXBupx0eVdjvgnxtqR7ULtwXqikIU5IAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59bN5kWtz7C4 for ; Tue, 03 Feb 2026 17:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f940 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:34:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cbb7441245cf - main - nvmecontrol: Pass 1 to uint8_t arg List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbb7441245cf2b22efed17dec3c88587c980c691 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:34:40 +0000 Message-Id: <698231b0.1f940.26da653a@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cbb7441245cf2b22efed17dec3c88587c980c691 commit cbb7441245cf2b22efed17dec3c88587c980c691 Author: Warner Losh AuthorDate: 2026-02-03 17:34:36 +0000 Commit: Warner Losh CommitDate: 2026-02-03 17:34:36 +0000 nvmecontrol: Pass 1 to uint8_t arg The rae arg is uint8_t (which we then shift over to the right bit. Pass '1' instead of 'true' here to match the interface. While true is promoted to (uint8_t)1, we don't use it as a bool in read_logpage(). Fixes: 5322eec86ae4 ("nvmecontrol: Always set the RAE bit on telemetry-log requests") Sponsored by: Netflix Reviewed by: chs Differential Revision: https://reviews.freebsd.org/D55060 --- sbin/nvmecontrol/telemetry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/telemetry.c b/sbin/nvmecontrol/telemetry.c index 60bd3e025f3d..2561d7dff20d 100644 --- a/sbin/nvmecontrol/telemetry.c +++ b/sbin/nvmecontrol/telemetry.c @@ -139,7 +139,7 @@ telemetry_log(const struct cmd *f, int argc, char *argv[]) /* Read the log page */ size = sizeof(tlp); off = 0; - read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, true, + read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, 1, off, 0, 0, 0, &tlp, size); switch(opt.da) { case 1: @@ -171,7 +171,7 @@ telemetry_log(const struct cmd *f, int argc, char *argv[]) (unsigned long long)blocks); fflush(stdout); } - read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, true, + read_logpage(fd, NVME_LOG_TELEMETRY_HOST_INITIATED, nsid, 0, 0, 1, off, 0, 0, 0, &buf, chunk); if (write(fdout, &buf, chunk) != chunk) err(EX_IOERR, "Error writing %s", opt.outfn); From nobody Tue Feb 3 18:40:30 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5C3M0CxSz6QY2V for ; Tue, 03 Feb 2026 18:40: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5C3L4b5bz3Tqr for ; Tue, 03 Feb 2026 18:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770144030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dQ2k3/3wfUC/+Es6hwSKfP0lstyKW7NDGyIEbSaSyns=; b=NW4U8hfndO8tJtY4qKc67e/m2xuY/n3HbU74RC500liLdwT/4pGEKlydFSLESzMQ41kuKL rGhz8n9NRT5bv1+76N5XWfnqeL684pLfwfBevnfy1yt/mSYGJPhAFEozPWeol2dvdQfmD6 FuDApvBsHijCePo1fFvmUFUXI9k5I9rkpUsCMhuZx1kPCrgJJUVfBJ5bOcv8nIdKcWku2k vCc8NVGBbpWXLUINuWfNhddFbkSJKFtAEvRIjOjPIKiHI1H2qw3eNBGa2EaigpWgCka1UT Z/u/ctLXXAzz5RiRebk8+vqpLcOolmrO2o0irEpJbIOnq8RvwAzrLMCInY4aow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770144030; a=rsa-sha256; cv=none; b=xgAyYmC3ApjHURi0EfDbRvrK0h/ySZx5/oJkZ+W5QEfb2UvvAcmuV+eFx4igu63cKlQrKF ZN6V5xp8zt6tHr6A/TR5vHMROpE7tG9/mKyG+mBJTcRL8elxX4IlNoTUOOga3Yt/Nl7Nwt 3+iqUoRiyRIWS50UVvxg3i+QOU25Oykl8WfaxJl6s2pFSARgsKl/JtJKBgOwRr4zYmgS+6 0XY5zT7oF/CMwogAw38RA0W0P5aMQxPJpRtpadTZ9Ns4MTYp+/qRapBdurhrfOTq3NHNCV 1IRW+FSJaOsOoBdYFCrVb4ig1JWJRYu2djOhbbdPauPi+cz6r7iq4rLQeUAk8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770144030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dQ2k3/3wfUC/+Es6hwSKfP0lstyKW7NDGyIEbSaSyns=; b=v3ijVF7l9/aPAULlEQy2k68TSPrs7z29z+ESs6amUempSK1JikUL2dbxYR7lkDVcmdjqHZ p/1dTl4rcLgGlLIFEuZpJGOnACQZ/B/9bmqrrJZ/c7LXhtry0R6sRYPJVvCU1KmYj9jibf 6CXMWIO81wHmRdRtndWane40y0bvOk5uDyyHbG73r2X2wVwdzeVRsZuBtSpcRPF0v+pZ1l j1fWBUxlGZz99uoOPHkxgBxkFkUSBvyV0Du/Cq5c0rF0R8EdtOORrOJhppHZLdDtYFUvCJ m+1AM2Wu0BPnxxdrzc/Nl+LcvOHgKAsN2nVI8Xs+uentLYaP6qJ0PhOiEpHN4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5C3L3C2zz9DV for ; Tue, 03 Feb 2026 18:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3068a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 18:40:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 6ea242cc305b - main - LinuxKPI: add str_read_write() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ea242cc305b7ec5b44488c9f04d413ebbf0b731 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 18:40:30 +0000 Message-Id: <6982411e.3068a.36d37c7c@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6ea242cc305b7ec5b44488c9f04d413ebbf0b731 commit 6ea242cc305b7ec5b44488c9f04d413ebbf0b731 Author: Bjoern A. Zeeb AuthorDate: 2026-01-31 23:16:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-03 18:39:30 +0000 LinuxKPI: add str_read_write() Needed by a wireless driver. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D55029 --- sys/compat/linuxkpi/common/include/linux/string_choices.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/string_choices.h b/sys/compat/linuxkpi/common/include/linux/string_choices.h index 74aa3fd019b2..18842dbd86a2 100644 --- a/sys/compat/linuxkpi/common/include/linux/string_choices.h +++ b/sys/compat/linuxkpi/common/include/linux/string_choices.h @@ -68,4 +68,13 @@ str_enable_disable(bool value) #define str_disable_enable(_v) str_enable_disable(!(_v)) +static inline const char * +str_read_write(bool value) +{ + if (value) + return "read"; + else + return "write"; +} + #endif From nobody Tue Feb 3 19:16:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5Crb5GCSz6Qbbq for ; Tue, 03 Feb 2026 19:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5Crb2pHTz3bmK for ; Tue, 03 Feb 2026 19:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770146175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tPDUQukETNHIXVS4wg1ks3ry4/LjCewJVvA5I71KdQ=; b=dBsq4xWnysPfXSG1Viy3kQWMI6DzYiB6tKI+c6tbRHd791dCFP9u/wdzHlP/6ZMZBlULHz 0b/cmWNfCK2Ay2ccqJVdMMoONj3AFQdR1kK4W6auxW8Gsz4caOBKaZyEsvw7J1bPeNvmhC yqwQ1YhZGr/vJ45cJBrcsSVDbyqLsk+WOmVF7w6XVUVPlkBayHeW78N7XByoqKuwg4bRQb 3pf6cvctHQX4nUXRIrFQFwRAQMaXfZcL2CLrM+TpH2XhsWM0+xKUrzsLwpzN3P4YiaVOQt B3ItB2LWL1mmtnrm8ebkfcAgGeJy3P/1/oqN4Pq7890ZSEsIvLpgI5nm3nFvVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770146175; a=rsa-sha256; cv=none; b=vsJ42tiAMI7w5eBStza70W7qlGDoVk0MDEMQMpy5renbsbshfwRHD6Y3bSEFwkO8rbkXb4 DDTFBrbJVmGHigUlAWOExN6zLV3ZNSeKRBxXintLgHMwm+fW9FhrForXO07JVfAs7BTk5m CeNV+n1nf4kaRN23daRXBDuWBX/PtbZ6f8k4q6HDFZSVs1dwIUNwHE9u99Ct1F8XmVg5dU uaUYj+oXjFR/oyOmaMRgDeN9Fv3+tBQlK7WCi00Uho6/4GAxoYcyglu7oyLkLwXfWXBcJL dESmrlinY0R+GnQGjsalTROTZbiYEsEGmUoM4nzGQcHb6uajkwcpOHQB9uzoiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770146175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tPDUQukETNHIXVS4wg1ks3ry4/LjCewJVvA5I71KdQ=; b=XOipgfCCgscWUPppIRifJdHk1Ik0CZ8sAyrXOaevPXo4V/x/5f72iiHBPrWuzaFgwNGv20 5DXVD/aplSDs5JYDqb5Sf7GztLjpTBS6adYEH2Uv4fNmohZfScbzcXm2lBo1T7ruKSZ8Or M3bYD0Hj2zmJW7NsvUdL+E2WEuT8RDw2OeVNSEA/1eEKlTskCXR2XRTVbkMK8NEEKDJaZQ 6qgiSN8rfFbqxqxWflzEQhrNpvwJr5I7x5IuBefdYQzt4P3gKHd38wuJNKkZk49WSMcd3C xqZedUKc11lpjyYvUa8iqUBpAJVAB/zNFc3QUVpr0mhWcG+cNGfTm/I3QsRwPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5Crb1SfWz95G for ; Tue, 03 Feb 2026 19:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33420 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 19:16:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8cfa6ddcee02 - main - vmm: Fix a resource leak in an error path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cfa6ddcee021adaf9515286e25dd0c961adf8a4 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 19:16:15 +0000 Message-Id: <6982497f.33420.536840f1@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8cfa6ddcee021adaf9515286e25dd0c961adf8a4 commit 8cfa6ddcee021adaf9515286e25dd0c961adf8a4 Author: Mark Johnston AuthorDate: 2026-02-03 19:09:28 +0000 Commit: Mark Johnston CommitDate: 2026-02-03 19:09:28 +0000 vmm: Fix a resource leak in an error path vmmdev_create() increments the VM count as its last step and calls vmmdev_destroy() if it fails. However, vmmdev_destroy() unconditionally decrements the count. Correct this bug by reordering operations. Fixes: 1092ec8b3375 ("kern: Introduce RLIMIT_VMM") Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D55068 --- sys/dev/vmm/vmm_dev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index fa51dc950459..ad3cc5725f9c 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -990,9 +990,15 @@ vmmdev_create(const char *name, uint32_t flags, struct ucred *cred) return (EEXIST); } + if (!chgvmmcnt(cred->cr_ruidinfo, 1, vm_maxvmms)) { + sx_xunlock(&vmmdev_mtx); + return (ENOMEM); + } + error = vm_create(name, &vm); if (error != 0) { sx_xunlock(&vmmdev_mtx); + (void)chgvmmcnt(cred->cr_ruidinfo, -1, 0); return (error); } sc = vmmdev_alloc(vm, cred); @@ -1015,12 +1021,6 @@ vmmdev_create(const char *name, uint32_t flags, struct ucred *cred) vmmdev_destroy(sc); return (error); } - if (!chgvmmcnt(cred->cr_ruidinfo, 1, vm_maxvmms)) { - sx_xunlock(&vmmdev_mtx); - destroy_dev(cdev); - vmmdev_destroy(sc); - return (ENOMEM); - } sc->cdev = cdev; sx_xunlock(&vmmdev_mtx); return (0); From nobody Tue Feb 3 19:16:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5Crc4c7fz6Qbch for ; Tue, 03 Feb 2026 19:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5Crc2GGDz3bbg for ; Tue, 03 Feb 2026 19:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770146176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbgAke99cHDu4MjoGJbytWCmnRYUOwtnhBR7Tr3UCrM=; b=MoSsaiPaImUQgttacmNbt1Ui9mYzrtAouBHkNvVCDV53WN1WxMvjQaQhBCIY4+4SIXJSfb I0TX3BHfBf9N8F3KUnCGpEqLENf2YAZrWHhpDwgNHLCNRsiyxzdtgALto9DCznOYd+NtAV 0TklbF+n9yxFn2h4XNZtpyWhtp4go12EzO458vsV4lTS1MLuOodnCJzpDv+ZnsYxPrgFrQ WycKTAb+OSUo+2ChtFWf9oSbybGviXbeVtTdk7uyf3XH+Y6y9yZJIj1HfOXH68h3h7r2UY KVtkGkO72TyDEZP0s1Hm7As8if/GY3r+Dpr9KwSqJXfnrQG8WBqKuneqyIJ63Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770146176; a=rsa-sha256; cv=none; b=Njdt7u1ruuJjbQnqU0CDiYpEpOzIi2Xm8EAcxlqBc9aOPxJKptqDriiXIR8zYJYr0P/R/1 Nh2M0CWNzBWV1nc/bnL8CtZQ1w+Ndjk+OR96PZuwvMlrZIqyhWOqmsYNkok8HATv5772G1 8VbFnQxSwIW9p15YwZcBdbKGzKfHuci0hvuBE9FkoGLyKV1aFV+WQ568kgzvUBlZvajitS JsqmDt+LBhTASlFpIrDENjGfFsGDYHrXvHCNeOJgmkYNAffB2MBLvnPBJ+pyQEaNoQ7yez aTzULq+Xb7Ntksnz1/gDmBV+dDF0DEgmxvtm41x5P3uyItkl4evRczqyHJNJ2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770146176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbgAke99cHDu4MjoGJbytWCmnRYUOwtnhBR7Tr3UCrM=; b=bf5ErBOa5mAim56fFduDq1rtotsWvu3OJ1cDyNfkuICeFYlFmLMcrb18FHXqthw2ngeps1 242EDJdVlotlVBf8uhnGUGAkMidFqNTWdwl4EUQ69GW6bkiVDZqAxg3vpJlZFyc1HQyW0g rkV/R2FbEkFz+nSQ05itmRdogQoMdus1iwMntV5V5v/GMgf7FxGfAT4SG0evOQfkY8cBmX ZRQn8Cn+HJUxRL7Ckl2t90SFngPLSRDaA7dfHjXAgL1PIwtFDZU6crYWVGsNTcg8RUYrqn Vaf/NJ+TkAFQpJug5s61gL9lxg/M4UWAp3cGCMXBxDdk1Ks9bP9lyDX0JVWXeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5Crc1dVVzB45 for ; Tue, 03 Feb 2026 19:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b38 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 19:16:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2d0564b9daf4 - main - vmm: Remove an unneeded NULL pointer check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d0564b9daf49c46e0e4ef6c7d162c73fc8b35d7 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 19:16:16 +0000 Message-Id: <69824980.33b38.31bc03ab@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d0564b9daf49c46e0e4ef6c7d162c73fc8b35d7 commit 2d0564b9daf49c46e0e4ef6c7d162c73fc8b35d7 Author: Mark Johnston AuthorDate: 2026-02-03 19:09:44 +0000 Commit: Mark Johnston CommitDate: 2026-02-03 19:09:44 +0000 vmm: Remove an unneeded NULL pointer check sc->vm is unconditionally dereferenced earlier in this function. No functional change intended. Reviewed by: bnovkov MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55069 --- sys/dev/vmm/vmm_dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index ad3cc5725f9c..09fd3a9048bd 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -876,8 +876,7 @@ vmmdev_destroy(struct vmmdev_softc *sc) free(dsc, M_VMMDEV); } - if (sc->vm != NULL) - vm_destroy(sc->vm); + vm_destroy(sc->vm); chgvmmcnt(sc->ucred->cr_ruidinfo, -1, 0); crfree(sc->ucred); From nobody Tue Feb 3 19:24:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5D1q0DPKz6QbnP; Tue, 03 Feb 2026 19:24:15 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5D1p6lCkz3f8y; Tue, 03 Feb 2026 19:24:14 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770146654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KT9Sp7zaBzdbFI9Fdf0I8xaUS712tXwY4c26Soxziww=; b=ZgiyexSogaOMb9nd6oMwVeH9nOiEsERsJlwkMrA5diBDZzpY922Jjy17BkPi37j/dNRfP6 vQhsHmYdLvZq3aieGablHYB6KZu0PGn332m7AAsyzEWkLLRR4oCpw+QAIUmkWKzqQhdCP5 ltbPEsMAWSV5cdQWm8x0EbgqloT1MKtoD5SN9F/LP8EkZbkyLfKmtv9XzfuKDya3NLibaz D5MD3ImxUzIrbpPrW8WOCIbWomhrwR0JkPgZ9RpsY2tlhf/4TyVSvaX09FvDPBvng4Wf9M dN322Imq2Q47CpTLb7B1G/6Ww/MJlhpgxD+z6DEegpMKroyNPhu6gcU3vXTWug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770146654; a=rsa-sha256; cv=none; b=TB2oLKbluaZ1dyWr/eqcxWsfUhqRL3Y0Ti9UtKdkEVTnEEg7+F3q2Z2FdDLv37b1IDdhU1 2tW23UC6NMKjrHg0FxGErmDkE72par8UCThQHXdN9w60q9ygEaeU4KP0Vw+7Jg8Q2hs6iv JDMW8vf07+WrIHH0wn/XGFygND3JoLinKSgY05tZZATfrpATa4sHeyshfuY7xkMOh69q8U w4fMHdIS2aI8ViZmBvchgIt4ELXVVQ8BOuvBDL0E7bL6U0ovulyuX9IQF3Wc8LMpAl6cwD G+AM5urq8kXmvf6Ch96bJicHv+PS23rquRpIYQe09XTwqtGpoduS1ZEkeCLiMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770146654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KT9Sp7zaBzdbFI9Fdf0I8xaUS712tXwY4c26Soxziww=; b=KoPZvDEVX4DBC7gcA5d+1xYNfKhV3uHlAhj3nhSSg9+Bj+ncg1nqLTv5VtgOCX2QJSpUpC nc+gE0Eo9wB2PSZnv5LsmblPC92f2C3u2N8cUr+nd5P5bMNtGEAGlt5AtZeui/eX9e0gzq KsT9w0+YRz9020Z0w8J5ynVzXI0JdcOpMYqIKUYK8MlccTikfqdsav/ROV+MsPShz3uMD0 MW8doAd2Qv1hwqh04A6LPBaIXsMzhU2eZPxjkdLbieqi19ZD1WMN2d6SQsPCca/Zpgjylv xKBq2ldFUdDxj1S0juAOY7SzXWIBZ54nuFuyp+r5AiVmMn2LyrZPePEpbN0HAQ== Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1101:be00:397f:c722:123e:f103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: tuexen) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f5D1p0fKgz4L9; Tue, 03 Feb 2026 19:24:13 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: d195b3783fa4 - main - sctp: fix socket type created by sctp_peeloff() From: Michael Tuexen In-Reply-To: Date: Tue, 3 Feb 2026 20:24:10 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <697e46e9.2271d.66b41ecf@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3864.300.41.1.7) > On 2. Feb 2026, at 20:28, Gleb Smirnoff wrote: >=20 > Michael, >=20 > On Sat, Jan 31, 2026 at 06:16:09PM +0000, Michael Tuexen wrote: > M> commit d195b3783fa4de5c1a95f6d95eb9444abce6778b > M> Author: Michael Tuexen > M> AuthorDate: 2026-01-31 18:11:08 +0000 > M> Commit: Michael Tuexen > M> CommitDate: 2026-01-31 18:11:08 +0000 > M>=20 > M> sctp: fix socket type created by sctp_peeloff() > M> =20 > M> When calling sctp_peeloff() on a SOCK_SEQPACKET socket, the = created > M> and returned socket has the type SOCK_STREAM. > M> This is specified in section 9.2 of RFC 6458. > M> =20 > M> Reported by: Xin Long > M> MFC after: 3 days > M> --- > M> sys/kern/uipc_socket.c | 6 ++++-- > M> 1 file changed, 4 insertions(+), 2 deletions(-) > M>=20 > M> diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c > M> index efc8ebfcece2..4014006ce2e5 100644 > M> --- a/sys/kern/uipc_socket.c > M> +++ b/sys/kern/uipc_socket.c > M> @@ -1292,7 +1292,7 @@ solisten_enqueue(struct socket *so, int = connstatus) > M> =20 > M> #if defined(SCTP) || defined(SCTP_SUPPORT) > M> /* > M> - * Socket part of sctp_peeloff(). Detach a new socket from an > M> + * Socket part of sctp_peeloff(). Create a new socket for an > M> * association. The new socket is returned with a reference. > M> * > M> * XXXGL: reduce copy-paste with solisten_clone(). > M> @@ -1304,6 +1304,8 @@ sopeeloff(struct socket *head) > M> =20 > M> VNET_ASSERT(head->so_vnet !=3D NULL, ("%s:%d so_vnet is NULL, = head=3D%p", > M> __func__, __LINE__, head)); > M> + KASSERT(head->so_type =3D=3D SOCK_SEQPACKET, > M> + ("%s: unexpecte so_type: %d", __func__, head->so_type)); > M> so =3D soalloc(head->so_vnet); > M> if (so =3D=3D NULL) { > M> log(LOG_DEBUG, "%s: pcb %p: New socket allocation failure: " > M> @@ -1311,7 +1313,7 @@ sopeeloff(struct socket *head) > M> __func__, head->so_pcb); > M> return (NULL); > M> } > M> - so->so_type =3D head->so_type; > M> + so->so_type =3D SOCK_STREAM; > M> so->so_options =3D head->so_options; > M> so->so_linger =3D head->so_linger; > M> so->so_state =3D (head->so_state & SS_NBIO) | SS_ISCONNECTED; >=20 > This creates a socket where: >=20 > so->so_type !=3D so->so_proto->pr_type. >=20 > I'm not sure this is a good idea. I was actually looking into = removing so_type > at all. What does SCTP idea is about this peel-off thing? If the = resulting > socket is a stream one, shouldn't its so_proto point at = sctp_stream_protosw? Yes, that makes sense. But this is now a generic routine (I think it was an SCTP specific one = in the past), how can I refer to it without using sctp_stream_protosw? Best regards Michael >=20 > --=20 > Gleb Smirnoff From nobody Tue Feb 3 20:01:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5DrH4Xb8z6QfRT for ; Tue, 03 Feb 2026 20:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5DrH3qN9z3kZV for ; Tue, 03 Feb 2026 20:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770148863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H+9rCW0zKiy/bqzWiaOeDv+CwvUCslYnokG6HVOSYtQ=; b=Rrky85QpI2bD1KyK5/EeUL+o9wslIIQ4p5sj2vMUvRsapa8FWh4az2MHX4ucOK19feCZ9V 8NYn+UJ1dHkQ/PlwUCDREVMJ/1Mbe3cI3OEygc5OaQZYKW9I83q1r3C338S00/JW2rN/zh fq9FuP/mljbuWNGsTvPIEu024ERzwM+Ir4wKQkFUoUWhZP1UN/+cuqvAFB5EsMBw235Wh9 GZMi5IMfdiJMu1auve8BAZU6QA1wmBquWIrcV3uhP65WBYhiTsDKd1Y/Rt5aCYVGnruQZY KCEDgn1X0XVgpN0ujnJKh/9TFLCJstMHmfoo0LARxVMbtAsEjowUyAmpVVb0bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770148863; a=rsa-sha256; cv=none; b=mPnLz3QJcg6E7jfo1pD0BrsvDeN5i5sXSXNPKLF7l2sqVC5W12Ow6xttgaHLNpgHODXewa U8JHFpsKErLkM6OTkKbP2vRLLRLsn7dprWntjMRdZxU9f3Lz3QWwK8bvnRGHTOsRwyt7Ql yYtaWBGEgHNJj1EGYlf7SIuqi48/Hks26gWH9cFEQcpJly1Exzq8RdH9h++7OxFFt5W9P/ AyxINBXQlvcv3uLZIjXpiJywI9bvBtafNum8ET/K7zDWjs8vTeel1tCrrepTyywAk+/VAh 3oRRS3sOWMX+TeoC6Q3tqdDr2YtjlgIylKjha4rY9tptIahniAIQxTZCv0IZYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770148863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H+9rCW0zKiy/bqzWiaOeDv+CwvUCslYnokG6HVOSYtQ=; b=mh3/KuMHhzv1Wbn7DwdL8Dw2pM+AuHhG+wUgtDH+Gfzi94TMSB6hgzKmRrzt5gfPUoHMRf 3JMCr9GBVfZlDDrHbP3ysg6dPwXtEpJO5BuM8SzxteTLQdFG23tv4WTIj66vF89sCMZLC3 yY+tf0jCW2rFTAwELv0mbnQTp+7z3huuCHAYT4ofNTbAbT4uFhoYkGOCIQIHXG9CUWtTuK MsXGEmdGfPSqnefCLSfbNLI5Lz3yYAqvXKcJI7hY+Kye0s2Aw5I8yzU2dZRWZWTSkNeoO/ 9Te4yz23hkcG7Tj2TkpTw5OFj2noHgbDu04hzAREOatQGevgtUt68sV5qSbFSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5DrH2yWJzBn4 for ; Tue, 03 Feb 2026 20:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3861b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 20:01:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8df7af9c9ecf - main - LinuxKPI: string_choices.h: use ternary operator List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8df7af9c9ecf7fc0b1c664f3d95893a9fcc16fcd Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 20:01:03 +0000 Message-Id: <698253ff.3861b.60e3122f@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8df7af9c9ecf7fc0b1c664f3d95893a9fcc16fcd commit 8df7af9c9ecf7fc0b1c664f3d95893a9fcc16fcd Author: Bjoern A. Zeeb AuthorDate: 2026-02-03 18:50:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-03 20:00:12 +0000 LinuxKPI: string_choices.h: use ternary operator Switch from using if () else to a direct return (?:) code. No functional changes. Suggested by: kib (D55029) Sponosred by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste (before removing more () as suggested by him) Differential Revision: https://reviews.freebsd.org/D55088 --- .../linuxkpi/common/include/linux/string_choices.h | 25 +++++----------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/string_choices.h b/sys/compat/linuxkpi/common/include/linux/string_choices.h index 18842dbd86a2..db540d3e7d40 100644 --- a/sys/compat/linuxkpi/common/include/linux/string_choices.h +++ b/sys/compat/linuxkpi/common/include/linux/string_choices.h @@ -33,37 +33,25 @@ static inline const char * str_yes_no(bool value) { - if (value) - return "yes"; - else - return "no"; + return (value ? "yes" : "no"); } static inline const char * str_on_off(bool value) { - if (value) - return "on"; - else - return "off"; + return (value ? "on" : "off"); } static inline const char * str_enabled_disabled(bool value) { - if (value) - return "enabled"; - else - return "disabled"; + return (value ? "enabled" : "disabled"); } static inline const char * str_enable_disable(bool value) { - if (value) - return "enable"; - else - return "disable"; + return (value ? "enable" : "disable"); } #define str_disable_enable(_v) str_enable_disable(!(_v)) @@ -71,10 +59,7 @@ str_enable_disable(bool value) static inline const char * str_read_write(bool value) { - if (value) - return "read"; - else - return "write"; + return (value ? "read" : "write"); } #endif From nobody Tue Feb 3 21:12:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5GQc62Wtz6QlCD; Tue, 03 Feb 2026 21:12:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5GQb50Skz3slt; Tue, 03 Feb 2026 21:12:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003b.ext.cloudfilter.net ([10.228.9.157]) by cmsmtp with ESMTPS id nIwwvkbTEAPFJnNh8vqS4N; Tue, 03 Feb 2026 21:12:22 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id nNh6vE1p7RXCAnNh7vAjXn; Tue, 03 Feb 2026 21:12:22 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=CNonnBrD c=1 sm=1 tr=0 ts=698264b6 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=HzLeVaNsDn8A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=XBysha4TQYMQKsZSQ_4A:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E334D16DD; Tue, 03 Feb 2026 13:12:19 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id ADB3214; Tue, 03 Feb 2026 13:12:19 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Olivier Certner cc: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= , ShengYi Hung , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3e6e4e4a0d42 - main - hwpstate: add CPPC support for pstate driver on AMD In-reply-to: <3081716.hHqAuc6tWs@ravel> References: <6958849c.4623e.7b53a822@gitrepo.freebsd.org> <86ms1pdgnv.fsf@ltc.des.dev> <3081716.hHqAuc6tWs@ravel> Comments: In-reply-to Olivier Certner message dated "Tue, 03 Feb 2026 16:14:10 +0100." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 03 Feb 2026 13:12:19 -0800 Message-Id: <20260203211219.ADB3214@slippy.cwsent.com> X-CMAE-Envelope: MS4xfLUP5u3ZUdK/EOMwUvi4qHl7DWn0qr0xi8NN9r1IY10TlJLdU1sK6j4NLvUQWTNfZAorC29F+mZEcU+v52S1xRrFYkVLEtSNSTuR/1U/YoyZO/lr0zRN pkFWt/DypMDHpiSWPuMLcfPuu/XEeZrYuMbHZqqUt+dWAkhpagwCYXxhQrS/4P7jQpJu4OTs3Xnko7V/QogwHwtbLGp+L+eMYRog2xyJrkj984P8hVKLePqJ a0BAP+JxpdHySOA9tax66KEO/Xlq1IKkCrmLJrlzDinj0e3I0QVuCLiONGj5fxhHjyOWzhCVhYGdeDQktxYzVmwdalQIS4huv6r/CeNgMDT5qFl+P5KVVNTP O+vCbhx26Ns8Eoj7mi8idyCLYdR2HbokA3Py6c4ICR2L6RnMmhg= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4f5GQb50Skz3slt X-Spamd-Bar: ---- In message <3081716.hHqAuc6tWs@ravel>, Olivier Certner writes: > --nextPart2431391.THHZn3L5Ee > Content-Transfer-Encoding: 7Bit > Content-Type: text/plain; charset="utf-8"; protected-headers="v1" > From: Olivier Certner > To: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= > Date: Tue, 03 Feb 2026 16:14:10 +0100 > Message-ID: <3081716.hHqAuc6tWs@ravel> > In-Reply-To: <86ms1pdgnv.fsf@ltc.des.dev> > MIME-Version: 1.0 > > > This doesn't work. You are reusing the same OID already used by the > > Intel subdriver. The result is that whichever one happens to be first > > on the linker command line works and the other one doesn't. You have to > > either use a different OID for each subdriver or have both subdrivers > > share a single boolean. > > Yes, we are aware. There's already https://reviews.freebsd.org/D54528 about > that. > > We did not feel this was urgent, especially since I intend to retire `machdep > .hwpstate_pkg_ctrl` from the AMD driver entirely (and obsolete it in the Inte > l driver) in favor of an easier to use interface, but this has lasted for a w > hile now and could prevent the same knob from working in existing Intel cases > . > > I'll move D54528 in the coming days. > > -- > Olivier Certner One of the subsequent commits broke the commit that allows disabling of CPPC through a tunable. Setting sysctl machdep.hwpstate_amd_cppc_enable failed: 12 -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Tue Feb 3 21:16:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5GWl3Vfsz6QlVc; Tue, 03 Feb 2026 21:16:51 +0000 (UTC) (envelope-from markj@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5GWl2mn5z3tPJ; Tue, 03 Feb 2026 21:16:51 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770153411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0QBtDf+1H1OHQqTP+ex/z3j4FLrbjdwAo7Ya7BGxUN8=; b=iGCwbt5hMUtECoCgYbLKQNOtH4JmmPBs1kVHm934zVW7AUeFovonucY+95Ljt8ndUFs5S4 ztAE5fBY48ywnMfUVCa7qpeVqq5Yq8FrO1uYwlcrQQ2Wf0GypdXJ7eYNzvYA1i8Me5goHC TogYb5/RBdwJS2Mm2qsM0UJGNcKNIqjpSHyIAnlKu5HiiSPTfoM12uGSdH0bB1mFYaNMd/ ZRVKCfKAMcKo8oFUz6f1aqNbH0cqcTgbjdIH2rAFZCk4TULEgp3rwj5f3UD4t/X2m9QXe6 nnYq9V6+h+wpX2c+yz6OeRmRAMh9h701U6KJPaKwY2iE2hb0kib4pzYz9pjU9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770153411; a=rsa-sha256; cv=none; b=rJgqIc6LQxBkfYELdX7TRYM0ZoZ8aLARVhry2BTzB392H7vcR9W7RseWGyLkk76WYqtKhE J/WzOHU/dU/K11jZewB/9xwnFaUzUIki1FGl1tPXI3uZE1dSxf/ASTKwyytZZi1nBkjoX3 9xbCpjGUrgcueLlzluBBQ8XcyYuN0B+k2PlOHSE6JRLGTFPKxJTG4eQJjHu6THMbCyYDpn 58P7VzlSm0sekhpxQL8g69x5SoFV6UIwWXebC3U+IFTQuwpgtVZjQ+t/ddbQ2tjGmdC2HA JYfOz0uJtmyUnP4n+rvWJU2X/7dKRXH9Hca52udxluF1RoWk+np7Bl7Te5tb6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770153411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0QBtDf+1H1OHQqTP+ex/z3j4FLrbjdwAo7Ya7BGxUN8=; b=cUdp9kKIX5oJPs3PWBL1OhzCeFimR2ZYvK0Pe9Ifv5/USIsE48ZTS+PaA3ZcOyaPc0yHXw 8wQVfeKhD9UWT/AM9sXfuRIbcSjkn3PlLZeLU5NYE6uZXOEJ8NIYBGxd2WH3zj8vOQk9Pz w68FroFpFe3qbwhFYbY1pgjoGjesiHpqjEDQM0giDmU3Bh8KidwDWGvXRrzCjJPppmxVec /tKFN/YycBfze7fmeQbgOaN1k1eVAZlEmyvj8YtVTJNASWpqr3Guq+dcAW2m0clDVdCGpB ZfOpgtoZeh7I/kYH0GiZheAE3MkVNQ9jm3nRWrjWs0o8Dv5I6IaVXuh/xdFuLA== Received: from nuc (192-0-220-237.cpe.teksavvy.com [192.0.220.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: markj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f5GWl0Xssz4YL; Tue, 03 Feb 2026 21:16:51 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Tue, 3 Feb 2026 16:16:49 -0500 From: Mark Johnston To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 349fcf079ca3 - main - net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming Message-ID: References: <6948abb4.37a66.71609f61@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6948abb4.37a66.71609f61@gitrepo.freebsd.org> On Mon, Dec 22, 2025 at 02:23:48AM +0000, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=349fcf079ca32d5c93e45366d2b27638747affeb > > commit 349fcf079ca32d5c93e45366d2b27638747affeb > Author: Gleb Smirnoff > AuthorDate: 2025-12-21 21:31:43 +0000 > Commit: Gleb Smirnoff > CommitDate: 2025-12-22 02:23:14 +0000 > > net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming > > and don't trigger ifnet_arrival_event and ifnet_departure_event for a > rename, as the interface isn't being detached from any protocol. The > consumers of the arrival/departure events are divided into a few > categories: > - which indeed need to do the same actions as if interface was fully > detached and attached: routing socket and netlink notifications to > userland and the Linux sysfs. All addressed by this commit. > - which build their logic based on an interface name, but should actually > update their database on rename: packet filters. This commit leaves > them with the old behavior - emulate full detach & attach, but this > should be improved. > - which shouldn't do anything on rename, not touched by the commit. > - ng_ether and if_tuntap, that are special and will be addressed by > separate commits. Can we get rid of the IFF_RENAMING flag now? IIUC all of its uses are in ifnet_departure_event handlers to short-circuit the handler because the interface is not actually going away. From nobody Tue Feb 3 22:02:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5HXY2BZCz6Qnlc; Tue, 03 Feb 2026 22:02:37 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5HXY1f08z40PR; Tue, 03 Feb 2026 22:02:37 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770156157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=c9ulgnijb9bByR2CWfZqGjnRj8WTzqtCxHmXrrRpaVU=; b=sncouHWOFpd4bzvfMvCu0y2mtZ0OS+96/Q6es+X0BY94HTq9hC4PsyTNA5udFY6GJFgBBa WDYdQR4FUPMC3ijkGX1R4107zS2HT2C6qKzm73ld5kzVahRrfFTDNVHCjYKAS/5Razry0I DlsCyLgfbR7B78QKSZyl+x07cLuZPoVa2vC4vv+0uB5Kcf0IuopRVlyWeS1DjxDwn+hMMw 7iswzqaBfSNaNEadVvhjBytYMJ6+NZjUhCkmMeAY2A+MCGrpEhifTPduQ3IgoS8a1QfITi n5Hnw26rSsEF0BkGhOH+wqOLT6wD2IyDpnKxnzXS7y5HmKD7XLR3GVmrnXvU+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770156157; a=rsa-sha256; cv=none; b=J+JPj6WglZ4YjFR7xaiwvVj8UTsVxDBYap/d1XIXvswwlRIwnwiPeVePR5lKbw83CIsmcb LJZCQrx09xSO/rvUMjyh8P1XPLYrQ3o0J3iw5/VO/eZsk2V7KFLgQc+WKDdYAPcxxHJLQd QBTxh58yotbhVXy7u6jtUT3L5KGlT2x7p2pmkTdt06xwbcXSdMNon/k2Eh05eclNhASFHF tOEbS47jwbJYDQZzCbT3MoOZZCtwG0QquHhdfwC0K0m5oMT1Nm+lkUUsr0fc0iLxDU92Xp fgf/0AZ2dJBkzKCcJjXkQh8sURdDqaaecv9hC7DGkHCvhlYuWqSiDa2LJTBV+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770156157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=c9ulgnijb9bByR2CWfZqGjnRj8WTzqtCxHmXrrRpaVU=; b=ML4QsSQyvf3C8h87XIw4T2/1tg6QDA556vKjtwbXBHDsXbL3mOToWqNi2hwHJZf/g4PDa/ 3XVfXjab4KvuaTqYRP/XXVHDvcAvWCmCF2yZzxoxw6V+Tbl3VN1KlLDC3g/9IYvAvBCKGo SjMHmPhX1urIJqpzFZpIJbJf8g2yBX9C143o+BXU8WWBf2+LTAPcbmGi8j/pulbdn0cmZf ua9RqOQXAVVi84gsU0CeaX5jgZ9SqxpIUivC9DYnG3bCNodlMgJbCMAJY5blNcNou3/Ecw YWAqb7C8t4h9NooLct4qkaQ0AGHlcXy1uN4PpNWp2YyO2oqvF829dU041edccg== Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f5HXX2qXGz792; Tue, 03 Feb 2026 22:02:36 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Cy Schubert Cc: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= , ShengYi Hung , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3e6e4e4a0d42 - main - hwpstate: add CPPC support for pstate driver on AMD Date: Tue, 03 Feb 2026 23:02:27 +0100 Message-ID: <3257190.ZmR5Pbtf01@ravel> In-Reply-To: <20260203211219.ADB3214@slippy.cwsent.com> References: <6958849c.4623e.7b53a822@gitrepo.freebsd.org> <3081716.hHqAuc6tWs@ravel> <20260203211219.ADB3214@slippy.cwsent.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart6487315.O1aUxXEVJ6"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart6487315.O1aUxXEVJ6 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: Cy Schubert Date: Tue, 03 Feb 2026 23:02:27 +0100 Message-ID: <3257190.ZmR5Pbtf01@ravel> In-Reply-To: <20260203211219.ADB3214@slippy.cwsent.com> MIME-Version: 1.0 Hi, > One of the subsequent commits broke the commit that allows disabling of > CPPC through a tunable. > Setting sysctl machdep.hwpstate_amd_cppc_enable failed: 12 Sorry for the breakage. Most probably, it's unrelated to any hwpstate_amd(4) commits but rather to a recent commit of mine changing bool sysctl knob handling. Testing a fix. See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292917. Thanks and regards. -- Olivier Certner --nextPart6487315.O1aUxXEVJ6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmmCcHMACgkQjKEwQJce JiexVQ/8Cc+iPfhBVb99bIvgn8jtwZICLzKpu22iU9L7PYu2EKFpdAy8kro/14n3 Yda8NZkFiDrFDnj+wczyX9ZJz4SqDh980PqB2y4jt1Ri1kjQmDLFXCwV1KTmw9Gl dYH8h1C3qB1AMoLrRHslCSACKkiuyyl1TWBxjfP8E7ijosWsXjApmbWkuiPK6rYx YzF4k8a9mcA91AFqPr/xaKD5kmIxdWimlrdTgOgxA79LCCK1M1+Hll0GOAV3G5sn tDQj//RvlFGAOXh1uaiyKHSqNEtjWCBay+E2moHdp5LE8cR6iYMMeH2I2XWBtpzp Q3t/22/T9s2xNwAuA+tT8UWAkWA18MMCPpi6ono57BUmlsZ0waQUdzp0r5vC/gHj BqZPuJLA0UP+hWNmR+Tl/FGJ/cMmymiwFOV26iVuS6x6JtbKO2Tr6SV053A+bWBO 8AaBtgmyBnsxVk9FxGQrPG1BlbXgGSJJlX5BSYaus376vZon53hB7QAZypwe0o3B WiISLn3wZpDGC4Un7TPzAMuFhSCEpQIaIYZWiuJ+4bUQTQHy1wH3x/kZsgvhj5iq rpEEcqBp1Ru8sf1fO2USn+7VmNlL+5YUVXxnWzg5uhHb6q3/RV3jV4Qxddxbu5F0 BOHFCx2faIL/Z6uOsGbhTdLEXObwmsZPgBZGzFid/iMhwkTiPTA= =8bRV -----END PGP SIGNATURE----- --nextPart6487315.O1aUxXEVJ6-- From nobody Tue Feb 3 22:44:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5JSk2scRz6Qrjy for ; Tue, 03 Feb 2026 22:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5JSk0ryxz450p for ; Tue, 03 Feb 2026 22:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770158662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lu1CT5bF4Q9vQVgya1rsdNyn9ALXP3XprNoLd3kK0r0=; b=UyDCMl6gHdnAmzbeMZLAzIfEN0zR2fC6mp0qiIYKgF+/DbHPGQe+b99xsQ4K0g55kA0qZz ZDBxAI7IviZtIIjGQB114WtDSGZMd8gxsDoluskD/NGADhnTl0VHAzGw3EpJLUgsnwMZQj ts50dmUNfeCMM59r+awmXdoJ+alLXqAxTAASWJxU/HCFS1EgYpA04KronWHELMBR7MTc97 wRASqSMbnzqSIPG01OCAZzZ/5hTSEhGvhBWTJDZ+nX2hflGzEI/PVaucF/xDLYlv8ZrMjE UY1Vu7Zl3CU+PS6uKhI+Y519HhIMCqu0uAIDA91MmRzv7WMtXvSffsRvp/po4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770158662; a=rsa-sha256; cv=none; b=s186KBfc1tje9RUK7hpiEpiWxaAWP9pxvmLSMHNr6sp29yYUJJgJZylKQmbSauDml8SmPO A4hwHfv4rDj1KOfhpvqL0yhUKz48HniZ4bwV8ZFLPfxDV6EBwp7jTt80PLsdBm4cEiFTeI G0qD1YRuuqyGQooEQNUeW5klwEOODUQUASVQT8H8niOkRODjgzFCdt6y6+29XnpSwF63PD y8eNvtZ4WcLd5sWOIWy66toZizTDiQo/QQOmcOf4vUPf4/DHogwK+/34stI1FcxgncryBp jLS6hR9Vv57d+i2iWAguuVhxBYacaIcRyCxte56EaDq0m4zXwa0wq6lLmW9DMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770158662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lu1CT5bF4Q9vQVgya1rsdNyn9ALXP3XprNoLd3kK0r0=; b=EjjUYX2mTqkmNFZxtdN2cw0lmEC5Zgvos6Z9Hakbes5TUMfzodcvSPISeZfh39KwG7jbou rr9tGnofxOYI21TMVsPgoOB/eTIuNXHPEek7Tsg3g8rY5tVmjvHZO9g83hkOose8LWRKJS q6Kv5vkRhzAE87KBRRLT3D0eP/jN61fzqs8Pqd57m8aAFxCwyJ3bgt8pHePvWLLyAuVEzH psmdRnGx3cU7pHIwe5hY+259vJ1bTtf8CZx56yd0gTcFNz4OFvdTjWLCrhfmeDR7u+MjsV ne0XN7ngW5gHVXzG2ZNQFKX0oZ/1tm1gC0M/7Z6IS0a3cdMisQl56xBYxhSwnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5JSk0QNfzYrQ for ; Tue, 03 Feb 2026 22:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18880 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 22:44:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 895e1c6567d9 - main - sysctl(9): Booleans: Fix old value length discovery List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 895e1c6567d9561c86f8d20b47e924911bce989e Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 22:44:22 +0000 Message-Id: <69827a46.18880.6ee8f9c8@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=895e1c6567d9561c86f8d20b47e924911bce989e commit 895e1c6567d9561c86f8d20b47e924911bce989e Author: Olivier Certner AuthorDate: 2026-02-03 22:25:46 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 22:43:49 +0000 sysctl(9): Booleans: Fix old value length discovery When calling sysctl(3) with a null 'oldp', i.e., length discovery mode, 'oldix' can be equal to 'oldlen', and we should not fail. More generally, let SYSCTL_OUT() and SYSCTL_IN() handle corner cases, simply removing the comparisons between 'oldidx' and 'oldlen' and 'newidx' and 'newlen' done by hand as the test just after is an equality that does not require to know if 'idx' is smaller than 'len'. PR: 292917 Reported by: cy Fixes: 406da392ef8d ("sysctl(9): Booleans: Accept integers to ease knob conversion") Sponsored by: The FreeBSD Foundation --- sys/kern/kern_sysctl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index dbe509b3e8e2..be0acb0a4a55 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1637,8 +1637,6 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) * the output buffer, we assume that the caller expected an 'int' * instead of a 'uint8_t'. */ - if (req->oldidx >= req->oldlen) - return (ENOMEM); if (req->oldlen - req->oldidx == sizeof(int)) { int temp_int = temp; @@ -1655,8 +1653,6 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) * Conversely, if the input buffer has exactly 4 bytes to read, * use them all to produce a bool. */ - if (req->newidx >= req->newlen) - return (ENOMEM); if (req->newlen - req->newidx == sizeof(int)) { int temp_int; From nobody Tue Feb 3 22:51:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5JdX1Vzqz6QrnP for ; Tue, 03 Feb 2026 22:52: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5JdX05h6z465S for ; Tue, 03 Feb 2026 22:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770159120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n1J+lDyLva10P4Oj224hTLzORcFlfTCXjpoUrhijS9Q=; b=ao+iSrkGKNIjrPerwxsFL/DY5Ma7K/YwErmJUSAVHod1TZUydzpkSAdgIWv3dqNHxqC9tp WPOw0ytFe7/tFWVDgzoJpssuIgCowidh1sx0pFTViX0tRK4Aj29+bBaYEWbujhut4CTFcq FCpVG+ScpQwtwi559pyB87xxucx1lNK6TUcYS1qUHj7i0hYXQxll+7PemZMycI+gUqsjQE ME2iHYFfhJPZHqKBimstKX9xEwfMZsZRj/IR0ODjoVeRl2NdujeeQ2t8UwBvw+bigU3vFT wjEGm6GjZI22zj2iop74hSpL4YBPjE1KgI2ONJZBibAO2/Blf0X0IFTdJwPmoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770159120; a=rsa-sha256; cv=none; b=VOTbYWR2ac8DlPX33sWI72q9APbkmOo+KBMf7nuBt/axO4NneTyt78Y8Rdw3hIgpjFtbms z48e9nrHwRkF4kuOYFwJGsWUYLi6Q65bwyoyEV76L8C7GUA7KKaPb74vyGae1oOrTTzM/3 EnQiXHFp7f6tmfoxryazgLLpGAjqnMSa+EckFuKYEVkIvvdKvKcuUHg3Z26vVKC48rYw/0 q1C/f/TVyO9zF4Gu9ZzlxoWAnKGFnkOYrxURBu6JH5SPgJBAOUyeESRPB4qDWaFQOpf+V+ ndPScKAgHj+7oxkck3pLJXYJ5FU3E8VUAd5vvGNeNyryUn4AUXOiAdt2Vzk17A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770159120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n1J+lDyLva10P4Oj224hTLzORcFlfTCXjpoUrhijS9Q=; b=hSF+kSqE63OY7aoKJZhfyVlHKSNJZXD6143x+rO6ZT/lEszOyfNXYv3W8AgpREpQ85wYhP E6DIiHbB9rfVSXzlShOeygQvyKlTP7xnQvtKu389jnkSjdvKMTER2ENkLf9NGl+sutR3Gc octN0yiK7JvscfBpFlgmeSjz0ztdPllc3hH/F0WH3LA67ELG6NraCbr2kBjsgQwfbkSf0M CuIJ44R3mFbsHVs0XagZ1zMlKLzHaLG7ZPsnvf8BDYaK3noHLblv0MKLoH0RoZE/5HGsdP HzamOYlHLrmfQFyHbdlwg7Xf7EVr/h92J3bMSXjzKioIvI07+w2Ro5AsD9BE0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5JdW6dKKzZSf for ; Tue, 03 Feb 2026 22:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18aa3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 22:51:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fe9e4eb6f38a - main - pf: fix use of uninitialised variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe9e4eb6f38ae004efb576bf44aded08852f9e6b Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 22:51:54 +0000 Message-Id: <69827c0a.18aa3.6d334ffe@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe9e4eb6f38ae004efb576bf44aded08852f9e6b commit fe9e4eb6f38ae004efb576bf44aded08852f9e6b Author: Kristof Provost AuthorDate: 2026-02-03 12:17:08 +0000 Commit: Kristof Provost CommitDate: 2026-02-03 22:51:28 +0000 pf: fix use of uninitialised variable In pf_match_rule() we attempt to append matching rules to the end of 'match_rules'. We want to preserve the order to make the multiple pflog entries easier to understand. So we keep track of the last added rule item in 'rt'. However, that assumed that 'match_rules' was only ever added to in that one call to pf_match_rules(). This isn't always the case, for example if we have match rules in different anchors. In that case we'd end up using the uninitialised 'rt' variable in the SLIST_INSERT_AFTER call. Instead track the match rules and the last matching rule (to enable easy appending) in the struct pf_test_ctx. This also allows us to reduce the number of arguments for some functions, because we passed a ctx to most functions that needed 'match_rules'. While here also make pf_match_rules() static, because it's only ever used in pf.c Add a test case to exercise the relevant code path. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 7 +++--- sys/netpfil/pf/pf.c | 41 ++++++++++++++---------------- tests/sys/netpfil/pf/match.sh | 58 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 26 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index eb17c4ff5ef0..68616a7de5e4 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1442,6 +1442,8 @@ struct pf_test_ctx { int limiter_drop; u_short reason; struct pf_src_node *sns[PF_SN_MAX]; + struct pf_krule_slist *match_rules; + struct pf_krule_item *last_match_rule; struct pf_krule *nr; struct pf_krule *tr; struct pf_krule **rm; @@ -3128,10 +3130,7 @@ int pf_osfp_match(struct pf_osfp_enlist *, pf_osfp_t); #ifdef _KERNEL void pf_print_host(struct pf_addr *, u_int16_t, sa_family_t); -enum pf_test_status pf_step_into_anchor(struct pf_test_ctx *, struct pf_krule *, - struct pf_krule_slist *match_rules); -enum pf_test_status pf_match_rule(struct pf_test_ctx *, struct pf_kruleset *, - struct pf_krule_slist *); +enum pf_test_status pf_step_into_anchor(struct pf_test_ctx *, struct pf_krule *); void pf_step_into_keth_anchor(struct pf_keth_anchor_stackframe *, int *, struct pf_keth_ruleset **, struct pf_keth_rule **, struct pf_keth_rule **, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3ccf1344fd7d..b7c79437584e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -342,14 +342,14 @@ static int pf_dummynet_route(struct pf_pdesc *, struct ifnet *, const struct sockaddr *, struct mbuf **); static int pf_test_eth_rule(int, struct pfi_kkif *, struct mbuf **); +static enum pf_test_status pf_match_rule(struct pf_test_ctx *, struct pf_kruleset *); static int pf_test_rule(struct pf_krule **, struct pf_kstate **, struct pf_pdesc *, struct pf_krule **, struct pf_kruleset **, u_short *, struct inpcb *, struct pf_krule_slist *); static int pf_create_state(struct pf_krule *, struct pf_test_ctx *, - struct pf_kstate **, u_int16_t, u_int16_t, - struct pf_krule_slist *match_rules); + struct pf_kstate **, u_int16_t, u_int16_t); static int pf_state_key_addr_setup(struct pf_pdesc *, struct pf_state_key_cmp *, int); static int pf_tcp_track_full(struct pf_kstate *, @@ -5108,8 +5108,7 @@ pf_tag_packet(struct pf_pdesc *pd, int tag) } while (0) enum pf_test_status -pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_krule *r, - struct pf_krule_slist *match_rules) +pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_krule *r) { enum pf_test_status rv; @@ -5127,7 +5126,7 @@ pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_krule *r, struct pf_kanchor *child; rv = PF_TEST_OK; RB_FOREACH(child, pf_kanchor_node, &r->anchor->children) { - rv = pf_match_rule(ctx, &child->ruleset, match_rules); + rv = pf_match_rule(ctx, &child->ruleset); if ((rv == PF_TEST_QUICK) || (rv == PF_TEST_FAIL)) { /* * we either hit a rule with quick action @@ -5138,7 +5137,7 @@ pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_krule *r, } } } else { - rv = pf_match_rule(ctx, &r->anchor->ruleset, match_rules); + rv = pf_match_rule(ctx, &r->anchor->ruleset); /* * Unless errors occured, stop iff any rule matched * within quick anchors. @@ -5987,10 +5986,9 @@ pf_rule_apply_nat(struct pf_test_ctx *ctx, struct pf_krule *r) } enum pf_test_status -pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset, - struct pf_krule_slist *match_rules) +pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset) { - struct pf_krule_item *ri, *rt; + struct pf_krule_item *ri; struct pf_krule *r; struct pf_krule *save_a; struct pf_kruleset *save_aruleset; @@ -6300,12 +6298,12 @@ pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset, } ri->r = r; - if (SLIST_EMPTY(match_rules)) { - SLIST_INSERT_HEAD(match_rules, ri, entry); + if (SLIST_EMPTY(ctx->match_rules)) { + SLIST_INSERT_HEAD(ctx->match_rules, ri, entry); } else { - SLIST_INSERT_AFTER(rt, ri, entry); + SLIST_INSERT_AFTER(ctx->last_match_rule, ri, entry); } - rt = ri; + ctx->last_match_rule = ri; pf_rule_to_actions(r, &pd->act); if (r->log) @@ -6337,7 +6335,7 @@ pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset, ctx->source = sr; } if (pd->act.log & PF_LOG_MATCHES) - pf_log_matches(pd, r, ctx->a, ruleset, match_rules); + pf_log_matches(pd, r, ctx->a, ruleset, ctx->match_rules); if (r->quick) { ctx->test_status = PF_TEST_QUICK; break; @@ -6354,7 +6352,7 @@ pf_match_rule(struct pf_test_ctx *ctx, struct pf_kruleset *ruleset, * Note: we don't need to restore if we are not going * to continue with ruleset evaluation. */ - if (pf_step_into_anchor(ctx, r, match_rules) != PF_TEST_OK) { + if (pf_step_into_anchor(ctx, r) != PF_TEST_OK) { break; } ctx->a = save_a; @@ -6391,6 +6389,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, ctx.rsm = rsm; ctx.th = &pd->hdr.tcp; ctx.reason = *reason; + ctx.match_rules = match_rules; pf_addrcpy(&pd->nsaddr, pd->src, pd->af); pf_addrcpy(&pd->ndaddr, pd->dst, pd->af); @@ -6488,7 +6487,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, ruleset = *ctx.rsm; } else { ruleset = &pf_main_ruleset; - rv = pf_match_rule(&ctx, ruleset, match_rules); + rv = pf_match_rule(&ctx, ruleset); if (rv == PF_TEST_FAIL || ctx.limiter_drop == 1) { REASON_SET(reason, ctx.reason); goto cleanup; @@ -6523,7 +6522,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, PFLOG_PACKET(r->action, ctx.reason, r, ctx.a, ruleset, pd, 1, NULL); } if (pd->act.log & PF_LOG_MATCHES) - pf_log_matches(pd, r, ctx.a, ruleset, match_rules); + pf_log_matches(pd, r, ctx.a, ruleset, ctx.match_rules); if (pd->virtual_proto != PF_VPROTO_FRAGMENT && (r->action == PF_DROP) && ((r->rule_flag & PFRULE_RETURNRST) || @@ -6568,8 +6567,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, (pd->flags & PFDESC_TCP_NORM)))) { bool nat64; - action = pf_create_state(r, &ctx, sm, bproto_sum, bip_sum, - match_rules); + action = pf_create_state(r, &ctx, sm, bproto_sum, bip_sum); ctx.sk = ctx.nk = NULL; if (action != PF_PASS) { pf_udp_mapping_release(ctx.udp_mapping); @@ -6659,8 +6657,7 @@ cleanup: static int pf_create_state(struct pf_krule *r, struct pf_test_ctx *ctx, - struct pf_kstate **sm, u_int16_t bproto_sum, u_int16_t bip_sum, - struct pf_krule_slist *match_rules) + struct pf_kstate **sm, u_int16_t bproto_sum, u_int16_t bip_sum) { struct pf_pdesc *pd = ctx->pd; struct pf_kstate *s = NULL; @@ -6729,7 +6726,7 @@ pf_create_state(struct pf_krule *r, struct pf_test_ctx *ctx, s->rule = r; s->nat_rule = ctx->nr; s->anchor = ctx->a; - s->match_rules = *match_rules; + s->match_rules = *ctx->match_rules; SLIST_INIT(&s->linkage); memcpy(&s->act, &pd->act, sizeof(struct pf_rule_actions)); diff --git a/tests/sys/netpfil/pf/match.sh b/tests/sys/netpfil/pf/match.sh index 58c1e021310a..992e32d9f887 100644 --- a/tests/sys/netpfil/pf/match.sh +++ b/tests/sys/netpfil/pf/match.sh @@ -177,9 +177,67 @@ allow_opts_cleanup() pft_cleanup } +atf_test_case "double_match" "cleanup" +double_match_head() +{ + atf_set descr 'Test two match statements in separate anchors' + atf_set require.user root +} + +double_match_body() +{ + pft_init + + epair_one=$(vnet_mkepair) + epair_two=$(vnet_mkepair) + vnet_mkjail rtr ${epair_one}a ${epair_two}a + vnet_mkjail srv ${epair_two}b + + ifconfig ${epair_one}b 192.0.2.2/24 up + + jexec rtr ifconfig ${epair_one}a 192.0.2.1/24 up + jexec rtr ifconfig ${epair_two}a 198.51.100.1/24 up + jexec rtr sysctl net.inet.ip.forwarding=1 + + jexec srv ifconfig ${epair_two}b 198.51.100.2/24 up + + route add default 192.0.2.1 + + # Sanity check + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + jexec rtr pfctl -e + pft_set_rules rtr \ + "nat on ${epair_two}a from 192.0.2.0/24 to any -> (${epair_two}a)" \ + "block all" \ + "anchor \"userrules\" all {\n \ + anchor \"one\" all { \n\ + match in tag \"allow\"\n\ + }\n\ + anchor \"two\" all { \n\ + match tag \"allow\"\n\ + }\n\ + }\n" \ + "pass quick tagged \"allow\"" + + atf_check -s exit:0 -o ignore \ + ping -c 1 198.51.100.2 + + jexec rtr pfctl -ss -vv + jexec rtr pfctl -sr -vv -a "*" + jexec rtr pfctl -sr -a "*" +} + +double_match_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "dummynet" atf_add_test_case "quick" atf_add_test_case "allow_opts" + atf_add_test_case "double_match" } From nobody Tue Feb 3 23:38:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5Kfz2lPvz6Qvp8; Tue, 03 Feb 2026 23:38:19 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5Kfz0Ds2z3Bmj; Tue, 03 Feb 2026 23:38:19 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001b.ext.cloudfilter.net ([10.228.9.171]) by cmsmtp with ESMTPS id nJDTvkcV3APFJnPyMvtykE; Tue, 03 Feb 2026 23:38:18 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id nPyKv23AvX0jpnPyLvEMxz; Tue, 03 Feb 2026 23:38:18 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=FMIWBuos c=1 sm=1 tr=0 ts=698286ea a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=HzLeVaNsDn8A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=JIsJQQpknA8kA4w4kt0A:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 60986110; Tue, 03 Feb 2026 15:38:16 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 29773305; Tue, 03 Feb 2026 15:38:16 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Olivier Certner cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 895e1c6567d9 - main - sysctl(9): Booleans: Fix old value length discovery In-reply-to: <69827a46.18880.6ee8f9c8@gitrepo.freebsd.org> References: <69827a46.18880.6ee8f9c8@gitrepo.freebsd.org> Comments: In-reply-to Olivier Certner message dated "Tue, 03 Feb 2026 22:44:22 +0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 03 Feb 2026 15:38:16 -0800 Message-Id: <20260203233816.29773305@slippy.cwsent.com> X-CMAE-Envelope: MS4xfKFM23jHrY/c3Y8tuATepTGsLlEr3tx7HVsR3GHE5mBvnqMc5UrlZ/SkkXkWMzH5IxPXTpDQZcaa6P7h1S/USk6iXqpirn0V3rC+0jLiK4/LgiEHQHZb AzeYhROeJdSgSUxGSPDrJFcWDZV2eGDzsnzZ0BaVJW5hIHiyWbLNVzrYFxo/WDijp4LnGfNassOAaDBwTAmnscLhnm+B1OsHnfwxt+8r/9NG5xyesiWUDnol GWtTXePlQwjFiqCROWFpoB9qknVYgkHYh45jkSJlM2y6RrtLbF0IsGdIynlyX5GOnwkKs8nMtvKGva9OWLBOQfc4mPzMXSaSz7f4/psFPpg= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4f5Kfz0Ds2z3Bmj X-Spamd-Bar: ---- In message <69827a46.18880.6ee8f9c8@gitrepo.freebsd.org>, Olivier Certner write s: > The branch main has been updated by olce: > > URL: https://cgit.FreeBSD.org/src/commit/?id=895e1c6567d9561c86f8d20b47e92491 > 1bce989e > > commit 895e1c6567d9561c86f8d20b47e924911bce989e > Author: Olivier Certner > AuthorDate: 2026-02-03 22:25:46 +0000 > Commit: Olivier Certner > CommitDate: 2026-02-03 22:43:49 +0000 > > sysctl(9): Booleans: Fix old value length discovery > > When calling sysctl(3) with a null 'oldp', i.e., length discovery mode, > 'oldix' can be equal to 'oldlen', and we should not fail. > > More generally, let SYSCTL_OUT() and SYSCTL_IN() handle corner cases, > simply removing the comparisons between 'oldidx' and 'oldlen' and > 'newidx' and 'newlen' done by hand as the test just after is an equality > that does not require to know if 'idx' is smaller than 'len'. > > PR: 292917 > Reported by: cy > Fixes: 406da392ef8d ("sysctl(9): Booleans: Accept integers to ea > se knob conversion") > Sponsored by: The FreeBSD Foundation > --- > sys/kern/kern_sysctl.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c > index dbe509b3e8e2..be0acb0a4a55 100644 > --- a/sys/kern/kern_sysctl.c > +++ b/sys/kern/kern_sysctl.c > @@ -1637,8 +1637,6 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) > * the output buffer, we assume that the caller expected an 'int' > * instead of a 'uint8_t'. > */ > - if (req->oldidx >= req->oldlen) > - return (ENOMEM); > if (req->oldlen - req->oldidx == sizeof(int)) { > int temp_int = temp; > > @@ -1655,8 +1653,6 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) > * Conversely, if the input buffer has exactly 4 bytes to read, > * use them all to produce a bool. > */ > - if (req->newidx >= req->newlen) > - return (ENOMEM); > if (req->newlen - req->newidx == sizeof(int)) { > int temp_int; > > Thank you. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Wed Feb 4 01:21:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5MyK04n7z6FP6T; Wed, 04 Feb 2026 01:21:45 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5MyJ6Hmpz3Lpn; Wed, 04 Feb 2026 01:21:44 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770168104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c5GC4p+VSBQPkDu0/sjXxrbJvmn3OKGoDgP6K7ukARk=; b=tV3A23P9+h08KSIIoTF9eP5U19xMTlysxlbHkgRvJgzXi520/jTblmrqKg7rkk/0Oa0ltt 7vV6vm40UqS38mJ7cer1nfgpble9X7OatmItEDzcJfbcYbDLA7/2WynZdXo6O6wKYS9i5b b9aTu6TTG5rj4hHa5RmcZ2n59Eo+llNr3BOsK5PG6lPiKDvYwCRWcpbUPXP1gAoca0Jca2 hn/VqpOwjyXvp1RocPVRgMh+68keURE5soyx942j9U4ttAJpwjE2LDDJ8Oms1B6jJcW/Kl T35N1lCvZUaXfhNZ6NnDHvgEaw0pOFvs4IiwpCj2gdBsHfW/vkrRXzPKP8nDVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770168104; a=rsa-sha256; cv=none; b=qLLaUhC5AumQHyrAdpmxbIXBgvOVyth4mhSodLLzh0UkLfslIndpPEwmyLyI3+MEqvc1Uo GvgOiu5hHOMmOSQgAxAGg+dE0q3ziGe0OajoxFgLwd139Hea/lt8FXeZvT22rjIPVtqU97 4MlCGazwDDAU7RtG5vG0G1c9SRxmGdu7tJ+ts18RVVwrzHHDTka3lDv+JPPei6XwEN2WgH eKki6LQR4ZsOME2RRg9UCNMAdyR4UOQkydVwWUSoOvTKqwHObZkbj4jKVyFNYMx/1ncuV1 9bGr1PRZD8qFHKseg3BoN8NCBLee/uDjrMzvq3DSGK24hP0hCjNfkwT7R8LXUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770168104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c5GC4p+VSBQPkDu0/sjXxrbJvmn3OKGoDgP6K7ukARk=; b=EQr/msJvCtwY9RAx5PhTjxJygztOha0mmNzHghD+aSCnmn9XlU42yFi0A90yYJsYrSDxlj UGPf2ymaSuDPNFMAF2JGn2I8DGxTsrDLnzDDFYxoIL4MUhslt1+pWfW8fnDWOsjfBBZ7If GURalanVMVguUI/MixVeuNUXybQkjzF+odgrhQO52QyV1fa9OBpdSM0bERwjJNGFOrEEY5 L6VNitUofXYCFMNs4fkzbliDtDW1xmz6v+w8fh227XONApa0ebgN3MhBIYUnN58a0NR0yu 4ioS4udyHooUi+Z3DoqW284+mwLRl6w6tzKc04R77hmweFIkXn944Y5eEn1Aug== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f5MyH1NGSzC99; Wed, 04 Feb 2026 01:21:42 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 349fcf079ca3 - main - net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming From: Zhenlei Huang In-Reply-To: Date: Wed, 4 Feb 2026 09:21:37 +0800 Cc: Gleb Smirnoff , src-committers@freebsd.org, "" , dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <6948abb4.37a66.71609f61@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3696.120.41.1.10) > On Feb 4, 2026, at 5:16 AM, Mark Johnston wrote: >=20 > On Mon, Dec 22, 2025 at 02:23:48AM +0000, Gleb Smirnoff wrote: >> The branch main has been updated by glebius: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D349fcf079ca32d5c93e45366d2b27638= 747affeb >>=20 >> commit 349fcf079ca32d5c93e45366d2b27638747affeb >> Author: Gleb Smirnoff >> AuthorDate: 2025-12-21 21:31:43 +0000 >> Commit: Gleb Smirnoff >> CommitDate: 2025-12-22 02:23:14 +0000 >>=20 >> net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming >>=20 >> and don't trigger ifnet_arrival_event and ifnet_departure_event = for a >> rename, as the interface isn't being detached from any protocol. = The >> consumers of the arrival/departure events are divided into a few >> categories: >> - which indeed need to do the same actions as if interface was = fully >> detached and attached: routing socket and netlink notifications = to >> userland and the Linux sysfs. All addressed by this commit. >> - which build their logic based on an interface name, but should = actually >> update their database on rename: packet filters. This commit = leaves >> them with the old behavior - emulate full detach & attach, but = this >> should be improved. >> - which shouldn't do anything on rename, not touched by the = commit. >> - ng_ether and if_tuntap, that are special and will be addressed = by >> separate commits. >=20 > Can we get rid of the IFF_RENAMING flag now? IIUC all of its uses are > in ifnet_departure_event handlers to short-circuit the handler because > the interface is not actually going away. Now that we have ifnet_rename_event, I think the flag IFF_RENAMING is not longer required. Well there're still some consumers, they should be cleaned up prior to = retire IFF_RENAMING. >=20 Best regards, Zhenlei From nobody Wed Feb 4 06:25:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5Vj22Hq5z6NQwP for ; Wed, 04 Feb 2026 06:25:42 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5Vj20wKBz3mJd for ; Wed, 04 Feb 2026 06:25:42 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-82318b640beso3631035b3a.0 for ; Tue, 03 Feb 2026 22:25:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770186340; x=1770791140; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=GR/J/yrvdRsQCdkrtZm2d2yJFpjhlN1OyU8Xj7pnQa4=; b=QLMLWp/mYHrg4hXA1x8XiPhomugUCQu8qjxfA88OhzJp+Zf5LD4LTrZc+UKOf9voG0 ebD8TC4efVVZhbWgFOwGJPNNu5Voa+5j1dGbhu2fxtOF3mXF6IMPD6MkpYllivHS0Ki2 xkcBy0AQ/ruI/N8ZJwSmLDWVrIs2772smGh2LemDgrO8Z23hRxehR0b6itCDkcsWaFvR dGE3bOoDV010M1kSgdirOPdzOD33AJTXqlA+/YvKyJ5tFi+4tB7Wlhclb4EsdtSqpvlW dbnv1Nbj2xgFMtdmAnQwfMTqvQe9z3MUylEGrulJJeaRiRlTrXOS7qL14rOMaPA8fFj+ kdjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770186340; x=1770791140; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=GR/J/yrvdRsQCdkrtZm2d2yJFpjhlN1OyU8Xj7pnQa4=; b=L8G1oU52qWU2baTofcI7kjg9isbN3woSZKMVG8XUm/ohc5FM1EZGgytL3U8FrhNaK7 y6ydZQOLo4YIRIietmE3Ifh/ZQuLTfcLPAHk15Y7smWSf0H7sNKuf/Btq4vDuRUTJHHG SKcSty6/euhneVsIh1knGIQ5/pHuR02eXbFX0wnrUTucR7HGVmbLl4fqD4fK9bcq2krF 6ibICCUIAqFmN2m5zjCdiPNNaAVQ+Ekfe0m0sgyehffZhSZodrGdZA708YGanr+vl3JZ QkKi+mzLd6LPBEfy603bqM4UDmDaCeDLVuethnwlkc78hC/unK3QQbShCRZPMoeSb5ka kSCw== X-Forwarded-Encrypted: i=1; AJvYcCXhoVV3+/pDHWAYTEyNiDC47dRL2CTZLKW5drFGItCTMMEMQkTGUSO6ipKXbJQLwrypGnMXVRPKClkPem7g/uVEojr5Fw==@freebsd.org X-Gm-Message-State: AOJu0YwMPm1e0+OtxayFG6yoM/SEU35erYPBw7nNttLLkEnQdHwA6/Id JSOCes/OirCLc7OxfQLLsmKRgZfTkgX8sFHEg6NuX4ehctlvIDzSE8XcEhqHkbiO X-Gm-Gg: AZuq6aJMW5t9f8M7P+DzKPGxeU1KIv0ig8/cpNjvKz4tp/Uj1YPcJoKg7LeU+LQrZ0j Wb8JPavyhFZILsiXxQ+fKbyI4fz/z4Tpc+plxnWcwvXXyKseweu3YAq0F2VJdv678ktRFcKWtNg aM/wkj7cplvzkeKRmFHyUsvlqufG2nvAYytxpNmquma5qY/MCY1m20tFABSdFoAvD5asO522onu CpNfUL9OXPhm+c5jyUOkoeSFJXrdiy6g7PTZoLnd4Dw3FaGUxW8ndB63Qwcb7zTbm5S6nBGEghx ZmX7xTsaxc2I+4gBjBLPutSOXJBGyynrlTfRgmqFHFYesnpn2okxQxX8VCzDr72GF+MJUpEWC5t eaMv/E8OJsHerXtOz3IGxuNpgVu/ejlS0Nkotfu/4kcXF/HtrzFk6f22Nt9azHvcpnNXWBr1YuU SxTO81pXf+q+XH5eDgwa8VXkW/1ws= X-Received: by 2002:a05:6a00:3c84:b0:81f:9bed:ae9d with SMTP id d2e1a72fcca58-8241c6e2f4fmr2031261b3a.46.1770186339793; Tue, 03 Feb 2026 22:25:39 -0800 (PST) Received: from smtpclient.apple ([176.100.43.9]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8241d16a9afsm1216994b3a.5.2026.02.03.22.25.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Feb 2026 22:25:39 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_BF700DC4-1B67-4EB9-9B10-28DB17BC46D8"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.3\)) Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware From: "Enji Cooper (yaneurabeya)" In-Reply-To: Date: Tue, 3 Feb 2026 22:25:27 -0800 Cc: Abdelkader Boudih , Adrian Chadd , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> <63ee9a06-97bd-4f7f-8bb8-ed39382d94a4@app.fastmail.com> To: Konstantin Belousov X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4f5Vj20wKBz3mJd X-Spamd-Bar: ---- --Apple-Mail=_BF700DC4-1B67-4EB9-9B10-28DB17BC46D8 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 3, 2026, at 2:38=E2=80=AFAM, Konstantin Belousov = wrote: >=20 > On Tue, Feb 03, 2026 at 11:08:40AM +0100, Abdelkader Boudih wrote: >> I agree that this should not be permanent verbosity. >>=20 >> The aim was not to add long-term noise, but to make the behavior = observable/greppable to reviewers while this logic is still being = validated across a wide range of Apple models. >>=20 >> I'm going to get few Apple devices to try on. Once we confirm that = every model behave the same, we could totally remove verbosity and = treating it as assumed-working code. One sidenote: this is hidden behind bootverbose: it=E2=80=99s not always = being displayed. I think it=E2=80=99s fine making the message more terse. It might = clarify behavior on Apple platforms since the added behavior contradicts = other OSI-related behavior and can result in a POLA violation. Cheers, -Enji= --Apple-Mail=_BF700DC4-1B67-4EB9-9B10-28DB17BC46D8 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmC5lcACgkQGpE5DjPs NJjIaQ//X/yvD/ciJ/GDyyZGYlIIfBgosuw3Hf0rhYu1ZNkHqxpGtdH+t/RNxI5v 0OnjA7YALpzADEm5ugr4g1rAsUypZuXn2qt+Im75HbxaqR1+TAUfLk4qcNDKeKrz JHS53lR84qsJi4nIyZIVjuqCf0O+Xp9rpyF/XSsYnBJRCRISgQaX0FNi2Z0/h+Em of27r/HPpig6URLSN/t4GWAOjBVWaYIGrOzXOhOCVzndbJ+m48juHBtP1aGOw5AE 1MFoUVDkXU9yNRU5igN4xfrHJa60vlgcr1RGXmnnLUFvE1WA2qFIyuVlDrTk16OQ Gz6htHJRSYMW5gmumpbkgK3hh3sbOJ+ysNSH/jIS36n6OOB2uuMbNNSLCHCiyjFe A9HprGTYWv9Td8NZ73pfvQbdzMFu6PR/8WgbeYB+0bqvo0OtYi01P0x8iFOfpcP8 rKUXW6C2HOHoqlaHguFb4FBvXy0uDsf+2dpA8uhwFOG7gGTk6xBl0iA903kH7b3Y VZJCaP9dbsnPiyBXffqCKchOqK8r0kvosoW4JvsWXHyv37yp5vuMyMcLoAr+PpHq phekhLQvBhAnl7HbJwXvg4QlUzIJBl00672IuIcGZzh3OJLbHBrw8N8+iQRD6Vwd FcWaPxchN5Iad5War9PfORlvURxgqoN+UssnytIyEtivXxPPJDk= =ch+V -----END PGP SIGNATURE----- --Apple-Mail=_BF700DC4-1B67-4EB9-9B10-28DB17BC46D8-- From nobody Wed Feb 4 06:29:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5Vnc43rBz6NRYD for ; Wed, 04 Feb 2026 06:29: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5Vnc1VGMz3mg0 for ; Wed, 04 Feb 2026 06:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770186580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxGDcKpmtQzJ9u2AD61ORk3nRA+zUooAzCho/KN073I=; b=WBgi+Zuwj+4snIViolKYbY9VHq3wklxpgwKLQ0qINmvGrAnCx76BALJR8OjCj/uwtx4+5U BjDFBIUF+4FeJtTwGBh2Qwa+rVvkKdlEI90oduDV7dXIH3qejW/HBgMnwsa9inmLGokG9b yFH0PZSfKMgTo8ac8a3lV2RxP+tptBjG2dKNOLW91tMgcoA6GmiKHRDvFo28baRG3p4UPh se/4lcOchvyNSZADcnoxFPmJ1ypHF5sc1dlbgNjJ1PhqGNzrC7Ap+QCPLZOTrYKJkmeVbF lKmy3dlaL4T4y7CwTeRU6VdgEvm9yrgEo2gN3TpRoFPBKCSPCCeVn/P5Zlg4EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770186580; a=rsa-sha256; cv=none; b=x34xU2aLkdVn9KturCZuhDxq2axN2JmUFNmKf5p9yI2EHK1kYxyDsNWFjoxYLfnLBDXdzy tPAoGhcSNCNZWYhoTiD9HGksfPzUsFveiWtCOzlXnHNR0RSpKpGIzRHZpSOivgFTjpALPP oNrw5UwXv2qf0J/zludUJ8OsEFp02yYvX4x7wDX/iZDPNx2s3PxVnNOnNf1hjVeUy9j+e3 E9O/UEMrRimvIebBvO4DkOPN05CYsDXRQPq+lrKaOucIIfGv8HZ/3XmRJD4MSbEUrT+aRX G38Rh7zSzF+elx5JIDz0eWFt1Txpe1SrQf7HcUA+LhTmD98wOas/u2eGID8YEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770186580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxGDcKpmtQzJ9u2AD61ORk3nRA+zUooAzCho/KN073I=; b=eEPQcuq0wpCvgNITr/cxuc2AwM5M2Xezcjed7vP4n3AJV8BYRDFf1q78BrSrliJ9nY3IfS NM7rz7+F/fGruboeIZ4kusGUeJ0JumM9rFIowtBUWF1MBt7QRL3GK+ycDvVhRsz8OjB/K0 ldhMXAJvgg3Q6m51ZNP9JVX7wEZcXgeHR+O5kSyIkX7gWhkbndL3x/fVLLF/rBtP5O1lLq Sonh50JyIukOrfsixk8gc9VHrXJ3X2UGop7dqzENn8jTdEPrd1bwjjEicw5nO3Ejkj6MrL LblXR/bKFlFxb7b/20ZqUMomMK5VRZaABZ9ooWEk0kNnkkitN9zXjoT8ghL6vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5Vnc0DV6znq8 for ; Wed, 04 Feb 2026 06:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3206b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 06:29:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Brad Smith From: Adrian Chadd Subject: git: 3f3cc6fd69e4 - main - if_rge: sync with up to date OpenBSD code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f3cc6fd69e4e3abf6b48c242e93b650c00451c1 Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 06:29:35 +0000 Message-Id: <6982e74f.3206b.3af47fcb@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=3f3cc6fd69e4e3abf6b48c242e93b650c00451c1 commit 3f3cc6fd69e4e3abf6b48c242e93b650c00451c1 Author: Brad Smith AuthorDate: 2026-02-04 06:25:13 +0000 Commit: Adrian Chadd CommitDate: 2026-02-04 06:29:10 +0000 if_rge: sync with up to date OpenBSD code e574c2d36cbcacf2556088879be336775e80154b Add support for RTL8125D revision 0x6890000 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D54922 MFC after: 2 weeks --- sys/dev/rge/if_rge.c | 20 +- sys/dev/rge/if_rge_hw.c | 135 ++++++++- sys/dev/rge/if_rge_microcode.h | 636 ++++++++++++++++++++++++++++++++++++++++- sys/dev/rge/if_rgereg.h | 6 +- sys/dev/rge/if_rgevar.h | 3 +- 5 files changed, 776 insertions(+), 24 deletions(-) diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index fde8e9df31fe..443acbbd77c3 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -423,8 +423,12 @@ rge_attach(device_t dev) // device_printf(dev, "RTL8126_2\n"); break; case 0x68800000: - sc->rge_type = MAC_R25D; -// device_printf(dev, "RTL8125D\n"); + sc->rge_type = MAC_R25D_1; +// device_printf(dev, "RTL8125D_1\n"); + break; + case 0x68900000: + sc->rge_type = MAC_R25D_2; +// device_printf(dev, "RTL8125D_2\n"); break; case 0x6c900000: sc->rge_type = MAC_R27; @@ -1159,7 +1163,7 @@ rge_init_locked(struct rge_softc *sc) rxconf = RGE_RXCFG_CONFIG; else if (sc->rge_type == MAC_R25B) rxconf = RGE_RXCFG_CONFIG_8125B; - else if (sc->rge_type == MAC_R25D) + else if (RGE_TYPE_R25D(sc)) rxconf = RGE_RXCFG_CONFIG_8125D; else rxconf = RGE_RXCFG_CONFIG_8126; @@ -1173,7 +1177,7 @@ rge_init_locked(struct rge_softc *sc) /* Disable L1 timeout. */ val = rge_read_csi(sc, 0x890) & ~0x00000001; rge_write_csi(sc, 0x890, val); - } else if (sc->rge_type != MAC_R25D) + } else if (!RGE_TYPE_R25D(sc)) RGE_WRITE_2(sc, 0x0382, 0x221b); RGE_WRITE_1(sc, RGE_RSS_CTRL, 0); @@ -1199,7 +1203,7 @@ rge_init_locked(struct rge_softc *sc) val = rge_read_mac_ocp(sc, 0xe614); val &= (sc->rge_type == MAC_R27) ? ~0x0f00 : ~0x0700; - if (sc->rge_type == MAC_R25 || sc->rge_type == MAC_R25D) + if (sc->rge_type == MAC_R25 || RGE_TYPE_R25D(sc)) rge_write_mac_ocp(sc, 0xe614, val | 0x0300); else if (sc->rge_type == MAC_R25B) rge_write_mac_ocp(sc, 0xe614, val | 0x0200); @@ -1235,7 +1239,7 @@ rge_init_locked(struct rge_softc *sc) val = rge_read_mac_ocp(sc, 0xea1c) & ~0x0003; rge_write_mac_ocp(sc, 0xea1c, val | 0x0001); - if (sc->rge_type == MAC_R25D) + if (RGE_TYPE_R25D(sc)) rge_write_mac_ocp(sc, 0xe0c0, 0x4403); else rge_write_mac_ocp(sc, 0xe0c0, 0x4000); @@ -1251,7 +1255,7 @@ rge_init_locked(struct rge_softc *sc) if (sc->rge_type == MAC_R25) RGE_SETBIT_1(sc, RGE_MCUCMD, 0x01); - if (sc->rge_type != MAC_R25D) { + if (!RGE_TYPE_R25D(sc)) { /* Disable EEE plus. */ RGE_MAC_CLRBIT(sc, 0xe080, 0x0002); } @@ -1306,7 +1310,7 @@ rge_init_locked(struct rge_softc *sc) val = rge_read_csi(sc, 0x98) & ~0x0000ff00; rge_write_csi(sc, 0x98, val); - if (sc->rge_type == MAC_R25D) { + if (RGE_TYPE_R25D(sc)) { val = rge_read_mac_ocp(sc, 0xe092) & ~0x00ff; rge_write_mac_ocp(sc, 0xe092, val | 0x0008); } else diff --git a/sys/dev/rge/if_rge_hw.c b/sys/dev/rge/if_rge_hw.c index ccd6580b2cfc..35a0e93dd193 100644 --- a/sys/dev/rge/if_rge_hw.c +++ b/sys/dev/rge/if_rge_hw.c @@ -78,7 +78,8 @@ static void rge_phy_config_mac_r26_1(struct rge_softc *sc); static void rge_phy_config_mac_r26_2(struct rge_softc *sc); static void rge_phy_config_mac_r25(struct rge_softc *sc); static void rge_phy_config_mac_r25b(struct rge_softc *sc); -static void rge_phy_config_mac_r25d(struct rge_softc *sc); +static void rge_phy_config_mac_r25d_1(struct rge_softc *); +static void rge_phy_config_mac_r25d_2(struct rge_softc *); static void rge_phy_config_mcu(struct rge_softc *sc, uint16_t rcodever); static void rge_hw_init(struct rge_softc *sc); static void rge_disable_phy_ocp_pwrsave(struct rge_softc *sc); @@ -230,7 +231,7 @@ rge_mac_config_mcu(struct rge_softc *sc, enum rge_mac_type type) rge_write_mac_ocp(sc, rtl8125b_mac_bps[i].reg, rtl8125b_mac_bps[i].val); } - } else if (type == MAC_R25D) { + } else if (type == MAC_R25D_1) { for (npages = 0; npages < 3; npages++) { rge_switch_mcu_ram_page(sc, npages); @@ -268,6 +269,35 @@ rge_mac_config_mcu(struct rge_softc *sc, enum rge_mac_type type) rge_write_mac_ocp(sc, 0xfc26, 0x8000); rge_write_mac_ocp(sc, 0xfc28, 0x14a2); rge_write_mac_ocp(sc, 0xfc48, 0x0001); + } else if (type == MAC_R25D_2) { + for (npages = 0; npages < 3; npages++) { + rge_switch_mcu_ram_page(sc, npages); + + for (i = 0; i < nitems(rtl8125d_2_mac_bps); i++) { + if (npages == 0) + rge_write_mac_ocp(sc, + rtl8125d_2_mac_bps[i].reg, + rtl8125d_2_mac_bps[i].val); + else + rge_write_mac_ocp(sc, + rtl8125d_2_mac_bps[i].reg, 0); + } + + for (reg = 0xf884; reg <= 0xf9f6; reg += 2) + rge_write_mac_ocp(sc, reg, 0); + + rge_write_mac_ocp(sc, 0xf9f8, + (npages == 2) ? 0x6938 : 0); + rge_write_mac_ocp(sc, 0xf9fa, + (npages == 2) ? 0x0a19: 0); + rge_write_mac_ocp(sc, 0xf9fc, + (npages == 2) ? 0x030e: 0); + rge_write_mac_ocp(sc, 0xf9fe, + (npages == 2) ? 0x0b2f: 0); + } + rge_write_mac_ocp(sc, 0xfc26, 0x8000); + rge_write_mac_ocp(sc, 0xfc28, 0x2382); + rge_write_mac_ocp(sc, 0xfc48, 0x0001); } } @@ -300,7 +330,7 @@ rge_mac_config_ext_mcu(struct rge_softc *sc, enum rge_mac_type type) } rge_write_mac_ocp(sc, 0xfc26, 0x8000); rge_write_mac_ocp(sc, 0xfc2c, 0x2360); - rge_write_mac_ocp(sc, 0xfc2E, 0x14a4); + rge_write_mac_ocp(sc, 0xfc2e, 0x14a4); rge_write_mac_ocp(sc, 0xfc30, 0x415e); rge_write_mac_ocp(sc, 0xfc32, 0x41e4); rge_write_mac_ocp(sc, 0xfc34, 0x4280); @@ -508,8 +538,11 @@ rge_phy_config(struct rge_softc *sc) case MAC_R25B: rge_phy_config_mac_r25b(sc); break; - case MAC_R25D: - rge_phy_config_mac_r25d(sc); + case MAC_R25D_1: + rge_phy_config_mac_r25d_1(sc); + break; + case MAC_R25D_2: + rge_phy_config_mac_r25d_2(sc); break; case MAC_R26_1: rge_phy_config_mac_r26_1(sc); @@ -531,7 +564,7 @@ rge_phy_config(struct rge_softc *sc) if (sc->rge_type == MAC_R25) { RGE_MAC_CLRBIT(sc, 0xeb62, 0x0006); RGE_PHY_CLRBIT(sc, 0xa432, 0x0010); - } else if (sc->rge_type == MAC_R25B || sc->rge_type == MAC_R25D) + } else if (sc->rge_type == MAC_R25B || RGE_TYPE_R25D(sc)) RGE_PHY_SETBIT(sc, 0xa432, 0x0010); RGE_PHY_CLRBIT(sc, 0xa5d0, (sc->rge_type == MAC_R27) ? 0x000e : 0x0006); @@ -1363,12 +1396,12 @@ rge_phy_config_mac_r25b(struct rge_softc *sc) } static void -rge_phy_config_mac_r25d(struct rge_softc *sc) +rge_phy_config_mac_r25d_1(struct rge_softc *sc) { uint16_t val; int i; - rge_phy_config_mcu(sc, RGE_MAC_R25D_RCODE_VER); + rge_phy_config_mcu(sc, RGE_MAC_R25D_1_RCODE_VER); RGE_PHY_SETBIT(sc, 0xa442, 0x0800); @@ -1555,6 +1588,67 @@ rge_phy_config_mac_r25d(struct rge_softc *sc) RGE_PHY_SETBIT(sc, 0xa442, 0x0080); } +static void +rge_phy_config_mac_r25d_2(struct rge_softc *sc) +{ + uint16_t val; + + rge_phy_config_mcu(sc, RGE_MAC_R25D_2_RCODE_VER); + + RGE_PHY_SETBIT(sc, 0xa442, 0x0800); + + rge_patch_phy_mcu(sc, 1); + val = rge_read_phy_ocp(sc, 0xbcd8) & ~0xc000; + rge_write_phy_ocp(sc, 0xbcd8, val | 0x4000); + RGE_PHY_SETBIT(sc, 0xbcd8, 0xc000); + val = rge_read_phy_ocp(sc, 0xbcd8) & ~0xc000; + rge_write_phy_ocp(sc, 0xbcd8, val | 0x4000); + val = rge_read_phy_ocp(sc, 0xbc80) & ~0x001f; + rge_write_phy_ocp(sc, 0xbc80, val | 0x0004); + RGE_PHY_SETBIT(sc, 0xbc82, 0xe000); + RGE_PHY_SETBIT(sc, 0xbc82, 0x1c00); + val = rge_read_phy_ocp(sc, 0xbc80) & ~0x001f; + rge_write_phy_ocp(sc, 0xbc80, val | 0x0005); + val = rge_read_phy_ocp(sc, 0xbc82) & ~0x00e0; + rge_write_phy_ocp(sc, 0xbc82, val | 0x0040); + RGE_PHY_SETBIT(sc, 0xbc82, 0x001c); + RGE_PHY_CLRBIT(sc, 0xbcd8, 0xc000); + val = rge_read_phy_ocp(sc, 0xbcd8) & ~0xc000; + rge_write_phy_ocp(sc, 0xbcd8, val | 0x8000); + RGE_PHY_CLRBIT(sc, 0xbcd8, 0xc000); + rge_patch_phy_mcu(sc, 0); + + val = rge_read_phy_ocp(sc, 0xac7e) & ~0x01fc; + rge_write_phy_ocp(sc, 0xac7e, val | 0x00b4); + rge_write_phy_ocp(sc, 0xb87c, 0x8105); + val = rge_read_phy_ocp(sc, 0xb87e) & ~0xff00; + rge_write_phy_ocp(sc, 0xb87e, val | 0x7a00); + rge_write_phy_ocp(sc, 0xb87c, 0x8117); + val = rge_read_phy_ocp(sc, 0xb87e) & ~0xff00; + rge_write_phy_ocp(sc, 0xb87e, val | 0x3a00); + rge_write_phy_ocp(sc, 0xb87c, 0x8103); + val = rge_read_phy_ocp(sc, 0xb87e) & ~0xff00; + rge_write_phy_ocp(sc, 0xb87e, val | 0x7400); + rge_write_phy_ocp(sc, 0xb87c, 0x8115); + val = rge_read_phy_ocp(sc, 0xb87e) & ~0xff00; + rge_write_phy_ocp(sc, 0xb87e, val | 0x3400); + rge_write_phy_ocp(sc, 0xb87c, 0x8feb); + val = rge_read_phy_ocp(sc, 0xb87e) & ~0xff00; + rge_write_phy_ocp(sc, 0xb87e, val | 0x0500); + rge_write_phy_ocp(sc, 0xb87c, 0x8fea); + val = rge_read_phy_ocp(sc, 0xb87e) & ~0xff00; + rge_write_phy_ocp(sc, 0xb87e, val | 0x0700); + rge_write_phy_ocp(sc, 0xb87c, 0x80d6); + val = rge_read_phy_ocp(sc, 0xb87e) & ~0xff00; + rge_write_phy_ocp(sc, 0xb87e, val | 0xef00); + RGE_PHY_CLRBIT(sc, 0xa5d4, 0x0020); + RGE_PHY_CLRBIT(sc, 0xa654, 0x0800); + RGE_PHY_CLRBIT(sc, 0xa448, 0x0400); + RGE_PHY_CLRBIT(sc, 0xa586, 0x0400); + RGE_PHY_SETBIT(sc, 0xa430, 0x1001); + RGE_PHY_SETBIT(sc, 0xa442, 0x0080); +} + static void rge_phy_config_mcu(struct rge_softc *sc, uint16_t rcodever) { @@ -1586,22 +1680,37 @@ rge_phy_config_mcu(struct rge_softc *sc, uint16_t rcodever) for (i = 0; i < nitems(mac_r25b_mcu); i++) rge_write_phy_ocp(sc, mac_r25b_mcu[i].reg, mac_r25b_mcu[i].val); - } else if (sc->rge_type == MAC_R25D) { + } else if (sc->rge_type == MAC_R25D_1) { for (i = 0; i < 2403; i++) rge_write_phy_ocp(sc, - mac_r25d_mcu[i].reg, mac_r25d_mcu[i].val); + mac_r25d_1_mcu[i].reg, + mac_r25d_1_mcu[i].val); rge_patch_phy_mcu(sc, 0); rge_patch_phy_mcu(sc, 1); for (; i < 2528; i++) rge_write_phy_ocp(sc, - mac_r25d_mcu[i].reg, mac_r25d_mcu[i].val); + mac_r25d_1_mcu[i].reg, + mac_r25d_1_mcu[i].val); + rge_patch_phy_mcu(sc, 0); + + rge_patch_phy_mcu(sc, 1); + for (; i < nitems(mac_r25d_1_mcu); i++) + rge_write_phy_ocp(sc, + mac_r25d_1_mcu[i].reg, + mac_r25d_1_mcu[i].val); + } else if (sc->rge_type == MAC_R25D_2) { + for (i = 0; i < 1269; i++) + rge_write_phy_ocp(sc, + mac_r25d_2_mcu[i].reg, + mac_r25d_2_mcu[i].val); rge_patch_phy_mcu(sc, 0); rge_patch_phy_mcu(sc, 1); - for (; i < nitems(mac_r25d_mcu); i++) + for (; i < nitems(mac_r25d_2_mcu); i++) rge_write_phy_ocp(sc, - mac_r25d_mcu[i].reg, mac_r25d_mcu[i].val); + mac_r25d_2_mcu[i].reg, + mac_r25d_2_mcu[i].val); } else if (sc->rge_type == MAC_R26_1) { for (i = 0; i < 6989; i++) rge_write_phy_ocp(sc, diff --git a/sys/dev/rge/if_rge_microcode.h b/sys/dev/rge/if_rge_microcode.h index f2803b869e3f..15f07099f80e 100644 --- a/sys/dev/rge/if_rge_microcode.h +++ b/sys/dev/rge/if_rge_microcode.h @@ -166,6 +166,31 @@ static const struct rge_hw_regaddr_array rtl8125b_mac_bps[] = { { 0xfc30, 0x4a20 }, { 0xfc32, 0x47a0 }, { 0xfc48, 0x003f } }; +static const struct rge_hw_regaddr_array rtl8125d_2_mac_bps[] = { + { 0xf800, 0xe010 }, { 0xf802, 0xe014 }, { 0xf804, 0xe016 }, + { 0xf806, 0xe018 }, { 0xf808, 0xe01a }, { 0xf80a, 0xe01c }, + { 0xf80c, 0xe01e }, { 0xf80e, 0xe020 }, { 0xf810, 0xe022 }, + { 0xf812, 0xe024 }, { 0xf814, 0xe026 }, { 0xf816, 0xe028 }, + { 0xf818, 0xe02a }, { 0xf81a, 0xe02c }, { 0xf81c, 0xe02e }, + { 0xf81e, 0xe030 }, { 0xf820, 0xc104 }, { 0xf822, 0xc202 }, + { 0xf824, 0xba00 }, { 0xf826, 0x2384 }, { 0xf828, 0xd116 }, + { 0xf82a, 0xc602 }, { 0xf82c, 0xbe00 }, { 0xf82e, 0x0000 }, + { 0xf830, 0xc602 }, { 0xf832, 0xbe00 }, { 0xf834, 0x0000 }, + { 0xf836, 0xc602 }, { 0xf838, 0xbe00 }, { 0xf83a, 0x0000 }, + { 0xf83c, 0xc602 }, { 0xf83e, 0xbe00 }, { 0xf840, 0x0000 }, + { 0xf842, 0xc602 }, { 0xf844, 0xbe00 }, { 0xf846, 0x0000 }, + { 0xf848, 0xc602 }, { 0xf84a, 0xbe00 }, { 0xf84c, 0x0000 }, + { 0xf84e, 0xc602 }, { 0xf850, 0xbe00 }, { 0xf852, 0x0000 }, + { 0xf854, 0xc602 }, { 0xf856, 0xbe00 }, { 0xf858, 0x0000 }, + { 0xf85a, 0xc602 }, { 0xf85c, 0xbe00 }, { 0xf85e, 0x0000 }, + { 0xf860, 0xc602 }, { 0xf862, 0xbe00 }, { 0xf864, 0x0000 }, + { 0xf866, 0xc602 }, { 0xf868, 0xbe00 }, { 0xf86a, 0x0000 }, + { 0xf86c, 0xc602 }, { 0xf86e, 0xbe00 }, { 0xf870, 0x0000 }, + { 0xf872, 0xc602 }, { 0xf874, 0xbe00 }, { 0xf876, 0x0000 }, + { 0xf878, 0xc602 }, { 0xf87a, 0xbe00 }, { 0xf87c, 0x0000 }, + { 0xf87e, 0xc602 }, { 0xf880, 0xbe00 }, { 0xf882, 0x0000 } +}; + struct rge_mac_bps { int count; const uint16_t *regs; @@ -489,6 +514,615 @@ static const struct rge_hw_regaddr_array mac_r27_ephy[] = { { 0x941c, 0x0190 }, { 0x981c, 0x0140 }, { 0x9c1c, 0x0140 } }; +static const struct rge_hw_regaddr_array mac_r25d_2_mcu[] = { + { 0xa436, 0x8023 }, { 0xa438, 0x3801 }, { 0xa436, 0xb82e }, + { 0xa438, 0x0001 }, { 0xb820, 0x0090 }, { 0xa436, 0xa016 }, + { 0xa438, 0x0000 }, { 0xa436, 0xa012 }, { 0xa438, 0x0000 }, + { 0xa436, 0xa014 }, { 0xa438, 0x1800 }, { 0xa438, 0x8010 }, + { 0xa438, 0x1800 }, { 0xa438, 0x808e }, { 0xa438, 0x1800 }, + { 0xa438, 0x80d6 }, { 0xa438, 0x1800 }, { 0xa438, 0x81e2 }, + { 0xa438, 0x1800 }, { 0xa438, 0x81e2 }, { 0xa438, 0x1800 }, + { 0xa438, 0x81e2 }, { 0xa438, 0x1800 }, { 0xa438, 0x81e2 }, + { 0xa438, 0x1800 }, { 0xa438, 0x81e2 }, { 0xa438, 0xd500 }, + { 0xa438, 0xc48d }, { 0xa438, 0xd504 }, { 0xa438, 0x8d03 }, + { 0xa438, 0xd701 }, { 0xa438, 0x4045 }, { 0xa438, 0xad02 }, + { 0xa438, 0xd504 }, { 0xa438, 0xd706 }, { 0xa438, 0x2529 }, + { 0xa438, 0x8021 }, { 0xa438, 0xd718 }, { 0xa438, 0x607b }, + { 0xa438, 0x40da }, { 0xa438, 0xf019 }, { 0xa438, 0x459a }, + { 0xa438, 0xf03f }, { 0xa438, 0xd718 }, { 0xa438, 0x62bb }, + { 0xa438, 0xbb01 }, { 0xa438, 0xd75e }, { 0xa438, 0x6231 }, + { 0xa438, 0x0cf0 }, { 0xa438, 0x0c10 }, { 0xa438, 0xd501 }, + { 0xa438, 0xce01 }, { 0xa438, 0xd70c }, { 0xa438, 0x6147 }, + { 0xa438, 0x8480 }, { 0xa438, 0x8440 }, { 0xa438, 0x8420 }, + { 0xa438, 0xa410 }, { 0xa438, 0xce00 }, { 0xa438, 0xd505 }, + { 0xa438, 0x0c0f }, { 0xa438, 0x0808 }, { 0xa438, 0xf002 }, + { 0xa438, 0xa4f0 }, { 0xa438, 0xf03c }, { 0xa438, 0xbb02 }, + { 0xa438, 0xd75e }, { 0xa438, 0x6231 }, { 0xa438, 0x0cf0 }, + { 0xa438, 0x0c20 }, { 0xa438, 0xd501 }, { 0xa438, 0xce01 }, + { 0xa438, 0xd70c }, { 0xa438, 0x6147 }, { 0xa438, 0x8480 }, + { 0xa438, 0x8440 }, { 0xa438, 0xa420 }, { 0xa438, 0x8410 }, + { 0xa438, 0xce00 }, { 0xa438, 0xd505 }, { 0xa438, 0x0c0f }, + { 0xa438, 0x0804 }, { 0xa438, 0xf002 }, { 0xa438, 0xa4f0 }, + { 0xa438, 0xf028 }, { 0xa438, 0xbb04 }, { 0xa438, 0xd75e }, + { 0xa438, 0x6231 }, { 0xa438, 0x0cf0 }, { 0xa438, 0x0c40 }, + { 0xa438, 0xd501 }, { 0xa438, 0xce01 }, { 0xa438, 0xd70c }, + { 0xa438, 0x6147 }, { 0xa438, 0x8480 }, { 0xa438, 0xa440 }, + { 0xa438, 0x8420 }, { 0xa438, 0x8410 }, { 0xa438, 0xce00 }, + { 0xa438, 0xd505 }, { 0xa438, 0x0c0f }, { 0xa438, 0x0802 }, + { 0xa438, 0xf002 }, { 0xa438, 0xa4f0 }, { 0xa438, 0xf014 }, + { 0xa438, 0xbb08 }, { 0xa438, 0xd75e }, { 0xa438, 0x6231 }, + { 0xa438, 0x0cf0 }, { 0xa438, 0x0c80 }, { 0xa438, 0xd501 }, + { 0xa438, 0xce01 }, { 0xa438, 0xd70c }, { 0xa438, 0x6147 }, + { 0xa438, 0xa480 }, { 0xa438, 0x8440 }, { 0xa438, 0x8420 }, + { 0xa438, 0x8410 }, { 0xa438, 0xce00 }, { 0xa438, 0xd505 }, + { 0xa438, 0x0c0f }, { 0xa438, 0x0801 }, { 0xa438, 0xf002 }, + { 0xa438, 0xa4f0 }, { 0xa438, 0xce00 }, { 0xa438, 0xd500 }, + { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, { 0xa438, 0x1000 }, + { 0xa438, 0x1829 }, { 0xa438, 0xd73e }, { 0xa438, 0x6074 }, + { 0xa438, 0xd718 }, { 0xa438, 0x5f2d }, { 0xa438, 0x1000 }, + { 0xa438, 0x81b7 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, + { 0xa438, 0x1000 }, { 0xa438, 0x1829 }, { 0xa438, 0xd73e }, + { 0xa438, 0x7f74 }, { 0xa438, 0x1000 }, { 0xa438, 0x81ce }, + { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, { 0xa438, 0x1000 }, + { 0xa438, 0x1829 }, { 0xa438, 0xd718 }, { 0xa438, 0x5f6d }, + { 0xa438, 0x1800 }, { 0xa438, 0x1660 }, { 0xa438, 0xd75e }, + { 0xa438, 0x68b1 }, { 0xa438, 0xd504 }, { 0xa438, 0xd71e }, + { 0xa438, 0x667b }, { 0xa438, 0x645a }, { 0xa438, 0x6239 }, + { 0xa438, 0x0cf0 }, { 0xa438, 0x0c10 }, { 0xa438, 0xd505 }, + { 0xa438, 0x0c0f }, { 0xa438, 0x0808 }, { 0xa438, 0xd501 }, + { 0xa438, 0xce01 }, { 0xa438, 0xd70c }, { 0xa438, 0x60c7 }, + { 0xa438, 0x8480 }, { 0xa438, 0x8440 }, { 0xa438, 0x8420 }, + { 0xa438, 0xa410 }, { 0xa438, 0xf032 }, { 0xa438, 0xa4f0 }, + { 0xa438, 0xf030 }, { 0xa438, 0x0cf0 }, { 0xa438, 0x0c20 }, + { 0xa438, 0xd505 }, { 0xa438, 0x0c0f }, { 0xa438, 0x0804 }, + { 0xa438, 0xd501 }, { 0xa438, 0xce01 }, { 0xa438, 0xd70c }, + { 0xa438, 0x60c7 }, { 0xa438, 0x8480 }, { 0xa438, 0x8440 }, + { 0xa438, 0xa420 }, { 0xa438, 0x8410 }, { 0xa438, 0xf022 }, + { 0xa438, 0xa4f0 }, { 0xa438, 0xf020 }, { 0xa438, 0x0cf0 }, + { 0xa438, 0x0c40 }, { 0xa438, 0xd505 }, { 0xa438, 0x0c0f }, + { 0xa438, 0x0802 }, { 0xa438, 0xd501 }, { 0xa438, 0xce01 }, + { 0xa438, 0xd70c }, { 0xa438, 0x60c7 }, { 0xa438, 0x8480 }, + { 0xa438, 0xa440 }, { 0xa438, 0x8420 }, { 0xa438, 0x8410 }, + { 0xa438, 0xf012 }, { 0xa438, 0xa4f0 }, { 0xa438, 0xf010 }, + { 0xa438, 0x0cf0 }, { 0xa438, 0x0c80 }, { 0xa438, 0xd505 }, + { 0xa438, 0x0c0f }, { 0xa438, 0x0801 }, { 0xa438, 0xd501 }, + { 0xa438, 0xce01 }, { 0xa438, 0xd70c }, { 0xa438, 0x60c7 }, + { 0xa438, 0xa480 }, { 0xa438, 0x8440 }, { 0xa438, 0x8420 }, + { 0xa438, 0x8410 }, { 0xa438, 0xf002 }, { 0xa438, 0xa4f0 }, + { 0xa438, 0x1800 }, { 0xa438, 0x168c }, { 0xa438, 0xd500 }, + { 0xa438, 0xd706 }, { 0xa438, 0x2529 }, { 0xa438, 0x80e0 }, + { 0xa438, 0xd718 }, { 0xa438, 0x607b }, { 0xa438, 0x40da }, + { 0xa438, 0xf00f }, { 0xa438, 0x431a }, { 0xa438, 0xf021 }, + { 0xa438, 0xd718 }, { 0xa438, 0x617b }, { 0xa438, 0x1000 }, + { 0xa438, 0x1a8a }, { 0xa438, 0x1000 }, { 0xa438, 0x1b1a }, + { 0xa438, 0xd718 }, { 0xa438, 0x608e }, { 0xa438, 0xd73e }, + { 0xa438, 0x5f34 }, { 0xa438, 0xf020 }, { 0xa438, 0xf053 }, + { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, { 0xa438, 0x1000 }, + { 0xa438, 0x1b1a }, { 0xa438, 0xd718 }, { 0xa438, 0x608e }, + { 0xa438, 0xd73e }, { 0xa438, 0x5f34 }, { 0xa438, 0xf023 }, + { 0xa438, 0xf067 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, + { 0xa438, 0x1000 }, { 0xa438, 0x1b1a }, { 0xa438, 0xd718 }, + { 0xa438, 0x608e }, { 0xa438, 0xd73e }, { 0xa438, 0x5f34 }, + { 0xa438, 0xf026 }, { 0xa438, 0xf07b }, { 0xa438, 0x1000 }, + { 0xa438, 0x1a8a }, { 0xa438, 0x1000 }, { 0xa438, 0x1b1a }, + { 0xa438, 0xd718 }, { 0xa438, 0x608e }, { 0xa438, 0xd73e }, + { 0xa438, 0x5f34 }, { 0xa438, 0xf029 }, { 0xa438, 0xf08f }, + { 0xa438, 0x1000 }, { 0xa438, 0x81b7 }, { 0xa438, 0x1000 }, + { 0xa438, 0x1a8a }, { 0xa438, 0xd73e }, { 0xa438, 0x7fb4 }, + { 0xa438, 0x1000 }, { 0xa438, 0x81ce }, { 0xa438, 0x1000 }, + { 0xa438, 0x1a8a }, { 0xa438, 0xd718 }, { 0xa438, 0x5fae }, + { 0xa438, 0xf028 }, { 0xa438, 0x1000 }, { 0xa438, 0x81b7 }, + { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, { 0xa438, 0xd73e }, + { 0xa438, 0x7fb4 }, { 0xa438, 0x1000 }, { 0xa438, 0x81ce }, + { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, { 0xa438, 0xd718 }, + { 0xa438, 0x5fae }, { 0xa438, 0xf039 }, { 0xa438, 0x1000 }, + { 0xa438, 0x81b7 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, + { 0xa438, 0xd73e }, { 0xa438, 0x7fb4 }, { 0xa438, 0x1000 }, + { 0xa438, 0x81ce }, { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, + { 0xa438, 0xd718 }, { 0xa438, 0x5fae }, { 0xa438, 0xf04a }, + { 0xa438, 0x1000 }, { 0xa438, 0x81b7 }, { 0xa438, 0x1000 }, + { 0xa438, 0x1a8a }, { 0xa438, 0xd73e }, { 0xa438, 0x7fb4 }, + { 0xa438, 0x1000 }, { 0xa438, 0x81ce }, { 0xa438, 0x1000 }, + { 0xa438, 0x1a8a }, { 0xa438, 0xd718 }, { 0xa438, 0x5fae }, + { 0xa438, 0xf05b }, { 0xa438, 0xd719 }, { 0xa438, 0x4119 }, + { 0xa438, 0xd504 }, { 0xa438, 0xac01 }, { 0xa438, 0xae01 }, + { 0xa438, 0xd500 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a78 }, + { 0xa438, 0xf00a }, { 0xa438, 0xd719 }, { 0xa438, 0x4118 }, + { 0xa438, 0xd504 }, { 0xa438, 0xac11 }, { 0xa438, 0xd501 }, + { 0xa438, 0xce01 }, { 0xa438, 0xa410 }, { 0xa438, 0xce00 }, + { 0xa438, 0xd500 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, + { 0xa438, 0xd718 }, { 0xa438, 0x5fb0 }, { 0xa438, 0xd505 }, + { 0xa438, 0xd719 }, { 0xa438, 0x4079 }, { 0xa438, 0xa80f }, + { 0xa438, 0xf05d }, { 0xa438, 0x4b98 }, { 0xa438, 0xa808 }, + { 0xa438, 0xf05a }, { 0xa438, 0xd719 }, { 0xa438, 0x4119 }, + { 0xa438, 0xd504 }, { 0xa438, 0xac02 }, { 0xa438, 0xae01 }, + { 0xa438, 0xd500 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a78 }, + { 0xa438, 0xf00a }, { 0xa438, 0xd719 }, { 0xa438, 0x4118 }, + { 0xa438, 0xd504 }, { 0xa438, 0xac22 }, { 0xa438, 0xd501 }, + { 0xa438, 0xce01 }, { 0xa438, 0xa420 }, { 0xa438, 0xce00 }, + { 0xa438, 0xd500 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, + { 0xa438, 0xd718 }, { 0xa438, 0x5fb0 }, { 0xa438, 0xd505 }, + { 0xa438, 0xd719 }, { 0xa438, 0x4079 }, { 0xa438, 0xa80f }, + { 0xa438, 0xf03f }, { 0xa438, 0x47d8 }, { 0xa438, 0xa804 }, + { 0xa438, 0xf03c }, { 0xa438, 0xd719 }, { 0xa438, 0x4119 }, + { 0xa438, 0xd504 }, { 0xa438, 0xac04 }, { 0xa438, 0xae01 }, + { 0xa438, 0xd500 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a78 }, + { 0xa438, 0xf00a }, { 0xa438, 0xd719 }, { 0xa438, 0x4118 }, + { 0xa438, 0xd504 }, { 0xa438, 0xac44 }, { 0xa438, 0xd501 }, + { 0xa438, 0xce01 }, { 0xa438, 0xa440 }, { 0xa438, 0xce00 }, + { 0xa438, 0xd500 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, + { 0xa438, 0xd718 }, { 0xa438, 0x5fb0 }, { 0xa438, 0xd505 }, + { 0xa438, 0xd719 }, { 0xa438, 0x4079 }, { 0xa438, 0xa80f }, + { 0xa438, 0xf021 }, { 0xa438, 0x4418 }, { 0xa438, 0xa802 }, + { 0xa438, 0xf01e }, { 0xa438, 0xd719 }, { 0xa438, 0x4119 }, + { 0xa438, 0xd504 }, { 0xa438, 0xac08 }, { 0xa438, 0xae01 }, + { 0xa438, 0xd500 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a78 }, + { 0xa438, 0xf00a }, { 0xa438, 0xd719 }, { 0xa438, 0x4118 }, + { 0xa438, 0xd504 }, { 0xa438, 0xac88 }, { 0xa438, 0xd501 }, + { 0xa438, 0xce01 }, { 0xa438, 0xa480 }, { 0xa438, 0xce00 }, + { 0xa438, 0xd500 }, { 0xa438, 0x1000 }, { 0xa438, 0x1a8a }, + { 0xa438, 0xd718 }, { 0xa438, 0x5fb0 }, { 0xa438, 0xd505 }, + { 0xa438, 0xd719 }, { 0xa438, 0x4079 }, { 0xa438, 0xa80f }, + { 0xa438, 0xf003 }, { 0xa438, 0x4058 }, { 0xa438, 0xa801 }, + { 0xa438, 0x1800 }, { 0xa438, 0x1736 }, { 0xa438, 0xd73e }, + { 0xa438, 0xd505 }, { 0xa438, 0x3088 }, { 0xa438, 0x81c0 }, + { 0xa438, 0x61d3 }, { 0xa438, 0x6172 }, { 0xa438, 0x6111 }, + { 0xa438, 0x60b0 }, { 0xa438, 0xf00d }, { 0xa438, 0x3298 }, + { 0xa438, 0x81cb }, { 0xa438, 0xf00a }, { 0xa438, 0xa808 }, + { 0xa438, 0xf008 }, { 0xa438, 0xa804 }, { 0xa438, 0xf006 }, + { 0xa438, 0xa802 }, { 0xa438, 0xf004 }, { 0xa438, 0xa801 }, + { 0xa438, 0xf002 }, { 0xa438, 0xa80f }, { 0xa438, 0xd500 }, + { 0xa438, 0x0800 }, { 0xa438, 0xd505 }, { 0xa438, 0xd75e }, + { 0xa438, 0x6211 }, { 0xa438, 0xd71e }, { 0xa438, 0x619b }, + { 0xa438, 0x611a }, { 0xa438, 0x6099 }, { 0xa438, 0x0c0f }, + { 0xa438, 0x0808 }, { 0xa438, 0xf009 }, { 0xa438, 0x0c0f }, + { 0xa438, 0x0804 }, { 0xa438, 0xf006 }, { 0xa438, 0x0c0f }, + { 0xa438, 0x0802 }, { 0xa438, 0xf003 }, { 0xa438, 0x0c0f }, + { 0xa438, 0x0801 }, { 0xa438, 0xd500 }, { 0xa438, 0x0800 }, + { 0xa436, 0xa026 }, { 0xa438, 0xffff }, { 0xa436, 0xa024 }, + { 0xa438, 0xffff }, { 0xa436, 0xa022 }, { 0xa438, 0xffff }, + { 0xa436, 0xa020 }, { 0xa438, 0xffff }, { 0xa436, 0xa006 }, + { 0xa438, 0xffff }, { 0xa436, 0xa004 }, { 0xa438, 0x16ab }, + { 0xa436, 0xa002 }, { 0xa438, 0x1663 }, { 0xa436, 0xa000 }, + { 0xa438, 0x1608 }, { 0xa436, 0xa008 }, { 0xa438, 0x0700 }, + { 0xa436, 0xa016 }, { 0xa438, 0x0000 }, { 0xa436, 0xa012 }, + { 0xa438, 0x07f8 }, { 0xa436, 0xa014 }, { 0xa438, 0xcc01 }, + { 0xa438, 0x20f6 }, { 0xa438, 0x0000 }, { 0xa438, 0x0000 }, + { 0xa438, 0x0000 }, { 0xa438, 0x0000 }, { 0xa438, 0x0000 }, + { 0xa438, 0x0000 }, { 0xa436, 0xa152 }, { 0xa438, 0x021c }, + { 0xa436, 0xa154 }, { 0xa438, 0x2100 }, { 0xa436, 0xa156 }, + { 0xa438, 0x3fff }, { 0xa436, 0xa158 }, { 0xa438, 0x3fff }, + { 0xa436, 0xa15a }, { 0xa438, 0x3fff }, { 0xa436, 0xa15c }, + { 0xa438, 0x3fff }, { 0xa436, 0xa15e }, { 0xa438, 0x3fff }, + { 0xa436, 0xa160 }, { 0xa438, 0x3fff }, { 0xa436, 0xa150 }, + { 0xa438, 0x0003 }, { 0xa436, 0xa016 }, { 0xa438, 0x0010 }, + { 0xa436, 0xa012 }, { 0xa438, 0x0000 }, { 0xa436, 0xa014 }, + { 0xa438, 0x1800 }, { 0xa438, 0x8010 }, { 0xa438, 0x1800 }, + { 0xa438, 0x8014 }, { 0xa438, 0x1800 }, { 0xa438, 0x803d }, + { 0xa438, 0x1800 }, { 0xa438, 0x804a }, { 0xa438, 0x1800 }, + { 0xa438, 0x804e }, { 0xa438, 0x1800 }, { 0xa438, 0x8052 }, + { 0xa438, 0x1800 }, { 0xa438, 0x8092 }, { 0xa438, 0x1800 }, + { 0xa438, 0x80a0 }, { 0xa438, 0xc2ff }, { 0xa438, 0x9a40 }, + { 0xa438, 0x1800 }, { 0xa438, 0x0042 }, { 0xa438, 0x1000 }, + { 0xa438, 0x02e5 }, { 0xa438, 0xba20 }, { 0xa438, 0x1000 }, + { 0xa438, 0x02b4 }, { 0xa438, 0xd701 }, { 0xa438, 0x4103 }, + { 0xa438, 0xd700 }, { 0xa438, 0x5f6c }, { 0xa438, 0x1000 }, + { 0xa438, 0x8024 }, { 0xa438, 0x9a20 }, { 0xa438, 0x1800 }, + { 0xa438, 0x0073 }, { 0xa438, 0x1800 }, { 0xa438, 0x0084 }, + { 0xa438, 0xd701 }, { 0xa438, 0x4061 }, { 0xa438, 0xba0f }, + { 0xa438, 0xf004 }, { 0xa438, 0x4060 }, { 0xa438, 0x1000 }, + { 0xa438, 0x802d }, { 0xa438, 0xba10 }, { 0xa438, 0x0800 }, + { 0xa438, 0xd700 }, { 0xa438, 0x60bb }, { 0xa438, 0x611c }, + { 0xa438, 0x0c0f }, { 0xa438, 0x1a01 }, { 0xa438, 0xf00a }, + { 0xa438, 0x60fc }, { 0xa438, 0x0c0f }, { 0xa438, 0x1a02 }, + { 0xa438, 0xf006 }, { 0xa438, 0x0c0f }, { 0xa438, 0x1a04 }, + { 0xa438, 0xf003 }, { 0xa438, 0x0c0f }, { 0xa438, 0x1a08 }, + { 0xa438, 0x0800 }, { 0xa438, 0x0c0f }, { 0xa438, 0x0504 }, + { 0xa438, 0xad02 }, { 0xa438, 0xd73e }, { 0xa438, 0x40f6 }, + { 0xa438, 0x1000 }, { 0xa438, 0x02c0 }, { 0xa438, 0xd700 }, + { 0xa438, 0x5fac }, { 0xa438, 0x1000 }, { 0xa438, 0x8024 }, + { 0xa438, 0x1800 }, { 0xa438, 0x0139 }, { 0xa438, 0x9a3f }, + { 0xa438, 0x8bf0 }, { 0xa438, 0x1800 }, { 0xa438, 0x02df }, + { 0xa438, 0x9a3f }, { 0xa438, 0x9910 }, { 0xa438, 0x1800 }, + { 0xa438, 0x02d7 }, { 0xa438, 0xad02 }, { 0xa438, 0x8d01 }, + { 0xa438, 0x9a7f }, { 0xa438, 0x9910 }, { 0xa438, 0x9860 }, + { 0xa438, 0xcb00 }, { 0xa438, 0xd501 }, { 0xa438, 0xce01 }, + { 0xa438, 0x85f0 }, { 0xa438, 0xd500 }, { 0xa438, 0x0c0f }, + { 0xa438, 0x0505 }, { 0xa438, 0xb820 }, { 0xa438, 0xc000 }, + { 0xa438, 0xc100 }, { 0xa438, 0xc628 }, { 0xa438, 0xc700 }, + { 0xa438, 0xc801 }, { 0xa438, 0xc91e }, { 0xa438, 0xc001 }, + { 0xa438, 0x4019 }, { 0xa438, 0xc6f8 }, { 0xa438, 0xc702 }, + { 0xa438, 0xc809 }, { 0xa438, 0xc940 }, { 0xa438, 0xc002 }, + { 0xa438, 0x4019 }, { 0xa438, 0x1000 }, { 0xa438, 0x02cc }, + { 0xa438, 0xd700 }, { 0xa438, 0x5fa7 }, { 0xa438, 0xc010 }, + { 0xa438, 0x1000 }, { 0xa438, 0x02cc }, { 0xa438, 0xd700 }, + { 0xa438, 0x5fa0 }, { 0xa438, 0xc020 }, { 0xa438, 0x1000 }, + { 0xa438, 0x02cc }, { 0xa438, 0xd700 }, { 0xa438, 0x5fa1 }, + { 0xa438, 0x0c0f }, { 0xa438, 0x0506 }, { 0xa438, 0xb840 }, + { 0xa438, 0xc6ca }, { 0xa438, 0xc701 }, { 0xa438, 0xc809 }, + { 0xa438, 0xc900 }, { 0xa438, 0xc001 }, { 0xa438, 0x4019 }, + { 0xa438, 0xc6b8 }, { 0xa438, 0xc700 }, { 0xa438, 0xc800 }, + { 0xa438, 0xc900 }, { 0xa438, 0xc008 }, { 0xa438, 0x4019 }, + { 0xa438, 0x1000 }, { 0xa438, 0x02cc }, { 0xa438, 0xd700 }, + { 0xa438, 0x5fa5 }, { 0xa438, 0x8580 }, { 0xa438, 0x8d02 }, + { 0xa438, 0x1800 }, { 0xa438, 0x018f }, { 0xa438, 0x1000 }, + { 0xa438, 0x02cc }, { 0xa438, 0xd700 }, { 0xa438, 0x6124 }, + { 0xa438, 0xd73e }, { 0xa438, 0x5f75 }, { 0xa438, 0xd700 }, + { 0xa438, 0x5f2c }, { 0xa438, 0x1000 }, { 0xa438, 0x8024 }, + { 0xa438, 0x9a20 }, { 0xa438, 0xfff5 }, { 0xa438, 0x1800 }, + { 0xa438, 0x00b8 }, { 0xa438, 0x0c0f }, { 0xa438, 0x0503 }, + { 0xa438, 0xad02 }, { 0xa438, 0x68c8 }, { 0xa438, 0x1000 }, + { 0xa438, 0x02c0 }, { 0xa438, 0xd700 }, { 0xa438, 0x6848 }, + { 0xa438, 0x604d }, { 0xa438, 0xfffb }, { 0xa438, 0xd73e }, + { 0xa438, 0x6082 }, { 0xa438, 0x1000 }, { 0xa438, 0x02a1 }, + { 0xa438, 0x8a0f }, { 0xa438, 0x1000 }, { 0xa438, 0x02c0 }, + { 0xa438, 0xd700 }, { 0xa438, 0x5fae }, { 0xa438, 0x1000 }, + { 0xa438, 0x02de }, { 0xa438, 0x1000 }, { 0xa438, 0x02c0 }, + { 0xa438, 0xd700 }, { 0xa438, 0x5faf }, { 0xa438, 0x8d01 }, + { 0xa438, 0x8b0f }, { 0xa438, 0x1000 }, { 0xa438, 0x02c0 }, + { 0xa438, 0xd700 }, { 0xa438, 0x2a58 }, { 0xa438, 0x80c5 }, + { 0xa438, 0x2a5b }, { 0xa438, 0x80cd }, { 0xa438, 0x2b53 }, + { 0xa438, 0x80d9 }, { 0xa438, 0xfff7 }, { 0xa438, 0x1000 }, + { 0xa438, 0x022a }, { 0xa438, 0x1000 }, { 0xa438, 0x02e5 }, + { 0xa438, 0xba40 }, { 0xa438, 0x1000 }, { 0xa438, 0x02fd }, + { 0xa438, 0xf018 }, { 0xa438, 0x1000 }, { 0xa438, 0x022a }, + { 0xa438, 0x1000 }, { 0xa438, 0x02e5 }, { 0xa438, 0xba40 }, + { 0xa438, 0x1000 }, { 0xa438, 0x02c0 }, { 0xa438, 0xd700 }, + { 0xa438, 0x5faa }, { 0xa438, 0x1000 }, { 0xa438, 0x02fd }, + { 0xa438, 0xf00c }, { 0xa438, 0x1000 }, { 0xa438, 0x022a }, + { 0xa438, 0x1000 }, { 0xa438, 0x02fd }, { 0xa438, 0x1000 }, + { 0xa438, 0x02c0 }, { 0xa438, 0xd700 }, { 0xa438, 0x5fab }, + { 0xa438, 0x1000 }, { 0xa438, 0x02e5 }, { 0xa438, 0xba40 }, + { 0xa438, 0x1000 }, { 0xa438, 0x02c0 }, { 0xa438, 0xd700 }, + { 0xa438, 0x6088 }, { 0xa438, 0xfffc }, { 0xa438, 0x1800 }, + { 0xa438, 0x0120 }, { 0xa438, 0x1800 }, { 0xa438, 0x0122 }, + { 0xa436, 0xa08e }, { 0xa438, 0x00db }, { 0xa436, 0xa08c }, + { 0xa438, 0x00b4 }, { 0xa436, 0xa08a }, { 0xa438, 0x015a }, + { 0xa436, 0xa088 }, { 0xa438, 0x02d6 }, { 0xa436, 0xa086 }, + { 0xa438, 0x02de }, { 0xa436, 0xa084 }, { 0xa438, 0x0137 }, + { 0xa436, 0xa082 }, { 0xa438, 0x0071 }, { 0xa436, 0xa080 }, + { 0xa438, 0x0041 }, { 0xa436, 0xa090 }, { 0xa438, 0x00ff }, + { 0xa436, 0xa016 }, { 0xa438, 0x0020 }, { 0xa436, 0xa012 }, + { 0xa438, 0x0000 }, { 0xa436, 0xa014 }, { 0xa438, 0x1800 }, + { 0xa438, 0x8010 }, { 0xa438, 0x1800 }, { 0xa438, 0x801d }, + { 0xa438, 0x1800 }, { 0xa438, 0x808a }, { 0xa438, 0x1800 }, + { 0xa438, 0x80a5 }, { 0xa438, 0x1800 }, { 0xa438, 0x80b8 }, + { 0xa438, 0x1800 }, { 0xa438, 0x8108 }, { 0xa438, 0x1800 }, + { 0xa438, 0x810f }, { 0xa438, 0x1800 }, { 0xa438, 0x811b }, + { 0xa438, 0x8980 }, { 0xa438, 0xd702 }, { 0xa438, 0x6126 }, + { 0xa438, 0xd704 }, { 0xa438, 0x4063 }, { 0xa438, 0xd702 }, + { 0xa438, 0x6060 }, { 0xa438, 0xd702 }, { 0xa438, 0x6077 }, + { 0xa438, 0x1800 }, { 0xa438, 0x0c29 }, { 0xa438, 0x1800 }, + { 0xa438, 0x0c2b }, { 0xa438, 0x1000 }, { 0xa438, 0x115a }, + { 0xa438, 0xd71f }, { 0xa438, 0x5fb4 }, { 0xa438, 0xd702 }, + { 0xa438, 0x6c46 }, { 0xa438, 0xd704 }, { 0xa438, 0x4063 }, + { 0xa438, 0xd702 }, { 0xa438, 0x6060 }, { 0xa438, 0xd702 }, + { 0xa438, 0x6b97 }, { 0xa438, 0xa340 }, { 0xa438, 0x0c06 }, + { 0xa438, 0x0102 }, { 0xa438, 0xce01 }, { 0xa438, 0x1000 }, + { 0xa438, 0x117a }, { 0xa438, 0xa240 }, { 0xa438, 0xa902 }, + { 0xa438, 0xa204 }, { 0xa438, 0xa280 }, { 0xa438, 0xa364 }, + { 0xa438, 0xab02 }, { 0xa438, 0x8380 }, { 0xa438, 0xa00a }, + { 0xa438, 0xcd8d }, { 0xa438, 0x1000 }, { 0xa438, 0x115a }, + { 0xa438, 0xd706 }, { 0xa438, 0x5fb5 }, { 0xa438, 0xb920 }, + { 0xa438, 0x1000 }, { 0xa438, 0x115a }, { 0xa438, 0xd71f }, + { 0xa438, 0x7fb4 }, { 0xa438, 0x9920 }, { 0xa438, 0x1000 }, + { 0xa438, 0x115a }, { 0xa438, 0xd71f }, { 0xa438, 0x6065 }, + { 0xa438, 0x7c74 }, { 0xa438, 0xfffb }, { 0xa438, 0xb820 }, + { 0xa438, 0x1000 }, { 0xa438, 0x115a }, { 0xa438, 0xd71f }, + { 0xa438, 0x7fa5 }, { 0xa438, 0x9820 }, { 0xa438, 0xa410 }, + { 0xa438, 0x8902 }, { 0xa438, 0xa120 }, { 0xa438, 0xa380 }, + { 0xa438, 0xce02 }, { 0xa438, 0x1000 }, { 0xa438, 0x117a }, + { 0xa438, 0x8280 }, { 0xa438, 0xa324 }, { 0xa438, 0xab02 }, + { 0xa438, 0xa00a }, { 0xa438, 0x8118 }, { 0xa438, 0x863f }, + { 0xa438, 0x87fb }, { 0xa438, 0xcd8e }, { 0xa438, 0xd193 }, + { 0xa438, 0xd047 }, { 0xa438, 0x1000 }, { 0xa438, 0x115a }, + { 0xa438, 0x1000 }, { 0xa438, 0x115f }, { 0xa438, 0xd700 }, + { 0xa438, 0x5f7b }, { 0xa438, 0xa280 }, { 0xa438, 0x1000 }, + { 0xa438, 0x115a }, { 0xa438, 0x1000 }, { 0xa438, 0x115f }, + { 0xa438, 0xd706 }, { 0xa438, 0x5f78 }, { 0xa438, 0xa210 }, + { 0xa438, 0xd700 }, { 0xa438, 0x6083 }, { 0xa438, 0xd101 }, + { 0xa438, 0xd047 }, { 0xa438, 0xf003 }, { 0xa438, 0xd160 }, + { 0xa438, 0xd04b }, { 0xa438, 0x1000 }, { 0xa438, 0x115a }, + { 0xa438, 0x1000 }, { 0xa438, 0x115f }, { 0xa438, 0xd700 }, + { 0xa438, 0x5f7b }, { 0xa438, 0x1000 }, { 0xa438, 0x115a }, + { 0xa438, 0x1000 }, { 0xa438, 0x115f }, { 0xa438, 0xd706 }, + { 0xa438, 0x5f79 }, { 0xa438, 0x8120 }, { 0xa438, 0xbb20 }, + { 0xa438, 0x1800 }, { 0xa438, 0x0c8b }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0x8f80 }, { 0xa438, 0x9503 }, + { 0xa438, 0x1800 }, { 0xa438, 0x0c3c }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0xa608 }, { 0xa438, 0x9503 }, + { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, { 0xa438, 0x8f80 }, + { 0xa438, 0x9503 }, { 0xa438, 0xd704 }, { 0xa438, 0x6192 }, + { 0xa438, 0xd702 }, { 0xa438, 0x4116 }, { 0xa438, 0xce04 }, + { 0xa438, 0x1000 }, { 0xa438, 0x117a }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0x8f40 }, { 0xa438, 0x9503 }, + { 0xa438, 0x1800 }, { 0xa438, 0x0b3d }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0xaf40 }, { 0xa438, 0x9503 }, + { 0xa438, 0x1800 }, { 0xa438, 0x0b48 }, { 0xa438, 0xd704 }, + { 0xa438, 0x6192 }, { 0xa438, 0xd702 }, { 0xa438, 0x4116 }, + { 0xa438, 0xce04 }, { 0xa438, 0x1000 }, { 0xa438, 0x117a }, + { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, { 0xa438, 0x8f40 }, + { 0xa438, 0x9503 }, { 0xa438, 0x1800 }, { 0xa438, 0x1269 }, + { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, { 0xa438, 0xaf40 }, + { 0xa438, 0x9503 }, { 0xa438, 0x1800 }, { 0xa438, 0x1274 }, + { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, { 0xa438, 0xa608 }, + { 0xa438, 0xc700 }, { 0xa438, 0x9503 }, { 0xa438, 0xce54 }, + { 0xa438, 0x1000 }, { 0xa438, 0x117a }, { 0xa438, 0xa290 }, + { 0xa438, 0xa304 }, { 0xa438, 0xab02 }, { 0xa438, 0xd700 }, + { 0xa438, 0x6050 }, { 0xa438, 0xab04 }, { 0xa438, 0x0c38 }, + { 0xa438, 0x0608 }, { 0xa438, 0xaa0b }, { 0xa438, 0xd702 }, + { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, { 0xa438, 0x8d01 }, + { 0xa438, 0xae40 }, { 0xa438, 0x4044 }, { 0xa438, 0x8e20 }, + { 0xa438, 0x9503 }, { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, + { 0xa438, 0x8c20 }, { 0xa438, 0x9503 }, { 0xa438, 0xd700 }, + { 0xa438, 0x6078 }, { 0xa438, 0xd700 }, { 0xa438, 0x609a }, + { 0xa438, 0xd109 }, { 0xa438, 0xd074 }, { 0xa438, 0xf003 }, + { 0xa438, 0xd109 }, { 0xa438, 0xd075 }, { 0xa438, 0x1000 }, + { 0xa438, 0x115a }, { 0xa438, 0xd704 }, { 0xa438, 0x6252 }, + { 0xa438, 0xd702 }, { 0xa438, 0x4116 }, { 0xa438, 0xce54 }, + { 0xa438, 0x1000 }, { 0xa438, 0x117a }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0x8f40 }, { 0xa438, 0x9503 }, + { 0xa438, 0xa00a }, { 0xa438, 0xd704 }, { 0xa438, 0x41e7 }, + { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, { 0xa438, 0xa570 }, + { 0xa438, 0x9503 }, { 0xa438, 0xf00a }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0xaf40 }, { 0xa438, 0x9503 }, + { 0xa438, 0x800a }, { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, + { 0xa438, 0x8570 }, { 0xa438, 0x9503 }, { 0xa438, 0xd704 }, + { 0xa438, 0x60f3 }, { 0xa438, 0xd71f }, { 0xa438, 0x60ee }, + { 0xa438, 0xd700 }, { 0xa438, 0x5bbe }, { 0xa438, 0x1800 }, + { 0xa438, 0x0e71 }, { 0xa438, 0x1800 }, { 0xa438, 0x0e7c }, + { 0xa438, 0x1800 }, { 0xa438, 0x0e7e }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0xaf80 }, { 0xa438, 0x9503 }, + { 0xa438, 0xcd62 }, { 0xa438, 0x1800 }, { 0xa438, 0x0bd2 }, + { 0xa438, 0x800a }, { 0xa438, 0x8530 }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0x8d10 }, { 0xa438, 0x9503 }, + { 0xa438, 0xd700 }, { 0xa438, 0x6050 }, { 0xa438, 0xaa20 }, + { 0xa438, 0x8306 }, { 0xa438, 0x1800 }, { 0xa438, 0x0cb6 }, + { 0xa438, 0xd105 }, { 0xa438, 0xd040 }, { 0xa438, 0x1000 }, + { 0xa438, 0x0d8f }, { 0xa438, 0xd700 }, { 0xa438, 0x5fbb }, + { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, { 0xa438, 0x8608 }, + { 0xa438, 0x9503 }, { 0xa438, 0x1000 }, { 0xa438, 0x0d8f }, + { 0xa438, 0xd704 }, { 0xa438, 0x7fb6 }, { 0xa438, 0x0c03 }, + { 0xa438, 0x1502 }, { 0xa438, 0x87f0 }, { 0xa438, 0x9503 }, + { 0xa438, 0xce88 }, { 0xa438, 0x1000 }, { 0xa438, 0x117a }, + { 0xa438, 0x0c03 }, { 0xa438, 0x1502 }, { 0xa438, 0xa608 }, + { 0xa438, 0x9503 }, { 0xa438, 0xd73e }, { 0xa438, 0x60a5 }, + { 0xa438, 0xd705 }, { 0xa438, 0x4071 }, { 0xa438, 0x1800 }, + { 0xa438, 0x0d65 }, { 0xa438, 0x1800 }, { 0xa438, 0x0d6f }, + { 0xa436, 0xa10e }, { 0xa438, 0x0d58 }, { 0xa436, 0xa10c }, + { 0xa438, 0x0cb5 }, { 0xa436, 0xa10a }, { 0xa438, 0x0bd1 }, + { 0xa436, 0xa108 }, { 0xa438, 0x0e37 }, { 0xa436, 0xa106 }, + { 0xa438, 0x1267 }, { 0xa436, 0xa104 }, { 0xa438, 0x0b3b }, + { 0xa436, 0xa102 }, { 0xa438, 0x0c38 }, { 0xa436, 0xa100 }, + { 0xa438, 0x0c24 }, { 0xa436, 0xa110 }, { 0xa438, 0x00ff }, + { 0xa436, 0xa016 }, { 0xa438, 0x0020 }, { 0xa436, 0xa012 }, + { 0xa438, 0x1ff8 }, { 0xa436, 0xa014 }, { 0xa438, 0x0000 }, + { 0xa438, 0x0000 }, { 0xa438, 0x0000 }, { 0xa438, 0x0000 }, + { 0xa438, 0x0000 }, { 0xa438, 0x0000 }, { 0xa438, 0x0000 }, + { 0xa438, 0x0000 }, { 0xa436, 0xa164 }, { 0xa438, 0x0ceb }, + { 0xa436, 0xa166 }, { 0xa438, 0x0e73 }, { 0xa436, 0xa168 }, + { 0xa438, 0x0deb }, { 0xa436, 0xa16a }, { 0xa438, 0x3fff }, + { 0xa436, 0xa16c }, { 0xa438, 0x3fff }, { 0xa436, 0xa16e }, + { 0xa438, 0x3fff }, { 0xa436, 0xa170 }, { 0xa438, 0x3fff }, + { 0xa436, 0xa172 }, { 0xa438, 0x3fff }, { 0xa436, 0xa162 }, + { 0xa438, 0x0007 }, { 0xa436, 0xb87c }, { 0xa438, 0x85bf }, + { 0xa436, 0xb87e }, { 0xa438, 0xaf85 }, { 0xa438, 0xd7af }, + { 0xa438, 0x85fb }, { 0xa438, 0xaf86 }, { 0xa438, 0x10af }, + { 0xa438, 0x8638 }, { 0xa438, 0xaf86 }, { 0xa438, 0x47af }, + { 0xa438, 0x8647 }, { 0xa438, 0xaf86 }, { 0xa438, 0x47af }, + { 0xa438, 0x8647 }, { 0xa438, 0xbf85 }, { 0xa438, 0xf802 }, + { 0xa438, 0x627f }, { 0xa438, 0xbf61 }, { 0xa438, 0xc702 }, + { 0xa438, 0x627f }, { 0xa438, 0xae0c }, { 0xa438, 0xbf85 }, + { 0xa438, 0xf802 }, { 0xa438, 0x6276 }, { 0xa438, 0xbf61 }, + { 0xa438, 0xc702 }, { 0xa438, 0x6276 }, { 0xa438, 0xee85 }, + { 0xa438, 0x4200 }, { 0xa438, 0xaf1b }, { 0xa438, 0x2333 }, + { 0xa438, 0xa484 }, { 0xa438, 0xbf86 }, { 0xa438, 0x0a02 }, + { 0xa438, 0x627f }, { 0xa438, 0xbf86 }, { 0xa438, 0x0d02 }, + { 0xa438, 0x627f }, { 0xa438, 0xaf1b }, { 0xa438, 0x8422 }, + { 0xa438, 0xa484 }, { 0xa438, 0x66ac }, { 0xa438, 0x0ef8 }, + { 0xa438, 0xfbef }, { 0xa438, 0x79fb }, { 0xa438, 0xe080 }, + { 0xa438, 0x16ad }, { 0xa438, 0x230f }, { 0xa438, 0xee85 }, + { 0xa438, 0x4200 }, { 0xa438, 0x1f44 }, { 0xa438, 0xbf86 }, + { 0xa438, 0x30d7 }, { 0xa438, 0x0008 }, { 0xa438, 0x0264 }, + { 0xa438, 0xa3ff }, { 0xa438, 0xef97 }, { 0xa438, 0xfffc }, + { 0xa438, 0x0485 }, { 0xa438, 0xf861 }, { 0xa438, 0xc786 }, + { 0xa438, 0x0a86 }, { 0xa438, 0x0de1 }, { 0xa438, 0x8feb }, + { 0xa438, 0xe583 }, { 0xa438, 0x20e1 }, { 0xa438, 0x8fea }, + { 0xa438, 0xe583 }, { 0xa438, 0x21af }, { 0xa438, 0x41a7 }, + { 0xa436, 0xb85e }, { 0xa438, 0x1b05 }, { 0xa436, 0xb860 }, + { 0xa438, 0x1b78 }, { 0xa436, 0xb862 }, { 0xa438, 0x1a08 }, + { 0xa436, 0xb864 }, { 0xa438, 0x419f }, { 0xa436, 0xb886 }, + { 0xa438, 0xffff }, { 0xa436, 0xb888 }, { 0xa438, 0xffff }, + { 0xa436, 0xb88a }, { 0xa438, 0xffff }, { 0xa436, 0xb88c }, + { 0xa438, 0xffff }, { 0xa436, 0xb838 }, { 0xa438, 0x000f }, + { 0xb820, 0x0010 }, { 0xa436, 0x0000 }, { 0xa438, 0x0000 }, + { 0xb82e, 0x0000 }, { 0xa436, 0x8023 }, { 0xa438, 0x0000 }, + { 0xa436, 0x801e }, { 0xa438, 0x0013 }, { 0xb820, 0x0000 }, + { 0xa436, 0xacca }, { 0xa438, 0x0104 }, { 0xa436, 0xaccc }, + { 0xa438, 0x8000 }, { 0xa436, 0xacce }, { 0xa438, 0xffff }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0fff }, { 0xa436, 0xacce }, + { 0xa438, 0xfd47 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0fff }, + { 0xa436, 0xacce }, { 0xa438, 0xffff }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0xe56f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x01c0 }, { 0xa436, 0xacce }, + { 0xa438, 0xffff }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0xed97 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x01c8 }, { 0xa436, 0xacce }, { 0xa438, 0xffff }, + { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, { 0xa436, 0xacce }, + { 0xa438, 0xf5bf }, { 0xa436, 0xacd0 }, { 0xa438, 0x01d0 }, + { 0xa436, 0xacce }, { 0xa438, 0xfb07 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0xfb0f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x01d8 }, { 0xa436, 0xacce }, + { 0xa438, 0xa087 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0180 }, + { 0xa436, 0xacce }, { 0xa438, 0xa00f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0108 }, { 0xa436, 0xacce }, { 0xa438, 0xa807 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0100 }, { 0xa436, 0xacce }, + { 0xa438, 0xa88f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0188 }, + { 0xa436, 0xacce }, { 0xa438, 0xb027 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0120 }, { 0xa436, 0xacce }, { 0xa438, 0xb02f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0128 }, { 0xa436, 0xacce }, + { 0xa438, 0xb847 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0140 }, + { 0xa436, 0xacce }, { 0xa438, 0xb84f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0148 }, { 0xa436, 0xacce }, { 0xa438, 0xfb17 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, { 0xa436, 0xacce }, + { 0xa438, 0xfb1f }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0xa017 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0110 }, { 0xa436, 0xacce }, { 0xa438, 0xa01f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0118 }, { 0xa436, 0xacce }, + { 0xa438, 0xa837 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0130 }, + { 0xa436, 0xacce }, { 0xa438, 0xa83f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0138 }, { 0xa436, 0xacce }, { 0xa438, 0xb097 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0190 }, { 0xa436, 0xacce }, + { 0xa438, 0xb05f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0158 }, + { 0xa436, 0xacce }, { 0xa438, 0xb857 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0150 }, { 0xa436, 0xacce }, { 0xa438, 0xb89f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0198 }, { 0xa436, 0xacce }, + { 0xa438, 0xfb27 }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0xfb2f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0x8087 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0180 }, { 0xa436, 0xacce }, + { 0xa438, 0x800f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0108 }, + { 0xa436, 0xacce }, { 0xa438, 0x8807 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0100 }, { 0xa436, 0xacce }, { 0xa438, 0x888f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0188 }, { 0xa436, 0xacce }, + { 0xa438, 0x9027 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0120 }, + { 0xa436, 0xacce }, { 0xa438, 0x902f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0128 }, { 0xa436, 0xacce }, { 0xa438, 0x9847 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0140 }, { 0xa436, 0xacce }, + { 0xa438, 0x984f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0148 }, + { 0xa436, 0xacce }, { 0xa438, 0xa0a7 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x01a0 }, { 0xa436, 0xacce }, { 0xa438, 0xa8af }, + { 0xa436, 0xacd0 }, { 0xa438, 0x01a8 }, { 0xa436, 0xacce }, + { 0xa438, 0xa067 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0161 }, + { 0xa436, 0xacce }, { 0xa438, 0xa86f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0169 }, { 0xa436, 0xacce }, { 0xa438, 0xfb37 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, { 0xa436, 0xacce }, + { 0xa438, 0xfb3f }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0x8017 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0110 }, { 0xa436, 0xacce }, { 0xa438, 0x801f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0118 }, { 0xa436, 0xacce }, + { 0xa438, 0x8837 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0130 }, + { 0xa436, 0xacce }, { 0xa438, 0x883f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0138 }, { 0xa436, 0xacce }, { 0xa438, 0x9097 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0190 }, { 0xa436, 0xacce }, + { 0xa438, 0x905f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0158 }, + { 0xa436, 0xacce }, { 0xa438, 0x9857 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0150 }, { 0xa436, 0xacce }, { 0xa438, 0x989f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0198 }, { 0xa436, 0xacce }, + { 0xa438, 0xb0b7 }, { 0xa436, 0xacd0 }, { 0xa438, 0x01b0 }, + { 0xa436, 0xacce }, { 0xa438, 0xb8bf }, { 0xa436, 0xacd0 }, + { 0xa438, 0x01b8 }, { 0xa436, 0xacce }, { 0xa438, 0xb077 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0171 }, { 0xa436, 0xacce }, + { 0xa438, 0xb87f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0179 }, + { 0xa436, 0xacce }, { 0xa438, 0xfb47 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0xfb4f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, { 0xa436, 0xacce }, + { 0xa438, 0x6087 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0180 }, + { 0xa436, 0xacce }, { 0xa438, 0x600f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0108 }, { 0xa436, 0xacce }, { 0xa438, 0x6807 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0100 }, { 0xa436, 0xacce }, + { 0xa438, 0x688f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0188 }, + { 0xa436, 0xacce }, { 0xa438, 0x7027 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0120 }, { 0xa436, 0xacce }, { 0xa438, 0x702f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0128 }, { 0xa436, 0xacce }, + { 0xa438, 0x7847 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0140 }, + { 0xa436, 0xacce }, { 0xa438, 0x784f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0148 }, { 0xa436, 0xacce }, { 0xa438, 0x80a7 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x01a0 }, { 0xa436, 0xacce }, + { 0xa438, 0x88af }, { 0xa436, 0xacd0 }, { 0xa438, 0x01a8 }, + { 0xa436, 0xacce }, { 0xa438, 0x8067 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0161 }, { 0xa436, 0xacce }, { 0xa438, 0x886f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0169 }, { 0xa436, 0xacce }, + { 0xa438, 0xfb57 }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0xfb5f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0x6017 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0110 }, { 0xa436, 0xacce }, + { 0xa438, 0x601f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0118 }, + { 0xa436, 0xacce }, { 0xa438, 0x6837 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0130 }, { 0xa436, 0xacce }, { 0xa438, 0x683f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0138 }, { 0xa436, 0xacce }, + { 0xa438, 0x7097 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0190 }, + { 0xa436, 0xacce }, { 0xa438, 0x705f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0158 }, { 0xa436, 0xacce }, { 0xa438, 0x7857 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0150 }, { 0xa436, 0xacce }, + { 0xa438, 0x789f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0198 }, + { 0xa436, 0xacce }, { 0xa438, 0x90b7 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x01b0 }, { 0xa436, 0xacce }, { 0xa438, 0x98bf }, + { 0xa436, 0xacd0 }, { 0xa438, 0x01b8 }, { 0xa436, 0xacce }, + { 0xa438, 0x9077 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0171 }, + { 0xa436, 0xacce }, { 0xa438, 0x987f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0179 }, { 0xa436, 0xacce }, { 0xa438, 0xfb67 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, { 0xa436, 0xacce }, + { 0xa438, 0xfb6f }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0x4087 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0180 }, { 0xa436, 0xacce }, { 0xa438, 0x400f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0108 }, { 0xa436, 0xacce }, + { 0xa438, 0x4807 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0100 }, + { 0xa436, 0xacce }, { 0xa438, 0x488f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0188 }, { 0xa436, 0xacce }, { 0xa438, 0x5027 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0120 }, { 0xa436, 0xacce }, + { 0xa438, 0x502f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0128 }, + { 0xa436, 0xacce }, { 0xa438, 0x5847 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0140 }, { 0xa436, 0xacce }, { 0xa438, 0x584f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0148 }, { 0xa436, 0xacce }, + { 0xa438, 0x60a7 }, { 0xa436, 0xacd0 }, { 0xa438, 0x01a0 }, + { 0xa436, 0xacce }, { 0xa438, 0x68af }, { 0xa436, 0xacd0 }, + { 0xa438, 0x01a8 }, { 0xa436, 0xacce }, { 0xa438, 0x6067 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0161 }, { 0xa436, 0xacce }, + { 0xa438, 0x686f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0169 }, + { 0xa436, 0xacce }, { 0xa438, 0xfb77 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0xfb7f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, { 0xa436, 0xacce }, + { 0xa438, 0x4017 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0110 }, + { 0xa436, 0xacce }, { 0xa438, 0x401f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0118 }, { 0xa436, 0xacce }, { 0xa438, 0x4837 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0130 }, { 0xa436, 0xacce }, + { 0xa438, 0x483f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0138 }, + { 0xa436, 0xacce }, { 0xa438, 0x5097 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0190 }, { 0xa436, 0xacce }, { 0xa438, 0x505f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0158 }, { 0xa436, 0xacce }, + { 0xa438, 0x5857 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0150 }, + { 0xa436, 0xacce }, { 0xa438, 0x589f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0198 }, { 0xa436, 0xacce }, { 0xa438, 0x70b7 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x01b0 }, { 0xa436, 0xacce }, + { 0xa438, 0x78bf }, { 0xa436, 0xacd0 }, { 0xa438, 0x01b8 }, + { 0xa436, 0xacce }, { 0xa438, 0x7077 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0171 }, { 0xa436, 0xacce }, { 0xa438, 0x787f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0179 }, { 0xa436, 0xacce }, + { 0xa438, 0xfb87 }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0xfb8f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0x40a7 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x01a0 }, { 0xa436, 0xacce }, + { 0xa438, 0x48af }, { 0xa436, 0xacd0 }, { 0xa438, 0x01a8 }, + { 0xa436, 0xacce }, { 0xa438, 0x4067 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0161 }, { 0xa436, 0xacce }, { 0xa438, 0x486f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0169 }, { 0xa436, 0xacce }, + { 0xa438, 0xfb97 }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0xfb9f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0x50b7 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x01b0 }, { 0xa436, 0xacce }, + { 0xa438, 0x58bf }, { 0xa436, 0xacd0 }, { 0xa438, 0x01b8 }, + { 0xa436, 0xacce }, { 0xa438, 0x5077 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0171 }, { 0xa436, 0xacce }, { 0xa438, 0x587f }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0179 }, { 0xa436, 0xacce }, + { 0xa438, 0xfba7 }, { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, + { 0xa436, 0xacce }, { 0xa438, 0xfbaf }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0x2067 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x0161 }, { 0xa436, 0xacce }, + { 0xa438, 0x286f }, { 0xa436, 0xacd0 }, { 0xa438, 0x0169 }, + { 0xa436, 0xacce }, { 0xa438, 0xfbb7 }, { 0xa436, 0xacd0 }, + { 0xa438, 0x07ff }, { 0xa436, 0xacce }, { 0xa438, 0xfbbf }, + { 0xa436, 0xacd0 }, { 0xa438, 0x07ff }, { 0xa436, 0xacce }, + { 0xa438, 0x3077 }, { 0xa436, 0xacd0 }, { 0xa438, 0x0171 }, + { 0xa436, 0xacce }, { 0xa438, 0x387f }, { 0xa436, 0xacd0 }, + { 0xa438, 0x0179 }, { 0xa436, 0xacce }, { 0xa438, 0xfff9 }, + { 0xa436, 0xacd0 }, { 0xa438, 0x17ff }, { 0xa436, 0xacce }, + { 0xa438, 0xfff9 }, { 0xa436, 0xacd0 }, { 0xa438, 0x17ff }, + { 0xa436, 0xacca }, { 0xa438, 0x0004 }, { 0xa436, 0xacc6 }, + { 0xa438, 0x0008 }, { 0xa436, 0xacc8 }, { 0xa438, 0xc000 }, + { 0xa436, 0xacc8 }, { 0xa438, 0x0000 }, { 0xb820, 0x0000 } +}; + static const struct rge_hw_regaddr_array mac_r26_1_mcu[] = { { 0xa436, 0x8023 }, { 0xa438, 0x4700 }, { 0xa436, 0xb82e }, { 0xa438, 0x0001 }, { 0xb820, 0x0090 }, { 0xa436, 0xa016 }, @@ -9614,7 +10248,7 @@ static const struct { MAC_R25_MCU }, mac_r25b_mcu[] = { MAC_R25B_MCU -}, mac_r25d_mcu[] = { +}, mac_r25d_1_mcu[] = { MAC_R25D_MCU }; diff --git a/sys/dev/rge/if_rgereg.h b/sys/dev/rge/if_rgereg.h index 7b34e3cefbe6..7da8ff42f2b4 100644 --- a/sys/dev/rge/if_rgereg.h +++ b/sys/dev/rge/if_rgereg.h @@ -365,13 +365,17 @@ struct rge_hw_mac_stats { #define RGE_STATS_ALIGNMENT 64 /* Ram version */ -#define RGE_MAC_R25D_RCODE_VER 0x0027 *** 28 LINES SKIPPED *** From nobody Wed Feb 4 07:33:13 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5XBx2ckpz6NWX1 for ; Wed, 04 Feb 2026 07:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5XBx2065z3sGr for ; Wed, 04 Feb 2026 07:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770190393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kilhWy7TApeu1i13DBU1hRlrfzksV79bwIHQqsn6h6g=; b=r3acUqxtA+XKlV4z9fVanDQK4MQDF0loUcqREFe0fJOfWaseOqbIjRL+/sezEyyGjJnODF wJ7FwPIAb8VGWHrAy4SN8gUWRnMJaBp71E2IEVioDRQv30kv0Zpk02OkG5d3UZAWYBYFnK aQaqzAzZzIJTe/sSusUzP3YP8WUitEKUtU2zVhzCBDCNdh2oTRkA7oWsGpZwNCI1VGaDr9 wExYIHDDyh7Rbb7apg4w4q8W+SaIs/3uBirhGjCvW372poghqH0YaHZPxnE2pk7rD/1elz my4KTNcbZGhJrpzDXxMkwyIjA+3Y99C2bfNG7TDlpM1ngCJ4u5XG0nBOr0GzLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770190393; a=rsa-sha256; cv=none; b=NswRxKH90vR1U69xhGBev2nuCvoZW4JPbuVb0+Y5dp473h+lNqR7IFysNYyfzopubPjYop o8YA+H0BCz15i9c9dRsJ2rNVIi9ow8S68rPuEvhgYiritV5Tt5//ePIOxvR/Lw6Eu+IwUK s11x0peEnQ5BqQKG9mhWW4eTOLU77YhrgqmpvWs/1Ac0S5U5A0+1qPuVjD7M9kEplKFEe/ my2QD5mqYGr3BsO5MUDKQsUuh88fPhFQ6p8Nm9Y9rA3h9kP/dyZr56WZpbTaMV0lUEc1pC 0xr+q1VwBSTAM6TkbQGufFsQt3BKXpbeTej59JU3OpP6AfNtV6cRunUABRYEZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770190393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kilhWy7TApeu1i13DBU1hRlrfzksV79bwIHQqsn6h6g=; b=DJmICA/qPhv7BrEa0OdlMnzHPiGQLZKX8I8JA0DcLxTxvZPmH0fZQPLMnUPuKFHMyOYDC6 vx1Akix7JIxXm1GXyo66uRl7e9t5R3zggSxLxTjN8s/nCB1B+ar/KRiBp6v+wxgiFCtrKO DklJDhS+MwuM7ff08i0MeVE9JhMqJq9NpYGC0zRv+bdckgrjRDs9+pvKIrmGXwN/RF6lik rVqCua7+ogtijAvMlWZYgHDslyrQClZoDK8GB9Se52Iz+qXdbZuCsYzOETNlDbC8De16yk OL8Ts/XDjHsU2FuUcUvyXwH+T2cgndAThNzfeNMyI4HfbT/L4S17CcfDY96XRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5XBx1TPfzqpq for ; Wed, 04 Feb 2026 07:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 07:33:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: b78806b156f7 - main - Remove additional libtpool and libuutil-related files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b78806b156f78733f8d6f1e0d593845e5e55221e Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 07:33:13 +0000 Message-Id: <6982f639.375be.4e4cf45e@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=b78806b156f78733f8d6f1e0d593845e5e55221e commit b78806b156f78733f8d6f1e0d593845e5e55221e Author: Enji Cooper AuthorDate: 2026-02-04 07:28:41 +0000 Commit: Enji Cooper CommitDate: 2026-02-04 07:33:04 +0000 Remove additional libtpool and libuutil-related files This change removes additional library files and tests orphaned in the commit referenced below. MFC with: 8b78d412a Fixes: 8b78d412a ("zfs: world changes after 89f729dcc merge") --- ObsoleteFiles.inc | 11 +++++++++-- etc/mtree/BSD.tests.dist | 2 -- lib/libsysdecode/Makefile.depend | 1 - rescue/rescue/Makefile.depend | 2 -- tools/build/mk/OptionalObsoleteFiles.inc | 4 ---- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 1bd4339f5cc2..a65251d0a9ee 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -89,8 +89,15 @@ OLD_FILES+=usr/bin/wait OLD_FILES+=boot/firmware/iwm8000C # 20251207: removed libuutil and libtpool -OLD_LIBS+= lib/libuutil.so.2 -OLD_LIBS+= lib/libtpool.so.2 +OLD_LIBS+=lib/libuutil.so.2 +OLD_FILES+=usr/lib/libuutil.a +OLD_FILES+=usr/lib/libuutil.so +OLD_FILES+=usr/lib/libuutil_p.a +OLD_LIBS+=lib/libtpool.so.2 +OLD_LIBS+=usr/lib/libtpool.a +OLD_LIBS+=usr/lib/libtpool.so +OLD_LIBS+=usr/lib/libtpool_p.a +OLD_FILES+=usr/tests/cddl/lib/libtpool/libtpool_test # 20251204: zpfind.9 alias to pfind.9 removed OLD_FILES+=usr/share/man/man9/zpfind.9 diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 5d004964e4e2..97b3bdefe8d4 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -80,8 +80,6 @@ .. cddl lib - libtpool - .. .. sbin .. diff --git a/lib/libsysdecode/Makefile.depend b/lib/libsysdecode/Makefile.depend index a9ccf3aa0870..0f4942adecfe 100644 --- a/lib/libsysdecode/Makefile.depend +++ b/lib/libsysdecode/Makefile.depend @@ -3,7 +3,6 @@ DIRDEPS = \ cddl/lib/libdtrace \ cddl/lib/libnvpair \ - cddl/lib/libtpool \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzfsbootenv \ diff --git a/rescue/rescue/Makefile.depend b/rescue/rescue/Makefile.depend index 0bfb25d3f174..25be7318ad3f 100644 --- a/rescue/rescue/Makefile.depend +++ b/rescue/rescue/Makefile.depend @@ -5,9 +5,7 @@ DIRDEPS = \ cddl/lib/libicp_rescue \ cddl/lib/libnvpair \ cddl/lib/libspl \ - cddl/lib/libtpool \ cddl/lib/libumem \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzfsbootenv \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 36b7a26458c1..5b0a18f75e9e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -9255,7 +9255,6 @@ OLD_DIRS+=etc/zfs OLD_LIBS+=lib/libavl.so.2 OLD_LIBS+=lib/libnvpair.so.2 OLD_LIBS+=lib/libumem.so.2 -OLD_LIBS+=lib/libuutil.so.2 OLD_LIBS+=lib/libzfs.so.2 OLD_LIBS+=lib/libzfs.so.3 OLD_LIBS+=lib/libzfs_core.so.2 @@ -9283,9 +9282,6 @@ OLD_FILES+=usr/lib/libnvpair_p.a OLD_FILES+=usr/lib/libumem.a OLD_FILES+=usr/lib/libumem.so OLD_FILES+=usr/lib/libumem_p.a -OLD_FILES+=usr/lib/libuutil.a -OLD_FILES+=usr/lib/libuutil.so -OLD_FILES+=usr/lib/libuutil_p.a OLD_FILES+=usr/lib/libzfs.a OLD_FILES+=usr/lib/libzfs.so OLD_FILES+=usr/lib/libzfs_core.a From nobody Wed Feb 4 14:50:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5jvF1dQGz6QyPh for ; Wed, 04 Feb 2026 14:50: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5jvD6BCvz3T09 for ; Wed, 04 Feb 2026 14:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770216616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkSLW6OVzCMVkSzYvWnn2o6q2MsjR4hJ691WLRdhyZY=; b=eJE9kYR+cQCW4/yPknH2/63v6Y8nci2epdVb1Uc7o/lUMckw6PPx3GUPBpLsrXv8nbljy5 qK6FGQAdCByPHZCrrfQhyjqa5988Xl987h/hCVehylTD5WLCx9F3tV8b95ljuSbI9FZ2FR 2jxLBuA5s7aoEvrA6/egIQll6gE85uP0jC3WJzjjpy92gb4t1UgLR8ENUK6dZWPP63WaI4 mXYJqz/UU23P4hLH2s4szX13FtH+zN5P+44N8YQlhNto+J4OyAkcoghTpGX6Icz2y4BlHj L+BS9x09o7jPFFBVkPviYQcZy2fIJxhbpBLUmP6V9uX1oTtwDXpPoa+rhubIdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770216616; a=rsa-sha256; cv=none; b=AfUTONXgMCP2N8opbrDGpe8WdfFgKOFp8JUip9YHOdOMi7ItXhmnKNPoYskkVh7sFsf+hy ysXIKfi5tsU3BZqVwJyF+PVDEzdfSvrMNWovBZbJZr1EHcEpFsurRT3kb4EWikjCrhag+I TbBERgN8YItKHD4N7IfN+9fQImS7VSFbWjxrMYTrbHMRtaKlxR6mNwG0vLtCj641clG2rr fnbNN6nZ93wX1sfD3XIP1iHid3vXpyqY1kha7lMcYesP7++2dIyMDvUhQW3QcAQubddnIQ tL0BrKZtCDisan3l9LqU05DKCFp9tTlWlvKkFiEwRbD6Yalm10PXe1q95tf6SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770216616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkSLW6OVzCMVkSzYvWnn2o6q2MsjR4hJ691WLRdhyZY=; b=DMALmrFOVlIRFwn49NKlNkzeuJIje0k6b5/hukS9Vpf0Sm+xrj8VenyDdiIR/aqsTsfwU0 zJoP7q1kOvNEos5GL+m6Rj7f1KXZM5/HydBrs903ywcRo4VmVQxSPnqS4PdPEkqKSHWquS ehqW3CzKaCynRyqZJTXqCH6UINs+lKBpn45KbqljzU3a4ODIfESZtbGbnTti2GAVaqAJ+Z 9S5BIvl40NVVbW5ZLB2hVSWtyfHsA8oFfJd0sFl4cpREDWkbUhjdnVeoVfxTTGU2bPt9rx Jnt7Qiv7fki7xrcynE7uZBoklRjcSLmKjJvu866tGxs6B6rpSpbXIOMeRB02Sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5jvD5mGBz13ps for ; Wed, 04 Feb 2026 14:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c4f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 14:50:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6e32e8d7d161 - main - sdt: Enable on 32-bit powerpc and powerpc64le List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e32e8d7d16148e9bad1e3544363f318582f4c13 Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 14:50:16 +0000 Message-Id: <69835ca8.3c4f7.579d87e6@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6e32e8d7d16148e9bad1e3544363f318582f4c13 commit 6e32e8d7d16148e9bad1e3544363f318582f4c13 Author: Mark Johnston AuthorDate: 2026-02-04 14:48:34 +0000 Commit: Mark Johnston CommitDate: 2026-02-04 14:48:34 +0000 sdt: Enable on 32-bit powerpc and powerpc64le Reviewed by: jhibbits, adrian MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54814 --- sys/conf/files.powerpc | 2 +- sys/modules/dtrace/Makefile | 4 +--- sys/powerpc/powerpc/sdt_machdep.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 7989f1c9bea4..d9171d33c8c0 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -390,7 +390,7 @@ powerpc/powerpc/platform.c standard powerpc/powerpc/platform_if.m standard powerpc/powerpc/ptrace_machdep.c standard powerpc/powerpc/sc_machdep.c optional sc -powerpc/powerpc/sdt_machdep.c optional powerpc64 kdtrace_hooks +powerpc/powerpc/sdt_machdep.c optional kdtrace_hooks powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode32.S optional powerpc | compat_freebsd32 powerpc/powerpc/sigcode64.S optional powerpc64 | powerpc64le diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 3a3769b8b4b5..019b5e951dcf 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -9,6 +9,7 @@ SUBDIR= dtaudit \ fbt \ profile \ prototype \ + sdt \ systrace .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" @@ -31,8 +32,5 @@ SUBDIR+= fasttrap SUBDIR+= systrace_freebsd32 .endif .endif -.if ${MACHINE_CPUARCH} != "powerpc" || ${MACHINE_ARCH} == "powerpc64" -SUBDIR+= sdt -.endif .include diff --git a/sys/powerpc/powerpc/sdt_machdep.c b/sys/powerpc/powerpc/sdt_machdep.c index 8a84016a9571..04a4cc170769 100644 --- a/sys/powerpc/powerpc/sdt_machdep.c +++ b/sys/powerpc/powerpc/sdt_machdep.c @@ -37,8 +37,8 @@ sdt_tracepoint_patch(uintptr_t patchpoint, uintptr_t target) uint32_t instr; KASSERT(sdt_tracepoint_valid(patchpoint, target), - ("%s: invalid tracepoint %#lx -> %#lx", - __func__, patchpoint, target)); + ("%s: invalid tracepoint %#jx -> %#jx", + __func__, (uintmax_t)patchpoint, (uintmax_t)target)); instr = ((target - patchpoint) & 0x7fffffful) | 0x48000000; memcpy((void *)patchpoint, &instr, sizeof(instr)); From nobody Wed Feb 4 15:41:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5l293mDLz6FPdk for ; Wed, 04 Feb 2026 15:41: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5l293PCbz3ZlS for ; Wed, 04 Feb 2026 15:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770219681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpDrNX7d4Q/ii5INFm0GKNunIQd8Ms10H0Mvx/0AvE8=; b=SFHO2+8nF0HHfhLECl0zGTcmTPP2jsSqrFsfqJWP+/5uJRlTMEfCbQ0PyMoz+8KVMHL8G1 +R2Z42MdNxw8EnJLxENsUH/U3QIQnjHCES7RgybgjZ4xyFt8KHQVNzIAEoB7GPCQ1BSr5w Ma9XMujzi02yB8IKxg4XU1PqDwdoSbr4CUASvvSyCnZEVEyB1LgwkcCFDSdUdacGcoxpf0 MWFBX8M+HcrKDv3ZBzRvLRVTUXPtTEbQr13ASzo2C5Kx7p2oIAQ6+tX7vQyayyNudsPcxW OfqDutLCHKGChTGMZ8M+r3saDC9Dl3Q/uBbb/9FW6NXqjYNm9YyWal4hadDW2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770219681; a=rsa-sha256; cv=none; b=KY9DnBlJXPoroqPDcMkxqBa6GlRs3i18Qzt1CsX6YFpGAZSEe+WQYfsJJMrKzAo9rn7X/i oFweKIwLEftILzeR+7JD1wMmUA2ZCbgBNBmiFb0C64nfBTbiVGGgxAeu6Oj4UHSArsXneu m3+KFKNvtXjP+PUb3ad3pvY0Iq325DBEdpaU/UooSXm2YhDppfN6wcUxppFpdUxnU+INJj Wahx+PFyInWCMw2rwXSLOduysbnlwkS7mU++mF9blXBNugBfbQOjqfVptx2fkGzxcjMgG0 JmEZHg5Ufk7CCbT/k/TOP1AAQDDZM1BkXGrNgD8aJaLLtE6SgHGI+4e9srIfWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770219681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpDrNX7d4Q/ii5INFm0GKNunIQd8Ms10H0Mvx/0AvE8=; b=Y6vNa9yW5LlfAhC1JdNbEfuII9sec23IWZSmHEVFCp2Xv+0CaApCFIS2+bN5aa7Lof2YNc zqUcb54f/9gJ4FMs/+6WREJi26w3b0qd2UJHBOfrECuaGiajYNpyrvHEWnuzgRVXsALPd/ Hmoj2hEU2kjAzsJy1jCjswF9KYdBEMojgCx3SfCEzUtBEtHmENejf3SrsUAC7aKPQM2G49 28LN54cKMObE2Bx0BBExN4FbWJU7kbaE0YS/hsesAwyJ4IsydQeQIe1mvbbOjFx5yAJwWi wkj6osxnpDf47xP7lgW12PEcofHmujku03fS3ELuomLZUn5LFRz1K+euFfMxLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5l292x9jz14Yj for ; Wed, 04 Feb 2026 15:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40a73 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 15:41:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: a3ff85e11925 - main - pmc: Import Intel Granite Rapids events List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3ff85e11925ba1e25465c8ba633356f405f9214 Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 15:41:21 +0000 Message-Id: <698368a1.40a73.3edd527e@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=a3ff85e11925ba1e25465c8ba633356f405f9214 commit a3ff85e11925ba1e25465c8ba633356f405f9214 Author: Bojan Novković AuthorDate: 2026-02-02 10:13:12 +0000 Commit: Bojan Novković CommitDate: 2026-02-04 15:38:30 +0000 pmc: Import Intel Granite Rapids events Reviewed by: mhorne Sponsored by: Klara, Inc. Obtained from: Intel perfmon (JSON event definitions) Differential Revision: https://reviews.freebsd.org/D55081 MFC after: 2 days --- .../pmu-events/arch/x86/graniterapids/cache.json | 1230 +++++++ .../arch/x86/graniterapids/floating-point.json | 242 ++ .../arch/x86/graniterapids/frontend.json | 476 +++ .../pmu-events/arch/x86/graniterapids/memory.json | 523 +++ .../pmu-events/arch/x86/graniterapids/other.json | 65 + .../arch/x86/graniterapids/pipeline.json | 1145 ++++++ .../arch/x86/graniterapids/uncore-cache.json | 3745 ++++++++++++++++++++ .../arch/x86/graniterapids/uncore-cxl.json | 29 + .../x86/graniterapids/uncore-interconnect.json | 1979 +++++++++++ .../arch/x86/graniterapids/uncore-io.json | 1925 ++++++++++ .../arch/x86/graniterapids/uncore-memory.json | 890 +++++ .../arch/x86/graniterapids/uncore-power.json | 109 + .../arch/x86/graniterapids/virtual-memory.json | 185 + lib/libpmc/pmu-events/arch/x86/mapfile.csv | 1 + sys/dev/hwpmc/hwpmc_intel.c | 5 + sys/sys/pmc.h | 1 + 16 files changed, 12550 insertions(+) diff --git a/lib/libpmc/pmu-events/arch/x86/graniterapids/cache.json b/lib/libpmc/pmu-events/arch/x86/graniterapids/cache.json new file mode 100644 index 000000000000..135264595c11 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/graniterapids/cache.json @@ -0,0 +1,1230 @@ +[ + { + "BriefDescription": "L1D.HWPF_MISS", + "Counter": "0,1,2,3", + "EventCode": "0x51", + "EventName": "L1D.HWPF_MISS", + "SampleAfterValue": "1000003", + "UMask": "0x20" + }, + { + "BriefDescription": "Counts the number of cache lines replaced in L1 data cache.", + "Counter": "0,1,2,3", + "EventCode": "0x51", + "EventName": "L1D.REPLACEMENT", + "PublicDescription": "Counts L1D data line replacements including opportunistic replacements, and replacements that require stall-for-replace or block-for-replace.", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Number of cycles a demand request has waited due to L1D Fill Buffer (FB) unavailability.", + "Counter": "0,1,2,3", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.FB_FULL", + "PublicDescription": "Counts number of cycles a demand request has waited due to L1D Fill Buffer (FB) unavailability. Demand requests include cacheable/uncacheable demand load, store, lock or SW prefetch accesses.", + "SampleAfterValue": "1000003", + "UMask": "0x2" + }, + { + "BriefDescription": "Number of phases a demand request has waited due to L1D Fill Buffer (FB) unavailability.", + "Counter": "0,1,2,3", + "CounterMask": "1", + "EdgeDetect": "1", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.FB_FULL_PERIODS", + "PublicDescription": "Counts number of phases a demand request has waited due to L1D Fill Buffer (FB) unavailability. Demand requests include cacheable/uncacheable demand load, store, lock or SW prefetch accesses.", + "SampleAfterValue": "1000003", + "UMask": "0x2" + }, + { + "BriefDescription": "Number of cycles a demand request has waited due to L1D due to lack of L2 resources.", + "Counter": "0,1,2,3", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.L2_STALLS", + "PublicDescription": "Counts number of cycles a demand request has waited due to L1D due to lack of L2 resources. Demand requests include cacheable/uncacheable demand load, store, lock or SW prefetch accesses.", + "SampleAfterValue": "1000003", + "UMask": "0x4" + }, + { + "BriefDescription": "Number of L1D misses that are outstanding", + "Counter": "0,1,2,3", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.PENDING", + "PublicDescription": "Counts number of L1D misses that are outstanding in each cycle, that is each cycle the number of Fill Buffers (FB) outstanding required by Demand Reads. FB either is held by demand loads, or it is held by non-demand loads and gets hit at least once by demand. The valid outstanding interval is defined until the FB deallocation by one of the following ways: from FB allocation, if FB is allocated by demand from the demand Hit FB, if it is allocated by hardware or software prefetch. Note: In the L1D, a Demand Read contains cacheable or noncacheable demand loads, including ones causing cache-line splits and reads due to page walks resulted from any request type.", + "SampleAfterValue": "1000003", + "UMask": "0x1" + }, + { + "BriefDescription": "Cycles with L1D load Misses outstanding.", + "Counter": "0,1,2,3", + "CounterMask": "1", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.PENDING_CYCLES", + "PublicDescription": "Counts duration of L1D miss outstanding in cycles.", + "SampleAfterValue": "1000003", + "UMask": "0x1" + }, + { + "BriefDescription": "L2 cache lines filling L2", + "Counter": "0,1,2,3", + "EventCode": "0x25", + "EventName": "L2_LINES_IN.ALL", + "PublicDescription": "Counts the number of L2 cache lines filling the L2. Counting does not cover rejects.", + "SampleAfterValue": "100003", + "UMask": "0x1f" + }, + { + "BriefDescription": "Modified cache lines that are evicted by L2 cache when triggered by an L2 cache fill.", + "Counter": "0,1,2,3", + "EventCode": "0x26", + "EventName": "L2_LINES_OUT.NON_SILENT", + "PublicDescription": "Counts the number of lines that are evicted by L2 cache when triggered by an L2 cache fill. Those lines are in Modified state. Modified lines are written back to L3", + "SampleAfterValue": "200003", + "UMask": "0x2" + }, + { + "BriefDescription": "Non-modified cache lines that are silently dropped by L2 cache.", + "Counter": "0,1,2,3", + "EventCode": "0x26", + "EventName": "L2_LINES_OUT.SILENT", + "PublicDescription": "Counts the number of lines that are silently dropped by L2 cache. These lines are typically in Shared or Exclusive state. A non-threaded event.", + "SampleAfterValue": "200003", + "UMask": "0x1" + }, + { + "BriefDescription": "Cache lines that have been L2 hardware prefetched but not used by demand accesses", + "Counter": "0,1,2,3", + "EventCode": "0x26", + "EventName": "L2_LINES_OUT.USELESS_HWPF", + "PublicDescription": "Counts the number of cache lines that have been prefetched by the L2 hardware prefetcher but not used by demand access when evicted from the L2 cache", + "SampleAfterValue": "200003", + "UMask": "0x4" + }, + { + "BriefDescription": "All accesses to L2 cache [This event is alias to L2_RQSTS.REFERENCES]", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_REQUEST.ALL", + "PublicDescription": "Counts all requests that were hit or true misses in L2 cache. True-miss excludes misses that were merged with ongoing L2 misses. [This event is alias to L2_RQSTS.REFERENCES]", + "SampleAfterValue": "200003", + "UMask": "0xff" + }, + { + "BriefDescription": "All requests that hit L2 cache. [This event is alias to L2_RQSTS.HIT]", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_REQUEST.HIT", + "PublicDescription": "Counts all requests that hit L2 cache. [This event is alias to L2_RQSTS.HIT]", + "SampleAfterValue": "200003", + "UMask": "0xdf" + }, + { + "BriefDescription": "Read requests with true-miss in L2 cache [This event is alias to L2_RQSTS.MISS]", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_REQUEST.MISS", + "PublicDescription": "Counts read requests of any type with true-miss in the L2 cache. True-miss excludes L2 misses that were merged with ongoing L2 misses. [This event is alias to L2_RQSTS.MISS]", + "SampleAfterValue": "200003", + "UMask": "0x3f" + }, + { + "BriefDescription": "L2 code requests", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_CODE_RD", + "PublicDescription": "Counts the total number of L2 code requests.", + "SampleAfterValue": "200003", + "UMask": "0xe4" + }, + { + "BriefDescription": "Demand Data Read access L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_DEMAND_DATA_RD", + "PublicDescription": "Counts Demand Data Read requests accessing the L2 cache. These requests may hit or miss L2 cache. True-miss exclude misses that were merged with ongoing L2 misses. An access is counted once.", + "SampleAfterValue": "200003", + "UMask": "0xe1" + }, + { + "BriefDescription": "Demand requests that miss L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_DEMAND_MISS", + "PublicDescription": "Counts demand requests that miss L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0x27" + }, + { + "BriefDescription": "Demand requests to L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_DEMAND_REFERENCES", + "PublicDescription": "Counts demand requests to L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0xe7" + }, + { + "BriefDescription": "L2_RQSTS.ALL_HWPF", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_HWPF", + "SampleAfterValue": "200003", + "UMask": "0xf0" + }, + { + "BriefDescription": "RFO requests to L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_RFO", + "PublicDescription": "Counts the total number of RFO (read for ownership) requests to L2 cache. L2 RFO requests include both L1D demand RFO misses as well as L1D RFO prefetches.", + "SampleAfterValue": "200003", + "UMask": "0xe2" + }, + { + "BriefDescription": "L2 cache hits when fetching instructions, code reads.", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.CODE_RD_HIT", + "PublicDescription": "Counts L2 cache hits when fetching instructions, code reads.", + "SampleAfterValue": "200003", + "UMask": "0xc4" + }, + { + "BriefDescription": "L2 cache misses when fetching instructions", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.CODE_RD_MISS", + "PublicDescription": "Counts L2 cache misses when fetching instructions.", + "SampleAfterValue": "200003", + "UMask": "0x24" + }, + { + "BriefDescription": "Demand Data Read requests that hit L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.DEMAND_DATA_RD_HIT", + "PublicDescription": "Counts the number of demand Data Read requests initiated by load instructions that hit L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0xc1" + }, + { + "BriefDescription": "Demand Data Read miss L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.DEMAND_DATA_RD_MISS", + "PublicDescription": "Counts demand Data Read requests with true-miss in the L2 cache. True-miss excludes misses that were merged with ongoing L2 misses. An access is counted once.", + "SampleAfterValue": "200003", + "UMask": "0x21" + }, + { + "BriefDescription": "All requests that hit L2 cache. [This event is alias to L2_REQUEST.HIT]", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.HIT", + "PublicDescription": "Counts all requests that hit L2 cache. [This event is alias to L2_REQUEST.HIT]", + "SampleAfterValue": "200003", + "UMask": "0xdf" + }, + { + "BriefDescription": "L2_RQSTS.HWPF_MISS", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.HWPF_MISS", + "SampleAfterValue": "200003", + "UMask": "0x30" + }, + { + "BriefDescription": "Read requests with true-miss in L2 cache [This event is alias to L2_REQUEST.MISS]", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.MISS", + "PublicDescription": "Counts read requests of any type with true-miss in the L2 cache. True-miss excludes L2 misses that were merged with ongoing L2 misses. [This event is alias to L2_REQUEST.MISS]", + "SampleAfterValue": "200003", + "UMask": "0x3f" + }, + { + "BriefDescription": "All accesses to L2 cache [This event is alias to L2_REQUEST.ALL]", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.REFERENCES", + "PublicDescription": "Counts all requests that were hit or true misses in L2 cache. True-miss excludes misses that were merged with ongoing L2 misses. [This event is alias to L2_REQUEST.ALL]", + "SampleAfterValue": "200003", + "UMask": "0xff" + }, + { + "BriefDescription": "RFO requests that hit L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.RFO_HIT", + "PublicDescription": "Counts the RFO (Read-for-Ownership) requests that hit L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0xc2" + }, + { + "BriefDescription": "RFO requests that miss L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.RFO_MISS", + "PublicDescription": "Counts the RFO (Read-for-Ownership) requests that miss L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0x22" + }, + { + "BriefDescription": "SW prefetch requests that hit L2 cache.", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.SWPF_HIT", + "PublicDescription": "Counts Software prefetch requests that hit the L2 cache. Accounts for PREFETCHNTA and PREFETCHT0/1/2 instructions when FB is not full.", + "SampleAfterValue": "200003", + "UMask": "0xc8" + }, + { + "BriefDescription": "SW prefetch requests that miss L2 cache.", + "Counter": "0,1,2,3", + "EventCode": "0x24", + "EventName": "L2_RQSTS.SWPF_MISS", + "PublicDescription": "Counts Software prefetch requests that miss the L2 cache. Accounts for PREFETCHNTA and PREFETCHT0/1/2 instructions when FB is not full.", + "SampleAfterValue": "200003", + "UMask": "0x28" + }, + { + "BriefDescription": "L2 writebacks that access L2 cache", + "Counter": "0,1,2,3", + "EventCode": "0x23", + "EventName": "L2_TRANS.L2_WB", + "PublicDescription": "Counts L2 writebacks that access L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0x40" + }, + { + "BriefDescription": "Core-originated cacheable requests that missed L3 (Except hardware prefetches to the L3)", + "Counter": "0,1,2,3,4,5,6,7", + "EventCode": "0x2e", + "EventName": "LONGEST_LAT_CACHE.MISS", + "PublicDescription": "Counts core-originated cacheable requests that miss the L3 cache (Longest Latency cache). Requests include data and code reads, Reads-for-Ownership (RFOs), speculative accesses and hardware prefetches to the L1 and L2. It does not include hardware prefetches to the L3, and may not count other types of requests to the L3.", + "SampleAfterValue": "100003", + "UMask": "0x41" + }, + { + "BriefDescription": "Core-originated cacheable requests that refer to L3 (Except hardware prefetches to the L3)", + "Counter": "0,1,2,3,4,5,6,7", + "EventCode": "0x2e", + "EventName": "LONGEST_LAT_CACHE.REFERENCE", + "PublicDescription": "Counts core-originated cacheable requests to the L3 cache (Longest Latency cache). Requests include data and code reads, Reads-for-Ownership (RFOs), speculative accesses and hardware prefetches to the L1 and L2. It does not include hardware prefetches to the L3, and may not count other types of requests to the L3.", + "SampleAfterValue": "100003", + "UMask": "0x4f" + }, + { + "BriefDescription": "Retired load instructions.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.ALL_LOADS", + "PublicDescription": "Counts all retired load instructions. This event accounts for SW prefetch instructions of PREFETCHNTA or PREFETCHT0/1/2 or PREFETCHW. Available PDIST counters: 0", + "SampleAfterValue": "1000003", + "UMask": "0x81" + }, + { + "BriefDescription": "Retired store instructions.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.ALL_STORES", + "PublicDescription": "Counts all retired store instructions. Available PDIST counters: 0", + "SampleAfterValue": "1000003", + "UMask": "0x82" + }, + { + "BriefDescription": "All retired memory instructions.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.ANY", + "PublicDescription": "Counts all retired memory instructions - loads and stores. Available PDIST counters: 0", + "SampleAfterValue": "1000003", + "UMask": "0x83" + }, + { + "BriefDescription": "Retired load instructions with locked access.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.LOCK_LOADS", + "PublicDescription": "Counts retired load instructions with locked access. Available PDIST counters: 0", + "RetirementLatencyMax": "5156", + "RetirementLatencyMean": "63.76", + "RetirementLatencyMin": "15", + "SampleAfterValue": "100007", + "UMask": "0x21" + }, + { + "BriefDescription": "Retired load instructions that split across a cacheline boundary.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.SPLIT_LOADS", + "PublicDescription": "Counts retired load instructions that split across a cacheline boundary. Available PDIST counters: 0", + "RetirementLatencyMax": "4704", + "RetirementLatencyMean": "3.97", + "RetirementLatencyMin": "0", + "SampleAfterValue": "100003", + "UMask": "0x41" + }, + { + "BriefDescription": "Retired store instructions that split across a cacheline boundary.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.SPLIT_STORES", + "PublicDescription": "Counts retired store instructions that split across a cacheline boundary. Available PDIST counters: 0", + "RetirementLatencyMax": "65535", + "RetirementLatencyMean": "19.0", + "RetirementLatencyMin": "0", + "SampleAfterValue": "100003", + "UMask": "0x42" + }, + { + "BriefDescription": "Retired load instructions that hit the STLB.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.STLB_HIT_LOADS", + "PublicDescription": "Number of retired load instructions with a clean hit in the 2nd-level TLB (STLB). Available PDIST counters: 0", + "RetirementLatencyMax": "3424", + "RetirementLatencyMean": "1.57", + "RetirementLatencyMin": "0", + "SampleAfterValue": "100003", + "UMask": "0x9" + }, + { + "BriefDescription": "Retired store instructions that hit the STLB.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.STLB_HIT_STORES", + "PublicDescription": "Number of retired store instructions that hit in the 2nd-level TLB (STLB). Available PDIST counters: 0", + "RetirementLatencyMax": "65535", + "RetirementLatencyMean": "5.24", + "RetirementLatencyMin": "0", + "SampleAfterValue": "100003", + "UMask": "0xa" + }, + { + "BriefDescription": "Retired load instructions that miss the STLB.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.STLB_MISS_LOADS", + "PublicDescription": "Number of retired load instructions that (start a) miss in the 2nd-level TLB (STLB). Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x11" + }, + { + "BriefDescription": "Retired store instructions that miss the STLB.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.STLB_MISS_STORES", + "PublicDescription": "Number of retired store instructions that (start a) miss in the 2nd-level TLB (STLB). Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x12" + }, + { + "BriefDescription": "Completed demand load uops that miss the L1 d-cache.", + "Counter": "0,1,2,3", + "EventCode": "0x43", + "EventName": "MEM_LOAD_COMPLETED.L1_MISS_ANY", + "PublicDescription": "Number of completed demand load requests that missed the L1 data cache including shadow misses (FB hits, merge to an ongoing L1D miss)", + "SampleAfterValue": "1000003", + "UMask": "0xfd" + }, + { + "BriefDescription": "Retired load instructions whose data sources were HitM responses from shared L3", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd2", + "EventName": "MEM_LOAD_L3_HIT_RETIRED.XSNP_FWD", + "PublicDescription": "Counts retired load instructions whose data sources were HitM responses from shared L3. Available PDIST counters: 0", + "RetirementLatencyMax": "4472", + "RetirementLatencyMean": "353.04", + "RetirementLatencyMin": "0", + "SampleAfterValue": "20011", + "UMask": "0x4" + }, + { + "BriefDescription": "Retired load instructions whose data sources were L3 hit and cross-core snoop missed in on-pkg core cache.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd2", + "EventName": "MEM_LOAD_L3_HIT_RETIRED.XSNP_MISS", + "PublicDescription": "Counts the retired load instructions whose data sources were L3 hit and cross-core snoop missed in on-pkg core cache. Available PDIST counters: 0", + "RetirementLatencyMax": "830", + "RetirementLatencyMean": "125.27", + "RetirementLatencyMin": "0", + "SampleAfterValue": "20011", + "UMask": "0x1" + }, + { + "BriefDescription": "Retired load instructions whose data sources were hits in L3 without snoops required", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd2", + "EventName": "MEM_LOAD_L3_HIT_RETIRED.XSNP_NONE", + "PublicDescription": "Counts retired load instructions whose data sources were hits in L3 without snoops required. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x8" + }, + { + "BriefDescription": "Retired load instructions whose data sources were L3 and cross-core snoop hits in on-pkg core cache", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd2", + "EventName": "MEM_LOAD_L3_HIT_RETIRED.XSNP_NO_FWD", + "PublicDescription": "Counts retired load instructions whose data sources were L3 and cross-core snoop hits in on-pkg core cache. Available PDIST counters: 0", + "RetirementLatencyMax": "3939", + "RetirementLatencyMean": "289.9", + "RetirementLatencyMin": "0", + "SampleAfterValue": "20011", + "UMask": "0x2" + }, + { + "BriefDescription": "Retired load instructions which data sources missed L3 but serviced from dram homed in the local socket", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.LOCAL_DRAM", + "PublicDescription": "Retired load instructions which data sources missed L3 but serviced from DRAM homed in the local socket. Available PDIST counters: 0", + "RetirementLatencyMax": "4146", + "RetirementLatencyMean": "115.83", + "RetirementLatencyMin": "0", + "SampleAfterValue": "100007", + "UMask": "0x1" + }, + { + "BriefDescription": "Retired load instructions with remote cxl mem as the data source where the data request missed all caches.", + "Counter": "0,1,2,3", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_CXL_MEM", + "PublicDescription": "Counts retired load instructions with remote cxl mem as the data source and the data request missed L3. Available PDIST counters: 0", + "SampleAfterValue": "100007", + "UMask": "0x10" + }, + { + "BriefDescription": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_DRAM", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_DRAM", + "PublicDescription": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_DRAM Available PDIST counters: 0", + "RetirementLatencyMax": "3572", + "RetirementLatencyMean": "430.22", + "RetirementLatencyMin": "0", + "SampleAfterValue": "1000003", + "UMask": "0x2" + }, + { + "BriefDescription": "Retired load instructions whose data sources was forwarded from a remote cache", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_FWD", + "PublicDescription": "Retired load instructions whose data sources was forwarded from a remote cache. Available PDIST counters: 0", + "RetirementLatencyMax": "8552", + "RetirementLatencyMean": "125.36", + "RetirementLatencyMin": "0", + "SampleAfterValue": "100007", + "UMask": "0x8" + }, + { + "BriefDescription": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_HITM", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_HITM", + "PublicDescription": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_HITM Available PDIST counters: 0", + "RetirementLatencyMax": "2580", + "RetirementLatencyMean": "135.29", + "RetirementLatencyMin": "0", + "SampleAfterValue": "1000003", + "UMask": "0x4" + }, + { + "BriefDescription": "Retired instructions with at least 1 uncacheable load or lock.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd4", + "EventName": "MEM_LOAD_MISC_RETIRED.UC", + "PublicDescription": "Retired instructions with at least one load to uncacheable memory-type, or at least one cache-line split locked access (Bus Lock). Available PDIST counters: 0", + "SampleAfterValue": "100007", + "UMask": "0x4" + }, + { + "BriefDescription": "Number of completed demand load requests that missed the L1, but hit the FB(fill buffer), because a preceding miss to the same cacheline initiated the line to be brought into L1, but data is not yet ready in L1.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.FB_HIT", + "PublicDescription": "Counts retired load instructions with at least one uop was load missed in L1 but hit FB (Fill Buffers) due to preceding miss to the same cache line with data not ready. Available PDIST counters: 0", + "SampleAfterValue": "100007", + "UMask": "0x40" + }, + { + "BriefDescription": "Retired load instructions with L1 cache hits as data sources", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L1_HIT", + "PublicDescription": "Counts retired load instructions with at least one uop that hit in the L1 data cache. This event includes all SW prefetches and lock instructions regardless of the data source. Available PDIST counters: 0", + "SampleAfterValue": "1000003", + "UMask": "0x1" + }, + { + "BriefDescription": "Retired load instructions missed L1 cache as data sources", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L1_MISS", + "PublicDescription": "Counts retired load instructions with at least one uop that missed in the L1 cache. Available PDIST counters: 0", + "SampleAfterValue": "200003", + "UMask": "0x8" + }, + { + "BriefDescription": "Retired load instructions with L2 cache hits as data sources", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L2_HIT", + "PublicDescription": "Counts retired load instructions with L2 cache hits as data sources. Available PDIST counters: 0", + "RetirementLatencyMax": "7140", + "RetirementLatencyMean": "5.71", + "RetirementLatencyMin": "0", + "SampleAfterValue": "200003", + "UMask": "0x2" + }, + { + "BriefDescription": "Retired load instructions missed L2 cache as data sources", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L2_MISS", + "PublicDescription": "Counts retired load instructions missed L2 cache as data sources. Available PDIST counters: 0", + "SampleAfterValue": "100021", + "UMask": "0x10" + }, + { + "BriefDescription": "Retired load instructions with L3 cache hits as data sources", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L3_HIT", + "PublicDescription": "Counts retired load instructions with at least one uop that hit in the L3 cache. Available PDIST counters: 0", + "RetirementLatencyMax": "5630", + "RetirementLatencyMean": "57.64", + "RetirementLatencyMin": "0", + "SampleAfterValue": "100021", + "UMask": "0x4" + }, + { + "BriefDescription": "Retired load instructions missed L3 cache as data sources", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L3_MISS", + "PublicDescription": "Counts retired load instructions with at least one uop that missed in the L3 cache. Available PDIST counters: 0", + "SampleAfterValue": "50021", + "UMask": "0x20" + }, + { + "BriefDescription": "Retired load instructions with local cxl mem as the data source where the data request missed all caches.", + "Counter": "0,1,2,3", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.LOCAL_CXL_MEM", + "PublicDescription": "Counts retired load instructions with local cxl mem as the data source and the data request missed L3. Available PDIST counters: 0", + "SampleAfterValue": "1000003", + "UMask": "0x80" + }, + { + "BriefDescription": "MEM_STORE_RETIRED.L2_HIT", + "Counter": "0,1,2,3", + "EventCode": "0x44", + "EventName": "MEM_STORE_RETIRED.L2_HIT", + "SampleAfterValue": "200003", + "UMask": "0x1" + }, + { + "BriefDescription": "Retired memory uops for any access", + "Counter": "0,1,2,3,4,5,6,7", + "EventCode": "0xe5", + "EventName": "MEM_UOP_RETIRED.ANY", + "PublicDescription": "Number of retired micro-operations (uops) for load or store memory accesses", + "SampleAfterValue": "1000003", + "UMask": "0x3" + }, + { + "BriefDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that have any type of response.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_CODE_RD.ANY_RESPONSE", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10004", + "PublicDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that have any type of response. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that hit in the L3 or were snooped from another core's caches on the same socket.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_CODE_RD.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F803C0004", + "PublicDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that hit in the L3 or were snooped from another core's caches on the same socket. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that resulted in a snoop hit a modified line in another core's caches which forwarded the data.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_CODE_RD.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C0004", + "PublicDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that resulted in a snoop hit a modified line in another core's caches which forwarded the data. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that have any type of response.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.ANY_RESPONSE", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10001", + "PublicDescription": "Counts demand data reads that have any type of response. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by CXL MEM (Type 2 or Type 3).", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.CXL_MEM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x703C00001", + "PublicDescription": "Counts demand data reads that were supplied by CXL MEM (Type 2 or Type 3). Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that hit in the L3 or were snooped from another core's caches on the same socket.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F803C0001", + "PublicDescription": "Counts demand data reads that hit in the L3 or were snooped from another core's caches on the same socket. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that resulted in a snoop hit a modified line in another core's caches which forwarded the data.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C0001", + "PublicDescription": "Counts demand data reads that resulted in a snoop hit a modified line in another core's caches which forwarded the data. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that resulted in a snoop that hit in another core, which did not forward the data.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_NO_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x4003C0001", + "PublicDescription": "Counts demand data reads that resulted in a snoop that hit in another core, which did not forward the data. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that resulted in a snoop hit in another core's caches which forwarded the unmodified data to the requesting core.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x8003C0001", + "PublicDescription": "Counts demand data reads that resulted in a snoop hit in another core's caches which forwarded the unmodified data to the requesting core. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by CXL MEM (Type 2 and Type 3) attached to local socket.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.LOCAL_CXL_MEM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x700C00001", + "PublicDescription": "Counts demand data reads that were supplied by CXL MEM (Type 2 and Type 3) attached to local socket. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by a cache on a remote socket where a snoop hit a modified line in another core's caches which forwarded the data.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.REMOTE_CACHE.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1030000001", + "PublicDescription": "Counts demand data reads that were supplied by a cache on a remote socket where a snoop hit a modified line in another core's caches which forwarded the data. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by a cache on a remote socket where a snoop hit in another core's caches which forwarded the unmodified data to the requesting core.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.REMOTE_CACHE.SNOOP_HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x830000001", + "PublicDescription": "Counts demand data reads that were supplied by a cache on a remote socket where a snoop hit in another core's caches which forwarded the unmodified data to the requesting core. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by CXL MEM (Type 2 or Type 3) attached to another socket.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.REMOTE_CXL_MEM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x703000001", + "PublicDescription": "Counts demand data reads that were supplied by CXL MEM (Type 2 or Type 3) attached to another socket. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that hit a modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.SNC_CACHE.HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1008000001", + "PublicDescription": "Counts demand data reads that hit a modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that either hit a non-modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.SNC_CACHE.HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x808000001", + "PublicDescription": "Counts demand data reads that either hit a non-modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that have any type of response.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.ANY_RESPONSE", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F3FFC0002", + "PublicDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that have any type of response. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that were supplied by CXL MEM (Type 2 or Type 3).", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.CXL_MEM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x703C00002", + "PublicDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that were supplied by CXL MEM (Type 2 or Type 3). Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that hit in the L3 or were snooped from another core's caches on the same socket.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F803C0002", + "PublicDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that hit in the L3 or were snooped from another core's caches on the same socket. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that resulted in a snoop hit a modified line in another core's caches which forwarded the data.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C0002", + "PublicDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that resulted in a snoop hit a modified line in another core's caches which forwarded the data. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that were supplied by CXL MEM (Type 2 and Type 3) attached to local socket.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.LOCAL_CXL_MEM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x700C00002", + "PublicDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that were supplied by CXL MEM (Type 2 and Type 3) attached to local socket. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that were supplied by CXL MEM (Type 2 or Type 3) attached to another socket.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.REMOTE_CXL_MEM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x703000002", + "PublicDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that were supplied by CXL MEM (Type 2 or Type 3) attached to another socket. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts writebacks of modified cachelines and streaming stores that have any type of response.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.MODIFIED_WRITE.ANY_RESPONSE", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10808", + "PublicDescription": "Counts writebacks of modified cachelines and streaming stores that have any type of response. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that have any type of response.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.ANY_RESPONSE", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F3FFC4477", + "PublicDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that have any type of response. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that were supplied by CXL MEM (Type 2 or Type 3).", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.CXL_MEM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x703C04477", + "PublicDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that were supplied by CXL MEM (Type 2 or Type 3). Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that hit in the L3 or were snooped from another core's caches on the same socket.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F003C4477", + "PublicDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that hit in the L3 or were snooped from another core's caches on the same socket. Available PDIST counters: 0", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that resulted in a snoop hit a modified line in another core's caches which forwarded the data.", + "Counter": "0,1,2,3", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C4477", *** 11723 LINES SKIPPED *** From nobody Wed Feb 4 17:21:44 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5nG02b42z6FW0S for ; Wed, 04 Feb 2026 17:21: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5nG01kbGz3pVX for ; Wed, 04 Feb 2026 17:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770225704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8w7KSPRFFkYj6zXwIIj7/0QX9nGOJH1ITS8wi220LdQ=; b=lrnOE0cwSiWvXXz+byz2I6TLXgtMEVRKZd8D/geAqrwfQWAqX+1c4bOm8BveWHB/5p02ok T0gPOcqdn5xlqugr/JCFhMkt7Xtc4oCuvaIAWXeeRP7ddyJq8c5CKDXVM6wBB7w144tNdj 0uZaf/JhYWcJ81l6AWx2ncLC4YWbKY319z8+Y+jYHD6Bj/FPIb7anU+ZZxy9fxtWksc8KM 1hhzYX6ibiYTbk/t5F9mvErUs7KtVNuLMLclz7AILGZQL/eCVwv/lkGgaO2UUGCmGBL6pg ETA/v+jkHJLlgGvNQK/awkZnW2aCg3cJ6RWhOr43F91/KC6HhR4B2rzaz74QAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770225704; a=rsa-sha256; cv=none; b=YM8Cwlt3DWJxOMLFiZKUU3xla2rU+83SbAVi7QTXHxI32ofqH8/JnyTEdtqhEdhX4w4amT q2hWAzzv9rrXoE/VhvpoEe2icw3vvsmrqQE4UkVsQH6UcHxsvpE7J/b5mpAc7SXZh/p+La wpT5Cj/vfAG05mxJOdjX5Sfgi5h3ogZc5cY8DzZ88TOlh9WbK0KXm40U27KV/2gIHOdiOF 4jWOH59gTQSOaVA6kTkkyorwq1BkC8Cgzjw2f7hs4ywUJkyFmu5FtzvD0FnjuQivDCH5PT i0arolHMkdcgPxo6QsFcEw7FagGlFJZiaTHE+m7dF4Eg4cxrz6Y4M/OYm8Xpjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770225704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8w7KSPRFFkYj6zXwIIj7/0QX9nGOJH1ITS8wi220LdQ=; b=yAXqKpEbMwBgvy8ILFV9xV8ZVhO5lL/8eRjF3sAEEUBKhOx+KBy7b89tWfzv987PJ3xa05 1kyTrmu38ui3uMSsc6CXzfnsP8l3+yxxyHNK78LTUjII2fZkidvqz50hhygiOY1eU/Nzt6 wh8dE/MWfeuPjfdoWyOer3MIgQfmZUQJznV+OB3Yq8nh48+I2lx0Vi24u9XBaBK94rcVGq GbcOBJM4fqnOLAnujcS9qGHEe4+FFELxz3Rq2veoUfo9hepuiJlZzZAbvmaY6f5I5+U33Q NSIxg3Iu0ZgeTQ209QVZuUwa9VvoQXY/bTvbQ/4cHTKSjI1Xldkf+51K6arBPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5nG01L3Lz17Sr for ; Wed, 04 Feb 2026 17:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e19c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 17:21:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: c2ba906fa639 - main - ifconfig: fix gre(4) status List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2ba906fa63982d7aa799466d83716d39fe91d2b Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 17:21:44 +0000 Message-Id: <69838028.1e19c.49706bc0@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=c2ba906fa63982d7aa799466d83716d39fe91d2b commit c2ba906fa63982d7aa799466d83716d39fe91d2b Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-04 11:03:22 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-04 17:20:21 +0000 ifconfig: fix gre(4) status Set `ifr->ifr_name` to display gre options for the interface. Reviewed by: glebius, zlei Approved by: glebius (mentor) MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D55099 --- sbin/ifconfig/ifgre.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c index 43c86a546167..c3d3856e0b09 100644 --- a/sbin/ifconfig/ifgre.c +++ b/sbin/ifconfig/ifgre.c @@ -53,11 +53,11 @@ gre_status(if_ctx *ctx) uint32_t opts = 0, port; struct ifreq ifr = { .ifr_data = (caddr_t)&opts }; - if (ioctl_ctx(ctx, GREGKEY, &ifr) == 0) + if (ioctl_ctx_ifr(ctx, GREGKEY, &ifr) == 0) if (opts != 0) printf("\tgrekey: 0x%x (%u)\n", opts, opts); opts = 0; - if (ioctl_ctx(ctx, GREGOPTS, &ifr) != 0 || opts == 0) + if (ioctl_ctx_ifr(ctx, GREGOPTS, &ifr) != 0 || opts == 0) return; port = 0; From nobody Wed Feb 4 17:29:23 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5nQw3vC8z6FWJl for ; Wed, 04 Feb 2026 17:29: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5nQq3HPrz3qHb for ; Wed, 04 Feb 2026 17:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770226163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hiNWZZSJJ5zPIa+gAzRVQfgskuh6yFyaiAIcDf7KZbE=; b=UMafq8SjQc/YGxh0EhOeXJcyNP2ooZdVTz+1TjfMk2JA1L6w36WR3muvSnJ4gP+lyStWHK RNDXU+jw1WegR5iB770yaxDhGHfovS4XGe6iH4a8rS5m1dQS/ERPVlivMoBs7A6qdSxKrk jIJdpVPTJUbnFqEuMpCW6QsuIgAU6zo+27Jj70pXhsSDC4wsS7+QenwddgJioaFIA1SMGs A+GH7hNUae8XRxQFHr8Ui48W7grmk7hCnwZiO51HzvKI04/9MLz/ed/wVwPUU4x7X8aFFX mponkfbwKmaXxh06f6xvw+73drWY7sNjPnN22mSwtEsyskddu1UzT9g0XdM6Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770226163; a=rsa-sha256; cv=none; b=lhcizFYg5sUUK2xt8M9Apr5Sk0G0MH/wyYZHCpym8WLPiePxUBxyLLJPAPjkVvNvEJcC4c 29Jg0EZDLAMYfWUStPSYDoJm9ScYQbWyJDC/EKPa8R6+dlIc1Xphp1acNi5AH0c9uVLhvf LBsB1KFkjbM/HXUiuACw1DEq2y4r7SS5dIH5VR7BzEKglka3wYQTaJBb0j2MygJmn6/+47 k1vx5UWfIo7kFOXjA7l8942zVFhIteUCrLQ7frXEZjaH3oJjH/Z5w4a426UG/ckx1M+M9s V+Nxn6HyngmQZy+3RU46sNzPVErr9Gzd1dBsx6+3lUQdEqEL5fu33EZdlOM9ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770226163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hiNWZZSJJ5zPIa+gAzRVQfgskuh6yFyaiAIcDf7KZbE=; b=hWDMXH/WwdMn6YYlIw7WBsqE9Eus2aIu2GDbe4j5iVCDckkblTbE2ooQhtRDyLINKYvRW8 JOliaN49PK3gYB3+lO81c/7PioAVk+3IEwHkRxXQAznAqbfQiqlaLLEjZdf23kmQbj8ay7 FgbhLKE8lPomczkBS77cuk40SFLmOvBUHhwvue2VStmTnLKRl/KmoBltsnlfAQgorYXDOT c7XQKw7jLFmMyuDEDnQmHohDCa5z4qtDIoAAjSJYVIgBG5joSFUoWh8iqLnu6hw3sB6eQM WYc0YZvdhABsLs8OIAJQIsQeW4O4NTGB1icFSiJtInapFW4pojW3AHY8joP7/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5nQq2qDRz17HQ for ; Wed, 04 Feb 2026 17:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d6a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 17:29:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fe8105de1485 - main - stand: Minor style tweaks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe8105de1485063a02ff25e686761247f78aaed9 Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 17:29:23 +0000 Message-Id: <698381f3.1d6a2.32ce4573@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe8105de1485063a02ff25e686761247f78aaed9 commit fe8105de1485063a02ff25e686761247f78aaed9 Author: Warner Losh AuthorDate: 2026-02-04 17:19:43 +0000 Commit: Warner Losh CommitDate: 2026-02-04 17:29:11 +0000 stand: Minor style tweaks re-wrap the function calls in a couple of ifs in get_zfs_root so they are more readable. They really didn't need to be wrapped like this in the first place. Sponsored by: Netflix --- stand/libsa/zfs/zfsimpl.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index e5920004bd9d..ebeb7bea7041 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -651,8 +651,7 @@ vdev_indirect_remap(vdev_t *vd, uint64_t offset, uint64_t asize, void *arg) list_insert_head(&stack, o); } vdev_indirect_gather_splits(rs->rs_split_offset, dst_v, - dst_offset + inner_offset, - inner_size, arg); + dst_offset + inner_offset, inner_size, arg); /* * vdev_indirect_gather_splits can have memory @@ -3468,8 +3467,7 @@ zfs_get_root(const spa_t *spa, uint64_t *objid) /* * Start with the MOS directory object. */ - if (objset_get_dnode(spa, spa->spa_mos, - DMU_POOL_DIRECTORY_OBJECT, &dir)) { + if (objset_get_dnode(spa, spa->spa_mos, DMU_POOL_DIRECTORY_OBJECT, &dir)) { printf("ZFS: can't read MOS object directory\n"); return (EIO); } @@ -3477,19 +3475,17 @@ zfs_get_root(const spa_t *spa, uint64_t *objid) /* * Lookup the pool_props and see if we can find a bootfs. */ - if (zap_lookup(spa, &dir, DMU_POOL_PROPS, - sizeof(props), 1, &props) == 0 && + if (zap_lookup(spa, &dir, DMU_POOL_PROPS, sizeof(props), 1, &props) == 0 && objset_get_dnode(spa, spa->spa_mos, props, &propdir) == 0 && - zap_lookup(spa, &propdir, "bootfs", - sizeof(bootfs), 1, &bootfs) == 0 && bootfs != 0) { + zap_lookup(spa, &propdir, "bootfs", sizeof(bootfs), 1, &bootfs) == 0 && + bootfs != 0) { *objid = bootfs; return (0); } /* * Lookup the root dataset directory */ - if (zap_lookup(spa, &dir, DMU_POOL_ROOT_DATASET, - sizeof(root), 1, &root) || + if (zap_lookup(spa, &dir, DMU_POOL_ROOT_DATASET, sizeof(root), 1, &root) || objset_get_dnode(spa, spa->spa_mos, root, &dir)) { printf("ZFS: can't find root dsl_dir\n"); return (EIO); From nobody Wed Feb 4 20:47:38 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5sqZ5ynbz6QdNw for ; Wed, 04 Feb 2026 20:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5sqZ3c5Kz476s for ; Wed, 04 Feb 2026 20:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770238058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Tuv3r4eQo7CLshlIFwdw3UuzZQrvZmwnjV22l0b6a0=; b=IRYTG3H+aV+9ADGOlhPabf5ZYqsC4J77sW8wAPV7NRfaTUe0RCn9UWtXNOmZMV01VOLffc UL97JnBoZ6HjtMiQnnftJOy5lv0mWym6LvmKuJnCDP//TsLucDhMp3NnBXb+h8hTqaWtv9 ZdzgmquCxoyunACnQgiZBoPwg436MeFGwQ8LYMVg3b7h0tttKBm/GvFSm1sf3VT5TM+AVg m3z3qrdBuiqCWBO3DJTpWNXw0ZxFe2+DQraxGtyC9Pcyfuy3Z4nRUw0imEXnWgFlSVMQTK 26nQsBBggStf2L/FYB7MIDtiu/VobM8k/AtNBHvXPMAis0KDRmZCSYET6sCMDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770238058; a=rsa-sha256; cv=none; b=dDUAy9optJQ9OtxXcZ/l71Ms9up1FzKOu3tOZe0yw6bjzBZsanCfm+sF4DV/o9fnkhXVVX H5hd/EWN8tyJ3hXi4AT5mtejiH4XQkJ3OLcBHNeBVbAr2lWC+s6SQto5Z1FuYUoz7mX46g OykoZoVKPfBgxFWEHSTxHjxdZSenXHZo3gl+8E5Oq3dFVuJ0lZXZ+WEsV8W1rzqMIIRvHM 03aJXlowBDxeMiMAVBZfNPivLbkQRV4TBTskAG6HJ7BPMBzTUd3xb2FOFi/QG9bXNYhYNj qFI/kmO9NdknFAyLwQEc3pwvGaHwdUpqwTN5Xm3f8SvcHUzrhy3QZ3j6vbJVww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770238058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Tuv3r4eQo7CLshlIFwdw3UuzZQrvZmwnjV22l0b6a0=; b=MXJyPgPHuUGAt2aMyFhrcW1NjWvc4T8JB0iiAxr4MxO56EjFgebY5R4OHS3t56F3/FpsSc P2+M517ZypwBfVtdEbw6MWtRppwSLYyM+yzquYcJtKIiQH8qMhGsP/LVd/PI9vFQdLqlW+ w6O07WHyCzi/rq086rOSrmk2ncR0j6G7ZzNX2CJQfTxaXh10ZPZAuhzyW50d8JQg+tK0xd sh9ckgClR8f0t1XjujT9iBufpWFVwNludl20W2FplkCfM68fORMWJn3PGasQUU9poE0BI+ 77QqhITo1SJ0Q3WwALeJfcEFVmCjIZA8iA+imQX94Od5ldSaOSKKux+8zlQ2VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5sqZ2TBgz1DwL for ; Wed, 04 Feb 2026 20:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3989f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 20:47:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: e40817302ebd - main - ipfilter: Fix possible overrun List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e40817302ebdf89df2f3bcd679fb7f2a18c244dc Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 20:47:38 +0000 Message-Id: <6983b06a.3989f.673c9651@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e40817302ebdf89df2f3bcd679fb7f2a18c244dc commit e40817302ebdf89df2f3bcd679fb7f2a18c244dc Author: Cy Schubert AuthorDate: 2026-02-04 17:27:23 +0000 Commit: Cy Schubert CommitDate: 2026-02-04 20:46:20 +0000 ipfilter: Fix possible overrun The destination buffer is FR_GROUPLEN (16 bytes) in length. When gname is created, the userspace utilities correctly use FR_GROUPLEN as the buffer length. The kernel should also limit its copy operation to FR_GROUPLEN bytes to avoid any user written code from exploiting this vulnerability. Reported by: Ilja Van Sprundel MFC after: 1 week --- sys/netpfil/ipfilter/netinet/fil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index f8b8ffec7bdd..24ac91c69fc8 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -3503,7 +3503,7 @@ ipf_group_add(ipf_main_softc_t *softc, char *group, void *head, u_32_t flags, fg->fg_head = head; fg->fg_start = NULL; fg->fg_next = *fgp; - bcopy(group, fg->fg_name, strlen(group) + 1); + bcopy(group, fg->fg_name, strnlen(group, FR_GROUPLEN) + 1); fg->fg_flags = gflags; fg->fg_ref = 1; fg->fg_set = &softc->ipf_groups[unit][set]; From nobody Wed Feb 4 21:17:50 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5tVh6zJQz6Qg6y; Wed, 04 Feb 2026 21:18:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5tVh13K7z3D7b; Wed, 04 Feb 2026 21:18:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 614LHoBs081837; Wed, 4 Feb 2026 23:17:54 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 614LHoBs081837 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 614LHonu081836; Wed, 4 Feb 2026 23:17:50 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 4 Feb 2026 23:17:50 +0200 From: Konstantin Belousov To: "Enji Cooper (yaneurabeya)" Cc: Abdelkader Boudih , Adrian Chadd , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware Message-ID: References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> <63ee9a06-97bd-4f7f-8bb8-ed39382d94a4@app.fastmail.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f5tVh13K7z3D7b X-Spamd-Bar: ---- On Tue, Feb 03, 2026 at 10:25:27PM -0800, Enji Cooper (yaneurabeya) wrote: > > > On Feb 3, 2026, at 2:38 AM, Konstantin Belousov wrote: > > > > On Tue, Feb 03, 2026 at 11:08:40AM +0100, Abdelkader Boudih wrote: > >> I agree that this should not be permanent verbosity. > >> > >> The aim was not to add long-term noise, but to make the behavior observable/greppable to reviewers while this logic is still being validated across a wide range of Apple models. > >> > >> I'm going to get few Apple devices to try on. Once we confirm that every model behave the same, we could totally remove verbosity and treating it as assumed-working code. > > One sidenote: this is hidden behind bootverbose: it’s not always being displayed. > > I think it’s fine making the message more terse. It might clarify behavior on Apple platforms since the added behavior contradicts other OSI-related behavior and can result in a POLA violation. Can you fix it, please, instead thinking that it might be fine? From nobody Wed Feb 4 22:07:25 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5vbk5m5Fz6QjJW for ; Wed, 04 Feb 2026 22:07: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5vbk5763z3J9q for ; Wed, 04 Feb 2026 22:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770242850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BoJDKkvR9NJaYsMU8mGweZGSwfn+5+xzd0MIqLqlzlw=; b=b7kbYZ5VSqZ8Kst/TSgMXjd4oX7e5csZf3OJJ4N4fkSw6tYZzGJf82w84Ojkf3POYH+LP1 h5dEMWhJS46LFe7Bw9P4MTfwLu03+cMUIBfHRY+s+LpyUDqoQ538XLFAFG+bx5MoAcLYr6 wEvwCAP5MacYb7Kj8w0PQUUHn8n5hGXZa6KVLIA1tPayS3LHdMnYMtWj/AmvP+LZ3irhx+ XQb+EgufWJjBIIKfsl+2NgHQ53aE6FB9qRc2Y5K1WkdBlPqu8GgwSbNz6QLtsrLdURhyUC aEsTDBK7OpsWtLvjEdy+loZoqJ60ptjVAwbcGYz3cElysoDGhEbkO17fe2jF2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770242850; a=rsa-sha256; cv=none; b=q56BRRcG7EXa0Tbof6SSMA5cUJb2k3ZKv5/fTkToUisj0/xqGsMrN/IJRctnzPX3kAsVx9 3BnZ1QpLWRYxdTEBvCxAFIlTRcZhR0VoxTQc9XkYCi+IKnYfTgbz3k5SHy4LvqLgRKTjQm J757WePda1dz68vIge1opLE9hG5gRwfhNgl4SkeyozPjf0aljgvr0P2K5xLxhG73Lzgp3z /e/oJXiKoGD/TCpWqldwQdeJpSxSSngRu2ZPksXUxSalaPxyjVSDf6MzO0H/BTZPUkWYCj kmbR1H12MGuezczyPE9NVDPahgjQUxSQtnEqHcehdEvjUhZrezIBzqUTx6SakQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770242850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BoJDKkvR9NJaYsMU8mGweZGSwfn+5+xzd0MIqLqlzlw=; b=crOJfGsfBUGpKv1I5G+efA7xnYBNfnrycJHp0+3vNIZw4PCHotTWE0+qBhUdyreO6hLgur lOs0f+CHzsJwFqwOVdQe4vm/Zc2H2u/GJlROovhB4cfl9TLbd4x+HuilY/9eR602GbOWjD /g8jUFwF4KW+9WE6/aryYdU83xax8FVdcHRKHHNmmMJil/7LKEPBKubucA7ye5KiqKfIhx KWV++69jJ76YX/x2vLMrqiEwXIcSZUpjoCbemLiRbYDaQuvtkKbIiLDHuroIa5PiVk++06 95rdpiB2Vhp30esdGmr5PUQitH3Yyzqv/3cGKjeGTqTmxzavSve8KIDueIdBRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5vbk4jd0z1Gqx for ; Wed, 04 Feb 2026 22:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19fab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 22:07:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 5937e1cdc991 - main - bpf: don't clear pointer from descriptor to the tap on descriptor close List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5937e1cdc99180b4adae2cf20cabd75dd9f45546 Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 22:07:25 +0000 Message-Id: <6983c31d.19fab.6a4635ed@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5937e1cdc99180b4adae2cf20cabd75dd9f45546 commit 5937e1cdc99180b4adae2cf20cabd75dd9f45546 Author: Gleb Smirnoff AuthorDate: 2026-02-04 22:07:11 +0000 Commit: Gleb Smirnoff CommitDate: 2026-02-04 22:07:11 +0000 bpf: don't clear pointer from descriptor to the tap on descriptor close During packet processing the descriptor is looked up using epoch(9) and it can be accessed after bpf_detachd(). In scenario of descriptor close the tap point is alive (it actually produces packets) and thus the pointer can be legitimately dereferenced. This fixes a race on a bpf(4) device close that would otherwise result in panic. Differential Revision: https://reviews.freebsd.org/D55064 --- sys/net/bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 9f0b57728e88..228ac9867bd7 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -678,8 +678,8 @@ bpf_detachd(struct bpf_d *d, bool detached_ifp) BPFD_LOCK(d); CK_LIST_REMOVE(d, bd_next); writer = (d->bd_writer > 0); - d->bd_bif = NULL; if (detached_ifp) { + d->bd_bif = NULL; /* * Notify descriptor as it's detached, so that any * sleepers wake up and get ENXIO. From nobody Wed Feb 4 22:37:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5wG25CZ3z6Qlbd; Wed, 04 Feb 2026 22:37:14 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5wG24Dxzz3Kv2; Wed, 04 Feb 2026 22:37:14 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770244634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Dy77t283pKRJ6LiTF9CacoB937tfE260Hm5ElcFW8jQ=; b=S+rTcSBDonVb+oXiOa6RkcEVJ4Y7bGqd8U6j0q5bcx/y7TA+4Fw6Hr8piCdCiQO+uu2Zat Xpidnw35DosUT1lfACJTpdXjuJvF/f6Gv9YD9Y8reJDaCthXEeC5YDdQTovWwttWm6QJBJ uWZHQhPTdqMrlczeft8J0J66tcSuaheK7g1Ebd/XH9jGFfA2N9gMcLF97lKJCJu0HuJvUa Peca2K7gXpdaV+5UwJTCBSflXc+vG4QcEZ2EI4N2wgTTsT3sE2lI/amDMzFvORpgYZXK41 31PHj6jccUyWhznqY1itU9NoDtHMPgnZ+OA8io0mFfwxSXH3EMXX5Q0XQqzsqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770244634; a=rsa-sha256; cv=none; b=MWfI+1mmCX2FcCVtqrh2qdw/SMiEEWl4dhmJFVoKnHoWQ4UyNWlcB6aci6oB8apTsXYUpy BrPUXurwEqdbNqnl8Rs3EpeB2TsHIoOK2/4QgRb7o9ilTfP57O4qdzn+f/Bp4KSYVNdaeA INIUL9w2W6r/q1DERGxE5w/tIwDqKkDXfYx0dAe7QhL21kPYRsZ01d+qHyxWyGfC0RtMVr QYqQySw9i0gmcG78lGfcAfFTCDLTrZf5D3cJxM7ELOCGJjU5pwx6tgAXGRQx8bdvGHuBlu /FZk6VDbHjJJY8M+H4y9scboI1qZJXmvaz8aTQzjoHU+gIaybsALqMOws8ukcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770244634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Dy77t283pKRJ6LiTF9CacoB937tfE260Hm5ElcFW8jQ=; b=TRmbSbdWwYy66Z2UiPZ3BN+SU3Rt3243SDQVZ3ACdshGu4qvME/ufUMTKFqTWj31BvkUlA GJHsX/1xabRhFzOrNu/0P4klqKaFUkPbbduU7eOq7UXYVBaOS75colHN5mslU29OAKnlfv dFpijRa5DCq9g1x3sc+8wGFV5CKFnqXPIZmHXrUB53G9T7hZpn1oKf8NMXhATMqRUaTCox Hp9UxchsPebYCagw+ajPhwSMxauHjMDFyudmByKgotVfiTNiDh4kWJZx2101aKO3pMusBO CJdtK+7Am1GsKf7Jxe7xyVghQNccsJBKNTaMo90dDk1uJtuc8EZf5dx/mFeFmg== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f5wG172nZzv6G; Wed, 04 Feb 2026 22:37:13 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Wed, 4 Feb 2026 14:37:11 -0800 From: Gleb Smirnoff To: Michael Tuexen Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: d195b3783fa4 - main - sctp: fix socket type created by sctp_peeloff() Message-ID: References: <697e46e9.2271d.66b41ecf@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Feb 03, 2026 at 08:24:10PM +0100, Michael Tuexen wrote: M> > M> VNET_ASSERT(head->so_vnet != NULL, ("%s:%d so_vnet is NULL, head=%p", M> > M> __func__, __LINE__, head)); M> > M> + KASSERT(head->so_type == SOCK_SEQPACKET, M> > M> + ("%s: unexpecte so_type: %d", __func__, head->so_type)); M> > M> so = soalloc(head->so_vnet); M> > M> if (so == NULL) { M> > M> log(LOG_DEBUG, "%s: pcb %p: New socket allocation failure: " M> > M> @@ -1311,7 +1313,7 @@ sopeeloff(struct socket *head) M> > M> __func__, head->so_pcb); M> > M> return (NULL); M> > M> } M> > M> - so->so_type = head->so_type; M> > M> + so->so_type = SOCK_STREAM; M> > M> so->so_options = head->so_options; M> > M> so->so_linger = head->so_linger; M> > M> so->so_state = (head->so_state & SS_NBIO) | SS_ISCONNECTED; M> > M> > This creates a socket where: M> > M> > so->so_type != so->so_proto->pr_type. M> > M> > I'm not sure this is a good idea. I was actually looking into removing so_type M> > at all. What does SCTP idea is about this peel-off thing? If the resulting M> > socket is a stream one, shouldn't its so_proto point at sctp_stream_protosw? M> Yes, that makes sense. M> But this is now a generic routine (I think it was an SCTP specific one in the past), M> how can I refer to it without using sctp_stream_protosw? It was never generic, albeit put into generic file. It lives under #ifdef SCTP. I'm all for moving it entirely into SCTP related file. -- Gleb Smirnoff From nobody Wed Feb 4 22:40:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5wKQ3Zhyz6QlqV; Wed, 04 Feb 2026 22:40:10 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5wKQ2zKWz3LBY; Wed, 04 Feb 2026 22:40:10 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770244810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ATtnWG1uJ9Abov6naU32wXPI3GTAJsmzM0nEdGXGYyM=; b=pggvjOxXHXKWdS+9asU4hGRUXUt73HrUzNIH90mkd5NGIYM/CLRGdBsE+pCV7hROfmruTU gYRIXwGLDW10yVWXRaPFq7/4rIVEnH0VH+iYPX8mhRA6G9DnbSc4YeHuRjmh24HI2IlwAw 40gQJg974o+m04LfEkV1b9xf1YcUnt5Hu6ED9bNvsPQtL680BX0SZcSRbuNQkhJk2B6O15 yhhs+U6aPKXr/qTSdec5ysR+vU60L3Jwkj7ZEfU37q/IF8GgHNdZ93RlxRXgq2WeIGomgu OfbWyfoCmQZc4oXVNsmZYzB/7El1z7axdD+htyS5Svj8EYDrulg0muFvOlvb4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770244810; a=rsa-sha256; cv=none; b=jGDF4pqxREIk5Ux3Z1BGyazKKESbE8+Kj4PeKpIlqE6wygqeJMfEOCf517wop56ZQJIwEJ IuKZNSq7xJgMiwGtU+Zy6nr/eGMy0Zg2En5AUeE8YnoEdr/jkxxd3Y/N7zMwp0GSouVSBE HYXaTvsWUMOP/Y7whN984yilrJOL11IgEhz5+haqIo/buF2WJnwHu2JeVRGUurY5CnILUF 5q74PGzNBNsEu4DiLRdPKCyeLgauCI+acvDHVtOqKy6dPbkeP2PKtc7WcdtjGF4YmU08WL qb+wFGRuCcJobQRMnaWfejcBIlAqx/ALWJHGGKhHtlwLq8g2MQsTMkN7orcU5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770244810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ATtnWG1uJ9Abov6naU32wXPI3GTAJsmzM0nEdGXGYyM=; b=yzv3VHo178ND42ouMIugzwt8BUJZIHixBnPFH3vkkccJhtlyMUMZNzNuh4R+kjJ/hw5xnH axoTPaWZFw3S/6vm2idJGurGDsg82LRUXmM0f69VUcf5hHLJ0J5VoZYHZymnbYmA9K6Aud zKeTezvQJ1Te+TXBkRQDPjSJ9BlMG1rCE9KJ/VmX09oPLFz5eIaUXARB0d4t28B6wbrBUz rKi08+XDlpXa+Xy8K3nBIuWeWt30yZrZCD2QpwKU6naWUO0kVJ7HWttUcid6GNkRveyLE/ wn/iBN/TFBq91IzsAKXANcaF8AjX1fOXxCKDvh2vYlalj3CfABuhKf+jl8o5TA== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f5wKP4Wb4zvjJ; Wed, 04 Feb 2026 22:40:09 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Wed, 4 Feb 2026 14:40:07 -0800 From: Gleb Smirnoff To: Zhenlei Huang Cc: Mark Johnston , src-committers@freebsd.org, "" , dev-commits-src-main@freebsd.org Subject: Re: git: 349fcf079ca3 - main - net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming Message-ID: References: <6948abb4.37a66.71609f61@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Wed, Feb 04, 2026 at 09:21:37AM +0800, Zhenlei Huang wrote: Z> >> commit 349fcf079ca32d5c93e45366d2b27638747affeb Z> >> Author: Gleb Smirnoff Z> >> AuthorDate: 2025-12-21 21:31:43 +0000 Z> >> Commit: Gleb Smirnoff Z> >> CommitDate: 2025-12-22 02:23:14 +0000 Z> >> Z> >> net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming Z> >> Z> >> and don't trigger ifnet_arrival_event and ifnet_departure_event for a Z> >> rename, as the interface isn't being detached from any protocol. The Z> >> consumers of the arrival/departure events are divided into a few Z> >> categories: Z> >> - which indeed need to do the same actions as if interface was fully Z> >> detached and attached: routing socket and netlink notifications to Z> >> userland and the Linux sysfs. All addressed by this commit. Z> >> - which build their logic based on an interface name, but should actually Z> >> update their database on rename: packet filters. This commit leaves Z> >> them with the old behavior - emulate full detach & attach, but this Z> >> should be improved. Z> >> - which shouldn't do anything on rename, not touched by the commit. Z> >> - ng_ether and if_tuntap, that are special and will be addressed by Z> >> separate commits. Z> > Z> > Can we get rid of the IFF_RENAMING flag now? IIUC all of its uses are Z> > in ifnet_departure_event handlers to short-circuit the handler because Z> > the interface is not actually going away. Z> Z> Now that we have ifnet_rename_event, I think the flag IFF_RENAMING is Z> not longer required. Z> Z> Well there're still some consumers, they should be cleaned up prior to retire Z> IFF_RENAMING. 100% correct. Fell free to do that, or I can do that. -- Gleb Smirnoff From nobody Thu Feb 5 00:10:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f5yLG1LKNz6Qrr4 for ; Thu, 05 Feb 2026 00:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5yLF5p6Mz3Sbn for ; Thu, 05 Feb 2026 00:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770250261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ItqXlnRBbrB5+UKDc6Lw0zeafKKjlC7L3SjAL4CEarg=; b=t5QLh2nFgQZwlQFNBq9gOecqO5ijyie/Mzy7XcsOtC0jXGW+XYokNKWftB4Oyot48AlW4e LmfBlX96zYuNxtf4zG92P6Nd7NUX/U+OUl6AP0grT7hIEbuDwLTgNJly4KRnumJHXDu3Ti OJ08/JiakxAdUh9WZbN8HOd1Cx2P3Bzx/adBXVYI8E7zZqZqrSAc0LF4+Sb4GvdcjYecNb 4D+kZaLn4stqpfuQbOqdxaU0TvB02IB9xLOqa0rE6ToJ912/db9Z5lLOGvHtAFwhvsa7lU D4p9uxhM5oXH27bhATA9xKstI02cRXoBiHXCjKqfhdQQBMr/IqBY+EaPXBr45g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770250261; a=rsa-sha256; cv=none; b=UBTKSw9RJb903gfhUmsCORBXFi+276PPIMhh/dHcBBQzogCWN8pE56UtuZ0XyS/EFIaKV/ xtda7gx2Ld+F06q1nO86QTjunXXT9Kay0puN5jRk3bPBZLb/wkHYUsjFGSsShbIXPj9HU6 UMV4iNBfsVAA0XCtF16GeCRmozZk6o8OjeG48PwK0JHAWoc3cp7lKDonL0uwn5uEjdvNXu IMECnsN2GkRuzt/3mKSxdyHl266ilyXAClthKTWKKTCfLocI8ua2YetBfzdgnTe9GO+5A8 HT3yvpsV3eNzlwSYuM871bM+G5T8h13Kyg7BeovflZRreU5+cCg59mSQgjACCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770250261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ItqXlnRBbrB5+UKDc6Lw0zeafKKjlC7L3SjAL4CEarg=; b=MbXtiMB4fE2VTNx1eI6dPXA0as/CNj03aVUbE+HxJL/6L7IN1LdlHAg2ywZ1n+TJucwlzn PZ/jc9zP6djOMCf07XicSCf1kzn2Q/lRl3yb9/wXUwh4OcIamGdago73LrI14lpRT24bZJ GKM9rU7HWeUII5OWqxS91XLSLaTnFvRysSpkyZC5slNzXwKv7zGHLF0UcrI0Hb3iVcM0nm aZPnIDaKL8nLd0ot5Bcuf6bGbWHi+1Klf7cya1vNk5BxOmrMv6tvjSGE8hMwUCRgkF3uFE pUYU0njA5Kw0MAcigEwlhHdx5rTA95ro5SyAcZoMufRKT9uMF4lKwYZrImwMPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5yLF59gDz1KwP for ; Thu, 05 Feb 2026 00:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 00:10:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 0f515c0a9748 - main - ufshci: Remove UIC error during initialization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f515c0a97489d8d35aca7f5e28c28b22f217dc9 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 00:10:56 +0000 Message-Id: <6983e010.31cad.7b90119@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=0f515c0a97489d8d35aca7f5e28c28b22f217dc9 commit 0f515c0a97489d8d35aca7f5e28c28b22f217dc9 Author: Jaeyoon Choi AuthorDate: 2026-02-04 23:53:01 +0000 Commit: Jaeyoon Choi CommitDate: 2026-02-05 00:05:14 +0000 ufshci: Remove UIC error during initialization This patch removes the UIC error caused by QEMU not supporting certain UIC command. Additionally, it removes the unused unipro_version. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D54513 --- sys/dev/ufshci/ufshci_dev.c | 55 +++++++++++++++++------------------------ sys/dev/ufshci/ufshci_private.h | 3 --- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/sys/dev/ufshci/ufshci_dev.c b/sys/dev/ufshci/ufshci_dev.c index 406130c537a7..3167945b53b6 100644 --- a/sys/dev/ufshci/ufshci_dev.c +++ b/sys/dev/ufshci/ufshci_dev.c @@ -273,40 +273,31 @@ ufshci_dev_init_unipro(struct ufshci_controller *ctrlr) uint32_t pa_granularity, peer_pa_granularity; uint32_t t_activate, pear_t_activate; - /* - * Unipro Version: - * - 7~15 = Above 2.0, 6 = 2.0, 5 = 1.8, 4 = 1.61, 3 = 1.6, 2 = 1.41, - * 1 = 1.40, 0 = Reserved - */ - if (ufshci_uic_send_dme_get(ctrlr, PA_LocalVerInfo, - &ctrlr->unipro_version)) - return (ENXIO); - if (ufshci_uic_send_dme_get(ctrlr, PA_RemoteVerInfo, - &ctrlr->ufs_dev.unipro_version)) - return (ENXIO); - - /* - * PA_Granularity: Granularity for PA_TActivate and PA_Hibern8Time - * - 1=1us, 2=4us, 3=8us, 4=16us, 5=32us, 6=100us - */ - if (ufshci_uic_send_dme_get(ctrlr, PA_Granularity, &pa_granularity)) - return (ENXIO); - if (ufshci_uic_send_dme_peer_get(ctrlr, PA_Granularity, - &peer_pa_granularity)) - return (ENXIO); + if (ctrlr->quirks & UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE) { + /* + * PA_Granularity: Granularity for PA_TActivate and + * PA_Hibern8Time + * - 1=1us, 2=4us, 3=8us, 4=16us, 5=32us, 6=100us + */ + if (ufshci_uic_send_dme_get(ctrlr, PA_Granularity, + &pa_granularity)) + return (ENXIO); + if (ufshci_uic_send_dme_peer_get(ctrlr, PA_Granularity, + &peer_pa_granularity)) + return (ENXIO); - /* - * PA_TActivate: Time to wait before activating a burst in order to - * wake-up peer M-RX - * UniPro automatically sets timing information such as PA_TActivate - * through the PACP_CAP_EXT1_ind command during Link Startup operation. - */ - if (ufshci_uic_send_dme_get(ctrlr, PA_TActivate, &t_activate)) - return (ENXIO); - if (ufshci_uic_send_dme_peer_get(ctrlr, PA_TActivate, &pear_t_activate)) - return (ENXIO); + /* + * PA_TActivate: Time to wait before activating a burst in order + * to wake-up peer M-RX UniPro automatically sets timing + * information such as PA_TActivate through the + * PACP_CAP_EXT1_ind command during Link Startup operation. + */ + if (ufshci_uic_send_dme_get(ctrlr, PA_TActivate, &t_activate)) + return (ENXIO); + if (ufshci_uic_send_dme_peer_get(ctrlr, PA_TActivate, + &pear_t_activate)) + return (ENXIO); - if (ctrlr->quirks & UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE) { /* * Intel Lake-field UFSHCI has a quirk. We need to add 200us to * the PEER's PA_TActivate. diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index b57142bf58fc..1634cf51c9fb 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -278,8 +278,6 @@ struct ufshci_device { struct ufshci_device_descriptor dev_desc; struct ufshci_geometry_descriptor geo_desc; - uint32_t unipro_version; - /* WriteBooster */ bool is_wb_enabled; bool is_wb_flush_enabled; @@ -398,7 +396,6 @@ struct ufshci_controller { /* UFS Interconnect Layer (UIC) */ struct mtx uic_cmd_lock; - uint32_t unipro_version; uint8_t hs_gear; uint32_t tx_lanes; uint32_t rx_lanes; From nobody Thu Feb 5 03:01:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f626X5mh3z6R4K1 for ; Thu, 05 Feb 2026 03:01: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f626X1ctsz3pXn for ; Thu, 05 Feb 2026 03:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770260468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oQihabVmrSMIWToTidvKqupw9igrSYH4TFjOluzgMug=; b=w+3ne6GyVWoVqioJ83fj94iHP1adUp4d4mS/VANzqO7FSqCc3KXJXjxNSo0KX7CuTqO9Yj ABntRE4h35iuxRZ438PK2PhSC+/fZII0ocp4+3RJYDrAQh1i/IXFaDN1FVMN9wW3UTTg4v Yrt3ZvAcLssXEwl3cW9Wf87SKWIk9sKECZVwHe1d3+ykKZSx1YCGK6ZhJRgwE4iHVxewsj jUqaFKhg/Mup4N05ydmynXzjiourriSuNVSyC153GvUDI/a7a/HA+gHutbGazWSA1JuSFT IE3B1aoc2x+7wMq2ME98xTebjG2A8zGPJb+RSf8daTYADiymfO2t5r+SrfaDAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770260468; a=rsa-sha256; cv=none; b=yKdO1DwxFxKw3zkXaeJwfJupFpq8aAeh/gEqQOR9CFBkmtLFzXAn4n9d1B69sp7G++06aL eB3jv2m64X1ZYePLMSiibxXqzmNBO4Cg4BcORbp8lYR/0mI+rbLvIsYT+lHJ8b4kCuhUxV bsF2bjx+Sbr4zEgXbPLcoAtkRwctLt+Hqv8WtYEuP3H3rhY6EqslQ6/89pwWKfrzVF7OKA kpBChEa4rHLpbzB5a+TT15Acw7yhwSJO1BjoP16N0r/C1Y4rL2+V9/u1rCQtOf7aeRT793 eJQEOauzPvNLAcEhG19V64ZGqJyrlMtyilqDNkAcuEU0MrMMiP6h8jH72rcKRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770260468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oQihabVmrSMIWToTidvKqupw9igrSYH4TFjOluzgMug=; b=JsS3XAYO0o++0SU9rkligHLy8JIp3hFonJVAW6bCW7iVe6EyWsog2bsnWeqBwzC7Lu88gA ejPcInjHof2CNktOWaIALpWAVzCv4HzRn0eQVHjxpxrtfhUQkIjJJllitEUONoj99ezftf g+3KOAGKiAcy5TNXtZDO3F8IjzF51nxjWbZxlX9mZ/LNkrbhb3LFIDEWbW/Ws4nQsTeOgc Ay219dgpkjJL9e6ybskDoJjDQ2M0QZlTF3/htO0RvtVV24LvaI0uyCV7Z5AbBhFfGlhelC PQoYrhzYBsz8+bteAC+JeUydGdYcM6cE0ybLCZDUewZBCtshKWDsANOSBK6FNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f626X1CYtz1QDg for ; Thu, 05 Feb 2026 03:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41c09 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:01:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 9c666de5b339 - main - Make message added for Darwin OSI quirk more terse List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c666de5b339d3c8f9bf3963691e4310e7d159cb Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:01:08 +0000 Message-Id: <698407f4.41c09.63400b0f@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=9c666de5b339d3c8f9bf3963691e4310e7d159cb commit 9c666de5b339d3c8f9bf3963691e4310e7d159cb Author: Enji Cooper AuthorDate: 2026-02-05 02:57:22 +0000 Commit: Enji Cooper CommitDate: 2026-02-05 02:57:22 +0000 Make message added for Darwin OSI quirk more terse The verbose message was way too verbose. Make it terse. MFC after: 1 week MFC with: 052a791b00 ("acpi: add Darwin OSI quirk for Apple Mac hardware") Requested by: kib --- sys/dev/acpica/acpi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 58ddb0a83922..ac02e1a349d3 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4951,22 +4951,20 @@ acpi_reset_interfaces(device_t dev) /* Disable all other OSI vendor strings. */ status = AcpiUpdateInterfaces( ACPI_DISABLE_ALL_VENDOR_STRINGS); - /* Install Darwin */ if (ACPI_SUCCESS(status)) { + /* Install Darwin OSI */ status = AcpiInstallInterface("Darwin"); } if (bootverbose) { if (ACPI_SUCCESS(status)) { device_printf(dev, - "Apple hardware: installed Darwin " - "OSI and removed other vendor OSI " - "(Windows, etc)\n"); + "disabled non-Darwin OSI & " + "installed Darwin OSI\n"); } else { device_printf(dev, - "Apple hardware: failed to install " - "Darwin OSI: %s\n", - AcpiFormatException( - status)); + "could not install " + "Darwin OSI: %s\n" + AcpiFormatException(status)); } } } else if (bootverbose) { From nobody Thu Feb 5 03:02:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f627w4Vnzz6R4qH for ; Thu, 05 Feb 2026 03:02:20 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f627w1KVSz3ptT for ; Thu, 05 Feb 2026 03:02:20 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-29f30233d8aso3088715ad.0 for ; Wed, 04 Feb 2026 19:02:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770260533; x=1770865333; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=k0kt+UZUTLW27GcNEMrcnIWCrcMCpRlHFFTyqMy9/K4=; b=Lja4CcPyEw2vftdYsscbzptfbSIcht8Sp2HYZ6FLHlgI1c7abDYJf49RpioX41xkRl tdSHXqwhy5MeMw6OYGJRiZUX8mNbcCMBEYyfCL08qpGNbcD1j/mge59XdDKUGsIBFPVs iChO1TWRs+jC5zBAwRxeiCbNjvBhSq7UJKy9RAC50LTrnqsH3K/gF2fhSTR9rzWFx0x7 qbT/QxR/T5DQTJlORIX2byrMa56T4uo9ZyfDDcCChnneTzvqCC0GTyz2KpETXYA1Vk5G rOWrj8vDytTt/gigkH565UOnPgbVpBnOtANibBgqArAB03jL8NHXE3aSn3v1vqywoTMx cKMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770260533; x=1770865333; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=k0kt+UZUTLW27GcNEMrcnIWCrcMCpRlHFFTyqMy9/K4=; b=CtIJq6wP38rN+YCtXKpDW/513YTlekgoCUTJUew33PHi2gfDYa6JhnWXSeSeeDxQL3 Nh/Hue19EbW7zIFDC4v0K6OuuWQ9UJRDIWYn+rlz8sJyPTL4J2mkTdAYQSZ33kDRm4eO Gfb3FgMBxXbrZyEcMx9j8fD20rC+6oYDnznaicTCG1F8Auq2EzOlfG66Tfcc9I5iX9dR pJJSHXwLLperdc/vhkZkkyK9jc66fWWlKya7E2P6CTuWrAH6okb7Jky5nCwYgZgfmRhY lyNNF1wO0l7UnjpRv0vTKbL6yVU3TDVGD3KQa5iGzt/y5SJBOVMoEdsX6pKX+oIRMCLw fUDg== X-Forwarded-Encrypted: i=1; AJvYcCWLkxiz/7XRt/gqyezgkq9OwgEj7aB6o0EC/KfbeFROUFV3Z4J6Y8O6ttn2VSDZzza6rgaBYcGnI+Nzp3McDEWt70LocQ==@freebsd.org X-Gm-Message-State: AOJu0YxqpCo+mxmKS0pb8viatVdYExuG7iIIq6ph3U6MsTYdtWuo/+z+ DCHKPph9H6oeY2ycESm5n6abB1xBWaz3g0C1T7p8q50ZEpb+JaxilHuB X-Gm-Gg: AZuq6aKw/NfsEtnHwMW6m0mrnZZynBLyZ3U7W45pWhXCYXVY41YSBiHNUTeHoAUKRLx MHIFmP0ViXZpCk2ADFH+0DmBqrhkR/2NKA6lWUs8d5JPw7jhqcQGH2WFAPCeNE//rjftK806gHm 1lvB4f5bkYScNzD33+MxLrcNvBQFbeXK+neuUo5/OVwOATgyA/00U2DqQXsp7I5p0KZGi2ZywXo 9iNSuv5UVR74JGa5+XnjruG67yhPPRQzMvvjYabbtxZqi6d+EZlh2HLN0rcYDoIUN0Fc3D6q2RS ht5alK5NDksuushLwLATyDj9B00unfIfxkULhzq9IiwAxLdI7kb3Ws1lmRM559xnB+s6Rfqwvjh FD8sSpUxqIxTNCt4wHLIrppImflFokWQMd1IodsQ3bTrL8mity1LvUdbzmsrxXEZNfMxCg/ZKV1 p5sFqyB3YLV028d3BiFmeyzogJLQCA X-Received: by 2002:a17:903:4b4b:b0:2a1:388d:c084 with SMTP id d9443c01a7336-2a933fda8b8mr54990625ad.42.1770260533000; Wed, 04 Feb 2026 19:02:13 -0800 (PST) Received: from smtpclient.apple ([176.100.43.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a93394e7d5sm36018585ad.60.2026.02.04.19.02.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Feb 2026 19:02:12 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_4CDAF6BF-179C-48EE-BB52-B1A08EEA8F6D"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.3\)) Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware From: "Enji Cooper (yaneurabeya)" In-Reply-To: Date: Wed, 4 Feb 2026 19:02:00 -0800 Cc: Abdelkader Boudih , Adrian Chadd , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: <25B2F11A-19F2-452E-971E-3C2C953540C5@gmail.com> References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> <63ee9a06-97bd-4f7f-8bb8-ed39382d94a4@app.fastmail.com> To: Konstantin Belousov X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4f627w1KVSz3ptT X-Spamd-Bar: ---- --Apple-Mail=_4CDAF6BF-179C-48EE-BB52-B1A08EEA8F6D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 4, 2026, at 1:17=E2=80=AFPM, Konstantin Belousov = wrote: >=20 > On Tue, Feb 03, 2026 at 10:25:27PM -0800, Enji Cooper (yaneurabeya) = wrote: >>=20 >>> On Feb 3, 2026, at 2:38=E2=80=AFAM, Konstantin Belousov = wrote: >>>=20 >>> On Tue, Feb 03, 2026 at 11:08:40AM +0100, Abdelkader Boudih wrote: >>>> I agree that this should not be permanent verbosity. >>>>=20 >>>> The aim was not to add long-term noise, but to make the behavior = observable/greppable to reviewers while this logic is still being = validated across a wide range of Apple models. >>>>=20 >>>> I'm going to get few Apple devices to try on. Once we confirm that = every model behave the same, we could totally remove verbosity and = treating it as assumed-working code. >>=20 >> One sidenote: this is hidden behind bootverbose: it=E2=80=99s not = always being displayed. >>=20 >> I think it=E2=80=99s fine making the message more terse. It might = clarify behavior on Apple platforms since the added behavior contradicts = other OSI-related behavior and can result in a POLA violation. >=20 > Can you fix it, please, instead thinking that it might be fine? Done: = https://cgit.freebsd.org/src/commit/?id=3D9c666de5b339d3c8f9bf3963691e4310= e7d159cb -Enji= --Apple-Mail=_4CDAF6BF-179C-48EE-BB52-B1A08EEA8F6D Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmECCgACgkQGpE5DjPs NJgDuhAAm6asA+jCvHoSEtUe/5LRYUFhuEHgDPqXJfsshMOEm0qDcSAdO3HpKtte yJ2qHRr0FY2GwXaQAViEjZIgRNpKeDxqntvo62uerPN+oQrGMCPxfUsrRvtvuw3a dthP4SFZemIgSt85kGLeihKrxcvsUArkIi8mW6ertT42AaYOyqShc8uwAColamDC 01d2hW5d9DXVLph4fkUdjWOZosb61PTV0KAWC69Aqe81eIFhKq2lL/tB7V54M6xX nV3eAD/FITMz35ZtR6ih9p/3Mb0Rtx/h6TZSlyWOb1SS1YWI/h2L9znpGf+eEGgx NVacL08K7+4JGJcUFFcoYzyX91DRicvqLR02LMtV0n4bqKfY5wZf9S4q2vC5UX1t 3c7dyik/duqJSnqH2nT+bkzAXun3pHV3agLzRctDz1DEemCzUzLDuiZwFtbL6eJZ l53sd2No3wEn9dbqp6cv/LIaYAFHGWkmrrB1Kyxfcu/zdGcmh6M6v9FKpELNzqXD KEI1kk8WCLZcwEUxavAZY3a0teWs7cdsqgbqKUlSiQR+A+PWNaAoKBAH36xsfQql YWTbT5ZpkEh/dlTh6wLsRaWXAD9thj0eQt3ZFZL1uNcOgUSEshpdHngB59u7Ztaw xNwi6PgLGfsvrsp7SZKAlk1CdTTJhsHvMOV/+xydrs6QLSwY6CU= =rXNN -----END PGP SIGNATURE----- --Apple-Mail=_4CDAF6BF-179C-48EE-BB52-B1A08EEA8F6D-- From nobody Thu Feb 5 03:12:26 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f62Mr2xfKz6R4yH; Thu, 05 Feb 2026 03:12:40 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f62Mq6NfSz3sDl; Thu, 05 Feb 2026 03:12:39 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 6153CQLA095178; Thu, 5 Feb 2026 05:12:29 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 6153CQLA095178 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 6153CQsm095177; Thu, 5 Feb 2026 05:12:26 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 5 Feb 2026 05:12:26 +0200 From: Konstantin Belousov To: "Enji Cooper (yaneurabeya)" Cc: Abdelkader Boudih , Adrian Chadd , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 052a791b0055 - main - acpi: add Darwin OSI quirk for Apple Mac hardware Message-ID: References: <698154c0.35e9d.2d7b8775@gitrepo.freebsd.org> <0A69735E-8BF6-41B1-AB7A-9B761A0FF158@gmail.com> <63ee9a06-97bd-4f7f-8bb8-ed39382d94a4@app.fastmail.com> <25B2F11A-19F2-452E-971E-3C2C953540C5@gmail.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <25B2F11A-19F2-452E-971E-3C2C953540C5@gmail.com> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f62Mq6NfSz3sDl X-Spamd-Bar: ---- On Wed, Feb 04, 2026 at 07:02:00PM -0800, Enji Cooper (yaneurabeya) wrote: > > > On Feb 4, 2026, at 1:17 PM, Konstantin Belousov wrote: > > > > On Tue, Feb 03, 2026 at 10:25:27PM -0800, Enji Cooper (yaneurabeya) wrote: > >> > >>> On Feb 3, 2026, at 2:38 AM, Konstantin Belousov wrote: > >>> > >>> On Tue, Feb 03, 2026 at 11:08:40AM +0100, Abdelkader Boudih wrote: > >>>> I agree that this should not be permanent verbosity. > >>>> > >>>> The aim was not to add long-term noise, but to make the behavior observable/greppable to reviewers while this logic is still being validated across a wide range of Apple models. > >>>> > >>>> I'm going to get few Apple devices to try on. Once we confirm that every model behave the same, we could totally remove verbosity and treating it as assumed-working code. > >> > >> One sidenote: this is hidden behind bootverbose: it’s not always being displayed. > >> > >> I think it’s fine making the message more terse. It might clarify behavior on Apple platforms since the added behavior contradicts other OSI-related behavior and can result in a POLA violation. > > > > Can you fix it, please, instead thinking that it might be fine? > > Done: https://cgit.freebsd.org/src/commit/?id=9c666de5b339d3c8f9bf3963691e4310e7d159cb > -Enji Thank you. From nobody Thu Feb 5 03:36:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f62v656Z4z6R736 for ; Thu, 05 Feb 2026 03:36: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f62v63X1Gz3vs0 for ; Thu, 05 Feb 2026 03:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770262578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i4o+W3rFQrp9Zoq2I1RWPelOM6Jcl2L/p5ywH+6EpyE=; b=Hpuli2f/M7gT27lj9RRs/F6xpQW0M442uvnHCDEFkBmzMEmOFlnKtfUlBS8EcuOVcicANu 6cdW9WwCbultix//FwNFquEmx8Z8DmuwX1NbHhpz1ypHEcEoKXcitB14+sa/8f52yIR8WV HxOrTQovV4NDdlm9t4MMu5VuwpW/jYSGsqG0i65pfttaSBrZM/kFjL3lLvdS8JYUFFcExm HjRJGCwlavGoW/1By0P/+C8cL2FzPn2Gz6CKKzX3xbJaVpxbct27fCl7fglYb8XTqFB2Nl YtDMeWEhZGfCdvv2P2JoiQoJ5hdeV+LT65dI9GUzM8uJr57/tBg1uikkoZgWjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770262578; a=rsa-sha256; cv=none; b=X+37noqw/H7k5FYjGyN0wypQGUMJ6ek3jJ6i2Dba4trBZ1yzzQAlVYnVTL41Mftsg/VpB3 cUWUbbsb21Lsm+uPtn1cxc4kXMnhhE0nzwIiQCAVnhVDyzHp5aGKU6wU8a1KinDBMwwiNz eDo0BYfjWNkdOQ6gr5uWURe2BFIh7BaOCyWKB9xTRzS82/x8NER8ovdvjKUHJ+DtRHyzvi QXvP+smxUfKRkTFHUFVbDxJRd6fzu2hepeBjrwk33rMf9DLoiLXACq/YpcWaPlJKxdec3y dck9CkpnnTi6TtozNJONzhXiKbgIa2fjZKvhHntpdj5cWCgbiNN7aMWCr/Zd5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770262578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i4o+W3rFQrp9Zoq2I1RWPelOM6Jcl2L/p5ywH+6EpyE=; b=wieboZDIOLP40veGYptK/kIsODhbtnxLi21M6TqfphSurk1gzHeXJjK44dRRSjGQrc5NuB ZmH/EvwzPaeO/bQQtHQSTK1cT1CyOvFpO5oSogTkseiodymrlXJDkmIDyeQACAeleNcB58 crq127mNvTpNG6aij+QbOQn/2JjRzm1zGwzVBZ8SaDz2aioIX60YiBmyEgN/tEP6RF//8S V2qwRlt3R371XgvZOex1g2rCE+gb7aj2woDtb1pgsP6L6QD+k0c5KYc6TDZgWcpSrCwHTC 8c5dW1qT79yKIASQMmWXTI/NLxJBSqg5aH3QaTusBLNBoC5Nf7HxDQBHvFH1Ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f62v62v98z1R08 for ; Thu, 05 Feb 2026 03:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4591c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:36:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 38a4995eb52d - main - tpm20: fix suspend/resume and entropy harvesting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38a4995eb52db21116f8b37ed942e66a8c2f050f Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:36:18 +0000 Message-Id: <69841032.4591c.45547cc2@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=38a4995eb52db21116f8b37ed942e66a8c2f050f commit 38a4995eb52db21116f8b37ed942e66a8c2f050f Author: Kyle Evans AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-02-05 03:35:10 +0000 tpm20: fix suspend/resume and entropy harvesting There were a few problem here: - TPM2_Shutdown results in a response that we need to either process or ignore, otherwise any tpm20_write or tpm20_harvest call will trivially hang on an `sc->pending_data_length != 0` - We should have a matching TPM2_Startup upon resume to restore any state that should have persisted - We must drain the harvest task before we suspend to avoid problems there This commit is sufficient to avoid breaking suspend/resume. PR: 291067 Fixes: a2d5ed9442bb ("Introduce driver for TPM 2.0 in CRB and [...]") Fixes: 4ee7d3b0118c ("Allow using TPM as entropy source.") Co-authored-by: markj (D53835) Tested by: garga Differential Revision: https://reviews.freebsd.org/D55074 --- sys/dev/tpm/tpm20.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/tpm/tpm20.h | 1 + sys/dev/tpm/tpm_crb.c | 1 + sys/dev/tpm/tpm_tis_core.c | 1 + 4 files changed, 68 insertions(+) diff --git a/sys/dev/tpm/tpm20.c b/sys/dev/tpm/tpm20.c index 6c587818058d..c521ca9dda9d 100644 --- a/sys/dev/tpm/tpm20.c +++ b/sys/dev/tpm/tpm20.c @@ -45,6 +45,7 @@ static void tpm20_discard_buffer(void *arg); #if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM static void tpm20_harvest(void *arg, int unused); #endif +static int tpm20_restart(device_t dev, bool clear); static int tpm20_save_state(device_t dev, bool suspend); static d_open_t tpm20_open; @@ -242,9 +243,31 @@ tpm20_release(struct tpm_sc *sc) destroy_dev(sc->sc_cdev); } +int +tpm20_resume(device_t dev) +{ + + tpm20_restart(dev, false); + +#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM + struct tpm_sc *sc; + + sc = device_get_softc(dev); + taskqueue_enqueue_timeout(taskqueue_thread, &sc->harvest_task, + hz * TPM_HARVEST_INTERVAL); +#endif + return (0); +} + int tpm20_suspend(device_t dev) { +#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM + struct tpm_sc *sc; + + sc = device_get_softc(dev); + taskqueue_drain_timeout(taskqueue_thread, &sc->harvest_task); +#endif return (tpm20_save_state(dev, true)); } @@ -307,6 +330,43 @@ tpm20_harvest(void *arg, int unused) } #endif /* TPM_HARVEST */ +static int +tpm20_restart(device_t dev, bool clear) +{ + struct tpm_sc *sc; + uint8_t startup_cmd[] = { + 0x80, 0x01, /* TPM_ST_NO_SESSIONS tag*/ + 0x00, 0x00, 0x00, 0x0C, /* cmd length */ + 0x00, 0x00, 0x01, 0x44, /* cmd TPM_CC_Startup */ + 0x00, 0x01 /* TPM_SU_STATE */ + }; + + sc = device_get_softc(dev); + + /* + * Inform the TPM whether we are resetting or resuming. + */ + if (clear) + startup_cmd[11] = 0; /* TPM_SU_CLEAR */ + + if (sc == NULL || sc->buf == NULL) + return (0); + + sx_xlock(&sc->dev_lock); + + MPASS(sc->pending_data_length == 0); + memcpy(sc->buf, startup_cmd, sizeof(startup_cmd)); + + /* XXX Ignoring both TPM_TRANSMIT return and tpm's response */ + TPM_TRANSMIT(sc->dev, sizeof(startup_cmd)); + sc->pending_data_length = 0; + sc->total_length = 0; + + sx_xunlock(&sc->dev_lock); + + return (0); +} + static int tpm20_save_state(device_t dev, bool suspend) { @@ -331,8 +391,13 @@ tpm20_save_state(device_t dev, bool suspend) sx_xlock(&sc->dev_lock); + MPASS(sc->pending_data_length == 0); memcpy(sc->buf, save_cmd, sizeof(save_cmd)); + + /* XXX Ignoring both TPM_TRANSMIT return and tpm's response */ TPM_TRANSMIT(sc->dev, sizeof(save_cmd)); + sc->pending_data_length = 0; + sc->total_length = 0; sx_xunlock(&sc->dev_lock); diff --git a/sys/dev/tpm/tpm20.h b/sys/dev/tpm/tpm20.h index b2cfcd4f25bd..96b2920283b6 100644 --- a/sys/dev/tpm/tpm20.h +++ b/sys/dev/tpm/tpm20.h @@ -136,6 +136,7 @@ struct tpm_sc { }; int tpm20_suspend(device_t dev); +int tpm20_resume(device_t dev); int tpm20_shutdown(device_t dev); int32_t tpm20_get_timeout(uint32_t command); int tpm20_init(struct tpm_sc *sc); diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 26b53e7a621d..18414a6c799b 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -651,6 +651,7 @@ static device_method_t tpmcrb_methods[] = { DEVMETHOD(device_detach, tpmcrb_detach), DEVMETHOD(device_shutdown, tpm20_shutdown), DEVMETHOD(device_suspend, tpm20_suspend), + DEVMETHOD(device_resume, tpm20_resume), DEVMETHOD(tpm_transmit, tpmcrb_transmit), {0, 0} }; diff --git a/sys/dev/tpm/tpm_tis_core.c b/sys/dev/tpm/tpm_tis_core.c index 4159de4daf3b..34ecfcc283b1 100644 --- a/sys/dev/tpm/tpm_tis_core.c +++ b/sys/dev/tpm/tpm_tis_core.c @@ -487,6 +487,7 @@ static device_method_t tpmtis_methods[] = { DEVMETHOD(device_detach, tpmtis_detach), DEVMETHOD(device_shutdown, tpm20_shutdown), DEVMETHOD(device_suspend, tpm20_suspend), + DEVMETHOD(device_resume, tpm20_resume), DEVMETHOD(tpm_transmit, tpmtis_transmit), DEVMETHOD_END }; From nobody Thu Feb 5 03:36:17 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f62vC3Vwzz6R71N for ; Thu, 05 Feb 2026 03:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f62vB3sc8z3wW0 for ; Thu, 05 Feb 2026 03:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770262582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kUi0z6nfVZdGGzR9yq3OwG61vKSG9uefoXct4uGBukw=; b=IlxudvEM+c+b5T8YwtGdey8RtkiXhJdTVgj8yp/+EpigJFAbnqDadTbPA7z+MiYkybYCYF fLROeewGkEbFVNGIZkXn+fTSaek/Qlz5Mf6SBQ1lRbJ78DO7O0/GQvL8PH4+ptQKoXcevT vZQigrVmg1Heedwlhhg4cYywEModKdkKa1P3MGzGTBJVjtOXW5VzAZTEz1yVh8AIuj5xPZ AAyI6s+RfUC4mHWzMrdfuMY64BNyQJDCvPfcQC7COyEpX0HUs1srlTD7gO46S2yqocS7rG cZFkIS8rbEPmKLx+4mXRwvz/LVR7tk7StnperFWhcZN1VIi+P5q26cRXZ6fFJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770262582; a=rsa-sha256; cv=none; b=oWTA+AhcQ1NZtCquVdaYzynHNDz1T6z336iB1e37UDqO5eUMWZWTXCB+kFljYlELmfTy8i 6hys/z9MO6vRqlxHDAqyW51ScR/3d8zUiDjiCIseCgEIlRe0Dy4Jqy1nGGx2WwQS8qJDYG PZqUhuDYJbk2AZ0RpG3/eF4yJ1UJg9UWiFMAyM4QPswWHmJVOOlp3uQd+EJlfp/KleMYUC d4MhXba7LE+3PUiarclGREZJZwu6wTD2yh1Irk63xA7DBqofHegXxYvye500j9o1OkQGOe 0hI13HMSUn5F2r0x+kvDrR1wU2B0LYA/biwsLqlKj9N1q5LIegzpwGOmQB23KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770262582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kUi0z6nfVZdGGzR9yq3OwG61vKSG9uefoXct4uGBukw=; b=O9jFZ/20b3HwxATfZM5cDhjEZISz/75FR5QZj34vsg6By931KtNbQhgHTED9WU2vzkr+BN nflWoE18pdGaQS+FWUCAvhruZecYuMfXpEnYZfrU1qcXBH42DmuVpZsEYlSvUSMkoHBKEZ xVj/qUUsALzHH6v9JoM+ZVMwQ7jQ4rwTZHzVWkKhdGzPW6Be9DLiBUN7a9JnRst86sOYw1 Hwytqv315XP/o3/5V5OS0BsHpj61pDM2p/SsAkOoBeW4hCKxSVQlwA58hnk+enph+Kmx4L 7dd/o2WdwtBx2ZoTPIPKke8zGJhgvgBOwcJjhGxM/vyHah6bXNTgw+J3dpbTFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f62vB2G8Xz1Qn6 for ; Thu, 05 Feb 2026 03:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45120 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:36:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Kyle Evans Subject: git: 5c9d988d865c - main - OptionalObsoleteFiles: Add etc/zfs/compatibility.d List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c9d988d865cc4ce849507173c0a2e2f399d0f62 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:36:17 +0000 Message-Id: <69841031.45120.cc296cb@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5c9d988d865cc4ce849507173c0a2e2f399d0f62 commit 5c9d988d865cc4ce849507173c0a2e2f399d0f62 Author: Artem Bunichev AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-02-05 03:35:01 +0000 OptionalObsoleteFiles: Add etc/zfs/compatibility.d If the world is built and installed with WITHOUT_ZFS, then make -DBATCH_DELETE_OLD_FILES delete-old-dirs will give the error: > rmdir: /etc/zfs: Directory not empty because /etc/zfs/compatibility.d is still there. While we're here, clean out /usr/share/zfs as well. Co-authored-by: kevans Differential Revision: https://reviews.freebsd.org/D54758 --- tools/build/mk/OptionalObsoleteFiles.inc | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 5b0a18f75e9e..aae83a44e53e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -9250,6 +9250,7 @@ OLD_FILES+=etc/rc.d/zvol OLD_FILES+=etc/devd/zfs.conf OLD_FILES+=etc/periodic/daily/404.status-zfs OLD_FILES+=etc/periodic/daily/800.scrub-zfs +OLD_DIRS+=etc/zfs/compatibility.d OLD_FILES+=etc/zfs/exports OLD_DIRS+=etc/zfs OLD_LIBS+=lib/libavl.so.2 @@ -9340,6 +9341,63 @@ OLD_FILES+=usr/share/man/man8/zfsbootcfg.8.gz OLD_FILES+=usr/share/man/man8/zfsd.8.gz OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz +OLD_FILES+=usr/share/zfs/compatibility.d/2018 +OLD_FILES+=usr/share/zfs/compatibility.d/2019 +OLD_FILES+=usr/share/zfs/compatibility.d/2020 +OLD_FILES+=usr/share/zfs/compatibility.d/2021 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2018 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2019 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2020 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2021 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.4 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.4 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-9.10.2 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2-2.06 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2-2.12 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.0-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.0-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.1-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.1-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.7.0 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.8.1 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.9.3 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.9.4 +OLD_FILES+=usr/share/zfs/compatibility.d/truenas-12.0 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-18.04 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-20.04 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-22.04 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.1 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.4 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.5 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.7 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.8 +OLD_DIRS+=usr/share/zfs/compatibility.d +OLD_DIRS+=usr/share/zfs .endif .if ${MK_ZONEINFO} == no From nobody Thu Feb 5 03:41:04 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f630j4vFHz6R72G for ; Thu, 05 Feb 2026 03:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f630c1Wgxz3x9W for ; Thu, 05 Feb 2026 03:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770262864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SdU0sHRFmcfIftQTb5H5gdqej4vKwWa/e8YbALgAZzA=; b=maLPkA5wHT3ASVfJoDW+zoYu6iZPsBYv3i4oxaZmG+WoQIgR8VgCiTpCwDZY3A+SdENCth 0Wo+d6hEhSSEtnKugXLjnJ+eEicnjYGWhcx4cXyTY5scmbZ05C/g1VfxEazsc56cXrSq1P wJHXccJsDf4ggZGO+UGZmSPMklGchHtG3TM0ZgOUxC1RXM73PyJI69zuCZby/g8S0W+B82 ErE1pEDE6XvGxl/U/uwSeyyiuWmxddmZ+IuJceK+b6wrGqi8ey2EOAPX7QSqbNXqn+x6H+ q+1E8UR9LwLROxIzpE07Pg0GInfgQZqGt/WpC59+7Ihm0X6ypbFmAZq4paBVBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770262864; a=rsa-sha256; cv=none; b=HYzJDbRpXAXOmljC35W0JF69F5PgHJvL8YHh6Sd6PG2ztv8qVRm0t3x4Jzye7/kV4ZCD+F uQLFcrQrYHFqH9aakwne45EoQ8vlru5Jro1MUnP3lgn70huRDblwK1dTYdSxQ/FsUHaISz +Gv069P64JAI8s6TiZfSMUi8tw30CODOHqq9DJkLtI25kZ+54zEsSiMbaRa8x7NQbhw1y4 vl3s/S1tQZZtwbNQkmBTcmkM9PPrb9PapUcf/apjT42x6RUQyAXqjopw9u86PJMJxK8cu2 5x6hdg3b/vejShbpm08hV37sWlLo6cQbzxTLw4DH1Vt3gd2Sx5auIZHNR1Te2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770262864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SdU0sHRFmcfIftQTb5H5gdqej4vKwWa/e8YbALgAZzA=; b=tk1/Z15iI1ioNJCh5nRpEN+Vm8pHwkbGm4UnQKWe7+6ij440GAxlWNdDJuy1aJJ78H1bUq IW47a5ZO/Uix2agymMb61VodrENG/pAFE0JDYBrRCc1fMpCDTapBROFjprdyT7urRYc6Z0 kkEJtqoOEbtdKAMJKhjxHcjvWdJm6BVRpKjS3rY2NtOFAegJKA+1+FLm3WANJ1Zu3Wn1AI WQ0le72ooYkPcWydcatxxyLh377O1v6ekt090MQAOHEB2BleOgmjeYboD27b4ahKZeLsld LyEYzuROU/PRIWn1Sz8Lw5/q6FWUghNO9fzGg2elW1lDDWzp3cmVXYiNu1aNYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f630c0zLBz1RJj for ; Thu, 05 Feb 2026 03:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45378 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:41:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: e54a1ef4ebdf - main - builtin.1: Command list maintenance List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e54a1ef4ebdf1ea606eb0e00cf2345f9c0db7a7f Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:41:04 +0000 Message-Id: <69841150.45378.79c36706@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e54a1ef4ebdf1ea606eb0e00cf2345f9c0db7a7f commit e54a1ef4ebdf1ea606eb0e00cf2345f9c0db7a7f Author: Alexander Ziaee AuthorDate: 2026-02-05 03:37:08 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-05 03:40:39 +0000 builtin.1: Command list maintenance + link to return(1) like the other exclusive builtins + fix alphabetical sorting of list in rendered manual MFC after: 3 days --- share/man/man1/Makefile | 1 + share/man/man1/builtin.1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile index d3975c8e8084..c4ba33ff086b 100644 --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -69,6 +69,7 @@ RUNTIMELINKS=\ builtin.1 readonly.1 \ builtin.1 rehash.1 \ builtin.1 repeat.1 \ + builtin.1 return.1 \ builtin.1 sched.1 \ builtin.1 set.1 \ builtin.1 setenv.1 \ diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1 index 2fb9859ca545..92024ac30116 100644 --- a/share/man/man1/builtin.1 +++ b/share/man/man1/builtin.1 @@ -95,8 +95,8 @@ and the standard shells that provide them. .It Ic false Ta Yes Ta \&No Ta Yes .It Ic fc Ta \&No Ta \&No Ta Yes .It Ic fg Ta \&No Ta Yes Ta Yes -.It Ic filetest Ta \&No Ta Yes Ta \&No .It Ic fi Ta \&No Ta \&No Ta Yes +.It Ic filetest Ta \&No Ta Yes Ta \&No .It Ic for Ta \&No Ta \&No Ta Yes .It Ic foreach Ta \&No Ta Yes Ta \&No .It Ic getopts Ta \&No Ta \&No Ta Yes From nobody Thu Feb 5 03:43:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f633c39sKz6R7Nw for ; Thu, 05 Feb 2026 03:43: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f633c20h1z3xxg for ; Thu, 05 Feb 2026 03:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nHly4CvRRteYQN556CVoYPU4rNMt6cWIvMYZgvBvkGA=; b=BBe2NXQhvOKMe2ZWqeKNhdG/+1JyYrGA9HS/wtk5Q8NtOSYGALDJGkr36WQjB2dYVowAvg k+w1qMOY5NmfNkZ/Jzt1n3rcvaA8qLBJ0ipcaCXQdbEy9n/pivA31fq62fqT/Uci66ZJAj anhXP3Ss06rjEoST5jhAFJOty/K61j0Q+iydiAPOpZboM6i6MTnjDS+o/hqlJxP2tP4dVv sU7qb0QlwslGSoTPHhacCWiuC3ckJGN0//F9U0DOdf804gRjtKfqoXvjgaMntP9yCER2Ih oxZ5LD3g2GUFS6cR8HiEA9p6I2xGBvsv1qDMYCHtiKXjBicusbUy9qDwQ+3Plg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770263020; a=rsa-sha256; cv=none; b=V3F5xHEgK3/7rzwnYbQeO9sVb6Pou6AnL9i1jBNX2uzgjWrf1VpZuQtSsBRvW+O6xzUwok IG1MLrHBI+4978jIbgRUuZMSG2UDcX0YuxMO+JIEAauG6D5wfrXwP5lveyid/JrUMsBqQC o3yKjmhLJbducIVbZoVOu7DfK4fHxEpCyEYc9I1UEeLfhaGr+Nf7EOeylItaWC3DGB6hpk iWrMr5fx3PIcu51ZVCsMaj4Rxp2FPr+izN4RVXjR+YrDUw5V+M6yDaVziMKrosEg7uvJLa Wcnk/wBmxPhdfkgB2TtWQrUZoIzQwOZh/j589REW9xGhcUQ5QahzAT0W/DYm2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nHly4CvRRteYQN556CVoYPU4rNMt6cWIvMYZgvBvkGA=; b=ckRVOTePqSs8XccGv19gAoDrwoipun9R2vSY9sYxKEUjkIvK0TvaJqTzgJp52rmVot+N2i 20cvyl7aL68cmZlSEjpe8Tvs5Lm/sjMHymRlAFSR85rz2rNEeb/mhqDO9nN/qydWvn9bVo GrQcOAGIW8CHw96nJfvzgfX2rtogZGfk/NjXUS9ubw40Q0dYpLp7dfPeYGcH02/4qCYmGS T+8uR3O2FaGG5y3mEkwEHsmfz97xIJKtB9BTVYmHd3A9WcRUDl/7aBYFva8fdiNjnSMVHs cyKpO9tMwTAFbSQe6Cc8kE+jn1oKyVfUhsTq8NCxwggIZmmdbZq97St+Jlvk0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f633c1MyBz1Rmq for ; Thu, 05 Feb 2026 03:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44bb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:43:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: c1a339b4a313 - main - powerpc64/pmap: No need to use r0 anymore in tlbie List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1a339b4a313ead4122c630ab9ac8f9c54c3e0a2 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:43:35 +0000 Message-Id: <698411e7.44bb3.7b40fde6@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=c1a339b4a313ead4122c630ab9ac8f9c54c3e0a2 commit c1a339b4a313ead4122c630ab9ac8f9c54c3e0a2 Author: Justin Hibbits AuthorDate: 2026-02-05 03:28:16 +0000 Commit: Justin Hibbits CommitDate: 2026-02-05 03:42:23 +0000 powerpc64/pmap: No need to use r0 anymore in tlbie The only use of `tlbie %rN, 0` is now explicit and covered in the block above. Since there's no need for an explicit `tlbie %rN, 0` now, drop this convoluted piece and let the compiler decide. While here, a trivial optimization of the old-style tlbie block, by clearing tlbie_lock and returning, instead of going to the end which checks again if the lock is needed. Since it's already known to be needed, there's no need to check again. --- sys/powerpc/aim/moea64_native.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c index 0ea44b1097b6..7714187c2f4d 100644 --- a/sys/powerpc/aim/moea64_native.c +++ b/sys/powerpc/aim/moea64_native.c @@ -183,7 +183,8 @@ TLBIE(uint64_t vpn, uint64_t oldptehi) "memory"); __asm __volatile("eieio; tlbsync; ptesync" ::: "memory"); - goto done; + tlbie_lock = 0; + return; #endif } } @@ -197,20 +198,8 @@ TLBIE(uint64_t vpn, uint64_t oldptehi) (oldptehi & LPTE_KERNEL_VSID_BIT) == 0) vpn |= AP_16M; - /* - * Explicitly clobber r0. The tlbie instruction has two forms: an old - * one used by PowerISA 2.03 and prior, and a newer one used by PowerISA - * 2.06 (maybe 2.05?) and later. We need to support both, and it just - * so happens that since we use 4k pages we can simply zero out r0, and - * clobber it, and the assembler will interpret the single-operand form - * of tlbie as having RB set, and everything else as 0. The RS operand - * in the newer form is in the same position as the L(page size) bit of - * the old form, so a slong as RS is 0, we're good on both sides. - */ - __asm __volatile("li 0, 0 \n tlbie %0, 0" :: "r"(vpn) : "r0", "memory"); + __asm __volatile("tlbie %0, %1" :: "r"(vpn), "r"(0) : "memory"); __asm __volatile("eieio; tlbsync; ptesync" ::: "memory"); -done: - #else vpn_hi = (uint32_t)(vpn >> 32); vpn_lo = (uint32_t)vpn; From nobody Thu Feb 5 03:45:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f635J1DyZz6R7C5 for ; Thu, 05 Feb 2026 03:45: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f635J0dtWz3yjM for ; Thu, 05 Feb 2026 03:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GA7l6YMZasX+lPe1+3W6dWv+RXWpecIp9me15KBW9BY=; b=e5CNLDkSan+NwuVeIWpixAOOGb96ol/kaHQGYA4BenVgDDMXmGJzBnAmsVv+5hltEJnwRN 8EvrpLNsFsOR+suIftzVYvqyMkgwjonbzRxLDkF1vqznM4Ul0Ctsu5FnPEGmnlYSQrP9b9 T3saJd8pecn6JttcHCWPUmQIzFR/nw/RYoEOAOyGnqQGHyIejHBrGwADjTswpg9G2DR55L xwm3MSSfn/vH7VYNBVF/UD5QGnrsJxKJHYukhY+Ox8h5i1Z4DPCI0h6BHPkkVOT/cqpJEG JsOPzme1HFITr7n1QRc5arwWucSMp7+JZtnhwAzFtzG2MSflK9pbhxXt3Ndvvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770263108; a=rsa-sha256; cv=none; b=r0814OpMl2AsdpJAW0rbx2oh0pOMjjMiZOh3Buz/jYAA6zkDI+5N1273Dy71klMnboBsLL qm/pN5MrIleNOurWaEtlNO6Ts3v2+fkoiXKceeH2jhyxh1oqco1ymua1JYMeZLXnIvolSy rSDIBYAIn1GTi1jLH85kefGeHCegFNPoIgrCu8b/p4ZwcnUkOtzIa/wjKqTKSqe694ULhk OtpKtLgw+z8ri1ncAjaFtO3jYNzBzdfh3jlJ+xyv1kMrdtFsdFrHyON/7bjTYb9iMH15Nd YieiIFI1QfKrNd1PqopsL2PBf35LFoiSj6ELxqJWQVJl9NskE3ycODuB0sn+IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GA7l6YMZasX+lPe1+3W6dWv+RXWpecIp9me15KBW9BY=; b=TQyHIBkqDS8xp7mzTYQf1yoDCJDpys4H6WIVuwVbMg3lBZKs8XeMMwQ7eB8BCy2p6sHHqF LenUyPqLHIoKLKAzmoU8hXx36C0+oD/TAFi+9st+zST2A0zNfKVrK17noo71NzirpA5DnM cREdjKlO+nq9EOnI6AKBNV4Tw75Xwk6JEN90RyGYghA0r0pceUYv3X9TaCyFAdK+auGjgo TTIm7qr5KHy33Iymyf/2aBHCFiVzOEE3TDNOa+q/k9HmpOjsw36nDm/1R3YzqmVOIYdR0L +G77JRt6/tC1Ioy7w6p7Hl+Lz2sMefOeOicm+KIoGJ8Q6ijC1ZvX9Rqqlu075g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f635J07Xyz1RMD for ; Thu, 05 Feb 2026 03:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 459f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:45:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 4f7336a93cb8 - main - etcupdate: Do not ignore empty files. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f7336a93cb84a0633ca9aa715e474625b4adce5 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:45:08 +0000 Message-Id: <69841244.459f0.6543ed67@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=4f7336a93cb84a0633ca9aa715e474625b4adce5 commit 4f7336a93cb84a0633ca9aa715e474625b4adce5 Author: Xin LI AuthorDate: 2026-01-29 03:23:15 +0000 Commit: Xin LI CommitDate: 2026-02-05 03:44:26 +0000 etcupdate: Do not ignore empty files. PR: bin/292773 Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54935 --- usr.sbin/etcupdate/etcupdate.sh | 4 -- usr.sbin/etcupdate/tests/Makefile | 1 + usr.sbin/etcupdate/tests/empty_file_test.sh | 86 +++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 7bddd6593b56..8f4737136d72 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -242,10 +242,6 @@ build_tree() (cd $1 && printf '%s\n' $autogenfiles >> $metatmp && \ rm -f $autogenfiles) || return 1 - # Remove empty files. These just clutter the output of 'diff'. - (cd $1 && find . -type f -size 0 -delete -print >> $metatmp) || \ - return 1 - # Trim empty directories. (cd $1 && find . -depth -type d -empty -delete -print >> $metatmp) || \ return 1 diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile index ba0b6223576b..8dc9bef0eb25 100644 --- a/usr.sbin/etcupdate/tests/Makefile +++ b/usr.sbin/etcupdate/tests/Makefile @@ -1,6 +1,7 @@ PLAIN_TESTS_SH= .for test in always_test \ conflicts_test \ + empty_file_test \ fbsdid_test \ ignore_test \ preworld_test \ diff --git a/usr.sbin/etcupdate/tests/empty_file_test.sh b/usr.sbin/etcupdate/tests/empty_file_test.sh new file mode 100755 index 000000000000..5fe7a5ffb2b3 --- /dev/null +++ b/usr.sbin/etcupdate/tests/empty_file_test.sh @@ -0,0 +1,86 @@ +#!/bin/sh + +# Regression test for "etcupdate: Do not ignore empty files" + +FAILED=no +WORKDIR=$(pwd)/work + +usage() +{ + echo "Usage: empty_file_test.sh [-s script] [-w workdir]" + exit 1 +} + +COMMAND=etcupdate +while getopts "s:w:" option; do + case $option in + s) + COMMAND="sh $OPTARG" + ;; + w) + WORKDIR=$OPTARG + ;; + *) + echo + usage + ;; + esac +done +shift $((OPTIND - 1)) +if [ $# -ne 0 ]; then + usage +fi + +SRC=$WORKDIR/src +DEST=$WORKDIR/dest +TEST=$WORKDIR/test + +# Clean up +rm -rf $WORKDIR + +# Create a mock source tree +mkdir -p $SRC +touch $SRC/empty_file + +# Create a mock make script +cat > $WORKDIR/mock_make.sh < "\$DESTDIR/METALOG" + fi + ;; + esac +done +exit 0 +EOF +chmod +x $WORKDIR/mock_make.sh + +# Run etcupdate +# Use -B to skip build targets +# Use -N to run without root privileges +# Use 'extract' command to bypass root check in 'update' command +$COMMAND extract -N -B -s $SRC -d $WORKDIR -m $WORKDIR/mock_make.sh > $WORKDIR/test.out 2>&1 + +if [ -f $WORKDIR/current/etc/empty_file ]; then + echo "Empty file preserved." +else + echo "Empty file missing from current tree." + FAILED=yes +fi + +[ "${FAILED}" = no ] From nobody Thu Feb 5 03:55:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f63Jt29hJz6R7Yp for ; Thu, 05 Feb 2026 03:55: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f63Jt1HRNz42Kk for ; Thu, 05 Feb 2026 03:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TGdQkNQSFcF6dhOUpeLK3nt2q/ffm68wgTZv/TywSMs=; b=KFwY31G5QcNlGwhLzUWLu5g4pXbA9+2xRkMAmGxlvYKymmlX9nPwHo++tHNkMgayksUCg4 udlEU7P6Ehq+2cexEOWYsdFftQpnrbKNTK4jVS1rsEkHjzo0qmBsza1G3BTM0fzOBbHNbY fi8b1LvxB+GIpxeI5UPXx6Kavp8KD0dpp3k6dCqByi3PYEC6vp83NPzaRh5sXd/UL4Bi99 icpAeEbAa6HHuT2CVJ9YzeBOevLb6YjyqLUlaZ7O/rVU2vq3TK06NZ3sXbHSa6hOvUqcm8 LloMT6IVZ3gNUVRnCd0tpegCZnD95+USWysW3gjEJIH0MmWLOwn/GLOyOyAnzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770263710; a=rsa-sha256; cv=none; b=w4Vm1fcn+BnSL4TFjsMVGzPL3/R4H5wByacl3g1HsqEpW4rED1ghEjLIABXBKJMxmhLnIy 4BUhejf3M3x5jQkyulQu1vtkxLlEJyYsMXa2HF+noZ+sjNjD2m1rGn0DXxzvXgMooITEce HMGMWb5Uc3QU6VBvkr5higRynliPGlDYjmsohswCgHFcp8TRdPxrOIR3NUpfoLF55b3uGG da3nsCVAcmxgdV+L3c+RCdr3OFgAcXt6Nzkrl7yElY+33/FMtRQyqmKsc/7c6JwFROlNCI YyKfjVrfI2NPkWmavqTwx5s4YYjp96DVSMuVOYEebTvxQrGR3NnY92VHyILWBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TGdQkNQSFcF6dhOUpeLK3nt2q/ffm68wgTZv/TywSMs=; b=qD7p/Iif05/yTjqRl8JU5L9uk1smg4ZiSk/znrInRMBknCX0oki0sUNbwAkC/qPcU46I39 DUiEdRgwIcOGVc1nzBJRnYVRvyuDBR9/Mw2sxAL9JUyPsMJupZLjd+kMHVBgy0vY+H/+Lj r60GWMdCX6E/Tn2KHDMvWlwFn4QmjSCkyWjgRkQ5KxF5vKPd8pVxN1OEl50TTO1uKHu+fi LuJyMdvrN9ISlS4tlvL2D0dYZvyxvHLxwaXvCdjvfWy6eTb2pc27F2C/cXBMK1XKjaenHX cXgHFu1JPafLTVF0I5B/xPZKcPshhNJaLZyXz5PrBeT4rNb97snEhtlp57vmUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f63Jt0pxNz1RLH for ; Thu, 05 Feb 2026 03:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:55:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Pat Maddox From: Kyle Evans Subject: git: 2e020c84cb5e - main - bectl: Add -E flag to create an empty boot environment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e020c84cb5ee1452e448f27ff7a7b6076c0147a Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:55:10 +0000 Message-Id: <6984149e.45b34.380e30ba@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2e020c84cb5ee1452e448f27ff7a7b6076c0147a commit 2e020c84cb5ee1452e448f27ff7a7b6076c0147a Author: Pat Maddox AuthorDate: 2026-02-05 03:54:09 +0000 Commit: Kyle Evans CommitDate: 2026-02-05 03:54:45 +0000 bectl: Add -E flag to create an empty boot environment Signed-off-by: Pat Maddox Reviewed by: kevans MFC after: 1 week Closes: https://github.com/freebsd/freebsd-src/pull/1975 --- lib/libbe/be.c | 64 +++++++++++++++++++++++++++++++++--------- lib/libbe/be.h | 1 + lib/libbe/libbe.3 | 9 +++++- lib/libbe/tests/Makefile | 2 +- lib/libbe/tests/be_create.sh | 9 ++++++ lib/libbe/tests/target_prog.c | 11 +++++--- sbin/bectl/bectl.8 | 14 ++++++++- sbin/bectl/bectl.c | 16 +++++++++-- sbin/bectl/tests/bectl_test.sh | 8 ++++++ 9 files changed, 111 insertions(+), 23 deletions(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 4a7c2e43b2c1..2147435ebf9b 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -891,6 +891,54 @@ be_create_from_existing(libbe_handle_t *lbh, const char *bename, const char *old return (set_error(lbh, err)); } +/* + * Create a zfs dataset and map the return to libbe error. + */ +static int +be_zfs_create(libzfs_handle_t *lzh, const char *buf, zfs_type_t t, + nvlist_t *props) +{ + int err; + + if ((err = zfs_create(lzh, buf, t, props)) != 0) { + switch (err) { + case EZFS_EXISTS: + return (BE_ERR_EXISTS); + case EZFS_NOENT: + return (BE_ERR_NOENT); + case EZFS_BADTYPE: + case EZFS_BADVERSION: + return (BE_ERR_NOPOOL); + case EZFS_BADPROP: + default: + /* We set something up wrong, probably... */ + return (BE_ERR_UNKNOWN); + } + } + + return (BE_ERR_SUCCESS); +} + + +/* + * Create an empty boot environment. + */ +int +be_create_empty(libbe_handle_t *lbh, const char *bename) +{ + char buf[BE_MAXPATHLEN]; + int err; + + if ((err = be_validate_name(lbh, bename)) != 0) + return (set_error(lbh, err)); + + if ((err = be_root_concat(lbh, bename, buf)) != 0) + return (set_error(lbh, err)); + + err = be_zfs_create(lbh->lzh, buf, ZFS_TYPE_FILESYSTEM, NULL); + return (set_error(lbh, err)); +} + /* * Verifies that a snapshot has a valid name, exists, and has a mountpoint of @@ -1118,21 +1166,9 @@ be_create_child_noent(libbe_handle_t *lbh, const char *active, nvlist_add_string(props, "mountpoint", child_path); /* Create */ - if ((err = zfs_create(lbh->lzh, active, ZFS_TYPE_DATASET, + if ((err = be_zfs_create(lbh->lzh, active, ZFS_TYPE_DATASET, props)) != 0) { - switch (err) { - case EZFS_EXISTS: - return (set_error(lbh, BE_ERR_EXISTS)); - case EZFS_NOENT: - return (set_error(lbh, BE_ERR_NOENT)); - case EZFS_BADTYPE: - case EZFS_BADVERSION: - return (set_error(lbh, BE_ERR_NOPOOL)); - case EZFS_BADPROP: - default: - /* We set something up wrong, probably... */ - return (set_error(lbh, BE_ERR_UNKNOWN)); - } + return (set_error(lbh, err)); } nvlist_free(props); diff --git a/lib/libbe/be.h b/lib/libbe/be.h index d3f47c0604fe..18be067c4410 100644 --- a/lib/libbe/be.h +++ b/lib/libbe/be.h @@ -65,6 +65,7 @@ bool be_is_auto_snapshot_name(libbe_handle_t *, const char *); /* Bootenv creation functions */ int be_create(libbe_handle_t *, const char *); int be_create_depth(libbe_handle_t *, const char *, const char *, int); +int be_create_empty(libbe_handle_t *, const char *); int be_create_from_existing(libbe_handle_t *, const char *, const char *); int be_create_from_existing_snap(libbe_handle_t *, const char *, const char *); int be_snapshot(libbe_handle_t *, const char *, const char *, bool, char *); diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index 4331713e9227..f65da5ef1090 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 11, 2025 +.Dd February 4, 2026 .Dt LIBBE 3 .Os .Sh NAME @@ -69,6 +69,9 @@ .Fn be_create_depth "libbe_handle_t *hdl" "const char *be_name" "const char *snap" "int depth" .Pp .Ft int +.Fn be_create_empty "libbe_handle_t *hdl" "const char *be_name" +.Pp +.Ft int .Fn be_create_from_existing "libbe_handle_t *hdl" "const char *be_name" "const char *be_origin" .Pp .Ft int @@ -282,6 +285,10 @@ A depth of '0' is no recursion and '-1' is unlimited (i.e., a recursive boot environment). .Pp The +.Fn be_create_empty +function creates an empty boot environment with the given name. +.Pp +The .Fn be_create_from_existing function creates a boot environment with the given name from the name of an existing boot environment. diff --git a/lib/libbe/tests/Makefile b/lib/libbe/tests/Makefile index dfe49bd7f3e5..57e33b75aabc 100644 --- a/lib/libbe/tests/Makefile +++ b/lib/libbe/tests/Makefile @@ -20,6 +20,6 @@ CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY .include diff --git a/lib/libbe/tests/be_create.sh b/lib/libbe/tests/be_create.sh index e1342368995d..e39ce1a0ccb4 100755 --- a/lib/libbe/tests/be_create.sh +++ b/lib/libbe/tests/be_create.sh @@ -174,6 +174,15 @@ libbe_create_body() # the child dataset should exist atf_check -o not-empty \ zfs list "${zpool}/ROOT/relative-snap/usr" + + # test empty BE creation. + atf_check $prog "${zpool}/ROOT" \ + empty \ + ignored \ + 0 + # the dataset should exist + atf_check -o not-empty \ + zfs list "${zpool}/ROOT/empty" } libbe_create_cleanup() diff --git a/lib/libbe/tests/target_prog.c b/lib/libbe/tests/target_prog.c index 4c79d1a30714..83ef68ab2890 100644 --- a/lib/libbe/tests/target_prog.c +++ b/lib/libbe/tests/target_prog.c @@ -27,6 +27,7 @@ #include #include +#include /* * argv[1] = root boot environment (e.g. zroot/ROOT), @@ -36,15 +37,17 @@ */ int main(int argc, char *argv[]) { - libbe_handle_t *lbh; + libbe_handle_t *lbh; if (argc != 5) - return -1; + return (-1); - if ((lbh = libbe_init(argv[1])) == NULL) - return -1; + if ((lbh = libbe_init(argv[1])) == NULL) + return (-1); libbe_print_on_error(lbh, true); + if (strcmp(argv[2], "empty") == 0) + return (be_create_empty(lbh, argv[2])); return (be_create_depth(lbh, argv[2], argv[3], atoi(argv[4]))); } diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 0e08b3383e9a..7614bea2ddad 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd June 13, 2025 +.Dd February 4, 2026 .Dt BECTL 8 .Os .Sh NAME @@ -33,6 +33,11 @@ .Ar beName@snapshot .Nm .Op Fl r Ar beroot +.Cm create +.Fl E +.Ar newBeName +.Nm +.Op Fl r Ar beroot .Cm destroy .Op Fl \&Fo .Ar beName Ns Op Cm @ Ns Ar snapshot @@ -181,6 +186,13 @@ for a discussion on different layouts. .Pp No new boot environment is created with this subcommand. .It Xo +.Cm create +.Fl E +.Ar newBeName +.Xc +Create a new empty boot environment named +.Ar newBeName . +.It Xo .Cm destroy .Op Fl \&Fo .Ar beName Ns Op Cm @ Ns Ar snapshot diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 28483dae17b2..7f462984267f 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -53,6 +53,7 @@ usage(bool explicit) "\tbectl [-r beroot] check\n" "\tbectl [-r beroot] create [-r] [-e {nonActiveBe | beName@snapshot}] beName\n" "\tbectl [-r beroot] create [-r] beName@snapshot\n" + "\tbectl [-r beroot] create -E beName\n" "\tbectl [-r beroot] destroy [-Fo] {beName | beName@snapshot}\n" "\tbectl [-r beroot] export sourceBe\n" "\tbectl [-r beroot] import targetBe\n" @@ -184,15 +185,19 @@ bectl_cmd_create(int argc, char *argv[]) char snapshot[BE_MAXPATHLEN]; char *atpos, *bootenv, *snapname; int err, opt; - bool recursive; + bool empty, recursive; snapname = NULL; + empty = false; recursive = false; - while ((opt = getopt(argc, argv, "e:r")) != -1) { + while ((opt = getopt(argc, argv, "e:Er")) != -1) { switch (opt) { case 'e': snapname = optarg; break; + case 'E': + empty = true; + break; case 'r': recursive = true; break; @@ -221,6 +226,13 @@ bectl_cmd_create(int argc, char *argv[]) */ *atpos++ = '\0'; err = be_snapshot(be, bootenv, atpos, recursive, NULL); + } else if (empty) { + if (snapname || recursive) { + fprintf(stderr, + "bectl create: -E cannot be combined with -e or -r\n"); + return (usage(false)); + } + err = be_create_empty(be, bootenv); } else { if (snapname == NULL) /* Create from currently booted BE */ diff --git a/sbin/bectl/tests/bectl_test.sh b/sbin/bectl/tests/bectl_test.sh index 8084b0a173f4..6aa94127aa36 100755 --- a/sbin/bectl/tests/bectl_test.sh +++ b/sbin/bectl/tests/bectl_test.sh @@ -126,6 +126,14 @@ bectl_create_body() zfs list "${zpool}/ROOT/recursive/usr" atf_check -o not-empty \ zfs list "${zpool}/ROOT/recursive-snap/usr" + + # Test creation of an empty BE. + atf_check bectl -r ${zpool}/ROOT create -E empty + atf_check -o inline:"-\n" zfs get -H -o value origin ${zpool}/ROOT/empty + atf_check -e match:"cannot be combined" -s not-exit:0 \ + bectl -r ${zpool}/ROOT create -E -e not-allowed empty-existing + atf_check -e match:"cannot be combined" -s not-exit:0 \ + bectl -r ${zpool}/ROOT create -E -r empty-recursive } bectl_create_cleanup() { From nobody Thu Feb 5 03:59:33 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f63Px4gjkz6R83p for ; Thu, 05 Feb 2026 03:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f63Px3qnHz43Lt for ; Thu, 05 Feb 2026 03:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M1mCsCBtDvCXoCo5baLlm2hx5L3Va8dKZn7VhrRPzrI=; b=fnnNa7jWApuAbH0KHGVbEXrQRApo6edIScaSNfLsgQJeuq6suQVWw8EzgkPl5mdW3fAwke ivu3KWAWMczdjI5CuwIxKUKgh80it/Dtmj3SqLWsnNyDTiP4sGmu26UnHCXgZLchsD4NXe A0jAminZDN8GWyI26yhMuWhK4whUFNJ/gAJZFqkGfKsT+GsDaX4bE1aH9xey8o9hSt1rT0 DQv6kSgCJn2DF7ZSFncoB4yhLgvmiYRF2SS4NeNZPGKSyZqdezYdb9ehCLATmOkKpe/crr MwAqDstwlOYsu+j5gYIPPrYyQ0VbYAw4CZicBDFn0nEcUnDGAQypSjjvznDveA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770263973; a=rsa-sha256; cv=none; b=mu3Y77IcXdhAeR36A15HavtgIQx4aQ42ec2N3tj1fKIFmgKg4tceqmDIS4M49pCyPxNczK iCAvuedLr2eQehTiiCV6DOkms4iZbGFDdHHu7mCs6xtxZ0ZQf2ah/GFNkHxDq/dGRzu+Fd fiE8XA6RdE9txx+oD4fL4zUE9kAH0lVMfp0bq5qPVmAhA07GiauKtLqg8aL0XZHlvIiIEW j2nKQdQmuqJ8GGY1PnA1ruiTKVZuHubVXgKGo9OoitM2N2rQGNIZVdU8q2Uffi82mw8Xaz aHD0uzADPUS5aKZ6xwBkr7A4Vts09WfNPX/58PqW3Y2RYQEAR5m8qbJXh1Ty0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770263973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M1mCsCBtDvCXoCo5baLlm2hx5L3Va8dKZn7VhrRPzrI=; b=ZM3lXcKQakgT6z5CFomwwX2GeojQlbIClyCmkXiF6IQgL1XT0NSLXy5g91EWM8Nf72iCSy VKovJBmcGufsAEQVs6mzWAovwf1GLRggrKqQzJ+KN007j4XGfSTruqQL395yDArVMFTBYB jOFt8VVOyCfpxkQwnqeSBFPOWSTv2vrfc6uzJsaPtMku7nWQbSSUhon0BHQBsEn+uGYAIr jjTQl11iJlws4O6u+p6Z1wIUHA5JJjt1UM/bmIvFpvVPHHVHwA2DfuErBHu/xiNO2qHoCR 9HP2dwuu1EzuCAIPwsBkdi8QMbRqZerUDhy0QnDTR8QFT+50xDvsJfO9doC+eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f63Px3Jn0z1RcV for ; Thu, 05 Feb 2026 03:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45a4e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:59:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Pavel Knoblokh From: Kyle Evans Subject: git: abf911af2272 - main - pkg: Fix mirror type parsing and service discovery List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abf911af22729858cc876231e7970eff6aefbb9d Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:59:33 +0000 Message-Id: <698415a5.45a4e.721a5f80@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=abf911af22729858cc876231e7970eff6aefbb9d commit abf911af22729858cc876231e7970eff6aefbb9d Author: Pavel Knoblokh AuthorDate: 2026-02-05 03:59:21 +0000 Commit: Kyle Evans CommitDate: 2026-02-05 03:59:21 +0000 pkg: Fix mirror type parsing and service discovery Signed-off-by: Pavel Knoblokh Reviewed by: emaste, imp, kevans Fixes: dc4581589a3 ("pkg: clean support for repositories") Closes: https://github.com/freebsd/freebsd-src/pull/1989 --- usr.sbin/pkg/config.c | 3 ++- usr.sbin/pkg/pkg.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index 6649e75b7f6b..8405a4c658fb 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -328,7 +328,8 @@ parse_mirror_type(struct repository *r, const char *mt) { if (strcasecmp(mt, "srv") == 0) r->mirror_type = MIRROR_SRV; - r->mirror_type = MIRROR_NONE; + else + r->mirror_type = MIRROR_NONE; } static void diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 7b0a67e69a4c..33a404474cf2 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -334,6 +334,12 @@ fetchfail: } cleanup: + fetchFreeURL(u); + while (mirrors != NULL) { + current = mirrors; + mirrors = mirrors->next; + free(current); + } if (remote != NULL) fclose(remote); From nobody Thu Feb 5 04:40:32 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f64KL3VYCz6RC57 for ; Thu, 05 Feb 2026 04:40: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f64KK3n5Rz46W3 for ; Thu, 05 Feb 2026 04:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770266437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyWxmh2i8Ngrsf1DhSZ+kEYPOVG8+d8rJ/FaWvsnh/s=; b=v50um0KCqcgr3oXQRO7S3rWxLDthqNNEeMsS3aufOroCiQi5YLtgVZ7YQlE3sY59cTmFhr Szen0axyUdJBrSMHNILZqS8GOKRxMxwt9mvrrasxPCorQ2jFQNQe8b/oRZi46WEoa7rPYI HEq9hWGFXm6cUHmqPnWJ7rEGVr/1kuIvjcGLiDK86gqWf6J43M22Mqw/eKb3JHXmmeBT/s lupcP5lHdhbj7ISFcosKO/HGWWFmuFV1R2QoXCO3BsW2S9nwmGn3h6qb/a91EfDMjxkZ18 nD8JEHH3QOA7XePS0NX8IRoHQBbmAkOHoDDratZuRA6e8+BXbyWqPp8iw0K1XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770266437; a=rsa-sha256; cv=none; b=F57cyaIj24o8U9cWd3nJscovv/4DO0NDvfQYpFQlMy7TXJ4YjNNBmLOlJcisw0uQtqWO9Q bvWffUB4L7Y4COu7KAmv2LcnK5979RrKhc0Bd77vJy9A2kgailjwfb0p2TTOfpK9W824U9 OTRD30qzHPZMr6c/e7s2LsPM/R4tIyp1M/aCg3lXFjeu2T8DDHRnAK+BYI4L8EXvXvMkYK XrsY11cOQNkj8miWeUZUX59NgDF9DQuzDGXVRvbXZ4LdxTtA6AE5vFPcMU3xijpAxV4j7Z 2IIY71ULTokMGsQ0rqQmHed3aDRrcpftYrjjTwtt9Smdt09RBZVB0ifn5UfsjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770266437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyWxmh2i8Ngrsf1DhSZ+kEYPOVG8+d8rJ/FaWvsnh/s=; b=s6qzpHtpVskvTWVueTUSKq3sLNlcRcRMIqyZ8iuyZ4uCxAqWPmG65Yf9nokzX0VPNdrjEC vUrbBG4D6H2joFl0YO2UqM437uBx9GlAk0RSyQmrtSma5nzSV/pTEVv50M3YRfur0L9FSc ixyBCW2TbhErpbaoPJUsIpL21nTlApWDABcV/rpCp5fa7nK6VhTd89Ah15kzIG1RM9D6SP meJwGuDus9Mkrrv1wZ1Ij+ZJESsnBlyCNhrD4/YR6MXa1x/TFUYtwuX9RAqNKGm3rd4DfR /y+Dq9r2HEMddlw+3UV0Hk3XDLW2LSDhN/YAVO/Y2x0CtGzz5Vo9dmK0zdZ6eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f64KK24JxzHt for ; Thu, 05 Feb 2026 04:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d549 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 04:40:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: cc702c78f70f - main - Unbreak the build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc702c78f70f972cf2f8ea008752d96df1989988 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 04:40:32 +0000 Message-Id: <69841f40.1d549.3be81fe4@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=cc702c78f70f972cf2f8ea008752d96df1989988 commit cc702c78f70f972cf2f8ea008752d96df1989988 Author: Enji Cooper AuthorDate: 2026-02-05 04:38:31 +0000 Commit: Enji Cooper CommitDate: 2026-02-05 04:40:24 +0000 Unbreak the build Add the missing comma in the `device_printf` statement. MFC after: 1 week MFC with: 9c666de5b Fixes: 9c666de5b ("Make message added for Darwin OSI quirk more terse") --- sys/dev/acpica/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index ac02e1a349d3..bb7c93bcc256 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4963,7 +4963,7 @@ acpi_reset_interfaces(device_t dev) } else { device_printf(dev, "could not install " - "Darwin OSI: %s\n" + "Darwin OSI: %s\n", AcpiFormatException(status)); } } From nobody Thu Feb 5 11:17:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6F6w6W4Vz6FThH for ; Thu, 05 Feb 2026 11: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6F6w46W2z3lbH for ; Thu, 05 Feb 2026 11: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=1770290232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q/bzHECbZvtFmVDZATTz/kNBo14RZofV2BOgKiaIPa4=; b=udyDML6o5WfxtkIV0i3sROTj9auBDVL3fF5gtbpRyVm5ClsEX6yJjPLz93UHvLcD/O+mD8 jR/+ITLp3lXlc4tVN0+f9iukaz8b0Z4N656uXWW+UgAKqpau2Loq+jRmXc7lL7rpnN62x2 xSsuu6ECjIG4RdMGsJrs1rEn7EgVnh/9DiTyZSV9fzFOOBx7rbgKiEUxKexSPj/odXtJcm 057bofgS1t6Jkr1iV9T/85znPUqfoK//RsWXdu9OTxWGY4bd+QsszBzkGPDKRNcS7z6cFr KtPmJiD23t+G7YmlmkECICHwS1TWgS0lBwbHfkapHx1TNkWb7cks+5Vp/osyZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770290232; a=rsa-sha256; cv=none; b=IZDtCn5kx1/phMIJN3v4UBlxqaCwyh93E0yGkp6SZllodsnsHfx0FHG4fidebeHw/oW8xe dKTQiHYywTQEFdzqqc801Fllm9IEFvERQYdohsJLFZ7rxbWaQboc+/rsb38LCv8Y9iTAz2 U33rqbYNbUuMWTRCWrosVRBOZvGt0Y+UoPcUrdgbH+n6o+w2qtFJFUAgdPaYwFy6f5icR6 NoNjj2KuQ7Ts7jXv6BzK5NniN+4xd2IMDVovLhf/T/wojf8Du/RQi0tpjANxAHJnConT92 BaPpyE/u2wQwVH0J/ynI3EkAhTKQaIzbRxAJIu5gvrRLnOzRu02jhzJV7RJ7nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770290232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q/bzHECbZvtFmVDZATTz/kNBo14RZofV2BOgKiaIPa4=; b=irolhOlU351ACPpzR5mWiqlJt5q4cqt60QCAWsV/9kOyRiq07WilbRiOVNGCjxtpKO0qtz zIrS4CWVcdci7+XLcLuPgTX7OsLQAe9Fwl+GZ5iPC96vEnxgThr8wcv+HHm6eDrxBlgxoX ButEi+OWyFNON+VewZJmFOA43gtwVSTafrZZHjbgPImPvo/cjINaWbpnSAmacZQ8j8rFd2 U2xKR80pjr7Y/WiwrvCBKgmuNVwPCK1r+ebwt0lnne3HEZs53WkEAC572wScN0WlHxkKac Pr+Q+gMddgMuynKCZvHWl0kMojVFUikJump78GNASruMJwEA5IgJraVRkhaNWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6F6w3QDGzBJQ for ; Thu, 05 Feb 2026 11:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d369 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 11:17:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: b8d55a86995b - main - touch: Fix setting time of created file if fstat() fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8d55a86995b5a8db5d1651c8dc9fc5093b67d2c Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 11:17:12 +0000 Message-Id: <69847c38.1d369.7d71508d@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=b8d55a86995b5a8db5d1651c8dc9fc5093b67d2c commit b8d55a86995b5a8db5d1651c8dc9fc5093b67d2c Author: Aymeric Wibo AuthorDate: 2026-02-04 20:58:13 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-05 11:16:06 +0000 touch: Fix setting time of created file if fstat() fails Previously, if creating the file and fstat() fails, we would've ended up calling utimensat() on that file anyways with whatever was in sb. Not that this is an error likely to happen... We don't check for the return value of close() as we aren't writing anything to the file and the file is always created on success of open(). Reviewed by: kevans Approved by: kevans Fixes: cb54c500d0e1 ("touch: don't leak descriptor if fstat(2) fails") Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55117 MFC after: 1 week --- usr.bin/touch/touch.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 70257e320a60..2be2e369596c 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -163,19 +163,14 @@ main(int argc, char *argv[]) /* Create the file. */ fd = open(*argv, O_WRONLY | O_CREAT, DEFFILEMODE); - if (fd == -1) { + if (fd < 0 || fstat(fd, &sb) < 0) { rval = 1; warn("%s", *argv); + if (fd >= 0) + (void)close(fd); continue; } - if (fstat(fd, &sb) < 0) { - warn("%s", *argv); - rval = 1; - } - if (close(fd) < 0) { - warn("%s", *argv); - rval = 1; - } + (void)close(fd); /* If using the current time, we're done. */ if (!timeset) From nobody Thu Feb 5 14:02:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6JnW2Zs1z6QZy7 for ; Thu, 05 Feb 2026 14:02: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6JnV5Srrz462k for ; Thu, 05 Feb 2026 14:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770300142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JucA4C/8Ml4fSXJ7panRciW3aOwtN4c7eiEUwmIxOTw=; b=TxOYu0i2dtluhGHltGYJGbNVgfHN/NjzAyDXHgJBdKBsKNki8oDT7egEmi0TaPCT10UXzn WAP2iTVt8XXT+Y0Vak8xgs5XTGd+iQzWF3/lfpknn3VWbjtQ9nZsvUVM1+7zEkWx7Lya0h vxLE10Ryv6pET8K0HuiR3qLi8ihAb6B6/ZEhWcRc4VSgCq0zU/KUeaMQ+Zb+CPrj8jdYwE tupBH5m6yeaTnnEZw8TUm83VR6ss/5krkxaT+39aBbSSSyHBHRr+n+ZACgPY+lJfU/sOhZ L6IjwWlISxuVHR59kW8rZnz9WP6QCwG/piHqzJsaUUNvAoJWdv2nde7/Rosx/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770300142; a=rsa-sha256; cv=none; b=MRp16OQrupHuaTojButDKlsQXbP/8wWInQtYbDsl0jMqiISWmIcl52qIGkhhOVDBSLVk4P XpRM6Q/FGo6NbwvBzZukNU8DHmUTlXahC9ao9uZGY25BJg3EsKFJeSC66C7PayqzYMwA2i xXmj/pjj2vuselV3Q6YFkOQpvgqMHH9kyQJ6lNQv04n9998uL/rTh6nRItMIZeY870bdRn tMYS9PdkUVO7gLaaBmPQ3omb7zWOmCeoamxDWxfmLlYWeM5qa+3Ctr/AVtjQwCq9X7orUP 7nynfBTT8EHZ0gAvK183rlFuADydgya2T9Sa64haiL6RMHg0YsiZFZjlboyxUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770300142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JucA4C/8Ml4fSXJ7panRciW3aOwtN4c7eiEUwmIxOTw=; b=vD/Lf+9t0gR3QWor1abwBT6cSQIv4B36nolVU+8/Ve/98KTrlnuGDMWMLVxqibkOJdJl36 wyRfmnErjXLQqBfzkKOm4KRcCoMYzP6H3bed0vt6JWng25M1d7ssL5UpVzS1ARPyIhLjW1 43lKKtt8B/Z626wT7hU9Sd2ONsh2zupW1VGESBkOzuqnPVWujvGIFDcXbnsEXAXIesD5al aV91oxpRyNvbK4cgcpCCCep/9qDolwEY1zbSz4HLLFQmO2HKlPSY/Tg+lYx2aT/v4y0ZGb 1DzZaV07fA2Vlv2jGHVAufTvkrUhH+D688GWNpcJGXT6w7eptwt5Uvr3bQ6XTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6JnV4zjVzYvF for ; Thu, 05 Feb 2026 14:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38096 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:02:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c12d6cc326b7 - main - arm64: Attach the vgic even if there is no ITS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c12d6cc326b70326d776324067bdf07e4fa328aa Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:02:22 +0000 Message-Id: <6984a2ee.38096.5a1218ca@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c12d6cc326b70326d776324067bdf07e4fa328aa commit c12d6cc326b70326d776324067bdf07e4fa328aa Author: Andrew Turner AuthorDate: 2026-01-19 14:24:14 +0000 Commit: Andrew Turner CommitDate: 2026-01-21 17:25:04 +0000 arm64: Attach the vgic even if there is no ITS If there is no ITS device so no memory resources the gicv3 driver would exit attaching early. This caused the vgic driver to also not be attached, even if it could. Reported by: novel@ Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54791 --- sys/arm64/arm64/gic_v3_fdt.c | 57 +++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c index 871516145168..a71114881906 100644 --- a/sys/arm64/arm64/gic_v3_fdt.c +++ b/sys/arm64/arm64/gic_v3_fdt.c @@ -86,7 +86,7 @@ EARLY_DRIVER_MODULE(gic_v3, ofwbus, gic_v3_fdt_driver, 0, 0, /* * Helper functions declarations. */ -static int gic_v3_ofw_bus_attach(device_t); +static void gic_v3_ofw_bus_attach(device_t); /* * Device interface. @@ -193,12 +193,7 @@ gic_v3_fdt_attach(device_t dev) * GIC will act as a bus in that case. * Failure here will not affect main GIC functionality. */ - if (gic_v3_ofw_bus_attach(dev) != 0) { - if (bootverbose) { - device_printf(dev, - "Failed to attach ITS to this GIC\n"); - } - } + gic_v3_ofw_bus_attach(dev); if (device_get_children(dev, &sc->gic_children, &sc->gic_nchildren) != 0) sc->gic_nchildren = 0; @@ -298,7 +293,7 @@ gic_v3_ofw_fill_ranges(phandle_t parent, struct gic_v3_softc *sc, * Collects and configures device informations and finally * adds ITS device as a child of GICv3 in Newbus hierarchy. */ -static int +static void gic_v3_ofw_bus_attach(device_t dev) { struct gic_v3_ofw_devinfo *di; @@ -313,8 +308,13 @@ gic_v3_ofw_bus_attach(device_t dev) if (parent > 0) { rv = gic_v3_ofw_fill_ranges(parent, sc, &addr_cells, &size_cells); - if (rv != 0) - return (rv); + if (rv != 0) { + if (bootverbose) { + device_printf(dev, + "Failed to attach ITS to this GIC\n"); + } + goto vgic; + } /* Iterate through all GIC subordinates */ for (node = OF_child(parent); node > 0; node = OF_peer(node)) { @@ -369,28 +369,31 @@ gic_v3_ofw_bus_attach(device_t dev) sc->gic_nchildren++; device_set_ivars(child, di); } - } - /* - * If there is a vgic maintanance interrupt add a virtual gic - * child so we can use this in the vmm module for bhyve. - */ - if (OF_hasprop(parent, "interrupts")) { - child = device_add_child(dev, "vgic", DEVICE_UNIT_ANY); - if (child == NULL) { - device_printf(dev, "Could not add vgic child\n"); - } else { - di = malloc(sizeof(*di), M_GIC_V3, M_WAITOK | M_ZERO); - resource_list_init(&di->di_rl); - di->di_gic_dinfo.gic_domain = -1; - di->di_gic_dinfo.is_vgic = 1; - device_set_ivars(child, di); - sc->gic_nchildren++; +vgic: + + /* + * If there is a vgic maintanance interrupt add a virtual gic + * child so we can use this in the vmm module for bhyve. + */ + if (OF_hasprop(parent, "interrupts")) { + child = device_add_child(dev, "vgic", DEVICE_UNIT_ANY); + if (child == NULL) { + device_printf(dev, + "Could not add vgic child\n"); + } else { + di = malloc(sizeof(*di), M_GIC_V3, + M_WAITOK | M_ZERO); + resource_list_init(&di->di_rl); + di->di_gic_dinfo.gic_domain = -1; + di->di_gic_dinfo.is_vgic = 1; + device_set_ivars(child, di); + sc->gic_nchildren++; + } } } bus_attach_children(dev); - return (0); } static struct resource_list * From nobody Thu Feb 5 14:14:39 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6K3g3xFqz6QbdL for ; Thu, 05 Feb 2026 14:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6K3g3GYjz3Cgx for ; Thu, 05 Feb 2026 14:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770300879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lu4UYqbs1qzVJLGCSm6ayFcJ7gwFyFcX0++VMjugpYU=; b=AJfCqMutCsfg7MWpgFJModCdXP3wpt9nAEcqG6vepCfbJnwN4KfVgeki2YywKKmt7xG2NC ZTZC8bGWBUw0j1n15ypej7jW5qvDwSyauvWq0z0IhagDlY8E/UMBvtBABZvQ2k3yNRLSVb I9pCH1JTrRMrfiAugly1kf091YGyLeBcSc3vEdkZ+Rnfnl7Z2j/ov722iz6/g8lThAsvFm OkPQRMBDZHbXWYcmYsY9/nfrKq0DggXYBGzFKU/v3xzVDYbbEsbxHR6qQ2OEKhyMkKk+zu 73GpvDnKFYnDElbkLFaPZoswPSX0yShlfVArEBePcx7AaaxnxAe1uAR60ttCew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770300879; a=rsa-sha256; cv=none; b=ntCJN6W1fd7779Dk1oyVSItvSPhXcuajIq4BZ6+lwchgR34+VcIiQIRMj7afqhbSHsdlj4 LEFoqKe6U68LkDrqyBuQmrQzk+zbfpXIfB8UZtQEUGaZFXJ7sIB9vvJRFwBObPyq2OWyY/ lJqRvBHOCflF/oUmNCp5R+MeMVg1JIu0IvtXypU/rqsJF4lmg1U7v/NuYo6ozBR3aOcBWg 4tjATIA1W0XK3PxuzmlZZFetdNGtt86SuOmeq3szdPIUlwl5+IJvHV3D1wJglHSdUzIMAj QYry/Ol1xevoW43qKoLIyLuiqH7i5cKLF2kHRDbWmKHbAI+OEHKXjM9oAOVf8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770300879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lu4UYqbs1qzVJLGCSm6ayFcJ7gwFyFcX0++VMjugpYU=; b=wmOYIdEq1YA7RLO/84hcv1m81mHoIaqfC3xYLKGFsF10ixhvbBLjOuhl1qtWM1HBKk2nND zSjCY3k5Y1mSjtf9M/LhrLeVPqW45RQjLfGKAnVDtv/46ZTC7nHtj89p2s+HG8EMq3rptD 5L7C2T4A0Z6w+DAzVC/2iLkKcc574cb93Bb54bBa+YkMfO0JYHXTdX+5fyDjEkoi3MMZdF pKQ7Zr2lCq5ea1iCFyODU46wOj4NuuYTyp5d76LZADLrDCXT8FTOdZP7xS1O1Ma65mNdK5 mHyVj00d+2wwBK6ajqKVUnEFfzSmDRi27IogEcF/DvIiQ3ihpeCO7M6INN/HZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6K3g2pv9zZCN for ; Thu, 05 Feb 2026 14:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 371e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:14:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: acazuc From: Ed Maste Subject: git: 2e94e1631ef5 - main - bnxt: set hardware checksum only if required List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e94e1631ef517f5495e25d7fa22c95f7dca0dc6 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:14:39 +0000 Message-Id: <6984a5cf.371e3.fcac435@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e94e1631ef517f5495e25d7fa22c95f7dca0dc6 commit 2e94e1631ef517f5495e25d7fa22c95f7dca0dc6 Author: acazuc AuthorDate: 2025-11-27 10:29:34 +0000 Commit: Ed Maste CommitDate: 2026-02-05 14:07:49 +0000 bnxt: set hardware checksum only if required The test condition in the bnxt driver for TCP/UDP transmit hardware checksum offload is invalid: only the TCP / UDP csum bits should be tested Only the relevant ipi_csum_flags bits are now tested Reviewed by: tuexen Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D53941 --- sys/dev/bnxt/bnxt_en/bnxt_txrx.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt_txrx.c b/sys/dev/bnxt/bnxt_en/bnxt_txrx.c index 2e10de6f0174..3e867454de8a 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_txrx.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_txrx.c @@ -154,12 +154,22 @@ bnxt_isc_txd_encap(void *sc, if_pkt_info_t pi) lflags |= TX_BD_LONG_LFLAGS_LSO | TX_BD_LONG_LFLAGS_T_IPID; } - else if(pi->ipi_csum_flags & CSUM_OFFLOAD) { - lflags |= TX_BD_LONG_LFLAGS_TCP_UDP_CHKSUM | - TX_BD_LONG_LFLAGS_IP_CHKSUM; - } - else if(pi->ipi_csum_flags & CSUM_IP) { - lflags |= TX_BD_LONG_LFLAGS_IP_CHKSUM; + else { + if (pi->ipi_csum_flags & CSUM_IP) { + lflags |= TX_BD_LONG_LFLAGS_IP_CHKSUM; + } + switch (pi->ipi_ipproto) { + case IPPROTO_TCP: + if (pi->ipi_csum_flags & (CSUM_IP_TCP | CSUM_IP6_TCP)) { + lflags |= TX_BD_LONG_LFLAGS_TCP_UDP_CHKSUM; + } + break; + case IPPROTO_UDP: + if (pi->ipi_csum_flags & (CSUM_IP_UDP | CSUM_IP6_UDP)) { + lflags |= TX_BD_LONG_LFLAGS_TCP_UDP_CHKSUM; + } + break; + } } tbdh->lflags = htole16(lflags); } From nobody Thu Feb 5 14:16:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6K6M6n5Wz6Qc6n for ; Thu, 05 Feb 2026 14:16:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6K6M64CCz3DMd for ; Thu, 05 Feb 2026 14:16:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770301019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WwPFWS3MT6TN/iiVBy/CKKR7gdbi47B6Yy7njQpBqS0=; b=kRUyKDECp61FtdYBrNSmaARPVY17RXc+E5GYLhkJ0IC2Z/Rohe24ntFmcBhLvt3LTfn2iW ZHAmi2I3IRdU/msHT0kNonEqFqeHpntcxfilZBs/DguNtPFkZ3WrDuWgQwylvwAZmdRycS oJyTFYhMoZO52DtWFKpQaK/A3K6L0g0/6AavghEoiW4T/va6+5kLpljMcghs/3cm2Bb2EU rTisiBber7wtrCpCqCdVhjasiaYo1S+tBOSoOzNHnT/JogBNcKLwFg1F2kjB4JdaGhB57q njmjXkyTFLDe2Atd+QrRwU+ITclLJ08x4tKBpDrfqjvD7ywCtwDC/39Jav5qvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770301019; a=rsa-sha256; cv=none; b=MDvitIZm+RT996pjWbwQy0LQ78YuS70vL9Sp0Sv4DvD822AwIyJeW0lwaq6CS8Rv+rJRyL fX6BlU4u5AgLE3KlIp0z7y8dcMgRLVjOT3c+1X9l9Q+8pfirnJ1HbY9X2HCmBdLtILgqwv bwkRymN+BQP6+XZyZL4MqJTSqsfawI6oF4v//2lPsc0cH/YFEQkN9BUZLrhxjwdeRknT61 rgjZlFGmePDvloL0FYyn61A5WkDIVyMxZBs8fohoRVWOp8ESYOV4EUC8IIr+iBwmRIRq8i A/ta38OyHZRbWCAKmRWY2egTc1qpdeZJ8MQOrSfSfaKNkpVHzdaQr25r34XeVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770301019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WwPFWS3MT6TN/iiVBy/CKKR7gdbi47B6Yy7njQpBqS0=; b=j83iOZDfskQvEleEnCo086eoStFllI3ju1eg1W98zAYiGXCSZ7Fjs0+3+3d6T5SxunrMZh 401KCmwuVft26mpwPDVkoYTQedsv93zG3Ms/PVNgy+7jZc+5VtAJ9FlyFWJ4DmsulFr8vg 2txkh1qJBvyOW8zXkA1QYkbwny48+qcelWWD/YIbD+LGBCTP+K/GTCaispw6HMZZRYMB4R 9xIjsGqYk15yNt195s/aKCttFBOUZmrefSWGzYQbaf+uxAtzV01MdKQo1MsPBcFMBsfsm6 p3046QRdb1/fpU2VIa2nmqXwQoj3+fY0OMR9Gme6fXQPp6UysV41K++tab19Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6K6M5Ql9zZCR for ; Thu, 05 Feb 2026 14:16:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38f93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:16:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 8c40c7bb361f - main - committers-ports: Belatedly add jwb List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c40c7bb361f0c8b595bfee9dc6f8790e0eb6d68 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:16:54 +0000 Message-Id: <6984a656.38f93.3e05ae59@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=8c40c7bb361f0c8b595bfee9dc6f8790e0eb6d68 commit 8c40c7bb361f0c8b595bfee9dc6f8790e0eb6d68 Author: Alexander Ziaee AuthorDate: 2026-02-05 14:12:29 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-05 14:16:22 +0000 committers-ports: Belatedly add jwb PR: 292962 MFC after: 3 days --- share/misc/committers-ports.dot | 1 + 1 file changed, 1 insertion(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 81870cf98af5..c16ba50a19d1 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -220,6 +220,7 @@ josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/12/20"] jpaetzel [label="Josh Paetzel\njpaetzel@FreeBSD.org\n2008/09/05"] jrm [label="Joseph R. Mingrone\njrm@FreeBSD.org\n2016/09/17"] jsm [label="Jesper Schmitz Mouridsen\njsm@FreeBSD.org\n2018/06/30"] +jwb [label="Jason Bacon\njwb@FreeBSD.org\n2017/11/12"] kai [label="Kai Knoblich\nkai@FreeBSD.org\n2019/02/01"] kami [label="Dominic Fandrey\nkami@FreeBSD.org\n2014/09/09"] kbowling [label="Kevin Bowling\nkbowling@FreeBSD.org\n2018/09/02"] From nobody Thu Feb 5 14:45:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Klc5hXHz6QdwQ for ; Thu, 05 Feb 2026 14:45: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Klc2l1Dz3KHx for ; Thu, 05 Feb 2026 14:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2346XhRKLYwBfZ5h2mY3vcRy4SuUXg2pT56bcuuz30=; b=aAgOaK92TdvgeCnGEnqt6z3dLfboKz2LNRXbhO0lm6XA7aCLq5K5ppYrmUcqYFU5AuPoxe 75Ca5x4iSi9YNxb33todnYToFNorMdKRbUdKvrNp5+o0zuHbR36XEAB7AUEOjgID2EdHhN cccuqXrvDL2W3+J0aPOulzKTbqIu2OW257QU6ZAONJ0/u+kuts0fWX/y33IrL5moGmYnLC yIy3HYNRrWV1zYhFstVNxd1ceCfDowbgLrNJOYhdveXuQ57YeBiwqQAjqDz4LOqkUZ3+RS 7YCbbTLDGRbOSC6iV56YP1i+90ryvgzdquUtL6iG0xT+x30eCaiIrnwM3uIi9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302748; a=rsa-sha256; cv=none; b=F+yMqdvtqhdV5hVNJTK7P7ovn8SIuHOlnijM2D3mpAkrHP06NkqIOXA5qKEqoJhVi8pf1k eYH371vBdKwSHNgugz9ennba+3nkMnkT8E0zhYNmpbcQ2tQA5OPxH+Ww2X8icPJxsheqU+ 1S/j3UWY0xow13Bxm3YGcNDpquahrpz8QHr4hL4qX62LmMNS8z9giPGNND87NTcPMOl5gJ 8MHhEynOJgxApNS8/TLR9i23a/594gHckNeZifG4mAZ/bWV+aUUxmA/kGHPKFp0NUG0hZq mCcdWT7m6mB8QYKx+F/7PtT8dD19GALzqzSdxEDKn4TChF6cGrL+DlOKlqy4BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2346XhRKLYwBfZ5h2mY3vcRy4SuUXg2pT56bcuuz30=; b=RnyEXSg0LHEu8i+OtNdKN90xaQGGxDa7gT+QxFUoPka7zg7Dqc/zj4UOdmjyOBjUG2ylbj QMddW/rRfg93WhvYi0L7tH0ifNQW4uVeZqkW5v56LLq9uC/j4n93rgpOnAQWkKZ7LPhz/m jcI3WPm/XQfxcNHB6fEqzViDKGpg+o8v/hUEJd6s27eJdFs+9Yh2DuXt9l8HnuZipHKKho HaizbnI5X/I5uYGZfAuiM5Tda0M1jyRAC85ooU175dnYwS4+l6uDkySccyCokYZZ8zR6DW C/b6KMPPVydZv3IX+FRxVo42X+hipx2cVkRZHLGOYJ+S296yn2nxPfmcXkoQvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Klc21BjzZtL for ; Thu, 05 Feb 2026 14:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bd2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c3904a7de78c - main - diff: Fix pagination leak List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:48 +0000 Message-Id: <6984ad1c.3bd2a.7f1d98c8@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5 commit c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:53 +0000 diff: Fix pagination leak * Drop an unnecessary variable and rename pidfd to procd. * Rewinding stdout serves no purpose, so stop doing it. * Don't bother freeing memory or setting the global status right before erroring out. * Error out if dup(2) or dup2(2) fail. * In the unlikely case that our pipe is equal to stdout, we need to record that information so we don't close it when cleaning up. * Don't bother closing a descriptor before dup2(2)ing to it. * Don't forget to close the the process descriptor after reaping the child process. PR: 266592 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D55112 --- usr.bin/diff/pr.c | 22 ++++++++++------------ usr.bin/diff/pr.h | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index f254fbab28b7..189e6b34649e 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -45,7 +45,6 @@ struct pr * start_pr(char *file1, char *file2) { int pfd[2]; - int pr_pd; pid_t pid; char *header; struct pr *pr; @@ -55,13 +54,10 @@ start_pr(char *file1, char *file2) xasprintf(&header, "%s %s %s", diffargs, file1, file2); signal(SIGPIPE, SIG_IGN); fflush(stdout); - rewind(stdout); if (pipe(pfd) == -1) err(2, "pipe"); - switch ((pid = pdfork(&pr_pd, PD_CLOEXEC))) { + switch ((pid = pdfork(&pr->procd, PD_CLOEXEC))) { case -1: - status |= 2; - free(header); err(2, "No more processes"); case 0: /* child */ @@ -73,15 +69,17 @@ start_pr(char *file1, char *file2) execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); _exit(127); default: - pr->pidfd = pr_pd; /* parent */ - if (pfd[1] != STDOUT_FILENO) { - pr->ostdout = dup(STDOUT_FILENO); - dup2(pfd[1], STDOUT_FILENO); + if (pfd[1] == STDOUT_FILENO) { + pr->ostdout = STDOUT_FILENO; + } else { + if ((pr->ostdout = dup(STDOUT_FILENO)) < 0 || + dup2(pfd[1], STDOUT_FILENO) < 0) { + err(2, "stdout"); + } close(pfd[1]); } close(pfd[0]); - rewind(stdout); free(header); } return (pr); @@ -98,14 +96,14 @@ stop_pr(struct pr *pr) fflush(stdout); if (pr->ostdout != STDOUT_FILENO) { - close(STDOUT_FILENO); dup2(pr->ostdout, STDOUT_FILENO); close(pr->ostdout); } - while (pdwait(pr->pidfd, &wstatus, WEXITED, NULL, NULL) == -1) { + while (pdwait(pr->procd, &wstatus, WEXITED, NULL, NULL) == -1) { if (errno != EINTR) err(2, "pdwait"); } + close(pr->procd); free(pr); if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) != 0) errx(2, "pr exited abnormally"); diff --git a/usr.bin/diff/pr.h b/usr.bin/diff/pr.h index b2ff7e5d6798..e6abad4466a6 100644 --- a/usr.bin/diff/pr.h +++ b/usr.bin/diff/pr.h @@ -26,7 +26,7 @@ struct pr { int ostdout; - int pidfd; + int procd; }; struct pr *start_pr(char *file1, char *file2); From nobody Thu Feb 5 14:45:44 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6KlY32mnz6QdwL for ; Thu, 05 Feb 2026 14:45: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6KlY0GlSz3KL3 for ; Thu, 05 Feb 2026 14:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WxXeLXH3sDVSCQk7n6WC1l6dyRwl/E/ofjqNg/bMN0I=; b=IvDJJoMYZAgI80NoqckctRNeFtQxHmABHyfpW01d+fRZDaUbb+hu+xo0lJ1g9C7aUVtjVu ziWXECxfnSCyOMwr6f/26/hNXL/TeCUBphgbQl5KAVVF1RSa24/f3HAs8XWgqGwrtTg6lf Ta5XfKgXCl1r+KfFDv71Vt70whDpbMcK3i5zekPQzc09KorLQ1SD6oQ/z69zgpnZVkB+KV +Y0j3hAAhWUO8jWDut7Lp147R7HyrA43RGVkVRFw9qf3tyr80HyKIKCcgaAuxXNeyRM0R4 bZCYPrnkH/X+OfXB1QxwEqpP1HIgRSVwUvv9BD4tO3OgLmBtT/9cjH7PwOMcpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302745; a=rsa-sha256; cv=none; b=HCibKJwauIxL99fUqbcbtLwgPcwjc2sDn8EjGQRDIXdv+db9p0A1eQ6XNmXwCBOMZLg/Ng YOy2P3hLyiGSSFNAIP0CDgYMYKk/YCclNLBO906kBXCr9e2P5Kzrr5vpd5vSXrAG502ugN 2nhK/Q1+rzMDFjynSGLYZEEam0PdtWBf6ViVarl1aCrbbYxtJDxDMns648s+SZUQ58fGIr VDamQluVZx5iR/dMq6mLRcztAfsUu52vsQwsUGpQblCrY/Ic3AXU3z5NI+t2Hx5/ROea3c mNPySFBnY2TnaY6UkNpjDxUruBJrCNYiPo27k/FAsakBid7xI/59HoPaURL6uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WxXeLXH3sDVSCQk7n6WC1l6dyRwl/E/ofjqNg/bMN0I=; b=RjxX+P9impUjIdALkE5FhOWk41J2WS0NTQnaHz+JkkMqT/QqTAftitfpKTEpIf8ZhYp5pm jTQxjHHMWKDei6lDpgJuQWra0bcLWzkYjWhm7g4EAoK/l9YGfziAgtF9q9h135YEDMptMW fxUtXIuAnER+UEDSH3cByp3bhGkXrgYckB6zG/bC8NKKrSe4yRxCrNeE8YVQPuv2ByHcPT ZYReyEX9YkYpmU0cYZ1oUhVbUIslNCIc+CR3vgG9fmMR9h7tXWVz5V/7kTXV1hU5PEYBzd JOutRLWn3y6V8pMr8aIcMyMcV17Nnv8auoSY32oojxFXOR0guRdnmiGUHRrTLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6KlX706Qzb4j for ; Thu, 05 Feb 2026 14:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 55f160fb07ea - main - diff: Print an error message on I/O error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55f160fb07eaee977c89bdee7bdd83f4d21f5adf Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:44 +0000 Message-Id: <6984ad18.3bf10.3fef388@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=55f160fb07eaee977c89bdee7bdd83f4d21f5adf commit 55f160fb07eaee977c89bdee7bdd83f4d21f5adf Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:39 +0000 diff: Print an error message on I/O error If an error occurs while atomizing either file, immediately print an error message using the error code returned by the atomizer, and set the error bit in the exit status. PR: 292198 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55109 --- usr.bin/diff/diffreg_new.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index f29e4ad8b9ed..29882923cd0e 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -158,6 +158,7 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) const struct diff_config *cfg; enum diffreg_algo algo; cap_rights_t rights_ro; + int ret; algo = DIFFREG_ALGO_MYERS_THEN_MYERS_DIVIDE; @@ -219,12 +220,20 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) if (flags & D_PROTOTYPE) diff_flags |= DIFF_FLAG_SHOW_PROTOTYPES; - if (diff_atomize_file(&left, cfg, f1, (uint8_t *)str1, st1.st_size, diff_flags)) { + ret = diff_atomize_file(&left, cfg, f1, (uint8_t *)str1, st1.st_size, + diff_flags); + if (ret != DIFF_RC_OK) { + warnc(ret, "%s", file1); rc = D_ERROR; + status |= 2; goto done; } - if (diff_atomize_file(&right, cfg, f2, (uint8_t *)str2, st2.st_size, diff_flags)) { + ret = diff_atomize_file(&right, cfg, f2, (uint8_t *)str2, st2.st_size, + diff_flags); + if (ret != DIFF_RC_OK) { + warnc(ret, "%s", file2); rc = D_ERROR; + status |= 2; goto done; } From nobody Thu Feb 5 14:45:47 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Klb3jtpz6QdSp for ; Thu, 05 Feb 2026 14:45: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Klb1bX5z3KSr for ; Thu, 05 Feb 2026 14:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Umwj2r/sH6BLhOpo748RfJ0Bj/5Z3zU0IsyPuySZbvg=; b=VrTzghPi5yzEPCVpSFuIDjpNrKxn8XbwBSY0L5fCO/+CFTWGd/K6ZCv8MhSxYaSCbdaXlE 4zyc2LRhUtU0n3AE3jcbxfYXARL5P5b8cqf69bRmdT7vLA4safgxpmRIfHRFg79O/RIlTt XDEC46AZNbmv+dAemblkySfRac11XlrjjhydT1zK5Ya3MkZLvH4WB+fUaiui4JVCgvpWDL PDETJ/vaZk9mUaIVUDD6+qusz6dHAhKuaz8Pw4A1xuCgtGrvgEX4I5in2S+TOmXy9MqSpx 86bydoAFMIlZKVWEI+/ZyOO0LXhVSnsF5HNk7zLUnNdGktQqWyXOu4TWP0lJhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302747; a=rsa-sha256; cv=none; b=cpunFiin1N0HVSBQU7szj9o67m1F3ZPtylS4C+gAoyUH1svMgvEeLc8yWmJ0UZfthlV2at yVAJjEndesPkqfOSiIdZzwX5hDGoLWy68CnN929effbUr8weqsidFTRMwDtD784xne1W1I KphAyGHxg2ff7/+BItYjZSAFyM8gAIdhyyJvuG5PzIkfvgcWmExJs7J22T5OrRzka9Tcts yHI1G3SD9Ca8Sh1oJhFQroGghDmHZufng6nWO9F6GbPShNjRsjBBqD9aKbVltaonP199vI blHieGF8JbXSWgfVXKeYz8S7/KlnkNOpU9YgxhNbeX+tGxPwCBjOXq5HVFDGRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Umwj2r/sH6BLhOpo748RfJ0Bj/5Z3zU0IsyPuySZbvg=; b=U+wlaiLOYVnJ/4yxi4KtcztIodKlriSPQcp9rH8REoDYsMgOVVfTGAByQgMT/sAJICKF9B IRKkgHaxWipf7CRSYpztICJfpsV+/SygvR4P5FD6DzM5exrTI6/KOjtdxCEaDWzA3okfiF RbyUa/QreNjpINBw3Yk4u/GU7UF1bMC/AjyG4awaYTu8yFV04c490O+a4QalXwvWB5xKD8 eRrQmj+ZQmMVkGUCNivRfmtIJYDjMcvkohU1t//4F97+g5vegS1515whw62+gYaS557nhJ lDClVZPAnQe8yJtDOWCl6EfnkE/zFR7mDImYZqtIwlIMHRWmbHi9V1t810T6zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Klb1CQgzZtK for ; Thu, 05 Feb 2026 14:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c102 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 270492602b9b - main - diff: Add test case for pagination resource leak List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 270492602b9bd8b8fce4f021f055804978bf3f23 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:47 +0000 Message-Id: <6984ad1b.3c102.4514c77b@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=270492602b9bd8b8fce4f021f055804978bf3f23 commit 270492602b9bd8b8fce4f021f055804978bf3f23 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:47 +0000 diff: Add test case for pagination resource leak The pagination code leaks either processes or descriptors or both, depending on the exact version of the code you have. Add a test case which exercises this leak to facilitate fixing it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55111 --- usr.bin/diff/tests/diff_test.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 89348d3a8b16..a3f76602cf37 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -411,6 +411,27 @@ bigu_body() diff -Astone -U$(((1<<31)-2)) a b } +prleak_head() +{ + atf_set "descr" "Verify that pagination does not leak resources" +} +prleak_body() +{ + local n=32 + mkdir a b + for hi in $(jot -w%02x $n 0) ; do + mkdir a/$hi b/$hi + for lo in $(jot -w%02x $n 0) ; do + echo "$hi$lo" >a/$hi/$lo + echo "$hi$lo" >b/$hi/$lo + done + done + ulimit -n 1000 + ulimit -u 1000 + atf_check diff -rul a b + atf_check diff -Astone -rul a b +} + atf_init_test_cases() { atf_add_test_case simple @@ -440,4 +461,5 @@ atf_init_test_cases() atf_add_test_case dirloop atf_add_test_case bigc atf_add_test_case bigu + atf_add_test_case prleak } From nobody Thu Feb 5 14:45:46 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Klb2gy7z6Qdlh for ; Thu, 05 Feb 2026 14:45: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6KlZ0nDZz3KSq for ; Thu, 05 Feb 2026 14:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIf7WRjfELAAixCoQyjxzWvw5gvXuaZ5HiflvxHe14I=; b=rUbBBzydrj4azvxOhR+0O2IvSeEE/nIiQjOQ3vbmsmhc9f04Az8iC7tPZysOgX0XAebHdn niW92bbzLp6Gsn0kqmkx2IJTZzbJc6aCQ++/cV1afsqnHt+ixDjSbV3/HedE/W3i3hYSDZ bMvoC/2mG77xW5BgQeVNvzm6+OfU8VcXjQJ57DqPpNVdhnvj2FcR+9UZwHWq2r8XjY6k0B bMxSJvXzDp3vy7kCP9xzGNrvKIwM0la0tplZyG01UOIlJsEoTIoyLXA1eyRG78VFY7aQQx B17o+f4dZDK7EQP9/+4bKoCNwg5qCQSAR27WWg5Vy9OgSufrhEv9Rg4+gi9/8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302746; a=rsa-sha256; cv=none; b=WS2rpIhd80b5D+R3T4zykAMxsKtCuEipuOnOXhaPPG+OEfnPAKuLD394SeQZVsNFcyAcAK gbL2Ai7LjPGaQ9xS0tGAx/YnQjLHD2tBWCz7dJFg8dwxKjVmPiWh8hMh0cOsofmt7OBlPA 7sxDfM4owg7Y5kuFuhAnwhkLb4gTPbow3pyhgDp4P1uBaUlAYT+XpdRqFWC0sdeBTQiWGf MqRprlUUFPth1UN+rWX/KHbpZtSPSVZvM34q+QfAykFNqoLe6m5HhnpFjp0uynrfQxBs1R K+iuo4I9Zj+Ws3p9j6ydooFTj8DZ4UE+LXqfkc+HH5gp2TJdUBvEnd9XJRuuqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIf7WRjfELAAixCoQyjxzWvw5gvXuaZ5HiflvxHe14I=; b=RiEDmNFv1CJ0iKFDL3wn1FsiCjQ/P6LXyutGJVr7rbadWEfOFUpmMYMGGYFYO2K/NzOOJ/ 7yk8VIzBQMJDl1UB0ilp5CFGsSaOXpyXaBQeOeRjsm/vpj53SblAm9+1eJWnE5YEUwCM7X Q9UKnQvqJbQgQL2E8Wfujxr6p4AnfNSWAmi+v3VwDxv8jeIDAqF3HEm9GdADGOmYiA0mdj X/01Y8UQe315MeBJSE5MuwARTfmYkhzQVsZI0BHhJrtBHty3sVEkEyhCahzbCHixsNOwES 38vPpHWMzhqLzooxt7xfhXh9GY3H8Ow0bMwNWWqJu3QPsq3VnpT6rDfQXXdAPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6KlZ0LsBzZtJ for ; Thu, 05 Feb 2026 14:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5fc739eb5949 - main - diff: Fix integer overflows in Stone algorithm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fc739eb5949620da911db2f87ca8faedc549d3a Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:46 +0000 Message-Id: <6984ad1a.3be1d.60ebf0ea@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5fc739eb5949620da911db2f87ca8faedc549d3a commit 5fc739eb5949620da911db2f87ca8faedc549d3a Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:43 +0000 diff: Fix integer overflows in Stone algorithm Fix integer overflows that may occur when the context window is very large and add tests to exercise those conditions. PR: 267032 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55110 --- usr.bin/diff/diffreg.c | 32 +++++++++++++++++++++----------- usr.bin/diff/tests/diff_test.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index ffa5568bf442..91ae5ee6591a 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -77,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -1056,7 +1057,7 @@ change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d, { static size_t max_context = 64; long curpos; - int i, nc; + int dist, i, nc; const char *walk; bool skip_blanks, ignore; @@ -1120,8 +1121,9 @@ proceed: */ print_header(file1, file2); anychange = 1; - } else if (a > context_vec_ptr->b + (2 * diff_context) + 1 && - c > context_vec_ptr->d + (2 * diff_context) + 1) { + } else if (!ckd_add(&dist, diff_context, diff_context) && + a - context_vec_ptr->b - 1 > dist && + c - context_vec_ptr->d - 1 > dist) { /* * If this change is more than 'diff_context' lines from the * previous change, dump the record and reset it. @@ -1506,10 +1508,14 @@ dump_context_vec(FILE *f1, FILE *f2, int flags) return; b = d = 0; /* gcc */ - lowa = MAX(1, cvp->a - diff_context); - upb = MIN((int)len[0], context_vec_ptr->b + diff_context); - lowc = MAX(1, cvp->c - diff_context); - upd = MIN((int)len[1], context_vec_ptr->d + diff_context); + if (ckd_sub(&lowa, cvp->a, diff_context) || lowa < 1) + lowa = 1; + if (ckd_add(&upb, context_vec_ptr->b, diff_context) || upb > (int)len[0]) + upb = (int)len[0]; + if (ckd_sub(&lowc, cvp->c, diff_context) || lowc < 1) + lowc = 1; + if (ckd_add(&upd, context_vec_ptr->d, diff_context) || upd > (int)len[1]) + upd = (int)len[1]; printf("***************"); if (flags & (D_PROTOTYPE | D_MATCHLAST)) { @@ -1609,10 +1615,14 @@ dump_unified_vec(FILE *f1, FILE *f2, int flags) return; b = d = 0; /* gcc */ - lowa = MAX(1, cvp->a - diff_context); - upb = MIN((int)len[0], context_vec_ptr->b + diff_context); - lowc = MAX(1, cvp->c - diff_context); - upd = MIN((int)len[1], context_vec_ptr->d + diff_context); + if (ckd_sub(&lowa, cvp->a, diff_context) || lowa < 1) + lowa = 1; + if (ckd_add(&upb, context_vec_ptr->b, diff_context) || upb > (int)len[0]) + upb = (int)len[0]; + if (ckd_sub(&lowc, cvp->c, diff_context) || lowc < 1) + lowc = 1; + if (ckd_add(&upd, context_vec_ptr->d, diff_context) || upd > (int)len[1]) + upd = (int)len[1]; printf("@@ -"); uni_range(lowa, upb); diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 691b649813a1..89348d3a8b16 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -24,6 +24,7 @@ atf_test_case functionname atf_test_case noderef atf_test_case ignorecase atf_test_case dirloop +atf_test_case verylong simple_body() { @@ -380,6 +381,36 @@ dirloop_body() diff -r a b } +bigc_head() +{ + atf_set "descr" "Context diff with very large context" +} +bigc_body() +{ + echo $'x\na\ny' >a + echo $'x\nb\ny' >b + atf_check -s exit:2 -e ignore diff -C$(((1<<31)-1)) a b + atf_check -s exit:1 -o match:'--- 1,3 ---' \ + diff -C$(((1<<31)-2)) a b + atf_check -s exit:1 -o match:'--- 1,3 ---' \ + diff -Astone -C$(((1<<31)-2)) a b +} + +bigu_head() +{ + atf_set "descr" "Unified diff with very large context" +} +bigu_body() +{ + echo $'x\na\ny' >a + echo $'x\nb\ny' >b + atf_check -s exit:2 -e ignore diff -U$(((1<<31)-1)) a b + atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ + diff -U$(((1<<31)-2)) a b + atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ + diff -Astone -U$(((1<<31)-2)) a b +} + atf_init_test_cases() { atf_add_test_case simple @@ -407,4 +438,6 @@ atf_init_test_cases() atf_add_test_case noderef atf_add_test_case ignorecase atf_add_test_case dirloop + atf_add_test_case bigc + atf_add_test_case bigu } From nobody Thu Feb 5 14:45:43 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6KlX2Rtlz6QdSl for ; Thu, 05 Feb 2026 14:45: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6KlX0lBqz3KSp for ; Thu, 05 Feb 2026 14:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rms4sdlfxsLKcd2YPTpMuWIGJNmeH3agzHfznsJ3F3k=; b=nYXKsA9mGQD3wH3rNVr8CA0wrVGSp5yGh4/e9br3TQDxJSUcai/pbiCsxmWfl6ItoRBKfB w/9rDBFeBKNdIzGnm1hcrE3M3cAVXLGSusUswT9Zi8LEaYBdtfdkTFs+ChUOLvIgJBQkxS WpEiDnLuZn5DPoKHquyNxNaneSCgocxPqBtVtDddmCaFi4QRazwWCoMrcDDLDKmulKs7br zpoii9wERmDgvwK7v2oMwqF8kdPkoBoyGvYr3D89v5HZC3vJ2JIv57aJFunfMllj7zyQpK Ebia0SMehhUnrc5JnIhkEXV7CBPP+OSorjcdaY7asE8XEdrMiyvqbRcRNBas2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302744; a=rsa-sha256; cv=none; b=JFYi4OVktZJa6A3lquYbBEjKRit4VWcCjN9j82Zs8q0H/t6nzWq6YQ1ZAtJhlfacWfAhth kDocXio3c4hx+wca+z0Bckws78i2eD6grcYPFp8s8OnIdY1hiaVVj5Ae69paAukmjPGAuO z1wTIarO5Bn60ANTeyo6Wrcck0OuhT2Ip8ZESaB4mDexpvCut4gEVXY/h2fOn3llPQ6eVa k5nyz0QZyitWbTlbXgKJ0zH3rvZfOWSULCgU4RC2P2yhHTqlAIORtWYOgxJ0PPyesHmeg2 hkxiTEPBP5YyMBHfLPkFtqZMpdE+WCidvjOG4e+HLGGY1n4OgDEgE+kGML5Efw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rms4sdlfxsLKcd2YPTpMuWIGJNmeH3agzHfznsJ3F3k=; b=g/7LiRNeTfdZRaVScW0iIErrwjftqAwN8EDb+g1U38uuDdOqqra0n6+578BtNdeyQ2LBTQ YhOD1RGHGkzNUyLPyaGuRc1jvz0y5abNHgwJwbdghRGpkvjJCQ8xfDOFxVxXaNOTZdzZ4x NLGJ5dbqG8ig/WbNq1XG3h2YkB3c6P0R19CxcevCjVp03wEWYUeaLC2146tyqsAsI03mtr 9hnoWmnvkq0vFfRQA7KvGfSGkWpu+Y/W6tm19Aa9U/vrU2azWGbZLfIQZUbg5W68WBvQWa 45vo0f21o+7QhfEgUYInadZ8uX5l0IPkuXigsVMH1m7dFrFWKI+K4gXqQwl//Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6KlW6bJBzZlY for ; Thu, 05 Feb 2026 14:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c336 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a689bfa4e25a - main - libdiff: Simplify truncation detection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a689bfa4e25af8307709dc12f75b0e02a65abf18 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:43 +0000 Message-Id: <6984ad17.3c336.366a8f11@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a689bfa4e25af8307709dc12f75b0e02a65abf18 commit a689bfa4e25af8307709dc12f75b0e02a65abf18 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:34 +0000 libdiff: Simplify truncation detection * Adjust the comment to reflect the fact that SIGBUS can occur not only if the file is truncated, but also if an I/O error occurs while paging in any part of it. * Instead of setting a flag, just return EIO. * Adjust the unit test accordingly. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55108 --- contrib/libdiff/include/diff_main.h | 1 - contrib/libdiff/lib/diff_atomize_text.c | 12 +++++++----- lib/libdiff/tests/libdiff_test.c | 3 +-- usr.bin/diff/diffreg_new.c | 4 ---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/contrib/libdiff/include/diff_main.h b/contrib/libdiff/include/diff_main.h index 11700580db4b..04a6c6e748c9 100644 --- a/contrib/libdiff/include/diff_main.h +++ b/contrib/libdiff/include/diff_main.h @@ -118,7 +118,6 @@ struct diff_data { /* Flags set by file atomizer. */ #define DIFF_ATOMIZER_FOUND_BINARY_DATA 0x00000001 -#define DIFF_ATOMIZER_FILE_TRUNCATED 0x00000002 /* Flags set by caller of diff_main(). */ #define DIFF_FLAG_IGNORE_WHITESPACE 0x00000001 diff --git a/contrib/libdiff/lib/diff_atomize_text.c b/contrib/libdiff/lib/diff_atomize_text.c index d8a69733fc00..9ed611cce4b2 100644 --- a/contrib/libdiff/lib/diff_atomize_text.c +++ b/contrib/libdiff/lib/diff_atomize_text.c @@ -141,6 +141,7 @@ diff_data_atomize_text_lines_mmap(struct diff_data *d) bool embedded_nul = false; unsigned int array_size_estimate = d->len / 50; unsigned int pow2 = 1; + int ret = DIFF_RC_OK; while (array_size_estimate >>= 1) pow2++; @@ -152,13 +153,14 @@ diff_data_atomize_text_lines_mmap(struct diff_data *d) sigaction(SIGBUS, &act, &oact); if (sigsetjmp(diff_data_signal_env, 0) > 0) { /* - * The file was truncated while we were reading it. Set - * the end pointer to the beginning of the line we were - * trying to read, adjust the file length, and set a flag. + * The file was truncated while we were reading it, or an + * I/O error occurred. Set the end pointer to the + * beginning of the line we were trying to read, adjust + * the file length, and set the return value to an error. */ end = pos; d->len = end - d->data; - d->atomizer_flags |= DIFF_ATOMIZER_FILE_TRUNCATED; + ret = EIO; } while (pos < end) { const uint8_t *line_start = pos, *line_end = pos; @@ -203,7 +205,7 @@ diff_data_atomize_text_lines_mmap(struct diff_data *d) if (embedded_nul) d->atomizer_flags |= DIFF_ATOMIZER_FOUND_BINARY_DATA; - return DIFF_RC_OK; + return ret; } static int diff --git a/lib/libdiff/tests/libdiff_test.c b/lib/libdiff/tests/libdiff_test.c index e82a36f3d38a..2a7c1b37e2c2 100644 --- a/lib/libdiff/tests/libdiff_test.c +++ b/lib/libdiff/tests/libdiff_test.c @@ -45,10 +45,9 @@ ATF_TC_BODY(diff_atomize_truncated, tc) rewind(f); ATF_REQUIRE(truncate(fn, size / 2) == 0); ATF_REQUIRE((p = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fileno(f), 0)) != MAP_FAILED); - ATF_REQUIRE(diff_atomize_file(&d, &cfg, f, p, size, 0) == 0); + ATF_REQUIRE(diff_atomize_file(&d, &cfg, f, p, size, 0) == EIO); ATF_REQUIRE((size_t)d.len <= size / 2); ATF_REQUIRE((size_t)d.len >= size / 2 - sizeof(line)); - ATF_REQUIRE(d.atomizer_flags & DIFF_ATOMIZER_FILE_TRUNCATED); } ATF_TC_CLEANUP(diff_atomize_truncated, tc) { diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index d932764bb6da..f29e4ad8b9ed 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -223,14 +223,10 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) rc = D_ERROR; goto done; } - if (left.atomizer_flags & DIFF_ATOMIZER_FILE_TRUNCATED) - warnx("%s truncated", file1); if (diff_atomize_file(&right, cfg, f2, (uint8_t *)str2, st2.st_size, diff_flags)) { rc = D_ERROR; goto done; } - if (right.atomizer_flags & DIFF_ATOMIZER_FILE_TRUNCATED) - warnx("%s truncated", file2); result = diff_main(cfg, &left, &right); if (result->rc != DIFF_RC_OK) { From nobody Thu Feb 5 14:45:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Kld5vYTz6QdwT for ; Thu, 05 Feb 2026 14:45: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Kld3T5Wz3KNT for ; Thu, 05 Feb 2026 14:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S8NdRrQILqi4j8laRASa7van+ZWac740HhPdis+nE6g=; b=oMi63j4x02pEhQGKD40QHb63XuGR+a9PZRlSaJ38k+2fRhPX/6gw9Ccxr/3tkz5/MroX40 zJwDg06NSmNvAll/puzDcgTjXA9idhPI203F0dfoUWCfsFvLlPFL+Bo3iefWETFIeVxv3n aBj8QEVK9FO2GLA4eIZ++9qxcu55HtB3Z2xNyhNbV96T72X7IIHqOwfAkWuDWGZsmfp+OS Pi5aIU51H1OEqiH3HG3J4b4KpZ2PEnD3zJZYFn5YXnc/sDyOQuiHitJUb4biFPo/cflvq6 vKmvuDILr9e+NRsTP7Dq4grdrXEH6K1h7L0r/AH2ffsjuFuip4jDZmiZWGyqtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302749; a=rsa-sha256; cv=none; b=qMMqUUgMB3HdQXtlLVSSthF/MTPLZe7m4YY1fDMHEqY/XESizjQhACHdhJstpwYPAlsBkw XpCsIsjkIj06bXRb61GxYEw5t/oF/yNENpIbtXacChYhxLTbRh0W2v3JtAM9bisNegkh2H yAZHJ50tMzCWNpYat8gZtqdGja9H7fdG+SIYkRXQA0dlMAy604eA7xKiKeZlUTSnOjm2oX TPj9lPtZLpS3wxDJb+/g4Z/hsAVudWuXfR2sjjMdzQbfItv7Ry3HFbh96hny69jjsuH4HX XArGe4X3r6aGgIouf69X9E7FNBwUGFbsrn9TAo+fKVfhUGxPHwJ7qpT9DgaLEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S8NdRrQILqi4j8laRASa7van+ZWac740HhPdis+nE6g=; b=CBXCjFuPhpEz2BfSZMHDl4fw8aFCPf+ZjTjUQy2WKTuO7Xx059Io8m4tc7Y3bcqw9WBYAr GMpAXTZ2jqq0daYNh+RaqU52utdeQzq382wnZroc1xQEDEW5t9/2VcAi7prDInuduFwl/S C8f39AJf1bEwK8vOdvIHq5Jss7UxEfvc+dVnYNNUav9/yRHUWrPYSxenEm6l0e2S31Of8J /IG5/HvM6H9XnpRGxouSvVAJul78DoI7NNl99cNaIHUDHa7YNP8GKgknFUvyzTfP7LsGlt LBgASJkEm6loS8KR7TZkatboStlDJ2Gc8E9KS38WELnJLrdXcxAQEJo8HUe4nQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Kld2nfxzZtM for ; Thu, 05 Feb 2026 14:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39760 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 590126789c84 - main - diff: Don't compare a file or directory to itself List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 590126789c841d80655869bc075c8980c173dd1c Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:49 +0000 Message-Id: <6984ad1d.39760.188296e8@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=590126789c841d80655869bc075c8980c173dd1c commit 590126789c841d80655869bc075c8980c173dd1c Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:57 +0000 diff: Don't compare a file or directory to itself While here, stop abusing struct dirent for something we don't even need to store. PR: 254455 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55113 --- usr.bin/diff/diffdir.c | 14 ++++++-------- usr.bin/diff/diffreg.c | 3 +++ usr.bin/diff/tests/diff_test.sh | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index a55a2bec70ee..bd8ef73e785a 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -41,8 +41,6 @@ static void diffit(struct dirent *, char *, size_t, struct dirent *, char *, size_t, int); static void print_only(const char *, size_t, const char *); -#define d_status d_type /* we need to store status for -l */ - struct inode { dev_t dev; ino_t ino; @@ -258,7 +256,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, flags |= D_EMPTY1; memset(&stb1, 0, sizeof(stb1)); } - if (lstat(path2, &stb2) != 0) { if (!Nflag || errno != ENOENT) { warn("%s", path2); @@ -315,7 +312,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, flags |= D_EMPTY1; memset(&stb1, 0, sizeof(stb1)); } - if (stat(path2, &stb2) != 0) { if (!Nflag || errno != ENOENT) { warn("%s", path2); @@ -328,6 +324,8 @@ diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, if (stb1.st_mode == 0) stb1.st_mode = stb2.st_mode; } + if (stb1.st_dev == stb2.st_dev && stb1.st_ino == stb2.st_ino) + return; if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { if (rflag) diffdir(path1, path2, flags); @@ -337,12 +335,12 @@ diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, return; } if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode)) - dp->d_status = D_SKIPPED1; + rc = D_SKIPPED1; else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode)) - dp->d_status = D_SKIPPED2; + rc = D_SKIPPED2; else - dp->d_status = diffreg(path1, path2, flags, 0); - print_status(dp->d_status, path1, path2, ""); + rc = diffreg(path1, path2, flags, 0); + print_status(rc, path1, path2, ""); } /* diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 91ae5ee6591a..95c724817ede 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -372,6 +372,9 @@ diffreg_stone(char *file1, char *file2, int flags, int capsicum) goto closem; } + if (stb1.st_dev == stb2.st_dev && stb1.st_ino == stb2.st_ino) + goto closem; + if (lflag) pr = start_pr(file1, file2); diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index a3f76602cf37..0c8147c7ed18 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -432,6 +432,24 @@ prleak_body() atf_check diff -Astone -rul a b } +same_head() +{ + atf_set "descr" "Don't diff a file or directory with itself" +} +same_body() +{ + local n=256 + mkdir a + for hi in $(jot -w%02x $n 0) ; do + mkdir a/$hi + for lo in $(jot -w%02x $n 0) ; do + echo "$hi$lo" >a/$hi/$lo + done + done + ln -s a b + atf_check timeout 1s diff -rqs a b +} + atf_init_test_cases() { atf_add_test_case simple @@ -462,4 +480,5 @@ atf_init_test_cases() atf_add_test_case bigc atf_add_test_case bigu atf_add_test_case prleak + atf_add_test_case same } From nobody Thu Feb 5 15:11:38 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6LKR16Zdz6QjqK for ; Thu, 05 Feb 2026 15:11: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6LKR05pkz3TcY for ; Thu, 05 Feb 2026 15:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770304299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pc5l4I9vcawZg53BoC+0Ics/W+M9nCgQKbmCmOUbCOU=; b=IkPHGok/yDy4VurpbAAqXdyD8kLXGcrTP/60PuA0nlFYQ+5i3Gag5/fJpl7rV7CqBq12JP Zd/OlVRNIln34dk2Xnr5cZOXWI/+dnzx8kTIo0cUMwDMOn9dnmEmdbbF36qzPJnnMoHbcq maJSZjiERcs44VvP9gEuSnZtiaOWb5c+fHby7iG8fAuE3vkPPDZpqSqIVGBsOJjWvj+4SD XTRc4Nln01nU2w/2IdQovwSxVASi3SsamWa/xCo5UWpF9B8VeqNdnkPUlP2CyLmkuhyxJo nFRPNcpw1Cma4F+lcG4QfjFFION4mVjOWLnpzX1g8VH1fpSKUkIwlhNTwcQ6kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770304299; a=rsa-sha256; cv=none; b=GZ2ckylxFG+CcbR2mBRB03Xo/vBBJ0zxLCBH6x8aCKau5/Wm3+q6pfX3XK6ehIErlUY9x4 W9AKpR79BervfRPF7U2pH5I4L+AeKDRm99f03+pkSFOxTvC++tKhspa4K7WjDzweJIjWxR ar8qkjms/sypL3Odf5O6G9I+F7hl+oWpcNEvlo3OGw0LO4nGMv0d6NjT9Ha4gRfHGZm3Pm T8S31U4t6a62756K4bmW5nFYwlPqCBzVmMTp5oiqsBSM7mq9Jrgp40JRv2kOHZXy/9hbfl Xas/uqeQqK+2pLYC6X2LK5MLSt4JR+rjdiocFvt4fvay/G96kc3gwAXUrLFmTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770304299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pc5l4I9vcawZg53BoC+0Ics/W+M9nCgQKbmCmOUbCOU=; b=X3+8ew8zRlgNlk1msmjvJzd7dQMjbms5RixfwEuDHRwyjiaD+BipAuAHXL3RS24RiuZXg2 0jDDISEwRaxHp6Kxr+mTWb3grCBIAFngeik7jGDpVAsuFvYMMPQdlMcrUxI3j+hXMt3Q6j hNAa2f2siNahU4rL1a9RhuBRYxqNmTyK4gapTn0hVwLH1qfuoTkAn3th8ATtSXI8MDCiCy USR0FB/Fi9gHqVVqywzGmPLn0b0w9sI4DjgjKDUk/pZvUD6zjjXWyJjZ4TpMzZ0uxL7vNh 9TMmAkwX7IZGkXDbJYqLNjayopsCFQFi6DRADe3MpKQfeqJtmuyUlF1MiOMuXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6LKQ6pM4zbPX for ; Thu, 05 Feb 2026 15:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d063 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:11:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: d15d6bf83de9 - main - acpi: Fix trying to enter NONE state List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d15d6bf83de97bd1742621bc10fe2feeb503cfdd Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:11:38 +0000 Message-Id: <6984b32a.3d063.7626be25@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=d15d6bf83de97bd1742621bc10fe2feeb503cfdd commit d15d6bf83de97bd1742621bc10fe2feeb503cfdd Author: Aymeric Wibo AuthorDate: 2026-02-05 00:49:26 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-05 15:10:31 +0000 acpi: Fix trying to enter NONE state In acpi_system_eventhandler_sleep(), I forgot to update ACPI_STATE_UNKNOWN when switching to new sleep types. Reviewed by: olce Approved by: olce Fixes: 97d152698f48 ("acpi: Use sleep types defined in sys/power.h") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55119 --- sys/dev/acpica/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index bb7c93bcc256..53099db8ae84 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4062,7 +4062,7 @@ acpi_system_eventhandler_sleep(void *arg, enum power_stype stype) ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, stype); /* Check if button action is disabled or unknown. */ - if (stype == ACPI_STATE_UNKNOWN) + if (stype == POWER_STYPE_UNKNOWN) return; /* From nobody Thu Feb 5 15:11:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6LKW0tbFz6QjvM for ; Thu, 05 Feb 2026 15:11: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6LKP6cdkz3TcV for ; Thu, 05 Feb 2026 15:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770304298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0Q/tkqAL8zh+oimHg+wXhqhuRtsTGCoW+vIXtVngXo=; b=D5FZsEEoBX3cI5YzsQSEDu4eknZtwYhKnLg0LksE6LTWoJEwkqKIsr0bDrr9xn0zyIBmye dVwA530W236BgNPimhldFTjBMWBl86QZyetp5R6Q/zXkgCakmZAr1FP/DBAqKsH7/PYjAr 1i0sUaUtITrPuPrkqo/+gW9kDf6t1JjQkPFB0HGL9V9u0+5d9MbGSPb1eWlr9WekSouGtH cr1c/vkEFDaoY475lGQz4LrIr1XWR4Kj6HaHEnO+2elHRIEavP7SvdsC3zloD9m+RPMZeg s5IOmTYejsQpYVjv+ZOxlQHNG7T+RNXlybE9JdTJxNoYzzMhWSAJqdUxw7BT4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770304298; a=rsa-sha256; cv=none; b=N4tpZVAp984ozxYSTWq94RSp99JK9v4dtJ1ewD3qoQCGH/uqTW8/oZXJZR4FqR1WrYI+Cp AO6flJKsQUnH1ReYKzipRvvlMbC6AMjPqjK0HfA1OSKEuH208lr89SeCVh+ZqiT1Mzb3d8 IpjMF/yIMI4KfXeXPVIMau28a7aHsVWk8SzFXSIPXiwfGVPF930eCAYitfPWNF+UrKxtUb h0YopJ3+gAMdATFuvy0rCeZOfur9lc+c+AnmZ06Lpm9Eo1pMTE45BDQAOlLXTl4Kn1shF3 g+xYzfCN+LkMWLuDoUuLd9tjrhy+MKUDyokHmSOm0L3/Th1yGKqIgnaoY+rF3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770304298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0Q/tkqAL8zh+oimHg+wXhqhuRtsTGCoW+vIXtVngXo=; b=lZOETy+3soArDJuyTwSvO5kz/0hCNF08bASHungQeHCBAHeMQCfBm2JkaAV8lJtY32B84T IMQsTpQOVcyHUO3gvA1mXJCIn7aF9pKqUVBpHZcm18sMC+LLCD1d+YuWl3lgznMxuWqWFI +LzQQIaKX/vBZni/6z8fg6r+KHNvw+ybidsi/Vpo8uTNzZhZqFvXUV8107otGm4+Ks9a79 CFWJqkCWt9r1kUU5yyTWZf59+8v/E5g3HHxoUnM8O7Unwwrdfpaxohe8Njs8NgUMt068u1 Yc5tdEmBusCyFbhq/d8787wUoZh+FpsP0LN5Vqjs7P+WDOnp7UOzvgwxvfHBbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6LKP623gzZvZ for ; Thu, 05 Feb 2026 15:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dcdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:11:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: d35e369d0a7f - main - sys/power.h: enum power_sstate_transition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d35e369d0a7f37c580b89485a148d007faf05b52 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:11:37 +0000 Message-Id: <6984b329.3dcdf.7f2335f7@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=d35e369d0a7f37c580b89485a148d007faf05b52 commit d35e369d0a7f37c580b89485a148d007faf05b52 Author: Aymeric Wibo AuthorDate: 2026-02-05 14:55:17 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-05 15:10:30 +0000 sys/power.h: enum power_sstate_transition Turn POWER_SLEEP_STATE_* defines into enum power_sstate_transition. Reviewed by: markj Approved by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52497 --- sys/dev/acpi_support/acpi_ibm.c | 7 ++++++- sys/dev/syscons/syscons.c | 4 ++-- sys/dev/vt/vt_core.c | 4 ++-- sys/kern/subr_power.c | 13 +++++++------ sys/sys/power.h | 18 ++++++++++-------- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index f895d48bb6d0..1221384e7d8a 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -1447,8 +1447,13 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg) ACPI_SERIAL_BEGIN(ibm); switch (arg) { + /* + * XXX "Suspend-to-RAM" here is as opposed to suspend-to-disk, but it is + * fine if our suspend sleep state transition request puts us in s2idle + * instead of suspend-to-RAM. + */ case IBM_EVENT_SUSPEND_TO_RAM: - power_pm_suspend(POWER_SLEEP_STATE_SUSPEND); + power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); break; case IBM_EVENT_BLUETOOTH: diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index e9d664f51a1f..1a2969d6f2d8 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3987,10 +3987,10 @@ next_code: break; case SUSP: - power_pm_suspend(POWER_SLEEP_STATE_SUSPEND); + power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); break; case STBY: - power_pm_suspend(POWER_SLEEP_STATE_STANDBY); + power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY); break; case DBG: diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index a6a5f0eeff9d..fd18e85092db 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -804,11 +804,11 @@ vt_machine_kbdevent(struct vt_device *vd, int c) return (1); case SPCLKEY | STBY: /* XXX Not present in kbdcontrol parser. */ /* Put machine into Stand-By mode. */ - power_pm_suspend(POWER_SLEEP_STATE_STANDBY); + power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY); return (1); case SPCLKEY | SUSP: /* kbdmap(5) keyword `susp`. */ /* Suspend machine. */ - power_pm_suspend(POWER_SLEEP_STATE_SUSPEND); + power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); return (1); } diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index f5a581e42bf3..13448cfa4d1e 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -176,25 +176,26 @@ power_pm_get_type(void) } void -power_pm_suspend(int state) +power_pm_suspend(enum power_sstate_transition trans) { enum power_stype stype; if (power_pm_fn == NULL) return; - switch (state) { - case POWER_SLEEP_STATE_STANDBY: + switch (trans) { + case POWER_SSTATE_TRANSITION_STANDBY: stype = power_standby_stype; break; - case POWER_SLEEP_STATE_SUSPEND: + case POWER_SSTATE_TRANSITION_SUSPEND: stype = power_suspend_stype; break; - case POWER_SLEEP_STATE_HIBERNATE: + case POWER_SSTATE_TRANSITION_HIBERNATE: stype = power_hibernate_stype; break; default: - printf("%s: unknown sleep state %d\n", __func__, state); + printf("%s: unknown sleep state transition %d\n", __func__, + trans); return; } diff --git a/sys/sys/power.h b/sys/sys/power.h index 33ace400bfd2..d34af0ddb86a 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -45,22 +45,24 @@ #define POWER_CMD_SUSPEND 0x00 /* - * Sleep state. + * Sleep state transition requests. * * These are high-level sleep states that the system can enter. They map to * a specific generic sleep type (enum power_stype). */ -#define POWER_SLEEP_STATE_STANDBY 0x00 -#define POWER_SLEEP_STATE_SUSPEND 0x01 -#define POWER_SLEEP_STATE_HIBERNATE 0x02 +enum power_sstate_transition { + POWER_SSTATE_TRANSITION_STANDBY, + POWER_SSTATE_TRANSITION_SUSPEND, + POWER_SSTATE_TRANSITION_HIBERNATE, +}; /* * Sleep type. * * These are the specific generic methods of entering a sleep state. E.g. - * POWER_SLEEP_STATE_SUSPEND could be set to enter either suspend-to-RAM (which - * is S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI systems). This - * would be done through the kern.power.suspend sysctl. + * POWER_SSTATE_TRANSITION_SUSPEND could be set to enter either suspend-to-RAM + * (which is S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI systems). + * This would be done through the kern.power.suspend sysctl. */ enum power_stype { POWER_STYPE_AWAKE, @@ -94,7 +96,7 @@ extern int power_pm_register(u_int _pm_type, power_pm_fn_t _pm_fn, void *_pm_arg, bool _pm_supported[static POWER_STYPE_COUNT]); extern u_int power_pm_get_type(void); -extern void power_pm_suspend(int); +extern void power_pm_suspend(enum power_sstate_transition _trans); /* * System power API. From nobody Thu Feb 5 15:27:43 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lgz4zNTz6QknR for ; Thu, 05 Feb 2026 15:27: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Lgz1KKFz3Xx6 for ; Thu, 05 Feb 2026 15:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p3d2wOtS9KKBAqNSF+kHFDGhPm8ytj9bnqZqqRVj5VQ=; b=BQjvfVpbxzBrRn4V3QAyPOu3Ysav85U74isyHqhNLLTvMXDV5zhuFCgYCJOmiWE5VnP7ne 1GDfDdBe3lAl3kcuGer0/oYCny7SxEqFkaAGKfdCUieU1luL3ADURVyNQlSoxTHiMW0Wa8 G1Z6o+un6vdK+UJXsJJMNSA/Y1xMMA94ZclJh+cS6um2zbqrL7hKLBSmhKEHbqUgudBzWL x9LihhZrfs+VAS0MLhbY5X1OKj7wwAh7A3c1khOLOgGvlOB2mtONwgPBQLnVtjWBr16ArZ saqjCOYU+cOa/nZlW1gvpUMLlzhM47OsPgf8X1DyFQGwd+q12ipgZlGajQDE+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305263; a=rsa-sha256; cv=none; b=j+5c+i0Foty8IJGPExySaPKWL+wU1wiry0q2hV/akwZrtOHrFPyVI6vaLh9VkqDx0A0Iqf lZiPa9SvTGmaUJMKFqIQ8gGjHxO2TAbiCvfn4bvbcxYB+moMURzWzkl3oniTVkrSS4ebdj 6wLFKjty1V4kAaiCVia142YHMFpHq73rUzRH28/GVVnhOP5LpeoY4KRb1XSByxGnr4dTQZ OVBDuy5deLx/uByl+6CLfZasoFtBqkvjjvnI1P8uVn39iIy9qXe/IN26Jdzh3IVgSADXSc h0J3Fgwn3JO6CGojYu6FzzrB+szmjA85fe8JI9l4BwrTbO/Slnwkx0CQNrKEJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p3d2wOtS9KKBAqNSF+kHFDGhPm8ytj9bnqZqqRVj5VQ=; b=wAMq3fgqPRQd0eYkJKY4/NX2laG+L5u5LJVHXLkSOuGY/6F+nhSCzWK0uNopszyr0FFQCx 6UAojNhq6RnnFkhDkG7tJUy1nsuOCY2nMOd/P2RZ0VIePM1SN/tSBgNezUp7K0Kl42/JUC wpLRh9LIZD/UOS8FgUFa97itfkMHZeWddRGtsMvz68jZCvwsVYlmiqqr3lfowmnGmnbip/ u2kVeiHrmNHEgvhnZSTStLvwYd4t3tcDYwAXg0JNaScIftt/K5splTn+0w3me872fiqrW/ JaCHMwzVFJR0/G1Zg5h5S9h10EMnh4z7E8BeTbsiY2RET0sPDhZRMUKBdJaCAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lgz0qcrzbcg for ; Thu, 05 Feb 2026 15:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd17 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:27:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: ee44ab936e84 - main - diff: Fix build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee44ab936e84bacaa49847d36aabdf280f9fecce Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:27:43 +0000 Message-Id: <6984b6ef.3fd17.4d0d372d@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ee44ab936e84bacaa49847d36aabdf280f9fecce commit ee44ab936e84bacaa49847d36aabdf280f9fecce Author: Cy Schubert AuthorDate: 2026-02-05 15:18:09 +0000 Commit: Cy Schubert CommitDate: 2026-02-05 15:26:01 +0000 diff: Fix build rc must be defined first. Fixes: 590126789c84 MFC after: 1 week X-MFC with: 590126789c84 --- usr.bin/diff/diffdir.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index bd8ef73e785a..0e9beb80e6a1 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -235,6 +235,8 @@ static void diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, char *path2, size_t plen2, int flags) { + int rc; + flags |= D_HEADER; strlcpy(path1 + plen1, dp->d_name, PATH_MAX - plen1); From nobody Thu Feb 5 15:36:06 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lsf4X2jz6Qldk for ; Thu, 05 Feb 2026 15:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Lsf1gjBz3drT for ; Thu, 05 Feb 2026 15:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bCLI8/uFEGQ+hbVAG+6a38ufYVMrhXV+8FTaPg5LBCQ=; b=YUdPITALb7x2VtgHkOdLpBILLjLRc27hwBlnz1BTEs2uwaxfPyhOrfiwQ2zQqmRzRsmnND RjJEW36CuQ5Q2/40AuUojKwHF+StI4OI/4OKcVoD75BVG7PfWcdj39me6xCgELQUFEd9m/ KmYfRHx/GhWyVv+np0j4qv2QSdsdlLkykQkjzM4+98s1QRCTglx0fErToFyKGebfJMmprc HjE13CktNpJOLNZj3FCazNMBvW0o97eZqppVJrB3j80QorMiCdxxRJivd9xTrFVRkiWz05 lMoV0PtyYxLTEIzh+IUHPPn9lZQXXQkTFkbVBTwHOmk9OR9Mh/bURY2ZCG8ZUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305766; a=rsa-sha256; cv=none; b=cHbSpFvdI12JdHjiATL6xSYjk86sug2DA+XP2qrt2ZKU8baYGaBzkJUjzVWsUbHM7Irz2w 1PmKucP92DItEbE3QviGKXiucYjPKQBLWas6X6WyEv7ZJCGFY6m8uYx4gVyN9dNnrwIyX4 tee8TW2UjHtpDxTCSrn7tYOjm4CVAmsa0CyxjIzgcsY+h3q49X7u9rVRxJrCdwcnVwnckb 3datUljfHsAXkunRqXAgGWr7FVXId5TkrobJlHUTVbXA51KB0c7eVuRGY3Pj0SjxLEG8dZ IHBJQVhsxH20yXN7Qggilk8/COL6wQjP+qLaMlESW8H07BoMHq3TZGdRSwPXHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bCLI8/uFEGQ+hbVAG+6a38ufYVMrhXV+8FTaPg5LBCQ=; b=U/TfxMgMeqCnFbsMQIZlj/s0SksnuhYn4av7WcEfzWSVUu6UwYs5PUM/hYPY84Z4XVcbyJ 64T1GYz/b389ks/nDJqoI1T8wXMOEfdlRb0odJ8AAEqOFHTIG/HBDRijjoJYWoc3AUdtUY scmrMQgTdu9Sv8FdWlwF4/VY6fNVPF9GTCkyW6NT+u+vHnwN94UpIhgeu5M6B1F2BX7zmR wCq5uZt/GGXV6oU1QGIPJuEuhPg2IyE2AfgP9hRtRk2pKEekDqvqbLk1q3Lhjm4ye5zkjg vo9G9NTjGlqfG5UKCZFjGxOtzsMsxnsekM1DnbasvdCgwrvo4w+5zfY/A03hUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lsf0gNFzc3N for ; Thu, 05 Feb 2026 15:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18e12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:36:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Vijeyalakshumi Koteeswaran From: Ed Maste Subject: git: b18604ed9376 - main - hyperv: Add opt_acpi.h to SRCS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b18604ed93766b317dd40438793b714523b50123 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:36:06 +0000 Message-Id: <6984b8e6.18e12.3f7b09e0@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b18604ed93766b317dd40438793b714523b50123 commit b18604ed93766b317dd40438793b714523b50123 Author: Vijeyalakshumi Koteeswaran AuthorDate: 2026-02-05 15:34:17 +0000 Commit: Ed Maste CommitDate: 2026-02-05 15:35:21 +0000 hyperv: Add opt_acpi.h to SRCS Add opt_acpi.h to SRCS as it is required by the hyper-v pcib sources. Reviewed by: imp Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D48166 --- sys/modules/hyperv/pcib/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/modules/hyperv/pcib/Makefile b/sys/modules/hyperv/pcib/Makefile index be0a905aab80..aa2566461d03 100644 --- a/sys/modules/hyperv/pcib/Makefile +++ b/sys/modules/hyperv/pcib/Makefile @@ -4,6 +4,7 @@ KMOD= vmbus_pcib SRCS= vmbus_pcib.c SRCS+= bus_if.h device_if.h pci_if.h pcib_if.h vmbus_if.h +SRCS+= opt_acpi.h CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/pcib From nobody Thu Feb 5 15:38:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6LwD2zJDz6QlZW for ; Thu, 05 Feb 2026 15:38: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6LwD0FR3z3fXH for ; Thu, 05 Feb 2026 15:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1NsoI9+GeR1NEDY4TwzxBnFF6+kK58SHFk8VGGcee6w=; b=nu8OliI6pajp8aROA6etgteWPxraVtYtqTjH++YEw89Y6uFTITC7y18nQDR/nrFSmg5sck DpOloM3dUevZsrOrY4skgRoiTDxkYR8+s0SzpXTGDcZ2HGG2PadPl1M4beVNETGmkdcOD5 DnYoXcNSoK60EOEI4gzacD+5nx9exTf6x+gSyZkq5TQ08t4/SwQQp6uqVptVb6ozY0cebO 7jGteIFOu28DZ+3y2R/l3fpxeltZ5fMpx/Mu7uCxiJNCE/t2eVXOwivDYB3TPhdVquA4rZ ZL2q7Dg+g1TzwiMbdIaIGCn6qI3Frfp07TSC2E4RMJXpL9vRK944n8KfkqOsDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305900; a=rsa-sha256; cv=none; b=jw5n9RXODZ0GunOY0t2UcPYcGahS1BS40pHN4moGpEZSCtQfHHl7ZBTW8Ll6pviJjdbuAb RiEI0wzTGPw+U8bScOnFwA9gsNby4uQqzx+RiM8lE6NK1L/uxpLDe0b+Ob1YW6oFn9n1F/ 6FYj1MibRcmCb5UAW0WkvKdDM0iVvgroYLIxQMLHvcdtoMZpllsZOVuFfv6afhnnZ2NVEF L9xt4GVGCa2amaRJE9jsDwD6BOlN96JFNJ059ln8eK7mB1DajSAC6m8vdoiX8BieWK4eCF uGP6xs2Yn0/DTeJw7mB6/1EarheleXIAWtGv+/61DFkfNl0qtKLVPDXaTwVYLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1NsoI9+GeR1NEDY4TwzxBnFF6+kK58SHFk8VGGcee6w=; b=gL51vXasiDGedR21rDMm2ewIfH0zSDmlu6suN+ZHX+yzgF5sirEAWj0SqH4Bz51hdyFTGR 4XBeOEwFS7ufpUDxMmmu45EZq7nUJeXQn/BEv0Dxxxx+E0BuUWOWuRzMpQk2jK6BRC2t6k V6oZXlvNoWHnN2wKpBpamyqvjhWnzx0Ay1qw8t2K4FM/z+XBo9ZGccAH4SSvPczHh9nii7 VaNDXVbEHheFnqECYsBDk7Z2UjCgDUvTO0Du9P9OyrzWCJDkh+8H8bGW9ssiPLJeLzi1V/ yQ73vRZzHUjUXVSVG6t7t+r9aWJtelpKFpRySpEbd7G521/3nM/s07i/3Jrd5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6LwC6gqxzby5 for ; Thu, 05 Feb 2026 15:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fea0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:38:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: dc2ec1ccc17a - main - geom.8: Improve classes list into a table List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc2ec1ccc17a0c43c736b16a537c01bb28d814a4 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:38:19 +0000 Message-Id: <6984b96b.3fea0.b0d2eaa@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=dc2ec1ccc17a0c43c736b16a537c01bb28d814a4 commit dc2ec1ccc17a0c43c736b16a537c01bb28d814a4 Author: Alexander Ziaee AuthorDate: 2026-02-05 15:31:29 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-05 15:38:07 +0000 geom.8: Improve classes list into a table Add missing entries MD, VFS, and DISK. Refactor list into a three column table, so the data is all visible at once, buying us ten lines at MANWIDTH 80, and still rendering nicely at MANWIDTH 59. PR: 292530 MFC after: 3 days Reported by: Slawomir Wojciech Wojtczak --- sbin/geom/core/geom.8 | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8 index 29c6385da3f7..96db7f3a80e4 100644 --- a/sbin/geom/core/geom.8 +++ b/sbin/geom/core/geom.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 4, 2025 +.Dd February 5, 2026 .Dt GEOM 8 .Os .Sh NAME @@ -143,41 +143,14 @@ Currently, classes aware of .Nm are: .Pp -.Bl -bullet -offset indent -compact -.It -CACHE -.It -CONCAT -.It -ELI -.It -JOURNAL -.It -LABEL -.It -MIRROR -.It -MOUNTVER -.It -MULTIPATH -.It -NOP -.It -PART -.It -RAID -.It -RAID3 -.It -SCHED -.It -SHSEC -.It -STRIPE -.It -UNION -.It -VIRSTOR +.Bl -column "* MULTIPATH" "* MULTIPATH" "* MULTIPATH" -offset indent +.It \(bu CACHE Ta \(bu MIRROR Ta \(bu SCHED +.It \(bu CONCAT Ta \(bu MOUNTVER Ta \(bu SHSEC +.It \(bu DISK Ta \(bu MULTIPATH Ta \(bu STRIPE +.It \(bu ELI Ta \(bu NOP Ta \(bu UNION +.It \(bu JOURNAL Ta \(bu PART Ta \(bu VFS +.It \(bu LABEL Ta \(bu RAID Ta \(bu VIRSTOR +.It \(bu MD Ta \(bu RAID3 .El .Sh ENVIRONMENT The following environment variables affect the execution of From nobody Thu Feb 5 15:38:50 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lxc0wnzz6QljN; Thu, 05 Feb 2026 15:39:32 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp5.goneo.de [IPv6:2001:1640:5::8:30]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Lxb5lS4z3ftd; Thu, 05 Feb 2026 15:39:31 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub2.goneo.de (hub2.goneo.de [IPv6:2001:1640:5::8:53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 8881824028B; Thu, 5 Feb 2026 16:39:20 +0100 (CET) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id 9E803240421; Thu, 5 Feb 2026 16:39:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1770305958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/GzIfzuzWwiLv1XflD1lCbdQ6GPArM1Pqk8UbPtfBKg=; b=RSgEPcsP0IEI2Gp72bPopRCjBQ6zbgRDPeyslWbUx2bj0sDHOJqpCXAXXc6TzM9snaUkpu SX2OlvKMHn+B5jCaBGU4weDnE0RneXh+9nKoh7de4D5bJ1EqI6gcz1gIosKJcJVkUjAqB2 8m13ooT6LcEwLfBKDCL+sGl7b5xCe/01hv1KOoAB3EFx/s1ltH/5H800t+dtPqfRvdfohS BuD4CI9e4JHmPaPz//ywcyxvCSq1or3oMiQUuMz33d0JEj+WzTS8Z2rSePfr/FNc6JB0az WRVD4IwJmON9c1ATIXrQ1vdpb8r9cUo4Wk3XHpZlndb6XKRJ+fs5HlczgYxzXg== Received: from thor.sb211.local (dynamic-2a02-3100-2efd-fd02-a884-0216-289d-5b94.310.pool.telefonica.de [IPv6:2a02:3100:2efd:fd02:a884:216:289d:5b94]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id 4009A24039D; Thu, 5 Feb 2026 16:39:18 +0100 (CET) Date: Thu, 5 Feb 2026 16:38:50 +0100 From: A FreeBSD User To: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 590126789c84 - main - diff: Don't compare a file or directory to itself Message-ID: <20260205162739.132689b5@thor.sb211.local> In-Reply-To: <6984ad1d.39760.188296e8@gitrepo.freebsd.org> References: <6984ad1d.39760.188296e8@gitrepo.freebsd.org> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd16.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/1e1plY84Qqzw2sr1atKsDpr"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: 131d73 X-Rspamd-UID: 0aa89b X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Queue-Id: 4f6Lxb5lS4z3ftd X-Spamd-Bar: ---- --Sig_/1e1plY84Qqzw2sr1atKsDpr Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Tage des Herren Thu, 05 Feb 2026 14:45:49 +0000 Dag-Erling Sm=C3=B8rgrav schrieb: > The branch main has been updated by des: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D590126789c841d80655869bc07= 5c8980c173dd1c >=20 > commit 590126789c841d80655869bc075c8980c173dd1c > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2026-02-05 14:39:57 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2026-02-05 14:39:57 +0000 >=20 > diff: Don't compare a file or directory to itself > =20 > While here, stop abusing struct dirent for something we don't even ne= ed > to store. > =20 > PR: 254455 > MFC after: 1 week > Sponsored by: Klara, Inc. > Reviewed by: thj, kevans > Differential Revision: https://reviews.freebsd.org/D55113 > --- > usr.bin/diff/diffdir.c | 14 ++++++-------- > usr.bin/diff/diffreg.c | 3 +++ > usr.bin/diff/tests/diff_test.sh | 19 +++++++++++++++++++ > 3 files changed, 28 insertions(+), 8 deletions(-) >=20 > diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c > index a55a2bec70ee..bd8ef73e785a 100644 > --- a/usr.bin/diff/diffdir.c > +++ b/usr.bin/diff/diffdir.c > @@ -41,8 +41,6 @@ static void diffit(struct dirent *, char *, size_t, str= uct dirent *, > char *, size_t, int); > static void print_only(const char *, size_t, const char *); > =20 > -#define d_status d_type /* we need to store status for -l */ > - > struct inode { > dev_t dev; > ino_t ino; > @@ -258,7 +256,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = struct dirent *dp2, > flags |=3D D_EMPTY1; > memset(&stb1, 0, sizeof(stb1)); > } > - > if (lstat(path2, &stb2) !=3D 0) { > if (!Nflag || errno !=3D ENOENT) { > warn("%s", path2); > @@ -315,7 +312,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = struct dirent *dp2, > flags |=3D D_EMPTY1; > memset(&stb1, 0, sizeof(stb1)); > } > - > if (stat(path2, &stb2) !=3D 0) { > if (!Nflag || errno !=3D ENOENT) { > warn("%s", path2); > @@ -328,6 +324,8 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = struct dirent *dp2, > if (stb1.st_mode =3D=3D 0) > stb1.st_mode =3D stb2.st_mode; > } > + if (stb1.st_dev =3D=3D stb2.st_dev && stb1.st_ino =3D=3D stb2.st_ino) > + return; > if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { > if (rflag) > diffdir(path1, path2, flags); > @@ -337,12 +335,12 @@ diffit(struct dirent *dp, char *path1, size_t plen1= , struct dirent > *dp2, return; > } > if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode)) > - dp->d_status =3D D_SKIPPED1; > + rc =3D D_SKIPPED1; > else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode)) > - dp->d_status =3D D_SKIPPED2; > + rc =3D D_SKIPPED2; > else > - dp->d_status =3D diffreg(path1, path2, flags, 0); > - print_status(dp->d_status, path1, path2, ""); > + rc =3D diffreg(path1, path2, flags, 0); > + print_status(rc, path1, path2, ""); > } > =20 > /* > diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c > index 91ae5ee6591a..95c724817ede 100644 > --- a/usr.bin/diff/diffreg.c > +++ b/usr.bin/diff/diffreg.c > @@ -372,6 +372,9 @@ diffreg_stone(char *file1, char *file2, int flags, in= t capsicum) > goto closem; > } > =20 > + if (stb1.st_dev =3D=3D stb2.st_dev && stb1.st_ino =3D=3D stb2.st_ino) > + goto closem; > + > if (lflag) > pr =3D start_pr(file1, file2); > =20 > diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_te= st.sh > index a3f76602cf37..0c8147c7ed18 100755 > --- a/usr.bin/diff/tests/diff_test.sh > +++ b/usr.bin/diff/tests/diff_test.sh > @@ -432,6 +432,24 @@ prleak_body() > atf_check diff -Astone -rul a b > } > =20 > +same_head() > +{ > + atf_set "descr" "Don't diff a file or directory with itself" > +} > +same_body() > +{ > + local n=3D256 > + mkdir a > + for hi in $(jot -w%02x $n 0) ; do > + mkdir a/$hi > + for lo in $(jot -w%02x $n 0) ; do > + echo "$hi$lo" >a/$hi/$lo > + done > + done > + ln -s a b > + atf_check timeout 1s diff -rqs a b > +} > + > atf_init_test_cases() > { > atf_add_test_case simple > @@ -462,4 +480,5 @@ atf_init_test_cases() > atf_add_test_case bigc > atf_add_test_case bigu > atf_add_test_case prleak > + atf_add_test_case same > } >=20 Buildworld seems to fail with newly added diff code: [...] --- all_subdir_usr.bin --- 342 | rc =3D diffreg(path1, path2, flags, 0); | ^ /usr/src/usr.bin/diff/diffdir.c:343:15: error: use of undeclared identifier= 'rc' 343 | print_status(rc, path1, path2, ""); Kind regards, oh --=20 A FreeBSD user --Sig_/1e1plY84Qqzw2sr1atKsDpr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCaYS5pQAKCRCxzvs8Oqok r9kuAQDSz+4UhOsv0sUrTlosnMEg9l52dsgUL9u6Yr8B6GVAvgD+MYk4GJJxA8gG rLgvsBDMiOk4L8c0Xej4YYQv04+ETQk= =GoH/ -----END PGP SIGNATURE----- --Sig_/1e1plY84Qqzw2sr1atKsDpr-- From nobody Thu Feb 5 15:41:31 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lzx1FD0z6Qlqj; Thu, 05 Feb 2026 15:41:33 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Lzw6DkBz3gLq; Thu, 05 Feb 2026 15:41:32 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770306092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GtSVFTv+F7es7c7JiVrKSUhiDl7l7iHYroeoGIlUsY8=; b=BXHtpkD3cch3bvaBLIE2Xe3Dzm1A/EQOy+spxeuExYniHRGAymorkqp9tLE0tWMrvWDfPG UI2x6lXHsgJUeQWLPAx929Zpfmr4EPiUEG1NRBk7MJgLNRToQjpHN2UyN54nyq1tW4A7D2 965nfaDpjjxDvT86epVi6AacbPMwkAUAfapDQf6zw1Cd/MXsUEZYZh5Xj9lyyJ/vC+p8Wy wEPv9NPlD/i5FqHZOSMHRYqf3NucHBFBDuj427S2Thq809f21IaNtski6p0m9J2iOM0xa4 mlM0z0PLLKiOLL5W68tqO8MnJWJvhYWnEdmPo1j92DHXknE4zJQgbGdY4+wVsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770306092; a=rsa-sha256; cv=none; b=Bh8PtGOTWj9o6Xi2M6NLVv9NaHydQZ+s5M3/DAkJbTs9qRWZTAg+wk+Zsd+o6tAP7SxFWu rAG37yJY4bFoD5f9MVS4zjbMK7qqmjuqXaT26dUvvJy7EbaYhpHppK1SnJP+Cts+7INeGx 9oeyWtgWJ5UNswNIlzyVIwhk+T6hOeW58Tq43etl6wQZRF6vMB72S32+8VlZnBeU+jOvNt eF/PIQDKpYGsjrpu0stcClq+QSP1q8JZNtBkADqm8J4PsMw/++UmJf5LNIWnUDJYSTcRq8 k8rd5D9dcIoYKiOhsY0KePXTAFvMj06Wg/NBstWUR/2r2mDBFAlKDZupdgaC3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770306092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GtSVFTv+F7es7c7JiVrKSUhiDl7l7iHYroeoGIlUsY8=; b=r2ovNmk0gGf3LSQ6vySTkmZNv16uENPp8VVR96gKXywmjMT8fZ4nFFLy/FM0cQ7PonTYgk oES/yURIawhlqseOeVFUKG7NlYgeJibLcWzubq8b6h2qv9jj1ge2DbV3N6pHUELOUCta+V bNzp11G4LcrWh/+Ww95gKE2kzQ17pVjtw+tPWr8hOvj7xd//TYGfbH/WNXcdt19bv/wRyB iZ8g4816crAsnMq+UJc6pV/GdHDcS40je+JWxVpLf3MeghPVwIic9gIjniUZ3Zh6m99sR3 Q+5fdTqvSg6tBGEiYuTHkX4Iof1tfy44Mck7aUmMt473uSAmot+jUWRmhd1rGg== Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f6Lzw598mz1HX1; Thu, 05 Feb 2026 15:41:32 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 4AE2E75421; Thu, 05 Feb 2026 16:41:31 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ee44ab936e84 - main - diff: Fix build In-Reply-To: <6984b6ef.3fd17.4d0d372d@gitrepo.freebsd.org> (Cy Schubert's message of "Thu, 05 Feb 2026 15:27:43 +0000") References: <6984b6ef.3fd17.4d0d372d@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Thu, 05 Feb 2026 16:41:31 +0100 Message-ID: <86qzqzb3kk.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cy Schubert writes: > commit ee44ab936e84bacaa49847d36aabdf280f9fecce > Author: Cy Schubert > AuthorDate: 2026-02-05 15:18:09 +0000 > Commit: Cy Schubert > CommitDate: 2026-02-05 15:26:01 +0000 > > diff: Fix build >=20=20=20=20=20 > rc must be defined first. >=20=20=20=20=20 > Fixes: 590126789c84 > MFC after: 1 week > X-MFC with: 590126789c84 You couldn't even wait five minutes? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Thu Feb 5 15:42:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6M1c0t3kz6Qlrc; Thu, 05 Feb 2026 15:43:00 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6M1b5Rsfz3gxD; Thu, 05 Feb 2026 15:42:59 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003b.ext.cloudfilter.net ([10.228.9.157]) by cmsmtp with ESMTPS id nuD1vmhD6APFJo1VSvWQiR; Thu, 05 Feb 2026 15:42:58 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id o1VRvMmghRXCAo1VRvDpup; Thu, 05 Feb 2026 15:42:58 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=CNonnBrD c=1 sm=1 tr=0 ts=6984ba82 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=HzLeVaNsDn8A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=vURbuoDfOrpi-_PoOWEA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A76EFE89; Thu, 05 Feb 2026 07:42:56 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id A1B2C715; Thu, 05 Feb 2026 07:42:56 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: A FreeBSD User cc: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 590126789c84 - main - diff: Don't compare a file or directory to itself In-reply-to: <20260205162739.132689b5@thor.sb211.local> References: <6984ad1d.39760.188296e8@gitrepo.freebsd.org> <20260205162739.132689b5@thor.sb211.local> Comments: In-reply-to A FreeBSD User message dated "Thu, 05 Feb 2026 16:38:50 +0100." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 05 Feb 2026 07:42:56 -0800 Message-Id: <20260205154256.A1B2C715@slippy.cwsent.com> X-CMAE-Envelope: MS4xfOwH5NYKxsgQ1xe65b00TelEtDU1N5aPK9AG7NqV/YZvbDiz8UhMZAm44Q6zKN2s8kySUF7F+7AswJ2pfQtkBsldnG4o5/I0WZO2Wrst15vEhQdlAnQr AiR9/6DWigTWnYQtUhJEihmRqRVtddRuZE+rxvIdd3E5etCbmEwnE25f6s424bh1FfsFOuwNGu5JjYvlEku/D/ydU8Jt/pt64pRwlXJQo4xWSLebZ+oP3LY+ dUvnTzSQO6Z65SLh2tdLbwHkLyq5410/CRc1Ak/vJcJ5IVjns0EbIg/exsbHx7C6hhouwtxVAd0ErklBO+FwzvgRRl3LSHtw/DD4CmHofIuklK59DOJedmt8 myd66hZr X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4f6M1b5Rsfz3gxD X-Spamd-Bar: ---- In message <20260205162739.132689b5@thor.sb211.local>, A FreeBSD User writes: > --Sig_/1e1plY84Qqzw2sr1atKsDpr > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: quoted-printable > > Am Tage des Herren Thu, 05 Feb 2026 14:45:49 +0000 > Dag-Erling Sm=C3=B8rgrav schrieb: > > > The branch main has been updated by des: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D590126789c841d80655869bc07= > 5c8980c173dd1c > >=20 > > commit 590126789c841d80655869bc075c8980c173dd1c > > Author: Dag-Erling Sm=C3=B8rgrav > > AuthorDate: 2026-02-05 14:39:57 +0000 > > Commit: Dag-Erling Sm=C3=B8rgrav > > CommitDate: 2026-02-05 14:39:57 +0000 > >=20 > > diff: Don't compare a file or directory to itself > > =20 > > While here, stop abusing struct dirent for something we don't even ne= > ed > > to store. > > =20 > > PR: 254455 > > MFC after: 1 week > > Sponsored by: Klara, Inc. > > Reviewed by: thj, kevans > > Differential Revision: https://reviews.freebsd.org/D55113 > > --- > > usr.bin/diff/diffdir.c | 14 ++++++-------- > > usr.bin/diff/diffreg.c | 3 +++ > > usr.bin/diff/tests/diff_test.sh | 19 +++++++++++++++++++ > > 3 files changed, 28 insertions(+), 8 deletions(-) > >=20 > > diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c > > index a55a2bec70ee..bd8ef73e785a 100644 > > --- a/usr.bin/diff/diffdir.c > > +++ b/usr.bin/diff/diffdir.c > > @@ -41,8 +41,6 @@ static void diffit(struct dirent *, char *, size_t, str= > uct dirent *, > > char *, size_t, int); > > static void print_only(const char *, size_t, const char *); > > =20 > > -#define d_status d_type /* we need to store status for -l */ > > - > > struct inode { > > dev_t dev; > > ino_t ino; > > @@ -258,7 +256,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = > struct dirent *dp2, > > flags |=3D D_EMPTY1; > > memset(&stb1, 0, sizeof(stb1)); > > } > > - > > if (lstat(path2, &stb2) !=3D 0) { > > if (!Nflag || errno !=3D ENOENT) { > > warn("%s", path2); > > @@ -315,7 +312,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = > struct dirent *dp2, > > flags |=3D D_EMPTY1; > > memset(&stb1, 0, sizeof(stb1)); > > } > > - > > if (stat(path2, &stb2) !=3D 0) { > > if (!Nflag || errno !=3D ENOENT) { > > warn("%s", path2); > > @@ -328,6 +324,8 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = > struct dirent *dp2, > > if (stb1.st_mode =3D=3D 0) > > stb1.st_mode =3D stb2.st_mode; > > } > > + if (stb1.st_dev =3D=3D stb2.st_dev && stb1.st_ino =3D=3D stb2.st_ino) > > + return; > > if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { > > if (rflag) > > diffdir(path1, path2, flags); > > @@ -337,12 +335,12 @@ diffit(struct dirent *dp, char *path1, size_t plen1= > , struct dirent > > *dp2, return; > > } > > if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode)) > > - dp->d_status =3D D_SKIPPED1; > > + rc =3D D_SKIPPED1; > > else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode)) > > - dp->d_status =3D D_SKIPPED2; > > + rc =3D D_SKIPPED2; > > else > > - dp->d_status =3D diffreg(path1, path2, flags, 0); > > - print_status(dp->d_status, path1, path2, ""); > > + rc =3D diffreg(path1, path2, flags, 0); > > + print_status(rc, path1, path2, ""); > > } > > =20 > > /* > > diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c > > index 91ae5ee6591a..95c724817ede 100644 > > --- a/usr.bin/diff/diffreg.c > > +++ b/usr.bin/diff/diffreg.c > > @@ -372,6 +372,9 @@ diffreg_stone(char *file1, char *file2, int flags, in= > t capsicum) > > goto closem; > > } > > =20 > > + if (stb1.st_dev =3D=3D stb2.st_dev && stb1.st_ino =3D=3D stb2.st_ino) > > + goto closem; > > + > > if (lflag) > > pr =3D start_pr(file1, file2); > > =20 > > diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_te= > st.sh > > index a3f76602cf37..0c8147c7ed18 100755 > > --- a/usr.bin/diff/tests/diff_test.sh > > +++ b/usr.bin/diff/tests/diff_test.sh > > @@ -432,6 +432,24 @@ prleak_body() > > atf_check diff -Astone -rul a b > > } > > =20 > > +same_head() > > +{ > > + atf_set "descr" "Don't diff a file or directory with itself" > > +} > > +same_body() > > +{ > > + local n=3D256 > > + mkdir a > > + for hi in $(jot -w%02x $n 0) ; do > > + mkdir a/$hi > > + for lo in $(jot -w%02x $n 0) ; do > > + echo "$hi$lo" >a/$hi/$lo > > + done > > + done > > + ln -s a b > > + atf_check timeout 1s diff -rqs a b > > +} > > + > > atf_init_test_cases() > > { > > atf_add_test_case simple > > @@ -462,4 +480,5 @@ atf_init_test_cases() > > atf_add_test_case bigc > > atf_add_test_case bigu > > atf_add_test_case prleak > > + atf_add_test_case same > > } > >=20 > Buildworld seems to fail with newly added diff code: > > [...] > --- all_subdir_usr.bin --- > 342 | rc =3D diffreg(path1, path2, flags, 0); > | ^ > /usr/src/usr.bin/diff/diffdir.c:343:15: error: use of undeclared identifier= > 'rc' > 343 | print_status(rc, path1, path2, ""); ee44ab936e84 just fixed this. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Thu Feb 5 15:44:47 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6M3k2tXyz6Qm9Z; Thu, 05 Feb 2026 15:44:50 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6M3k0Y7Pz3hWs; Thu, 05 Feb 2026 15:44:50 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001b.ext.cloudfilter.net ([10.228.9.171]) by cmsmtp with ESMTPS id o1PDvUln8PzKyo1XFvVZLy; Thu, 05 Feb 2026 15:44:49 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id o1XDvAA06X0jpo1XEvHHCJ; Thu, 05 Feb 2026 15:44:49 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=FMIWBuos c=1 sm=1 tr=0 ts=6984baf1 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=HzLeVaNsDn8A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=UHzPHE3E2-XMwY2fr5cA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id B17E1E8E; Thu, 05 Feb 2026 07:44:47 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id AB26A797; Thu, 05 Feb 2026 07:44:47 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ee44ab936e84 - main - diff: Fix build In-reply-to: <86qzqzb3kk.fsf@ltc.des.dev> References: <6984b6ef.3fd17.4d0d372d@gitrepo.freebsd.org> <86qzqzb3kk.fsf@ltc.des.dev> Comments: In-reply-to =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= message dated "Thu, 05 Feb 2026 16:41:31 +0100." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 05 Feb 2026 07:44:47 -0800 Message-Id: <20260205154447.AB26A797@slippy.cwsent.com> X-CMAE-Envelope: MS4xfHPqB33MSTJX/wacpoMnjsb4vvL6hRpLqZD85Xn3AFDLyXTgkAWJFALvC74W12q4YlPXxt9+7a5VDLULxUkMphB4bJ6d0Y3FktXJxD2/pZjr+u6zoYeD H/1IMXlPpDly0r5/t5umqmRClzpIw8o6dxAD009rdOYTPmFrIDjI7SJQwG+uctZXeXwkExODkvN/xODW8qkk6rVsUn2glY63DZ+OY3Hy1pEE0iPW+mEFYp1I C6kRQM1mJGSvnEey9A3k368QBBM2UR8SDuSmqiQiCd3Zv0pqPCS98JFxWgfJMME8jgJ1GNGtqNvcSM10YOC6wAepXfZ0h34MpvL+KxbKJIlfgwiQqEmS/YJS y1h6s/wh X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4f6M3k0Y7Pz3hWs X-Spamd-Bar: ---- In message <86qzqzb3kk.fsf@ltc.des.dev>, =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav? = w rites: > Cy Schubert writes: > > commit ee44ab936e84bacaa49847d36aabdf280f9fecce > > Author: Cy Schubert > > AuthorDate: 2026-02-05 15:18:09 +0000 > > Commit: Cy Schubert > > CommitDate: 2026-02-05 15:26:01 +0000 > > > > diff: Fix build > >=20=20=20=20=20 > > rc must be defined first. > >=20=20=20=20=20 > > Fixes: 590126789c84 > > MFC after: 1 week > > X-MFC with: 590126789c84 > > You couldn't even wait five minutes? You're in a different time zone. I figured you were off for the evening. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Thu Feb 5 15:48:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6M7Y1PXJz6QmTG for ; Thu, 05 Feb 2026 15:48: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6M7Y0l0kz3jSD for ; Thu, 05 Feb 2026 15:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770306489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8idbgmfJOjDbW8ShSEb2VmBiMcbls0ao1zvQ1ecjzSw=; b=IoQhn06D+wk/ifRE0ZPnCUHTb7QjJdsWfo0Kf/7yNsjLmHMGkycLPUVNjZ8OM2KSIsScSW 8eAE0GsHgp5VYXJh5VLHNgZHOS7OxgDQA89kjj0FnnwXz5E5GvJLq6l6cYUsgR05QHlnNw ACTB37bUXe6m/F/tpxDuJRlM+h0KVpD086In1WklQXfsUp/jxKsBvAvjv/cBVYXwwZZtU2 qQ1S15gCEO9WyBoNnd7zowyYobXVHyOd3IJgTeCkgOSOTITZVxY5VNuF4eiby/7xImST+N jfuxqrJTGkggE8c8Bm3k2HtywH23MDD3e2zDW4PFSWT237cBI+Rp//RjZThsTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770306489; a=rsa-sha256; cv=none; b=c+AeisgQwE+gc6M7KWOGalAKiK9Kntd94cokSw7ZdeZl8dcWtJqfj6J7yEMl3nBYl9G2ir tK37Y8CeKGGkFTxCgtYvaCYksWZjDc5396/Qsy+ig+aa6k5YwFfSN20PKOPl2yQsbG4ori oP5EnA28aLuiIRUsJN5CZERDbgCEHEZZrcZkezzqY8wiuyFLul2Z7j3vN52FyDtdG89DCc T5GK7PbEMHiNNEuVPuZdi0mVv3ErcrgIwwuT7+XJs5+RPuFJhuMytIYsQ10n3nxVwUbG5H /CbPF03PMfp7IvKt7llQPIDSSBPlQZr6nkD+YomwBk+P40HxlgNPrwx/hVmq2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770306489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8idbgmfJOjDbW8ShSEb2VmBiMcbls0ao1zvQ1ecjzSw=; b=f8L+51X2XVH6y4laTHQ6y5iXlruVKEVpf/LF7kKYoRlziqS/2TDGpoITzkA6VOVHcNsxSj sJwVqX3iHLPluXjqEV4ACteNJLOKcEM59uS/ALl+QgvPyUa57A/sy4Z8fnAVgRu2bVUYkK vpjt5dGeGkMsR2+8Fe7tEyK9bvE4qsjMctD/d4m+uorHche/YCTyXN8dk6G5iJObmFx9+H kRf5a07icktS8Ojs+UOMBYKXHfQOWwWkmvF065xIv5KdWysruK7wiRYN8R2mlG27JUwxZQ sIh3suv/+W/MGT/XlbjfEHo+eWcpERi5nN0OhIUtDdQY6ET9CCg30OdspO10DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6M7X6pkvzcQY for ; Thu, 05 Feb 2026 15:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:48:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Felix Johnson From: Alexander Ziaee Subject: git: c5ee920c3f35 - main - wpa_supplicant.conf.5: Remove removed variables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5ee920c3f35c5f0f485a7a274d87ebd91469892 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:48:08 +0000 Message-Id: <6984bbb8.19d93.458c1042@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c5ee920c3f35c5f0f485a7a274d87ebd91469892 commit c5ee920c3f35c5f0f485a7a274d87ebd91469892 Author: Felix Johnson AuthorDate: 2026-02-05 15:46:49 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-05 15:46:53 +0000 wpa_supplicant.conf.5: Remove removed variables 2005-09-25 - wpa_supplicant v0.4.5 removed "server_nai" 2008-02-22 - wpa_supplicant v0.6.3 removed "eappsk" and "nai" PR: 284126 MFC after: 3 days Reviewed by: carlavilla, ziaee Reported by: J.R. Oldroyd Differential Revision: https://reviews.freebsd.org/D49010 --- usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 index 852d83f463ce..59dc8be6a99d 100644 --- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 +++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 @@ -405,12 +405,6 @@ but for EAP inner Phase 2. Like .Va subject_match but for EAP inner Phase 2. -.It Va eappsk -16-byte pre-shared key in hex format for use with EAP-PSK. -.It Va nai -User NAI for use with EAP-PSK. -.It Va server_nai -Authentication Server NAI for use with EAP-PSK. .It Va pac_file Pathname to the file to use for PAC entries with EAP-FAST. The From nobody Thu Feb 5 16:25:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6My44Rwnz6QqPF for ; Thu, 05 Feb 2026 16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6My412Hmz3pLF for ; Thu, 05 Feb 2026 16: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=1770308700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jK7ANRZ6sOZO+CTy2/zMQRnZiBgxKgIS23f4Bufj6Qs=; b=C5TbUr+ayPY3DFkg3xBgtXnjtrk4Puv29BjCuzvn7dGMNISCkG8nOFg2XsK6Vdgcrs28br +P4HCnsheFo9Euix7z/avIZWis8V3PdGv7w9N0VXdSMC7Qi1AriEf5LakxnWnWedqsgupU DVDMhPu0DYdjJPuoM4lP9wPXcHFnAlW0ReuTDHTP/649o7Obz5sBFgnSjy+GA9L2C1RqRn eJZ8DcHFWZwOjNLjwRuB353pzdTf9m9hlSO14S6vX0wMSrtjb6wYHI6fM3TONz90QiVL8E USBCBnhIA9jCeXkuXnt371LiLIDbB6TKvGM/47ZBEuJQFt+AR5PKutfkM013xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770308700; a=rsa-sha256; cv=none; b=tUb3sBd+41l4aEMUm6KgdhEk32kclRkA8yZG6Q3fPoxdjZqudjPZCexTpnwtvP1rsjvwzF u06/Efnuu/EBxoKMbK6pqgHaz1t010+1oYu9wHnTU68qimY6TQeZUjmYSAhjiylTTfYWIs 7Y2Nmf2G6+V2i5LrKQgYxEVhDCSyanuM4tGH2onpvrpM+qKmXYaE7aeG6BlhTgEbDlsrw0 NGh6xPiYxFLWIBQJvd7JVDRc01NOZnE/V/nishz6dh5qKpMtManLGukh4pmyS/VEutLalA OCGyBcXzXwFWIgUbw+Sr+UPL8sVUl705Lv5vbGQWRCfMJxMopprnBLOrE7Btsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770308700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jK7ANRZ6sOZO+CTy2/zMQRnZiBgxKgIS23f4Bufj6Qs=; b=AC/RCwVl6MtBCZhbCoP6Ki82AxV3KCaYzXwtp++l4VsqmOEbyZ8YgKzR8BXrPKBLRJ+GIm DNnUFGEm/utdzum7bWYFXoAm5Hm9uXt14TsjApYR4SRkW+Wg5dD2pVjdceYzScaysZucBp epwDWA4I3iAu59ClSkl8MgY5niS+OeTbZxcVMOt4iNjU7dwm/VhtzJwlyEN1Uug+SnmUXi fPURC3fWBZJPJNJmXA0H3k2tZzd/bRO1bU/p1dnk3uSWeiioItL8+IyidFMT/Mx/eo4g7/ FqwfU4XhjGLBFSZtUeivNywtlqfVgNlnKd9YrT5qt2UPBWcj/8SZsrm13Vlheg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6My407rFzd5Q for ; Thu, 05 Feb 2026 16:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d0ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 16:25:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 157d6664aeb8 - main - diff: Correctly declare tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 157d6664aeb815db3b758bd3038fd1512a0f4e2c Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 16:25:00 +0000 Message-Id: <6984c45c.1d0ed.3f384bdb@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=157d6664aeb815db3b758bd3038fd1512a0f4e2c commit 157d6664aeb815db3b758bd3038fd1512a0f4e2c Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 16:21:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 16:23:53 +0000 diff: Correctly declare tests Sponsored by: Klara, Inc. Fixes: 5fc739eb5949 ("diff: Fix integer overflows in Stone algorithm") Fixes: 270492602b9b ("diff: Add test case for pagination resource leak") Fixes: 590126789c84 ("diff: Don't compare a file or directory to itself") --- usr.bin/diff/tests/diff_test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 0c8147c7ed18..6ca19a8f20cb 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -24,7 +24,10 @@ atf_test_case functionname atf_test_case noderef atf_test_case ignorecase atf_test_case dirloop -atf_test_case verylong +atf_test_case bigc +atf_test_case bigu +atf_test_case prleak +atf_test_case same simple_body() { From nobody Thu Feb 5 16:32:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6N784klgz6QrC4 for ; Thu, 05 Feb 2026 16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6N7845Fnz3qTp for ; Thu, 05 Feb 2026 16: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=1770309172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XBliwfIApF9kSqKwSijHc8gyczw0AMiFXbaqFDIeraw=; b=scuvAitIhqzZKH2MlzJrKhRWVg/sdd3KjjUVebCGK5PhLagMg437bjZqdRUHSYBUuGPBas lk+iUZjl80llnjtXwIIjEvVnn5JkcfL1ncOoVcsroFAY/kjYFSNDwJ43be8g3TbgdMqIB9 limIHvFzNrnGLPxQq1MhsXLlJNmstQ0jvwt6OStMVFOainXF/WfjvcU5oGHZ10RK+qh+V5 aaSscV8OKZK5rxxtGBwyCAirxMHMHZPLKVAKD/BnNNaEkmax9YzJCw4sAnNx3UhqpCuef1 KIZlxq1KcRQroi+U1NgUzdicqkfs+TqvzlrKImnHV1kbejYhWh7iM5YKB+J4fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770309172; a=rsa-sha256; cv=none; b=asMOPCK11Fx2UUZ6hvQ7AvhSlMJCY+J8aor6KnBVb9azGO/psvNs8Tzf76xPqPg1mVQW2y FzugwDe7cb8M9b7vCAeJrjl+sJRQyEQh0rJRAaFcQbAhntBa4D0l3IlxtdO/MDt/7cCL2T S7cngcIBovZYTHTq9KYPr8ZMC265r+KvnQ0ljUbzciLJErwxpvj9vhNf93GkIeWkXeSzqi safZkduVio9w9jMGODfrdyMk9TXi0VFLoTpynVmoyqgyIbi6Eluqmw3r3c1ughWrZbwahR QxfEjt4lBZPqf73M7KCjYbMr8jpAAVLbYb/ZdUJXCFO0VMrPfbzE2GK4/NvLew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770309172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XBliwfIApF9kSqKwSijHc8gyczw0AMiFXbaqFDIeraw=; b=sycO25pvKGtrb60J/LzfkeZyhgHcII69Eaig2mY2r21cCdael08BVRxo/9/+TmznxUYqvp xmd+bZ3jnyEjT1HyisUV0l9AW+Ixl6UjaHnfacfbSDUU6eObMjodS2/W3c/3nVmSmPmLPm W63TTN/YwtjUNFMray/999sfgKX+Fv+9pPemJD/vaiMFRLFmFjOeE8Y/bKJZrRpd5g/zzD ht5XQvD8SdwIv9/KCO6hdLHA+YwF0wgVH7wBU/JAHb9eY8W4l4OUGiQhk0UZ8IHJZe/ERb yuCM3k74nTSRXs3FBtLBAYDJdKE4jlI0lK2+ZupThuIKnxNmrvQRdcbDt4jkew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6N783V99zdtK for ; Thu, 05 Feb 2026 16:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21383 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 16:32:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: cf41d1113377 - main - riscv: implement kernel ifunc resolution List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf41d1113377c44be5aad20c2f7ff2c5324ca89f Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 16:32:52 +0000 Message-Id: <6984c634.21383.77117d13@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cf41d1113377c44be5aad20c2f7ff2c5324ca89f commit cf41d1113377c44be5aad20c2f7ff2c5324ca89f Author: Mitchell Horne AuthorDate: 2026-02-05 16:11:25 +0000 Commit: Mitchell Horne CommitDate: 2026-02-05 16:32:16 +0000 riscv: implement kernel ifunc resolution This completes the set of architectures implementing this feature. Move the calls to sched_instance_select() and link_elf_ireloc() later in initriscv(), after identify_cpu(0). There will be more information available to any resolver functions at this time. Reviewed by: imp, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55082 --- sys/conf/kern.pre.mk | 5 ++--- sys/kern/link_elf.c | 2 -- sys/riscv/include/ifunc.h | 2 -- sys/riscv/riscv/elf_machdep.c | 11 ++++++++--- sys/riscv/riscv/machdep.c | 6 ++++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 93e291b45bb6..cf5e4a96ad49 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -119,10 +119,9 @@ CFLAGS+= ${CONF_CFLAGS} LDFLAGS+= --build-id=sha1 .endif -.if ${MACHINE_CPUARCH} != "riscv" && \ - defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" && \ +.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" && \ !make(install) -.error amd64/arm/arm64/i386/ppc* kernel requires linker ifunc support +.error kernel requires linker ifunc support .endif .if ${MACHINE_CPUARCH} == "amd64" LDFLAGS+= -z max-page-size=2097152 diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 2a9e2a02709d..4c77f444d961 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -2041,7 +2041,6 @@ link_elf_propagate_vnets(linker_file_t lf) } #endif -#if !defined(__riscv) /* * Use this lookup routine when performing relocations early during boot. * The generic lookup routine depends on kobj, which is not initialized @@ -2104,4 +2103,3 @@ link_elf_late_ireloc(void) relocate_file1(ef, elf_lookup_ifunc, elf_reloc_late, true); } #endif -#endif diff --git a/sys/riscv/include/ifunc.h b/sys/riscv/include/ifunc.h index 0d91014ccce8..0f9747a2aa14 100644 --- a/sys/riscv/include/ifunc.h +++ b/sys/riscv/include/ifunc.h @@ -30,8 +30,6 @@ #ifndef __RISCV_IFUNC_H #define __RISCV_IFUNC_H -#define __DO_NOT_HAVE_SYS_IFUNCS 1 - #define DEFINE_IFUNC(qual, ret_type, name, args) \ static ret_type (*name##_resolver(void))args __used; \ qual ret_type name args __attribute__((ifunc(#name "_resolver"))); \ diff --git a/sys/riscv/riscv/elf_machdep.c b/sys/riscv/riscv/elf_machdep.c index 5bd4af4c15f8..b52050e56a14 100644 --- a/sys/riscv/riscv/elf_machdep.c +++ b/sys/riscv/riscv/elf_machdep.c @@ -271,10 +271,10 @@ reloctype_to_str(int type) } bool -elf_is_ifunc_reloc(Elf_Size r_info __unused) +elf_is_ifunc_reloc(Elf_Size r_info) { - return (false); + return (ELF_R_TYPE(r_info) == R_RISCV_IRELATIVE); } /* @@ -501,7 +501,12 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, (local ? 'l' : 'g'), reloctype_to_str(rtype), before32, *insn32p); break; - + case R_RISCV_IRELATIVE: + addr = relocbase + addend; + val = ((Elf64_Addr (*)(void))addr)(); + if (*where != val) + *where = val; + break; default: printf("kldload: unexpected relocation type %ld, " "symbol index %ld\n", rtype, symidx); diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index b213e8812bc7..0214426eea18 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -479,8 +479,6 @@ parse_metadata(void) /* Initialize preload_kmdp */ preload_initkmdp(true); - sched_instance_select(); - /* link_elf_ireloc(); */ /* Read the boot metadata */ boothowto = MD_FETCH(preload_kmdp, MODINFOMD_HOWTO, int); @@ -626,6 +624,10 @@ initriscv(struct riscv_bootparams *rvbp) */ identify_cpu(0); + sched_instance_select(); + + link_elf_ireloc(); + /* Do basic tuning, hz etc */ init_param1(); From nobody Thu Feb 5 16:32:53 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6N795nCBz6QrDN for ; Thu, 05 Feb 2026 16:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6N794cqNz3q76 for ; Thu, 05 Feb 2026 16:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770309173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcRVIkqDJl4yKkC+LJaC2P00Fxep/dpfMpSCV/sRCFs=; b=hAf00Hn/TYD3qpOQ4yVzK/c/lFQyyk9hvWpBvSK9hLWmYNwnV43Tml/6DtPWbJgKR3f4vP ctLWRSe1yjhCvxjdymhXE2CNUZ28R5PPUrpYBR9hpXFew66kIP5VVQn31zGmi/dDCPYXwN fX1XEyPipTEsjw7AiiZTJ4JcIv3dpE72SssZt8jZcT5ZdFyHRiSV2QOxBGT/6jcdyyZKaA fNHl45OAdQhpuSl/mN5D+bLQv7Od2SF0OlGx40BMqBt6otRNzBgKAYfbJ8ohipm+DMnmy2 ym11PIEHcWOCV4wQIOnwQH4JKv8eBVfSf5b4lnD9lxsBJfR3Yu4lhbHa/YedqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770309173; a=rsa-sha256; cv=none; b=u0ukHVByXXTvbZdwgXjUu4c/Q7hZT/ytTPa9dIQ/MF/KWszmjaQAM/eDkW8qvJfAcnQe5f 0Bo9fTc+2Sz4fUnsSxIL02vHl2+cK0gamgTLQR2vr2pkwO4EWfciNorD1kSJCNupRvhkfD AD1xF/5uUWP11vIzex65Da9qukI5mJo/roUcXCoa5OL8a9mTkZC2tPsYNKAwFElkwtYvHZ iUTxF3tHx1RzkIo8IpBatRFDMINOKzMTkFwlqX03NjRhdU1mWcWgr0DmWmWLPfr+QSSwhg cfKTc2Z6Ptf8BoRLRoF5OHvt1RXmWSnbtEvnxML7I3laP+64sM/A/FSV3Q0aaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770309173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcRVIkqDJl4yKkC+LJaC2P00Fxep/dpfMpSCV/sRCFs=; b=kGEHpe3ahx5rnvEIOKLoQOV9GRYD2YJvmRgBlbHZcPBPuzDiNqZAvW2kb1O/ZnoD9JCbIL uWWobKSbvk2tdom7E4AH1i2nS9NqK2yukrrk7b64XP6OnCh+tDayjurow/s5M+uAoNVTW5 cqtjK4jk5bpJUOCtGvINQkihf1+hNdvGmlgr+slxyqwEpMUdDjBTux+C5fAyHLWqy6gQY5 CYpFuoxxOi64CGlekFrweL5JzR4yj6QOE2LNwgmObTzDhovxX0AnkIxSwpO6y6cYGE151N NvNrSDV1iKpouk3rg80BZsejfvX9Z0ps7H9J5+OhDnNuwg8muFASjUVLuMCQEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6N794C7pzd8Y for ; Thu, 05 Feb 2026 16:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e072 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 16:32:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 0d3652f67d24 - main - sched_shim: Drop the no-ifunc case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d3652f67d246348e2c017205c6782caf4484449 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 16:32:53 +0000 Message-Id: <6984c635.1e072.359146aa@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0d3652f67d246348e2c017205c6782caf4484449 commit 0d3652f67d246348e2c017205c6782caf4484449 Author: Mitchell Horne AuthorDate: 2026-02-05 16:12:03 +0000 Commit: Mitchell Horne CommitDate: 2026-02-05 16:32:16 +0000 sched_shim: Drop the no-ifunc case Now all architectures support kernel ifunc resolvers. Therefore, the alternate implementation can be removed. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55114 --- sys/kern/sched_shim.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c index 83e4412494d3..2b1dcecda433 100644 --- a/sys/kern/sched_shim.c +++ b/sys/kern/sched_shim.c @@ -22,20 +22,12 @@ const struct sched_instance *active_sched; -#ifndef __DO_NOT_HAVE_SYS_IFUNCS -#define __DEFINE_SHIM(__m, __r, __n, __p, __a) \ - DEFINE_IFUNC(, __r, __n, __p) \ - { \ - return (active_sched->__m); \ - } -#else #define __DEFINE_SHIM(__m, __r, __n, __p, __a) \ __r \ __n __p \ { \ return (active_sched->__m __a); \ } -#endif #define DEFINE_SHIM0(__m, __r, __n) \ __DEFINE_SHIM(__m, __r, __n, (void), ()) #define DEFINE_SHIM1(__m, __r, __n, __t1, __a1) \ From nobody Thu Feb 5 16:42:06 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6NKq0pPbz6QrTK for ; Thu, 05 Feb 2026 16:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6NKp73S9z3rLl for ; Thu, 05 Feb 2026 16:42:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770309727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kk1ULucXVg2neUFkgRUsg9bwBJdpXVGaoqi3eUEwYpE=; b=TojzqHW16DQfD0pAxnhTvYH4maa9ncwAD/RlwrowyloKlKSnzTA2c9+sApWdjV90u/dmm/ 3hvhQ+eVXJ9BLG9ejnM2IYg21VsJdCjR18pzYUJDkeq79iAtZ9kGaHdXdT0WWdoj0ahJj+ NOWqahFlj4b2mkEvU6HsanAK3l73lncLPNh7sNhcmv40S1SW1ECKcCPnzaN6EYmBx1Eo4i WG1OF9FiYwnPoK8blQa7bM7RgIx8FJgextO3qtBH7zAIzAVefE8f5pQdzMFsrAreMX/c8A SALv45cMInO9aksEWKotj2OObu7uq82h3Q+3D9izN5gnvjdYZpm0eTgbpprR7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770309727; a=rsa-sha256; cv=none; b=AGjP6YDdtaOFPKn1LwfrLnlnT8NXMpWxvFS1vO0Xq8Rx4ijaHI7/7U/cs4LX2M9iRTS1w3 mZPf0U5Fqix/mUCPcsBqyK9X9jG5y+t0SJdl1vzhb1h4ybmRRRtziLPt+cnlfJKXv1lce5 w08vfokjqD5cdybBJ9cGTVYuW1ShYDdGufOwNhuyupjpN+8BpjvTBdTDzZ9sW1rclAsEo+ 9HVbpwk+bRhj/7dBnfHiwql3gz3GrCGjcD6Rgp2BOZhubO6BRgrylly1bcnZ56C+EWOh7f OygEWLwts47OQHpXUwOHFllhqp/xuNezWEV7NLjdz8hQlRUOw3lmn1LxonZpOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770309727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kk1ULucXVg2neUFkgRUsg9bwBJdpXVGaoqi3eUEwYpE=; b=o0AwHueN9tT2qyy1jCOYhqE5wacFUtd5bQoCPJHqGs3v1YkUuyVz/V62HNJz17i4/auL1p 89sle36lmqf3iY0vv86ZSB955H3HOvvN4dfA6nah25UTumr6PLuiYBL9ClScrPLhK+JswZ sWAWbRGrh1Eahiesf/pN7C9LVaORmW2LScJH4n/0C6U3Bn+Bdn4ePJH1a8CyijBgmjRIHP PF+1HKay8zdbvXYdWVl+CvpTgzy/dm3FpZiIEpF/cNe/NPLVbKmkbFX2tqVNp5CimMVlCz JZEy0VxLgj8FzMnhP2yGhpxuXPh0CJcHpfXXH290lmxFuBbHWsWeHrMk0OHCCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6NKp6g2yzdvC for ; Thu, 05 Feb 2026 16:42:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2141e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 16:42:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Timothy Pearson Subject: git: 1364e7d0921b - main - powerpc64: Fix disappearing low memory on radix MMU systems (POWER9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tpearson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1364e7d0921bfd79738dae80748d836730e39056 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 16:42:06 +0000 Message-Id: <6984c85e.2141e.13103b45@gitrepo.freebsd.org> The branch main has been updated by tpearson: URL: https://cgit.FreeBSD.org/src/commit/?id=1364e7d0921bfd79738dae80748d836730e39056 commit 1364e7d0921bfd79738dae80748d836730e39056 Author: Timothy Pearson AuthorDate: 2026-02-04 05:16:39 +0000 Commit: Timothy Pearson CommitDate: 2026-02-05 16:42:01 +0000 powerpc64: Fix disappearing low memory on radix MMU systems (POWER9) The FreeBSD radix implementation piggybacks on the physical memory allocation function from the HPT implementation, but did not share the same state information for number of physical memory ranges. This led to a situation where the HPT physical memory allocator would attempt to shift the physical memory ranges in the shared range table, but would use the wrong number of entries, thus overwriting the large segment of low memory that should have been available for e.g. 32-bit DMA. Incorrect physical memory map: real memory = 33997058048 (32422 MB) available KVA = 34359619583 (32767 MB) Physical memory chunk(s): 0x0000000000003000 - 0x0000000000002fff, 0 bytes (0 pages) 0x000000000000e000 - 0x000000000000ffff, 8192 bytes (2 pages) 0x0000000000094000 - 0x0000000000ffffff, 16171008 bytes (3948 pages) 0x0000000100000000 - 0x00000007a2042fff, 28487987200 bytes (6955075 pages) 0x00000007d0006000 - 0x00000007fc72dfff, 745701376 bytes (182056 pages) 0x00000007fdc00000 - 0x00000007ff79ffff, 28966912 bytes (7072 pages) 0x00000007ff7d1000 - 0x00000007ff7effff, 126976 bytes (31 pages) avail memory = 29190103040 (27837 MB) FreeBSD/SMP: Multiprocessor System Detected: 16 CPUs Correct physical memory map: real memory = 33997058048 (32422 MB) available KVA = 34359619583 (32767 MB) Physical memory chunk(s): 0x0000000000003000 - 0x0000000000002fff, 0 bytes (0 pages) 0x000000000000e000 - 0x000000000000ffff, 8192 bytes (2 pages) 0x0000000000094000 - 0x0000000000ffffff, 16171008 bytes (3948 pages) 0x0000000002000000 - 0x000000000284ffff, 8716288 bytes (2128 pages) 0x0000000004627000 - 0x000000002fffffff, 731746304 bytes (178649 pages) 0x0000000034040000 - 0x00000000efffffff, 3153854464 bytes (769984 pages) 0x0000000100000000 - 0x00000007982ecfff, 28323008512 bytes (6914797 pages) 0x00000007cc20a000 - 0x00000007fc72dfff, 810696704 bytes (197924 pages) 0x00000007fdc00000 - 0x00000007ff79ffff, 28966912 bytes (7072 pages) 0x00000007ff7d1000 - 0x00000007ff7effff, 126976 bytes (31 pages) avail memory = 32984436736 (31456 MB) FreeBSD/SMP: Multiprocessor System Detected: 16 CPUs Signed-off-by: Timothy Pearson Sponsored-by: Raptor Computing Systems, LLC --- sys/powerpc/aim/mmu_oea64.c | 3 ++- sys/powerpc/aim/mmu_oea64.h | 1 + sys/powerpc/aim/mmu_radix.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index c82c5c539de2..a7042ffb02a9 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -164,9 +164,10 @@ extern void *slbtrap, *slbtrapend; static struct mem_region *regions; static struct mem_region *pregions; static struct numa_mem_region *numa_pregions; -static u_int phys_avail_count; static int regions_sz, pregions_sz, numapregions_sz; +u_int phys_avail_count; + extern void bs_remap_earlyboot(void); /* diff --git a/sys/powerpc/aim/mmu_oea64.h b/sys/powerpc/aim/mmu_oea64.h index 38b743159980..bc93cf4d521d 100644 --- a/sys/powerpc/aim/mmu_oea64.h +++ b/sys/powerpc/aim/mmu_oea64.h @@ -139,5 +139,6 @@ extern u_long moea64_pteg_count; extern u_long moea64_pteg_mask; extern int n_slbs; extern bool moea64_has_lp_4k_16m; +extern u_int phys_avail_count; #endif /* _POWERPC_AIM_MMU_OEA64_H */ diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index a12142fc2d7b..85008de83870 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -632,7 +632,6 @@ static unsigned int isa3_base_pid; */ static struct mem_region *regions, *pregions; static struct numa_mem_region *numa_pregions; -static u_int phys_avail_count; static int regions_sz, pregions_sz, numa_pregions_sz; static struct pate *isa3_parttab; static struct prte *isa3_proctab; From nobody Thu Feb 5 16:52:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6NYx1gFZz6QsfR for ; Thu, 05 Feb 2026 16:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6NYx0nsZz3tXV for ; Thu, 05 Feb 2026 16:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770310357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tzZUVC8lPRJ0tdPetKPL7nEW2butpE9MQtawJu3XB0o=; b=uZOe5nrV8awQFzEt3h7qfnq4IHQuuT3L9E21Zmtnkk5b/y0GsD95EypUQ5nMzHaUJ4CQiw dIaHy2QuCw/eF94HIMg5frd+3FP0lBOEfGwn5uJ0n1DlN5Sz0WIlSR7nbn68j1+G5q4cB7 6NRGRsZVpcmSxbf6Sm8OCLcSehaiOeR4wdDZbpSxZhIG0F16F8demsxz9N82rI1QFCRUu3 noaCdAYgsOCQMKgdrFxOH/bM2MVl2/9xMhiYgA/2HsVW5jktRCd0Kw3V/oVbzOXBM8VFbb rs65lX7wTUH1hr91NjhSIhBrGV4S+5WowGZZS1iTxhXOke5jlNVwgrEjzfaJlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770310357; a=rsa-sha256; cv=none; b=BYlHbm8kth6sl6UDfWi7IYGqmIhsrHUP61+qFxNN3Ns3QdlpUPUGxvMdIDYDse9/JwSBTz aXcPYJq5JaZbJJ5tGlrvBwD8QFvhTIWsH0qnHuYX7cupByQ9P9V5t/1O2rzVOz/xiCDgzl 53RDqlnrnVhuqa41eq7NwNBi93ex/vtsqahulgRFGUFVbakrrjt/PKeTIKR4rdvHCG6CXa wM06oI5tyopQ6uWColt6nCZs2ZgTMfpFonzIdk0HMVX6n8r+XIfykeHx3DxAPCvbR7sXfS yaktFa+5jxlyLLdrc+f1KF0A1vJRgBZ8wJUvy+SemNdABweQ0PfWhZ46JuAIwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770310357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tzZUVC8lPRJ0tdPetKPL7nEW2butpE9MQtawJu3XB0o=; b=lDkzxYzGa95btGvnPuflIXlA3uFMxrAbm0YS1B2cnJJxWEIH8GqeXTWhaYQNGtxNnpM/Kt SujVi6h/SkaWEgzwm+j6XsR4BDVvqvjxYm3GvugwyBXYZU0b8oCNPwHQgRtV7hJOgVO4uX ZzSrT4+4EhJVGghbVhcW5MABpbQ/XOL3uYveUyQ7hK0x2jnkXQUflDij8eiAIdXoJRVniE 0rCMeZUoegJ+PS/v2JkP/hKs8Oz52meXfZPkq34xZGLc0lMEYJsiZ/S2Qy8fikvFz8GakY sR/1oG69UVi/MDOuQEMNQefByACLC6IGYD9nyFAoRcZykqifbG9hVt/AfCq/gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6NYx08DQzdw3 for ; Thu, 05 Feb 2026 16:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21734 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 16:52:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 39148cbead21 - main - usr.sbin/jail/Makefile: remove riscv linker workaround List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39148cbead211163f7e5a203d7c88ece5c3e30e0 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 16:52:37 +0000 Message-Id: <6984cad5.21734.7c3f381b@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=39148cbead211163f7e5a203d7c88ece5c3e30e0 commit 39148cbead211163f7e5a203d7c88ece5c3e30e0 Author: Mitchell Horne AuthorDate: 2026-02-05 16:41:31 +0000 Commit: Mitchell Horne CommitDate: 2026-02-05 16:52:22 +0000 usr.sbin/jail/Makefile: remove riscv linker workaround It links fine with newer binutils 2.44 (and GCC 15), so the workaround can be dropped. Reviewed by: emaste PR: 242109 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55083 --- usr.sbin/jail/Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile index babe7b9459c0..37400368da76 100644 --- a/usr.sbin/jail/Makefile +++ b/usr.sbin/jail/Makefile @@ -14,13 +14,6 @@ CWARNFLAGS.jailparse.c= ${NO_WUNUSED_BUT_SET_VARIABLE} YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} -# workaround for GNU ld (GNU Binutils) 2.33.1: -# relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2' -# https://bugs.freebsd.org/242109 -.if defined(LINKER_TYPE) && ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv" -CFLAGS+=-Wl,--no-relax -.endif - .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif From nobody Thu Feb 5 18:23:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6QZN1TP7z6R0fG for ; Thu, 05 Feb 2026 18:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6QZH035zz48sr for ; Thu, 05 Feb 2026 18:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770315783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QVDKkr/hOkQuUHOtkNf2L1q4NUBZexmgdtqORLVUGlA=; b=AbVxo0ixptwYxTBSNJDHdwMazVRSzfo161Q4zslTnrU2Z1fl58fq/Mj6UQjTojiK7fq1vZ fZCLSiIdHgOxyV1CYvlpnN76FHAsNYkpcKsJRoP2o0crprJLqFdES/tNO6Rse6hlHuu4ow JqvEXoO8g680Z4iRTc4/HOazcbPS4zhTpSzijbWktW9R5QOxgodUtHh1sJtCy7uo1f9h8d DOF4Dbv6m3tCJVi5ysCngyENOmcwmQ50yKByyjBeEeHa+vLvxQFSc5lu2mD3Ufscn1App6 TcU9YwOfgvbg+ykAtvVtGNzW3gIg8bGVY2IlSEwtAL/ncLzVy9m0Fl2dvj6eAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770315783; a=rsa-sha256; cv=none; b=sF0LY0KeVQyomt7HjYrUZTohcpIaPiYPU7VSxhZkkI4PnrfiNzOjuNyIg4uRfFx5hBH0kx b837eERFou4OWVneyB1VY48DmsVN+A3vVyKNRJgYVUH4YDgVy9PFZRE/k2BtKNvM03OlNY rOHBYbvHM0dFEEoBeb4IJBlT6UtwmF5h3hAQL1u2BkNEbBgO/QEQk12BZJPq1FhyAqmH2H VdeLD+hW/H4GO2OGC+zM+02xay5Fd6m2Kp96DueFB8bTYIFAs3v3zLUqMKyM4OK1dk7xJ8 L5aNB2hKCAhOCeV3mK4J1iVItIWTm32sM/GPV15sLxB6kykvafUV5T3+PwOmkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770315783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QVDKkr/hOkQuUHOtkNf2L1q4NUBZexmgdtqORLVUGlA=; b=vgUCeQLm0Xo/0KiTNuXHZjw7DE+ooQUSIkJqscU5rF6PD/kUGc5lOl/IU8ziGhMsFCHEhT EnVxIPOwPdZcYqzeRF61sELvEHTFKu9+Yvv4DiFRUFpVlcTYlzaRp9obKKZReCHVEk5LfW XW8iTnUHbGPruDkuyfWQLuR7PvU/5HC4HxNEmVeX7dYRPfZ2XDh2wZLgX8u/gxgjq/rWvO MRN5tHwfWb5z6cslMihKLhYvnqNcQMnrCnzfsyD47ixYgdcbwgVER7yCCO44aMww7Ng4Fm PzMII0BXj9aP8nfzaPW9t/kU6NNeB9kMp+WIjrWP2dpNjf8O3VWjN421TNs5Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6QZG6jLczhYD for ; Thu, 05 Feb 2026 18:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 336a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 18:23:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b773da180e02 - main - MAINTAINERS, CODEOWNERS: Update capsicum-test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b773da180e02c0c27de48dbba72f3fb7a64656da Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 18:23:02 +0000 Message-Id: <6984e006.336a1.33d64e1f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b773da180e02c0c27de48dbba72f3fb7a64656da commit b773da180e02c0c27de48dbba72f3fb7a64656da Author: Ed Maste AuthorDate: 2026-02-05 18:21:27 +0000 Commit: Ed Maste CommitDate: 2026-02-05 18:21:52 +0000 MAINTAINERS, CODEOWNERS: Update capsicum-test Fixes: 670b568ec1c3 ("capsicum-test: Move out of contrib") Sponsored by: The FreeBSD Foundation --- .github/CODEOWNERS | 2 +- MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6d55fcfe2003..f928a489642d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -117,7 +117,7 @@ /sys/x86/pci @bsdimp @bsdjhb /tests @ngie-eign /tests/sys/aio/ @asomers -/tests/sys/capsicum-test @ngie-eign @emaste +/tests/sys/capsicum/ @ngie-eign @emaste /tests/sys/fs/fusefs/ @asomers /tests/sys/kqueue/ @jmgurney /tests/sys/opencrypto/ @jmgurney diff --git a/MAINTAINERS b/MAINTAINERS index 307932dee240..b33f0f9a9d78 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -36,7 +36,6 @@ subsystem login notes aio(4) asomers Pre-commit review requested. ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org contrib/atf ngie,#test Pre-commit review requested. -contrib/capsicum-test ngie,#capsicum,#test Pre-commit review requested. contrib/googletest ngie,#test Pre-commit review requested. sbin/ipf cy Pre-commit review requested. contrib/libcxxrt dim,emaste Pre-commit review preferred. @@ -112,6 +111,7 @@ sys/netpfil/pf kp,glebius Pre-commit review recommended. sys/x86/xen royger Pre-commit review recommended. sys/xen royger Pre-commit review recommended. tests ngie,#test Pre-commit review requested. +tests/sys/capsicum ngie,#capsicum,#test Pre-commit review requested. tools/build imp,jrtc27 Pre-commit review requested, especially to fix bootstrap issues. top(1) eadler Pre-commit review requested. ufshci(4) jaeyoon Pre-commit review requested. From nobody Thu Feb 5 18:49:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6R993bMbz6R2j8 for ; Thu, 05 Feb 2026 18:49: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6R986kmrz4Dvg for ; Thu, 05 Feb 2026 18:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770317389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWAn5bV2eh7YA4J02hTf6UcPRv8cguIScdakcrO0d/8=; b=GiX3tgsqIyklWAQHKsX8KIcVTjs5uCPN/wNagt80Sn1KzxMhKOKiub/kg+t83m4ou1843k lD6jqL9+twK416JbEggYS7krnGn6NbpB9qT2lsYsSbQsfey4kJx0ySTBkaq5xVMcSSnXdt YMUK1m91C4G1qoAA5dIFzQhQb5E04q58NGVH+oPUU0KqrdIbO/coWkZrcoE2bn0DH8L9h/ lwvumXVvZZe7oQmqDmfOJ6MNgxm+tNbfiSxlXbs/xwzZ9XnP84gP2/l5pGFZOPfQRozbER dzDI6NycGKXxwIH0XBX+8VCKapkEVhrp6CG1X2vmVd4Yp8Ykygq5+h6W6eMe+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770317389; a=rsa-sha256; cv=none; b=wH4x9ItSMugneg86dyxICgrMhZJYgDhS+voeOMm5ZRmnD0r/7w3lg0kmPZkUlE5MRKIJhd 7RXjrq0tdO4K/ONhitoL2EpzS116xfPERNb5bHzWSEluMifu4sxx4yWqp3dadd49vDFilh e8KnpuiSyf4VFdV1/KDdRR5abUMFkCM8trADZw4G/iGDTMmxBrFkjn/A1pHcryadJdmmtb MkbiEnXTg7wowHOUtl7kh4XkrICnfVw7wD84KmenU6FFE0pr8hKOjoTqdYQLBvz4dX5xv2 w+CcR7YHcGvINrGy5nUTwG8NERsQpi7mDYNUNYOpvGhFNdrwXXE8ss1FM0VqcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770317388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWAn5bV2eh7YA4J02hTf6UcPRv8cguIScdakcrO0d/8=; b=rjmcZkWHo3uLH8mjcMVLt73JYiUTuAVyfNz7i+DvLa4ZvAvUCybwAIZqKz2gClaeMsopZW XWuK5IxVuer3f87SDabqx0hQgyqqGkR3YpkZ+VZ93xyHReilIzv2Kbv7OWbGgWMb6YvX9D YOBz3wzOWLSBhCaA+8T0SzsGnIu4An8Vhvsh0h5CXPJhEHTlbE4xCtHPWgKUQXrBtLdT5a xakJ6KRijgIDe/2622M5e8Oq+8NvPT1zrBA+9/v0Gt83cqkoseYKr5OGlqhTIs/v41J8Hb pQJ+rm6MDtiU31HA8nk+vLwW9gnHx1V7ZHDqOBWNFp28MAfU2TL9ZIZ6BfZbqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6R985hjPzj12 for ; Thu, 05 Feb 2026 18:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 337f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 18:49:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Ed Maste Subject: git: 5379c4627782 - main - bhyve/virtio: check negotiated_caps for indirect descriptor support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5379c4627782ebb2619f95a5784361c88472c8b5 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 18:49:48 +0000 Message-Id: <6984e64c.337f5.24cfed28@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5379c4627782ebb2619f95a5784361c88472c8b5 commit 5379c4627782ebb2619f95a5784361c88472c8b5 Author: Hans Rosenfeld AuthorDate: 2026-02-05 18:48:10 +0000 Commit: Ed Maste CommitDate: 2026-02-05 18:49:09 +0000 bhyve/virtio: check negotiated_caps for indirect descriptor support vq_getchain() erroneously checked vc_hv_caps for indirect descriptor support when it encountered an indirect descriptor. vc_hv_caps is used in feature negotiation to advertise what features our device emulation supports, but we should really check what features we have negotiated with the driver. Reviewed by: corvink Differential Revision: https://reviews.freebsd.org/D53465 --- usr.sbin/bhyve/virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c index 304156bf7416..a5ccbb9983a0 100644 --- a/usr.sbin/bhyve/virtio.c +++ b/usr.sbin/bhyve/virtio.c @@ -331,7 +331,7 @@ vq_getchain(struct vqueue_info *vq, struct iovec *iov, int niov, if ((vdir->flags & VRING_DESC_F_INDIRECT) == 0) { _vq_record(i, vdir, ctx, iov, niov, &req); i++; - } else if ((vs->vs_vc->vc_hv_caps & + } else if ((vs->vs_negotiated_caps & VIRTIO_RING_F_INDIRECT_DESC) == 0) { EPRINTLN( "%s: descriptor has forbidden INDIRECT flag, " From nobody Thu Feb 5 19:40:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6SJ148XFz6R64y for ; Thu, 05 Feb 2026 19:40: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6SJ11Nsfz4JcS for ; Thu, 05 Feb 2026 19:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770320449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmZglPug5iy8lNPKDeoQxgKV0AZYOiKS9xGcg4a0BRE=; b=SpsF56O7H5ZI9doCmNPeU/StUjNMRuRaw5zzCQA59Ij00FaDn28A6hAmb5OZq+M5RCHi7s XITYpa1a8IawEau9M+tT0g/UjHGgktHL+w9QerrE2j/C3/8GmMWGsvOQbQBuyllmJZaQgi FT+pmkJv5paOKRieB75y2D3RgXY/E9R2bn2onmK4gGEU77Y56MtMfa0J7wexqvhAjltBGX SKU27+W49hiZJwSm0im7v9c3DUWxbpF88VzQgXqCIFiVSJ2Zm1COUuHDQDMcmM4RqUc/ux oaDjg651l+LsTpx/zwogBwCkzIAgvLju3o3TpHQrHlOnIIeNE5q8XUfUqBh9Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770320449; a=rsa-sha256; cv=none; b=nSFVPAPFmeDLgd7GwW8GxIXuWsGS7u4rddRXBO6LHkOuN56YqqO/Y/Ir34kUdK7xulVHtj gt8AI4HgNhxkY18ETZgFdQ1k3rHOo6bi4rOHFlpxuha4jEZYTOUyPpr0Azbh52aiJm9rLn g6LauqmxFe0G7YHog3YNUVJOaNDvmt41n4k+A480pVXtz30wnL87JZoVi/f/G5oL/T6i3R Wx6PtzDlpKWS1J3zU4zdVghuVN90bjr98064/PjJCnYDX2l5r/DsYqnMBYTpmW/7X1oX7z CnwZ/iQPY0nYfJ3bSawhLwMkQ+8iOLusKw3TI+FCUrhUciOm8+s5Mzq4Pn9tkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770320449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmZglPug5iy8lNPKDeoQxgKV0AZYOiKS9xGcg4a0BRE=; b=FAq9GzyxU65++stdiqQW+PYycx4FeMxyxLBFDZ+QDz2uSspGfYMJlRaEo5KG6mzopIaai0 3bc8N0scLUwiK3fj/TNmVXOgb73NAghW7/sP167O5cRmjfToqbZ5vQ7doY259JQdOzeSo7 c4U4eey+P6wkWGPOme6GNC1gFb9+M6vwbOAfVgNQePSDk692dAVJl0QiTl5ORD6D8n+f1e yRftHdob7qaPmDIRWeFNYBQocGt1YFuzbWJwIpO6eThNMHBAUlHgRNjmcEkQOhvB0D9My8 UNnaiJ2HVTz0fMh+8guHo3U3K93GJ9iF2iBdpA4QTj0RXlRT8FAlnJML3raJ0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6SJ110r4zkDy for ; Thu, 05 Feb 2026 19:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b148 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 19:40:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f8c12e6e3874 - main - diff: Report I/O errors in Stone algorithm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8c12e6e3874cdd353fb16785da6f4e7eb134cd9 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 19:40:49 +0000 Message-Id: <6984f241.3b148.1f4cabb0@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f8c12e6e3874cdd353fb16785da6f4e7eb134cd9 commit f8c12e6e3874cdd353fb16785da6f4e7eb134cd9 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 17:41:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 19:40:35 +0000 diff: Report I/O errors in Stone algorithm In the legacy Stone algorithm, we do a first pass over the files to check if they're identical before we start diffing them. That code would correctly set the exit status if an I/O error was encountered, but would not emit an error message. Do so. PR: 292198 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D55125 --- usr.bin/diff/diffreg.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 95c724817ede..8dcf55a7190b 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -406,6 +406,10 @@ diffreg_stone(char *file1, char *file2, int flags, int capsicum) break; default: /* error */ + if (ferror(f1)) + warn("%s", file1); + if (ferror(f2)) + warn("%s", file2); rval = D_ERROR; status |= 2; goto closem; @@ -499,9 +503,9 @@ files_differ(FILE *f1, FILE *f2, int flags) return (0); for (;;) { - i = fread(buf1, 1, sizeof(buf1), f1); - j = fread(buf2, 1, sizeof(buf2), f2); - if ((!i && ferror(f1)) || (!j && ferror(f2))) + if ((i = fread(buf1, 1, sizeof(buf1), f1)) == 0 && ferror(f1)) + return (-1); + if ((j = fread(buf2, 1, sizeof(buf2), f2)) == 0 && ferror(f2)) return (-1); if (i != j) return (1); From nobody Thu Feb 5 21:57:40 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6WKw3KdFz6RHHB for ; Thu, 05 Feb 2026 21:57: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6WKw1ByDz3WZ1 for ; Thu, 05 Feb 2026 21:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770328660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yO2oRxLiTVKv59iX3erZ+mD7yvWUw/B7TZXyLA0V6H8=; b=nAmkdLL00Ha60UW9rglSxoWQNz+N7J8hWTwQ76LjjOlWoaCI2QG8oVC0qpFnwLj9/6iNGN T0xhh2Etn6EMXpTJRFHrBXgGMdkvcv4CtUs5nkUokgWUtTrZWVPE4KOfet/LHmtgkm/YDk vZ9S70fVZ5zdus9WLqYAhDko6rGC724mUSgWLTT0yZ9QQcdIzHDOc55RVZgHEzN23rfEEA sNEEOM3uIEmX77SMAKASDWgAL7483Gjmi2VJi65Hv2tWdLoo+XhJTpEtfK+Kx1YMIQMZc7 sfo67UpTff73NvLhIBJk3EYLAM9uwINURNKmCtHfdUI8hCwqaMDR87arei4cRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770328660; a=rsa-sha256; cv=none; b=KCk+LAG4O2lcvSTvKttjxe0Y1YaIOIlIBXYzCaqHKo5TInwPlWVWQHyEJ3cY6NjCJzrzJ7 JIv3jIRNF0eALMb3PrlKti81wktJWp6JiAig52F0J9w/2gHadsMIkHpBFi1N1rJDn0Sh6p actjdCM4udaEi/SkOBRhAL1MOevdlzida1wYcNAOZhT5H32y61GyaSQtbxLN+1XcCeIdpT AtsxZkh0W/RS/M7o5RBAPadGXlyih/hl0WJ+a4Ux2Cggc4ltz48scGjkyHnSeamF6BCvkr hYGW3VKeZml0XPtRQ5LkzA03h3Nge5yBGzIUJwatpraVHDf0T0iQDVOSsZTNxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770328660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yO2oRxLiTVKv59iX3erZ+mD7yvWUw/B7TZXyLA0V6H8=; b=YU0Esam/xbtKTxc2S52DcmTkz29lR67ZZB9O3bn9WMF6vRid8qYamVIMQqw+QkQY545We0 zYIJlyZTwZ3UPKSDNC1OqImwtyMxA/p8rDHfTwFdrLihyeqLQmeVT5S+qCfV63PlNXmkih TnsNtugS590foSq6N9p6hbsPfVxju/XGHa1NiDiI/ZakcGfvZxIGQaKg3tVXlPcK0axWZH gfUWefo0GIkgnYzPj6nGIbaUm4XDUmzo2wliXTvaxpWEQhu69b9g9/Wh4nGEsj0bRvy47p TZFb77Qfh+/qUmyynz6AechIUuJ75YCKSdqEvqci9fZUcMxieTruVZ8WAhZLLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6WKw0pRhzny4 for ; Thu, 05 Feb 2026 21:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47e36 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 21:57:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 9352d2f6dd55 - main - cxgbe(4): sysctl to disable/enable the TCB cache List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9352d2f6dd55afcf0ac24d2806da7c6febf19589 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 21:57:40 +0000 Message-Id: <69851254.47e36.400be12a@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=9352d2f6dd55afcf0ac24d2806da7c6febf19589 commit 9352d2f6dd55afcf0ac24d2806da7c6febf19589 Author: Navdeep Parhar AuthorDate: 2026-02-05 19:52:51 +0000 Commit: Navdeep Parhar CommitDate: 2026-02-05 20:11:58 +0000 cxgbe(4): sysctl to disable/enable the TCB cache The TCB cache can be enabled/disabled at any time on the T7 and this commit adds a sysctl to do that. This is for debug only. # sysctl dev.chnex.0.misc.tcb_cache=0 # sysctl dev.chnex.0.misc.tcb_cache=1 MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 41 +++++++++++++++++++++++++++++++++++++++++ sys/dev/cxgbe/t4_sge.c | 15 ++++++++++----- 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 3237c6649713..e35bb9f64951 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -900,6 +900,7 @@ static int sysctl_ulprx_la(SYSCTL_HANDLER_ARGS); static int sysctl_wcwr_stats(SYSCTL_HANDLER_ARGS); static int sysctl_cpus(SYSCTL_HANDLER_ARGS); static int sysctl_reset(SYSCTL_HANDLER_ARGS); +static int sysctl_tcb_cache(SYSCTL_HANDLER_ARGS); #ifdef TCP_OFFLOAD static int sysctl_tls(SYSCTL_HANDLER_ARGS); static int sysctl_tp_tick(SYSCTL_HANDLER_ARGS); @@ -8119,6 +8120,12 @@ t4_sysctls(struct adapter *sc) sysctl_wcwr_stats, "A", "write combined work requests"); } + if (chip_id(sc) >= CHELSIO_T7) { + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "tcb_cache", + CTLTYPE_INT | CTLFLAG_RW, sc, 0, sysctl_tcb_cache, "I", + "1 = enabled (default), 0 = disabled (for debug only)"); + } + #ifdef KERN_TLS if (is_ktls(sc)) { /* @@ -12204,6 +12211,40 @@ sysctl_reset(SYSCTL_HANDLER_ARGS) return (0); } +static int +sysctl_tcb_cache(SYSCTL_HANDLER_ARGS) +{ + struct adapter *sc = arg1; + u_int val, v; + int rc; + + mtx_lock(&sc->reg_lock); + if (hw_off_limits(sc)) { + rc = ENXIO; + goto done; + } + t4_tp_pio_read(sc, &v, 1, A_TP_CMM_CONFIG, 1); + mtx_unlock(&sc->reg_lock); + + val = v & F_GLFL ? 0 : 1; + rc = sysctl_handle_int(oidp, &val, 0, req); + if (rc != 0 || req->newptr == NULL) + return (rc); + if (val == 0) + v |= F_GLFL; + else + v &= ~F_GLFL; + + mtx_lock(&sc->reg_lock); + if (hw_off_limits(sc)) + rc = ENXIO; + else + t4_tp_pio_write(sc, &v, 1, A_TP_CMM_CONFIG, 1); +done: + mtx_unlock(&sc->reg_lock); + return (rc); +} + #ifdef TCP_OFFLOAD static int sysctl_tls(SYSCTL_HANDLER_ARGS) diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index b6d44792dce4..af18b3019760 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -828,12 +828,17 @@ t4_tweak_chip_settings(struct adapter *sc) t4_set_reg_field(sc, A_SGE_ITP_CONTROL, m, v); if (sc->debug_flags & DF_DISABLE_TCB_CACHE) { - m = V_RDTHRESHOLD(M_RDTHRESHOLD) | F_WRTHRTHRESHEN | - V_WRTHRTHRESH(M_WRTHRTHRESH); t4_tp_pio_read(sc, &v, 1, A_TP_CMM_CONFIG, 1); - v &= ~m; - v |= V_RDTHRESHOLD(1) | F_WRTHRTHRESHEN | - V_WRTHRTHRESH(16); + if (chip_id(sc) >= CHELSIO_T7) { + v |= F_GLFL; + } else { + m = V_RDTHRESHOLD(M_RDTHRESHOLD) | + F_WRTHRTHRESHEN | + V_WRTHRTHRESH(M_WRTHRTHRESH); + v &= ~m; + v |= V_RDTHRESHOLD(1) | F_WRTHRTHRESHEN | + V_WRTHRTHRESH(16); + } t4_tp_pio_write(sc, &v, 1, A_TP_CMM_CONFIG, 1); } } From nobody Fri Feb 6 00:14:30 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6ZMq0xJGz6RR1V for ; Fri, 06 Feb 2026 00:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6ZMq0G19z3tXx for ; Fri, 06 Feb 2026 00:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770336871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXBG9RKB/SAwCgK8HVOlS1B5bTxaW0iCtNblcPDmGrw=; b=HB73jfIipBRqpEeQqL72Wpx98HoRi9cVmrKIPs62m2a7ZF7DerTGHbh1OChnCfhDqKXWv/ owxyHZEb5nq7EgA2fWbzt2WNJTHL9NdKdDNOOwUOX1SVRBSR9/MTvIfk/eYsihCaNqbNr4 XairWBm6qR+8HuHTEoNPP2WZnj/34R3XCVvblr4xfEYdRH0GE4p6fCxbC/2ZykRCl3g6xO dPqALMv2U4okmO6uGfozbdtjqG9BnQn9fR3UklmAlkKN1uOwDOGd5IFEz83fslpZIABsX4 Pfku9kVRXAbgKpuilnsLf9kzs1NWG+ut+JmkAcC1C6ZtxXV9wfPfwIsQo2fxBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770336871; a=rsa-sha256; cv=none; b=sRIaE5c4SMsJwbib48IRnCGRjrjGdoMqL90YJ9wkPAXXTRCOapE7ShQVDu7e+OIrS0pazc Fezk8YzCDhuH8+BSg3b8ymwDxXOvwEiBd2IHzwOotGa2PXtqgPPYninURYFDdbAFSG1nj8 exUuKS9NpUQLhKgIFqXZA7qDUqFyNSfx4zFle72gJcJR6/a/W2aF9acLeptm8nrHZ1iRD7 ose6MeaEbZqXC6FWXDf3T0tlrQImj3nrWs59I5fssJZYk6hkXWZVAn+xcZiYlu8emPn18k /y8cRaoh1tFYEnt6JbG0MPsNBkzcGzkLryngpjtgGeO4YioUMrxJKBW3ygizBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770336871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXBG9RKB/SAwCgK8HVOlS1B5bTxaW0iCtNblcPDmGrw=; b=OwFpH4DAlIo/ToClr5yl2OGYoSM7h40I/9TWyGY5ehdGmc3LEv2WWPsLJPV4O8hhxOU1NB BR6XYNOu1aBRkvzyF0zQOM21/JvIa0G2UKaE0VeYGPNsuhoeIh+FWki5/Rj6jpCXXaHwzl WmVF2O+Lp10treU8Ep9IKsArEi5mjvXGw5/WQnlSgwc3Uxf7YxzzG/EDQ6FBzbG/uZ+f0O zxpOojhYtd3IIXcTvnqbGW8gFI56VqNDhLctxEEyyw9CJryvyeKp/vpVcCeqo/zVd6GnHn ay4XB0wxMLOGJff3WCijkjSUO2aos5oHRyQ52y3BSqbZhkZPxyiC+UOo0t2Cbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6ZMp6sdvzscH for ; Fri, 06 Feb 2026 00:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 306cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 00:14:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 40134060f658 - main - diff: Bump version number List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40134060f6583486ad8ab303140fa73960d3de3d Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 00:14:30 +0000 Message-Id: <69853266.306cd.53773091@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=40134060f6583486ad8ab303140fa73960d3de3d commit 40134060f6583486ad8ab303140fa73960d3de3d Author: Dag-Erling Smørgrav AuthorDate: 2026-02-06 00:13:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-06 00:14:05 +0000 diff: Bump version number MFC after: 1 week Sponsored by: Klara, Inc. --- usr.bin/diff/diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 1aba09f7a5f7..9bf3f2ad79eb 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -35,7 +35,7 @@ #include "diff.h" #include "xmalloc.h" -static const char diff_version[] = "FreeBSD diff 20240307"; +static const char diff_version[] = "FreeBSD diff 20260206"; bool lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; bool ignore_file_case, suppress_common, color, noderef; static bool help = false; From nobody Fri Feb 6 03:38:53 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6fvd4Hw9z6FY8Y for ; Fri, 06 Feb 2026 03:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6fvd1SRhz3QZq for ; Fri, 06 Feb 2026 03:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770349133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bckRdTmrh4IdTSUYqEjXsNnf/9v/QnXPfLbj8+n1EZM=; b=UIJrSQwQrGFDKQbQf5RDtIlQOBOX6Buxc/1/7+IHO08QbuVmXtePzsxWyVh+gFrBrFMi4k loGJIsQBhF2Z9/UMz+MB4BoGsbqU673BT4G5l/CFaBpjTTLKNGRg0C56alFJHdT98oBXiV Jnwz6Xq9joxdESe3AtzPg7derm2NVpYkDcZQ9hx9OxO/5c4ArXK5ETr/8bqY7RM7U8hPGU OLTA50UhahKnMvuGoeCha2qN5m2Dvps50NHn6XtWx3uZC6CJQNRzvPUTs3eRC2TmAZd5mO MpwKdzfOjG18pIS8vf2y0mFof0bq/YytwBokjIBPAvDr0k7iX+28VY10M5JcLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770349133; a=rsa-sha256; cv=none; b=O/Ui+PB45jRWBJk4T9PDuiZuhX8s/QZDLDpA3SGvNHq6LVunkHkR9Aa18Qw2d/MJXdcqgf NzweX+G8rjen4t73mGm/90PY/HU0wbbS39ggCfBxW9sW0/9sirUy7t82i8g9PXNxHuQzFx 2JlY8gVsNCfvcrCPJZiE52zEmyX7VzuJOJcYd7wSlJc4i6Wf+zjNTTA0kFxqgT/ruOCpnR Bsdu4mpqJVTQtORthMcnY65dYBrBuNipvc2FT8CfGkwv8RB435SpwWeK89oHXzS1EwWFLZ oHBb4vse0uM3HpUlBLpNG+su2Bf22mFMPCjH6CH0mfinRul0PYrqImVcpgzr7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770349133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bckRdTmrh4IdTSUYqEjXsNnf/9v/QnXPfLbj8+n1EZM=; b=AFnAb6+YLjj443GMUmsgf1UsYGYza/HOrb+lb0xbICCzE/1iu6cajsWZ+p48EDaQdH79QT bvSAUKkprlTyCZ2eZkZrmkM4DTfyEocrSU+HR3z03Rky/ayVTLQxMZslIWh6CA0YS9yWJu qIVfM7LwJxkDyG+odqvL6uN8I70wQPyUBD4G4sOHAZVIonAesxDmW8OyISVICVnku4hQAa 7PTKwxkIMz6Rk9nfTJ7GBfOqlCIWP0TkL9C5r16h6d02WYvWYM+WGHx/wAMh62vAwYJVrn r33HW7ywzZinT6aQ4vjFFHF45y9qAW9SkQEHxk2ZaNWKxanaD6muG4R/esIS1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6fvd0YfBzymR for ; Fri, 06 Feb 2026 03:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42ebc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 03:38:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 5ba503fc2cab - main - lagg: Remove the member pr_num from struct lagg_proto List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ba503fc2cabc1a614997f102ace671d996bcc53 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 03:38:53 +0000 Message-Id: <6985624d.42ebc.bf1d1b0@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5ba503fc2cabc1a614997f102ace671d996bcc53 commit 5ba503fc2cabc1a614997f102ace671d996bcc53 Author: Zhenlei Huang AuthorDate: 2026-02-06 03:37:43 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 03:37:43 +0000 lagg: Remove the member pr_num from struct lagg_proto It is set but never used. Remove it to avoid confusion and save a little space. While here, use designated initializers to initialize the LAGG protocol table. That improves readability, and it will be safer to initialize the table if we introduce new protocols in the future. No functional change intended. Reviewed by: glebius MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55124 --- sys/net/if_lagg.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 21ea2b30459b..1e4d3d8d85ac 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -208,7 +208,6 @@ static struct mbuf *lagg_default_input(struct lagg_softc *, struct lagg_port *, /* lagg protocol table */ static const struct lagg_proto { - lagg_proto pr_num; void (*pr_attach)(struct lagg_softc *); void (*pr_detach)(struct lagg_softc *); int (*pr_start)(struct lagg_softc *, struct mbuf *); @@ -223,24 +222,20 @@ static const struct lagg_proto { void (*pr_request)(struct lagg_softc *, void *); void (*pr_portreq)(struct lagg_port *, void *); } lagg_protos[] = { - { - .pr_num = LAGG_PROTO_NONE, + [LAGG_PROTO_NONE] = { .pr_start = lagg_none_start, .pr_input = lagg_none_input, }, - { - .pr_num = LAGG_PROTO_ROUNDROBIN, + [LAGG_PROTO_ROUNDROBIN] = { .pr_attach = lagg_rr_attach, .pr_start = lagg_rr_start, .pr_input = lagg_default_input, }, - { - .pr_num = LAGG_PROTO_FAILOVER, + [LAGG_PROTO_FAILOVER] = { .pr_start = lagg_fail_start, .pr_input = lagg_fail_input, }, - { - .pr_num = LAGG_PROTO_LOADBALANCE, + [LAGG_PROTO_LOADBALANCE] = { .pr_attach = lagg_lb_attach, .pr_detach = lagg_lb_detach, .pr_start = lagg_lb_start, @@ -248,8 +243,7 @@ static const struct lagg_proto { .pr_addport = lagg_lb_port_create, .pr_delport = lagg_lb_port_destroy, }, - { - .pr_num = LAGG_PROTO_LACP, + [LAGG_PROTO_LACP] = { .pr_attach = lagg_lacp_attach, .pr_detach = lagg_lacp_detach, .pr_start = lagg_lacp_start, @@ -263,8 +257,7 @@ static const struct lagg_proto { .pr_request = lacp_req, .pr_portreq = lacp_portreq, }, - { - .pr_num = LAGG_PROTO_BROADCAST, + [LAGG_PROTO_BROADCAST] = { .pr_start = lagg_bcast_start, .pr_input = lagg_default_input, }, From nobody Fri Feb 6 03:38:51 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6fvc646Fz6FY8R for ; Fri, 06 Feb 2026 03:38: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6fvc1fddz3QZp for ; Fri, 06 Feb 2026 03:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770349132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1SsIRpTGhTXPfEQ6uLRfT9+oorJDYQJNN6loaTxPpvk=; b=LSCFTeF8FyvzAM9Bj0Pvc/OPK/Vb7iKkRcPP18vXeONqtJJQaNmQr9H/qzzKAznM5V5Z4r RaNaUH5ptTflWlJ2B2uV1jT/LEpmSEaGpvEELHi7ugg3tmKSdG1BdlxQSAScckBa+3aroF ZeH3Q1LAgy6ITRLbq1HSFpbecUYShnNeI67JXkoTmK/VUD+LrayId8MVb93RmChKyfhhiN eQCYuxjcQp96JfbLlKZqMpmFnw7qnWBB3fOQA9VeP1/zzlSSofd+lLx9lHkDOevgf2IZUv t21foezNaqhvZoEJVdvPDtGmvLUXdKG5yeELjVUWolzQ+3lhnx1sQHaRw/bOgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770349132; a=rsa-sha256; cv=none; b=nRFna+rrq5f2CwEGAQn6AtqLQ1QVs8gEhXOu1NYDUsRMkj2f1Lr3dv26OOna+wTJMdUpiX kviVwWIClTrSlwS4uAWTqAFNmgo7DKLGFzBHtNGzc0Ma+EuCGbLqRY8lKA0qWs8nlCZkkt pv1KUVWrhiNYSEV/cbAt7kqW20wd54cqEdj4isidcZRnaAxc/05SNOOvWdHnoRtzuItiuy AWJn+PJzeQtm4gnVc7izUYjuSRu2akxGZhRns4luoz3sCg1khHWfx+w6GS6MmXRY/2KZn8 HfM35sEcZ6GhZsuX5IEpbliCXzAWDip+P73BeIcb/FfDzqaPQlWI/NN/VpLXjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770349132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1SsIRpTGhTXPfEQ6uLRfT9+oorJDYQJNN6loaTxPpvk=; b=AmAcLWnrHcKn9JFtzrp6lS/4aHuXCoSA+7OEAGUMk99KmcZnwWZl+AL7SxFTGpfoYRKs7G cejYCaBn9NafH+l+8YCsFrYuTmfu0np0ZfkIvPYrDFEFh63HrqN6T9rkDhkKso/m7yI4RU zIjh64J9S3MJLQ2MDeGLtUZBTbqyOXjRn/QMrlhK8ET7SFXgdbtjIGoPeyGEjZwyzGAoLF UkbELcOKTHfUQrC6Np/etgakzOi+Rtl5WgmoBqMfGBDgdkdGenyEaYrub4Fg+uJsu3aRlH 4o0GRtVuBYcAE2991+5652iVj/IFxHVYbvE01fW8UjV0ren11ekD9lB1CYFd4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6fvc0Db0zylx for ; Fri, 06 Feb 2026 03:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42e7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 03:38:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: a622030b4bae - main - lagg: Make the none protocol a first-class citizen List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a622030b4baec2136984cea7bd25c2985a2ae9b3 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 03:38:51 +0000 Message-Id: <6985624b.42e7d.c91bd19@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a622030b4baec2136984cea7bd25c2985a2ae9b3 commit a622030b4baec2136984cea7bd25c2985a2ae9b3 Author: Zhenlei Huang AuthorDate: 2026-02-06 03:37:43 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 03:37:43 +0000 lagg: Make the none protocol a first-class citizen All the other protocols have corresponding start and input routines, which are used in the fast path. Currently the none protocol is treated specially. In the fast path it is checked to indicate whether a working protocol is configured. There are two issues raised by this design: 1. In production, other protocols are commonly used, but not the none protocol. It smells like an overkill to always check it in the fast path. It is unfair to other commonly used protocols. 2. PR 289017 reveals that there's a small window between checking the protocol and calling lagg_proto_start(). lagg_proto_start() is possible to see the none protocol and do NULL deferencing. Fix them by making the none protocol a first-class citizen so that it has start and input routines just the same as other protocols. Then we can stop checking it in the fast path, since lagg_proto_start() and lagg_proto_input() will never fail to work. The error ENETDOWN is chosen for the start routine. Obviously no active ports are available, and the packets will go nowhere. It is also a better error than ENXIO, since indeed the interface is configured and has a TX algorithm (the none protocol). PR: 289017 Diagnosed by: Qiu-ji Chen Tested by: Gui-Dong Han Reviewed by: glebius MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55123 --- sys/net/if_lagg.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 5b52bfa80e3b..21ea2b30459b 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -169,6 +169,11 @@ static void lagg_media_status(struct ifnet *, struct ifmediareq *); static struct lagg_port *lagg_link_active(struct lagg_softc *, struct lagg_port *); +/* No proto */ +static int lagg_none_start(struct lagg_softc *, struct mbuf *); +static struct mbuf *lagg_none_input(struct lagg_softc *, struct lagg_port *, + struct mbuf *); + /* Simple round robin */ static void lagg_rr_attach(struct lagg_softc *); static int lagg_rr_start(struct lagg_softc *, struct mbuf *); @@ -219,7 +224,9 @@ static const struct lagg_proto { void (*pr_portreq)(struct lagg_port *, void *); } lagg_protos[] = { { - .pr_num = LAGG_PROTO_NONE + .pr_num = LAGG_PROTO_NONE, + .pr_start = lagg_none_start, + .pr_input = lagg_none_input, }, { .pr_num = LAGG_PROTO_ROUNDROBIN, @@ -2129,8 +2136,8 @@ lagg_transmit_ethernet(struct ifnet *ifp, struct mbuf *m) if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) MPASS(m->m_pkthdr.snd_tag->ifp == ifp); #endif - /* We need a Tx algorithm and at least one port */ - if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) { + /* We need at least one port */ + if (sc->sc_count == 0) { m_freem(m); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return (ENXIO); @@ -2151,8 +2158,8 @@ lagg_transmit_infiniband(struct ifnet *ifp, struct mbuf *m) if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) MPASS(m->m_pkthdr.snd_tag->ifp == ifp); #endif - /* We need a Tx algorithm and at least one port */ - if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) { + /* We need at least one port */ + if (sc->sc_count == 0) { m_freem(m); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return (ENXIO); @@ -2180,8 +2187,7 @@ lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) NET_EPOCH_ASSERT(); if ((scifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || - lp->lp_detaching != 0 || - sc->sc_proto == LAGG_PROTO_NONE) { + lp->lp_detaching != 0) { m_freem(m); return (NULL); } @@ -2215,8 +2221,7 @@ lagg_input_infiniband(struct ifnet *ifp, struct mbuf *m) NET_EPOCH_ASSERT(); if ((scifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || - lp->lp_detaching != 0 || - sc->sc_proto == LAGG_PROTO_NONE) { + lp->lp_detaching != 0) { m_freem(m); return (NULL); } @@ -2390,6 +2395,25 @@ lagg_enqueue(struct ifnet *ifp, struct mbuf *m) return (ifp->if_transmit)(ifp, m); } +/* + * No proto + */ +static int +lagg_none_start(struct lagg_softc *sc, struct mbuf *m) +{ + m_freem(m); + if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1); + /* No active ports available */ + return (ENETDOWN); +} + +static struct mbuf * +lagg_none_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) +{ + m_freem(m); + return (NULL); +} + /* * Simple round robin aggregation */ From nobody Fri Feb 6 07:50:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6mVY3VFzz6Qm7y for ; Fri, 06 Feb 2026 07:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6mVS2DHcz3mDC for ; Fri, 06 Feb 2026 07:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770364256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uu/KsVWHVj2tuBL2xXB4MZN9lAqZnhcSKlQYLtoD+dc=; b=lLwljlYUXvwvU/7hYlc6vOEDE1CN+aZY2O5SJcTsot/WiKSEKcWFbtIXZOhMVuRBH5wERQ +pp23STOpgzo4W+xA7eoy4lVQLyWKfmbeIDVe/GyZS15xeCDnkeHpR4+DZViA7lRV+rKGT rlpNw7v+ggQLJuROPr8DPmr4yx9oB8xd08TC0p3WblXBfaW7GVLThJSp3dIS7yry7ic5gG H0fH/EwHwVe7apj+rhEYtrbKB6zJabRaiXoYGqw7zrWDK42c/3m4USQU9cQVkubKMZaAsE PlBmyHMqnBbLrfDk2vy2ZQZLL1yiuA+vclD8cO4G1N5Zk3QOXKUlO5EFTcqugw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770364256; a=rsa-sha256; cv=none; b=oxYNJLWirIwNhoA5GyP39097iOLqPIgKiq2qy7/ZP1v/eID67/nuH+WXjg4dRZILvAQ5fu xDbF+kzMwtLSmd3laWJTp+pwE/xdM4ygpL8LY6MMFZAMF9VNIfqP2zix2IRuOlZv6oBan4 Zm4eQFIenYGF+5TEe4ycFeBDupv71nLHW/tyrR/TLilYF8ioKngfpVAocZKTikBx3+X4Bt dJhg0tO/eldK93TGj+SR582noVbLEyojC2tpLilfMpE0uaQc9szxRXNpZM8L9x3fBA3s3v Us2dlYNQuXEcpoXfuWGMYZV12VMlWL0YYI6hIEAQXqgYDVLiHouQuG6qbTL7WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770364256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uu/KsVWHVj2tuBL2xXB4MZN9lAqZnhcSKlQYLtoD+dc=; b=b7PudpymiSoQLlkyYgXVpWxt1T97t+ZUyU0aS19y7+aLkuZD/F551hvlwPqSuFkaLlb3gD pYUdAIgkRCtRQdtB/Yvsku5P56RX0O8+BveKa/ibxC+ivxHbGBHGCV0QCMduHYN67+P0Ir 48tb1mjjcEOAS6WfcHR8ywnNK4+4aO4k5xmL2+wu5aKpZWV74u7u06WIPeTkgEmyF1/Xtv PpIzvDN3YzsdHVcP1p2HpkCHNpZ9aVDvTE8KjEPpzu4tsYO4YGsm407PGubUGD/B38JQTl fqn/moQNGqAM4DMoC7uv/qqxdbx7Q4UAhuJleW2ynE1mSBFeJozfnSZYuoz2TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6mVS1h10z15cS for ; Fri, 06 Feb 2026 07:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 392f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 07:50:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Pat Maddox From: Kyle Evans Subject: git: 93f482ab3e6b - main - release: Pass optional VM_IMAGE_CONFIG to vm-image List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93f482ab3e6b4577f13e85e216a50bdf3704dda3 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 07:50:56 +0000 Message-Id: <69859d60.392f7.691b29e1@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=93f482ab3e6b4577f13e85e216a50bdf3704dda3 commit 93f482ab3e6b4577f13e85e216a50bdf3704dda3 Author: Pat Maddox AuthorDate: 2026-02-06 07:50:20 +0000 Commit: Kyle Evans CommitDate: 2026-02-06 07:50:20 +0000 release: Pass optional VM_IMAGE_CONFIG to vm-image `make vm-image` calls mk-vmimage.sh, which supports `-c CONFFILE`. This file gets sourced before building the image. One example of how to use it is to define vm_extra_filter_base_packages() to filter the list of packages installed into the VM image: # vm-nodbg32.conf vm_extra_filter_base_packages() { grep -v -E '(-dbg|lib32)' } $ make VM_IMAGE_CONFIG=path/to/vm-nodbg32.conf \ VMFORMATS=raw \ -DWITH_VMIMAGES \ vm-image Signed-off-by: Pat Maddox Reviewed by: cperciva Closes: https://github.com/freebsd/freebsd-src/pull/1993 --- release/Makefile.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index 3e5f4936b518..abbfcb341afc 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -211,6 +211,7 @@ vm-image: ${QEMUTGT} ${PKGBASE_REPO_DIR} PKGBASE_REPO_DIR=${.OBJDIR}/pkgbase-repo-dir \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ + ${VM_IMAGE_CONFIG:D-c ${VM_IMAGE_CONFIG}} \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} || true From nobody Fri Feb 6 10:26:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6qyZ0GcXz6Qy3J; Fri, 06 Feb 2026 10:27:02 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6qyY570Wz45lW; Fri, 06 Feb 2026 10:27:01 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770373621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=waz4gwxXBmeB1IRa4QCWgeOR3bhTMDFSLGE4CmAtnBs=; b=shWVOEaU7UCMSXSxGx8v0HTXed7wJppsc7epNVU2KmQR84FIdm/HCM+rbkn/cAJdA0Cb/X 4LdrtR6uTRzv4yatoauSMeYChIjyJILc/5kEbQG/LXoBe54DX4s0+lDLn+m6VcEW+b9TC3 ncEYohxd5T6VkC2ZIR6LARR6b4spij/fSFwFUqsubJ2U4v4/1t9qFIzs67yqb6WG0DYib4 NoXB6XRCc6VvT6FsfFpQ889VUWnfGIkOtqwDNo6ZIOUL0gepvJ2cGyVCmGuzBmHozyE1Hj jew9DhHbLhLf3x9x3zoidIirgxSLflnh5i6OnFnNLhCDJuPknFXxarFfK3iNxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770373621; a=rsa-sha256; cv=none; b=kdEkJnsj+dn3Tycy0q8z0AkY04Lp/vGIi+rUF5jh9mjAKVp72ojzGlBVSVtKa+DRpbKNwE PFfTsdS31RCjQKXrz/EFqy7DLhyF/1yz8ImSSccirA6kpwBj6ZQFvbeo2cxvThIY9rCoxw /M4q+pVI5t55EYTF8RBgfpB6G+imfnaMeUfbHsGE46D5Pq0kajlFG0Rq7MoMUlbAVTLvib kLbwgN5ZlILFOlD2gGAJO5NKVFb0ZEkrRGHweUCmCJzO+JrmHLJsva8Oh7kiIqLyn8R2CT oa5S4jGh3rVEMClCF0CvWvm4ouk4KBDMUYn4n9zHYsnjkC947p3fex9i0PEDTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770373621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=waz4gwxXBmeB1IRa4QCWgeOR3bhTMDFSLGE4CmAtnBs=; b=AX2tXs7hx1SeQGs0zeND4737A3eaEvi/PY6WOpy6/op8Ow9vCyWNAOWOmSlf21ymWfCcE3 XyF4dyLaT8ZVR2u5xOGH66xPgxp98NC7AJ9tvehFii78xqOfqzHtZaJBkGH96/SkDeB/5P oAaR101/CFyoB2OaA9SYVVToxeRLS3sxD5xvxprQBQ4C60xPLtcvK8uKBjN5RQpqnEqils KhvBrxn4qTAeOoWsoinNESxP82IyDcocoRWwCz6L56qeQMyJGizJpjwH/CbCMEsT9RDNzs ghA7xCUi2KTcu54FEtHMFvqPT4nXxPpZPbjyDoFa4qirMM4/ilNZbv3+AmgReg== Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1101:be00:614d:4071:7145:c2c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: tuexen) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f6qyX2xGLzF6f; Fri, 06 Feb 2026 10:27:00 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: d195b3783fa4 - main - sctp: fix socket type created by sctp_peeloff() From: Michael Tuexen In-Reply-To: Date: Fri, 6 Feb 2026 11:26:52 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <0A0F4504-8243-4B11-880B-89A1BDAAB3BF@FreeBSD.org> References: <697e46e9.2271d.66b41ecf@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3864.300.41.1.7) > On 4. Feb 2026, at 23:37, Gleb Smirnoff wrote: >=20 > On Tue, Feb 03, 2026 at 08:24:10PM +0100, Michael Tuexen wrote: > M> > M> VNET_ASSERT(head->so_vnet !=3D NULL, ("%s:%d so_vnet is = NULL, head=3D%p", > M> > M> __func__, __LINE__, head)); > M> > M> + KASSERT(head->so_type =3D=3D SOCK_SEQPACKET, > M> > M> + ("%s: unexpecte so_type: %d", __func__, head->so_type)); > M> > M> so =3D soalloc(head->so_vnet); > M> > M> if (so =3D=3D NULL) { > M> > M> log(LOG_DEBUG, "%s: pcb %p: New socket allocation failure: " > M> > M> @@ -1311,7 +1313,7 @@ sopeeloff(struct socket *head) > M> > M> __func__, head->so_pcb); > M> > M> return (NULL); > M> > M> } > M> > M> - so->so_type =3D head->so_type; > M> > M> + so->so_type =3D SOCK_STREAM; > M> > M> so->so_options =3D head->so_options; > M> > M> so->so_linger =3D head->so_linger; > M> > M> so->so_state =3D (head->so_state & SS_NBIO) | = SS_ISCONNECTED; > M> >=20 > M> > This creates a socket where: > M> >=20 > M> > so->so_type !=3D so->so_proto->pr_type. > M> >=20 > M> > I'm not sure this is a good idea. I was actually looking into = removing so_type > M> > at all. What does SCTP idea is about this peel-off thing? If = the resulting > M> > socket is a stream one, shouldn't its so_proto point at = sctp_stream_protosw? > M> Yes, that makes sense. > M> But this is now a generic routine (I think it was an SCTP specific = one in the past), > M> how can I refer to it without using sctp_stream_protosw? >=20 > It was never generic, albeit put into generic file. It lives under = #ifdef > SCTP. I'm all for moving it entirely into SCTP related file. OK. Let me see how to fix it. Best regards Michael >=20 > --=20 > Gleb Smirnoff From nobody Fri Feb 6 11:37:41 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6sXL54Pwz6R3ns for ; Fri, 06 Feb 2026 11:37:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6sXL04Syz3F15 for ; Fri, 06 Feb 2026 11:37:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; arc=pass ("google.com:s=arc-20240605:i=1"); dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.160.53 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-408199852c5so1784295fac.0 for ; Fri, 06 Feb 2026 03:37:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770377873; cv=none; d=google.com; s=arc-20240605; b=AxBCzxpBoqSHA0e3+lV0H4igvAtjQMg/mgb1rJ+9Eg+xvhK2eigEw5kF6DX9fIDk9M BfNBie1PSdwd+iNwBCoOjL/sTCcP1HnpO01X/AYmD+liPXCQRLs7DkDcOg7B54FLNJQs WMgaNhQPX+K7VjSO9M6eFwKWITeP5qwnngNmglizSfKGH2TvsTkgOSXNnS86giDkjpjU 2dZkFSfO92vP15F/rDUoy3RD1TU6F0uRKmrpRCHnapeFONBWJklwOZGizGNdjR+u3b+q uiJnh/66gElyq7PwZcJHM77RyXsZbJadOY0djKn70OK940/BmoKYmcMHCxe5XqMxk32T p1YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version; bh=+F5uI7PfeR1WakIeq2F3Zdy9O4IWV7No+PGMYh58hy0=; fh=XiSrF961pUyqy2C3cnD2bGvWX75ytcz7gqN8L1TwUmE=; b=f4QJobfchKx4ei08GjNx0PU3OzB2Ec+PlGGU9mPxsA4Uqw4FC0QNjwjB+swyCH31OD WkC5vdDG0nIHIaG2D08HWZ23vmU0wlLIFaGt49M5OJMCw+DH2eWy+LEF+T0ex4c8boJn 3HXDwyV+0ZE0gySeOQEcX7d/aWbdPfC1or87BalSIfD/GohAJ5afjGMrAKd9YOYuD/f4 hYWLU88M9RSZNVzyf73n9puY9ibGXgop1IOcg0QE+/VsBOl3Yjw57lJpPvMpVCjp7C16 U6R7bsFL1CgtHjNa8+DYloRRmMAGewHtIMQgEZzYoNQgg/ZMhKFnoutL71Vk/Y46bGxp 6Wfw==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770377873; x=1770982673; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+F5uI7PfeR1WakIeq2F3Zdy9O4IWV7No+PGMYh58hy0=; b=khZVo2thXt5k7VVj5gzZN9hya/f7wy/H3f/Ml1lMa52C+2BCSawR+2WM+aBc16c5uR quDjpve+NhHjwWyEhFzb7W6gPYj/TG686uW+vcijZNTMnBBMUWeIWOmEUxedbn88Qzrr 1TxrZ+EZY7gLLssjqYT01cx2FSrFXmJsOGOXpyJTv4HsvibujPUSRQUUXKw0jjMTgQ5v nALNUm+GIvypE7714atLPN0K9WGGCIh+LjhxKrE7h6HtMGEPvd/72yX2qasbBDhpMc14 FTfa5j0l6GlLYPtgPcTcCVMQ90PInrIS3jjroSfRjjYr1csNDaVfF/I0hEyoewGH9Fro FyMw== X-Forwarded-Encrypted: i=1; AJvYcCWNgR0ZzLT0Ia7Gpm3vX59ehr65Hjhz2n+/GsSZtqpO58H+XJIfIuykEmSBskRiq0V1kPeY13EoErLq9/L1ueAc2LZBIA==@freebsd.org X-Gm-Message-State: AOJu0YwOp6XR5/TGojmyLPgjixOtSM6YMBBWpGN9mSB4QiK3LbjdRqoF xqaghNbY3PlgKugo9+ZZPLECIpyLRAsIgHCAb9eVOBA8dgO7Z3aMZFFXBv5kR3SyXvvxyCGXumW RWdKSOzhyZ9wsToeaF8vLIV3Fn0Sj1Rk= X-Gm-Gg: AZuq6aLDc9sFRXziHqiGt2myPNUF1z9l9L2UGUA/rvMBzZqUuPlUikKRvcF1Qk+GCBQ SRf11FeZapDdOYPioJUiPgUPTB27J0ooLTIjcWl7bLEu8/j4YUPva5opMTKTn7Xd/vK/q9AKK+9 g+4nt3e2Hx85vV2FoTDGafKLR9nBOEDPSElnhpt3Kbpv0CGDDEUEkExVEVUjz1dHWdomfO76F3K QtZq01ICc8LXZIQ8TL+aO85nT3ydtwW0bjL5qtKhchBoiVzmSJ7VRh/dALZjytbBpBc5b5wjauI Hg748sUZcrtIUi6TOhyrTjycwa+Ex6FjT+zHHATSKtJgWc1fIpZmDKgNVA6a5aYnO9vVu4nf X-Received: by 2002:a05:6820:220b:b0:664:86ce:df46 with SMTP id 006d021491bc7-66d0c472fd0mr1226246eaf.57.1770377872932; Fri, 06 Feb 2026 03:37:52 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <697e9f97.2248d.47c46024@gitrepo.freebsd.org> In-Reply-To: <697e9f97.2248d.47c46024@gitrepo.freebsd.org> From: Ed Maste Date: Fri, 6 Feb 2026 06:37:41 -0500 X-Gm-Features: AZwV_QjuvtWywv0QqJfrFViB9aB9kz2IHdd9DE7t_kXUzaIHdX5eexmD9Jc47DM Message-ID: Subject: Re: git: 1f5795b6422a - main - INDEX.fonts: Minor maintenance To: Alexander Ziaee Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-1.69 / 15.00]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_MEDIUM(-1.00)[-0.997]; NEURAL_SPAM_LONG(0.99)[0.992]; NEURAL_HAM_SHORT(-0.68)[-0.681]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.160.53:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEFALL_USER(0.00)[carpeddiem]; RCVD_COUNT_ONE(0.00)[1]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[209.85.160.53:from]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4f6sXL04Syz3F15 X-Spamd-Bar: - > diff --git a/stand/fonts/INDEX.fonts b/stand/fonts/INDEX.fonts > index fc035c6b2e4e..d4287a570863 100644 > --- a/stand/fonts/INDEX.fonts > +++ b/stand/fonts/INDEX.fonts > @@ -1,6 +1,5 @@ > # > -# > -# database for vidfont(8) > +# database for vidfont(1) vidfont does not use the INDEX.fonts file under stand/. This is slightly less wrong after this change, but still incorrect. From nobody Fri Feb 6 12:04:09 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6t6f1JB7z6R55V for ; Fri, 06 Feb 2026 12:04: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6t6f0KF0z3Hjj for ; Fri, 06 Feb 2026 12:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770379450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFw1Vk3N1Xp0756OWseATUiUhlUiPeYiVgjdd/ctoWA=; b=WLMjV5Sf6CisrA9ktb+TAr9Q7PaVz2WJa0FDYTinaHA9hgoneR6KDh4SWbIUHyhuuZ013J JlPTj/JnmBOix+lcWKEMaphNuyGDH1KPtMKPZjrFHxg6ZnLwUzFdRONHEb/nmH4ug6GqR5 oEMf5Hc1YKLgTKhIm9MutI2hzFaAoi8zOIgDIcDDt0lBvIR8WFUo4/VwACQwp9Ki72uiSV 7FNKggpDJWSoXqUttp2OrYJgIpbud15cU4GTf2gAQAwW8CqRjCZt3u4q8o9gyNTrHfn8Y4 aki2DseO9ePCCL/U2bs0h9TVivrh8f4DcMkQJu8/Dxtm1cU/ucgkjYEArKgt8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770379450; a=rsa-sha256; cv=none; b=NMZc5IC3YInggczw0KVKRna8hyiKv8LxHY+lCzILgSIvIJywjUlDnFAhi1Ob95UaS7pQ3S O22G9uMUr8wrwMJq7CxRnp7wfQrOyAMPehSMBA6qL0y/RcRCOsGVc7y8p1GMFgNsUcC7p4 P+fm7Dacg7iYv+hub+aN79Eu3CuwnHD3RuSe4CAelMzmTs2BkMnABaLHKYR6AOhOgd0/wm ET3mlDibH6zAPkdk68NhTpmLRzkoYaC7mLv+TDpPpvErxrcIk24a5lLtC6VpMGy9oINNLa B1/xe+S3DXEw4NBhdrEDW2Zui7H+cK/EbVLWUukrQGp1AhDygLZUvPno/hErQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770379450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFw1Vk3N1Xp0756OWseATUiUhlUiPeYiVgjdd/ctoWA=; b=D/rhLFF8eGBmaI6owepeUBrvMZq47fpKl0DqMymVVKCZN5NQI4Q9n3uGH1OHmCEmUPbe77 DQ9raVLKoWYHn3WoiWZ4xtFDWT3nHUgEvI46qCJSEFU7n/XAnQN1eK7ngHBSnp2MkzYiTq hp0nGlfXmVGNJ+MKHWHwTD8G2xd5HLvmCzBf7Dg9VPXGNthwdxODx5lExcFXWR7JW2GZcj 7/81jjf7OJv9+6KxVVPy7KTx0XYI3U8lyuNP30f2JWZ+rW6MAScZyCv7PfZ8J/PV/UgKdw Dx8cVpfmfUIb8/VQyYGAIfrkZXdvc845Eq6KMHO05dVrbnUU4qGIZ98xoubtOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6t6d6k2vzZw for ; Fri, 06 Feb 2026 12:04:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22c22 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 12:04:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Ahmad Khalifa Subject: git: 912418193ed1 - main - sys/subr_module: remove useless macro gates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 912418193ed1f9a0f58b083037751b1fbc4c30ef Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 12:04:09 +0000 Message-Id: <6985d8b9.22c22.6b6da7ad@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=912418193ed1f9a0f58b083037751b1fbc4c30ef commit 912418193ed1f9a0f58b083037751b1fbc4c30ef Author: Quentin Thébault AuthorDate: 2026-02-05 14:57:11 +0000 Commit: Ahmad Khalifa CommitDate: 2026-02-06 11:56:55 +0000 sys/subr_module: remove useless macro gates These constants are always defined by sys/sys/linker.h. Reviewed by: vexeduxr Signed-off-by: Quentin Thébault Sponsored by: Defenso MFC after: 2 weeks Closes: https://github.com/freebsd/freebsd-src/pull/2004 --- sys/kern/subr_module.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c index d07990cebdc3..f8b6770e3189 100644 --- a/sys/kern/subr_module.c +++ b/sys/kern/subr_module.c @@ -433,16 +433,12 @@ preload_modinfo_type(struct sbuf *sbp, int type) sbuf_cat(sbp, "MODINFOMD_VBE_FB"); break; #endif -#ifdef MODINFOMD_FONT case MODINFOMD_FONT: sbuf_cat(sbp, "MODINFOMD_FONT"); break; -#endif -#ifdef MODINFOMD_SPLASH case MODINFOMD_SPLASH: sbuf_cat(sbp, "MODINFOMD_SPLASH"); break; -#endif #ifdef MODINFOMD_BOOT_HARTID case MODINFOMD_BOOT_HARTID: sbuf_cat(sbp, "MODINFOMD_BOOT_HARTID"); @@ -497,12 +493,8 @@ preload_modinfo_value(struct sbuf *sbp, uint32_t *bptr, int type, int len) #ifdef MODINFOMD_VBE_FB case MODINFO_METADATA | MODINFOMD_VBE_FB: #endif -#ifdef MODINFOMD_FONT case MODINFO_METADATA | MODINFOMD_FONT: -#endif -#ifdef MODINFOMD_SPLASH case MODINFO_METADATA | MODINFOMD_SPLASH: -#endif sbuf_print_vmoffset(sbp, *(vm_offset_t *)bptr); break; case MODINFO_METADATA | MODINFOMD_HOWTO: From nobody Fri Feb 6 12:04:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6t6g3bzRz6R5M1 for ; Fri, 06 Feb 2026 12:04: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6t6g19dDz3HnN for ; Fri, 06 Feb 2026 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=1770379451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7KYUNeQI/vBHQvdiKcMF7HDjQAgeOj+EVp8WxoQppw=; b=nfGaheLqwT4Ya6l03yX8hlwkuoJmEi90DjvqImXZBCJ97fF4IVQikAy4uXTuYiBpj+VD+f b3pE0IO/4ZhKMEnziys6u9mysE6sRGVoCpSU6z/lKO71SRWQfQW91dARWrxEpNjC5SBUuY pS3IkHrKVPwb24IWkzbkqTFdxpkIvq3vxze8QgvwcmMOB5o7LV9BIDoc3qFUPifT9So7jH Ed65nblXaq0BdDQwfNjBl5JCEuLuM/DOnC3NbCwdH1boHHDPRPBf3DjTkvEXBw1Fhg4NAT XbisirwXSCg+O69NN0iEpPcvhdtdloCHgJ9G0b2XeII0xnLSqzb2QawuEgIf4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770379451; a=rsa-sha256; cv=none; b=oLij54pU4fZEvru3ykSK9Y3oCt1BT2lDONRyrveF0vomf2xfSJ5xBDKZVgO0PZ5hNG9Gvx Pa6IU6g1ciPsM0Txh0NSvRqP0NclhB3MKlOtc80Q+DwzzbZgord7MWvXHaIfYQcbyeWOxv NYNDi6BS672UODF/rnfwqUdj3jqPinfGRwDhFsfvhtu5BWGqox+KZiRtITKJ37An72/nQF PsIogTDlm0adZC050H9bw05oEM4AOEwmQAyTL/nFggsEVXfD+JkVA50Iq9fTFA2SLOxGop Bms84pODJeczHG8o+3C1bUwfvqdXancrLo6N/dAiTmH7imf3ToWN4p/HfTobEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770379451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7KYUNeQI/vBHQvdiKcMF7HDjQAgeOj+EVp8WxoQppw=; b=RVyNt9uUh2p/7/rj2JgD8SF+ZNycDbY7FJgYpZsRN4vzJab5wXU9oMjbIDHc0qZcu89CUb bUT1VGwOSUzow+Hu18MFcLffXYP8VxuUnhFpy4RnkG0HL8ae+hINl5aZRdGDz+O+f2YzRo KOyRXC4S7oXXH15WZEaHPhLls8Cwk0+e09VvQyZOE0bsYt8zdYKdrKyKJyT3YIhHJn3uVX Bpu9XXMghjCP/cw7MPUNc5UtdcpaRZNkbCQONrQ6w4Yg9gy5oPq86GCPEvBN90E4R5iMpf TIVq4AXcT73hzs4h3b9NHaIXq/vOvkrW7gWkfj7bWEkyJjNkECXbsbcCo+6IAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6t6g0VnLzLs for ; Fri, 06 Feb 2026 12:04:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20d62 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 12:04:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Ahmad Khalifa Subject: git: 87b2c0168d9d - main - sys/conf/options: remove improper full stops List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87b2c0168d9deb79aacf3f13dbd3201054371b2b Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 12:04:11 +0000 Message-Id: <6985d8bb.20d62.255aa9cd@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=87b2c0168d9deb79aacf3f13dbd3201054371b2b commit 87b2c0168d9deb79aacf3f13dbd3201054371b2b Author: Quentin Thébault AuthorDate: 2026-02-06 06:03:21 +0000 Commit: Ahmad Khalifa CommitDate: 2026-02-06 11:57:10 +0000 sys/conf/options: remove improper full stops Only keep them when used in a sentence. Reviewed by: vexeduxr Signed-off-by: Quentin Thébault Sponsored by: Defenso Closes: https://github.com/freebsd/freebsd-src/pull/2004 --- sys/conf/options | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index c9b9307718b7..d5192db59181 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -42,7 +42,7 @@ AHD_DEBUG_OPTS opt_aic79xx.h AHD_TMODE_ENABLE opt_aic79xx.h AHD_REG_PRETTY_PRINT opt_aic79xx.h -# Debugging options. +# Debugging options ALT_BREAK_TO_DEBUGGER opt_kdb.h BREAK_TO_DEBUGGER opt_kdb.h BUF_TRACKING opt_global.h @@ -70,7 +70,7 @@ TSLOG opt_global.h TSLOG_PAGEZERO opt_global.h TSLOGSIZE opt_global.h -# Miscellaneous options. +# Miscellaneous options ALQ ATSE_CFI_HACK opt_cfi.h AUDIT opt_global.h @@ -325,10 +325,10 @@ UFS_ACL opt_ufs.h UFS_EXTATTR opt_ufs.h UFS_EXTATTR_AUTOSTART opt_ufs.h -# Enable fast hash lookups for large directories on UFS-based filesystems. +# Enable fast hash lookups for large directories on UFS-based filesystems UFS_DIRHASH opt_ufs.h -# Enable gjournal-based UFS journal. +# Enable gjournal-based UFS journal UFS_GJOURNAL opt_ufs.h # The below sentence is not in English, and neither is this one. @@ -341,14 +341,14 @@ NFS_ROOT opt_nfsroot.h # SMB/CIFS requester NETSMB opt_netsmb.h -# Enable debugnet(4) networking support. +# Enable debugnet(4) networking support DEBUGNET opt_global.h -# Enable netdump(4) client support. +# Enable netdump(4) client support NETDUMP opt_global.h -# Enable netgdb(4) support. +# Enable netgdb(4) support NETGDB opt_global.h -# Options used only in subr_param.c. +# Options used only in subr_param.c HZ opt_param.h MAXFILES opt_param.h NBUF opt_param.h @@ -360,7 +360,7 @@ DFLDSIZ opt_param.h MAXDSIZ opt_param.h MAXSSIZ opt_param.h -# Generic SCSI options. +# Generic SCSI options CAM_MAX_HIGHPOWER opt_cam.h CAMDEBUG opt_cam.h CAM_DEBUG_COMPILE opt_cam.h @@ -387,7 +387,7 @@ CHANGER_MAX_BUSY_SECONDS opt_cd.h # Options used only in cam/scsi/scsi_da.c DA_TRACK_REFS opt_da.h -# Options used only in cam/scsi/scsi_sa.c. +# Options used only in cam/scsi/scsi_sa.c SA_IO_TIMEOUT opt_sa.h SA_SPACE_TIMEOUT opt_sa.h SA_REWIND_TIMEOUT opt_sa.h @@ -400,7 +400,7 @@ SCSI_PT_DEFAULT_TIMEOUT opt_pt.h # Options used only in cam/scsi/scsi_ses.c SES_ENABLE_PASSTHROUGH opt_ses.h -# Options used in dev/sym/ (Symbios SCSI driver). +# Options used in dev/sym/ (Symbios SCSI driver) SYM_SETUP_SCSI_DIFF opt_sym.h #-HVD support for 825a, 875, 885 # disabled:0 (default), enabled:1 SYM_SETUP_PCI_PARITY opt_sym.h #-PCI parity checking @@ -415,7 +415,7 @@ ISP_DEFAULT_ROLES opt_isp.h ISP_INTERNAL_TARGET opt_isp.h ISP_FCTAPE_OFF opt_isp.h -# Net stuff. +# Net stuff ACCEPT_FILTER_DATA ACCEPT_FILTER_DNS ACCEPT_FILTER_HTTP @@ -501,8 +501,8 @@ SCTP_MBUF_LOGGING opt_sctp.h # Log to KTR general mbuf aloc/free SCTP_MBCNT_LOGGING opt_sctp.h # Log to KTR mbcnt activity SCTP_PACKET_LOGGING opt_sctp.h # Log to a packet buffer last N packets SCTP_LTRACE_CHUNKS opt_sctp.h # Log to KTR chunks processed -SCTP_LTRACE_ERRORS opt_sctp.h # Log to KTR error returns. -SCTP_USE_PERCPU_STAT opt_sctp.h # Use per cpu stats. +SCTP_LTRACE_ERRORS opt_sctp.h # Log to KTR error returns +SCTP_USE_PERCPU_STAT opt_sctp.h # Use per cpu stats SCTP_MCORE_INPUT opt_sctp.h # Have multiple input threads for input mbufs SCTP_LOCAL_TRACE_BUF opt_sctp.h # Use tracebuffer exported via sysctl SCTP_DETAILED_STR_STATS opt_sctp.h # Use per PR-SCTP policy stream stats @@ -718,7 +718,7 @@ IOMMU opt_iommu.h DEV_ISA opt_isa.h ISAPNP opt_dontuse.h -# various 'device presence' options. +# various 'device presence' options DEV_BPF opt_bpf.h DEV_CARP opt_carp.h DEV_NETMAP opt_global.h @@ -946,7 +946,7 @@ RACCT_DEFAULT_TO_DISABLED opt_global.h RCTL opt_global.h # Random number generator(s) -# Alternative RNG algorithm. +# Alternative RNG algorithm RANDOM_FENESTRASX opt_global.h # With this, no entropy processor is loaded, but the entropy # harvesting infrastructure is present. This means an entropy @@ -1014,5 +1014,5 @@ U2F_DROP_UHID_ALIAS opt_hid.h # environment's contents are known to be safe. PRESERVE_EARLY_KENV opt_global.h -# Options for the Intel QuickAssist (QAT) driver. +# Options for the Intel QuickAssist (QAT) driver QAT_DISABLE_SAFE_DC_MODE opt_qat.h From nobody Fri Feb 6 14:19:50 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6x7B70vdz6RG3x for ; Fri, 06 Feb 2026 14:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6x7B6Bbbz3fSN for ; Fri, 06 Feb 2026 14:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770387590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AHWsdUHT/Ferzycf8YU5kkrvFhv54nnPKS8EET5v7E0=; b=dN2RCOiC7W251uTkKMdjYGuOjDoIPjCxjdO3WGrRuSqpgSJJus7GIPxYOcI2oPQBtPjOTo 3qyCfVFwTMn/RVzd1aUcNL01aZJ2ZUIR6Hu+lPYVVKdJLCWMgLyfGzzkLXzxAMUmPQoEf2 c0j58cZGMaSJG6vSBOB22R/ACF+EL0IS8sXPI51p5pS+QEHV6OAs3a3WCkopYWl9OVVe7m W+v+kKvfYplkCTefiSfD9w7RRNiQf358OgXJhZibm19D7WcoNiOVm3scvtVx5ootZq+lNh Q5b+j9WGvvRy3gdK6XHCvXufLPtCunF9pd8HnZckpnFzZbN5OFXAztOQuQWigA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770387590; a=rsa-sha256; cv=none; b=l50IWvJJ1Opj6+jZSSy0LzcdMawgk/X4eBKNGTpfFvCmQrB6Pq5DeLh0j504XNgOKFZK1E 6FLAMD2TUWD2w2//nCcGHYdDAsNibz2jDcWnZS17HLWkSu7YD9Xsza9/s5NKZzuy66Lafj OvXHe12iW9OCoMFmHQsrc3W4pemqWGbnfwyZVTyDyA57xGfIIgiHvwgVsGl7RiNLLHV+hF X5eG3DzoLz4IgWM91fFepBWQKEqbZsPZ5ACQMRwDqned11zgV1iHad1gWUejGPiVhTuz2j I7I0xWYFqDWHv7J9IXiKJpMqBljFm6OG8HDDPoQKdlZxowmzTC6UbWlmS4V18Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770387590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AHWsdUHT/Ferzycf8YU5kkrvFhv54nnPKS8EET5v7E0=; b=B/Nd0H4sg5nDrZJFrnMPDg3uU4UKZG/DNReNNDCGACSfiRVjEMmz698YAtKuV1pSjiwkal RD4tOUc/ktw3cOLncQ8+7HpdLZ06eysvWy0VIO/pQHum3/7w1qG6xBNKyQ6/yMXk3oVrCx FXEUaPOv4TZOhSfMrTkic5tkS6MylJ1t9p+pWDqx6BF60DCi1YnOj3Xgm80DQs4VQLeker dpiukT5B5tYHU/eJsZd7MRGnYiECyvdCla1YVcQ+Umj+c5OCaNKzp3z99m6Gm2AdYqPQQg XKvWLvq+ZuP/wNd3dhzP4x7S50McLRXLt66D9QWhbR4+Knpstq15527IF8dJRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6x7B4zyLz3wD for ; Fri, 06 Feb 2026 14:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 14:19:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Ed Maste Subject: git: 94976733d352 - main - bhyve/virtio-scsi: advertise support for indirect descriptors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94976733d35234c629fdb086036f2319c44eb08c Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 14:19:50 +0000 Message-Id: <6985f886.38d0f.54cc7e1@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=94976733d35234c629fdb086036f2319c44eb08c commit 94976733d35234c629fdb086036f2319c44eb08c Author: Hans Rosenfeld AuthorDate: 2026-02-05 18:52:56 +0000 Commit: Ed Maste CommitDate: 2026-02-06 14:14:47 +0000 bhyve/virtio-scsi: advertise support for indirect descriptors Support for indirect registers is actually part of the common virtio code, the virtio-scsi code doesn't actually care or even know anything about it. Advertising the features greatly improves performance with some guest operating systems. Reviewed by: corvink Differential Revision: https://reviews.freebsd.org/D53467 --- usr.sbin/bhyve/pci_virtio_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index 409e8c1c21ae..c7d930b0f4ee 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -252,7 +252,7 @@ static struct virtio_consts vtscsi_vi_consts = { .vc_cfgread = pci_vtscsi_cfgread, .vc_cfgwrite = pci_vtscsi_cfgwrite, .vc_apply_features = pci_vtscsi_neg_features, - .vc_hv_caps = 0, + .vc_hv_caps = VIRTIO_RING_F_INDIRECT_DESC, }; static void * From nobody Fri Feb 6 14:34:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6xST6jq7z6RGvG for ; Fri, 06 Feb 2026 14:34: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6xST67wCz3jhw for ; Fri, 06 Feb 2026 14:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770388489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4e/G9YLxrYRzITdUXV3Y3uJb6Td7byIX3TCGM1j6TEA=; b=J4PzKpbaflRPlS+JYsTcNGKjwaTt/ehkW0l+8MDI0qHdTrV7E8zC70U1GN6wTkzgWNZTfI YVCDT7rRQeWCBZJEWhiM/GdwIPQtDPVRUBevMDk6sxtOgRVVIRpdcR0qR+G3w8/ChUFzrf B6YXmpJsX+80HTFDrBhgRf7otqyCFb6EIkYmoN2RV/qwGO0gVnoi5fbJxhJUuVNGKLBeFl TBaFrnQcKRA+wa0/xrPiCSYskMgVHfockzltSb81c3Z1jYGHwe9tkXVc0SwoaEvS7JRcnn b9dk1i24cSHXfFvEbr4kVvDVR+BE6Bfou5Xu7gvMVSvDNTZLoRg37k+SaPUAWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770388489; a=rsa-sha256; cv=none; b=rbEe1ArujW4Qx0BGExFafHFnAYL1oGZRhCwgmC5CAltAFywOQ1ez4QeuQnGewOTzmvcxn9 iVYkiaFG3L0Ch45vIT4+0EunDoI2U3018ZSAgrJbmT9lyj7JynWnjmchOHNHWzM6XWlZ01 ncEBmM52W8Ynx5Rr0fPpuDEdJMkODlFA7e+aZJ06j+lHeCk7USvCbcwa5UAh0UpT+YTU5l ACDP++wroSno9F0+J756MMpEeg9hMX5sqcD4R7iY8ZgaNzz/Vlm9sYSR1kfyPzDpw+8bFV 87Pz0t3+dNqCIc3cmljaGi+U9zIY3GV+uqCh7HyvGNrWQxT99L6G3+u+caWRcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770388489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4e/G9YLxrYRzITdUXV3Y3uJb6Td7byIX3TCGM1j6TEA=; b=yNMlccLb2uizwjalstrIVzl4hgE1zLV8sQgV8thZBhxbbZBKrfxf5OOxbHEfkfGo8M2vUu Skh/dSH7apiJY3J+IwfUGs1h3EfYQRk6IYqRtocsPHDCNfyKOGTrUdIMtycesJsTaXFToK ECjLczwbCBJ6u/xLONE2MYHlliXepUY11nkEnz6INEtXrhS8f4VfZIs2pY1S9NjrHW01wj nbWzhbjRRiFotA0qOttOt9TUlqH9zgQ1ZaegK48kMw6XHZ5RbnB0h5RghDPfqTg5ExfT5n fISCqbrAC5fBVASu93J1F3orKyL2eF5q2uvaW/IeHId1VR6a75XR5/8iFEKyJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6xST5lPBz4Qb for ; Fri, 06 Feb 2026 14:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a999 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 14:34:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: efcc0423d80e - main - em: remove M_HASHTYPE when RSS is not enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efcc0423d80e4048e11e997abc46bd0343537e1b Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 14:34:49 +0000 Message-Id: <6985fc09.3a999.17d766c4@gitrepo.freebsd.org> The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=efcc0423d80e4048e11e997abc46bd0343537e1b commit efcc0423d80e4048e11e997abc46bd0343537e1b Author: Cheng Cui AuthorDate: 2026-02-05 21:12:15 +0000 Commit: Cheng Cui CommitDate: 2026-02-06 14:32:31 +0000 em: remove M_HASHTYPE when RSS is not enabled Summary: Since "73fe85e486d2 tcp: store flowid info in syncache", inp_flowid can be set if the incoming packet is not M_HASHTYPE_NONE. But this can introduce dummy and duplicated flowid when a virtual interface set M_HASHTYPE_OPAQUE. This change will let the upper layer know how to deal with software hash, with benefits like inp_flowid can be set correctly and m_pkthdr.flowid can be set correctly in output path. This fix is similar to "20285cad7a55" Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D55137 --- sys/dev/e1000/em_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 647255417b3e..b86222e363e9 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -836,6 +836,6 @@ em_determine_rsstype(uint32_t pkt_info) case E1000_RXDADV_RSSTYPE_IPV6_TCP_EX: return M_HASHTYPE_RSS_TCP_IPV6_EX; default: - return M_HASHTYPE_OPAQUE; + return M_HASHTYPE_NONE; } } From nobody Fri Feb 6 14:47:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6xkj0BH0z6RHnl for ; Fri, 06 Feb 2026 14:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6xkh2d1qz3lns for ; Fri, 06 Feb 2026 14:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770389228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FkoIBDxXMBnkZge8qtTZVUBbsONGaZNUWty3v4jtKVU=; b=SCj7IaTCAsd2xVIWa4C6GWWuH1OyAglVB6voSxX88wZSRthSTVS+Y+fDZz9eI3kI2eLNwY Y/Z9YPtpvG2IVvaCiHn0uep+Rs0ZazRNgwEEI3sGfYViD1mwX6WCoxt1RBExDKIdBwnqK2 g7Ok/0RfGzrQOrq/gqp4HGydBWURZLq1UngGK8kSY9eQUHXXan+nSti/XZ4ARTmW/N1/e/ a9UkBGTJvlxqsrx08juc6GU5kk4QxC16Fof+uH8sLUMoswfQySa8KaKs1M02kDBYopDWof 2FM6zPF0TSzUdsHHYWPVS1fWDO1aR6IDh3SxwcciD4Z/NYtQXpTXknjebbzAlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770389228; a=rsa-sha256; cv=none; b=S2f1j2tZ3XDXPW1o/tp7CWYuGSWGc0xrg4sh5XH37WgglHGatRiVShg0EH+b2y1ysT3UEj CtZaUVcOymapF8BlnVk84VXy3wNfEkMR4SahNs07Oe6pJrOEP0jT0+epfdWnVor+ezeNAi bKxJ4k/Jxuv3HUZjAhVfUkOps3HLRf2k1aGndEepNd0tM9i66EJAKbYzuJG3UkLt3N7irN JT+nqFaBZjA5sHLTGu/ryz865THlVrScrAaoalTGUHJIW6jB4ma9YEKvxs+0Y70Z4LHsq1 /Av00monqn/Rhu19xDHSYieEzmcRA3jfOswtulsbRu7He0pysPsz70fBxXSkCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770389228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FkoIBDxXMBnkZge8qtTZVUBbsONGaZNUWty3v4jtKVU=; b=IW0u5ne7h4TwVz/bv7mmkR5ZKHIZtGdivx+qyFrxtPh6dtewMTo7jEKnndlFVhOvMst++B dCNbMcgXJwmYxWyE55/lPQLqJ4NC37HbhjBwG55lGjVUBlFXYe0drVBmFLEvxyGyJpgIm6 tI0XTaS2l9iUNxsHV2AHZRRrjEEPAuvbGyGLmIGRnbh9pADgOqWVsbkb/CDWRzyupLkKHz AAu+9N2mKlQhLTEwT6YWKIPjt97Pl21FOHqo/RqfLbiKQlNVSgpfJRErSiwOBDytxDcDFY hqgVi66JoXayz8m6cZKjnBTwQSILnmFGoOiCleXs36DMG+MM7lQM2fcpokntPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6xkh1VHlz482 for ; Fri, 06 Feb 2026 14:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c7bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 14:47:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d2aa0a4dace1 - main - acpi: New R/O 'hw.acpi.s4bios_supported' sysctl, gate S4BIOS with it List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2aa0a4dace1d0cf8d52614c25b6a8f5cf03fd32 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 14:47:08 +0000 Message-Id: <6985feec.3c7bf.535c3c1c@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d2aa0a4dace1d0cf8d52614c25b6a8f5cf03fd32 commit d2aa0a4dace1d0cf8d52614c25b6a8f5cf03fd32 Author: Olivier Certner AuthorDate: 2026-01-09 13:43:23 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 14:45:22 +0000 acpi: New R/O 'hw.acpi.s4bios_supported' sysctl, gate S4BIOS with it This new sysctl knob indicates whether the ACPI implementation supports S4BIOS (FACS present with bit S4BIOS_F set, as per the standard). If S4BIOS is not supported, do not allow 'hw.acpi.s4bios' to be set to true. This is also in preparation of probably switching the default for 'hw.acpi.s4bios' to false once OSPM-initiated S4 support is ready, in which case administrators need some way to determine whether firmware-initiated S4 support is possible. For now, we keep the default of setting 'hw.acpi.s4bios' to true (1) when S4BIOS is supported. Reviewed by: obiwac MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54627 --- sys/amd64/acpica/acpi_wakeup.c | 2 +- sys/dev/acpica/acpi.c | 35 +++++++++++++++++++++++++++++++---- sys/dev/acpica/acpivar.h | 8 ++++++++ sys/i386/acpica/acpi_wakeup.c | 2 +- 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 8cada2f4f911..6e6b9ac618dd 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -218,7 +218,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, pcb->pcb_gdt.rd_base); /* Call ACPICA to enter the desired sleep state */ - if (state == ACPI_STATE_S4 && sc->acpi_s4bios) + if (state == ACPI_STATE_S4 && acpi_should_do_s4bios(sc)) status = AcpiEnterSleepStateS4bios(); else status = AcpiEnterSleepState(state); diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 53099db8ae84..59ae4624f407 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -193,6 +193,7 @@ static void acpi_system_eventhandler_sleep(void *arg, enum power_stype stype); static void acpi_system_eventhandler_wakeup(void *arg, enum power_stype stype); +static int acpi_s4bios_sysctl(SYSCTL_HANDLER_ARGS); static enum power_stype acpi_sstate_to_stype(int sstate); static int acpi_sname_to_sstate(const char *sname); static const char *acpi_sstate_to_sname(int sstate); @@ -624,9 +625,12 @@ acpi_attach(device_t dev) if (AcpiGbl_FADT.Flags & ACPI_FADT_RESET_REGISTER) sc->acpi_handle_reboot = 1; - /* Only enable S4BIOS by default if the FACS says it is available. */ + /* + * Mark whether S4BIOS is available according to the FACS, and if it is, + * enable it by default. + */ if (AcpiGbl_FACS != NULL && AcpiGbl_FACS->Flags & ACPI_FACS_S4_BIOS_PRESENT) - sc->acpi_s4bios = true; + sc->acpi_s4bios = sc->acpi_s4bios_supported = true; /* * Probe all supported ACPI sleep states. Awake (S0) is always supported, @@ -754,9 +758,13 @@ acpi_attach(device_t dev) SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "sleep_delay", CTLFLAG_RW, &sc->acpi_sleep_delay, 0, "sleep delay in seconds"); - SYSCTL_ADD_BOOL(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), - OID_AUTO, "s4bios", CTLFLAG_RW, &sc->acpi_s4bios, 0, + SYSCTL_ADD_PROC(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "s4bios", CTLTYPE_U8 | CTLFLAG_RW | CTLFLAG_MPSAFE, + sc, 0, acpi_s4bios_sysctl, "CU", "On hibernate, have the firmware save/restore the machine state (S4BIOS)."); + SYSCTL_ADD_BOOL(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "s4bios_supported", CTLFLAG_RD, &sc->acpi_s4bios_supported, 0, + "Whether firmware supports saving/restoring the machine state (S4BIOS)."); SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "verbose", CTLFLAG_RW, &sc->acpi_verbose, 0, "verbose mode"); SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), @@ -4433,6 +4441,25 @@ acpiioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *t return (error); } +static int +acpi_s4bios_sysctl(SYSCTL_HANDLER_ARGS) +{ + struct acpi_softc *const sc = arg1; + bool val; + int error; + + val = sc->acpi_s4bios; + error = sysctl_handle_bool(oidp, &val, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + + if (val && !sc->acpi_s4bios_supported) + return (EOPNOTSUPP); + sc->acpi_s4bios = val; + + return (0); +} + static int acpi_sname_to_sstate(const char *sname) { diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 51881c580d4b..d585fc8f2e23 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -65,6 +65,7 @@ struct acpi_softc { int acpi_standby_sx; bool acpi_s4bios; + bool acpi_s4bios_supported; int acpi_sleep_delay; int acpi_do_disable; @@ -530,6 +531,13 @@ acpi_d_state_to_str(int state) return (strs[state]); } +static __inline bool +acpi_should_do_s4bios(struct acpi_softc *sc) +{ + MPASS(!sc->acpi_s4bios || sc->acpi_s4bios_supported); + return (sc->acpi_s4bios); +} + char *acpi_name(ACPI_HANDLE handle); int acpi_avoid(ACPI_HANDLE handle); int acpi_disabled(char *subsys); diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index 96be64de017b..b5390f3cd659 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -240,7 +240,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) pmap_remap_lowptdi(true); /* Call ACPICA to enter the desired sleep state */ - if (state == ACPI_STATE_S4 && sc->acpi_s4bios) + if (state == ACPI_STATE_S4 && acpi_should_do_s4bios(sc)) status = AcpiEnterSleepStateS4bios(); else status = AcpiEnterSleepState(state); From nobody Fri Feb 6 14:47:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6xkk6kjKz6RHqs for ; Fri, 06 Feb 2026 14:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6xkk3Wrsz3lg8 for ; Fri, 06 Feb 2026 14:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770389230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOb3YyOA5ReAHM2ymSFjM+c178nP+lEr2GwF6zuQg1Y=; b=xrzVAMopaXiabx0iWRtxRw+NJFaeE8OTlZ+fqRzqYgBL1XDNPYQ0cwLAxPTsASt9MB+EdQ JaMTT+orTF34cQ8++lxdHKvAySXvKv/+jkZ6R6Ph5tRNOKemjkFI6f8u+HYFVA8+cyeToK D03EEq0xTj3vcwE5c4wtx7KE4ui9xUHQ93XOBWLc5BlL0OCvtjMKdwV8woY92bnM0su5YI p3XXH9meJ+bC5jDFahs5MGdW3oCSYF1CYM0RvuDh9qCFIhIM7diz1HRgH7Kf6I55txbIIn jCF+ydsBngfOgnqaeJ6q/G1Oly/ptS1PZ3kZL3n042HZzTxUMUkiVR+LCeEP5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770389230; a=rsa-sha256; cv=none; b=ndlKdo0tNH6Wf49w6gK91wfoczvW7XQeogJWYvRbEgzPN1JODCTWaN4uTuMrxexFtjYkN9 cYGNMMM5spzK7SsanyjLRb71iTQRAsE7fTW97zKfH17iMIZ4QpNu++z134SeGphMuMvbCe 2NOmwgcf+KdHQoiQNFLTYPf7gsMQ+pVRLhK9LnsH3lRclaDKUViu9a7rxvzknI60FfZ791 dnWL0LIybjhj/DSSPZYKE8IQMqDvaXvZO8Sxf3bErHG3twstngJA9nj1HvU3+lIbeJzgqS YMbWxZqade4Lu6uERstLMQOSehZcG1dgLgA4gpjqL3QF9W78IjrSde1dUZfG3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770389230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOb3YyOA5ReAHM2ymSFjM+c178nP+lEr2GwF6zuQg1Y=; b=RvL/s0M33oBlewP0OoCexLKc1nA2nJgirAPb2Sa54Aaqom014JD+NhLzzTfsf7Uooy5Vd+ 6KO19pOjcatHDlJSKXM1+CWjydFA5ScBtWKxfcdNSa+OIo7i+6cD/nwCQlrocBa1Ldo/MF Gz+adIShumH/Grdi1ntyZf8gIqj45+5iLhq4ELm8dPrKgeL2AGE9LOD9DMvn1Dl2nDkcVh VVkVsUkZLolQ1OREmFh8ord64JJPrhfyOF8teWYATYI0RHSP+sQWQ5lR6lqGy0eC4sphEh Sg+uf+5Mz5DnvOzjBv2UL3qc8JEVr13OiF5AOm0PvAQETVO7qsK5BmLIASc2QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6xkk2wRyz4BV for ; Fri, 06 Feb 2026 14:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b03c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 14:47:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 8bdcfc2a3feb - main - endian.h: Visibility comment: Fix grammar, a typo and punctuation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bdcfc2a3febcd1aade1d9a3a8a87581c7b2928d Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 14:47:10 +0000 Message-Id: <6985feee.3b03c.12d06248@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8bdcfc2a3febcd1aade1d9a3a8a87581c7b2928d commit 8bdcfc2a3febcd1aade1d9a3a8a87581c7b2928d Author: Olivier Certner AuthorDate: 2026-02-05 15:55:48 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 14:45:31 +0000 endian.h: Visibility comment: Fix grammar, a typo and punctuation No functional change. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/sys/endian.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/sys/endian.h b/sys/sys/endian.h index b51616b8d83c..b2df6798c61e 100644 --- a/sys/sys/endian.h +++ b/sys/sys/endian.h @@ -54,11 +54,12 @@ typedef __uint64_t uint64_t; #endif /* - * Note: While tempting to try to avoid namespace pollution from this file, - * several software packages assume these marcos are defined, even when it - * defines _POSIX_C_SOURCE to request an unpolluted namespace. - * is not defined by any version of POSIX.1, so we don't have to be - * careful. No POSIX.1 defined header file includes on FreeBSD. + * Note: While it is tempting to try to avoid namespace pollution from this + * file, several software packages assume these macros are defined even when + * they define _POSIX_C_SOURCE to request an unpolluted namespace. + * is not defined by any version of POSIX.1, so we don't have to + * be careful. No POSIX.1 defined header file includes on + * FreeBSD. */ /* From nobody Fri Feb 6 14:47:09 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6xkk1TS9z6RJ5y for ; Fri, 06 Feb 2026 14:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6xkj39BRz3ljh for ; Fri, 06 Feb 2026 14:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770389229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZQ8hqI/ntIWsS0+g/aMh2oQvpoC8Ff9YtkcDe/JWEk=; b=bxfeRWBOYxXRynxo0kEnwPn69bdP60PeGiihUyK6w4IgxyBMwk1UF1xyPdATvQ3hU9vRUu AOKFg6GczYOEif+VP/6ANS0eQOnKqmfRUOfgum1nxjj+XsCnz+s+8RZ1j99fNZbSIntrOH fK5Ycj2per/KvHNogwPnHo5FjRTdXPirLSoFpbohVT11r28BK25Ut2PvEEfIDq9Mixg2OB UL0xCHlocTh4+ObzGFGYmigoGYRXzPs22qpSPWyVzfvISqukO5pMAsxeP2VOa0nlOnBHfe zROgtHKPa+D5BRBWigRBGpZDWlsbRn3URXVzqJq4LC/Hcrswhl6CLgt0CmKCkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770389229; a=rsa-sha256; cv=none; b=Hna0eS0XnC5HlJXRHRZ9TDc9X5LYadCc8cMlKPcjSWltASADLHcHkHrzEF/VNjFn7NHXZW jSVlZEDLG2C7Pjs6tXIUhqY1Tv8KI+0gJvkukcjzWBuT7NFn7ZDB87xfMi8Iga0Sasr9g3 ytd1iXgIpaKpcNmvxs8kqQJRQQ9z8sA8X8/eOEAZXAAr+XICxtcO9k1uoBvn2rWaZfo5bV AVImQ3sF+YEb7PJbfqy+qV5hH5zJDSR9jeh24LaX/mvwHaDaUxLCbOH3CPsQ9BnI3wnOeX +SLFHuXi9W0nqk5mQ6j3mex5xLbLL/ABDuv28z4ZYcr0mL7jcj0L6IW1x3NyqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770389229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZQ8hqI/ntIWsS0+g/aMh2oQvpoC8Ff9YtkcDe/JWEk=; b=ThU3ONHiCNrD3fpjZg/CKbyOFeECdURaS4SfCrPp79Ge8oW7CLpQDsrYad5TPZfM4U5Msw xpIvvUsvZ2NMr7Qf7bWPg5zEvu0tO9M3NrH3rha/FbHsi/YBvj5TtOBetOULkxyQUSo9PU AFaBNneEEm5Avbkt1m+AJSGZAc9TwX5S06/Ro+zM3bOSe0hhhXd4bKL8yNeHILL8RUAN1w 6O0p0EBNWfGihCv1IJdQztv1ugdCStIHw0ub8egtoG4rG4S6LyncVmSZAIuYRyF3XvWyIz yqB7de9AyZbNBL0gMUdC/qOy4pa6js25dHmpCPLUfp2JvULu6P8b06t0F7CmGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6xkj2Cw6z4BT for ; Fri, 06 Feb 2026 14:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a8cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 14:47:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 584c4e0abbfd - main - i386 minidump: Remove unused macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 584c4e0abbfdbac355601491a695c7a8fd5d8ab3 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 14:47:09 +0000 Message-Id: <6985feed.3a8cd.c70d574@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=584c4e0abbfdbac355601491a695c7a8fd5d8ab3 commit 584c4e0abbfdbac355601491a695c7a8fd5d8ab3 Author: Olivier Certner AuthorDate: 2026-02-05 08:44:28 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 14:45:31 +0000 i386 minidump: Remove unused macros No functional change (intended). MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/i386/i386/minidump_machdep_base.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/i386/i386/minidump_machdep_base.c b/sys/i386/i386/minidump_machdep_base.c index 5abbca455fdb..6cb7b84b1f25 100644 --- a/sys/i386/i386/minidump_machdep_base.c +++ b/sys/i386/i386/minidump_machdep_base.c @@ -50,9 +50,6 @@ CTASSERT(sizeof(struct kerneldumpheader) == 512); -#define MD_ALIGN(x) (((off_t)(x) + PAGE_MASK) & ~PAGE_MASK) -#define DEV_ALIGN(x) roundup2((off_t)(x), DEV_BSIZE) - static struct kerneldumpheader kdh; /* Handle chunked writes. */ From nobody Fri Feb 6 14:55:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6xwn3HsBz6RJhF for ; Fri, 06 Feb 2026 14:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6xwn0Wt8z3nxm for ; Fri, 06 Feb 2026 14:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770389753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErmzjI5C9NUDyJTpAA+Pgm81cr6ChQyUDzrobkAuCac=; b=C3kED2A1KKeTiNdpqBSkMbk0tFyTEiwYh7GPij8pdkk/dYHtg+OQgqyvOf99pWfBJHC15Z 4JRfns7hlNitvIgn4gx3JO3AV1zN29wKFMd54EWzhOdYsaFYU8cdYKfL0t5Ar0OPFNF9md 6nkWs/PcOxdjf7WcC/QexYAp/Y4owUgZ+xG7gjiBt4fPeT3KdBNcdOTrfkmTjmy+PtkakQ isS3ggP70TmQpfuuzNbLQ3bHcBZ+YCcPm2iAr1VaCfNhwCatzcvf8rvyCsqVp26gYbUdd6 ZQz51rFPlWHD9X/wxLxLCDy5NG7plV6bydTxxSqnbpykrrizUMcNCPwGIsj9Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770389753; a=rsa-sha256; cv=none; b=dGVrTCPo0FbWsH0ALWKg7zMC7qcijmHUHDPI57ztJH9oJtddQnV9lsH3yskr8yBRuTKQSV mUUVYEZHDjQfJ5iqzdSqlf6BhFLuJ09+q9vAQfmIbNlXQg81A2+HhiAosBDzydqH5geGql BJ7nA99Z2QcssYmDh369D8e9Urkml2G/zb+ZXjYroz8u/G35RCf4n8YIIhU73o+yVPim+p 6TY/rB/PvwuLNu+mdBUTQ5MRhE5Qu0FDUinC1kmRAUnEI2zx8GuDjG7U21WdCDhpi+cLxi YgnfWG9Ys0cF/WDMMxXIMCSIWA221aFGUDntwc1YoMlsfb5fBgR9XgvAKKu1tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770389753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErmzjI5C9NUDyJTpAA+Pgm81cr6ChQyUDzrobkAuCac=; b=QKC3XyBrNz6plHBY4yLuIq77Owip1G0r/zzP1yuaDL7aFfoCo5qBPJ3YK8qbL2ak4hZWc3 Gcd8LrljCH3cF0cyycoLBNzBT9jfkE+GuyrIvNMrZiK8vqNmmFh6eAOJQpMnDij8yfon4l 18a4i9Fbt1UTxYvNPrCIOnVO3E3lvDjw3gQI56T434RHEdW/vooRg4vpVVdGYw19V4eJNv F9ArGSizhwG5aE4tn1Qjcs2JiWZQsrVc02TIR5v5sFDIdnfSjkIws1diMdcVZ+CKnTUwAB UI+n4SKaJ2S1tjqbfxuCpa8mMZEgSey3cujua7HIXRPnSEXzmrfdxRTy2dIpCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6xwm5pltz4PT for ; Fri, 06 Feb 2026 14:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c88c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 14:55:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Ed Maste Subject: git: 73ab91aaade5 - main - bhyve/virtio-scsi: Unlimit max_sectors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73ab91aaade5f33459fda16d9daf6526ab668c42 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 14:55:52 +0000 Message-Id: <698600f8.3c88c.2967f457@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=73ab91aaade5f33459fda16d9daf6526ab668c42 commit 73ab91aaade5f33459fda16d9daf6526ab668c42 Author: Hans Rosenfeld AuthorDate: 2025-10-29 14:09:43 +0000 Commit: Ed Maste CommitDate: 2026-02-06 14:55:41 +0000 bhyve/virtio-scsi: Unlimit max_sectors The old default of 2 for max_sectors limits performance significantly with guest systems where the virtio-scsi driver actually honors this value. As CTL doesn't seem to have any limit of the maximum size of a single transfer, set this to INT32_MAX by default. Reviewed by: corvink Differential Revision: https://reviews.freebsd.org/D53466 --- usr.sbin/bhyve/pci_virtio_scsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index c7d930b0f4ee..bb0b18c51571 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -308,7 +308,8 @@ pci_vtscsi_reset(void *vsc) .num_queues = VTSCSI_REQUESTQ, /* Leave room for the request and the response. */ .seg_max = VTSCSI_MAXSEG - 2, - .max_sectors = 2, + /* CTL apparently doesn't have a limit here */ + .max_sectors = INT32_MAX, .cmd_per_lun = 1, .event_info_size = sizeof(struct pci_vtscsi_event), .sense_size = 96, From nobody Fri Feb 6 15:31:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6yjW5QBtz6RLXH for ; Fri, 06 Feb 2026 15:31: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6yjW4dj9z3t1X for ; Fri, 06 Feb 2026 15:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770391871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K7SPOsCeui45nMZJ/zJkWTh/cWYlOM3nAKRW/GK2HgU=; b=vqz1HYEcVOElo2BmqLHMC+oU4TeTF6UOGm6NQ401oLEeQ1Zfv5O+e0hoQfWb7mdJpaP68g njwuvq0qsfu1QFinprmIoN6zZL4mDQZ7usEHaHunRlXM8joLLW+04BEugzjNUiVd46R1L5 Wbn+FbMG80rZCB0Xw+VHPhJYCgRbmaGUmB3NfIPw+yuFMtTCMKb/i2Pa2U1M612+8VwzmZ BfCtR23G8NpRofwccHHOTiCMEviUuQYq7nuDwbeMchu1FeIvHCAjhAOYia+NIlrlfUFw4X i9BGBN8myFryDk9iEFaq7SlEgj0Foxz+hNamOQUKu6l2AKFZiWy7JKnK1ypNGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770391871; a=rsa-sha256; cv=none; b=b7WwEyXlR4ySjsVL50h7sI4PmyBqv9jb1VFYYUAFvQkBq0EYwpMV/Z2wyxtw4ZLzKGEfPS z9pGb09DZdQo1CejoDOrYYSeOX6lS7Z86NkGPZcP8E/HQHzE+95PxeeVDwiZHm9mfNdd/w 5NCkWiITqVmWzL7ajJOPQqIUwRpCf7m7Xcu7KWhPK2itZmQ+rJ4aeXyfHRP5IuY0UwGKCy Cke//GiTx+oPNEovAwQYYcds0syegLt/neb267NuqLvHD4SpYjNNdWlYJVCibECv9WEsWB Gb4PSrr3CFv0KMtP/6g952BVUrNe4MY8EnwmLTCSAqZnI774lHaGyYNg6/+xRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770391871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K7SPOsCeui45nMZJ/zJkWTh/cWYlOM3nAKRW/GK2HgU=; b=lWiSBNuHp3oKf9WfHG86lp1cPOTsbw1Phxjhr43ld2A+g8kcvm2cBsKZWTeeE2wvuKvEaX VbbYPKH/RTOwRCqNWwPyuZdkuoszHrMsL22KyH/ZiLfApWyBMkXwTOYh3EycRAX5nt+yn7 sQKE2CQBRNOtsl8+h3gKmamgnFqw+VLtBSXFEaLgBlEnWFHopxJ/BLD8L6Z/6+d430iips Xo//PLi5jFzk3Kb+EaJ6Gpp1jj6RJO9B8sQCiog+q/FZA/9F+o3SbMh3MuiETVEstyWGGc D6msmCVuAFBY7lqG2VjEBQ0vIq0H+vGRFy3J8ff9+NWl8x0eDfMQTsvnQA9Z2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6yjW4BvXz62H for ; Fri, 06 Feb 2026 15:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18885 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 15:31:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 06fd19b5349a - main - spibus: Don't leak KVA when freeing a mmap region List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06fd19b5349a1ff27ef338619fdade596986fc2f Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 15:31:11 +0000 Message-Id: <6986093f.18885.5a7e56d@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=06fd19b5349a1ff27ef338619fdade596986fc2f commit 06fd19b5349a1ff27ef338619fdade596986fc2f Author: John Baldwin AuthorDate: 2026-02-06 15:30:26 +0000 Commit: John Baldwin CommitDate: 2026-02-06 15:30:26 +0000 spibus: Don't leak KVA when freeing a mmap region Effort: CHERI upstreaming Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54837 --- sys/dev/spibus/spigen.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/spibus/spigen.c b/sys/dev/spibus/spigen.c index 66c93e927281..39b94c6123fc 100644 --- a/sys/dev/spibus/spigen.c +++ b/sys/dev/spibus/spigen.c @@ -283,8 +283,10 @@ spigen_mmap_cleanup(void *arg) { struct spigen_mmap *mmap = arg; - if (mmap->kvaddr != 0) + if (mmap->kvaddr != 0) { pmap_qremove(mmap->kvaddr, mmap->bufsize / PAGE_SIZE); + kva_free(mmap->kvaddr, mmap->bufsize); + } if (mmap->bufobj != NULL) vm_object_deallocate(mmap->bufobj); free(mmap, M_DEVBUF); From nobody Fri Feb 6 15:31:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6yjX6frCz6RLXJ for ; Fri, 06 Feb 2026 15:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6yjX5MRkz3t6V for ; Fri, 06 Feb 2026 15:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770391872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/F1Um04jsoZe/bNcClEEVIzzA4iqaJXx7D27PguxTB8=; b=lImzJpdRUrBbUu/6X31uOWuTmYRGdw3B70Qvh6AKcm9fpeWBfYnpMuxKQbyxNNrWsss9Xj oGEZYfQuAPZ5Q0WfeTQDGK/cpbh3c8m3+QLrwO6hCghYYM+TQjjdftpS8o+fvUVQ4ZhMpb WVnhe7EusKE+I8cMEx4I6R6D51GyC0GyOWMH0R/6q/3fb1SXdTEBXM13o3yvbHPWygIUpt rl+cTM7bz05jGlioQ4cBjn9EgGziT5oHFQ4iv/M/5HM5PSuOntwS/5jf/UJJBUvfviTfl3 uLxVfrYsJFuLn7c96Oz59nv66Jnnt74TyljouYRQSQEn7lqeu5jZPyKIogtZgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770391872; a=rsa-sha256; cv=none; b=GirbbPt6INR4nCh6pG6aeI6M4GI7YoYGoGFrgZy89Uy3PbN5fwSnnYoAaWG//hVArrSXWK oOeddGUwMR0R/G2vxwBfFsIULn1NsRT2W8qh/LvFjW1Cv8goCRu9IGTFhfobD/YeH/MPBr k4MIIjvK00NHdnklGHgFni8k3Ny1czGUzcTdYmBEOxMmI1v7PfblxgZp4FoHFJgWLaIVqQ dCQcXpfHTtrRhKY/Msi3IVARayOBq/6Q1+xEj1jATDi0+BIl70lAET5rOUcmSkZmZQPnw8 /LoQza36a0H8KbtcrR0LVgyHPauT8gC2t1YcRO81TDKW5OX58MILV3IvwQmtOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770391872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/F1Um04jsoZe/bNcClEEVIzzA4iqaJXx7D27PguxTB8=; b=ST/BUjO0AP+P9PIK6aw7Sbq3BmEWtqikaOO0JikfAd1/gAeuyep4Ko7AmrOm9bnen4qafB 1gcK5GlUzeRwk5OCLMikEE4Y4iUw0dJBm3a0vxNodLboQRiiaP8ZvFNsyrwzlDe2KVyqvf L/RTFh2T7T5lXCQ31i5ZVjFACPnnWgxQ605B1XzwKPgxwlC8jGYPyDOdIqzpsnbliiAeIg c7WBDqwdOgUtnkJOPQ2VKBbL8led/qm9a9FBH2cRWnoyIkO1wr2Gf5mchfrPb5Swc+LiT8 FBpaiYwtDbu7kGTaVYN0mc96njOWSlMfFNq/UnbwM6GSanmn8/eai+3lZLXnMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6yjX4tV3z62J for ; Fri, 06 Feb 2026 15:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1900e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 15:31:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e9a697bf20cc - main - STACKALIGN: Reimplement in terms of __align_down List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9a697bf20ccbb2a19f6ad01fa3e0c14e0390847 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 15:31:12 +0000 Message-Id: <69860940.1900e.5bab1fda@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a697bf20ccbb2a19f6ad01fa3e0c14e0390847 commit e9a697bf20ccbb2a19f6ad01fa3e0c14e0390847 Author: John Baldwin AuthorDate: 2026-02-06 15:30:50 +0000 Commit: John Baldwin CommitDate: 2026-02-06 15:30:50 +0000 STACKALIGN: Reimplement in terms of __align_down This changes STACKALIGN to be type-preserving when operating on pointers. Reviewed by: brooks, kib Effort: CHERI upstreaming Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54920 --- lib/libc/aarch64/gen/makecontext.c | 3 ++- lib/libc/riscv/gen/makecontext.c | 3 ++- sys/arm/arm/exec_machdep.c | 2 +- sys/arm/arm/machdep.c | 2 +- sys/arm/arm/vm_machdep.c | 4 ++-- sys/arm/include/param.h | 1 - sys/arm64/arm64/exec_machdep.c | 2 +- sys/arm64/arm64/vm_machdep.c | 2 +- sys/arm64/include/param.h | 1 - sys/arm64/linux/linux_sysvec.c | 2 +- sys/riscv/include/param.h | 1 - sys/riscv/riscv/exec_machdep.c | 2 +- sys/sys/param.h | 3 +++ 13 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/libc/aarch64/gen/makecontext.c b/lib/libc/aarch64/gen/makecontext.c index 8c9b4edd7a15..2d0ee1043a9b 100644 --- a/lib/libc/aarch64/gen/makecontext.c +++ b/lib/libc/aarch64/gen/makecontext.c @@ -74,7 +74,8 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...) va_end(ap); /* Set the stack */ - gp->gp_sp = STACKALIGN(ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size); + gp->gp_sp = STACKALIGN((uintptr_t)ucp->uc_stack.ss_sp + + ucp->uc_stack.ss_size); /* Arrange for return via the trampoline code. */ gp->gp_elr = (__register_t)_ctx_start; gp->gp_x[19] = (__register_t)func; diff --git a/lib/libc/riscv/gen/makecontext.c b/lib/libc/riscv/gen/makecontext.c index e5371d082b2c..8a6498167f13 100644 --- a/lib/libc/riscv/gen/makecontext.c +++ b/lib/libc/riscv/gen/makecontext.c @@ -80,7 +80,8 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...) va_end(ap); /* Set the stack */ - gp->gp_sp = STACKALIGN(ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size); + gp->gp_sp = STACKALIGN((uintptr_t)ucp->uc_stack.ss_sp + + ucp->uc_stack.ss_size); /* Arrange for return via the trampoline code. */ gp->gp_sepc = (__register_t)_ctx_start; gp->gp_s[0] = (__register_t)func; diff --git a/sys/arm/arm/exec_machdep.c b/sys/arm/arm/exec_machdep.c index 011085841938..8ce00fc87a08 100644 --- a/sys/arm/arm/exec_machdep.c +++ b/sys/arm/arm/exec_machdep.c @@ -307,7 +307,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) fp--; /* make the stack aligned */ - fp = (struct sigframe *)STACKALIGN(fp); + fp = STACKALIGN(fp); /* Populate the siginfo frame. */ bzero(&frame, sizeof(frame)); get_mcontext(td, &frame.sf_uc.uc_mcontext, 0); diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index dc2205023820..60d63cebca3d 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -655,7 +655,7 @@ initarm(struct arm_boot_params *abp) } #endif - return ((void *)STACKALIGN(thread0.td_pcb)); + return (STACKALIGN(thread0.td_pcb)); } #endif /* FDT */ diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index 5f478b54cd66..bee1c705fbbd 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -129,7 +129,7 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) pcb2->pcb_regs.sf_r4 = (register_t)fork_return; pcb2->pcb_regs.sf_r5 = (register_t)td2; pcb2->pcb_regs.sf_lr = (register_t)fork_trampoline; - pcb2->pcb_regs.sf_sp = STACKALIGN(td2->td_frame); + pcb2->pcb_regs.sf_sp = (register_t)STACKALIGN(td2->td_frame); pcb2->pcb_regs.sf_tpidrurw = (register_t)get_tls(); #ifdef VFP @@ -194,7 +194,7 @@ cpu_copy_thread(struct thread *td, struct thread *td0) td->td_pcb->pcb_regs.sf_r4 = (register_t)fork_return; td->td_pcb->pcb_regs.sf_r5 = (register_t)td; td->td_pcb->pcb_regs.sf_lr = (register_t)fork_trampoline; - td->td_pcb->pcb_regs.sf_sp = STACKALIGN(td->td_frame); + td->td_pcb->pcb_regs.sf_sp = (register_t)STACKALIGN(td->td_frame); td->td_frame->tf_spsr &= ~PSR_C; td->td_frame->tf_r0 = 0; diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h index fa9737608038..8e6f7b1d9bd6 100644 --- a/sys/arm/include/param.h +++ b/sys/arm/include/param.h @@ -47,7 +47,6 @@ #include #define STACKALIGNBYTES (8 - 1) -#define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES) #ifndef MACHINE #define MACHINE "arm" diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index 207e10ede96c..9f9b74e6a0e5 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -838,7 +838,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Make room, keeping the stack aligned */ fp = (struct sigframe *)addr; fp--; - fp = (struct sigframe *)STACKALIGN(fp); + fp = STACKALIGN(fp); /* Copy the sigframe out to the user's stack. */ if (copyout(&frame, fp, sizeof(*fp)) != 0) { diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index 0134feb65b6a..b46cb8793409 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -100,7 +100,7 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) ptrauth_fork(td2, td1); - tf = (struct trapframe *)STACKALIGN((struct trapframe *)pcb2 - 1); + tf = STACKALIGN((struct trapframe *)pcb2 - 1); bcopy(td1->td_frame, tf, sizeof(*tf)); tf->tf_x[0] = 0; tf->tf_x[1] = 0; diff --git a/sys/arm64/include/param.h b/sys/arm64/include/param.h index f3cdd4e44bc0..919dea4fb3cf 100644 --- a/sys/arm64/include/param.h +++ b/sys/arm64/include/param.h @@ -41,7 +41,6 @@ #include #define STACKALIGNBYTES (16 - 1) -#define STACKALIGN(p) ((uint64_t)(p) & ~STACKALIGNBYTES) #ifndef MACHINE #define MACHINE "arm64" diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index ac05820f89bc..9afb6fb143d6 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -338,7 +338,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Make room, keeping the stack aligned */ fp--; - fp = (struct l_sigframe *)STACKALIGN(fp); + fp = STACKALIGN(fp); get_mcontext(td, &uc.uc_mcontext, 0); uc.uc_sigmask = *mask; diff --git a/sys/riscv/include/param.h b/sys/riscv/include/param.h index 471d8b354b82..e1cf50df7d14 100644 --- a/sys/riscv/include/param.h +++ b/sys/riscv/include/param.h @@ -37,7 +37,6 @@ #include #define STACKALIGNBYTES (16 - 1) -#define STACKALIGN(p) ((uint64_t)(p) & ~STACKALIGNBYTES) #ifndef MACHINE #define MACHINE "riscv" diff --git a/sys/riscv/riscv/exec_machdep.c b/sys/riscv/riscv/exec_machdep.c index b1f96b1426a7..4e0d1f2a7e5c 100644 --- a/sys/riscv/riscv/exec_machdep.c +++ b/sys/riscv/riscv/exec_machdep.c @@ -370,7 +370,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Make room, keeping the stack aligned */ fp--; - fp = (struct sigframe *)STACKALIGN(fp); + fp = STACKALIGN(fp); /* Fill in the frame to copy out */ bzero(&frame, sizeof(frame)); diff --git a/sys/sys/param.h b/sys/sys/param.h index 65a244311fee..27e8e0f14e77 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -179,6 +179,9 @@ #ifndef MAXDUMPPGS #define MAXDUMPPGS (DFLTPHYS/PAGE_SIZE) #endif +#ifdef STACKALIGNBYTES +#define STACKALIGN(p) (__align_down(p, STACKALIGNBYTES + 1)) +#endif /* * Constants related to network buffer management. From nobody Fri Feb 6 15:33:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6yll45q1z6RLSt for ; Fri, 06 Feb 2026 15:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6yll36D9z3vKS for ; Fri, 06 Feb 2026 15:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770391987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0KjIvQDFNg3j5I6SEN9zlLt6RcMNoO34tJpULU+z0c=; b=VHQv5rQI/WCtjLHeDtrkqb0keYiRvldAM5TgQV6sabo2Hz4LCHbZ4THDSUoILy2EOT2Euk AXf83mbHEMMSd+p2Ldl0rkYuu6NVPYMDVyAjBzBUeS8axTtM4+2y+vwJTAuxzC3kIwN4Ia vM4Q/0tr+EvBdMBF02Vwkpgthzp591vsd1bQYtUYAPsaQW06j4wy3qTDqkkbJa0Bcvfp2O dS2g6joW1ANomaymIMbKjjyJ8zbpI/3MSyLxWy3pw94d7gH9P+lxBWSialByvpapj8Ut69 ivhMV011eyxWw59J+KI2ivNILFuWa+AdS6Qgt9gQJT2ayEw1SyUGOWramkQY1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770391987; a=rsa-sha256; cv=none; b=j1ndfRjsveQ9YqXhx1T4up9W+kCIJGkZ0NOaUeehSH7uEMd5q+JMiHhPqDc0XBLKqr2RAI DzKuQn42uQfeIsz4yZPmjZEDkYGFjs8nxTe5/KjoRs+q5y3gtEAkLHv3IkNWBlqF2G+suT yTPEE4VSFOqIREvGLWxACmU4NndAii22AQgBRLfqgCQ5Oe/GAGy2f/LrASqeNGIn1iT83T 7jpl1CQGs83uqjvwQw4c8aQZiJTKCzHyNpFLMWmQ9ua747XpJExzdNXRyL8Zkz8KJtRKJ5 EGYdjWkebcPO5EJKxf41ZCXXX0vYMSL5uh0X9u2CSTq9upGkj6+Jn8QOkOvnMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770391987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0KjIvQDFNg3j5I6SEN9zlLt6RcMNoO34tJpULU+z0c=; b=L3JKdjuCsdspFsS0Zr/cW30GfxYbJskqyw8i51Z3p3bvp9ckjgDV/60RLuYx1EBG07wGJc Id79lDAm4GvEzaKul1rgBv1XLBr5K9oNRJjHMBZPBooippI4CI/xxJ+oTIwa8/cvWSh8Kc tx2t2f3iX7LZ9THz+eP9b4Qjmhid2CWFMtqbnxyNdsupJCnO4vZ3h2m5WNUYK/W9c5yxgN AV69VFW+p+YDzcVMSa7iPbPBH6hPXzbekLxZKzUH4g+S9YUPBHxhCzfGHSquW27Zzg6f4y HZ4WeMKL7KGRwRNkWG8YL8uC56zVys/W8AMfyvViwWhG7zJzprw9G3GMEsfMEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6yll2cHNz5sW for ; Fri, 06 Feb 2026 15:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e846 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 15:33:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f73101fabc74 - main - universe: Bump default GCC version to 15 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f73101fabc74255d70f4e7ce0e71f0f6655c51ea Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 15:33:07 +0000 Message-Id: <698609b3.3e846.367c77f7@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f73101fabc74255d70f4e7ce0e71f0f6655c51ea commit f73101fabc74255d70f4e7ce0e71f0f6655c51ea Author: John Baldwin AuthorDate: 2026-02-06 15:32:58 +0000 Commit: John Baldwin CommitDate: 2026-02-06 15:32:58 +0000 universe: Bump default GCC version to 15 Reviewed by: lwhsu, emaste Differential Revision: https://reviews.freebsd.org/D55085 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ac0a9218e88f..9308883b8500 100644 --- a/Makefile +++ b/Makefile @@ -546,7 +546,7 @@ TARGET_ARCHES_${target}= ${MACHINE_ARCH_LIST_${target}} .endfor .if defined(USE_GCC_TOOLCHAINS) -_DEFAULT_GCC_VERSION= gcc14 +_DEFAULT_GCC_VERSION= gcc15 _GCC_VERSION= ${"${USE_GCC_TOOLCHAINS:Mgcc*}" != "":?${USE_GCC_TOOLCHAINS}:${_DEFAULT_GCC_VERSION}} TOOLCHAINS_amd64= amd64-${_GCC_VERSION} TOOLCHAINS_arm= armv7-${_GCC_VERSION} From nobody Fri Feb 6 15:39:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6yv44lrbz6RLTr for ; Fri, 06 Feb 2026 15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6yv4496jz3vsv for ; Fri, 06 Feb 2026 15: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=1770392368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2p0fisiLzVVna8ZSd6+3rQhkuH77KR2n1ken1Jfhds=; b=x8QJZ9hT2bmOlgSHc8kcvKTT0uUyeT/HtUo5yzKF6Oqug2WZRHFXKZpWuUakSwJ0csWakK 6Beajy2mVGtlfYXUWO7UFbWZU83e+zIiF06o+OswmbV9XfVQocQeGHuE/d/BMxXtkJuvNw JSdG8DQUGSlAgnE88EjK5kAyCxj/NR2VDWogsCxJZLgL9Pxfi0n3HMu0FB2LCgcVT9W9tU 9QuKa3TCxT8XvMJNhfKEA+X6k9KNzxFE0KKz31rgOeuZTEAJUCLMYtkhEGiHDn7bX4e1q5 3tKxYfWa764k0VyfZLm25WDwqC8DFsuvFEM0qW+Ff7rqseAgKWEFu/DsLTzuyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770392368; a=rsa-sha256; cv=none; b=U1DUvLjmXIxWuUJicBTerawufQYWaFLpNay/3mWBvSddSNHuqUn3pkaPbZAnJX1a1w5mlm YMHmpYgrPGnIgaF6HuOwwBXCr6JAXlUk1xTBqmZKRWycvqbiqqDFrUtKJPFZKxOmnyLHEg va7mgitb2qevcBYbargNgZTVTMuweL0ri4gKWsM7Ww+80DBGqH45MiY4UoN5y9Dy3dOamn aaRjS0RV19E4l9Xb2QMlKkzeTDnnkW7RW3dC4yYfRGo86agwSMuS9fuIgTqbclax0V2sv0 p9xWIUl+33F5b6Gep6flJ8ZgFPZk8/adC4WqEdqOP62BckuJsBFF7H/I/VFuXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770392368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2p0fisiLzVVna8ZSd6+3rQhkuH77KR2n1ken1Jfhds=; b=LySxnyUUJZ/gaAeENykrmeL/nn+fb4AmRzOeLh986lCBGpbEMR53aRVc3sXxAwL8cYqf7V B4SfqwmuCrKnapKxPOLFmwjz3ayBNq7lG8CLaKM8nJ/XzRiTzoPMmPfhyY2L1687YTTDy5 1WdZrXeVFBK18pcKN9ZDwuVrZ6osKJ6YxCundT6NdmmOKQZSkTWwQmyLS2NL6B1zLRiJPk akJmiK9Jk1JnTun2a/xc7GkBzgZiURwjjaOp06XCvSD8TZMF2rpMP9f6QyaKT1KUbsYBxU CDoKvCbpb0UgWvZYuSh7RHpEVmhHwSQmi0M6/TaB5zIp42kLf5TSeuHaCA2m1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6yv43SvRz63P for ; Fri, 06 Feb 2026 15:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f83f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 15:39:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 36b855f18925 - main - amd64/vmm: Lock global PCI passthrough structures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36b855f1892575cbfe1cd5455b989bfc8ae07502 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 15:39:28 +0000 Message-Id: <69860b30.3f83f.acb567e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=36b855f1892575cbfe1cd5455b989bfc8ae07502 commit 36b855f1892575cbfe1cd5455b989bfc8ae07502 Author: Mark Johnston AuthorDate: 2026-02-06 15:29:22 +0000 Commit: Mark Johnston CommitDate: 2026-02-06 15:38:51 +0000 amd64/vmm: Lock global PCI passthrough structures There is a global list of ppt-claimed devices, accessed via several vmm ioctls. The ioctls are locked by per-VM locks, but this isn't sufficient to prevent multiple VMs from trying to bind a given device. Add a sleepable lock and use that to synchronize all access to ppt devices. Reviewed by: corvink, jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55065 --- sys/amd64/vmm/io/ppt.c | 162 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 111 insertions(+), 51 deletions(-) diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index 6feac5dcbbed..b522e18e3b24 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -28,13 +28,15 @@ #include #include +#include #include +#include #include #include -#include #include #include #include +#include #include #include @@ -67,6 +69,12 @@ MALLOC_DEFINE(M_PPTMSIX, "pptmsix", "Passthru MSI-X resources"); +static struct sx ppt_mtx; +SX_SYSINIT(ppt_mtx, &ppt_mtx, "ppt_mtx"); +#define PPT_LOCK() sx_xlock(&ppt_mtx) +#define PPT_UNLOCK() sx_xunlock(&ppt_mtx) +#define PPT_ASSERT_LOCKED() sx_assert(&ppt_mtx, SA_XLOCKED) + struct pptintr_arg { /* pptintr(pptintr_arg) */ struct pptdev *pptdev; uint64_t addr; @@ -156,17 +164,20 @@ ppt_attach(device_t dev) ppt = device_get_softc(dev); + PPT_LOCK(); cmd1 = cmd = pci_read_config(dev, PCIR_COMMAND, 2); cmd &= ~(PCIM_CMD_PORTEN | PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN); pci_write_config(dev, PCIR_COMMAND, cmd, 2); error = iommu_remove_device(iommu_host_domain(), dev, pci_get_rid(dev)); if (error != 0) { pci_write_config(dev, PCIR_COMMAND, cmd1, 2); + PPT_UNLOCK(); return (error); } num_pptdevs++; TAILQ_INSERT_TAIL(&pptdev_list, ppt, next); ppt->dev = dev; + PPT_UNLOCK(); if (bootverbose) device_printf(dev, "attached\n"); @@ -180,22 +191,26 @@ ppt_detach(device_t dev) struct pptdev *ppt; int error; + error = 0; ppt = device_get_softc(dev); - if (ppt->vm != NULL) - return (EBUSY); + PPT_LOCK(); + if (ppt->vm != NULL) { + error = EBUSY; + goto out; + } if (iommu_host_domain() != NULL) { error = iommu_add_device(iommu_host_domain(), dev, pci_get_rid(dev)); - } else { - error = 0; + if (error != 0) + goto out; } - if (error != 0) - return (error); num_pptdevs--; TAILQ_REMOVE(&pptdev_list, ppt, next); +out: + PPT_UNLOCK(); - return (0); + return (error); } static device_method_t ppt_methods[] = { @@ -216,6 +231,8 @@ ppt_find(struct vm *vm, int bus, int slot, int func, struct pptdev **pptp) struct pptdev *ppt; int b, s, f; + PPT_ASSERT_LOCKED(); + TAILQ_FOREACH(ppt, &pptdev_list, next) { dev = ppt->dev; b = pci_get_bus(dev); @@ -406,10 +423,11 @@ ppt_assign_device(struct vm *vm, int bus, int slot, int func) int error; uint16_t cmd; + PPT_LOCK(); /* Passing NULL requires the device to be unowned. */ error = ppt_find(NULL, bus, slot, func, &ppt); - if (error) - return (error); + if (error != 0) + goto out; pci_save_state(ppt->dev); ppt_pci_reset(ppt->dev); @@ -417,12 +435,14 @@ ppt_assign_device(struct vm *vm, int bus, int slot, int func) error = iommu_add_device(vm_iommu_domain(vm), ppt->dev, pci_get_rid(ppt->dev)); if (error != 0) - return (error); + goto out; ppt->vm = vm; cmd = pci_read_config(ppt->dev, PCIR_COMMAND, 2); cmd |= PCIM_CMD_BUSMASTEREN | ppt_bar_enables(ppt); pci_write_config(ppt->dev, PCIR_COMMAND, cmd, 2); - return (0); +out: + PPT_UNLOCK(); + return (error); } int @@ -432,9 +452,10 @@ ppt_unassign_device(struct vm *vm, int bus, int slot, int func) int error; uint16_t cmd; + PPT_LOCK(); error = ppt_find(vm, bus, slot, func, &ppt); - if (error) - return (error); + if (error != 0) + goto out; cmd = pci_read_config(ppt->dev, PCIR_COMMAND, 2); cmd &= ~(PCIM_CMD_PORTEN | PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN); @@ -448,6 +469,8 @@ ppt_unassign_device(struct vm *vm, int bus, int slot, int func) error = iommu_remove_device(vm_iommu_domain(vm), ppt->dev, pci_get_rid(ppt->dev)); ppt->vm = NULL; +out: + PPT_UNLOCK(); return (error); } @@ -500,13 +523,17 @@ ppt_map_mmio(struct vm *vm, int bus, int slot, int func, hpa % PAGE_SIZE != 0 || gpa + len < gpa || hpa + len < hpa) return (EINVAL); + PPT_LOCK(); error = ppt_find(vm, bus, slot, func, &ppt); if (error) - return (error); + goto out; - if (!ppt_valid_bar_mapping(ppt, hpa, len)) - return (EINVAL); + if (!ppt_valid_bar_mapping(ppt, hpa, len)) { + error = EINVAL; + goto out; + } + error = ENOSPC; for (i = 0; i < MAX_MMIOSEGS; i++) { seg = &ppt->mmio[i]; if (seg->len == 0) { @@ -515,10 +542,12 @@ ppt_map_mmio(struct vm *vm, int bus, int slot, int func, seg->gpa = gpa; seg->len = len; } - return (error); + break; } } - return (ENOSPC); +out: + PPT_UNLOCK(); + return (error); } int @@ -529,10 +558,12 @@ ppt_unmap_mmio(struct vm *vm, int bus, int slot, int func, struct pptseg *seg; struct pptdev *ppt; + PPT_LOCK(); error = ppt_find(vm, bus, slot, func, &ppt); if (error) - return (error); + goto out; + error = ENOENT; for (i = 0; i < MAX_MMIOSEGS; i++) { seg = &ppt->mmio[i]; if (seg->gpa == gpa && seg->len == len) { @@ -541,9 +572,11 @@ ppt_unmap_mmio(struct vm *vm, int bus, int slot, int func, seg->gpa = 0; seg->len = 0; } - return (error); + break; } } +out: + PPT_UNLOCK(); return (ENOENT); } @@ -586,19 +619,22 @@ ppt_setup_msi(struct vm *vm, int bus, int slot, int func, if (numvec < 0 || numvec > MAX_MSIMSGS) return (EINVAL); + PPT_LOCK(); error = ppt_find(vm, bus, slot, func, &ppt); if (error) - return (error); + goto out; /* Reject attempts to enable MSI while MSI-X is active. */ - if (ppt->msix.num_msgs != 0 && numvec != 0) - return (EBUSY); + if (ppt->msix.num_msgs != 0 && numvec != 0) { + error = EBUSY; + goto out; + } /* Free any allocated resources */ ppt_teardown_msi(ppt); if (numvec == 0) /* nothing more to do */ - return (0); + goto out; flags = RF_ACTIVE; msi_count = pci_msi_count(ppt->dev); @@ -613,8 +649,10 @@ ppt_setup_msi(struct vm *vm, int bus, int slot, int func, * The device must be capable of supporting the number of vectors * the guest wants to allocate. */ - if (numvec > msi_count) - return (EINVAL); + if (numvec > msi_count) { + error = EINVAL; + goto out; + } /* * Make sure that we can allocate all the MSI vectors that are needed @@ -624,10 +662,11 @@ ppt_setup_msi(struct vm *vm, int bus, int slot, int func, tmp = numvec; error = pci_alloc_msi(ppt->dev, &tmp); if (error) - return (error); + goto out; else if (tmp != numvec) { pci_release_msi(ppt->dev); - return (ENOSPC); + error = ENOSPC; + goto out; } else { /* success */ } @@ -662,10 +701,12 @@ ppt_setup_msi(struct vm *vm, int bus, int slot, int func, if (i < numvec) { ppt_teardown_msi(ppt); - return (ENXIO); + error = ENXIO; } - return (0); +out: + PPT_UNLOCK(); + return (error); } int @@ -677,17 +718,22 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, int numvec, alloced, rid, error; size_t res_size, cookie_size, arg_size; + PPT_LOCK(); error = ppt_find(vm, bus, slot, func, &ppt); if (error) - return (error); + goto out; /* Reject attempts to enable MSI-X while MSI is active. */ - if (ppt->msi.num_msgs != 0) - return (EBUSY); + if (ppt->msi.num_msgs != 0) { + error = EBUSY; + goto out; + } dinfo = device_get_ivars(ppt->dev); - if (!dinfo) - return (ENXIO); + if (dinfo == NULL) { + error = ENXIO; + goto out; + } /* * First-time configuration: @@ -697,8 +743,10 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, */ if (ppt->msix.num_msgs == 0) { numvec = pci_msix_count(ppt->dev); - if (numvec <= 0) - return (EINVAL); + if (numvec <= 0) { + error = EINVAL; + goto out; + } ppt->msix.startrid = 1; ppt->msix.num_msgs = numvec; @@ -718,7 +766,8 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, if (ppt->msix.msix_table_res == NULL) { ppt_teardown_msix(ppt); - return (ENOSPC); + error = ENOSPC; + goto out; } ppt->msix.msix_table_rid = rid; @@ -730,7 +779,8 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, if (ppt->msix.msix_pba_res == NULL) { ppt_teardown_msix(ppt); - return (ENOSPC); + error = ENOSPC; + goto out; } ppt->msix.msix_pba_rid = rid; } @@ -739,12 +789,16 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, error = pci_alloc_msix(ppt->dev, &alloced); if (error || alloced != numvec) { ppt_teardown_msix(ppt); - return (error == 0 ? ENOSPC: error); + if (error == 0) + error = ENOSPC; + goto out; } } - if (idx >= ppt->msix.num_msgs) - return (EINVAL); + if (idx >= ppt->msix.num_msgs) { + error = EINVAL; + goto out; + } if ((vector_control & PCIM_MSIX_VCTRL_MASK) == 0) { /* Tear down the IRQ if it's already set up */ @@ -755,8 +809,10 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, rid = ppt->msix.startrid + idx; ppt->msix.res[idx] = bus_alloc_resource_any(ppt->dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (ppt->msix.res[idx] == NULL) - return (ENXIO); + if (ppt->msix.res[idx] == NULL) { + error = ENXIO; + goto out; + } ppt->msix.arg[idx].pptdev = ppt; ppt->msix.arg[idx].addr = addr; @@ -767,19 +823,20 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, INTR_TYPE_NET | INTR_MPSAFE, pptintr, NULL, &ppt->msix.arg[idx], &ppt->msix.cookie[idx]); - if (error != 0) { bus_release_resource(ppt->dev, SYS_RES_IRQ, rid, ppt->msix.res[idx]); ppt->msix.cookie[idx] = NULL; ppt->msix.res[idx] = NULL; - return (ENXIO); + error = ENXIO; + goto out; } } else { /* Masked, tear it down if it's already been set up */ ppt_teardown_msix_intr(ppt, idx); } - - return (0); +out: + PPT_UNLOCK(); + return (error); } int @@ -788,10 +845,13 @@ ppt_disable_msix(struct vm *vm, int bus, int slot, int func) struct pptdev *ppt; int error; + PPT_LOCK(); error = ppt_find(vm, bus, slot, func, &ppt); - if (error) + if (error != 0) { + PPT_UNLOCK(); return (error); - + } ppt_teardown_msix(ppt); + PPT_UNLOCK(); return (0); } From nobody Fri Feb 6 15:39:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6yv56XlMz6RLmM for ; Fri, 06 Feb 2026 15:39: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6yv54ncHz3w4J for ; Fri, 06 Feb 2026 15:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770392369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+W+WZZ2/l3Jr0iDYkWuXkMIUcSLJdEr0nkIW8+JKg2M=; b=v2sfp6r4RWN9sPKnyAMxcV2184XuaGZRnBQKEbHQg1+gJ3vInnj9Qeg3KdyZw4Chw7KybQ 1oZwwyXjzcMXFrbX5ecCBFFaxf8hhXCpePCBec6w8mG8uGJZ9MDIjNAyAv1hjcU/icqUlv xZThYCZirlhm6oKTTag6nnYWQvH8PkCSqxDpqa6/OUlp0oComb1NA8ekgGQC4WdDBqhfNd B/I7w36BoVxBNLQMtwJmPnyMpAZaabuBG8FWdyiBBhKETj3tB1Y/4VgIR0EeG12RxOzRJN 61HvAaM8SYSqDbeEfakYM+R+X6w7mBKsHL7pWiInAZaCwHyGlyEKnomcanbfYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770392369; a=rsa-sha256; cv=none; b=No8sruAuVMH/mtSO7UFNp+eD3Dcw8b9UXAmD0+Vy74R5L2mG95r01Al3abxbK/vo7BEvMA ibF3pWK+2OQE3YJUCx8l0NOCojV3I/UuUaS504ZqqIHPd/bYu63rJtdAAFFYB9SeMAY5o6 K710ggk2HCqvap3UM/t49/JmGrfsBlUHhlKCpV/N4QXAjYRFxG0QdSgmsC/xmMZOY+eivQ JEx0xS2KZqxwp5tseNGMVwN/K6N7A9HhkACktKt5OG+FikOWKDTMnBa343a3E7mTq2XQXZ TEPEz4EhX/WhH8PidXd6ec69xjoT0YvMY/UqqYJvxjG0PrcW8km7EK3EZO9orw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770392369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+W+WZZ2/l3Jr0iDYkWuXkMIUcSLJdEr0nkIW8+JKg2M=; b=P/v79LXPHIipY8Q+3kLlXnkBWobnxvur+2Q3dJquVfQ60qla2CT99a12aIZynotOE+joNV MMDnnXfrpBCaFEaqaosFDruCja2Yl2F3TnB0lUzjHvl0JRpjrK45MQssOnd0ZTv0NcjsLi bM2cnAXT0AnS1LXH9MAcGeoUZBUXOIV3qr1HNwL60Q4jS28tBE9ehqHtx8fCAhZZMEFHx8 uOQURDME4JBqcTjhIpUYE4rSEdxN9CPr2RxtX4aWtHOec6Uh7tCDQajbuGR7vOx8EPpH8u Uc2bisERmgs/neLE/1URtbBFjX1JAvhTxIoR8AIQP89bu6/jggzONcTFV9nONg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6yv54Cb4z5m9 for ; Fri, 06 Feb 2026 15:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f8c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 15:39:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 86150ed98b79 - main - bhyve: Simplify passthru_msix_addr() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86150ed98b7903feaba942f01619e74894cd23c4 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 15:39:29 +0000 Message-Id: <69860b31.3f8c9.5a7bead4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=86150ed98b7903feaba942f01619e74894cd23c4 commit 86150ed98b7903feaba942f01619e74894cd23c4 Author: Mark Johnston AuthorDate: 2026-02-06 15:30:56 +0000 Commit: Mark Johnston CommitDate: 2026-02-06 15:38:51 +0000 bhyve: Simplify passthru_msix_addr() It can use the passthru_mmio_map() helper function. Make that change, and also make passthru_mmio_map() use EPRINTLN to fix formatting when the guest console is stdio. Reviewed by: corvink, jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55067 --- usr.sbin/bhyve/pci_passthru.c | 80 ++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 54 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 8ddcd8bd56e8..662390413dbc 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -1310,58 +1310,6 @@ passthru_read(struct pci_devinst *pi, int baridx, uint64_t offset, int size) return (val); } -static void -passthru_msix_addr(struct pci_devinst *pi, int baridx, int enabled, - uint64_t address) -{ - struct passthru_softc *sc; - size_t remaining; - uint32_t table_size, table_offset; - - sc = pi->pi_arg; - table_offset = rounddown2(pi->pi_msix.table_offset, 4096); - if (table_offset > 0) { - if (!enabled) { - if (vm_unmap_pptdev_mmio(pi->pi_vmctx, - sc->psc_sel.pc_bus, - sc->psc_sel.pc_dev, - sc->psc_sel.pc_func, address, - table_offset) != 0) - warnx("pci_passthru: unmap_pptdev_mmio failed"); - } else { - if (vm_map_pptdev_mmio(pi->pi_vmctx, sc->psc_sel.pc_bus, - sc->psc_sel.pc_dev, - sc->psc_sel.pc_func, address, - table_offset, - sc->psc_bar[baridx].addr) != 0) - warnx("pci_passthru: map_pptdev_mmio failed"); - } - } - table_size = pi->pi_msix.table_offset - table_offset; - table_size += pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE; - table_size = roundup2(table_size, 4096); - remaining = pi->pi_bar[baridx].size - table_offset - table_size; - if (remaining > 0) { - address += table_offset + table_size; - if (!enabled) { - if (vm_unmap_pptdev_mmio(pi->pi_vmctx, - sc->psc_sel.pc_bus, - sc->psc_sel.pc_dev, - sc->psc_sel.pc_func, address, - remaining) != 0) - warnx("pci_passthru: unmap_pptdev_mmio failed"); - } else { - if (vm_map_pptdev_mmio(pi->pi_vmctx, sc->psc_sel.pc_bus, - sc->psc_sel.pc_dev, - sc->psc_sel.pc_func, address, - remaining, - sc->psc_bar[baridx].addr + - table_offset + table_size) != 0) - warnx("pci_passthru: map_pptdev_mmio failed"); - } - } -} - static int passthru_mmio_map(struct pci_devinst *pi, int baridx, int enabled, uint64_t address, uint64_t off, uint64_t size) @@ -1373,14 +1321,16 @@ passthru_mmio_map(struct pci_devinst *pi, int baridx, int enabled, if (vm_unmap_pptdev_mmio(pi->pi_vmctx, sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, sc->psc_sel.pc_func, address + off, size) != 0) { - warnx("pci_passthru: unmap_pptdev_mmio failed"); + EPRINTLN("pci_passthru: unmap_pptdev_mmio failed: %s", + strerror(errno)); return (-1); } } else { if (vm_map_pptdev_mmio(pi->pi_vmctx, sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, sc->psc_sel.pc_func, address + off, size, sc->psc_bar[baridx].addr + off) != 0) { - warnx("pci_passthru: map_pptdev_mmio failed"); + EPRINTLN("pci_passthru: map_pptdev_mmio failed: %s", + strerror(errno)); return (-1); } } @@ -1388,6 +1338,28 @@ passthru_mmio_map(struct pci_devinst *pi, int baridx, int enabled, return (0); } +static void +passthru_msix_addr(struct pci_devinst *pi, int baridx, int enabled, + uint64_t address) +{ + size_t remaining; + uint32_t table_size, table_offset; + + table_offset = rounddown2(pi->pi_msix.table_offset, 4096); + if (table_offset > 0) { + (void)passthru_mmio_map(pi, baridx, enabled, address, 0, + table_offset); + } + table_size = pi->pi_msix.table_offset - table_offset; + table_size += pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE; + table_size = roundup2(table_size, 4096); + remaining = pi->pi_bar[baridx].size - table_offset - table_size; + if (remaining > 0) { + (void)passthru_mmio_map(pi, baridx, enabled, address, + table_offset + table_size, remaining); + } +} + static void passthru_mmio_addr(struct pci_devinst *pi, int baridx, int enabled, uint64_t address) From nobody Fri Feb 6 15:59:33 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6zLJ0B2wz6RNDk; Fri, 06 Feb 2026 15:59:36 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6zLH4p21z3ynV; Fri, 06 Feb 2026 15:59:35 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770393575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AAAleocPvqeRZllqL2Nf2roFk07g18D05j8CwVY5DA4=; b=JRpvm8HJ4q/IjbRSMxuv2b82mXU1g+05tqr9aTWkUa9nlQ8lBc138MmtXvW5GDnQyw4qGo A1c9KOJ2dXfWGc5KQWauz7r/8arNjowIYo6fBFsIwsPkLzzqffGxfGlmLfh/3jZeTALaxy Lg+q/IgOWxdwUwTOT11eDj3utz2BZC/orAC4jyqqy/f2uitwjnNPlZBzfvM6vbGbJnQf4C E57+cZBSwduw5kimHJnQuR/oaxCldfIEPi9yOp4HQKA7FI01dLABAyEDTYzPRklPoiftZk mxx6GyNsMY4SuFbM6sQjYDFLcxzBx5oYNvpgBFzHVPF/Sr7gBCQZbySiGOy7Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770393575; a=rsa-sha256; cv=none; b=yOqVXfKAxBC06FKDoEzrgy6WpLCymfxiMMb8/chLIRerihTlZBWHwZxJXmkmxO4lGHrGDs BxAQ/TU9u431qDLA2qO7GIxOT+TtOdj6ovQI2zgHcCpOLfsRVQhH8mTIpzxH27/X7R8oox ypCO7HPEaqyEPyv3catbKR+2Dc+apJMM6wgDTVQQ/eoHgj1zh/N+qP7caUYf3ShU4U58JP GIvMVNqrKXgkkYCcZgYOU+UjHM5mGv77/VtPEziU18Zjn2c75uSRd8fmQQqyj2rQjgy6rm 43R709GX4yhfvw4pcYc4Zc5u0NsrG6kEzeHh1VD/zQBKlNvtnayo5ZJYItp8kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770393575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AAAleocPvqeRZllqL2Nf2roFk07g18D05j8CwVY5DA4=; b=QLVGCz6O5rmmVvJUiby2x4jo6Oo2J3Zd+FGwL1XsnlwOVp/RxkcihM0zyN7dfE0/e7uHX+ O6wjQL7xvml2vW07OLmD+TuRLbrqS5KwgzBiUnC4PnI946VGQX7QklqLNrK9CWKyF+kEQ8 Mhv8p3TeSK85J7Ca78jAZrZquop2kyw5kW3rc0uPHpqhSFRQ79c9EOmwfhD0EYD3ny/yDp Q5KiQ2tsgkAsWXouob5b6QcuThaPlMPrsneMxT5YWnQR2KSf5WS/Cls3vFwcxtqUdyXP9J VJrlJV1adbKJ9uxXvtWRvtuLqTP5jkfoqruKne/yJQdktdlzSVWkhkT/9lTw1A== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f6zLH2MySzMDN; Fri, 06 Feb 2026 15:59:35 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <11fddfa0-41fd-430a-8ecb-8afa27385878@FreeBSD.org> Date: Fri, 6 Feb 2026 09:59:33 -0600 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c0df8f6f0e6a - main - acpi: Make taskqueue only run on BSP To: Aymeric Wibo , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <695f8abf.30bec.62a9009@gitrepo.freebsd.org> Content-Language: en-US From: Kyle Evans In-Reply-To: <695f8abf.30bec.62a9009@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/8/26 04:45, Aymeric Wibo wrote: > The branch main has been updated by obiwac: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c0df8f6f0e6a5f77ec9140e8075d09c55fe4c3c7 > > commit c0df8f6f0e6a5f77ec9140e8075d09c55fe4c3c7 > Author: Aymeric Wibo > AuthorDate: 2025-12-29 20:01:50 +0000 > Commit: Aymeric Wibo > CommitDate: 2026-01-08 10:35:54 +0000 > > acpi: Make taskqueue only run on BSP > > This is needed because when we add the suspend-to-idle loop, we only > want to break the BSP out of idle to process the taskqueue while keeping > all the others idled. > > Currently assuming BSP to be CPU0, which may not always be the case on > non-x86. > > Reviewed by: kib > Approved by: kib > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D54406 > --- > sys/dev/acpica/Osd/OsdSchedule.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c > index f0464709e8ad..0c5eadb87687 100644 > --- a/sys/dev/acpica/Osd/OsdSchedule.c > +++ b/sys/dev/acpica/Osd/OsdSchedule.c > @@ -35,6 +35,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -109,10 +110,13 @@ static void > acpi_taskq_init(void *arg) > { > int i; > + /* XXX Currently assuming BSP is CPU0. */ > + cpuset_t just_bsp = CPUSET_T_INITIALIZER(0x1); > > acpi_taskq = taskqueue_create_fast("acpi_task", M_NOWAIT, > &taskqueue_thread_enqueue, &acpi_taskq); > - taskqueue_start_threads(&acpi_taskq, acpi_max_threads, PWAIT, "acpi_task"); > + taskqueue_start_threads_cpuset(&acpi_taskq, acpi_max_threads, PWAIT, > + &just_bsp, "acpi_task"); > if (acpi_task_count > 0) { > if (bootverbose) > printf("AcpiOsExecute: enqueue %d pending tasks\n", > Hi, Mentioned privately, but also bringing it to the list in case anyone else has had the same symptom- updating my frame.work laptop from ~December main to ~February main resulted in a power-button wakeup shutting down the system after it wakes up. The result of a bisect pointed at this commit reliably causing it, and reverting it locally does seem to fix it. Thanks, Kyle Evans From nobody Fri Feb 6 16:15:34 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6zhl1HnVz6RNtj for ; Fri, 06 Feb 2026 16:15: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6zhk6RZlz42BD for ; Fri, 06 Feb 2026 16:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770394534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CEzZvx6yjW5Ae9Y1CKykQXunr5HKEHJqM6b/yAI8lBU=; b=gjHnFiWBqBJbWj5iYlxLcmADKKbLIeBySsa6hiZ6VRzw7L2WrbQd/6dUiKJehBS5rq5Gmm S/I3ubmzyjgzl0gUXj9zG6HvfrTWDypJjdmNmbxLina5nb06vZRbgzUYZBT3BfRgWaMwcl T3iSRswAkN2zwC/oTRaPtUtBXiMFcftmC9Igg6+XCnQ5IRhv6Bmlc8FrOTCVmESrUTBpqr tc//82d1o5ILCIbbOBiWjH7nM95VVvMlLJVHdawWxXjTrOq806B0eL+3fTacYPfvIhjfXz b354DsRRJgUPDE3WuXyAPnaENVxZHjRjU9oRambEjy+hDFdbRhT91BTNP5lLQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770394534; a=rsa-sha256; cv=none; b=Ud+7ymznzEBwx0Ypfy/g2QTB6IP7tWABpIN7q2fwV0Qq9Oj1O+mbm7Es3M2UdJOtPSayR3 Drvu+QI+l2RNIifNHkEGb3v8lGVYYLkz5+3kvVaOcTNWagM3Z75jK5sxk7Q8d7u7in2qLG 9C/SPQ7eDduBdUhvc8l9MH4hU9+xlcrvchvBKtZ07TJJMRIlhaLHskEWxWb91oQAItf7M7 fPc+/kSH8uAoOsm1zxj/r9ATj4fwHR4NE9IEehgaTjLsuN8ArY+qactQpf6jCZBVVT5fc7 4dzkr+Q4cCakIhuj/ezCKRU4LVOsS6EXM1H6GxZZWmCMJUuUnw7QiN4sSljSmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770394534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CEzZvx6yjW5Ae9Y1CKykQXunr5HKEHJqM6b/yAI8lBU=; b=wz1dcBjHN3w20Ezrm7lHVwoybMCFBci9Ro2XxWqHQzzDyr5bVcNhCdait9GkCZj0XPajPX ernqqzEHQnGZb8KmsmcBt3kaCyQc1nC+6rBae4Jv9cIoAZk7ISBUf68rLlPpo+VTp23dwA ezcnJx61y/F+qytM+OCigGnUYFODdls5AR8ag2gw+DJfFL0PPV85keQmuFUgKPSTt7/NdU Z9KuwLy9hTMGTDiCy/yUv5o/vict1TlSCXPFqD4mu9xlegkhbEvLma7FjNxVf6AsgEPtPP EO0C25DqXkYbDe7JGhoeeejT2PmNq7+Mzql7bmLJhM9x+vZXuBImwhLMfoNukA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6zhk5S2gz7Hf for ; Fri, 06 Feb 2026 16:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a075 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:15:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Aymeric Wibo Subject: git: 067ad8b31bf6 - main - thunderbolt: Fix tb_pcib device matching to check PCI class List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 067ad8b31bf68b6dcf1ad571746349ed88d63d00 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:15:34 +0000 Message-Id: <698613a6.1a075.25bbf0ea@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=067ad8b31bf68b6dcf1ad571746349ed88d63d00 commit 067ad8b31bf68b6dcf1ad571746349ed88d63d00 Author: Abdelkader Boudih AuthorDate: 2026-02-06 16:12:56 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-06 16:13:12 +0000 thunderbolt: Fix tb_pcib device matching to check PCI class Light Ridge and earlier Thunderbolt controllers reuse the same device ID (0x1513) for both the NHI (class 0x088000) and PCI bridges (class 0x060400). Without checking the PCI class, tb_pcib would incorrectly match NHI devices, causing a panic when trying to attach bridge code to non-bridge hardware. Add PCI class check to tb_pcib_find_ident() to only match actual PCI-PCI bridges (PCIC_BRIDGE/PCIS_BRIDGE_PCI). Reviewed by: obiwac, jhb Approved by: obiwac, jhb Fixes: 2ed9833791f2 (thunderbolt: Import USB4 code) Differential Revision: https://reviews.freebsd.org/D55102 --- sys/dev/thunderbolt/tb_pcib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/thunderbolt/tb_pcib.c b/sys/dev/thunderbolt/tb_pcib.c index e6f0115364da..ffb85ebec9ae 100644 --- a/sys/dev/thunderbolt/tb_pcib.c +++ b/sys/dev/thunderbolt/tb_pcib.c @@ -119,6 +119,10 @@ tb_pcib_find_ident(device_t dev) for (n = tb_pcib_identifiers; n->vendor != 0; n++) { if ((n->vendor != v) || (n->device != d)) continue; + /* Only match actual PCI-PCI bridges to avoid conflict with NHI */ + if (pci_get_class(dev) != PCIC_BRIDGE || + pci_get_subclass(dev) != PCIS_BRIDGE_PCI) + continue; if (((n->subvendor != 0xffff) && (n->subvendor != sv)) || ((n->subdevice != 0xffff) && (n->subdevice != sd))) continue; From nobody Fri Feb 6 16:23:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6zsf4FJjz6RPg9 for ; Fri, 06 Feb 2026 16:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6zsf1wWrz4387 for ; Fri, 06 Feb 2026 16:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770394998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s5plkceNwAxH1kjsOmUXZBEcFtKFxSModeucfUciztU=; b=hQKBmsEyOqNDcod7rL2PLP4r619IrhPlNfZbprw8ffLTpXWg+zPPQjrYSBNEnzlu+8USPG EFoH0RXF+wVRPvDHGKIIRHMW3nHs/LX17GwqpwNmuhu5QmyLrBlHPzSvXozs8HalQ4tADm wMEMbtSbw3KIuQ6cqTlbQEgXcXNooV7+KE99iOyGmafFXdvaEseUhlNe/kVS8704o8aydE 9rmeE59iD43XTj1aQOw2fEAWtwux8O7e6G86KLRkfBDH99zS9X7SX0+f+KVYt29Z2eGc8k MYk3zGnegUUf/v8CiCFVfhnx2A9iHcYreKGuz67FEkFi2ZMVFpyn33jCFyo0IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770394998; a=rsa-sha256; cv=none; b=PgYS61btf9lQD6rYs+QBxkfbwfSRoKzKSOzDQDXDChF86NQIkNhVf+oFGQjOF69xgrB00A aP46/RBP32C+mTtlR3rGkbnCtlWLNMZX5w56Jt8N3DtrvhPy9dRRj7wDVKuz8JIG+iCZcj GX/9P9T/J/65NyKpyE7SBsN1Z/xogNUCdaH32wHqCxaeQgwK1CI8q3tYN6VOzFdgZEGR8J vB9nxg71ASY64Ry0czTsbgd3V10SfoqdWxeOla8PK71ITG8fFNHxItSZo2moL5hSlVOleG EtWLOkXcSOy1/M7+PMfBAiOouPsm+5clJ6XWXXP+oxBXg+s21UELyU3j3HIWTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770394998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s5plkceNwAxH1kjsOmUXZBEcFtKFxSModeucfUciztU=; b=ieIR0ph+ajQEjVyIM3dk2m9KB0JZtoPPG3DyluU1PI8Y01hII3KdEZPkQyJdWB4wQ1JXg0 yWdpzwc/s9URq+CUC8JJIxExDa3tC6k7Xj+mwYqlJiZzLoVTHrf8aLQEZdjKwZT7lZ4p+f rL2aoawVFpZHTsaWmAPV+I/Msj7c+tUkqWfzvVI/OshLo18nlP6DxX5bfln+Sza1n2ggrD SPlOUzp15axxF+NIfotJ01NXLMcJ7IdhhZhzqUZz4k7O+rbwHtmpnfiwIpJvwHgv97wSu2 g1GOuXkeEq5Xujirzvp1uL2qRGSbDWF7H3WsRQQMjSQWZ+E+bpvvwAiz8OciYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6zsf1TBCz7ZD for ; Fri, 06 Feb 2026 16:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f281 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:23:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 1a446f765d9c - main - sys/sysctl.h: Make it self-contained when included from the kernel List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a446f765d9cb34e8137ffa6dbb71ce551560cc1 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:23:18 +0000 Message-Id: <69861576.1f281.17979416@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1a446f765d9cb34e8137ffa6dbb71ce551560cc1 commit 1a446f765d9cb34e8137ffa6dbb71ce551560cc1 Author: Olivier Certner AuthorDate: 2026-02-06 15:02:39 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:23:03 +0000 sys/sysctl.h: Make it self-contained when included from the kernel MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/sys/sysctl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 902f5bde9c37..139b4bc5d9da 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -36,7 +36,8 @@ #define _SYS_SYSCTL_H_ #ifdef _KERNEL -#include +#include +#include #include #include #endif From nobody Fri Feb 6 16:23:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6zsg3g9Dz6RPgC for ; Fri, 06 Feb 2026 16:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6zsg2rslz42nv for ; Fri, 06 Feb 2026 16:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770394999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G1w5qx63vAr0jOvhcTsRx29C7EDlWNkAQkVY4daMdDI=; b=r8ZAAWHFgChieamV4npPcK/6RbciKi3tK4SdYJLvZ4oUbzAXKLwKcZLe5AyG88wiGVCmkg KG2QAKe6bCTCXpI5+KysrdaFDIjHFxw47w/1LRjsAWz/8IwkPzkHYV7nf9zrMqBeCMkz19 L1NEbuFtUVhkS1VGYRbRoU0FplBIHzRRs6dT0oXKP+3sluOeRnvYkDssnedGWFtF/9QE6l SN6zZp/OpOh9paTM+C2yGBETd40hlieatrzyOBgaEWsCyYu58A02Sm6Iq/oLmlglxNTq1I E1Q8tHrBKC7LilE1gx74GYO1vMSON6U9Iin4ckwTX1u4Zd49B6xuAdGuuyYJqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770394999; a=rsa-sha256; cv=none; b=E3/UBERuBzLTshYTJjnO46kPl4W1hv1HjGa3nHDC7xQZUZY4tJ8yGJ7LAu7iLyHkUsEo/q PhQJ58yyliMx1BuKkj9GvvgWO7oiL7Dv10zJoQtqD6foXFy//WSfpub7Sts8ijCmF8pTfZ qc5N2VSOXMxsLSFKw2XheBuVjuCzFG2sYKIPloHomRdZ6WCuAo+scb8M4t9CQnZnyDwwrJ suMF7hKl42XCLCNl8xaVwc/oIRTO18yJMqwrizbEyr46ojCqyBinbi5ccG0A7zUyax7MoN 7VPwOchSL5DONz73StSN0ryWO4lfNDtf/tZ3mfDURRjLBmamyLTn8uHXduLgxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770394999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G1w5qx63vAr0jOvhcTsRx29C7EDlWNkAQkVY4daMdDI=; b=e/A/Z1jxL+kVTSGzmyT7ioA2pW4P+LzcnOtbKFOuTNhWmnHosSLUolYNvUbDZLALrq4f7R qo2GCqTTJwnLy8PZZSgNtsg7hTUiIMaDBEJBMMiIPzQw6FuzDCzIZJnuAy8mkKuYZbmOTx taQmW+AqeNPOostGyT7hONTo+w/YIaT4buX2+9+8tRMAWKe3wpyOfuCFDNjaTgL45IQE/s PuRx7vMkq1YEESD2ioa9DCq34Lts/RpHQ1wI6UBNylXmeroxu5TbW1ARUgUqRt+M0USj4N QMAuATu0qc4d+4gvKd5+HxcIEQFND/j6E0nS3BG9Rcssr8/nKHQUY3lLoQcIkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6zsg2LYSz7fc for ; Fri, 06 Feb 2026 16:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d172 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:23:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 804329587508 - main - hwpstate{_amd,intel}(4): Move common knobs to a separate file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8043295875083b57a6b7b2dc6826fde4cf4e1ba1 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:23:19 +0000 Message-Id: <69861577.1d172.fd5fa27@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8043295875083b57a6b7b2dc6826fde4cf4e1ba1 commit 8043295875083b57a6b7b2dc6826fde4cf4e1ba1 Author: Olivier Certner AuthorDate: 2026-02-06 10:58:07 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:23:07 +0000 hwpstate{_amd,intel}(4): Move common knobs to a separate file Reason for doing this right now is to resolve the conflict on 'machdep.hwpstate_pkg_ctrl' between the Intel and AMD drivers, even though I expect to remove it for hwpstate_amd(4) at some point. More generally, this is going to be useful for some future code factorization. Also, the 'debug.hwpstate_verbose' knob was moved there, as we'll likely want to use it for the Intel driver as well (which is currently not the case). Note for MFC: Will be partial, since `hwpstate_amd(4)` does not support CPPC in stable/15 nor stable/14. Reviewed by: emaste Fixes: 3e6e4e4a0d42 ("hwpstate: add CPPC support for pstate driver on AMD") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54528 --- sys/conf/files.x86 | 1 + sys/modules/cpufreq/Makefile | 3 ++- sys/x86/cpufreq/hwpstate_amd.c | 11 ++--------- sys/x86/cpufreq/hwpstate_common.c | 22 ++++++++++++++++++++++ sys/x86/cpufreq/hwpstate_common.h | 13 +++++++++++++ sys/x86/cpufreq/hwpstate_intel.c | 6 +----- 6 files changed, 41 insertions(+), 15 deletions(-) diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index b1bd6f7291ca..fabcd5d9ebe5 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -342,6 +342,7 @@ x86/acpica/srat.c optional acpi x86/bios/vpd.c optional vpd x86/cpufreq/est.c optional cpufreq x86/cpufreq/hwpstate_amd.c optional cpufreq +x86/cpufreq/hwpstate_common.c optional cpufreq x86/cpufreq/hwpstate_intel.c optional cpufreq x86/cpufreq/p4tcc.c optional cpufreq x86/cpufreq/powernow.c optional cpufreq diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile index 9a417f72fc27..23b4c97f5393 100644 --- a/sys/modules/cpufreq/Makefile +++ b/sys/modules/cpufreq/Makefile @@ -9,7 +9,8 @@ SRCS+= bus_if.h cpufreq_if.h device_if.h pci_if.h .PATH: ${SRCTOP}/sys/x86/cpufreq SRCS+= acpi_if.h opt_acpi.h -SRCS+= est.c hwpstate_amd.c p4tcc.c powernow.c hwpstate_intel.c +SRCS+= est.c p4tcc.c powernow.c +SRCS+= hwpstate_amd.c hwpstate_common.c hwpstate_intel.c .endif .if ${MACHINE} == "i386" diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index d8ad090a6a58..0afc0919aa16 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -68,6 +68,8 @@ #include +#include + #include "acpi_if.h" #include "cpufreq_if.h" @@ -162,10 +164,6 @@ static int hwpstate_get_info_from_acpi_perf(device_t dev, device_t perf_dev); static int hwpstate_get_info_from_msr(device_t dev); static int hwpstate_goto_pstate(device_t dev, int pstate_id); -static int hwpstate_verbose; -SYSCTL_INT(_debug, OID_AUTO, hwpstate_verbose, CTLFLAG_RWTUN, - &hwpstate_verbose, 0, "Debug hwpstate"); - static int hwpstate_verify; SYSCTL_INT(_debug, OID_AUTO, hwpstate_verify, CTLFLAG_RWTUN, &hwpstate_verify, 0, "Verify P-state after setting"); @@ -176,11 +174,6 @@ SYSCTL_BOOL(_debug, OID_AUTO, hwpstate_pstate_limit, CTLFLAG_RWTUN, "If enabled (1), limit administrative control of P-states to the value in " "CurPstateLimit"); -static bool hwpstate_pkg_ctrl_enable = true; -SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, - &hwpstate_pkg_ctrl_enable, 0, - "Set 1 (default) to enable package-level control, 0 to disable"); - static bool hwpstate_amd_cppc_enable = true; SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_amd_cppc_enable, CTLFLAG_RDTUN, &hwpstate_amd_cppc_enable, 0, diff --git a/sys/x86/cpufreq/hwpstate_common.c b/sys/x86/cpufreq/hwpstate_common.c new file mode 100644 index 000000000000..60d84f9983a6 --- /dev/null +++ b/sys/x86/cpufreq/hwpstate_common.c @@ -0,0 +1,22 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 The FreeBSD Foundation + * + * This software was developed by Olivier Certner at Kumacom + * SARL under sponsorship from the FreeBSD Foundation. + */ + +#include + +#include + + +int hwpstate_verbose; +SYSCTL_INT(_debug, OID_AUTO, hwpstate_verbose, CTLFLAG_RWTUN, + &hwpstate_verbose, 0, "Debug hwpstate"); + +bool hwpstate_pkg_ctrl_enable = true; +SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, + &hwpstate_pkg_ctrl_enable, 0, + "Set 1 (default) to enable package-level control, 0 to disable"); diff --git a/sys/x86/cpufreq/hwpstate_common.h b/sys/x86/cpufreq/hwpstate_common.h new file mode 100644 index 000000000000..953037672c0f --- /dev/null +++ b/sys/x86/cpufreq/hwpstate_common.h @@ -0,0 +1,13 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 The FreeBSD Foundation + * + * This software was developed by Olivier Certner at Kumacom + * SARL under sponsorship from the FreeBSD Foundation. + */ + +/* Stuff common to hwpstate_amd(4) and hwpstate_intel(4). */ + +extern int hwpstate_verbose; +extern bool hwpstate_pkg_ctrl_enable; diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c index 259aeac399c8..3d2cc0a5966b 100644 --- a/sys/x86/cpufreq/hwpstate_intel.c +++ b/sys/x86/cpufreq/hwpstate_intel.c @@ -48,6 +48,7 @@ #include +#include #include #include "acpi_if.h" @@ -108,11 +109,6 @@ static driver_t hwpstate_intel_driver = { DRIVER_MODULE(hwpstate_intel, cpu, hwpstate_intel_driver, NULL, NULL); MODULE_VERSION(hwpstate_intel, 1); -static bool hwpstate_pkg_ctrl_enable = true; -SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, - &hwpstate_pkg_ctrl_enable, 0, - "Set 1 (default) to enable package-level control, 0 to disable"); - static int intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) { From nobody Fri Feb 6 16:29:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f700X4R0Nz6RPmm for ; Fri, 06 Feb 2026 16:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f700X3d56z43sP for ; Fri, 06 Feb 2026 16:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUw26HEcgIUzkVBS3umTG0Nxo6oIPiOmuLfQVjOKxbE=; b=P2eFI8ejqYi9Yska1L1v78x69P/y8+5j03eIa4ecWVR38FYKJKDNiaDQZp4lIEHMj3lxmY nEE2ojBNRwy2lV8BewN0kWOY8uII5fD1qLm5WFVz7vrcKCrFucLTnJHCKPcJYYX0sLcESW m1YU6UTeAsBanfv/HtdFCgHJwLNzFdSzA7+TCX4JB6OG46HK5AGLTwU5n1VlkrVXBt4ezK bTKFEbOn9carp7OEsJMyiM+ceSfpQ44tNt22LzycudoY6e0Vj75zSMGh6g4DMfPLSo8xOL E1m+rQyyWFk2iRyZGCvnFsXq4CzYz/DMTRVBtU2OM5gNjqqbP0J4H36k/qBE5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395356; a=rsa-sha256; cv=none; b=o6+9Z7DGM1uZkRXZKYte80/iXc98tFScxdomht0RXHz1+viJQAXkP+LFn6gY+ZdydYJ/Nn Be8o36TzrXUn6eYsx1VcVeblNLIwp0dwdYzRPbHruvrY6wd8w9UOFtTCsRMyeSabWCov7j 89poeL0joCzsm+n9vqAJtZi4qX1ZuxFmuZ3+LS/b+w5wkRBI1RcWN4lNybLNdJTuuO6pqn u1xcYJUCxwvEkFNZmPaIDLpKCmeXbPz3/KTrx4DmKcE/qFUD6CXIWP4cT0OMX/1X9BJEbU 6DlXrAAcQFsn+HvyS68zxrHFHs2n0f9/blX1tKB0WOD9FoKfLNCvhJKgtUkJVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUw26HEcgIUzkVBS3umTG0Nxo6oIPiOmuLfQVjOKxbE=; b=Pi/4K+TDqCXAwF4a5XokOmNkoePdzcyAcuSpNuA7AskO/RHT8Ejk+r3ydoO5LcehSZ2wJA a3y1klMtDJ+elPQSS46JvtLms1tfvYlxrcjbFdaO6NdRhBJxFUmlknpWe4HUbmntR1HCp+ /+2oCMnqwFdCuOIxr7b0kWjgpVVMmFnbgE32lS3raYpjRAtYc5dWo/b2NZlQyY/2m9j250 hJs49nemQErs1AIQN09zdWMv4i7fI9SNR8RpkZv5KunGc1HpAGfeLjmcBfeSQU9dMA6kZr ca/fAjPWJv281J8TUD9PGC/LvciF7XZPxUPNTpdvz9eJ4vEL1q8j6YpjcJL2LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700X3B0cz7W4 for ; Fri, 06 Feb 2026 16:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dd41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 73c9d843ffb9 - main - hwpstate_amd(4): Factor out printing CPPC registers, fix CPPC_REQUEST's List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73c9d843ffb9d816737aa2cef7551923e68e6eaf Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:16 +0000 Message-Id: <698616dc.1dd41.7fce5a2d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=73c9d843ffb9d816737aa2cef7551923e68e6eaf commit 73c9d843ffb9d816737aa2cef7551923e68e6eaf Author: Olivier Certner AuthorDate: 2026-01-29 10:16:27 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:27 +0000 hwpstate_amd(4): Factor out printing CPPC registers, fix CPPC_REQUEST's Factor out these printing, so they can be called from other places than just the register dump handler. This also makes surrounding code clearer. Fix inverted printing of minimum and maximum performance. For better diagnostic, print the full raw content of each register before printing the value of fields we know about. As fields are printed in decimal, remove 0-padding, which could give the impression that the numbers are printed in octal or hexadecimal. While here, remove superfluous blank lines when printing (we use TABs for the different registers' fields). Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54999 --- sys/x86/cpufreq/hwpstate_amd.c | 65 ++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 22 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 0afc0919aa16..aaaaa394058f 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -60,6 +60,7 @@ #include #include +#include #include #include #include @@ -84,6 +85,9 @@ #define MSR_AMD_CPPC_REQUEST 0xc00102b3 #define MSR_AMD_CPPC_STATUS 0xc00102b4 +#define MSR_AMD_CPPC_CAPS_1_NAME "CPPC_CAPABILITY_1" +#define MSR_AMD_CPPC_REQUEST_NAME "CPPC_REQUEST" + #define MSR_AMD_PWR_ACC 0xc001007a #define MSR_AMD_PWR_ACC_MX 0xc001007b @@ -205,6 +209,43 @@ struct amdhwp_dump_sysctl_handler_request { int res; }; +static void +print_msr_bits(struct sbuf *const sb, const char *const legend, + const uint64_t bits, const uint64_t msr_value) +{ + sbuf_printf(sb, "\t%s: %" PRIu64 "\n", legend, + BITS_VALUE(bits, msr_value)); +} + +static void +print_cppc_caps_1(struct sbuf *const sb, const uint64_t caps) +{ + sbuf_printf(sb, MSR_AMD_CPPC_CAPS_1_NAME ": %#016" PRIx64 "\n", caps); + print_msr_bits(sb, "Highest Performance", + AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, caps); + print_msr_bits(sb, "Guaranteed Performance", + AMD_CPPC_CAPS_1_NOMINAL_PERF_BITS, caps); + print_msr_bits(sb, "Efficient Performance", + AMD_CPPC_CAPS_1_EFFICIENT_PERF_BITS, caps); + print_msr_bits(sb, "Lowest Performance", + AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, caps); +} + +static void +print_cppc_request(struct sbuf *const sb, const uint64_t request) +{ + sbuf_printf(sb, MSR_AMD_CPPC_REQUEST_NAME ": %#016" PRIx64 "\n", + request); + print_msr_bits(sb, "Efficiency / Energy Preference", + AMD_CPPC_REQUEST_EPP_BITS, request); + print_msr_bits(sb, "Desired Performance", + AMD_CPPC_REQUEST_DES_PERF_BITS, request); + print_msr_bits(sb, "Minimum Performance", + AMD_CPPC_REQUEST_MIN_PERF_BITS, request); + print_msr_bits(sb, "Maximum Performance", + AMD_CPPC_REQUEST_MAX_PERF_BITS, request); +} + static void amdhwp_dump_sysctl_handler_cb(void *args) { @@ -251,30 +292,10 @@ amdhwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) goto out; data = request.caps; - sbuf_printf(sb, "\tHighest Performance: %03ju\n", - BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, data)); - sbuf_printf(sb, "\tGuaranteed Performance: %03ju\n", - BITS_VALUE(AMD_CPPC_CAPS_1_NOMINAL_PERF_BITS, data)); - sbuf_printf(sb, "\tEfficient Performance: %03ju\n", - BITS_VALUE(AMD_CPPC_CAPS_1_EFFICIENT_PERF_BITS, data)); - sbuf_printf(sb, "\tLowest Performance: %03ju\n", - BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, data)); - sbuf_putc(sb, '\n'); + print_cppc_caps_1(sb, data); data = request.req; -#define pkg_print(name, offset) \ - do { \ - sbuf_printf(sb, "\t%s: %03u\n", name, \ - (unsigned)(data >> offset) & 0xff); \ - } while (0) - - pkg_print("Requested Efficiency Performance Preference", 24); - pkg_print("Requested Desired Performance", 16); - pkg_print("Requested Maximum Performance", 8); - pkg_print("Requested Minimum Performance", 0); -#undef pkg_print - - sbuf_putc(sb, '\n'); + print_cppc_request(sb, data); out: if (ret == 0) From nobody Fri Feb 6 16:29:17 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f700Y69Xfz6RPxg for ; Fri, 06 Feb 2026 16:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f700Y4D7Qz43sQ for ; Fri, 06 Feb 2026 16:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lwXkydNfCsz10RJ3L8ZGxgpOrYKHnqbgExEPHgRQV18=; b=u5f+1Tk0hISKRkjY+e9o+cOq4D+puz839Dbjx6SUG7YyUzq2VH4u97PPrXm8mAlPXWoO1i Lixixz11oypTAWPieMVre2hrtVpYJ2eusCeNNCfASIccArBaD7itKWzZyyL8CyYkgi9leH wWIp2+DQusJcMm6rRo7DxbOpMfbpY1Jfsu2LzUnrWj5fhWf0ODMSJvWhbMGAieqzlLrUnn g709g/1K2XeFw888fWDgqS6sRNpQJwxLUSwjOqT5hdv77/sVqtE/9h+dxoe3EhkHdl0aB+ FD6vjJPAlOHoR8Ss46XbcVjQ9cX2iIu/ka7s31jFRyMh7yZeXj4w3F2qoiNIuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395357; a=rsa-sha256; cv=none; b=xm3Ifob9QjtXP4tCoNBpLxIL4MEohrZfbmhwFIL04qJCLEkihrj2Xzb+dCeYhPlQsgsAWc y4A5GQvNsDDzhlFr71NvOy3MN8rs78Pvt4z/+rVAh/aSmxrHYHYkA7aadWFvEqxEqrn7Fm 80qz96PGx27N0lglT6DB74/xOHZVSHk1MdjuAT95rPdQIvgAQX+UOz61lV26a5cZOvKmYK sYmK5pftDSOI0TZCSqb3VIIwF23FWX7ytguULB3wTLxc/NhL1jz/X+ap31k9Rdq0PFlLe9 FMMjdiqrWgIXRYn2ih/dqhrTX/gY/JVpy27byw54IFBs9DLYNwG0MXDBwrh99Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lwXkydNfCsz10RJ3L8ZGxgpOrYKHnqbgExEPHgRQV18=; b=iPniyP3901ZzwUXVaTEtDP2IqPAQZgMrU0jDhPhv1/LYChCjxCVqDcNTbLw1BPxjQPFKCI oR4ozwHsrIsPpJfbh47XL4kpoOW1jsPBSAkHZ9jvHTKsw2qvJVgCazMq3WX9wiAlgek45g /OgVaYWcVCvF64dgubMGLW74/KZl424L/Wyb/SB00GJxR7JVFyLbdjwTkAjvpaDU+/wArX P0OvI6wE8Ch+rF5Xsv9Y0T1RnQVqSSz2pp8si5LgnVbU69a/APiyzINIFvYdET8CfTNAsq eUpcnp4AKnmUqdIElbapz2yCIK4e3dpDmdIZjpx8fG1nor6sLCzR1DTRheX4UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700Y3d4fz7ZG for ; Fri, 06 Feb 2026 16:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ea20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: e938d57e0a88 - main - hwpstate_amd(4): Rename register dump sysctl handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e938d57e0a8852e956a16dd4fc041047fd1b2c35 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:17 +0000 Message-Id: <698616dd.1ea20.255757f8@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e938d57e0a8852e956a16dd4fc041047fd1b2c35 commit e938d57e0a8852e956a16dd4fc041047fd1b2c35 Author: Olivier Certner AuthorDate: 2026-01-29 10:43:53 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:31 +0000 hwpstate_amd(4): Rename register dump sysctl handler While here, rename the callback function and structure to a more immediately informative name. While here, remove a superfluous cast and rename the variable containing the callback data to just 'data' instead of 'req' which can be confusing (because of CPPC_REQUEST but also the fact that 'req' is a parameter of sysctl handlers). No functional change intended. Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55000 --- sys/x86/cpufreq/hwpstate_amd.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index aaaaa394058f..9e2d0fcbc8bb 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -202,7 +202,7 @@ static device_method_t hwpstate_methods[] = { {0, 0} }; -struct amdhwp_dump_sysctl_handler_request { +struct get_cppc_regs_data { uint64_t enable; uint64_t caps; uint64_t req; @@ -247,26 +247,25 @@ print_cppc_request(struct sbuf *const sb, const uint64_t request) } static void -amdhwp_dump_sysctl_handler_cb(void *args) +get_cppc_regs_cb(void *args) { - struct amdhwp_dump_sysctl_handler_request *req = - (struct amdhwp_dump_sysctl_handler_request *)args; - - req->res = rdmsr_safe(MSR_AMD_CPPC_ENABLE, &req->enable); - if (req->res == 0) - req->res = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &req->caps); - if (req->res == 0) - req->res = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &req->req); + struct get_cppc_regs_data *data = args; + + data->res = rdmsr_safe(MSR_AMD_CPPC_ENABLE, &data->enable); + if (data->res == 0) + data->res = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &data->caps); + if (data->res == 0) + data->res = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &data->req); } static int -amdhwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) +sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) { device_t dev; struct pcpu *pc; struct sbuf *sb; struct hwpstate_softc *sc; - struct amdhwp_dump_sysctl_handler_request request; + struct get_cppc_regs_data request; uint64_t data; int ret; @@ -280,7 +279,7 @@ amdhwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) sb = sbuf_new(NULL, NULL, 1024, SBUF_FIXEDLEN | SBUF_INCLUDENUL); sbuf_putc(sb, '\n'); smp_rendezvous_cpu(pc->pc_cpuid, smp_no_rendezvous_barrier, - amdhwp_dump_sysctl_handler_cb, smp_no_rendezvous_barrier, &request); + get_cppc_regs_cb, smp_no_rendezvous_barrier, &request); ret = request.res; if (ret) goto out; @@ -774,7 +773,7 @@ hwpstate_attach(device_t dev) SYSCTL_STATIC_CHILDREN(_debug), OID_AUTO, device_get_nameunit(dev), CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_SKIP | CTLFLAG_MPSAFE, - sc, 0, amdhwp_dump_sysctl_handler, "A", ""); + sc, 0, sysctl_cppc_dump_handler, "A", ""); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, From nobody Fri Feb 6 16:29:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f700b01wcz6RPkK for ; Fri, 06 Feb 2026 16:29: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f700Z4wTlz43w7 for ; Fri, 06 Feb 2026 16:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+0du1dcDAsurhjQF18mxAhHlMxFQYk0o7dRDsLhKqE=; b=XAdO5XfjF7stPWMohjvfG3BNf85ZOGqUIW2TYl+SrmjxdDpJvIyZwMglRf532hYG4h/8CV xcavN9+15uOqDMzEshzJtTOzrxRtAUG+k3+ZwtYVdwOm0u2FRn29Apit0iB8fYKxSPAUYh 1mPzcwk7H5YPEZfH+T6ABZuH5R8GDa/hn6MIlWYk8AymhxFE9EdohXJY8MArDPaugrHw90 oD1fe6hDkR8IhfNpCIZWaQgL0IVqmUwOMRwue94nZQzKY5aYE6uHD4BlWllMCDqb+cKkbZ XvvLkTp2nWZFSdLTbJQi5LNJ/qPe0cARPZ1Ac3VmXnUYIlAIl9tylpRqcoBXkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395358; a=rsa-sha256; cv=none; b=FhBVVS7vwGoY/zhnYc/46mGG19c6BxfbOHGcdp/YdUdJ48QfkukX8AKxXFYIahXYNVfGBs CfmMY0WJi+3fyB9prnv7+QS4EioRlYtHNNfP1RvKUC5M6hDRwHtVtRqhNQrAeErlSTd7aE yC+prVjusUo3eKco3uYEP77le22Tv2PmDn/5MSzJmmEo8ov24elWMOdb9Ds7sF6Mn2KSzn P0//NDjyCWxeNZKCeT645YEZeWyhAs2Qn8ghi74zRrFg5CtAX7Js3Dn9mIyAa6wbmloT8x xUEy3c7XWnNm327pqHiDfUOObhQmtgBZxfBSHL6+Vmt5HsYwDiRp0z3mKU4VTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+0du1dcDAsurhjQF18mxAhHlMxFQYk0o7dRDsLhKqE=; b=UFzSYJVo9MxPtYRxjDV1JfXiPzAj4/rZ2SDVfdTngVgo3GaKwkdFfmAmF85/ay/irX3oat RHcbdZ4dE3czGQuQoc5LX/gWNVW/Yv3tQKelWfqkqg/kybXQe+41sZVRzQ0M3T/cmGw3zP E9WqRrcqTXL7rudKzxO6mF3fMPGE07MdtZr+0WR3uL6yfrpcIC3F2KxjQMrBxJsFd0GecV BZYNEd/H4ES8u1H9HjH7tJtAfdnSGFBrY3TPqahzF6u/5b1MsdBe9+qJ2TqlfV0KSzKEKe bvtuSgTDugBfjMHvFpLAn+wcOMp6XvaDxqDreIYBqDh1XHYzL1C7l1HFk32n4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700Z4T1Yz7fg for ; Fri, 06 Feb 2026 16:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f285 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: fa0512f7156d - main - hwpstate_amd(4): Assert PSTATE_CPPC is on in corresponding sysctl handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa0512f7156d1851a7d498d42c32655e390399cf Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:18 +0000 Message-Id: <698616de.1f285.1b223152@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fa0512f7156d1851a7d498d42c32655e390399cf commit fa0512f7156d1851a7d498d42c32655e390399cf Author: Olivier Certner AuthorDate: 2026-01-29 10:48:55 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:32 +0000 hwpstate_amd(4): Assert PSTATE_CPPC is on in corresponding sysctl handlers No functional change intended. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55001 --- sys/x86/cpufreq/hwpstate_amd.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 9e2d0fcbc8bb..c31bde247aaa 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -202,6 +202,13 @@ static device_method_t hwpstate_methods[] = { {0, 0} }; +static inline void +check_cppc_enabled(const struct hwpstate_softc *const sc, const char *const func) +{ + KASSERT((sc->flags & PSTATE_CPPC) != 0, (HWP_AMD_CLASSNAME + ": %s() called but PSTATE_CPPC not set", func)); +} + struct get_cppc_regs_data { uint64_t enable; uint64_t caps; @@ -270,8 +277,10 @@ sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) int ret; sc = (struct hwpstate_softc *)arg1; - dev = sc->dev; + /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ + check_cppc_enabled(sc, __func__); + dev = sc->dev; pc = cpu_get_pcpu(dev); if (pc == NULL) return (ENXIO); @@ -336,8 +345,8 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) dev = oidp->oid_arg1; sc = device_get_softc(dev); - if (!(sc->flags & PSTATE_CPPC)) - return (ENODEV); + /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ + check_cppc_enabled(sc, __func__); val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->req) * 100 / max_energy_perf; From nobody Fri Feb 6 16:29:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f700c0hsDz6RPSH for ; Fri, 06 Feb 2026 16:29: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f700b5fz1z43sl for ; Fri, 06 Feb 2026 16:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKL8l3LFqti2svgZiqTTixjFz7u2JgYWV7J4Rx7oGLQ=; b=SiM3GEtSHMB7LRxZXVanBh4ekviXzVZbhT8GTlBLITjTdtgVRI6bctvI62lfnZP5pJv81A qTGZW7DLAsDh4qHMDfIbXiiJEDmmhAEYOodFFpHb+ljzXR7n36YDd5gk6YsVIIqGnBsJ3i hc4+GzYWdBMmdLc9Pde9HW8ubfs0hGpBjQIpVLTGMcETs9QAMeGRYemndnflS+I4mpz5zg LX/y7kQrgc6LGPy/jae7LVrCDP3/qGrs2zGbvPRCtDupm4A95+kgCoTwT6GJ5dGwtyZLBi yeNfuLj5VLjBlqSN0kdC/2d8ZZDMpA+pKs5rki4BEJ23liVxezf+iKU0H98PRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395359; a=rsa-sha256; cv=none; b=fgEs/tLhMD0Nr3ZW1LuHQcN+2xmjdsGVrCXevDkq0AXGisPwDoXk48t/mGmjznqFlFMk+J xJVuYYZGaVfRqUDPblxHiwA4I6Elzesa67RBOjLu1/85Mw9ya2GVB/KDMCg2LByWRE05ac nXIH5ixqpyqceTpQKQCiRoTMkyas24Hei37vfsAfdAmP4DoiE3RLLhqfCT58Ff/qACLUis +O/mOPyjuIG/mRKmfOfIQsFIrzlcCZ9A+jZ1jVYbwBfsbPQ7FIL6I8FG+tIfiBHTteTs3R kKHyppXUS7o/58ocEWNsnIFONwuGnAJQSSKI6nTRTTq2ROw4tZ89J+O5C3gmhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKL8l3LFqti2svgZiqTTixjFz7u2JgYWV7J4Rx7oGLQ=; b=hoXmHLfDy49JE8KdUfyJ9oud4IPcXD2Z8tMp1ywbvJAfAizGO9ULdPdOdfK630JeF7JgRF sfc5A5ZoK379XWVIavQFEMBGZVMb6iYAnjY0BcrYrwgqKABfm1hCZwNscvU5BDmdoKtVGN ejakHpSiwlQTpBIVwjgDaDCs1ujdzJAKZVEoGMj9x321ykY7qW2IpHKHOHOi4fNYmi58An hxilcGUOD+55fe7KVBp3Lljk5fKFtfqc6M1bOXPqPX3XejTlHisvAcdK9YglMU9sVTHih4 myD55tpd7XDVruoMLGZWnx1vvFORKCvW7IxYppetGzhM13f/F79KVPfz7UhXwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700b55M7z7fh for ; Fri, 06 Feb 2026 16:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e8c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 461bac05a145 - main - hwpstate_amd(4): Rename EPP handler, convert to unsigned int List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 461bac05a1454e8a1656cc35f1308cbd6b374f51 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:19 +0000 Message-Id: <698616df.1e8c0.10f4dd35@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=461bac05a1454e8a1656cc35f1308cbd6b374f51 commit 461bac05a1454e8a1656cc35f1308cbd6b374f51 Author: Olivier Certner AuthorDate: 2026-01-29 14:06:08 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:32 +0000 hwpstate_amd(4): Rename EPP handler, convert to unsigned int 'val' is supposed to be the storage for a sysctl knob of an 'unsigned int', so consistently don't specify its width. While here, rename variables in the handler. The new names feel clearer, and the 'ret' => 'error' rename is to be more in line with our tradition. No functional change intended. Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55002 --- sys/x86/cpufreq/hwpstate_amd.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index c31bde247aaa..d0eccf0d3eaa 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -316,7 +316,7 @@ out: } static void -sysctl_epp_select_per_core(device_t hwp_device, uint32_t val) +set_epp(device_t hwp_device, u_int val) { struct hwpstate_softc *sc; @@ -331,15 +331,15 @@ sysctl_epp_select_per_core(device_t hwp_device, uint32_t val) } static int -sysctl_epp_select(SYSCTL_HANDLER_ARGS) +sysctl_epp_handler(SYSCTL_HANDLER_ARGS) { device_t dev, hwp_dev; devclass_t dc; struct hwpstate_softc *sc; - const uint32_t max_energy_perf = + const u_int max_epp = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, (uint64_t)-1); - uint32_t val; - int ret = 0; + u_int val; + int error = 0; int cpu; dev = oidp->oid_arg1; @@ -349,29 +349,27 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) check_cppc_enabled(sc, __func__); val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->req) * 100 / - max_energy_perf; - ret = sysctl_handle_int(oidp, &val, 0, req); - if (ret != 0 || req->newptr == NULL) + max_epp; + error = sysctl_handle_int(oidp, &val, 0, req); + if (error != 0 || req->newptr == NULL) goto end; if (val > 100) { - ret = EINVAL; + error = EINVAL; goto end; } - val = (val * max_energy_perf) / 100; + val = (val * max_epp) / 100; if (hwpstate_pkg_ctrl_enable) { dc = devclass_find(HWP_AMD_CLASSNAME); - KASSERT(dc != NULL, - (HWP_AMD_CLASSNAME ": devclass cannot be null")); CPU_FOREACH(cpu) { hwp_dev = devclass_get_device(dc, cpu); - sysctl_epp_select_per_core(hwp_dev, val); + set_epp(hwp_dev, val); } } else - sysctl_epp_select_per_core(dev, val); + set_epp(dev, val); end: - return (ret); + return (error); } static driver_t hwpstate_driver = { @@ -786,8 +784,8 @@ hwpstate_attach(device_t dev) SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "epp", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, 0, - sysctl_epp_select, "I", + "epp", CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, 0, + sysctl_epp_handler, "IU", "Efficiency/Performance Preference " "(range from 0, most performant, through 100, most efficient)"); } From nobody Fri Feb 6 16:29:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f700d2Sksz6RPf4 for ; Fri, 06 Feb 2026 16:29: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f700c66JXz43lD for ; Fri, 06 Feb 2026 16:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fo4scDR+sMyycytfIoT+JuVh9v4ueQOYxjANsQYcy4=; b=aN8Bg/tJSp3aImGMiqQFFeryVHOgFlX27j6/M5GgOhSJbKBsCwcnYeFYmpEeRNmrfdx4Ku QlrW/IXIsJsLYN3dvQuOwg0Clw4vqcT875YrCUdmz7ccLtDKdp1phB7/u/2l2rV+xRb52Z YvRi0uKdVv1Z7A2KfU57W4sBKf9USyW+VVQQOZInVe43rSFhNwyUaOR/eg8GAS4XezeGhK 38KxjMNSj3xh8VLTFWBTKOSrfKII0ZBlczcqjKegD/lCsqRT4K7xBZseiE5O/ScZjKXaWf kcgneQFiN8wpdflmzPPo+0GIPWn5mweKcW79647t+GeatVghL/H1W3jgOBIXXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395360; a=rsa-sha256; cv=none; b=HywD84WeLK72AsbjAEE+/XAwS/60FDVLJFo5UWtNanNhJBOcykfGSwTrupNv9J/zW2Rc2R NMud/cVY3zKaKkZl7lkeyI2k0naGgU3KGTNBmsPFTjVt5aHZRTj9TGT90Nd5mtzzg33+nQ a7rxVWoqyCq5V0v2fKJhwXZb9QMvDjJm9bLYzvdBKXaEdTz5H8oI/RtO2LzmW1wBlyXfwh zhMG9Jdpyjdfl6kH+La5kADncJP8FwZ7dL9iFgMniBqdBL/kfNn3MbEHBxa8+EVCrc87rS fwjzGCO3CGmvKamODSuz1MlUHFspQJQ1CV4aBUFKYXh2Gnv2kMK3FvZBstcPxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fo4scDR+sMyycytfIoT+JuVh9v4ueQOYxjANsQYcy4=; b=uvke05AQdw/pPAZXXMIFd7e570LtcUKJfc7UKJVj7fDonG6Bz4WVAetL3URsKXb3ZvgHL+ qQgQS15a5oNs05qhoZdKLMrczSPgkV1DrIPJieMdjne+M67kdJFjIJ4dPxT54gRe4UKYdk EISAAAS+8LQNAQHGQN46GB8DUqRDmD7FBqHyDTDAZyVx5JfGta2qRW+hL5D7OHMX0Pv1k3 yHbrh6oS99cnPE/F91w2fyz8YCQOTkf4EkyKVtb8JCsLij5ueX7Pz2yDV88A58ih7ooFO6 TqOrV+LRqP+3B0FlG6yEm0zNR5pGOsLIGRIFsq26NAHYEUGQA1tuekatIuXdcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700c5Qk2z7W7 for ; Fri, 06 Feb 2026 16:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d176 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 0f747142c16b - main - hwpstate_amd(4): attach(): Fix style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f747142c16b1f1921f8f983cba362a204158e9a Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:20 +0000 Message-Id: <698616e0.1d176.44302801@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0f747142c16b1f1921f8f983cba362a204158e9a commit 0f747142c16b1f1921f8f983cba362a204158e9a Author: Olivier Certner AuthorDate: 2026-01-29 14:08:47 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:32 +0000 hwpstate_amd(4): attach(): Fix style No functional change intended. Reviewed by: aokblast, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55003 --- sys/x86/cpufreq/hwpstate_amd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index d0eccf0d3eaa..5d96808ceaee 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -773,9 +773,9 @@ hwpstate_attach(device_t dev) int res; sc = device_get_softc(dev); - if (sc->flags & PSTATE_CPPC) { + if ((sc->flags & PSTATE_CPPC) != 0) { if ((res = amd_set_autonomous_hwp(sc))) - return res; + return (res); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_STATIC_CHILDREN(_debug), OID_AUTO, device_get_nameunit(dev), From nobody Fri Feb 6 16:29:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f700f1485z6RPxt for ; Fri, 06 Feb 2026 16:29: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f700d6MlFz43tL for ; Fri, 06 Feb 2026 16:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=io6qKYVPGtFDnsPB8ccCGFeEZzsA1+DhbMgIUSSufCs=; b=cw6MAurHEKXqFD6ThIOhC/uQ82uEOouqNkhtEazXcRjXKsUhaOR2NSMETJW94/rQfdmmn0 /IKwnKtBrZDB9LwBQQwnZ3kzjZMYZtYdPbqe1kbdHf1Dh+4t/nlhhxF6dV0KtYypgmRxFH hju13kNmjJbyUsriYznm5qnijZEipdrff46mfNpVs0IEpZkQC3p2MZRqTxvIp/8XaePkXJ v6vc9EkGcaEVBi1wxp9xHvXZ8XHFoFA6rLcrHmjyFTa2s7OpNoWpna/sH1fzG5ky9EIr7k XyEimz6L2xDWms5jy5ngwqXkTRhShn91vDXA13eae7yl8NlLZbmkaNkp3dL9Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770395361; a=rsa-sha256; cv=none; b=vw7TpobsVm0zz1nfThJ+pDVKt9e2zNyb4E8Vo3xYF/Ydb+7l1Tn6fu3pCz1Rh17/WacHi1 FiTRZM/4MTmLQhhEkzawcL16RKS69kagvz7ndtQKofUx6EGxK5AnDUhvc+FNmYjzQH/rO9 G7O44EQtCDRkPFqIn66VrlhFLyktlNpbo0lMfK9pLFHwdr6m8w0iS7Qy4GAcCqj5d3Vv5f /v+qADd8Xq2nrZEpK7yrJUrvT8rEJbskbLAaK/9IT6g8jOWPx8yt1jr0WSWwzGeKPKguPQ VGQzd4V9AgMVwxhGSC1qiPW/aanyccmvl8WFvoEldpTYJ2uY4k8LoIBJW5XbpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770395361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=io6qKYVPGtFDnsPB8ccCGFeEZzsA1+DhbMgIUSSufCs=; b=syTs50gwEMg1hG98hHcCoPX9eIqRstpRsT/eHHVZJ8/7of91g+iKasCBX11CFeuxjMet1Y 61xojc6Q19xx6smJWjOFbV1QB1TosF/dB9xLKQ3cwIhpYTMqjk31s4h8mcI00RdYbzy697 LaFU5EZykeu1Z1k2sSiZdTt9E98r0aey+wLhS9TvL9vRxmSeoFCsb+4UuiMeK1+mWysmGt evey5Tm6JfNdMKKM4H3wCrb1wNOHUpGHtZ1soH/qzRRGSid5SG1/cTVtsH2m+ZZo2b0Hdf Nc7bautgLaFYW2At4FYesJOSqgndSkgqZZIxYKdF3CM1CwCZX2YabdI6MAFc7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f700d5vHWz7j5 for ; Fri, 06 Feb 2026 16:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e9ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 16:29:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7bc7692b940b - main - hwpstate_amd(4): Revamp the softc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bc7692b940b0c2af0f4a89ae2ef6fbba0bc3381 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 16:29:21 +0000 Message-Id: <698616e1.1e9ac.112d5a56@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7bc7692b940b0c2af0f4a89ae2ef6fbba0bc3381 commit 7bc7692b940b0c2af0f4a89ae2ef6fbba0bc3381 Author: Olivier Certner AuthorDate: 2026-01-29 16:01:43 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 16:27:32 +0000 hwpstate_amd(4): Revamp the softc As the new CPPC and old P-states modes are exclusive, put their respective data in a union. Rename the field containing the content of the CPPC_REQUEST register. It it now to be accessed using 'cppc.request'. Use an 'unsigned int' instead of 'uint32_t' for 'flags'. This is an internal field whose width could be changed at will. We only have one flag at the moment. No functional change intended. Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55004 --- sys/x86/cpufreq/hwpstate_amd.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 5d96808ceaee..e8499f2e3c88 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -147,11 +147,18 @@ enum hwpstate_flags { }; struct hwpstate_softc { - device_t dev; - struct hwpstate_setting hwpstate_settings[AMD_10H_11H_MAX_STATES]; - int cfnum; - uint32_t flags; - uint64_t req; + device_t dev; + u_int flags; + union { + struct { + struct hwpstate_setting + hwpstate_settings[AMD_10H_11H_MAX_STATES]; + int cfnum; + }; + struct { + uint64_t request; + } cppc; + }; }; static void hwpstate_identify(driver_t *driver, device_t parent); @@ -321,13 +328,13 @@ set_epp(device_t hwp_device, u_int val) struct hwpstate_softc *sc; sc = device_get_softc(hwp_device); - if (BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->req) == val) + if (BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->cppc.request) == val) return; - SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_EPP_BITS, val); + SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_EPP_BITS, val); x86_msr_op(MSR_AMD_CPPC_REQUEST, MSR_OP_RENDEZVOUS_ONE | MSR_OP_WRITE | MSR_OP_CPUID(cpu_get_pcpu(hwp_device)->pc_cpuid), - sc->req, NULL); + sc->cppc.request, NULL); } static int @@ -348,7 +355,7 @@ sysctl_epp_handler(SYSCTL_HANDLER_ARGS) /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ check_cppc_enabled(sc, __func__); - val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->req) * 100 / + val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->cppc.request) * 100 / max_epp; error = sysctl_handle_int(oidp, &val, 0, req); if (error != 0 || req->newptr == NULL) @@ -629,7 +636,7 @@ amd_set_autonomous_hwp_cb(void *args) req->res = ret; } - ret = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &sc->req); + ret = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &sc->cppc.request); if (ret != 0) { device_printf(dev, "Failed to read CPPC request MSR for cpu%d (%d)\n", curcpu, @@ -651,15 +658,15 @@ amd_set_autonomous_hwp_cb(void *args) * is the balanced mode. For consistency, we set the same value in AMD's * CPPC driver. */ - SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_EPP_BITS, 0x80); - SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_MIN_PERF_BITS, + SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_EPP_BITS, 0x80); + SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_MIN_PERF_BITS, BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, caps)); - SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_MAX_PERF_BITS, + SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_MAX_PERF_BITS, BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, caps)); /* enable autonomous mode by setting desired performance to 0 */ - SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); + SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); - ret = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->req); + ret = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->cppc.request); if (ret) { device_printf(dev, "Failed to setup autonomous HWP for cpu%d\n", curcpu); From nobody Fri Feb 6 17:56:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f71x000F3z6RVnb for ; Fri, 06 Feb 2026 17:56:20 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f71wz3s8vz4K4B for ; Fri, 06 Feb 2026 17:56:19 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-8c531473fdcso133369785a.3 for ; Fri, 06 Feb 2026 09:56:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770400579; cv=none; d=google.com; s=arc-20240605; b=k8sZ5xIO12qpC3KR7svyoAPn3D+Ojy1CmS5Ep1IpNnFXyguaMZ3wyTkyaHmoIrSCiX 5FNbpoAi20MLnkqHlZ9G6qFzgKMelf1J2x1wIqwg2nXzzo/FQMq9vJ4IHOdafLJamvsP GAHslOOWBhBLhUFDRK9sUkARXMQ553U+qlngjWlERgj7IMmWPEw5W0guxx081zDmS3E6 BWhd35QmxlMw5wtA7rz8PQDoL7+n/LtJCefSqtcqyw670VuUyFHLt4cVIanesqXzTLE1 Q03xOBj1UmFp85HfpJeyw+RGAjsCdKMJrY5CtBuW9E0b6O3RO4sZqhYJvKPfaMjdPyQn yqkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version; bh=cQ4qTzV/0YDEIwCIGfsx2A4Xn+eCfp171+P6YjD9E6k=; fh=9znFQ5yEMk04U8skGTeUseK4va6vrzvq/T5PnZ2Bqb8=; b=fSsy/Oyo30PyZ7kykM3XBwF+PEmfOBbFPBkggHE/fx9lGHswjgl4hjQavJ7sCIK5B5 rUmxi6YD6W4VDt6cnsi6jM/3KwYBscC0H40hRUHoC7OZbOA7VaQV17UPU851myaIPkk8 L7FAsfXYL2Qp7BJTip12fOK4LX6CV3vTr7AWJMnYj6akUEBu+ktUIp+J7jpjHo5mYxmb 2UfkefLBIEdnareug7iuJblBXrC3WXXTavCX6VxH+xo5OMMR3HsskNP/eDvcBZ83At4C GvcZYHcOiRsD2DnUBvLeSWtr6Nt72HMSLh0YpCgreUh0Gv8CehosxCu4sVxCcKpgKGi2 ARng==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770400579; x=1771005379; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cQ4qTzV/0YDEIwCIGfsx2A4Xn+eCfp171+P6YjD9E6k=; b=JYARVC8P7q314AQ3Anh0ZPMtJyd8VEvVkNMhzICWbEtgBwenSE7cZs+efbv5kY3P0b /HLMqbH668j0yBIR1yX220WLLPHAhJReaWRYEaRDVvcEGxGV1MYOOFlUzYixdPCe7Kmw Hwb6gJX965I2PIBykeIwz2aYwJBJlSMzQwLWOGK02eWY/xK9k4bHcZIlWeLcptYzWuqN gs81YYVT/CTFFVOQkKG1PleF8aAEp9Eu9LJcoh3uplOyKU7UcNm2+fWnRfmZdPB4pbh8 bXoMKftpqx/QlaRdnp68iN2WkB+4oyVXxvb3AoOdpNqIcqIpBwjCd4ZswIGji8LSZme8 hIlw== X-Forwarded-Encrypted: i=1; AJvYcCUEJnbPBROWrB0/jlR7Z2wKYkwL6e2N71vYTSqieXB3m2RhUVZncGer2zbY0h/2WEotaBCXbOyDpTEkRhMDuqXSlGGi8g==@freebsd.org X-Gm-Message-State: AOJu0Yx8TtQKbHT6hCqxsO9W839Z0ZgMX4rh8G1ZlwNWDtKbYiZv7dJC QoeFg1BthrUgjOwck+TCl153oJnyI8hRPNQ08UxAWbgabTpTdC8I/EJ/oEgJYWn2pH6aKVz3oYy 0zDg3Cf/bUVlFW8QiMU+RbQnH4PTLH7c= X-Gm-Gg: AZuq6aJfhNE6CbnBvLWf5s0tfPfwVAJ7AUc2INCRcrmH44yULMsOJ20Xo/LmlzD2xUb QcACH+ucPj51gv68JRukIeBjO8LlYnG+klhQ/edmUxpAwX926HIlqYnA6YdImEHxnvcJcZQ4v0o gVL0EQ8KZX62rDkgMZnj13/96gi+z/dEBG0vu8tbX9QIPnf6RLQbSY8rMqv4bfNz1wYtYR/Kw+A tH1Grey1sYrevJ+/pZJ+S+NZ5+E26Ko8HHgSrrcYtuG7NFdUY9o1yoAWyBK2oQy4Aa/XlmLCdpw brjw/nuXqIK6MHzNIwbBXEkNF6EpNw== X-Received: by 2002:a05:620a:40c5:b0:8b2:eea5:3311 with SMTP id af79cd13be357-8caef7e1788mr491246985a.26.1770400578619; Fri, 06 Feb 2026 09:56:18 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <695f8abf.30bec.62a9009@gitrepo.freebsd.org> <11fddfa0-41fd-430a-8ecb-8afa27385878@FreeBSD.org> In-Reply-To: <11fddfa0-41fd-430a-8ecb-8afa27385878@FreeBSD.org> From: Adrian Chadd Date: Fri, 6 Feb 2026 09:56:07 -0800 X-Gm-Features: AZwV_QgVm5nVhz_gsTjtCvj4bSNcUxyyJGSan7L3GXkph1gbjD2pnfQxAxqAkz0 Message-ID: Subject: Re: git: c0df8f6f0e6a - main - acpi: Make taskqueue only run on BSP To: Kyle Evans Cc: Aymeric Wibo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4f71wz3s8vz4K4B X-Spamd-Bar: ---- oh, is this what's causing it? i've been seeing weird behaviour on my intel based MSI GE76 raider that aligns with this. Do we actually know that the BSP is always the CPU that woke up from ACPI? -adrian On Fri, 6 Feb 2026 at 07:59, Kyle Evans wrote: > > On 1/8/26 04:45, Aymeric Wibo wrote: > > The branch main has been updated by obiwac: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc0df8f6f0e6a5f77ec9140e8= 075d09c55fe4c3c7 > > > > commit c0df8f6f0e6a5f77ec9140e8075d09c55fe4c3c7 > > Author: Aymeric Wibo > > AuthorDate: 2025-12-29 20:01:50 +0000 > > Commit: Aymeric Wibo > > CommitDate: 2026-01-08 10:35:54 +0000 > > > > acpi: Make taskqueue only run on BSP > > > > This is needed because when we add the suspend-to-idle loop, we on= ly > > want to break the BSP out of idle to process the taskqueue while k= eeping > > all the others idled. > > > > Currently assuming BSP to be CPU0, which may not always be the cas= e on > > non-x86. > > > > Reviewed by: kib > > Approved by: kib > > Sponsored by: The FreeBSD Foundation > > Differential Revision: https://reviews.freebsd.org/D54406 > > --- > > sys/dev/acpica/Osd/OsdSchedule.c | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdS= chedule.c > > index f0464709e8ad..0c5eadb87687 100644 > > --- a/sys/dev/acpica/Osd/OsdSchedule.c > > +++ b/sys/dev/acpica/Osd/OsdSchedule.c > > @@ -35,6 +35,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -109,10 +110,13 @@ static void > > acpi_taskq_init(void *arg) > > { > > int i; > > + /* XXX Currently assuming BSP is CPU0. */ > > + cpuset_t just_bsp =3D CPUSET_T_INITIALIZER(0x1); > > > > acpi_taskq =3D taskqueue_create_fast("acpi_task", M_NOWAIT, > > &taskqueue_thread_enqueue, &acpi_taskq); > > - taskqueue_start_threads(&acpi_taskq, acpi_max_threads, PWAIT, "acp= i_task"); > > + taskqueue_start_threads_cpuset(&acpi_taskq, acpi_max_threads, PWAI= T, > > + &just_bsp, "acpi_task"); > > if (acpi_task_count > 0) { > > if (bootverbose) > > printf("AcpiOsExecute: enqueue %d pending tasks\n", > > > > Hi, > > Mentioned privately, but also bringing it to the list in case anyone else= has had the same symptom- updating my frame.work laptop from ~December mai= n to ~February main resulted in a power-button wakeup shutting down the sys= tem after it wakes up. The result of a bisect pointed at this commit relia= bly causing it, and reverting it locally does seem to fix it. > > Thanks, > > Kyle Evans > From nobody Fri Feb 6 17:59:26 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720Z2X4pz6RVpV for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720Z1h1Kz4KPf for ; Fri, 06 Feb 2026 17:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IZVbumBwGqhU/5pO2+iQbV+dE+qTrZ339BVyIAWRkoI=; b=SZTCScAWqeAEDDQHnaDC7DpcLUzN4ks0buxwcNRXNAdqqTTTIzhaZl6zD2BCCApMqtG0rO buVUqZSxl+f6LYmXmo92Ao05Tk6tl0jlifKIwdycFwOQSqtZWiqNDVg/ztqegr4zIM121y TGvbDcuKfeVUf0FuZPDSV4OZpExgt09j8MDGKJnzpFzqg3cFYCVThlUS31Yeuw0PQr9Urp TzDwMCGNkme866EYrZxG0486zwyg8Iucc04ldcoueviXlrm/bNpxdu2sOGIHUF3VXojmwg VwSw+YDvvU5aZl7sH/phN//0qqTNQvQl2RrkIiwWcls8+0lSZPdY05Kl0EUU3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400766; a=rsa-sha256; cv=none; b=p+vkbg0rdQha3BUQ8/ulAQmlrAinDvI1tzSei0wuJ2DBEpm47vYNF63H6yAC+xlPM0t0hA NAf1hlz75D0nbp1bLXGmQSl8ZKc+04xYV6HHtwWwvbjHms5zoLl+RleHegYBkT6HiD28ng 3THxAkII86vt+8/+LqbQ5IFw0OpoaEO7OtAxrgiK7AhL0SPQFet9uVn90x9420ZLU+ymDr pa/WdQ6x6GxJAYsThMA9OoVrjZcE4ziYSx8HOO7KzIe7LKt9RELfc49Asu8juAPw9+lFG7 TdFe0tmE5k1170dVM/tWMD/p/SF2ayqi+BMl5x0KPFtxQ41zsaMNE46hzI593g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IZVbumBwGqhU/5pO2+iQbV+dE+qTrZ339BVyIAWRkoI=; b=nL6QhAgoSn51hoYrQkgY75cy5DZv5sDkqmRPzp8yliadGW6K+mlJw3ZuhEsAMpBUttF8Ni 1+ju7exEAlBNvJG/8A0SlMuvoSFmgVK3Okn1PNcgF+6GBunEX71gmDM8+lE28v2QWOAGm9 YL/WXCtaLOwSctS7HSUXQtfiPCCwafvvynWbZbzH/hqu9ARsp5qVhvpMcHQB+DJvMHOrQa z/R9lNpE1kbmJuw8/24340uWz7CRzNuRAmkHky0xTEWlRvXaWgHqAFbCswagS0nyk7pvPK /eH2Zqd9aSs8ej6vi3K+yAQiZiXUZV5ppYTbAaSsC3oWg2m+u1nV2gqym5rTEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720Z1403z9yZ for ; Fri, 06 Feb 2026 17:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 271b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 4ac3081b2828 - main - qlnxe: Remove a pointless copy back from the link-layer address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ac3081b282800158df7abe93f307d76e1b5b808 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:26 +0000 Message-Id: <69862bfe.271b3.1ec742ec@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4ac3081b282800158df7abe93f307d76e1b5b808 commit 4ac3081b282800158df7abe93f307d76e1b5b808 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:52:53 +0000 qlnxe: Remove a pointless copy back from the link-layer address On ifnet attaching, ether_ifattach() makes the link-layer address by shadow copying the ha->primary_mac. Well, the link-layer address will not be altered during attaching, thus it is pointless to copy it back. No functional change intended. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54883 --- sys/dev/qlnx/qlnxe/qlnx_os.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 99110e5e2d8f..9616d9f4d611 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2392,8 +2392,6 @@ qlnx_init_ifnet(device_t dev, qlnx_host_t *ha) ifmedia_set(&ha->media, (IFM_ETHER | IFM_AUTO)); ether_ifattach(ifp, ha->primary_mac); - bcopy(if_getlladdr(ha->ifp), ha->primary_mac, ETHER_ADDR_LEN); - QL_DPRINT2(ha, "exit\n"); return; From nobody Fri Feb 6 17:59:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720b3Jn3z6RVsF for ; Fri, 06 Feb 2026 17:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720b2Mrlz4KHR for ; Fri, 06 Feb 2026 17:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZwzTrqRRGuWVP5hsKs723uUsW8n4Zu49pdwR0cjMGA=; b=D2wef+5HEGptNgt0lgtYVAtE1sSx5jjgJwLq8Owg82AeinhreIwwy+arI9FceqNA6MFZPv lHoAPu7u2fIjiXuR7szJp+xacwzWaZYIWpPJEGjDYi5UwNhzTCfwfaRUQOOyWQDmXbpRLA NoV9Y61VslpMtUCxpKs2e/A4KAOOgjX+k2SGs1kt46H2jD/VhjxJ3eqZSkcX+vygOeslgS SkL8KTGhDZEAxjDx3KvYJrZbjBjw2ikJjdwrT9PakG1weKSERCCZXezuOza1SHmuGIQyfA FyD/JgE0k1vUpt4PuP+BQ5Fdxh9l0Iuo420O9CH6WV19FV+eoL4vn7+xEAgIPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400767; a=rsa-sha256; cv=none; b=g9HqfAKJNDzh68SVJhXnNRk/I7eKnA7XkQYuVfss83tbyNvNaNbfxFjvSirjcau4wLj79y NbCO10wmHKfDwDjH/3PiJMBPpoZoUttYoDrK2Ra3cKYrhEykFyhtLZWZ6TffgCdB91PCZE gyQOR192D1U7irinGYdCbYIACdfMHkieNzlZmo0/ADqsepAbJZn3D4ZI0ta/Dm3YQb9uUH qdRTuXC1JcaEeStUKQbvwbJc6o1jGVOHSmKxini/xNAXiWjQe0FytuvNv/JjGVtH2LRzVS MgPagF6jxx9By6TJyEefozCqhaLHmt5l399YOi5VBOu1qhNouveBHkIUT+6QoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZwzTrqRRGuWVP5hsKs723uUsW8n4Zu49pdwR0cjMGA=; b=ZEatKs+kQkWQs5almcKOjL6Y5fwSMQiUF/FA+lW7MKi3vsy1SpORUkddPDx6BKR6kuhbZs kmuS6Npcb92cbEnF9mAH6ECvq6/SMBhWTFrxdVPWYzhJDtr+c309Sq8uL6EKEqL6F7qKDf RP1A8G7EbL2FH5pF4Dfbele0xtlktbFzukrf6p4mdCwa3ad2RevfL+eaa3BzxGa0Fcr+Ci sxibE6eQpR8LEHSBE99QzIPYEWRccu61CzKkQUX5ynHKPClcDjFq3tUQfQmwUwQnU0SQnr ++5e027wTPuwNWCe7r44m1Edz1gUVOOEubp2V9llvoz/mvTXlyZ0FF578UuRXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720b1rrmz9Rs for ; Fri, 06 Feb 2026 17:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30127 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 3aeeedc7e0dc - main - qlnxe: Avoid memcpy with same source and destination List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3aeeedc7e0dc231c16406ff64f4a08a716964c40 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:27 +0000 Message-Id: <69862bff.30127.8f264c6@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3aeeedc7e0dc231c16406ff64f4a08a716964c40 commit 3aeeedc7e0dc231c16406ff64f4a08a716964c40 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:52:53 +0000 qlnxe: Avoid memcpy with same source and destination In case the device is VF, qlnx_get_mac_addr() returns ha->primary_mac hence it ends up memcpy with same source and destination. Refactor slightly to avoid that. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54884 --- sys/dev/qlnx/qlnxe/qlnx_def.h | 1 - sys/dev/qlnx/qlnxe/qlnx_os.c | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index 796845f3f8c6..ed3a0403bb6f 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -683,7 +683,6 @@ extern int qlnx_grc_dump(qlnx_host_t *ha, uint32_t *num_dumped_dwords, int hwfn_index); extern int qlnx_idle_chk(qlnx_host_t *ha, uint32_t *num_dumped_dwords, int hwfn_index); -extern uint8_t *qlnx_get_mac_addr(qlnx_host_t *ha); extern void qlnx_fill_link(qlnx_host_t *ha, struct ecore_hwfn *hwfn, struct qlnx_link_output *if_link); extern int qlnx_set_lldp_tlvx(qlnx_host_t *ha, qlnx_lldp_sys_tlvs_t *lldp_tlvs); diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 9616d9f4d611..1c885133c3ec 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -101,6 +101,7 @@ static void qlnx_stop(qlnx_host_t *ha); static int qlnx_send(qlnx_host_t *ha, struct qlnx_fastpath *fp, struct mbuf **m_headp); static int qlnx_get_ifq_snd_maxlen(qlnx_host_t *ha); +static void qlnx_get_mac_addr(qlnx_host_t *ha); static uint32_t qlnx_get_optics(qlnx_host_t *ha, struct qlnx_link_output *if_link); static int qlnx_transmit(if_t ifp, struct mbuf *mp); @@ -2322,7 +2323,7 @@ qlnx_init_ifnet(device_t dev, qlnx_host_t *ha) ha->max_frame_size = if_getmtu(ifp) + ETHER_HDR_LEN + ETHER_CRC_LEN; - memcpy(ha->primary_mac, qlnx_get_mac_addr(ha), ETH_ALEN); + qlnx_get_mac_addr(ha); if (!ha->primary_mac[0] && !ha->primary_mac[1] && !ha->primary_mac[2] && !ha->primary_mac[3] && @@ -3772,7 +3773,7 @@ qlnx_get_ifq_snd_maxlen(qlnx_host_t *ha) return(TX_RING_SIZE - 1); } -uint8_t * +static void qlnx_get_mac_addr(qlnx_host_t *ha) { struct ecore_hwfn *p_hwfn; @@ -3781,8 +3782,10 @@ qlnx_get_mac_addr(qlnx_host_t *ha) p_hwfn = &ha->cdev.hwfns[0]; - if (qlnx_vf_device(ha) != 0) - return (p_hwfn->hw_info.hw_mac_addr); + if (qlnx_vf_device(ha) != 0) { + memcpy(ha->primary_mac, p_hwfn->hw_info.hw_mac_addr, ETH_ALEN); + return; + } ecore_vf_read_bulletin(p_hwfn, &p_is_forced); if (ecore_vf_bulletin_get_forced_mac(p_hwfn, mac, &p_is_forced) == @@ -3792,8 +3795,6 @@ qlnx_get_mac_addr(qlnx_host_t *ha) p_is_forced, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); memcpy(ha->primary_mac, mac, ETH_ALEN); } - - return (ha->primary_mac); } static uint32_t From nobody Fri Feb 6 17:59:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720c6X56z6RVsH for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720c3ShBz4KZd for ; Fri, 06 Feb 2026 17:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUeNDKZfS87NATMSui1zYS1l2r4XHkpBXTB3ROQoj5o=; b=gehJ/wP3/5SnGvihE8LcpKUGD+oWIoFlZcLyu+gIrTTtDisSpZyG0GDaUxk16ukA7uum06 y3tMMD9VX1maBWsin8G+V96r2ZrdjtbpHcl1FhsUVcaEG5jLTlBw1ZWRL05dKyTGOW6U4T 43iJVBBWPFNkqwNeMxC46F/vSL1C64fTu54J4mXxph9i+0Et2L9beayvyhMu7CXsQ+w8Yt BEjb2DGHQhBQbE0Iq4Z9lcEd0hpLTdvkawqtYnn8t7WiNyx6qezU3oCtUdr45F5LMpy29t KgG7IZ0KVjPV92oHJrkSF8udxyJvPK73gVt6ShIHtlGLiKfnxd1qRGPp+sv6YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400768; a=rsa-sha256; cv=none; b=ItSCFLiGyszLiK6ujxhozysoaQB2b6B/Dtddgp4w5X4m2PHIIl1BYR9mzzqoC2+9Na8sp4 URiXPTVTUIpCxwNS9oR+D67oiPjXmlYtXSDGfhdpoJMeRIcQFx/1z1dAzhfFKwY7UnqmrG Sc0j0rYNSPbsrL5q41l4JJ64h7PTD6tCk0fS0BZ5MJaFR/LxZ333QPmWgpY4jAgfSzvmn6 g6ynOySDbiMrGcfzcAglXTCYMPbMFyEwfYMUAvMtHDyAm+gUg26oz5dqi4jf/Ca26hzwD2 RYyGxbI3EvwvFd+2P08LyxCORKNj2WkDuoNhzFx5gR/zcq1hXvpbLjPhZSYmig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUeNDKZfS87NATMSui1zYS1l2r4XHkpBXTB3ROQoj5o=; b=OEGfMDWA/kskggJSfVvljPRceb2mcexTjRw+x/tK+pw8ObaNv2yBXDvHZM2SNiLl4Lln0v fZ1XG+tXoec+8XK33RJ04eSrBbnmeqRybg23Fbchy/SIlTWaqS/3SduL52/qfRMU84azwk qzYWDjkLQxOOggc+98mekXJTmaXV7dgkvjcP4m9XJIHpaWo9le/l/YmXpR6SeipGETXOWZ 35FwKHLYxbX4YcQ56JQEQOKkx88m7WXeiig6xkMS81Qh+iriZTEcNb5ouLar0D+pWxHdzG iHqfSUKtzJ3M22YwVPkomnJ/1uTSZ746mN4S3SHWuyNzcofPh6czKR2tnBUvRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720c2h88z9sx for ; Fri, 06 Feb 2026 17:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2694a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f250852c9a0c - main - qlnxe: Fix setting the unicast MAC filter of RX path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f250852c9a0c1021c3be4b498e27cfc7b42a81db Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:28 +0000 Message-Id: <69862c00.2694a.6c8ab9e@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f250852c9a0c1021c3be4b498e27cfc7b42a81db commit f250852c9a0c1021c3be4b498e27cfc7b42a81db Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:52:53 +0000 qlnxe: Fix setting the unicast MAC filter of RX path When an Ethernet interface is added to lagg(4) as a child interface, its type, aka if_type, is changed from IFT_ETHER to IFT_IEEE8023ADLAG. Well changing the link-layer address of the lagg(4) interface will be propagated to all child interfaces, hence the drivers of child interfaces shall not presume the type of the interface will not be changed. Meanwhile, on initializing, an ifnet has been fully attached and it is guaranteed to have non-null link-layer address so stop NULL checking for it. Reviewed by: kbowling Fixes: 792226e53023 qlnxe: Allow MAC address override MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54885 --- sys/dev/qlnx/qlnxe/qlnx_os.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 1c885133c3ec..ec2fd7cacfae 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -7057,20 +7057,10 @@ qlnx_set_rx_mode(qlnx_host_t *ha) int rc = 0; uint8_t filter; const if_t ifp = ha->ifp; - const struct ifaddr *ifa; - struct sockaddr_dl *sdl; - ifa = if_getifaddr(ifp); - if (if_gettype(ifp) == IFT_ETHER && ifa != NULL && - ifa->ifa_addr != NULL) { - sdl = (struct sockaddr_dl *) ifa->ifa_addr; - - rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, LLADDR(sdl)); - } else { - rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, ha->primary_mac); - } - if (rc) - return rc; + rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, if_getlladdr(ifp)); + if (rc) + return rc; rc = qlnx_remove_all_mcast_mac(ha); if (rc) From nobody Fri Feb 6 17:59:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720d6jXPz6RVv5 for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720d4BS3z4KVq for ; Fri, 06 Feb 2026 17:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jnm9QN+IPV9jB0PGqYr+a6vxHpeV8UxxeDWmD+HZPEI=; b=BODJu6B7gBvIb/jSWNDYDagoktO6iFf9E6eiIs3M4Y4Q8MlKCmijYlMi7dUwaPA40dYm0O t9tE+DYPiRIR/vT4ZH3UjJBqYAMubXiu9/NgyordCccLnbB29mZ1xAM6hagm1kEzu/Jjs+ ad+SpYgB6DNBHl/OHJS+pAJrR6izmuKpxRPx1NIkjzymhU6CZIM4k091SXaTyDKRNBwlyv oCYTXlqN0uhPEh/wcCpfUKUR0RHTnlwkV0uCnWzWBJU+r47Nr+hbYdtl9nt7R8BUFGiJEe j9zmx4p8FxcuBLw6nst75eXbkI6Oz0e1ZTjsZSZ7YZHELR6jJo/c9+ZPWTebNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400769; a=rsa-sha256; cv=none; b=TGoXUnL3ttei6ifYBp9bJQ8gg2iSETJS/l8l0ZWRzgtB3YS5DFPp1xpYUQebhmWFAaKENW 7tWVPnDzC8wHXkU15rQh6+t75aqVVuULCcZOnKLB86F1LsV86FDazogMm4CVj5sF+WvL87 JJ+zOiW4flDtsZI+Rx3xhqP7BRYeDnbpmMxnSaX+U2e9TCP9je+2Lfae51KlzpsiNpjyLt OAGUvu4iDdmmhiWyIZpVYROnSmRy49BCVQRLVmVptGjUX9Jayfc4ItQf2YbFGwNInXJiNX XOfa/T+Fc4tOFLIzngjQUpeSdu9RiyZBcz9LYTCLTFNt/oWq5rYKDhrelPbMBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jnm9QN+IPV9jB0PGqYr+a6vxHpeV8UxxeDWmD+HZPEI=; b=UQCgx3tMYyNth8VhUJNSY2YqjCcVm8QHESadKG7z1z457jhgUtqoVMJIqsUTZTvq4keCil ZG8hpunsaHTpwYVYfSdKKhYXfNzXNxRcV+YGekH0EcSUqbJfKEnFG3FrUs2XKlIlHAODAL HgJlIx5z00wjiqJ2jxxXcJ0Ajk/vM8fyiVuIA/87pQFZQtZSeWlXpdWKm7jUB2wtFXbAn3 aDL5gVnY5n/6XfA3e1IeVYWstusxkJEmZmThu7hVsfEHUJOZxpLdRn2nTO8xiKW//DgPfR WAYQJyPdOul3mw3xqyFfGc1IVBDt/jtPU2dBQ1LIHJhsuupEHQSC1SpqI7Up1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720d3L2qz9Qp for ; Fri, 06 Feb 2026 17:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 301b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 0df8a998a9fe - main - qlnxe: Prevent potential concurrency between ioctls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0df8a998a9fe28af659cb401c537c6d785e55f81 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:29 +0000 Message-Id: <69862c01.301b2.4a06c215@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0df8a998a9fe28af659cb401c537c6d785e55f81 commit 0df8a998a9fe28af659cb401c537c6d785e55f81 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:52:53 +0000 qlnxe: Prevent potential concurrency between ioctls The driver-managed status flags should be lock protected to be touched. Also this can serialize ioctls those check the IFF_DRV_RUNNING status. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54886 --- sys/dev/qlnx/qlnxe/qlnx_os.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index ec2fd7cacfae..b0dac3a82582 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2568,9 +2568,7 @@ qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi) mcnt = if_foreach_llmaddr(ifp, qlnx_copy_maddr, mta); - QLNX_LOCK(ha); qlnx_hw_set_multi(ha, mta, mcnt, add_multi); - QLNX_UNLOCK(ha); return (0); } @@ -2637,11 +2635,10 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) #ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) { if_setflagbits(ifp, IFF_UP, 0); - if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) { - QLNX_LOCK(ha); + QLNX_LOCK(ha); + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) qlnx_init_locked(ha); - QLNX_UNLOCK(ha); - } + QLNX_UNLOCK(ha); QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx) ipv4 [0x%08x]\n", cmd, ntohl(IA_SIN(ifa)->sin_addr.s_addr)); @@ -2703,19 +2700,23 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) case SIOCADDMULTI: QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCADDMULTI", cmd); - if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { + QLNX_LOCK(ha); + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { if (qlnx_set_multi(ha, 1)) ret = EINVAL; } + QLNX_UNLOCK(ha); break; case SIOCDELMULTI: QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCDELMULTI", cmd); - if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { + QLNX_LOCK(ha); + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { if (qlnx_set_multi(ha, 0)) ret = EINVAL; } + QLNX_UNLOCK(ha); break; case SIOCSIFMEDIA: From nobody Fri Feb 6 17:59:30 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720f6gpmz6RVpj for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720f4NGLz4KNF for ; Fri, 06 Feb 2026 17:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GSNYTIPBlK/NpuBRZ3Eb2Amyc/+pDi0t5BIPYwuCVrg=; b=DQm0ZS4U0ulAF4jS8UM5U6vy0UdpGv60t2rs+HABlninXxV4l6P9NzDXmytGBHa8HsKh62 6T/o6EONrdlpVH3K0i+BjsIur2VHYE/vLX/gxr/CQA6HYVcgNCtNFPflr7Bfxl7pLVwzk9 mVvoR+M4lFFXcT7zfi2H2nyibDTgEXJdK/9ZojPJlqMmP+MqKRhIJ0AfC4Ub2z8I+oRdle slS8EgQr9ezT0jrBc7pCd6jofzwPbsUI+a76c4N7QPCleqdNrphIpDcgAP8pHKWKz4O69P E5+oLxQTc3js7EptrRSYPuOghH3SplzDTvvlXqgPBrd/JwucIGm68hWo3vqM3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400770; a=rsa-sha256; cv=none; b=G1HDyaZ1FVocPQ5xSW3Ro+ASuZ+4upowLzpQI4grCQKE1ncaLbAXndoXSUBan+c+M/P3lZ kbsfyzBSLpo+ul9umsCpKFCDgVPmsEEx2SLcg2cZ5h4RsUXN+eaVParWjI1G6UIRDHygKd a3/M6oKrClZmNa5PTR9804tGJQfWDntfyLMxF/iAybxT0oO6P+8sGBQeJq+igh3qVR9gjy xpb3Ceq21NvXOMz8Mrn9Z7QARRTXGTVkaYtH9EX5Py6pYaYR9n7N5bWUYXovPcnJmXjMSc WpoGjnDfCiAkIIWbXPaDEXe8xYX8zL6sPA8NG4IjUw58LED/Fj/RSNjS7p78mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GSNYTIPBlK/NpuBRZ3Eb2Amyc/+pDi0t5BIPYwuCVrg=; b=og6Q6YxV/fc7QSdgpc9GZUsqWWAC6/HAfS07NN2OJ2lYPXcCXV1ku2jObEX+oJ5dX9McSB wPyzN4qMqPhlaps4u2U9iZAhWIIQe8nz/fdBIoXqEmnBMP/cHdTpo8XW5ZbLL5IHrc1WZT jQwA8uPlXWPmQVN1h6QDZhXVtwGoaG/70xVMCgDAYphf6UStns3sKM1uzcNAG3L52hLc4A BAJTWZLW1WwOuZr44NnV2poyHicE7HQAUh9Ei5y+hZjGRFFGyS/CPGj4NZTSTSrNrHQwin sJXKBP42HdpaWMoVuOTq7KwXKv3S6mOD61iO7QQq3XVMkY/xergeIbEu36MHRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720f3vdYz9wP for ; Fri, 06 Feb 2026 17:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26edb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: c10e6bc0f007 - main - qlnxe: Avoid reinitializing the interface when it is already initialized List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c10e6bc0f0079e90cb484323ad71d437f1882422 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:30 +0000 Message-Id: <69862c02.26edb.eca8b69@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c10e6bc0f0079e90cb484323ad71d437f1882422 commit c10e6bc0f0079e90cb484323ad71d437f1882422 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:52:54 +0000 qlnxe: Avoid reinitializing the interface when it is already initialized qlnx_init_locked() unconditionally uninitialize the interface thus is actually reinitializing the interface. Well the init routine qlnx_init() is to initialize the interface by net stack when assigned with the first inet or inet6 address. The ioctl SIOCSIFADDR for the first inet6 address is handled by ether_ioctl() thus the interface is reinitialized no matter it was initialized or not. Add a driver status check for that to avoid reinitializing. Further plan is removing SIOCSIFADDR ioctl from the driver and let ether_ioctl() handle it. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54887 --- sys/dev/qlnx/qlnxe/qlnx_os.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index b0dac3a82582..bc0282e3c22b 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2431,7 +2431,8 @@ qlnx_init(void *arg) QL_DPRINT2(ha, "enter\n"); QLNX_LOCK(ha); - qlnx_init_locked(ha); + if ((if_getdrvflags(ha->ifp) & IFF_DRV_RUNNING) == 0) + qlnx_init_locked(ha); QLNX_UNLOCK(ha); QL_DPRINT2(ha, "exit\n"); From nobody Fri Feb 6 17:59:31 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720h1Qv1z6RVsR for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720g62Vkz4KWL for ; Fri, 06 Feb 2026 17:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IffgaKZtJFyrXClQBXqQsqI1mdVft+JA3WrwV82Qbqw=; b=p3A87KnAuO1k+KeTpHMAGoSSNSoO1X8cGwNcWznjmJ2+0xDmGHzwamnr7vS9WRl5qzYsUv htUrSr1tvFJ0S4+qtwZc3Vv38aKsL0EeSxZLqpsVF300v+7xJJSQh7Sq69k78ArVdZ6i2A GAvaKVrBSIhmnSfWHcf0+IQ3LkoSuehNQ9HMWwE/XcZQOmOtqbwtPB6cvxL/XVGAFtRVjd Etp2nMWTEUShaxy5C+4/BUyKoFUhAI+QE4oCvpAujEWiYJKro7k1udj0041hAlHWkMALzc YgUcr2/f0popxd1hV5+VeMYnx6QQWd8aXZ8ccH36bAAjR3Ilwgglb+o4Rb6bmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400771; a=rsa-sha256; cv=none; b=AruOQ4x4iyUFT83SD6aODo7AsRvC40Cdh24JyeoZuAlcqZw9ETJvhjM/AsgnryzPCGuyyl I1Nf5meKR2D4a+FDHmJMytxmow1Rudl8bcDVBhA7M0LCyn0TUBjlvfhUPv8cx7tsRUNCdn WtwTETcpPbu7bG3btNxMWBQP/sLpZmxQLXpsFiW72lirmnNSRIanvmqwxQHmVAs2ZuDZkK D+7NZYRimRPceXW3x305on3tIYFcMkMECj3BWHckCqfI8la7EAbWM1SKP7P/gvM/g7Lvtz Ze4g6YZ/ze/yZ5OVEY0T2nMazZdokvodhG1rj2msC8+nHxIfFGYJ34mO+4x1LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IffgaKZtJFyrXClQBXqQsqI1mdVft+JA3WrwV82Qbqw=; b=RzaB4rPyMNMdY/3ct0FXW6zIhfmZsZEjFg4+ux5oSHnjBMelG5kLzlg7uZ6aXoU3V0oeX3 dbDTv3CZzvZPE+Z11wsvptI9VdqxjZK57a5TLsUT0KIceFsGhORWwECYkiN9C8pSUk7gDw Mafu48rbh43zqD1j7Fw1+vnO4ADaGSCLQA9kweyNCVY97XPg7cgk1voI9f3+moHfZPRQm8 uTLtCWJ6dodlbXy/AE1yfwTARbzJM/3QH66A2K7vGcinC/SH65Fw+UbvwPwGTK7XysYUmN Ky4ewNYucf3mBVmaZia0QQDGGW7hx+EmhckDFmIGqo2pSuaBxxSNbXe5lvQeYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720g4mJvz9yb for ; Fri, 06 Feb 2026 17:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 276fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 4012b63889e4 - main - qlnxe: Let ether_ioctl() handle SIOCSIFADDR ioctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4012b63889e40bb877bc0e4c8da1792bce472c08 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:31 +0000 Message-Id: <69862c03.276fc.16278089@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4012b63889e40bb877bc0e4c8da1792bce472c08 commit 4012b63889e40bb877bc0e4c8da1792bce472c08 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:54:15 +0000 qlnxe: Let ether_ioctl() handle SIOCSIFADDR ioctl Since the change [1], the init routine qlnx_init() works as intended. Let ether_ioctl() handle SIOCSIFADDR to simplify the code. Combined with the change [1], this shall be a better fix for PR 287445. [1] c10e6bc0f007 qlnxe: Avoid reinitializing the interface when it is already initialized PR: 287445 Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54888 --- sys/dev/qlnx/qlnxe/qlnx_os.c | 25 ------------------------- sys/modules/qlnx/qlnxe/Makefile | 1 - 2 files changed, 26 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index bc0282e3c22b..8a12d45512ac 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -30,8 +30,6 @@ * Author : David C Somayajulu, Cavium, Inc., San Jose, CA 95131. */ -#include "opt_inet.h" - #include #include "qlnx_os.h" #include "bcm_osal.h" @@ -2622,34 +2620,11 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) int ret = 0, mask; int flags; struct ifreq *ifr = (struct ifreq *)data; -#ifdef INET - struct ifaddr *ifa = (struct ifaddr *)data; -#endif qlnx_host_t *ha; ha = (qlnx_host_t *)if_getsoftc(ifp); switch (cmd) { - case SIOCSIFADDR: - QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx)\n", cmd); - -#ifdef INET - if (ifa->ifa_addr->sa_family == AF_INET) { - if_setflagbits(ifp, IFF_UP, 0); - QLNX_LOCK(ha); - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) - qlnx_init_locked(ha); - QLNX_UNLOCK(ha); - QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx) ipv4 [0x%08x]\n", - cmd, ntohl(IA_SIN(ifa)->sin_addr.s_addr)); - - arp_ifinit(ifp, ifa); - break; - } -#endif - ether_ioctl(ifp, cmd, data); - break; - case SIOCSIFMTU: QL_DPRINT4(ha, "SIOCSIFMTU (0x%lx)\n", cmd); diff --git a/sys/modules/qlnx/qlnxe/Makefile b/sys/modules/qlnx/qlnxe/Makefile index 2a44ae6ddde5..3d8415cf0e57 100644 --- a/sys/modules/qlnx/qlnxe/Makefile +++ b/sys/modules/qlnx/qlnxe/Makefile @@ -58,7 +58,6 @@ SRCS+=qlnx_rdma.c SRCS+=qlnx_ioctl.c SRCS+=qlnx_os.c -SRCS+=opt_inet.h SRCS+= ${LINUXKPI_GENSRCS} From nobody Fri Feb 6 17:59:32 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720j1MG9z6FNWL for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720h6W4cz4KQn for ; Fri, 06 Feb 2026 17:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=APC4jn0+3VUQOwj3pKGSpv1FJ6S8+NBNeVD8bgg1bFA=; b=Y+dt762zBg8i7ZxHcDRUJ3pKA+VfjUcrI3dD+MznFohacGaTl5yeBynjTKBkpkgdg1pn5b Cy5oe/aLGRpMCrssiTDz4d0AWuKaw6eBJCsvJHSHbfAGdPtKhKOJg7BHQG24ifIKaUisHV VCGoW8GSF/KwAxzn2niMeBfgI+S9OTGF20ct1MDmocIFywmctGq7LpaD4V/f9zLFvYRTBd NVUg+Gs+MZzUU6NxkkZ9u2xZrPTk/bMF3iE719oCpfB10QXM4lfsxwnY7YJ24NsUadJUih o51MAtJV7FGzdrdOO4jnjkPBhOxJPl9IelQFbJBUs3LWax94Dez9fO7fMjMO/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400772; a=rsa-sha256; cv=none; b=I3dAgyk+Am7cDnq+wyAOl2JErTnapRKt/u9OmFAGeumVnXhRJGyzWcAqx6/lAjYKV6sOhK FKLc7QE020P8cMeiBV3B/yUtgt4w7WWpn41Gz0fqNzSzuJUKe4meF9VQPgm512foeiWAjF Qed5RqK6BwPuCjRRWw9M9ytNUPvW42B5twoMc6mJ9OEMXqeoSmip2Rj3vpGIwWw/bMGoJv NAaVnAFKs/km9wjt/haY3i+xdXOwztj5U7PNMTZMbgbGwOkRxfI9rKm/tzYWJc1+4LUMl8 xOK04U630CtyX7YIZ2ePhQIfwxe1W6OU6sNVVXOMHoqaln63ooDFxlAoeL5N/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=APC4jn0+3VUQOwj3pKGSpv1FJ6S8+NBNeVD8bgg1bFA=; b=ChlPtn5rofr2KHl1gmxCqgzFpQHEC1e7aYSTE1Tqo09HKp2aO0nL4t2UlXgSEyBhYMnZN3 RRyckFNOB10tDYlEsjIRM7b4f0XB0HlEyhD3NcVM2cYO7lMQCJRlOssQ7mOj6ai1Vv1Je1 rpYdGr0ZQ6SyBqYLlFZojpRbR3mCs34+RlXsP57i9KWgaS8SleNU0+FvGr0p0V4VQPAea9 lPlC6vduNbaWP8PIgy/0AOtJqtsLF/pZxrQwMEapiIjrCMnPTRNVqsD4iWLkngN2+pBMX9 gf8rOxV+QrZUELRmEmMkn7tHNVldNyh7PKDaicslFjng/hl4DQXnblusayO3oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720h5ZZ4z9Rt for ; Fri, 06 Feb 2026 17:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3095a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: ec7950fe4234 - main - qlnxev: Remove now unneeded include for opt_inet.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec7950fe42344900567cb72c83845ea4dc5a7114 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:32 +0000 Message-Id: <69862c04.3095a.361de796@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ec7950fe42344900567cb72c83845ea4dc5a7114 commit ec7950fe42344900567cb72c83845ea4dc5a7114 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:54:58 +0000 qlnxev: Remove now unneeded include for opt_inet.h Since the change [1], this is not required anymore. This change partially reverts commit 8a847947153e. [1] 4012b63889e4 qlnxe: Let ether_ioctl() handle SIOCSIFADDR ioctl Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54889 --- sys/modules/qlnx/qlnxev/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/modules/qlnx/qlnxev/Makefile b/sys/modules/qlnx/qlnxev/Makefile index 766a5a950032..ed62f1f1dd40 100644 --- a/sys/modules/qlnx/qlnxev/Makefile +++ b/sys/modules/qlnx/qlnxev/Makefile @@ -49,7 +49,6 @@ SRCS+=ecore_vf.c SRCS+=qlnx_ioctl.c SRCS+=qlnx_os.c -SRCS+=opt_inet.h SRCS+= ${LINUXKPI_GENSRCS} From nobody Fri Feb 6 17:59:33 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720k1bG7z6RVpn for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720j6n2wz4KhR for ; Fri, 06 Feb 2026 17:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQUgPly39nBvEWSsAgC7IhM676M4RjjHxv9Flp6tVe8=; b=qUzTtVseTJAERHz8/VtWHGtlDGmliOhzWTB2AST8FIKrkARBlQ5Z8LrHA7aYTpzcHN5QE2 RW5CjtvNJ4bUZF8fIAbsvIV1W5k26kIVfsWZFhxRjEMDHKjglRYPrjgdG7zH99ROrh6Er2 kwquce/jbMZm7SlUw4QD8t7I2l1oTX8m+z2KGmtVHwUPiT4SN8fD6/cB9NS8/XjEFlMq2n WIpKVacZObhELu888vBhS4qv2pVebMu9yVt2BTxmJA7xgrllSAnwe31c8aCXZMthoaRpCt UY4flzjd27vrg0r0sHMJH1zGVxdYX0+roHj/Xm77Rg8DIe3GmNamJnqyr/Z9Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400774; a=rsa-sha256; cv=none; b=O08mtqb9g8ryfdlVD8/u9K6dSPWhtCnfSHIB68CnX/HT91GjcrQdyjlYeAMtCblog+5w1S K2UZI0ZiOcVLth9jE/mivFJ98SSEe24WdDheCymbYvFhEzuzdyOhb84DckwGiY0WBxnnsH x86Q1yOmA4FRTmIGQhSGXks+SWlKgCHEKIcgR7rOjsmI5e2db5ucET8YHGpcB03zNw4cPC fbUoZ1HdfZBLYnG1EGrka5G+1XvobNgsRuVRCkF2iysauiMDZJgDCCEdyNeA8jC0I9jKzw 86BL1dsIoMo60barf2CJOkQFYRG73XYghXvwMt8YnwufpGs4QDK+zqTKaZyM4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQUgPly39nBvEWSsAgC7IhM676M4RjjHxv9Flp6tVe8=; b=oUuQCj680yI7LqPIS6wDFVJmiynA3zWn9397VYfgwPw9UwegaofhWa0dyhr+uN+HEl9OM2 zent3CmUlG+XcFexTzDz66v/Xo+zZBCMqawL2t1f75vDWtZR9YZQC9jhf+f/Eaj6RFwcWv GM37Ww9KpR8AyNbt73PzQQaMOdcfajG/wMLqDOfGfRN8nTJYK19hXVek3/dtpT8bEu9rz2 zMZ8U51Y+1RVWGO6l7zlB6O4GxD94Fsg6NzuEwfVaC/L7C21e4wTAZ/oY4d5pYA7I/Z3yn ker2SH6Q5T1el013QBy3iZ5UlYW2pMX/4YtvVbjONPT5L+IRyy1T/xrbzdaSyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720j6FR1z9Ls for ; Fri, 06 Feb 2026 17:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27bad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 45b1718fadae - main - qlnxe: Refactor setting the promiscuous and allmulti mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45b1718fadae7d56051ba04ef9d7a175a602a226 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:33 +0000 Message-Id: <69862c05.27bad.17b6f7d@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=45b1718fadae7d56051ba04ef9d7a175a602a226 commit 45b1718fadae7d56051ba04ef9d7a175a602a226 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:56:15 +0000 qlnxe: Refactor setting the promiscuous and allmulti mode There are two entry points to set the promiscuous and allmulti mode. One is ioctl, and another is the init routine. Given they share almost the identical logic, refactor a little to make the code more clear. While here, for the ioctl, translate the error to EINVAL to avoid confusing the net stack. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54890 --- sys/dev/qlnx/qlnxe/qlnx_def.h | 1 - sys/dev/qlnx/qlnxe/qlnx_os.c | 80 +++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index ed3a0403bb6f..6184e78fe846 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -370,7 +370,6 @@ struct qlnx_host { uint16_t device_id; if_t ifp; - int if_flags; volatile int link_up; struct ifmedia media; uint16_t max_frame_size; diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 8a12d45512ac..bc7ff63fe783 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -90,8 +90,8 @@ static void qlnx_init_ifnet(device_t dev, qlnx_host_t *ha); static void qlnx_init(void *arg); static void qlnx_init_locked(qlnx_host_t *ha); static int qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi); -static int qlnx_set_promisc(qlnx_host_t *ha, int enabled); -static int qlnx_set_allmulti(qlnx_host_t *ha, int enabled); +static int qlnx_set_promisc_allmulti(qlnx_host_t *ha, int flags); +static int _qlnx_set_promisc_allmulti(qlnx_host_t *ha, bool promisc, bool allmulti); static int qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data); static int qlnx_media_change(if_t ifp); static void qlnx_media_status(if_t ifp, struct ifmediareq *ifmr); @@ -2573,44 +2573,49 @@ qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi) } static int -qlnx_set_promisc(qlnx_host_t *ha, int enabled) +qlnx_set_promisc_allmulti(qlnx_host_t *ha, int flags) { int rc = 0; - uint8_t filter; if (qlnx_vf_device(ha) == 0) return (0); - filter = ha->filter; - if (enabled) { - filter |= ECORE_ACCEPT_MCAST_UNMATCHED; - filter |= ECORE_ACCEPT_UCAST_UNMATCHED; - } else { - filter &= ~ECORE_ACCEPT_MCAST_UNMATCHED; - filter &= ~ECORE_ACCEPT_UCAST_UNMATCHED; - } - - rc = qlnx_set_rx_accept_filter(ha, filter); + rc = _qlnx_set_promisc_allmulti(ha, flags & IFF_PROMISC, + flags & IFF_ALLMULTI); return (rc); } static int -qlnx_set_allmulti(qlnx_host_t *ha, int enabled) +_qlnx_set_promisc_allmulti(qlnx_host_t *ha, bool promisc, bool allmulti) { int rc = 0; uint8_t filter; - - if (qlnx_vf_device(ha) == 0) - return (0); + bool mcast, ucast; filter = ha->filter; - if (enabled) { + filter |= ECORE_ACCEPT_UCAST_MATCHED; + filter |= ECORE_ACCEPT_MCAST_MATCHED; + filter |= ECORE_ACCEPT_BCAST; + + mcast = promisc || allmulti; + ucast = promisc; + + if (mcast) filter |= ECORE_ACCEPT_MCAST_UNMATCHED; - } else { + else filter &= ~ECORE_ACCEPT_MCAST_UNMATCHED; - } - rc = qlnx_set_rx_accept_filter(ha, filter); + if (ucast) + filter |= ECORE_ACCEPT_UCAST_UNMATCHED; + else + filter &= ~ECORE_ACCEPT_UCAST_UNMATCHED; + + if (filter == ha->filter) + return (0); + + rc = qlnx_set_rx_accept_filter(ha, filter); + if (rc == 0) + ha->filter = filter; return (rc); } @@ -2652,13 +2657,8 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) if (flags & IFF_UP) { if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { - if ((flags ^ ha->if_flags) & - IFF_PROMISC) { - ret = qlnx_set_promisc(ha, flags & IFF_PROMISC); - } else if ((if_getflags(ifp) ^ ha->if_flags) & - IFF_ALLMULTI) { - ret = qlnx_set_allmulti(ha, flags & IFF_ALLMULTI); - } + if (qlnx_set_promisc_allmulti(ha, flags) != 0) + ret = EINVAL; } else { ha->max_frame_size = if_getmtu(ifp) + ETHER_HDR_LEN + ETHER_CRC_LEN; @@ -2669,7 +2669,6 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) qlnx_stop(ha); } - ha->if_flags = if_getflags(ifp); QLNX_UNLOCK(ha); break; @@ -6989,6 +6988,9 @@ qlnx_clean_filters(qlnx_host_t *ha) { int rc = 0; + /* Reset rx filter */ + ha->filter = 0; + /* Remove all unicast macs */ rc = qlnx_remove_all_ucast_mac(ha); if (rc) @@ -7032,7 +7034,6 @@ static int qlnx_set_rx_mode(qlnx_host_t *ha) { int rc = 0; - uint8_t filter; const if_t ifp = ha->ifp; rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, if_getlladdr(ifp)); @@ -7043,19 +7044,10 @@ qlnx_set_rx_mode(qlnx_host_t *ha) if (rc) return rc; - filter = ECORE_ACCEPT_UCAST_MATCHED | - ECORE_ACCEPT_MCAST_MATCHED | - ECORE_ACCEPT_BCAST; - - if (qlnx_vf_device(ha) == 0 || (if_getflags(ha->ifp) & IFF_PROMISC)) { - filter |= ECORE_ACCEPT_UCAST_UNMATCHED; - filter |= ECORE_ACCEPT_MCAST_UNMATCHED; - } else if (if_getflags(ha->ifp) & IFF_ALLMULTI) { - filter |= ECORE_ACCEPT_MCAST_UNMATCHED; - } - ha->filter = filter; - - rc = qlnx_set_rx_accept_filter(ha, filter); + if (qlnx_vf_device(ha) == 0) + rc = _qlnx_set_promisc_allmulti(ha, true, true); + else + rc = qlnx_set_promisc_allmulti(ha, if_getflags(ifp)); return (rc); } From nobody Fri Feb 6 17:59:34 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720l3dfRz6FNbC for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720l0GHnz4Kkk for ; Fri, 06 Feb 2026 17:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xuCDTXD0F1qeRqjceBVmvutZhJngO6mi8CiC3IY6nU=; b=yA6LBox070F/9g6/bL7ZBmeoIjX17mm8pm7X1R92dr1l/2C9tkWueA4sAV8P2eG6wwEAQc eMS6FVUjjPoxHmCafqZ8xd1v2F8ax2eCfykUC6O563b+nBRtCFrNBixebkbXkPYBInCpqh 0IUjf2HFbeL0eGg49PqvHA1Ox2vaJeFXkcsyIzU0CEXMH/fsORhS3EUIFWhALbIjNbVHu2 UKmCiOb4hqzKUZypd8+jtd9tYciB9hCZh8vuNeOo1kTiyLIvTOi5ydN3xM2VWyMRAbItgQ aRdV6/mrMZC46RlN4q1pSJtIdMLyly9XTo1GJ3L44/mAfigDNAiG45rb/22YrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400775; a=rsa-sha256; cv=none; b=Zlnd44oEEQP+lDK1n4ONx1awmduMbo711g6ENffVPBJ8jgIh5K+gVVdwWMvmnfMJDdct7F OCDGUE1O/PdynnAMnPNRBtHQqeo8DKSty3f6puVbxb9yStuIincSGGcJJ1YrIJ9KG7Iz7K PRsgf2mSHbm595gH2i7W1NpFF22g619FKmcUa3cJ6PmM7yLWjaiAksIBWOF0S9awUCd2oQ berWO90UYUb8DL7pN03yy6ZFwhZrSmvks2KRgIAR7XIsb0+BcnXNS9s/xadia7E/hCSEdU 0sGeft8gxfxD7MaZdMy1oJ0Wof6HZv0IOwoZdLtRg9004JsGlhcKcmdaeMIHCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xuCDTXD0F1qeRqjceBVmvutZhJngO6mi8CiC3IY6nU=; b=fohHHaJtnSi6V9/+tRKmAfTrF4YIOBGC3wlVcZuaguXqS2ox9F12145UX251BxrWxxaNms rLhiVXlNyad9qiPRjItIpZrSc0IOZOC2tCdcgLHCC0cbeoVlVy1NEuaPwcrkojo4D7vyLn lATmKpteYkNYgnmsP7k2eI/RKD26mxik2T0H0mt84hKZVsqiPo/Gl77+NICQh8Pb8ko5p+ DU+B4vAoqvwojobNihqJe/6z1BiDAgJMHUM5lRg1E5zt1BEUnPAcTkRbhpQLW/hfW8iXUv VDQ5hYz0TL047mx5PlP+EK9P6ppPpwCehQBLfqVTF+FmIEvMB+7A74BG9PFu/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720k6l9Kz9wQ for ; Fri, 06 Feb 2026 17:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 271b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 968647502ec2 - main - qlnxe: Allow tapping the TX packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 968647502ec21464ad3aecc7577ff0e8dfd41693 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:34 +0000 Message-Id: <69862c06.271b7.19fc81f4@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=968647502ec21464ad3aecc7577ff0e8dfd41693 commit 968647502ec21464ad3aecc7577ff0e8dfd41693 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:56:16 +0000 qlnxe: Allow tapping the TX packets Currently only the packets in the RX path can be captured by tcpdump as the ETHER_BPF_MTAP call in the TX path is missing. Add it so that packets in both directions can be captured. PR: 290973 Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54891 --- sys/dev/qlnx/qlnxe/qlnx_os.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index bc7ff63fe783..5f6f336aab8d 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2993,6 +2993,7 @@ qlnx_transmit_locked(if_t ifp, struct qlnx_fastpath *fp, struct mbuf *mp) drbr_advance(ifp, fp->tx_br); fp->tx_pkts_transmitted++; fp->tx_pkts_processed++; + ETHER_BPF_MTAP(ifp, mp); } mp = drbr_peek(ifp, fp->tx_br); From nobody Fri Feb 6 17:59:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f720m322Hz6RVcM for ; Fri, 06 Feb 2026 17:59: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f720m0sQbz4Kc1 for ; Fri, 06 Feb 2026 17:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7vk7twD+NDVdGUzUh2EOQakn1kei5RSO9LNwJcRVoM=; b=AcvlHS3IP24LjKp1H8tX7qOCe3/CbZUCf5H7/BWWJbbhgU2qSnqGFT46bijd2AXTAUSkpg lSzJl2n7/v8MaYaTPdHiB9F7c5nuGb3seCmdJjHQCyPC9ydTnBpurhMVfpwbgNM0RPFYLP L8PD2SXXDq2IcLUuzzy0Xd4N6654lM7UpUYn711CT/uvYv5OVyzzbK68fkHPcDUoGjbed0 7MBBXVpX/OE0gNibAvsXNTj1RCYphdhgMEk9k21ZFdO5i8Tjwj50Uf1TXFlKMt6XbnF8Ja pb1w40tku6guLf0+FywAqiob2KxaqnRX6qN1fnQgCmbNh3STM7dZ2y6FoMSS+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400776; a=rsa-sha256; cv=none; b=CWyCxOBeUK1L+elg2INJpT8vdmI1UawwqVrx5JJrzuQwJHymNKwCFayLN3mVEpN5GxS5kK HbJ8Llsubq6zF4kg9gD+luJknAM6uMuRWHSwStQSqT70TluT9ziaaPJ6UpQQtZF8ncjf48 eNcmzxrOll1uZfuwt59oIG5SsWTr4/ICO0/9ioKFqXMBU7jP0HSYJZlFhbDLZ1FQn3qkbi v4yGV4dERJA38V6HICnDXHRATd+biDUdM0b53SEsG5Y2R5ZcH4/9KZ9tkjFAwGdl3nLU2H hDL+Mn1DT4CqurrLIjHcAmxLfGL41XQ0qubf+AtvHgDGdDZNABJQUXWH6qsp5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7vk7twD+NDVdGUzUh2EOQakn1kei5RSO9LNwJcRVoM=; b=BW2sMB2OhHhJcRXzxERAktelE0csJRvxIVmKsIUbn9K6pJwkTuWbzcqYVzlLm+2RNj5U3g 2fKoLnxZV6iXg6cf3RRTLBSzNLUOdS9dLjfO6CIsNbK02Vd+VTE0jTdDiciNyVc3Gw7M1Y nQ88rgAu0RyG+rax23xIrxzTifoNRjipA6M0i0BWVwkpcBkt4CMn5t0bCFzIOoEs90cB7i DRtHAy+WPQHssGrVL7ao+OxtZ5YAibli2qLeLQzbxcv8slqR4A8478lEtR+Qwq+wx+hIMc LGataxWcyYZqoOmMorTR0Vr9xtEpTCNZrHBAwA5CYITV3Yq2CRzbm1WHIPE9ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720m0RR6z9t5 for ; Fri, 06 Feb 2026 17:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27044 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 70256d2b86d9 - main - qlnxe: Overhaul setting the multicast MAC filters List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70256d2b86d95a678a63c65b157b9c635f1f4c6a Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:36 +0000 Message-Id: <69862c08.27044.1d324723@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=70256d2b86d95a678a63c65b157b9c635f1f4c6a commit 70256d2b86d95a678a63c65b157b9c635f1f4c6a Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:55 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:58:16 +0000 qlnxe: Overhaul setting the multicast MAC filters When operating the multicast MAC filters, the current usage of ECORE_FILTER_ADD and ECORE_FILTER_REMOVE are rather misleading. ECORE_FILTER_ADD reads "adding new filter", but it actually removes any existing filters and then addes a new one. ECORE_FILTER_REMOVE reads "removing a filter", but it actually removes all filters. Let's use ECORE_FILTER_REPLACE and ECORE_FILTER_FLUSH instead to avoid confusion. In the current implementation, only one MAC address is passed to ecore_sp_eth_filter_mcast() and any previously installed filters are removed, hence it breaks the multicast function. That can be observed via either assigning new IPv6 addresses to the interface or putting the interface as a member of lagg(4) interface with LACP aggregation protocol. Fix that by calculating the multicast filter bins directly from multicast MAC addresses and replace the filters every time the bins changes. Due to the nature of the multicast filter, which is hash based, a full 1's multicast filter bin means all multicast packets are to be accepted. Thus there's no need to make the vport into allmulti mode when the number of multicast MAC addresses exceeds the limit (ECORE_MAX_MC_ADDRS, 64). Tested with a FastLinQ QL41212HLCU 25GbE adapter, both MFW_Version 8.35.23.0 and 8.59.16.0 are tested. Note: Currently the VF port is set to promiscuous mode unconditionally, and the setting of the multicast MAC filters for VF ports is short-circuited, so the VF port functions as it did. PR: 265857 PR: 290973 Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54892 --- sys/dev/qlnx/qlnxe/ecore_l2.c | 41 ++++---- sys/dev/qlnx/qlnxe/ecore_l2_api.h | 9 +- sys/dev/qlnx/qlnxe/ecore_vf.c | 11 +-- sys/dev/qlnx/qlnxe/qlnx_def.h | 5 +- sys/dev/qlnx/qlnxe/qlnx_os.c | 190 ++++++++------------------------------ 5 files changed, 66 insertions(+), 190 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/ecore_l2.c b/sys/dev/qlnx/qlnxe/ecore_l2.c index ee7d225540d0..5e281c330765 100644 --- a/sys/dev/qlnx/qlnxe/ecore_l2.c +++ b/sys/dev/qlnx/qlnxe/ecore_l2.c @@ -1617,14 +1617,13 @@ ecore_sp_eth_filter_mcast(struct ecore_hwfn *p_hwfn, struct ecore_spq_comp_cb *p_comp_data) { struct vport_update_ramrod_data *p_ramrod = OSAL_NULL; - u32 bins[ETH_MULTICAST_MAC_BINS_IN_REGS]; struct ecore_spq_entry *p_ent = OSAL_NULL; struct ecore_sp_init_data init_data; u8 abs_vport_id = 0; enum _ecore_status_t rc; int i; - if (p_filter_cmd->opcode == ECORE_FILTER_ADD) + if (p_filter_cmd->opcode == ECORE_FILTER_REPLACE) rc = ecore_fw_vport(p_hwfn, p_filter_cmd->vport_to_add_to, &abs_vport_id); else @@ -1654,30 +1653,33 @@ ecore_sp_eth_filter_mcast(struct ecore_hwfn *p_hwfn, /* explicitly clear out the entire vector */ OSAL_MEMSET(&p_ramrod->approx_mcast.bins, 0, sizeof(p_ramrod->approx_mcast.bins)); - OSAL_MEMSET(bins, 0, sizeof(u32) * ETH_MULTICAST_MAC_BINS_IN_REGS); - /* filter ADD op is explicit set op and it removes - * any existing filters for the vport. - */ - if (p_filter_cmd->opcode == ECORE_FILTER_ADD) { - for (i = 0; i < p_filter_cmd->num_mc_addrs; i++) { - u32 bit; - - bit = ecore_mcast_bin_from_mac(p_filter_cmd->mac[i]); - bins[bit / 32] |= 1 << (bit % 32); - } - + /* + * filter REPLACE op is explicit set op and it removes + * any existing filters for the vport. + */ + if (p_filter_cmd->opcode == ECORE_FILTER_REPLACE) { + _Static_assert(sizeof(p_filter_cmd->bins) == sizeof(p_ramrod->approx_mcast.bins), "Size mismatch"); + _Static_assert(nitems(p_filter_cmd->bins) == ETH_MULTICAST_MAC_BINS_IN_REGS, "Size mismatch"); /* Convert to correct endianity */ for (i = 0; i < ETH_MULTICAST_MAC_BINS_IN_REGS; i++) { struct vport_update_ramrod_mcast *p_ramrod_bins; p_ramrod_bins = &p_ramrod->approx_mcast; - p_ramrod_bins->bins[i] = OSAL_CPU_TO_LE32(bins[i]); + p_ramrod_bins->bins[i] = OSAL_CPU_TO_LE32(p_filter_cmd->bins[i]); } - } + } /* else FLUSH op clears existing filters */ p_ramrod->common.vport_id = abs_vport_id; rc = ecore_spq_post(p_hwfn, p_ent, OSAL_NULL); + + DP_INFO(p_hwfn, "Multicast filter cmd: [%s], bins: [%08x, %08x, %08x, %08x, %08x, %08x, %08x, %08x], ret = %d\n", + p_filter_cmd->opcode == ECORE_FILTER_REPLACE ? "replace" : "flush", + p_ramrod->approx_mcast.bins[0], p_ramrod->approx_mcast.bins[1], + p_ramrod->approx_mcast.bins[2], p_ramrod->approx_mcast.bins[3], + p_ramrod->approx_mcast.bins[4], p_ramrod->approx_mcast.bins[5], + p_ramrod->approx_mcast.bins[6], p_ramrod->approx_mcast.bins[7], rc); + if (rc != ECORE_SUCCESS) DP_ERR(p_hwfn, "Multicast filter command failed %d\n", rc); @@ -1692,10 +1694,9 @@ enum _ecore_status_t ecore_filter_mcast_cmd(struct ecore_dev *p_dev, enum _ecore_status_t rc = ECORE_SUCCESS; int i; - /* only ADD and REMOVE operations are supported for multi-cast */ - if ((p_filter_cmd->opcode != ECORE_FILTER_ADD && - (p_filter_cmd->opcode != ECORE_FILTER_REMOVE)) || - (p_filter_cmd->num_mc_addrs > ECORE_MAX_MC_ADDRS)) { + /* only REPLACE and FLUSH operations are supported for multi-cast */ + if ((p_filter_cmd->opcode != ECORE_FILTER_REPLACE && + (p_filter_cmd->opcode != ECORE_FILTER_FLUSH))) { return ECORE_INVAL; } diff --git a/sys/dev/qlnx/qlnxe/ecore_l2_api.h b/sys/dev/qlnx/qlnxe/ecore_l2_api.h index 610cc329f1fd..3b2f48e9fe11 100644 --- a/sys/dev/qlnx/qlnxe/ecore_l2_api.h +++ b/sys/dev/qlnx/qlnxe/ecore_l2_api.h @@ -162,14 +162,13 @@ struct ecore_filter_ucast { }; struct ecore_filter_mcast { - /* MOVE is not supported for multicast */ + /* Only REPLACE and FLUSH is supported for multicast */ enum ecore_filter_opcode opcode; u8 vport_to_add_to; u8 vport_to_remove_from; - u8 num_mc_addrs; -#define ECORE_MAX_MC_ADDRS 64 - unsigned char mac[ECORE_MAX_MC_ADDRS][ETH_ALEN]; + u32 bins[ETH_MULTICAST_MAC_BINS_IN_REGS]; }; +#define ECORE_MAX_MC_ADDRS 64 struct ecore_filter_accept_flags { u8 update_rx_mode_config; @@ -384,7 +383,7 @@ struct ecore_sp_vport_update_params { u8 anti_spoofing_en; u8 update_accept_any_vlan_flg; u8 accept_any_vlan; - u32 bins[8]; + u32 bins[ETH_MULTICAST_MAC_BINS_IN_REGS]; struct ecore_rss_params *rss_params; struct ecore_filter_accept_flags accept_flags; struct ecore_sge_tpa_params *sge_tpa_params; diff --git a/sys/dev/qlnx/qlnxe/ecore_vf.c b/sys/dev/qlnx/qlnxe/ecore_vf.c index 6cdc94d05c86..a7b006b982de 100644 --- a/sys/dev/qlnx/qlnxe/ecore_vf.c +++ b/sys/dev/qlnx/qlnxe/ecore_vf.c @@ -1515,18 +1515,13 @@ void ecore_vf_pf_filter_mcast(struct ecore_hwfn *p_hwfn, struct ecore_filter_mcast *p_filter_cmd) { struct ecore_sp_vport_update_params sp_params; - int i; OSAL_MEMSET(&sp_params, 0, sizeof(sp_params)); sp_params.update_approx_mcast_flg = 1; - if (p_filter_cmd->opcode == ECORE_FILTER_ADD) { - for (i = 0; i < p_filter_cmd->num_mc_addrs; i++) { - u32 bit; - - bit = ecore_mcast_bin_from_mac(p_filter_cmd->mac[i]); - sp_params.bins[bit / 32] |= 1 << (bit % 32); - } + if (p_filter_cmd->opcode == ECORE_FILTER_REPLACE) { + _Static_assert(sizeof(sp_params.bins) == sizeof(p_filter_cmd->bins), "Size mismatch"); + memcpy(sp_params.bins, p_filter_cmd->bins, sizeof(sp_params.bins)); } ecore_vf_pf_vport_update(p_hwfn, &sp_params); diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index 6184e78fe846..f895487c47e4 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -319,7 +319,6 @@ typedef struct qlnx_link_output qlnx_link_output_t; #define QLNX_TPA_MAX_AGG_BUFFERS (20) -#define QLNX_MAX_NUM_MULTICAST_ADDRS ECORE_MAX_MC_ADDRS typedef struct _qlnx_mcast { uint16_t rsrvd; uint8_t addr[6]; @@ -442,9 +441,7 @@ struct qlnx_host { qlnx_ivec_t irq_vec[QLNX_MAX_RSS]; uint8_t filter; - uint32_t nmcast; - qlnx_mcast_t mcast[QLNX_MAX_NUM_MULTICAST_ADDRS]; - struct ecore_filter_mcast ecore_mcast; + uint32_t ecore_mcast_bins[ETH_MULTICAST_MAC_BINS_IN_REGS]; uint8_t primary_mac[ETH_ALEN]; uint8_t prio_to_tc[MAX_NUM_PRI]; struct ecore_eth_stats hw_stats; diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 5f6f336aab8d..85c16842283c 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -48,6 +48,7 @@ #include "ecore_sp_commands.h" #include "ecore_dev_api.h" #include "ecore_l2_api.h" +#include "ecore_l2.h" #include "ecore_mcp.h" #include "ecore_hw_defs.h" #include "mcp_public.h" @@ -89,7 +90,7 @@ static void qlnx_fp_isr(void *arg); static void qlnx_init_ifnet(device_t dev, qlnx_host_t *ha); static void qlnx_init(void *arg); static void qlnx_init_locked(qlnx_host_t *ha); -static int qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi); +static int qlnx_set_multi(qlnx_host_t *ha); static int qlnx_set_promisc_allmulti(qlnx_host_t *ha, int flags); static int _qlnx_set_promisc_allmulti(qlnx_host_t *ha, bool promisc, bool allmulti); static int qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data); @@ -127,14 +128,13 @@ static void qlnx_set_id(struct ecore_dev *cdev, char name[NAME_SIZE], char ver_str[VER_SIZE]); static void qlnx_unload(qlnx_host_t *ha); static int qlnx_load(qlnx_host_t *ha); -static void qlnx_hw_set_multi(qlnx_host_t *ha, uint8_t *mta, uint32_t mcnt, - uint32_t add_mac); static void qlnx_dump_buf8(qlnx_host_t *ha, const char *msg, void *dbuf, uint32_t len); static int qlnx_alloc_rx_buffer(qlnx_host_t *ha, struct qlnx_rx_queue *rxq); static void qlnx_reuse_rx_data(struct qlnx_rx_queue *rxq); static void qlnx_update_rx_prod(struct ecore_hwfn *p_hwfn, struct qlnx_rx_queue *rxq); +static int qlnx_remove_all_mcast_mac(qlnx_host_t *ha); static int qlnx_set_rx_accept_filter(qlnx_host_t *ha, uint8_t filter); static int qlnx_grc_dumpsize(qlnx_host_t *ha, uint32_t *num_dwords, int hwfn_index); @@ -2438,138 +2438,45 @@ qlnx_init(void *arg) return; } -static int -qlnx_config_mcast_mac_addr(qlnx_host_t *ha, uint8_t *mac_addr, uint32_t add_mac) -{ - struct ecore_filter_mcast *mcast; - struct ecore_dev *cdev; - int rc; - - cdev = &ha->cdev; - - mcast = &ha->ecore_mcast; - bzero(mcast, sizeof(struct ecore_filter_mcast)); - - if (add_mac) - mcast->opcode = ECORE_FILTER_ADD; - else - mcast->opcode = ECORE_FILTER_REMOVE; - - mcast->num_mc_addrs = 1; - memcpy(mcast->mac, mac_addr, ETH_ALEN); - - rc = ecore_filter_mcast_cmd(cdev, mcast, ECORE_SPQ_MODE_CB, NULL); - - return (rc); -} - -static int -qlnx_hw_add_mcast(qlnx_host_t *ha, uint8_t *mta) -{ - int i; - - for (i = 0; i < QLNX_MAX_NUM_MULTICAST_ADDRS; i++) { - if (QL_MAC_CMP(ha->mcast[i].addr, mta) == 0) - return 0; /* its been already added */ - } - - for (i = 0; i < QLNX_MAX_NUM_MULTICAST_ADDRS; i++) { - if ((ha->mcast[i].addr[0] == 0) && - (ha->mcast[i].addr[1] == 0) && - (ha->mcast[i].addr[2] == 0) && - (ha->mcast[i].addr[3] == 0) && - (ha->mcast[i].addr[4] == 0) && - (ha->mcast[i].addr[5] == 0)) { - if (qlnx_config_mcast_mac_addr(ha, mta, 1)) - return (-1); - - bcopy(mta, ha->mcast[i].addr, ETH_ALEN); - ha->nmcast++; - - return 0; - } - } - return 0; -} - -static int -qlnx_hw_del_mcast(qlnx_host_t *ha, uint8_t *mta) -{ - int i; - - for (i = 0; i < QLNX_MAX_NUM_MULTICAST_ADDRS; i++) { - if (QL_MAC_CMP(ha->mcast[i].addr, mta) == 0) { - if (qlnx_config_mcast_mac_addr(ha, mta, 0)) - return (-1); - - ha->mcast[i].addr[0] = 0; - ha->mcast[i].addr[1] = 0; - ha->mcast[i].addr[2] = 0; - ha->mcast[i].addr[3] = 0; - ha->mcast[i].addr[4] = 0; - ha->mcast[i].addr[5] = 0; - - ha->nmcast--; - - return 0; - } - } - return 0; -} - -/* - * Name: qls_hw_set_multi - * Function: Sets the Multicast Addresses provided the host O.S into the - * hardware (for the given interface) - */ -static void -qlnx_hw_set_multi(qlnx_host_t *ha, uint8_t *mta, uint32_t mcnt, - uint32_t add_mac) -{ - int i; - - for (i = 0; i < mcnt; i++) { - if (add_mac) { - if (qlnx_hw_add_mcast(ha, mta)) - break; - } else { - if (qlnx_hw_del_mcast(ha, mta)) - break; - } - - mta += ETHER_ADDR_LEN; - } - return; -} - static u_int -qlnx_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt) +qlnx_mcast_bins_from_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt) { - uint8_t *mta = arg; - - if (mcnt == QLNX_MAX_NUM_MULTICAST_ADDRS) - return (0); + uint8_t bit; + uint32_t *bins = arg; - bcopy(LLADDR(sdl), &mta[mcnt * ETHER_ADDR_LEN], ETHER_ADDR_LEN); + bit = ecore_mcast_bin_from_mac(LLADDR(sdl)); + bins[bit / 32] |= 1 << (bit % 32); return (1); } static int -qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi) +qlnx_set_multi(qlnx_host_t *ha) { - uint8_t mta[QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_ADDR_LEN]; - if_t ifp = ha->ifp; - u_int mcnt; + struct ecore_filter_mcast mcast; + struct ecore_dev *cdev; + if_t ifp = ha->ifp; + u_int mcnt __unused; + int rc; if (qlnx_vf_device(ha) == 0) return (0); - mcnt = if_foreach_llmaddr(ifp, qlnx_copy_maddr, mta); + bzero(&mcast, sizeof(struct ecore_filter_mcast)); + mcnt = if_foreach_llmaddr(ifp, qlnx_mcast_bins_from_maddr, mcast.bins); + QL_DPRINT1(ha, "total %d multicast MACs found\n", mcnt); - qlnx_hw_set_multi(ha, mta, mcnt, add_multi); + if (memcmp(ha->ecore_mcast_bins, mcast.bins, sizeof(mcast.bins)) == 0) + return (0); - return (0); + cdev = &ha->cdev; + mcast.opcode = ECORE_FILTER_REPLACE; + rc = ecore_filter_mcast_cmd(cdev, &mcast, ECORE_SPQ_MODE_CB, NULL); + if (rc == 0) + memcpy(ha->ecore_mcast_bins, mcast.bins, sizeof(mcast.bins)); + + QL_DPRINT1(ha, "ecore_filter_mcast_cmd: end(%d)\n", rc); + return (rc); } static int @@ -2673,22 +2580,12 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) break; case SIOCADDMULTI: - QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCADDMULTI", cmd); - - QLNX_LOCK(ha); - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { - if (qlnx_set_multi(ha, 1)) - ret = EINVAL; - } - QLNX_UNLOCK(ha); - break; - case SIOCDELMULTI: - QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCDELMULTI", cmd); + QL_DPRINT4(ha, "%s (0x%lx)\n", "SIOCADDMULTI/SIOCDELMULTI", cmd); QLNX_LOCK(ha); if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { - if (qlnx_set_multi(ha, 0)) + if (qlnx_set_multi(ha) != 0) ret = EINVAL; } QLNX_UNLOCK(ha); @@ -6955,31 +6852,18 @@ qlnx_remove_all_ucast_mac(qlnx_host_t *ha) static int qlnx_remove_all_mcast_mac(qlnx_host_t *ha) { - struct ecore_filter_mcast *mcast; + struct ecore_filter_mcast mcast; struct ecore_dev *cdev; - int rc, i; + int rc; cdev = &ha->cdev; - mcast = &ha->ecore_mcast; - bzero(mcast, sizeof(struct ecore_filter_mcast)); - - mcast->opcode = ECORE_FILTER_REMOVE; - - for (i = 0; i < QLNX_MAX_NUM_MULTICAST_ADDRS; i++) { - if (ha->mcast[i].addr[0] || ha->mcast[i].addr[1] || - ha->mcast[i].addr[2] || ha->mcast[i].addr[3] || - ha->mcast[i].addr[4] || ha->mcast[i].addr[5]) { - memcpy(&mcast->mac[i][0], &ha->mcast[i].addr[0], ETH_ALEN); - mcast->num_mc_addrs++; - } - } - mcast = &ha->ecore_mcast; - - rc = ecore_filter_mcast_cmd(cdev, mcast, ECORE_SPQ_MODE_CB, NULL); + bzero(&mcast, sizeof(struct ecore_filter_mcast)); + mcast.opcode = ECORE_FILTER_FLUSH; - bzero(ha->mcast, (sizeof(qlnx_mcast_t) * QLNX_MAX_NUM_MULTICAST_ADDRS)); - ha->nmcast = 0; + rc = ecore_filter_mcast_cmd(cdev, &mcast, ECORE_SPQ_MODE_CB, NULL); + if (rc == 0) + bzero(ha->ecore_mcast_bins, sizeof(ha->ecore_mcast_bins)); return (rc); } @@ -7041,7 +6925,7 @@ qlnx_set_rx_mode(qlnx_host_t *ha) if (rc) return rc; - rc = qlnx_remove_all_mcast_mac(ha); + rc = qlnx_set_multi(ha); if (rc) return rc; From nobody Fri Feb 6 18:54:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f73D41fbDz6FSVG for ; Fri, 06 Feb 2026 18:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f73D41344z3MQc for ; Fri, 06 Feb 2026 18:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770404068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yB88ZplxP8wcunPD3UWj5xDv1xeGMaqbunAwEPlOR9o=; b=EkhIKtavqIj7oTot85JS+j2AW9raXljglh9Flh6mcE3Wds9Gpke9oGPHu4y+byvtMfCq0l govZbAO+dyXQk+OhybNVpOR2OSZ6/mJ+6J+8cumkjuEbG30pstaXQgW4uIvPt9N8FSTbAV TwmA+NXjiOWQ4/6Zg73m+mV1GF+SyeDUgeYKC/37Iplk72v8bWGjIXFolBYNEWoXWU7aNb E2HpoFBj0I9/VkeApD7otr1URii46mYpY5MAIGXDfnQtt456aasV66IjCT6QP8Wvtk//rZ qMXXKvWf1thZluLFAqgzkMXuzrPDycTAHSgWDMQSXXa0+pFS22NYuGGs3aIGKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770404068; a=rsa-sha256; cv=none; b=eR12XsKOjROXdgMHQ2wOVh1BwVj/Ine8FfOBZROLcwQNZ9fgD52O2pzrjM4S0BRFArFbcD mEREd2/9d9amwuRs7BM4nVXtoVAyTFxiOQwriW6tZ7kRbeAIAWVT8Xfj+XQ0lHWacaV5rH Gg6dseeMOnXSnIJiR5YKr0KAkpLc08SHWHtIHEKd4ZCYZ1rh9KTVYcAwio6UUCbr1YIYO7 +PKxjAUPFzwAf+X5vsPfmhB/en9DWgUB0mC4b1coF61Jr4YoHZUnr7UJLyNlH/VP6qnMhq 0MbmUct6CvQ8skCkHjXxgfHQSbGnqEPmka6SJw0IkoZFLnjJQKFbgU8qY2W5DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770404068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yB88ZplxP8wcunPD3UWj5xDv1xeGMaqbunAwEPlOR9o=; b=ME2j4b2d9jkusTR6L16OoZuBGqca5igKfvtWNO+lk6gOp9RAh3wkwv++3w7OeN6a7xmoRU xime184IOIoVPjb8V+poSi8hYCue0RsLa/8ULKQPWkSIAekBN4yKnviY+lBVJBMi/GyaZj leTTUCfsKhNaV25eLZJqzDmR4xHCtwA3RmdZwT40CzEg4KgGUGpoCxgQWM+MmHWyyKZKhp bA2pnS5AUSocUil8Hy42/8EgfJ71xsd5ni6WuOcIT85uvkvO+UqP7A1tz6wz5Qlc3i6RLK CFqj6+qYGdKBwctF78+n/6xA6t2uQfQSfkKHZw1if/45l9rDV2vDPnD3teU41Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f73D400BJzBxJ for ; Fri, 06 Feb 2026 18:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 18:54:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: f5923578eb67 - main - sockets: repair sctp_peeloff(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5923578eb67c6363e4575c107d3be3180ac9371 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 18:54:27 +0000 Message-Id: <698638e3.33e6b.6b5a6d38@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f5923578eb67c6363e4575c107d3be3180ac9371 commit f5923578eb67c6363e4575c107d3be3180ac9371 Author: Gleb Smirnoff AuthorDate: 2026-02-06 18:51:38 +0000 Commit: Gleb Smirnoff CommitDate: 2026-02-06 18:53:59 +0000 sockets: repair sctp_peeloff(2) The shim function soattach() may be passed a non-listening socket by SCTP. NB: the change makes soattach() more hairy, but long term plan is that this function goes away. PR: 293010 Fixes: 64f7e3c9c178ab35cb1f8fdf791aec74ede6f6b2 --- sys/kern/uipc_socket.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 73ac2c6efc4e..8b5d1f504e80 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -905,7 +905,11 @@ sodealloc(struct socket *so) * normal socket(2) syscall it is the pr_attach that calls soreserve(), even * for protocols that don't yet do PR_SOCKBUF. In case of accepted connection * it is our shim that calls soreserve() and the hiwat values are taken from - * the parent socket. + * the parent socket. The SCTP's sopeeloff() hands us a non-listening parent + * socket. + * + * This whole shim should go away when all major protocols fully manage their + * socket buffers. */ static int soattach(struct socket *so, int proto, struct thread *td, struct socket *head) @@ -921,8 +925,10 @@ soattach(struct socket *so, int proto, struct thread *td, struct socket *head) so->so_snd.sb_mtx = &so->so_snd_mtx; so->so_rcv.sb_mtx = &so->so_rcv_mtx; } - if (head == NULL || (error = soreserve(so, head->sol_sbsnd_hiwat, - head->sol_sbrcv_hiwat)) == 0) + if (head == NULL || (error = soreserve(so, + SOLISTENING(head) ? head->sol_sbsnd_hiwat : head->so_snd.sb_hiwat, + SOLISTENING(head) ? head->sol_sbrcv_hiwat : head->so_rcv.sb_hiwat)) + == 0) error = so->so_proto->pr_attach(so, proto, td); if (error != 0 && (so->so_proto->pr_flags & PR_SOCKBUF) == 0) { mtx_destroy(&so->so_snd_mtx); From nobody Fri Feb 6 19:00:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f73Nb1DjXz6FT5F; Fri, 06 Feb 2026 19:01:51 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f73NZ6RQFz3PKK; Fri, 06 Feb 2026 19:01:50 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Received: from phl-compute-10.internal (phl-compute-10.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 6504B1400050; Fri, 6 Feb 2026 14:01:50 -0500 (EST) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Fri, 06 Feb 2026 14:01:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770404510; x=1770490910; bh=sXWfv/dqqn kreFQ+nhP5N7tqcGOaA1FwTuWOSwYWzGY=; b=TYMrotY3qA9RICgXpSOzJ3WbXc BiQZzM5iRcBXEj4fca/uFX42qhfBxyXpJlXi1HHLJZuRKENGKMHsm7S7boLvErWd aMiDXYUOlq2xcPFjww4Nw++tdcMISfvb6TBVJyOrZ43i+kLHEqdRkhSIOr8XixBh wq4AVv/ATpmRNrT4SsoA4cKDo11R3aSfKQpKSsA+AvPoo755mMmo3+FHWeZhWArS MamiTE8MfOd44FQpTRq6ieR36L3+r2cuD4JXuRkQxH1Q3RWuLH6amADy7Na6p6D0 PMxE/doHhkS1rcgxK15nlfY0VGfB82FO7BCwVJYQG9P9keWaoS5op4kUxbDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770404510; x=1770490910; bh=sXWfv/dqqnkreFQ+nhP5N7tqcGOaA1FwTuW OSwYWzGY=; b=l5bMcODT7cp1cfWck+4J1LZ8Gxp2L+cPSQ/Zzfjv2tpBGuXA+FZ XgP7WARy74ZnblIHZVN43QO7cgEmiGNV/yH6787DACDTREA+QmLTb967OyOBrQs8 MekvadkhdiqNmeBcAUDX7oiaR1F0HazyAre717YVQydQnevitiAx5DF3JLXOARC5 qx4ZRn4S0nJeZ2pqvZcZ5wzMT7HlrCBex8YA9k37MMd/neM1OC6L4lvmJGlMqe/Q 1fEvyJESsCG+q4K+x3r3He3UrZVJl2RDeamt/ikVGWVBlw+CK4/7qEZEX6Yk8Yyz 8IZ8061Q39PtCrMbaSkcz4x4rJ+CGjD4YFg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddukeekleehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepfffkhffvvefujghffgggtgesthdtredttdervdenucfhrhhomhepfdfjvghrsggv rhhtucflrdcuufhkuhhhrhgrfdcuoehhvghrsggvrhhtsehgohhjihhrrgdrrghtqeenuc ggtffrrghtthgvrhhnpeefhfehffegvdehuedtuefgkeefieffieejhfeggeekgeevjeeg feffgeeglefhtdenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhvghrsggvrhhtsehgohhj ihhrrgdrrghtpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtph htthhopeholhgtvgesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgtohhm mhhithhtvghrshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhmmh hithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggvvhdq tghomhhmihhtshdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 6 Feb 2026 14:01:49 -0500 (EST) Date: Fri, 06 Feb 2026 20:00:55 +0100 Message-ID: <87qzqxlms8.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Olivier Certner Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 804329587508 - main - hwpstate{_amd,intel}(4): Move common knobs to a separate file In-Reply-To: <69861577.1d172.fd5fa27@gitrepo.freebsd.org> References: <69861577.1d172.fd5fa27@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:151847, ipnet:103.168.172.0/24, country:AU] X-Rspamd-Queue-Id: 4f73NZ6RQFz3PKK X-Spamd-Bar: ---- On Fri, 06 Feb 2026 17:23:19 +0100, Olivier Certner wrote: > > The branch main has been updated by olce: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8043295875083b57a6b7b2dc6826fde4cf4e1ba1 > > commit 8043295875083b57a6b7b2dc6826fde4cf4e1ba1 > Author: Olivier Certner > AuthorDate: 2026-02-06 10:58:07 +0000 > Commit: Olivier Certner > CommitDate: 2026-02-06 16:23:07 +0000 > > hwpstate{_amd,intel}(4): Move common knobs to a separate file > > Reason for doing this right now is to resolve the conflict on > 'machdep.hwpstate_pkg_ctrl' between the Intel and AMD drivers, even > though I expect to remove it for hwpstate_amd(4) at some point. > > More generally, this is going to be useful for some future code > factorization. Also, the 'debug.hwpstate_verbose' knob was moved there, > as we'll likely want to use it for the Intel driver as well (which is > currently not the case). > > Note for MFC: Will be partial, since `hwpstate_amd(4)` does not support > CPPC in stable/15 nor stable/14. > > Reviewed by: emaste > Fixes: 3e6e4e4a0d42 ("hwpstate: add CPPC support for pstate driver on AMD") > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D54528 > --- > sys/conf/files.x86 | 1 + > sys/modules/cpufreq/Makefile | 3 ++- > sys/x86/cpufreq/hwpstate_amd.c | 11 ++--------- > sys/x86/cpufreq/hwpstate_common.c | 22 ++++++++++++++++++++++ > sys/x86/cpufreq/hwpstate_common.h | 13 +++++++++++++ > sys/x86/cpufreq/hwpstate_intel.c | 6 +----- > 6 files changed, 41 insertions(+), 15 deletions(-) This commit seems to break GENERIC_NODEBUG. From nobody Fri Feb 6 19:03:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f73Qt55rVz6FSmP; Fri, 06 Feb 2026 19:03:50 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [IPv6:2001:1640:5::8:31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f73Qt2YMJz3PsZ; Fri, 06 Feb 2026 19:03:50 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id 92DF324103D; Fri, 6 Feb 2026 20:03:42 +0100 (CET) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id B8DE6240278; Fri, 6 Feb 2026 20:03:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1770404620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=r5IQIT8AokrDRjRoc0wovOdmCIavQKRZggqVRDHiCyE=; b=Q3S0VFhoKy9N78f0s0x0HM+V1wxM0b1ITtjveGgOWQcjwNI7BWZRiOESgRFO9ZnnRVC4A9 zzUj19Mjm1qbEsF64VmymJEKKtwPzw/t1gyIQsUFk1NIdkyfzH1DfNeCPf1hwQAJqE+U33 YkWKd3303/VB1AfwvOeABfeSPZ109mB2NeFB3QPLAEVVggrL8lhz/+Ql7BASCIIVtfuiM/ cpT1l8iIAl6gteiUICGCrWf/Z044c3QyVepH1jmx+LNfZ63Q7qc3YjFlLwfiuMPhGHDkJ9 Egbxj71o/WpCQ0rOQCkNXXu2T1ZPTXMkBTS3XOkfk4cKkwH2XiLWryK4/AnSCg== Received: from thor.sb211.local (dynamic-2a02-3100-1a6f-b002-ce3a-ff67-64fc-d552.310.pool.telefonica.de [IPv6:2a02:3100:1a6f:b002:ce3a:ff67:64fc:d552]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 60D55240276; Fri, 6 Feb 2026 20:03:40 +0100 (CET) Date: Fri, 6 Feb 2026 20:03:12 +0100 From: A FreeBSD User To: Olivier Certner Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 804329587508 - main - hwpstate{_amd,intel}(4): Move common knobs to a separate file Message-ID: <20260206195430.50c28a04@thor.sb211.local> In-Reply-To: <69861577.1d172.fd5fa27@gitrepo.freebsd.org> References: <69861577.1d172.fd5fa27@gitrepo.freebsd.org> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd16.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/eGQLsQUcQYcU6=Ziywq___1"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: 31de44 X-Rspamd-UID: 5bab65 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Queue-Id: 4f73Qt2YMJz3PsZ X-Spamd-Bar: ---- --Sig_/eGQLsQUcQYcU6=Ziywq___1 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Tage des Herren Fri, 06 Feb 2026 16:23:19 +0000 Olivier Certner schrieb: > The branch main has been updated by olce: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D8043295875083b57a6b7b2dc68= 26fde4cf4e1ba1 >=20 > commit 8043295875083b57a6b7b2dc6826fde4cf4e1ba1 > Author: Olivier Certner > AuthorDate: 2026-02-06 10:58:07 +0000 > Commit: Olivier Certner > CommitDate: 2026-02-06 16:23:07 +0000 >=20 > hwpstate{_amd,intel}(4): Move common knobs to a separate file > =20 > Reason for doing this right now is to resolve the conflict on > 'machdep.hwpstate_pkg_ctrl' between the Intel and AMD drivers, even > though I expect to remove it for hwpstate_amd(4) at some point. > =20 > More generally, this is going to be useful for some future code > factorization. Also, the 'debug.hwpstate_verbose' knob was moved the= re, > as we'll likely want to use it for the Intel driver as well (which is > currently not the case). > =20 > Note for MFC: Will be partial, since `hwpstate_amd(4)` does not suppo= rt > CPPC in stable/15 nor stable/14. > =20 > Reviewed by: emaste > Fixes: 3e6e4e4a0d42 ("hwpstate: add CPPC support for pstate = driver on AMD") > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D54528 > --- > sys/conf/files.x86 | 1 + > sys/modules/cpufreq/Makefile | 3 ++- > sys/x86/cpufreq/hwpstate_amd.c | 11 ++--------- > sys/x86/cpufreq/hwpstate_common.c | 22 ++++++++++++++++++++++ > sys/x86/cpufreq/hwpstate_common.h | 13 +++++++++++++ > sys/x86/cpufreq/hwpstate_intel.c | 6 +----- > 6 files changed, 41 insertions(+), 15 deletions(-) >=20 > diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 > index b1bd6f7291ca..fabcd5d9ebe5 100644 > --- a/sys/conf/files.x86 > +++ b/sys/conf/files.x86 > @@ -342,6 +342,7 @@ x86/acpica/srat.c optional acpi > x86/bios/vpd.c optional vpd > x86/cpufreq/est.c optional cpufreq > x86/cpufreq/hwpstate_amd.c optional cpufreq > +x86/cpufreq/hwpstate_common.c optional cpufreq > x86/cpufreq/hwpstate_intel.c optional cpufreq > x86/cpufreq/p4tcc.c optional cpufreq > x86/cpufreq/powernow.c optional cpufreq > diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile > index 9a417f72fc27..23b4c97f5393 100644 > --- a/sys/modules/cpufreq/Makefile > +++ b/sys/modules/cpufreq/Makefile > @@ -9,7 +9,8 @@ SRCS+=3D bus_if.h cpufreq_if.h device_if.h pci_if.h > .PATH: ${SRCTOP}/sys/x86/cpufreq > =20 > SRCS+=3D acpi_if.h opt_acpi.h > -SRCS+=3D est.c hwpstate_amd.c p4tcc.c powernow.c hwpstate_intel.c > +SRCS+=3D est.c p4tcc.c powernow.c > +SRCS+=3D hwpstate_amd.c hwpstate_common.c hwpstate_intel.c > .endif > =20 > .if ${MACHINE} =3D=3D "i386" > diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_am= d.c > index d8ad090a6a58..0afc0919aa16 100644 > --- a/sys/x86/cpufreq/hwpstate_amd.c > +++ b/sys/x86/cpufreq/hwpstate_amd.c > @@ -68,6 +68,8 @@ > =20 > #include > =20 > +#include > + > #include "acpi_if.h" > #include "cpufreq_if.h" > =20 > @@ -162,10 +164,6 @@ static int hwpstate_get_info_from_acpi_perf(device_t= dev, > device_t perf_dev); static int hwpstate_get_info_from_msr(device_t dev); > static int hwpstate_goto_pstate(device_t dev, int pstate_id); > =20 > -static int hwpstate_verbose; > -SYSCTL_INT(_debug, OID_AUTO, hwpstate_verbose, CTLFLAG_RWTUN, > - &hwpstate_verbose, 0, "Debug hwpstate"); > - > static int hwpstate_verify; > SYSCTL_INT(_debug, OID_AUTO, hwpstate_verify, CTLFLAG_RWTUN, > &hwpstate_verify, 0, "Verify P-state after setting"); > @@ -176,11 +174,6 @@ SYSCTL_BOOL(_debug, OID_AUTO, hwpstate_pstate_limit,= CTLFLAG_RWTUN, > "If enabled (1), limit administrative control of P-states to the val= ue in " > "CurPstateLimit"); > =20 > -static bool hwpstate_pkg_ctrl_enable =3D true; > -SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, > - &hwpstate_pkg_ctrl_enable, 0, > - "Set 1 (default) to enable package-level control, 0 to disable"); > - > static bool hwpstate_amd_cppc_enable =3D true; > SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_amd_cppc_enable, CTLFLAG_RDTUN, > &hwpstate_amd_cppc_enable, 0, > diff --git a/sys/x86/cpufreq/hwpstate_common.c b/sys/x86/cpufreq/hwpstate= _common.c > new file mode 100644 > index 000000000000..60d84f9983a6 > --- /dev/null > +++ b/sys/x86/cpufreq/hwpstate_common.c > @@ -0,0 +1,22 @@ > +/* > + * SPDX-License-Identifier: BSD-2-Clause > + * > + * Copyright (c) 2026 The FreeBSD Foundation > + * > + * This software was developed by Olivier Certner at = Kumacom > + * SARL under sponsorship from the FreeBSD Foundation. > + */ > + > +#include > + > +#include > + > + > +int hwpstate_verbose; > +SYSCTL_INT(_debug, OID_AUTO, hwpstate_verbose, CTLFLAG_RWTUN, > + &hwpstate_verbose, 0, "Debug hwpstate"); > + > +bool hwpstate_pkg_ctrl_enable =3D true; > +SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, > + &hwpstate_pkg_ctrl_enable, 0, > + "Set 1 (default) to enable package-level control, 0 to disable"); > diff --git a/sys/x86/cpufreq/hwpstate_common.h b/sys/x86/cpufreq/hwpstate= _common.h > new file mode 100644 > index 000000000000..953037672c0f > --- /dev/null > +++ b/sys/x86/cpufreq/hwpstate_common.h > @@ -0,0 +1,13 @@ > +/* > + * SPDX-License-Identifier: BSD-2-Clause > + * > + * Copyright (c) 2026 The FreeBSD Foundation > + * > + * This software was developed by Olivier Certner at = Kumacom > + * SARL under sponsorship from the FreeBSD Foundation. > + */ > + > +/* Stuff common to hwpstate_amd(4) and hwpstate_intel(4). */ > + > +extern int hwpstate_verbose; > +extern bool hwpstate_pkg_ctrl_enable; > diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_= intel.c > index 259aeac399c8..3d2cc0a5966b 100644 > --- a/sys/x86/cpufreq/hwpstate_intel.c > +++ b/sys/x86/cpufreq/hwpstate_intel.c > @@ -48,6 +48,7 @@ > =20 > #include > =20 > +#include > #include > =20 > #include "acpi_if.h" > @@ -108,11 +109,6 @@ static driver_t hwpstate_intel_driver =3D { > DRIVER_MODULE(hwpstate_intel, cpu, hwpstate_intel_driver, NULL, NULL); > MODULE_VERSION(hwpstate_intel, 1); > =20 > -static bool hwpstate_pkg_ctrl_enable =3D true; > -SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, > - &hwpstate_pkg_ctrl_enable, 0, > - "Set 1 (default) to enable package-level control, 0 to disable"); > - > static int > intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) > { >=20 The commit break buildworld/buildkernel: [...] /usr/src/sys/x86/cpufreq/hwpstate_common.c:16:48: error: expected ')' ... /usr/src/sys/x86/cpufreq/hwpstate_common.c:20:52: error: type specifier mis= sing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-in= t] Kind regards, oh --=20 A FreeBSD user --Sig_/eGQLsQUcQYcU6=Ziywq___1 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCaYY7CwAKCRCxzvs8Oqok rw7rAQDqlbe8hlI/cXHYSJi58UQ/ptGa6isfkSkSUFt1Rnjb0AD/TDe4hWaV/CHO pIWyPCaIMtL5AzAfE5jRxc3LKbcPswY= =NS2F -----END PGP SIGNATURE----- --Sig_/eGQLsQUcQYcU6=Ziywq___1-- From nobody Fri Feb 6 20:29:59 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f75LT0LDGz6FZnv; Fri, 06 Feb 2026 20:30:09 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f75LS6tPVz3kfV; Fri, 06 Feb 2026 20:30:08 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770409809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SG3LayGo2TKLbH7d6NWiUVWA1CFdkcYNHn6wP40opBs=; b=c6p6jsuSVzIYy8Si5ePmoLLM/jLvdAU1JaCYjmZyMgZKxiBUgcYZOkbeXbHfN1hlyNaSHX ndY3cQxDSra1rqjVvcJfGtQB3o6rwMoD1Clw2qTQM0Al9qgOY6883/aU+J2P1LbO60+oyU 4RdT2khveHj4A3dy4Mlli1pWJC6zEYAz8tViLQ6AcE9h6WM7/ZQP2/IKit2ebKTLLzzHeF IfwcY1zy2n+KhgqcerQCao92FTbNbUo/x8+Om20YdifXm5onYfrlNurLP5lrlyLW09dHg+ 5o+iLNADQaYo9C2VLhb33XhC6u6EPkiZJZsNENv8QI4OAf+4jL8OqXeo8vsnWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770409809; a=rsa-sha256; cv=none; b=qnN89u97x/DL247dZ9T1xXslIX3iWOMqREGLj/t0KTaPG2/16N6VpPNEKYEO6LpF0yPDRd F5QSF+V/nGDp+0o1UIaeipgK5g6wEJoV5fzguy1v+area5K6YPQK20+H1IwIsXQrxEn8Nv X0YhYY+JxUnwlsgV8OadeYFhSRtZ1HXyzKA/wLO4+MA73p8weTbNvoBWzl7qjJp5xlhxTr jLU+k6xuapgc+HNXHYPYyWLfjw0pipxJQgLIP5cwXYGQ1h9xfTk8QBZ3xQnN/Sj+vWzsgi n8XnNbbd2Du7su9PUQaN8BJwRXEvac2czV6zzDSDGcT/7zey6axvH5GAOLPmSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770409809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SG3LayGo2TKLbH7d6NWiUVWA1CFdkcYNHn6wP40opBs=; b=I4pFkYpJNw1/9hy3S06LCTCD+AbAzh2BAzwdW7M6p3msMGg4EAA/niwjBPd5/7J5G9Lton 3sgy2i1oEf+H7UTrcjGsMFppGD71+/SsLTWFDH3kY6T+KCxjrpImzhNfaBRdnw+fgVgHnc aIe7utE6giFLTFoTFrlCmgGaNsMkvGM6H5hoIqMfclwEMhV3xYyfu56tBkHwsHWQJpxtj2 atWSP/g5Hy4tHFNmVP8c/zvgbo3oqBOEVbv98nHiPd54nl1t7XVRVHYEgDCBvsxikdAJzu UGR5pgLTg/55EayfVTbyWCq2fg8Gi7kGOJ3/MJOjeS54oLlEc2q/j3UYWX5eAQ== Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f75LS23zszZMc; Fri, 06 Feb 2026 20:30:08 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: src-committers@freebsd.org Cc: A FreeBSD User , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 804329587508 - main - hwpstate{_amd,intel}(4): Move common knobs to a separate file Date: Fri, 06 Feb 2026 21:29:59 +0100 Message-ID: <1942282.183gH74vGi@ravel> In-Reply-To: <20260206195430.50c28a04@thor.sb211.local> References: <69861577.1d172.fd5fa27@gitrepo.freebsd.org> <20260206195430.50c28a04@thor.sb211.local> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1865086.OVFmXjEfDW"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart1865086.OVFmXjEfDW Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: src-committers@freebsd.org Date: Fri, 06 Feb 2026 21:29:59 +0100 Message-ID: <1942282.183gH74vGi@ravel> In-Reply-To: <20260206195430.50c28a04@thor.sb211.local> MIME-Version: 1.0 Hi, Sorry for the breakage. GENERIC is fine, but it's indeed GENERIC-NODEBUG that does not work. I'm on it. Regards. -- Olivier Certner --nextPart1865086.OVFmXjEfDW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmmGT0cACgkQjKEwQJce Jie/zhAAqxuQ7oAIkMKNzICldEWT88oWtSfDOoGyaOtbPP1szup13RTelxEQ5h8D 4Jkt8ln+1ynPTqC5UBFXKY5n2aA1GBuBw0jsi2SEBNorpiqBPsej7+mEjyE7Nvdy O2+66sTeDGyC9I3WX8/37Y+YcQl/VIPivDP43Lh0y4vIwLV7g9zOQeWlFW1WjRtn aYJfITAYyvlrNfAniRIzC2+SpLhQOLYO+DdbAp3MlIQcqdwzmuRaDGCAIJlcm9U6 6BXV5A6adhxm7yxEn34rVME7VpA6pk3kXDuCQaVmdisXjo+/uXLY8N9ICopb4G+1 H6Rq1ykDsYy1bJljmj/adFlv7sokO80bjwTgd2m0Ul8YhmDnOFYDAJPW0iOLLKUN ltqlc6V4EP3Dc+MXtPee4kjJwU1L701ghPwkBYJSYisNufCJpchmouVPLZJT4lXX /nIKpGrQrypFOAuwC6rSx4fE29gE//agbK15P/VF7B+Nfdrw3yx8Jf86TE76ZMcT rg2mnisoLzR1O67FAIUzMtCBrYSVXeheWD0O5+XFycKbAygsxUd1pGvOAD9OU3ka VPm2siREKL15iw8MV1y7INg94UNxFCiRa+Lc6oXgb1TBuAYaDs2oB15ImPTiVJ32 V9NvFEshThCNz2X1Q2thGA7tPN/BIFiJO/f0s9skn58jqVBjSN8= =LrSy -----END PGP SIGNATURE----- --nextPart1865086.OVFmXjEfDW-- From nobody Fri Feb 6 20:33:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f75Pr0tfkz6FZm8 for ; Fri, 06 Feb 2026 20:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f75Pq745Yz3lL0 for ; Fri, 06 Feb 2026 20:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770409984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zNSMvMbd5C/PJDyc200EHA/rM2ebCY5fdKixAgTMg4c=; b=Q+4oECuthMbpyGBhS++8XcwW7RdBfO4s+hr6+8klAm+ndPY5CmChyWpAsPG6FDs8ZrF0tA 8LknF7RoH2Sj6Co48mduOQBsBK1MW/Pz0WDANvaPoMTIKChq25nvu+QOFq/ah5ADyyudhE YsPQpnbKDgf8zT7KS+xExFkqtqLJIs/S63wkfOS89IA65tyfLl7RluVL4KPJs7nmGIoYID RQMc34OQHsvvO4CpqCjbKrdnztauA/8xzFT6iTmh8OdO0Bx/LPJcHucDkONj9wXhQqSWj7 OPrpS0qM3qYslW9SOgXM5ts8H8hnLVtfQEwkX2Qr/YBLAwx6Xf1BcqIdL8StYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770409984; a=rsa-sha256; cv=none; b=EaxooVylygWb9S23C1TOgP0WjUNlUUXAiusNZ/gKIYDIqn9QCnSMmRB6uFjqbPISoIrbpU 2Ej96uISSe8v32VImzGsu9FRiNfMtJa/GRjzkVg0B9PsJtb1sk/3S+1v/tIV5QkqIrjMYg g1le70VFwSKMVWnWKhj1nnPPZPS9yvWTkO805J3CVX48clkE8yikFQEJMV7yQ+xuBTL7tc pwILRv580cxxvtvHwe1XPUthlB9CaBIb5gRncOCt2ySU9R8NdOEc3L0r7TnfbTLFEzc573 +UCHYMi8n+HQODXPGo9EkFSHQ/sqDZKdkglU6mmidoB7feh7J5fO2j2EmLzktg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770409984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zNSMvMbd5C/PJDyc200EHA/rM2ebCY5fdKixAgTMg4c=; b=Zw5dICqF9CEQ9WgrbDEQQJdRknDNatETlWauozi5NeYwBPQG0Owpsh17hG3mF/PY3OTQrZ SSNSvwJTQp/d832htba85y0nYsdOimTh5HlmOplK/92R0Bhb2lD3QTa8i10+MJhMZDhFWk N+uAkPagVZrjryme4TcvOdVvL3bwJKcEf49O6+0hsF856TnFDWWDDJZOi56ZwiszXzudwK FPejLvD/7n00N6hB0ZMV52fKkJZEC5GWZlpAufj1EB3xkZLOHRw52HQKge0U7GYz44tkCu pqNK2uG/UbpIHsEtgIS7AV4r75F0D2coDxUcfoiqGDKHmsgNWty883oSeezCww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f75Pq6bn9zWdn for ; Fri, 06 Feb 2026 20:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40d8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 20:33:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 21dd554d1697 - main - igb: remove M_HASHTYPE when RSS is not enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21dd554d16971a9cce36bb48ebbf5219297995b4 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 20:33:03 +0000 Message-Id: <69864fff.40d8c.6b2e1ef@gitrepo.freebsd.org> The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=21dd554d16971a9cce36bb48ebbf5219297995b4 commit 21dd554d16971a9cce36bb48ebbf5219297995b4 Author: Cheng Cui AuthorDate: 2026-02-06 14:43:41 +0000 Commit: Cheng Cui CommitDate: 2026-02-06 20:31:11 +0000 igb: remove M_HASHTYPE when RSS is not enabled manually cherry-pick efcc0423d80e Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D55143 --- sys/dev/e1000/igb_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c index 46fe5c741055..e01bc72cdc55 100644 --- a/sys/dev/e1000/igb_txrx.c +++ b/sys/dev/e1000/igb_txrx.c @@ -573,6 +573,6 @@ igb_determine_rsstype(uint16_t pkt_info) case E1000_RXDADV_RSSTYPE_IPV6_TCP_EX: return M_HASHTYPE_RSS_TCP_IPV6_EX; default: - return M_HASHTYPE_OPAQUE; + return M_HASHTYPE_NONE; } } From nobody Fri Feb 6 20:52:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f75ql5tL3z6FcLT for ; Fri, 06 Feb 2026 20:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f75ql5C68z3ntF for ; Fri, 06 Feb 2026 20:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770411123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQsRRxtaxNndRmomoWS/pO2wOgxAwLYEjNM4e6Th8LE=; b=uxidZVg1ibkC9kQEtRedlbua3nlHzosYKImZqzwf6a0Z7SEytIOiGTzuh9jJAm3YXI6D0x Kn8axmb66DANWPmUKOzi8sRzBo5bwC9oAfqkCegW259dpXfevczfPg7FKunyVlaDXQ31ot WHiHM59vC9MplLthLT7ZhFv/emwM8KVz/u5Km3XBlsVVL9nnP8mkziQROIrIV7KuYwUQ8Q IJwFWw5nunGp0tFmeP3KQQ+KpfMCx22bKrfC/QjwpyJpMPZ7/LV4Y0/tFb7U8jPr8FBVvR VetDeW/q+HqV05Sa0vvFP3jv8cGZTy/aFREhUnctxR0n0/7dlftEPseVd1610Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770411123; a=rsa-sha256; cv=none; b=HdWF1Kpoo3a/h7EpzN8oAyUID3in0SpYI3C2A0wJGTVRDHLXP8At/aZmAdPmOflxIHihE+ bfPlSUThNiT1htMsCtmXbPvqULOqO848oI4S2SRFbAPYZJETMk63k3CBqilL+Sh+dQivRq CmqvfI39ebHmQEIecykOYlUCDubm2Zjf55iz98EqNPcHsWzQYslpvJCB5TlRho5Jp1Hr3f 59NaTq7YOa3DUTKt8jiqjW3BauQSbKUdkkupdT5kadNf334uhLdTdEhr2Uk+/l9aQBH8/q fA1l6xjJW8K3bR7+W6BwSXjWoK4WgWhR24rK0clZ1G7w3XJUGA28EQvPQG/qaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770411123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQsRRxtaxNndRmomoWS/pO2wOgxAwLYEjNM4e6Th8LE=; b=owjbkB5ik5I8bDARIQfmrWMoFFpgkn2Xezfltyp1270ietexZn7BOhWriR21bFzqNSH/bB or4dcoYFGb2dEJm5RqMtaSz8+/WStivW5umm90NBdf4Eyw4+4AbEptpbG0AwTX4sFbHpLa WAl6/brHDGRKNa/gEfAvjT4vD33t2aKj1SdE7BVuyVA21TFHgP+KADKUujQ81RSCY5nMS4 Vdf3tfPLnj2G00CJqdm44aBrTJediiMTvc7pfxz6WrrfSXXqvxAZkOKf965a0VuvZSBIhD ZuooY/njMe4mpDnkzFlnZivMocgBlz6EwMQWZ893eLYyTstgWsgtEi4yb7wTPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f75ql4hRdzWXS for ; Fri, 06 Feb 2026 20:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42806 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 20:52:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: bfd50a32ff26 - main - sys/sysctl.h: Add missing include List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfd50a32ff26067552220c6f08e6025be3603962 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 20:52:03 +0000 Message-Id: <69865473.42806.5c304cf@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bfd50a32ff26067552220c6f08e6025be3603962 commit bfd50a32ff26067552220c6f08e6025be3603962 Author: Olivier Certner AuthorDate: 2026-02-06 20:46:48 +0000 Commit: Olivier Certner CommitDate: 2026-02-06 20:51:21 +0000 sys/sysctl.h: Add missing include Hopefully, 'sys/sysctl.h' is really self-contained now. This fixes the GENERIC-NODEBUG compilation error in 'hwpstate_common.c' after commit 804329587508 (see below). Fixes: 1a446f765d9c ("sys/sysctl.h: Make it self-contained when included from the kernel") Fixes: 804329587508 ("hwpstate{_amd,intel}(4): Move common knobs to a separate file") Sponsored by: The FreeBSD Foundation --- sys/sys/sysctl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 139b4bc5d9da..273dd2a71d30 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -38,6 +38,7 @@ #ifdef _KERNEL #include #include +#include #include #include #endif From nobody Fri Feb 6 20:55:57 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f75wR5NBSz6FcbP; Fri, 06 Feb 2026 20:56:07 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f75wR4YXWz3p6C; Fri, 06 Feb 2026 20:56:07 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770411367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+1UKNkl1JiF8bDwFXr0EL5U3S4deQBhcByzL+RT1UXQ=; b=I0NHBGq7OtQDv5kAWjQqevb8sKDSW6ZwQp+Pvpa/gHs9qidW1tAvQi2ulIRiMPzMtx2taC /ysPJQqMOEgg1UiNXNn2V/WSS+X1LXJBYHRcsrnQiQ5tkdl7RptODnvYAzly9TgChERCtc yRc0LH1DsgQxMENc8jd9yk5K+TuLrk0JHxDqJcEqZJod1chUWLCcTXS/0RNi3iaappJQPb CCoMqrWtbQFdkW4A9fBI+RYBqYDtzOkWoALXMOY6WBxRZnWQ98aw9plxgPzkvys1Twx4tO 9y2jZhnvkyStdTR6LFye1A2rxagHlRZgwPfxA5j4yRkbUoXI0Utq3OttvCkaFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770411367; a=rsa-sha256; cv=none; b=kp/fS66MhWqD/XVlJfgPN/lt4WDVLbVQg/d/BwetFn9EPZTrlkrnyyvt/U5yQQETYx0one JZ0H14KNds83td7+HVQMHlmEkoRF8RyTwvcAqNTlwP2T6krqkIOiMeTq8kSuyWgIN7c+TV 3a8TvqvxX1o+wYUg0TjIM7P56+FUu72pkZDeFTLOltB1iH6CU44pIRszG6FsUc7tGdqwYM gYVCH7+lbsMdvfoNOLgIDpGOVX+9moWcKjyKzgdQURpHtRAq6Kuj57G9iorfu2q1fGpvIl fTL49iTy8crf8sFvZA40LqviVz4Mz9TPpEQK/ne2DqFGG7mouiZ3n9AaGboClg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770411367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+1UKNkl1JiF8bDwFXr0EL5U3S4deQBhcByzL+RT1UXQ=; b=S05jQBLmGbKutx0saKeGHCWCDkcXQ4Q4WQllOBBD7Panl2PrDQISu3lcWhAZZx4OHOQSTm QTk61Vi9nfBjCtHFrUZxKhKzI6f5xo0AxKQ6cX7tOtxZhlgZH05rR2nHyjyvY0BWsk/F2R K5iGdflHj0Bd6WZT6KWscKrG6JX6aairHPHByIDNX9WLmOGQYbyVLyua27NI0i7TF08ZG4 34mkb7mKOtUu3vUzzhGPoW6B+20SEDoDb8JrigI77Hrwcv3B/FIZMAV/FqRDed52hmdHJY jUlpz6Ne5w0YDC+Tte0gz13+sozdZEtp0Om8VjFymhVdukl2Gggkke2GovbRjw== Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f75wR0WvszQYQ; Fri, 06 Feb 2026 20:56:06 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: src-committers@freebsd.org Cc: dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 804329587508 - main - hwpstate{_amd,intel}(4): Move common knobs to a separate file Date: Fri, 06 Feb 2026 21:55:57 +0100 Message-ID: <29561707.QdLYigECfs@ravel> In-Reply-To: <1942282.183gH74vGi@ravel> References: <69861577.1d172.fd5fa27@gitrepo.freebsd.org> <20260206195430.50c28a04@thor.sb211.local> <1942282.183gH74vGi@ravel> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3327331.VPuetLRq1i"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart3327331.VPuetLRq1i Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: src-committers@freebsd.org Cc: dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Date: Fri, 06 Feb 2026 21:55:57 +0100 Message-ID: <29561707.QdLYigECfs@ravel> In-Reply-To: <1942282.183gH74vGi@ravel> MIME-Version: 1.0 Fixed in bfd50a32ff26 ("sys/sysctl.h: Add missing include"). -- Olivier Certner --nextPart3327331.VPuetLRq1i Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmmGVV0ACgkQjKEwQJce Jick6w//QydduEWfiCafHeU/zPE83Mrlf2irg1qwRJkAHzEbt5FN2gjRzzpmbjT7 iN3V/fXeMvrCFs0zUpIO9eIKr4dInbsWeAfZuTmmXj3bkCEcKDsM8f8niDrCEhD5 nCMKV5dUOJ2/+HWP4mifUPhb0Md1AQZB7k1zQeoUMM1zCOa5m8nHiPI68Xu9jDT3 AYLuryox/UrtKBGzjnBEtR9GVkmFHqMcXVF1VCQ9MPoCkBIvIZ3b7qEmD/nQ5oTu ZxK/t/3eeozAl0XG0UsiTlL2jU9qGQaflI1wBv/jsJM4Mm/xv45+0gH3cjypjjpV mFpA+S5dyF0MN35nL6xDJHpewF+7SWetruUh+1Nn3iYKCEwC8kYAtTMyAFVWwCuq aTli6LQHZJxBqCG9wP7pwZ9pu6t/s6NObHd8MvrAja4XUVtzf0cYs18AXklLBq33 PkRf8JmVJDd0eo3FJh3rfNR/nwjZSlOsoiDnlpFSSsQRRLyP7lp36ZlmBYZ/Gvyl sRJIN2zvIISpnnbx1k929a9O4reSVh3RtjgzAIpkpyGfUmFYblUPXuvRsH5J6619 JLB2rvhauVA+PN9erYHVgwx1T/cPWGCB2WHWw+f/0922ueckjpgejCPav4SsnmYM rUHt8430uaO8DM9EBu/doat7iRKV7Nk5vNgIEWj5PiHigxOO5j0= =CDDC -----END PGP SIGNATURE----- --nextPart3327331.VPuetLRq1i-- From nobody Fri Feb 6 21:05:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f767N0N7Fz6QX9V for ; Fri, 06 Feb 2026 21:05: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f767M4M9Rz3rQp for ; Fri, 06 Feb 2026 21:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770411935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mFyQw2FwpRzwyx83TPCuuF4y8eFUL3rpCkZ7fMVBC18=; b=xAaZZayog8joN2rmkIr8f2ZxjDpVNICg02OKNW9OST2n1P5Nf4t7SVnLhnDeiwO0NwMdUy 6FckcEVjtJ1gI+FdxhEMDKR3c85l3v/HaVhvbTqFxv9MPCXjvcbqA593mj8eXa7wgIbCGi x6ZZdFgsEdUMdwclBHesYVnCgviEZzLSerT8KmgDS12dg2YXk9FGSVSkwTlSNFVoeDiVbK Rs2Apbvraa/7a9+F5TK6bU+Wxm+bDX61zGmPIGzZ6XrzZgfmQNN7aVZiq0tIBtQmVApP+N diGtbptqQ9F76DkeaBhxCY7VR+d9qgp9Lh5RJDbb8H/vHEmsFGnPfJ0gXeKjWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770411935; a=rsa-sha256; cv=none; b=OOn78scDXhuzjjbgY1rPuh+tpwmJslNXMn4TCCLcg2j3sND+xUmXUA+2e/OjZQWAP2Dmdj XoKIJ0YH5vFJkTNqCPzhRnxZ9HOYsPEkxXsccKAb0kdo+ASkPO031xZRtyq2hQABbhRW15 m5I0nCEV4YV7AMcoFg4zl1nRHSfcZlkkMasmujEWKH9GxBJJA6vYclRj+JNsxq69nfrR5l LYUCbM0XH/ofl8D185991zPOLCi/T/nqU+tiBUP34v1g1BSL849dH2qPTqcaAoXrmM0R2S vQKNv0O8aiiGoWTda20ui3Bj4eChoAUxsdh64cy3XC9wp7lk+a4eeSSKlM2peg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770411935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mFyQw2FwpRzwyx83TPCuuF4y8eFUL3rpCkZ7fMVBC18=; b=MtGLkvpp5Sa8GGOzzmGW61Dd63A5yK0SO8rTJ8+mlAW59cVaLH3U0yyirNTJGnOJgcHoP4 r3oqwzLip5vhjT8cTKtXFjz4bf+0vkZb70on5UQh3KINuGqDNXeGCVkO0Jol3p32n913OX hH/LO9fRQL7sVkVtBgQKL5kyoH+u6Mlfo+aTwOOpE/tiDrq/L3yHpP7cSDH12vOE53YPwD d5rdNRtJQX5C3ZydWm6mQQqwvFVNh7JfRCjwZGrTHf2PZSLMSWISYTwTn73ZzSYxblZT+i pml/PPGmMY79qxGyBFg55HsCxzv0Xw9lVo8GO6LgMkilPItDaZH9vG/MAvw3lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f767M3GQ8zXdx for ; Fri, 06 Feb 2026 21:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42e65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 21:05:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 18721be35604 - main - release: Turn off debugging in pkg(8) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18721be356043f6749a6e2470bc9f7351c450c6e Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 21:05:35 +0000 Message-Id: <6986579f.42e65.4efa4e49@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=18721be356043f6749a6e2470bc9f7351c450c6e commit 18721be356043f6749a6e2470bc9f7351c450c6e Author: Colin Percival AuthorDate: 2026-02-06 21:03:11 +0000 Commit: Colin Percival CommitDate: 2026-02-06 21:05:26 +0000 release: Turn off debugging in pkg(8) Running `pkg -d` in pkg-stage.sh results in multiple GB of network traffic being written into the log files, which is less than helpful when it comes to tracking down build failures. Remove the -d flag. MFC after: 5 days X-MFC-note: The code in 15 has diverged from 14, but the flag is there, just in a different place. --- release/scripts/pkg-stage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 00b83d9c51f0..5c4ec76150da 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -59,7 +59,7 @@ while getopts N opt; do esac done -PKG_ARGS="-d --rootdir ${ROOTDIR}" +PKG_ARGS="--rootdir ${ROOTDIR}" PKG_ARGS="$PKG_ARGS -o INSTALL_AS_USER=1" PKGCMD="/usr/sbin/pkg ${PKG_ARGS}" From nobody Sat Feb 7 00:58:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHx34Vbz6Qrr9 for ; Sat, 07 Feb 2026 00:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CHx2JRTz3LxF for ; Sat, 07 Feb 2026 00:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6aIiNd28tU7gs79iT2w8mgmjvdSFX2Vfxl49hzAZIuI=; b=kYSjDRq2fvA6wl1A4oE/eI886dQVA8WZfyNIeYw9lZlmbs2qMy5E+mcEuVh/7AAR0GBJtT ihtC5ELlq5CpiedRSBObB0Rnima46IGKltMpoZnMeK/O5zNdad4650fAAZAcqxMLXyzai6 7W++V3XXFte6Re5qac0ctYQxoXZESzy2pZEOGMX8FXNLE7IoKwLTR7TP3i/tbmfui+1RHI 7ngtWetIC6L4MKKlPkQlmhFHk4qszuR1GHqKfJPuiG+LelJzHLvBl2ONz4qRYI5LpkDhui sSR8A8FUH11U+taYD+YWEwV8Y2p3CKol9FpjhMwg7FOWtWmxOULQ1G5o9A0kpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425901; a=rsa-sha256; cv=none; b=huwFcch4hF4+WgFCBIx828b5ygiOBZj8kQACZSD6aoGGq5CWEJx3MXy7pvlp7fClyvYu2r Tbeg2DHCrkYQYwQqZqAY55eZeHdWTDv0OQ50AQxAF7h/PlIHmAuyhXh05ynTIirIE0vKcN jnFYcsUunu6L7w0bIj2qasosjWpP8lA7Uo45cgUdCud1NlqdtaGezReL+QZnA31xo3H9pD LTdaC8FjjWuxcufIMpOTbYjR/G06rU4Oawew56sx1ergS32GE3KujmuVg2G7Fv6ZbtXefh 2j1CcarUi5wUfPdFnQ4xh3aYaC6TaAuaKOWwOOePaVN980a2+ibrUp+w80k4Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6aIiNd28tU7gs79iT2w8mgmjvdSFX2Vfxl49hzAZIuI=; b=Z7/U1ndh5akZehBGuJ8dVq8xH+qhuwoh3seHVRe3DT2D8y5oRPXnzE2FoO/O08WkbQO29q WwAPslAULG6hd4i8SZ7w155wRB4tGbuMVFpOL+2BMBi4QbtSHUwg+tlt/F6nSjKp12oMDZ tYkwRRIkjWkGlzKSU7bYEF2PPo1OGDrLcB91+WyA9HOHOOgEeY2CxlRueDxRi1HPCMuTtS KhGFbz+Ri9kY8gW15XISSr3tB+madlqSmTYlAy/by/PU9TvrpUqJ3KQZzRoC5kY78emHcc ekDBl44fb7QdWiOIVdhtCzk8bA8IVH9ilcn5rIZMS06/6m8rY9FE8mdwDXyjUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHx1d1kzgGn for ; Sat, 07 Feb 2026 00:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 323e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 201fc8a55a48 - main - mt76: sort bus attachments in module Makefiles for pci and usb List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 201fc8a55a4832174b5943e17ac90800aebe5772 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:21 +0000 Message-Id: <69868e2d.323e5.1406dd34@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=201fc8a55a4832174b5943e17ac90800aebe5772 commit 201fc8a55a4832174b5943e17ac90800aebe5772 Author: Bjoern A. Zeeb AuthorDate: 2026-02-02 01:23:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:50 +0000 mt76: sort bus attachments in module Makefiles for pci and usb With PCI enabled and USB still disabled add knobs to (i) enabled them manually in the common Makefile.inc and (ii) add bus attachment depend knobs where needed to enable them in individual drivers. For now the focus is in 7921 and 7925. Sponsored by: The FreeBSD Foundation MFC atfer: 3 days --- sys/modules/mt76/Makefile.inc | 6 ++++++ sys/modules/mt76/core/Makefile | 7 +++++++ sys/modules/mt76/mt7921/Makefile | 18 +++++++++++++----- sys/modules/mt76/mt7925/Makefile | 12 +++++++++--- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index e4369564237e..739c85c60dac 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -4,6 +4,12 @@ COMMONDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76 .PATH: ${COMMONDIR} +# Bus attachments. +WITH_PCI= 1 +WITH_USB= 0 +WITH_SDIO= 0 + +# Options. WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 WITH_SOC_WED= 0 diff --git a/sys/modules/mt76/core/Makefile b/sys/modules/mt76/core/Makefile index c782bf218d93..589063a23229 100644 --- a/sys/modules/mt76/core/Makefile +++ b/sys/modules/mt76/core/Makefile @@ -1,3 +1,5 @@ +.include + KMOD= mt76_core # Basic stuff. @@ -6,10 +8,15 @@ SRCS+= channel.c scan.c wed.c #SRCS+= trace.c # Bus stuff. +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c +.endif + .if defined(WITH_USB) && ${WITH_USB} > 0 SRCS+= usb.c # usb_trace.c .endif + #SRCS+= sdio.c sdio_txrx.c # Connac-Lib stuff. diff --git a/sys/modules/mt76/mt7921/Makefile b/sys/modules/mt76/mt7921/Makefile index d3f201997a2d..1b53df04357c 100644 --- a/sys/modules/mt76/mt7921/Makefile +++ b/sys/modules/mt76/mt7921/Makefile @@ -1,3 +1,5 @@ +.include + DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7921 .PATH: ${DEVDIR} @@ -7,14 +9,20 @@ KMOD= if_mt7921 # Common stuff. SRCS= init.c main.c mac.c mcu.c -# PCI stuff. +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c pci_mac.c pci_mcu.c +.endif -# USB stuff. -#SRCS+= usb.c +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +.endif -# SDIO stuff. -#SRCS+= sdio.c sdio_mac.c sdio_mcu.c +# SDIO parts; SDIO depends on an MMCCAM kernel. +.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} +SRCS+= sdio.c sdio_mac.c sdio_mcu.c +.endif .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 SRCS+= debugfs.c diff --git a/sys/modules/mt76/mt7925/Makefile b/sys/modules/mt76/mt7925/Makefile index dc6de5085d77..ee79f09dba1c 100644 --- a/sys/modules/mt76/mt7925/Makefile +++ b/sys/modules/mt76/mt7925/Makefile @@ -1,3 +1,5 @@ +.include + DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7925 .PATH: ${DEVDIR} @@ -7,11 +9,15 @@ KMOD= if_mt7925 # Common stuff. SRCS= init.c main.c mac.c mcu.c regd.c -# PCI stuff. +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c pci_mac.c pci_mcu.c +.endif -# USB stuff. -#SRCS+= usb.c +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +.endif .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 SRCS+= debugfs.c From nobody Sat Feb 7 00:58:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHy2h2xz6Qs09 for ; Sat, 07 Feb 2026 00:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CHy1pFnz3LWn for ; Sat, 07 Feb 2026 00:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3D2Li44Wd3f7MNscEgoKX/CCA/IIFLRSh0BLQ0Clj+k=; b=mKlCW34RnvjGcJvuVC6q1/3vj+cjLUDbYMd2qPjRa1K/mg0UQVFOkalTmTv+4VR8b152rr xx07fd4oxepp/ecBpf+KYv/leU8cWYWYr5IX3uCyOnYevbgAM0gq9CvRLupxWG+yTcmuMM p6oBL8Rme0v4wLPGDFeVx77E3vODTo6pQG18/qWrOxeZtPC/abPnvLRZcK0dB81CJxi/fP AKXJctNY5k+S5PvYtds2uOH9VMpdHaImNYjbQ4hKmJJpWVcJQ88xIsiIK8/IUaF5SXXLNd EVdlvRn8yrzRP6B0l/NT6W2ssyDG7A7gvYKQ7odYZeFksBkib0C8Bq2Nb9zsfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425902; a=rsa-sha256; cv=none; b=MWYPHWme+8a3CO0MBQ1Fz70lj6mJTea4w5KfFPqms+8W49Uqwotnk0bF0uUjrtBQUxfs7s 51YNs0qQl/2gcAxXPp8fUhYPEw5pYjzoRqCoL862RldUdXn4NiZaIhdANfZluCh25pY1ye UykZPPibJD/KjsJBhD5QUGSbj7xTtQOWZWxys2sy6M+jJBAd1Z3iT1RkpydLv4KHgCVAhm 9T2PF6L3IVlvbt8Jk9Ry1hJ/YLXlyvniadsnqWbh7lJGJUXUmdkUVCjyTHwuAJBEchC0vl dqwei9zmusXgzEPU5UsysSTZiXB4ia4FCrAWxWEjKrLRglmq55Ac6Byh9BCrIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3D2Li44Wd3f7MNscEgoKX/CCA/IIFLRSh0BLQ0Clj+k=; b=GuVa8CSt+MlSFUKtRZJxzf2KFd/jH6wHaWUOUziN3EPEb4zah0ouM8YdUiH5MAcPXykoA0 BKw5JzoE73EYiXsS75EZd9cwJJztZ+3HNE2dGnoXn6MJeerPJgDE8RKzvVyJ+DX6fWtWPF reYYFOvOkqvkZX+4puNIl6jIvw/e49VvNyIoH0mWUH5b+YoYj2Ee0lz1Tz2YX49KhPLf1X uNuegQ30gdQgtKsmrJFusEn3giy83cn2jr6MtFM7RAAOZVSz+USF6qRp2Wap3iFylTVxc6 vxq9BdociMKOjFiv28GOyiAiqBZu7QdR8Os3N+Y6m7iA+v7OEg1ww+kt3CuJHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHy1Mh9zfcc for ; Sat, 07 Feb 2026 00:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32d2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 03f6b1fd6af0 - main - mt76: module Makefiles fix .PATH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03f6b1fd6af0bb43f74b38d8b5373f5485da0e8f Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:22 +0000 Message-Id: <69868e2e.32d2d.1d493846@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=03f6b1fd6af0bb43f74b38d8b5373f5485da0e8f commit 03f6b1fd6af0bb43f74b38d8b5373f5485da0e8f Author: Bjoern A. Zeeb AuthorDate: 2026-02-03 18:26:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:51 +0000 mt76: module Makefiles fix .PATH The common Makefile.inc had the .PATH set for the common code. That .PATH is only needed for the mt76_core module, which shares code for all other drivers. We leave the COMMONDIR variable defined in Makefile.inc as we need it for CFLAGS+= -I for each driver but migrate the .PATH to avoid drivers picking up the wrong files. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/mt76/Makefile.inc | 2 -- sys/modules/mt76/core/Makefile | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index 739c85c60dac..41b18651e985 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -2,8 +2,6 @@ COMMONDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76 -.PATH: ${COMMONDIR} - # Bus attachments. WITH_PCI= 1 WITH_USB= 0 diff --git a/sys/modules/mt76/core/Makefile b/sys/modules/mt76/core/Makefile index 589063a23229..f2aec9dfcf4c 100644 --- a/sys/modules/mt76/core/Makefile +++ b/sys/modules/mt76/core/Makefile @@ -1,5 +1,7 @@ .include +.PATH: ${COMMONDIR} + KMOD= mt76_core # Basic stuff. From nobody Sat Feb 7 00:58:23 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHz4WgTz6QrRt for ; Sat, 07 Feb 2026 00:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CHz2myTz3Lm9 for ; Sat, 07 Feb 2026 00:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDoaSgHUzaeGJt+Sga94JYVkhUZLe1mvoQ8gfW4Veck=; b=V/+xPomSZurOYkQC15mwg6qLOepCnBDOdxudKLsFQeiz6oC4bGvfvPU9WlCqB0gQjZXH8+ +03muZ4xUrDpeezzy3O7mEIYBQ/ihkP1BZcySUSQlO1DbEEuRbaDbxkjFeeL5Yq3hr3x3o 30VfaCkSsNGSFs8LzDfUtVgMTWXeqbFCxciqtJPRGacLIYP/HpV+9GX/63qfHhN1p6ZLrA pgP8KfhATLXxk8a1o5NmvNnsOH71rYUhE+NXeFjOmyORIuhfkd2Ttuowx9EHZbsC0PBsvQ emildFYffjSgz5qwIJZlg0o0eVtTw8k586MIwrd1jm2ctrTZxBs9P51QIOLqcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425903; a=rsa-sha256; cv=none; b=GTq+nVpnb2+MAL1tu6WoWgbKolwM4cihU79xyfkJ00167frRFQiJuioiM430jj7+CpLx+T elM4Hqnume2LkyVF9XoHBX+iud5aBhOAPjrUx46s8xBOVud8DhRaDJsn+QK7TeRW+LKuE6 /G716qzbqTtjXI9hrW/WDDM19JziPw0SyVDlkVq1GLvEboqgUtD6IvsWNsid2j6Liz3eY+ urMZ8sEtxZzwYA2z4feuCfqxwWhYGyunJKy7YX1s+kKaI7JGn+WXAxdeBrf2QL7Q1rLpNS XYkqDsPQJssggY/OT/b7VN9vQlIJfluJLM69GwkkgVDXO6H0Pu/S1tIw604oLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDoaSgHUzaeGJt+Sga94JYVkhUZLe1mvoQ8gfW4Veck=; b=dUNlXqBK+q41G8ViKmHZlOKqdCH/CtmNwK9ifRC9i6Ek4mNnPlAJjP+0LPRBaYnttKGW09 KOP22VJ98tmjbCzQ5LaI0mrmBmi/Rkn3mVNJeoV8vYs5ooQwWGN2ywxi/M4K4KyL76zHr1 JHmmLWREPHYnnlczutydiBfzKjud+6Mxc8E+pNnFJZUG5C72w3xgHcIo/WlOVTDdUzvLE1 rd37UFhlY0f8WtLcoQcTatjeHMcJ8g+KBNVEH1c6fy5YPTnxV6nks9JOTVclItrXPez+kX NymLrxzsiE6GiGzelDjR0FQ0gcSQJEU5XZWQo5v1PEAQO9RJk3VaqE+yvIPoWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHz28Kyzg1p for ; Sat, 07 Feb 2026 00:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34978 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b129f79a8985 - main - mt76: sort out MODULE_DEPEND for PCI and USB List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b129f79a8985a92cd061afa4ee31311cfe31d285 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:23 +0000 Message-Id: <69868e2f.34978.34f0a549@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b129f79a8985a92cd061afa4ee31311cfe31d285 commit b129f79a8985a92cd061afa4ee31311cfe31d285 Author: Bjoern A. Zeeb AuthorDate: 2026-02-02 01:24:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:51 +0000 mt76: sort out MODULE_DEPEND for PCI and USB It is not enough to depend on mt76_core which then depends on linuxkpi and linuxkpi_wlan. Given each mt76 driver is its own module, each also needs to depend on these linuxkpi modules. In addition the core module usb part also has to depend on linuxkpi_usb. This in addition to the previously sorted PCI drivers, allows (or will allow) the individual chipsets (drivers) to load on systems with USB, if compiled in, as well. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/mediatek/mt76/mt7615/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/usb.c | 7 +++++++ sys/contrib/dev/mediatek/mt76/mt7925/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7925/usb.c | 7 +++++++ sys/contrib/dev/mediatek/mt76/mt7996/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/usb.c | 3 +++ 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/sys/contrib/dev/mediatek/mt76/mt7615/pci.c b/sys/contrib/dev/mediatek/mt76/mt7615/pci.c index fe181d269419..ae701dc7d9c3 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7615/pci.c +++ b/sys/contrib/dev/mediatek/mt76/mt7615/pci.c @@ -206,7 +206,7 @@ MODULE_FIRMWARE(MT7663_FIRMWARE_N9); MODULE_FIRMWARE(MT7663_ROM_PATCH); #if defined(__FreeBSD__) MODULE_VERSION(mt7615_pci, 1); +MODULE_DEPEND(mt7615_pci, mt76_core, 1, 1, 1); MODULE_DEPEND(mt7615_pci, linuxkpi, 1, 1, 1); MODULE_DEPEND(mt7615_pci, linuxkpi_wlan, 1, 1, 1); -MODULE_DEPEND(mt7615_pci, mt76_core, 1, 1, 1); #endif diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/pci.c b/sys/contrib/dev/mediatek/mt76/mt7915/pci.c index 4e94a137c077..2eb2b7079057 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/pci.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/pci.c @@ -266,7 +266,7 @@ MODULE_FIRMWARE(MT7916_FIRMWARE_WM); MODULE_FIRMWARE(MT7916_ROM_PATCH); #if defined(__FreeBSD__) MODULE_VERSION(mt7915_pci, 1); +MODULE_DEPEND(mt7915_pci, mt76_core, 1, 1, 1); MODULE_DEPEND(mt7915_pci, linuxkpi, 1, 1, 1); MODULE_DEPEND(mt7915_pci, linuxkpi_wlan, 1, 1, 1); -MODULE_DEPEND(mt7915_pci, mt76_core, 1, 1, 1); #endif diff --git a/sys/contrib/dev/mediatek/mt76/mt7921/pci.c b/sys/contrib/dev/mediatek/mt76/mt7921/pci.c index 30660837077f..46b59c4d0390 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7921/pci.c +++ b/sys/contrib/dev/mediatek/mt76/mt7921/pci.c @@ -595,7 +595,7 @@ MODULE_DESCRIPTION("MediaTek MT7921E (PCIe) wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); #if defined(__FreeBSD__) MODULE_VERSION(mt7921_pci, 1); +MODULE_DEPEND(mt7921_pci, mt76_core, 1, 1, 1); MODULE_DEPEND(mt7921_pci, linuxkpi, 1, 1, 1); MODULE_DEPEND(mt7921_pci, linuxkpi_wlan, 1, 1, 1); -MODULE_DEPEND(mt7921_pci, mt76_core, 1, 1, 1); #endif diff --git a/sys/contrib/dev/mediatek/mt76/mt7921/usb.c b/sys/contrib/dev/mediatek/mt76/mt7921/usb.c index 17057e68bf21..64881ef7cbf4 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7921/usb.c +++ b/sys/contrib/dev/mediatek/mt76/mt7921/usb.c @@ -346,3 +346,10 @@ module_usb_driver(mt7921u_driver); MODULE_DESCRIPTION("MediaTek MT7921U (USB) wireless driver"); MODULE_AUTHOR("Lorenzo Bianconi "); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_VERSION(mt7921_usb, 1); +MODULE_DEPEND(mt7921_usb, mt76_core, 1, 1, 1); +MODULE_DEPEND(mt7921_usb, linuxkpi, 1, 1, 1); +MODULE_DEPEND(mt7921_usb, linuxkpi_wlan, 1, 1, 1); +MODULE_DEPEND(mt7921_usb, linuxkpi_usb, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/pci.c b/sys/contrib/dev/mediatek/mt76/mt7925/pci.c index 021f431c9ded..d57e1aacf112 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7925/pci.c +++ b/sys/contrib/dev/mediatek/mt76/mt7925/pci.c @@ -651,7 +651,7 @@ MODULE_DESCRIPTION("MediaTek MT7925E (PCIe) wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); #if defined(__FreeBSD__) MODULE_VERSION(mt7925_pci, 1); +MODULE_DEPEND(mt7925_pci, mt76_core, 1, 1, 1); MODULE_DEPEND(mt7925_pci, linuxkpi, 1, 1, 1); MODULE_DEPEND(mt7925_pci, linuxkpi_wlan, 1, 1, 1); -MODULE_DEPEND(mt7925_pci, mt76_core, 1, 1, 1); #endif diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/usb.c b/sys/contrib/dev/mediatek/mt76/mt7925/usb.c index d9968f03856d..437c073d6a5b 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7925/usb.c +++ b/sys/contrib/dev/mediatek/mt76/mt7925/usb.c @@ -344,3 +344,10 @@ module_usb_driver(mt7925u_driver); MODULE_AUTHOR("Lorenzo Bianconi "); MODULE_DESCRIPTION("MediaTek MT7925U (USB) wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_VERSION(mt7925_usb, 1); +MODULE_DEPEND(mt7925_usb, mt76_core, 1, 1, 1); +MODULE_DEPEND(mt7925_usb, linuxkpi, 1, 1, 1); +MODULE_DEPEND(mt7925_usb, linuxkpi_wlan, 1, 1, 1); +MODULE_DEPEND(mt7925_usb, linuxkpi_usb, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/pci.c b/sys/contrib/dev/mediatek/mt76/mt7996/pci.c index 241599dcbc72..5ca3b0819acb 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7996/pci.c +++ b/sys/contrib/dev/mediatek/mt76/mt7996/pci.c @@ -287,7 +287,7 @@ MODULE_FIRMWARE(MT7990_FIRMWARE_WM); MODULE_FIRMWARE(MT7990_ROM_PATCH); #if defined(__FreeBSD__) MODULE_VERSION(mt7996_pci, 1); +MODULE_DEPEND(mt7996_pci, mt76_core, 1, 1, 1); MODULE_DEPEND(mt7996_pci, linuxkpi, 1, 1, 1); MODULE_DEPEND(mt7996_pci, linuxkpi_wlan, 1, 1, 1); -MODULE_DEPEND(mt7996_pci, mt76_core, 1, 1, 1); #endif diff --git a/sys/contrib/dev/mediatek/mt76/usb.c b/sys/contrib/dev/mediatek/mt76/usb.c index 67c976bb9c22..b0d04a465f35 100644 --- a/sys/contrib/dev/mediatek/mt76/usb.c +++ b/sys/contrib/dev/mediatek/mt76/usb.c @@ -1141,3 +1141,6 @@ EXPORT_SYMBOL_GPL(mt76u_init); MODULE_AUTHOR("Lorenzo Bianconi "); MODULE_DESCRIPTION("MediaTek MT76x USB helpers"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_DEPEND(mt76_core, linuxkpi_usb, 1, 1, 1); +#endif From nobody Sat Feb 7 00:58:24 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ11M1dz6Qs0d for ; Sat, 07 Feb 2026 00:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CJ04Lfwz3LgB for ; Sat, 07 Feb 2026 00:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAR5TaEnmlupt+ZpmAy5wIHhqFy/O5YBLAWu5rKiUyY=; b=AiXnqA49SMT7jNY5feeLDz/yJpMJzrr9yrQfdSRVHmhvBc+LtOVsrjXSaKekrBdb/PUgLZ O6Bl8CKv9+4iW6l7FJ9Sm0NOCs90onEu+oIgbdvPtS2lqiaa3d+5Qzw1lE0nbRJoG5V1tj Hb1Xahc0r/6TM49bdGiJXF7iULCUjQPzhbZZ3W3+n+Luy8cAg+ouaeJlTe51uUc/OKIxnx PokJofhh6BCIZsGqvYehdK9KY5/X6JzlxItat26b9K0UBfSK2Dp5YqbcfreTc0fSozxWgT CthISKVGJnQ5Jnqxin5iyYlTCOYlQGjqcRb6W1mI43hnwYL7q0aIu9RQZTVbXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425904; a=rsa-sha256; cv=none; b=JN27IjpLK2Kq1Yk/uGbfzf/61d/BOzy8Sfaskjwnb/oNHysxlGaoouHCiNghNQnPXaPCdi u+6EeAbDZSDmqi/PgDoqwnxVkdZyzxpQF4UfK9rJ8cStSQOqNFPn+uCzdvr/aYPZEw+gaC 40bZKGNXxGQrWExDq9PalxBFlhGHEOEf6DyYa4eKmNPwuwEM6VcfzsdCY19qLdmq9VC57m g+DI19FlvEu9I5tnxiTzKuuq6N51d5pcat2M7zp8C6wlT1UgtcWa3gz6HQr542CQgelfLU GNRH3rRo/LN4cx52ziO9h0Pyx5BHxqHY0AT68ARy0F5GSRoAi/WlnOQq3zc5YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAR5TaEnmlupt+ZpmAy5wIHhqFy/O5YBLAWu5rKiUyY=; b=FxM2PW81OORN+fP6vzPC3Vxc7oGHISWH+hGVwB2Kri07a1JD9SW03SmVP14tpwGaWXX5Ee Lfp6D88W6xgXdxKZAN1csVlryx0AtBHEm5giKrpdZfHNnvoyfnAFIvk7zN5ZJ9kvQiKe1g 0eI4NR5YGgP9K3Jg0cypbj0yHkCXROtPZz1bjIbqk5jKi1PM0e6Q+4FWi36aZXcclGt+Qz dadnoQZCGON8zmKr9LFbDfVE1B1OrIZRah+vHVoFJ/n24acOkNpxp9+1EQYIA8rCkeQtCB BvH0qwo8p8AWVG90VWlxHDOUEQOP7fKpX8KiuteLJ18dbapVYhKqY1FPK0JXHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ02stQzgGp for ; Sat, 07 Feb 2026 00:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 642c8387647d - main - mt76: make USB compile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 642c8387647daabc2505497cdafef4d3ce82bbf2 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:24 +0000 Message-Id: <69868e30.31b6b.4625207a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=642c8387647daabc2505497cdafef4d3ce82bbf2 commit 642c8387647daabc2505497cdafef4d3ce82bbf2 Author: Bjoern A. Zeeb AuthorDate: 2026-02-03 18:25:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:51 +0000 mt76: make USB compile This is the mt76-specific changes to make the USB driver targets for 7921 and 7925 compile. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/mediatek/mt76/mt792x_usb.c | 3 +++ sys/contrib/dev/mediatek/mt76/usb.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/sys/contrib/dev/mediatek/mt76/mt792x_usb.c b/sys/contrib/dev/mediatek/mt76/mt792x_usb.c index 552808458138..05879ae232d2 100644 --- a/sys/contrib/dev/mediatek/mt76/mt792x_usb.c +++ b/sys/contrib/dev/mediatek/mt76/mt792x_usb.c @@ -7,6 +7,9 @@ #include #include #include +#if defined(__FreeBSD__) +#include +#endif #include "mt792x.h" #include "mt76_connac2_mac.h" diff --git a/sys/contrib/dev/mediatek/mt76/usb.c b/sys/contrib/dev/mediatek/mt76/usb.c index b0d04a465f35..e658334fe4e4 100644 --- a/sys/contrib/dev/mediatek/mt76/usb.c +++ b/sys/contrib/dev/mediatek/mt76/usb.c @@ -5,6 +5,8 @@ #if defined(__FreeBSD__) #define LINUXKPI_PARAM_PREFIX mt76_usb_ + +#include #endif #include @@ -474,7 +476,11 @@ mt76u_get_rx_entry_len(struct mt76_dev *dev, u8 *data, } static struct sk_buff * +#if defined(__linux__) mt76u_build_rx_skb(struct mt76_dev *dev, void *data, +#elif defined(__FreeBSD__) +mt76u_build_rx_skb(struct mt76_dev *dev, u8 *data, +#endif int len, int buf_size) { int head_room, drv_flags = dev->drv->drv_flags; @@ -495,7 +501,11 @@ mt76u_build_rx_skb(struct mt76_dev *dev, void *data, data += head_room + MT_SKB_HEAD_LEN; page = virt_to_head_page(data); skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, +#if defined(__linux__) page, data - page_address(page), +#elif defined(__FreeBSD__) + page, data - (u8 *)page_address(page), +#endif len - MT_SKB_HEAD_LEN, buf_size); return skb; From nobody Sat Feb 7 00:58:25 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ168Jcz6Qrts for ; Sat, 07 Feb 2026 00:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CJ13wbVz3M0m for ; Sat, 07 Feb 2026 00:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dj94WRkMqREFqufkI09R0pIFcSSUBjp7mFDYrwY/VWE=; b=b3TdvsKt293lqFU1yO21D6HBTkEaoYtLOtyJRi6OJhupnSuFVrtRnh5VBA7gpmxi5p/0+o IojKA8MBLnZRbgOh/q7b820wsOQaekQKAZP2afmV582v4864o3S9P5+4TU021S95IUppSm SiSzfpTepkuasSIR3ibsDduB6gCK4gxSk6gUZ6xHfY5TBXSPfgKHloKeNivTTInhUz0f7D D6hxP/JWLxr4Oi4Ea9Ka7mU95+QIf7yps6cHTNzsrkz03SOKvXuvQ9dw3eDed/e67xz6A6 odBap7eb7usm9M0rtdpMsQh1hJ7wQB/vUen3uU1jadRNe6WlvhXtVddSgYUzGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425905; a=rsa-sha256; cv=none; b=JgeGXY717uvfFTkb7uVSn+Oy0jHnPUzwMYRi4pP4OQsY8S0HH6SXUzAH7vQ5bSE0TUph5D UT27VSfxnIEdj/KPuy4Sm94kGAi105Q9mpjjHoB9OlxeUJ5NMeCdIV26i4EMiVuLsNxzP2 zwcMBIPgnB6plaIGPTknLRBCl3N6urPviQuTxA4yxxwBXsoVvRVLW5qrZkkeAiLyWjKG97 mxwZEd24ybXOfHhPlXB9ETYiYbg83ljocC1mwHkpudvf2OTAh6Gh7q1McYpeXeOJwd7tiR 6TzyCAEa4VCNVuaAsscRttoyl8IdC0qDSk52cGwDZquHMkys0VuCFhQKAtgtzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dj94WRkMqREFqufkI09R0pIFcSSUBjp7mFDYrwY/VWE=; b=tXGKOZAhXzW1SD7sJrS5mcYpUbdWwWq63MMBTZc1JJLDLrFzwUyTff2NKZnpCoPBQsEvEl oI3Y2s6DfsNIzTdPsZZf3pABoFzBM4z3leVFv9uadyt5iYNWAlChMIZ8wu9JEBxkS+f02d EQSgGV/MYoVRTbglYfnbxXijE+7enmvPJH4s5BGlOJxVCr0/Bu5wswq6oxfA1tRykFh3LQ yVZuN91j6zQSMbYOVXmsQMaCIP7Cxr46/ZpKRVYVJJHMJNd+JGe4xr7lVRn+AtsEAeZH2Z qtYu7kJx9O1qWQbXmGY50khJDE59ID6hX/1nhbk4U/oyd2yvvdaxOAnrkjULaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ13T13zfcf for ; Sat, 07 Feb 2026 00:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: bc820edd2d79 - main - mt76: mt7925: add missing LINUXKPI_PARAM_PREFIX List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc820edd2d7906e04e93aef8a6137991ad86f4cc Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:25 +0000 Message-Id: <69868e31.33c18.4c67936b@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bc820edd2d7906e04e93aef8a6137991ad86f4cc commit bc820edd2d7906e04e93aef8a6137991ad86f4cc Author: Bjoern A. Zeeb AuthorDate: 2026-02-04 22:20:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:51 +0000 mt76: mt7925: add missing LINUXKPI_PARAM_PREFIX There is a module_param_named() in the file so we need to set LINUXKPI_PARAM_PREFIX to get it a uniq sysctl name. mt7921 has the exact same option. Without their individual prefixes the names would clash on systems with both chipsets and not work for both. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/mediatek/mt76/mt7925/regd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/regd.c b/sys/contrib/dev/mediatek/mt76/mt7925/regd.c index 292087e882d1..73f6f93faf35 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7925/regd.c +++ b/sys/contrib/dev/mediatek/mt76/mt7925/regd.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* Copyright (C) 2025 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7925_ +#endif + #include "mt7925.h" #include "regd.h" #include "mcu.h" From nobody Sat Feb 7 00:58:26 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ26Bm9z6Qs1y for ; Sat, 07 Feb 2026 00:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CJ24h54z3M7X for ; Sat, 07 Feb 2026 00:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y26gC4B0idGd5ZnoSZm6wYRvkiv+vUKz7eErt0K1dBE=; b=Ph3sQIexHRhEIYTqWc97f4yhE7gJvaw4Lp6Fus0m8t3/eWepFQNa9Z7ECwFe31QsAak5W4 +NFO1DY4Kh1c0SRbJqUfZZkJl0sOTYIb4kyN7p4OjC6H4JMgFFl60RLQROOHagA1Ei+2am EEhc+OTUZktMWDkPdSLq1YAYJI+gp7U1WmiAgoAUKFY4HLgcNrwCrxmaWlUU57KKeD4qYp zsrdSZW1hPvB20Sgnk9bqRg6OumbwhQK7ZUr/W3BByA++cQknF7BgYC9exdjU6yELnA5wx YT3uJu4a2q3CnbvaltcAp1cXKMsbwteuMIA5UKUtlt5rXjXURXZ+HNzeyUHqEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425906; a=rsa-sha256; cv=none; b=DXfNeX+YEarI6lJDYnKfVF2bqxcPafB/SdTuwrQbpT+QHBWmpC/xffDyZfpZZ2Uayv9MKj AFxL6hiXR0lOew+t1RzjfKhr29Qj7+maA6dxXtOcKJaXhqyFtWjeDK8+Db+z4I59k5bK2Y dD4ts4lQ4srL66DMrJPzBgcKpl0Hz/DDUvibnkiawCn0ZSWl4OpuVhILl4STbKumVUai+e YRXda0/QwGBkAK0x+8y4KfSjhReUy2A5HX4RJtTrqdnCNzLp4Vf7eR1HnpUWVEeyJPDxfs lf8lKhYJABQjeKg2NZCgeRvhPbkUyTBbW6sl0Q/mqBr6kwGFruFQoSROzq2yeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y26gC4B0idGd5ZnoSZm6wYRvkiv+vUKz7eErt0K1dBE=; b=Kb/+LrovEJkCqiwNT5nKj62QP0aDJQ3K5PonqXRfufkF+3tJwgxFHwueR36l1WmvspjAr0 3ouG9m5wSMi3wTTRg0BFI6bYj+rv+qOnTFEDBcAmAsYeQZH2ASh9MlxymM1QH8Qr732HNf cZXLs3lVO1YfeEeVDVpYt2MaT+upgrc1Ee5TI31TIaQddHJq2g8H24vcByRUllkKuxyk35 Qdwe9qwGR+82widL8IC96cb9VHYGF4I5zn72xCS67+dvd+iS1nqD7MpCIdHKhGFWdgLyYU e1b5DG/K7e957g7pmPRywOil38DQrABd3sONs7ou06YZYxymKc3RWaqGjv43vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ24Gr2zfYH for ; Sat, 07 Feb 2026 00:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34414 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 3afe9e12fb33 - main - mt76: fix a check wrongly giving us random ether addresses all the time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3afe9e12fb331dc698ac62f3b918d82d768a2792 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:26 +0000 Message-Id: <69868e32.34414.2ac53743@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3afe9e12fb331dc698ac62f3b918d82d768a2792 commit 3afe9e12fb331dc698ac62f3b918d82d768a2792 Author: Bjoern A. Zeeb AuthorDate: 2026-02-05 00:20:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:52 +0000 mt76: fix a check wrongly giving us random ether addresses all the time Do not cover the is_valid_ether_addr() check under CONFIG_OF. Unclear if this is an initial porting or a merging error before the driver hit the FreeBSD src tree. The end result was that we always got a random link-layer address, while the individual drivers may have setup phy->macaddr and this function would only overwride if given in device tree. Only if both, driver and and the OF backup, fail then go and use the random link-layer address. While here adjust printing the random link-layer address using a FreeBSD format specifier and not the unsupported Linux one. Fixes: 6c92544d7c97 Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/mediatek/mt76/eeprom.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/contrib/dev/mediatek/mt76/eeprom.c b/sys/contrib/dev/mediatek/mt76/eeprom.c index 1d5b95226a16..99e1bca3c19f 100644 --- a/sys/contrib/dev/mediatek/mt76/eeprom.c +++ b/sys/contrib/dev/mediatek/mt76/eeprom.c @@ -186,16 +186,19 @@ mt76_eeprom_override(struct mt76_phy *phy) err = of_get_mac_address(np, phy->macaddr); if (err == -EPROBE_DEFER) return err; +#endif if (!is_valid_ether_addr(phy->macaddr)) { -#endif eth_random_addr(phy->macaddr); dev_info(dev->dev, +#if defined(__linux__) "Invalid MAC address, using random address %pM\n", phy->macaddr); -#if defined(CONFIG_OF) - } +#elif defined(__FreeBSD__) + "Invalid MAC address, using random address %6D\n", + phy->macaddr, ":"); #endif + } return 0; } From nobody Sat Feb 7 00:58:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ40mLvz6QrrQ for ; Sat, 07 Feb 2026 00:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CJ35gqgz3M1G for ; Sat, 07 Feb 2026 00:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W5yEK6K0o29o1V2YRobTDCs01X5iwYjmsNPne+R/DPY=; b=B7nZEWFnuB8L02qTH6k1wXILwOxx8eS9QELmYYpeQY8dVUsLXZsRkh2ITyf7hZhKgLbXmQ ZR4L0xJbMDZokZYA2hN2pS4MTuHqnpSIYC4fpwe6HInFmCyHL0ka10xj7NT7aeF/pGSdup 71xrm8BueyTJq747vXy/EAsSTYAeg0DsKh+ndFVlNGOpYZhj9X9SW1jFeSC0NgkS8P9D0d 3zzi2JIxVTmQ6HcjQI7beVAotFBQBs5qtoa47fr87a5O4/bcvonch7YIK7ohWBoUWt5gLQ dnW710h+LXm7TS9PqMfzicnr/vPpwULAhYbogrA48MCzYmaxU13YpsxTAM3PNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425907; a=rsa-sha256; cv=none; b=jVES9FiURr0ptwcphPY05B/Pkz+KP7T2ravCQSo7IqenMNg6rAyHNt05PrpQbRcpYEDmX/ tSIq8C1gpZZ/7CVGPGK/zGXmuLO2/Obp9YR8uNPb80tL0Ypa2x7UMdcqUhP6Daatwap/vI x0cALIMl4hw6RK8YN6UjGy7r1USs6JLv9wjrSTlStQomZ8TsFJqkth32+5DgUFo/4s38/P WgfxVluSpvhnlok4NOoWUdMF8eHuLfFCyzYqEXMaydNhWXfiuX0pH5RsfeLv3dYTupLiF/ Zf+fay7ZWFpAz11qZlTdbV1S9JmYzS27TWvA0ZS8DfGSrHLkQKG3MfAZAnRsag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W5yEK6K0o29o1V2YRobTDCs01X5iwYjmsNPne+R/DPY=; b=jI+yg1csa1p0D/xcBrtf8hlyuSyOhee3OuIrg6xMZqla0nAuprkQf7WY73+q3t1gkvqjxY lvUG9uTOXpdkXO0e373xuKkwpF1cpo5gMHfycP56oBvEhU0X9Iarf/9EdON8rUvD5W8oCh gslxH3Z6bKNHRJ104jdSlFKe2k4CoNOcMJx9IWEA++HmhnaED0RSfTWyZtw+uHDkrIid3l iCY4UBuiS1l4ruxMhljvtKg2ORLfZV9VsBwd6mDEziILUm9LjRRFAmRFiwihKH2bSH15PJ ksYCmPzlUDbuoVme7GAKeakZVtSUjZx7JqEHzlVEA2F9L5FdSnern2WGNJ3rxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ356v4zfcg for ; Sat, 07 Feb 2026 00:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 330fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c529e1a8f8ed - main - LinuxKPI: 802.11: set extra tx info flag for EAPOL for mt76 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c529e1a8f8edb575de6b109981c4ca7ffdd3b81c Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:27 +0000 Message-Id: <69868e33.330fe.2c0d3a3e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c529e1a8f8edb575de6b109981c4ca7ffdd3b81c commit c529e1a8f8edb575de6b109981c4ca7ffdd3b81c Author: Bjoern A. Zeeb AuthorDate: 2026-02-04 22:25:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:52 +0000 LinuxKPI: 802.11: set extra tx info flag for EAPOL for mt76 mt76 requires IEEE80211_TX_CTL_USE_MINRATE to be set for EAPOL, so add it. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 4ce0a2094adb..2a56d19adbea 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5697,8 +5697,10 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) c = ic->ic_curchan; info->band = lkpi_net80211_chan_to_nl80211_band(c); info->hw_queue = vif->hw_queue[ac]; - if (m->m_flags & M_EAPOL) + if ((m->m_flags & M_EAPOL) != 0) { info->control.flags |= IEEE80211_TX_CTRL_PORT_CTRL_PROTO; + info->flags |= IEEE80211_TX_CTL_USE_MINRATE; /* mt76 */ + } info->control.vif = vif; /* XXX-BZ info->control.rates */ #ifdef __notyet__ From nobody Sat Feb 7 00:58:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ52n0Tz6QrS8 for ; Sat, 07 Feb 2026 00:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CJ460Dlz3M1c for ; Sat, 07 Feb 2026 00:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MEWXNrEauplFBWkVxs9fWDzlIRNU0UBtS+kMwsyUW5Q=; b=Jk6PN5I2abgpCKMKeCUePvs05+YExl1ZgTzTmw4S0eD6NAMlRAwZeyKdjixGkxOAk6gZ6/ hgB+6ua87Ism6Tu2ipPZyklmrM5JlgZw0wsZ2ABexsTTmNDUBqVTljrLhlq9CfrWEbusji jKkI+8pSBYs9TVu3346DXZiatTYNZuH+PiNxZ5cv1FQHZ8kZNwCCsmMyNBs8m21S0zjKni tr8mH5Qfb+VWYJrztpig0BqsLqBX+Xh+M0czX80Tgr/eVhHQzdK6wLCdfAfZpVwBj8t2iL oA3kzSYEp+cjmTodx0pigTkt6n7noi55M/MMTk3vlWyuFr+uJoPYKUuoQ4pabA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425908; a=rsa-sha256; cv=none; b=YZK8uBPDLtVvUIj9DmCx9JyGtf+fsfDkHEfJyOgllB8sQykjYxbwzQJ798tz3R4b7ZpgFn pp7M/jaUjjOUHAy2FwcyDjBmW6j0Sv1Dh6uLVZCIVmWer4rj9/NVbVwYQprDxTDaQ4Evbk Bfvi66bTMAkmTxzWYz+EeSgjtzAHz2r3UhHeIRb1uOrq+8TxsiQh/M5QhJyH2qJkf5siTn 3UvPiJYChchyrV9s3juSBmoPYL/TBSkeny3IAQzYQLaHF8BLi4ztJPUJpV11PdhqJ4Tyt7 F0A/MqPW2SqsVgjfRVQO1HYp8uncxkY2FISy0ay9eGN17rdSmsSF7xkGnYofQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MEWXNrEauplFBWkVxs9fWDzlIRNU0UBtS+kMwsyUW5Q=; b=FZV2ZfYQwUD7qG0QS5PZk4iPs/1qfWoOtQwSIPHt4hiIZmB1nd10vLrTH3TTrI4+Ua7wum HnvrbXQAu25gYu5PTdnIJ/emMVyrPxvHFLbKa4wfj/JNUtTaLLCNXwGUpX1cApyIhukPqz gyjsvJFss64Xpzu+yz9jQYswb/h+qaQmbZ6ndXRo2lNgcP8Ht29FzlJoobQtrBbTnjSHc9 Rba0UPnjjgCih2Po9fB9ctXWjyhIMOBGC4tlVFyIe0lTPIa1i1fhbBXv7tOy4jPgQVYN2x QUhNtLi+k7Duep7NijCnYnYbBNAg2UhX0P4lSF3Y84qPAVXWYxHggawGmN/ihQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ45Y8fzfYJ for ; Sat, 07 Feb 2026 00:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 7d60647a1a6c - main - LinuxKPI: 802.11: make sure we are scheduled before wake_tx_queue() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d60647a1a6c19e7be33428c33b77faadfe863a1 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:28 +0000 Message-Id: <69868e34.33f68.6207670a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7d60647a1a6c19e7be33428c33b77faadfe863a1 commit 7d60647a1a6c19e7be33428c33b77faadfe863a1 Author: Bjoern A. Zeeb AuthorDate: 2026-02-04 22:39:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:52 +0000 LinuxKPI: 802.11: make sure we are scheduled before wake_tx_queue() If we are not scheduled before calling wake_tx_queue() packets may never go out, which at first will look like EAPOL fails (as wpa_supplicant suggest possibly with a wrong key). Using monitor mode it will be clear what is going on. Pass a flag down to wake_tx_queue() to call ieee80211_schedule_txq() in case (*wake_tx_queue)() is supported or not, which solves the problem for the lkpi_80211_txq_tx_one() which was failing. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++---- sys/compat/linuxkpi/common/src/linux_80211.h | 5 +++-- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 10 ++++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 2a56d19adbea..54571b28e2b8 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2025 The FreeBSD Foundation + * Copyright (c) 2020-2026 The FreeBSD Foundation * Copyright (c) 2020-2025 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -2150,7 +2150,7 @@ lkpi_wake_tx_queues(struct ieee80211_hw *hw, struct ieee80211_sta *sta, if (no_emptyq && ltxq_empty) continue; - lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid]); + lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid], false); } } @@ -5764,7 +5764,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) #endif LKPI_80211_LTXQ_UNLOCK(ltxq); wiphy_lock(hw->wiphy); - lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); + lkpi_80211_mo_wake_tx_queue(hw, <xq->txq, true); wiphy_unlock(hw->wiphy); return; @@ -8751,7 +8751,7 @@ lkpi_ieee80211_wake_queues(struct ieee80211_hw *hw, int hwq) ltxq->stopped = false; if (!skb_queue_empty(<xq->skbq)) - lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid]); + lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid], false); } } rcu_read_unlock(); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index d4f18fcafbba..3d25ab4a857b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2023 The FreeBSD Foundation + * Copyright (c) 2020-2026 The FreeBSD Foundation * Copyright (c) 2020-2021 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -481,7 +481,8 @@ void lkpi_80211_mo_mgd_complete_tx(struct ieee80211_hw *, struct ieee80211_vif * struct ieee80211_prep_tx_info *); void lkpi_80211_mo_tx(struct ieee80211_hw *, struct ieee80211_tx_control *, struct sk_buff *); -void lkpi_80211_mo_wake_tx_queue(struct ieee80211_hw *, struct ieee80211_txq *); +void lkpi_80211_mo_wake_tx_queue(struct ieee80211_hw *, struct ieee80211_txq *, + bool); void lkpi_80211_mo_sync_rx_queues(struct ieee80211_hw *); void lkpi_80211_mo_sta_pre_rcu_remove(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index a85e6d0d0dd7..634cffddea9e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2021-2022 The FreeBSD Foundation + * Copyright (c) 2021-2026 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -644,11 +644,17 @@ lkpi_80211_mo_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *txctrl, } void -lkpi_80211_mo_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) +lkpi_80211_mo_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq, + bool schedule) { struct lkpi_hw *lhw; lhw = HW_TO_LHW(hw); + + /* Do the schedule before the check for wake_tx_queue supported! */ + if (schedule) + ieee80211_schedule_txq(hw, txq); + if (lhw->ops->wake_tx_queue == NULL) return; From nobody Sat Feb 7 00:58:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ62TfTz6Qs8h for ; Sat, 07 Feb 2026 00:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CJ60P5cz3LyT for ; Sat, 07 Feb 2026 00:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Snt0m9Co9whwaVICdKlJFqR76kVEgTbGlN9aqiVcZTs=; b=a0LWRgS73HmkmZ6VIbT2pIdkPbTJSEzHWEPTl25/7uk2db7PV9Gx+jU4flRFqOXMLa79ng g3eOx02TjqHaN99g4VLe5X4tpU3s29tTwLFCFTGI9gIjPQm69KWmrm8DlzowdUVnTE5huP 9kb8yAe/5mjFzll7p00Ool0Lg0kc/EWjXQXSYwBKL/qhpK9x1AWgl0T49QnsHn/1pgwthu Zbg+4CLcGsjNTOQC1dxLmpIQ4RaH0RHp0GI5img0oFmcBEw1Marzh54rqcTbu9/bPbb85a 7eHhafzSp/PGOHmO/FLbgDXOVowd4e/nCkrk/dXom2nxtRi0TOwo6dd5Sj0KoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425910; a=rsa-sha256; cv=none; b=JGdROU+AHg1hxeaRpQZ9tJfeNhrCK/5NOdwSv/fUWhh9TLradZrtQmGA+LHVdLAV53PIdi SM7GWhnoobO7fLtCflLgerCDwXTp8rCAUktPwuBW4BYtcOQhLuzHVJcJ62R+Y2M1hF7vKb PNhmW58XJxdewjNdqDn6RxNeST94/ifvhC9oTPl+sB7V3oXU9YdhiX+Ea2Z2AodvshKmjX Z58pMu41bl+1GV6BXUBpmn/j14WLHtFYBYxRYCynRDfFfSmKK3rqxiFcbv6Wl+3CgPPh7f JYRfKAfeiam/R2YlisLgiRCLCl8C7yTGrEfjYXjKOSjYbWFwyvynUAo7X4sQAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Snt0m9Co9whwaVICdKlJFqR76kVEgTbGlN9aqiVcZTs=; b=iK4b/85VBQQTKIUFopSBT11qazNIdqCiiMwERTFao6FOT1KDMBHWD5/UbiMEB4TLQ7RBQR IZF3ax0+SSPps6k1jUqeKpBzpbzHoItXQcoyGSxZtknopP0JzmONNSh/9w2B0Jg4EXwEVs k6kuTaSYmkrvMdJoko7r3zNvP35b7I0745gdPbzT8BlhfFFsHgmtfpib4ZZEFw1xmMJ+p4 ve03hHsZpJbp/+4dTx+hgLXMT4XlRLqo9IzyBiate7o1fVn1PDNEYES6SiwUFiXt/pikX5 1XqOn9qIyyObQ8ZdV19aUIa+eVomhvo4yUIF/AvJYFu3Cit6MF8U4VXO07NOPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CJ56Q9zzfYK for ; Sat, 07 Feb 2026 00:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3497c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 94be5dbdfd22 - main - LinuxKPI: 802.11: catch possible NULL pointer deref with mt76 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94be5dbdfd22de4ec9ad699803ae18d9d209d824 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:29 +0000 Message-Id: <69868e35.3497c.7cff2db@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=94be5dbdfd22de4ec9ad699803ae18d9d209d824 commit 94be5dbdfd22de4ec9ad699803ae18d9d209d824 Author: Bjoern A. Zeeb AuthorDate: 2026-02-04 22:46:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:53 +0000 LinuxKPI: 802.11: catch possible NULL pointer deref with mt76 With mt76 we, for the first time, see that txstat->skb or txstat->info may not be filled in linuxkpi_ieee80211_tx_status_ext(). Guard for these cases checking for skb and info to be not NULL and assume a TX failure in case info is NULL. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 54571b28e2b8..0b732cb691c6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -8304,6 +8304,9 @@ _lkpi_ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb, struct ieee80211_node *ni; struct mbuf *m; + if (skb == NULL) + return; + m = skb->m; skb->m = NULL; @@ -8329,13 +8332,13 @@ linuxkpi_ieee80211_tx_status_ext(struct ieee80211_hw *hw, struct ieee80211_tx_status *txstat) { struct sk_buff *skb; - struct ieee80211_tx_info *info; + struct ieee80211_tx_info *info, _info = { }; struct ieee80211_ratectl_tx_status txs; struct ieee80211_node *ni; int status; skb = txstat->skb; - if (skb->m != NULL) { + if (skb != NULL && skb->m != NULL) { struct mbuf *m; m = skb->m; @@ -8345,7 +8348,13 @@ linuxkpi_ieee80211_tx_status_ext(struct ieee80211_hw *hw, ni = NULL; } + /* + * If we have no info information on tx, set info to an all-zero struct + * to make the code (and debug output) simpler. + */ info = txstat->info; + if (info == NULL) + info = &_info; if (info->flags & IEEE80211_TX_STAT_ACK) { status = 0; /* No error. */ txs.status = IEEE80211_RATECTL_TX_SUCCESS; @@ -8410,7 +8419,8 @@ linuxkpi_ieee80211_tx_status_ext(struct ieee80211_hw *hw, if (txstat->free_list) { _lkpi_ieee80211_free_txskb(hw, skb, status); - list_add_tail(&skb->list, txstat->free_list); + if (skb != NULL) + list_add_tail(&skb->list, txstat->free_list); } else { linuxkpi_ieee80211_free_txskb(hw, skb, status); } From nobody Sat Feb 7 03:38:46 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7Gs307TDz6R4v3 for ; Sat, 07 Feb 2026 03:38: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7Gs244p0z3d28 for ; Sat, 07 Feb 2026 03:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770435526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6QhPkFAo5oyI3OQOg2TkGqvOe91tQNpwguS+wo0HPQ=; b=QPqT0IM2BLGM3DcdKMkOyY4sXECstC7i6MMf5fOFvfZ1feT/XLfyRsD08ivExiBMHUHvFd j+34qyNQFqTe3DNCxOFqnHVBbDM9GW2xr60AazdboosRX3A2jaEXBO1cR5VFoykmZFqE6b 9kwxn6OTQdyvJAv5xG+EcGT1dqozyYlDr0whZyo+3rePcyBupYSpSBU8tVREnd6VsagExE ce8tyhL0Eyh5FKV/T/gHSn0SJqVs6NqS9010QF33lgh/G6U6fw0cLD1gxH0N52/MKE09LM 1Am9AkZJ6L7be5tqoi+ucijODRWHf3vk9V9pWeMh0L/8l9x8wNApPZuLNUB70w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770435526; a=rsa-sha256; cv=none; b=e+YPSQ7KLyqndVru0jWae7s/s0MTCHzuBk5b/vOAtt1ZHPpkiWJprLMuhZ9FcF88mwLFsI tawQt5bBjV4dtWydAVh/5oF001njbTE/fAs3359/Kw1Tz9HdfgQhnZkmDZICS7FdOLRGZS YxhGWRzqTVlfXZpg4RRBjyVVrfzjoQJJgGNu/JZ8WXtlp8nRNpHOBl71RmgalYbx1g9pH1 SJ5sSi6cuBeFTchWgRkQU0aywL2yLhm16YHYAIQyXP76nKXb1EqZr1/LlBG0yefMAo6Wg+ 70TPAEXV6ugv66fU8OR4CffkhMrYyAD+3qLod7NBC37Gkc+A+/Xa4KW+kj5sBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770435526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6QhPkFAo5oyI3OQOg2TkGqvOe91tQNpwguS+wo0HPQ=; b=dXqp20AqWy8vvxQx2pRcb9hdONQlEtoQTWnAEUiTmozpYZdc3BG5I+V37mMfgmFr1u1LzD GIavoi1hOUkzDDMvGehQ1QKrqrGLgKYWWRszS2rdspKsnFwUGwjPJfvmTkhFQhp2w9UOAG YEnFeHua8/KRcLadHG3AhREgRkCgADiW4G8/tJefLvPI268riZw5O5RPyOgM6JMBcnhVBm 9vd5kqSYm0VvYQpjn5XRU2vUpKwEc1GCGIfngKgMlLasKJSnYrwkxLLGngs2hCbZ+5dmMj Q716y/fg+DMng7KMo1wVcnU1WWw2MdGipLWVoqxHM7IcZz3reCMHyQv9yPDLlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7Gs23fK8zl9F for ; Sat, 07 Feb 2026 03:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4448d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 03:38:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: deb3c9dc54c7 - main - development.7: Refer to new port name for git-arc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: deb3c9dc54c72efcb19fd4c55449ba08f07cba2d Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 03:38:46 +0000 Message-Id: <6986b3c6.4448d.58d9d3e3@gitrepo.freebsd.org> The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=deb3c9dc54c72efcb19fd4c55449ba08f07cba2d commit deb3c9dc54c72efcb19fd4c55449ba08f07cba2d Author: Joseph Mingrone AuthorDate: 2026-02-05 17:16:30 +0000 Commit: Joseph Mingrone CommitDate: 2026-02-07 03:33:46 +0000 development.7: Refer to new port name for git-arc The git-arc script was moved from devel/freebsd-git-devtools to devel/freebsd-git-arc. Reviewed by: ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55128 --- share/man/man7/development.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index 348302a50ee7..c64e9fa32d88 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -125,13 +125,13 @@ the continuous integration system is at: .Pp .Lk https://ci.FreeBSD.org .Sh FILES -.Bl -tag -compact -width "/usr/ports/devel/freebsd-git-devtools" +.Bl -tag -compact -width "/usr/src/tools/tools/git/git-arc.sh" .It Pa /usr/src/CONTRIBUTING.md .Fx contribution guidelines .It Pa /usr/src/tools/tools/git/git-arc.sh Phabricator review tooling -.It Pa /usr/ports/devel/freebsd-git-devtools +.It Pa /usr/ports/devel/freebsd-git-arc Phabricator review tooling as a port .El .Sh EXAMPLES From nobody Sat Feb 7 03:38:45 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7Gs16N9bz6R4p2 for ; Sat, 07 Feb 2026 03:38: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7Gs13bBRz3ct3 for ; Sat, 07 Feb 2026 03:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770435525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHte/JycEweMV1jiEWsqE+fPHaVyYDIelItwOPWQHZI=; b=r0T1yBoDGOE2dqSsyD0auvSDKj5IXuwucLTCwpNUoUSAlfRvzh6Mby3EvUKPWysUdbJxdA MxDUwEKwnRES970TBZo98P93wiM4yn4e+hxtj/dqaz5Xfj+e49AEmo0+Jh9c9W2ebpNi8y 5J9xee84CcV7EfZl76lNyQ+Noif4x/HmUPN7s+/CMiN4CaWYZlxQcGtEFcPIwIFkgiDZry 08DrjJjORVtlz3of5x7jqfXJwJm6einendHd5jwQw/O5VYxDJQfv588Gt1sK0Wm/FzfJvK cQTo4i9ZWrvje1AZ2d2cZs5dihz3bRLMBKRKl3ZKN58+H//9wUozpoGD357iSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770435525; a=rsa-sha256; cv=none; b=xFFK1kBxTbluibmSmE3Im8pl1jCbGpB9LviifzpZHWK8ArHkPsdT9c81LiE6AGE75i+8/n vvHtxQuGxdKLj9oUv1USGdVq/Vu4CZjYApKzBAmV1zBviDB6EJt+jbGA7jXybmLWfX7vqt 4el48DUZuT7J6Fz1BGJ5hrvjQLrbzOpDLMfRsQtW80vB+htxFrj4169wHn78Qgk4DtesoI pSdK1mpyrICi6qWtBA7VgUoY46PDyQUXckegKz9snJjGyWKcbRacqS/fCymawzXY0p4lx4 n2o9X11EGS2pqBWl0mIc/k8RhXis+mKI243y49u8VkEmUfyJv9ubpfL3buziDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770435525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHte/JycEweMV1jiEWsqE+fPHaVyYDIelItwOPWQHZI=; b=FrspqeQyqPHcH+qAmUMuUkfG1FkzlciY35bNK53s+b9nnhRl8s8tKFOwWTFq2MvrkPNsq9 D/3RovDgAFb5+8rY6aqGkYycopLVeXYLMDGJwvtyFkjKQ4LzlgjlW+W9aqewnK0ljJT2tW Zo6yac7cfu5lkbCcjMwMWhvG2sFK+MYS30E2NjBqkPFnLBVP2q6N0MB57fe1hb9uewsR6Y +hVWuwHcBNLYbIexQn9pzbThf6Uv9vCJC3+/eekx4wvyAA9RBDEKIb0YfIawWmvZkfJBpC TitWI+PIIqUkgCzjw3cQhtpvp4ZGNR27LWgYCF5NNpEfMEn1p99E1WJMvmEYDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7Gs1335kzlP8 for ; Sat, 07 Feb 2026 03:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44965 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 03:38:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 32bd754d4dcd - main - git-arc.1: Refer to new port name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32bd754d4dcd9752b552ff70d68d3c1e1c335d92 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 03:38:45 +0000 Message-Id: <6986b3c5.44965.317ab6ad@gitrepo.freebsd.org> The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=32bd754d4dcd9752b552ff70d68d3c1e1c335d92 commit 32bd754d4dcd9752b552ff70d68d3c1e1c335d92 Author: Joseph Mingrone AuthorDate: 2026-02-05 17:16:05 +0000 Commit: Joseph Mingrone CommitDate: 2026-02-07 03:32:52 +0000 git-arc.1: Refer to new port name The git-arc script was moved from devel/freebsd-git-devtools to devel/freebsd-git-arc. Reviewed by: ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55127 --- tools/tools/git/git-arc.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/git-arc.1 b/tools/tools/git/git-arc.1 index 0e2615d83fa4..f3fd6ea11adb 100644 --- a/tools/tools/git/git-arc.1 +++ b/tools/tools/git/git-arc.1 @@ -71,7 +71,7 @@ and packages; these will be installed automatically if .Nm is installed via the -.Pa devel/freebsd-git-devtools +.Pa devel/freebsd-git-arc package. .Pp .Nm From nobody Sat Feb 7 05:20:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7K6Y38fPz6RCw9 for ; Sat, 07 Feb 2026 05:20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7K6X6lZQz3n3S for ; Sat, 07 Feb 2026 05:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770441637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2OnijBIEaQ9//pawuLEPBs0Y937WzBdpAUH7ilIQEg=; b=tZytWaNd3unOWb1vE1Frnq0XhXRFFlCPhSfMCfe3Iw/ecm5PGhW5fm5n+ETnJcQ8Jua3Sm MTRnP8mYt0DWWUCvGvU7+8BDiMPH6YvgbyS0wFUlwJUfpqKK3mYullQ1Fjw+6VunTzwGPY niV+xqK5IJ9hrCKl3Lptpxfb7c0lauBxQA5syej2OWHCuO7TlV0fgDpa6Kkv6y5uQdY2pO Nyb5iLqizxA4A6cDkKhmQ+DBy04043P1OyyzYhM+gsSgPvl5zDJWIJC9klgmxBbkLs1hJp ByUBPyMUGNOqzgx3UuV3exzZ0GA6Ev0Lp3LfuJfGX7oGvBzjAaSjM1EhcKSfvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770441637; a=rsa-sha256; cv=none; b=guV3wiFakG0ITGl7mZwAn98L2Ede7e/IRfgH9RAsCUejpo5t4VQfDrhuVX7fwLDVs0d4mc BQ5lkbx/eVr6qoyuzXZjEIoUrirbPAW99MB21EP77MnBm4qMVSKM39tR59ohu/FlpGbuRm jTetA6itLTLk5SiB6ljD4njVERq/k6NqRZXLw510VxT20dlQAADRK6WHVo04YRMAEjSDYG pQaGs7e8w+TwhUmz2cEYganP64lsFkAbl2y7gUH1ZwlB6c+ooxfMiULePO+mdgY7BYBxyi 8eLQ0s6YjUr6IAF7GqdBp3QIszapXRmDcz8d5zKBV1kAuW7NvtHK4n9AmiEnVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770441637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2OnijBIEaQ9//pawuLEPBs0Y937WzBdpAUH7ilIQEg=; b=OsuDRpCutJmxJMicUuLzCJk0VHL3Q8teM5wkpwFWK2F2emQAI4UtbWi/kqa7SKkLnNgnvf jPzteTWsqrD+Dp8o396CiecS6LlHb8TROair+wW5HFQblmCPzYukIFxWJAS0WEXtrrxC+/ r7LE+NkD82Xya47uzixaf2+vbFWiFh3FVSa9jDaq/nDCxTCT5Xm5sGtEhe50ZyHna5nKKY UC/gKjdt7Y48xa0EBJ7e5RIuM6nNlyC1puQpaRaVyHTVYh6ik/v6Vcrq8+JJ1f71gNzw9c xvrbTAOQhO5+tQaaEnahD8gMqvxtuKvhNTphw7p/P1JhQqaBCX2Io8kTZ9Xhng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7K6X6K1JznhH for ; Sat, 07 Feb 2026 05:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ed5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 05:20:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: fa567fe7c537 - main - libsa/geli: Fix a typo in an error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa567fe7c537950fe48e35fa3b0827af4a45ec57 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 05:20:36 +0000 Message-Id: <6986cba4.1ed5c.629a732f@gitrepo.freebsd.org> The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fa567fe7c537950fe48e35fa3b0827af4a45ec57 commit fa567fe7c537950fe48e35fa3b0827af4a45ec57 Author: Gordon Bergling AuthorDate: 2026-02-07 05:20:16 +0000 Commit: Gordon Bergling CommitDate: 2026-02-07 05:20:16 +0000 libsa/geli: Fix a typo in an error message - s/crypo/crypto/ MFC after: 5 days --- stand/libsa/geli/geliboot_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/geli/geliboot_crypto.c b/stand/libsa/geli/geliboot_crypto.c index 6cb47d5572c3..a7780471d090 100644 --- a/stand/libsa/geli/geliboot_crypto.c +++ b/stand/libsa/geli/geliboot_crypto.c @@ -47,7 +47,7 @@ geliboot_crypt(u_int algo, geli_op_t enc, u_char *data, size_t datasize, err = rijndael_makeKey(&aeskey, !enc, keysize, (const char *)key); if (err < 0) { - printf("Failed to setup crypo keys: %d\n", err); + printf("Failed to setup crypto keys: %d\n", err); return (err); } From nobody Sat Feb 7 12:49:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7W4w5Smhz6Pmfm for ; Sat, 07 Feb 2026 12:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7W4w3207z3WbS for ; Sat, 07 Feb 2026 12:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770468592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ofpTFrrCklvO9cLM5E2VEunXcvBNvKsGAmGIjFkuOTw=; b=brDXP92P+cVPiW9Hdw5WZhqi4V/jYFrQMrtrzeH9/G+hNYaVpEHnQnVxKUQkVd2xzOaa+A pFucD3R8TEuCXVty4kkSqb+J7kVeMz+eCF8HmYj+lEPFc5kvVYlJrCgP4/8j6EELx06hPF 484zCjxN7Apbl/sIGz9yY6otoU2iAGoVbVAfCEh9edlompR0dF3/zLznWSFmUN9O4eWJNd MixETHdwwHyec8XLvt1oXNqFNvVsGRzxUG/ldGRt4dIqVZPUsTdeb0sJBwHV8T7D4zj5OW 1HVTjPwGrq/blW37rcmi3MJ1MrKhrP6A1yfjizQvMIBqO8E+sB/dOV6X69TSVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770468592; a=rsa-sha256; cv=none; b=ChtXzq2Bcopd3ZoOcbl5+cQ1sdY59kxGoIVBxfTUNfe57HDpN3gWBvBjbYF8SYQU3sARnk qpk6aIG0pN3F/EdAkqhZSZ3IoTWjM0415KhwdFpga+U/CmQ6gqqDrP2QeSXiIP+YTtDHZC BaObxDZy4dNz85+511OgjDjXLm91bZmpkHkxEm1n0JslWFYSURM7TkK22pI+RLpmFE76yJ O65jcbNnVs0tJ9FJb6+bKI2+NxAzTavzVBlYvCBnhbxKmvkdTW5qS8Lak1QvBPC3kmRE0j s/KjIU/JZaHcsGbIireEf5cVafbDcYgn1h4r2BNkNYiMQBYnGVgQhI3KyXQSdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770468592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ofpTFrrCklvO9cLM5E2VEunXcvBNvKsGAmGIjFkuOTw=; b=iDF1H0pwbiZar9OsqYPkqlXGvt5+gJXYfLBZh4RPZk5SPqUfp3hF49WMJcUBkLvzNEX2ZT HCOTeHDKWrsLeklUpykI/Uk9BTOfykieGEQWp3YGFDQnZeR2GvEu2qOQR5fcpYE7kjJtfl nAHkZ8NvxJsOTWGxKG+0cHC3B7IBKec1Up2ckASFwAW4b2v8VWVnjSZLo29HOGJ1H5sp0z Jga9zNS2T9U7tGUuCKvxGgNdigTwni4lj0gASoHpDZq42GFN8gl+IA9NXCuYmWDI46Unmr 3srFMcjky2ZZk35IT4YJKXZ8dkH3rsphL13A7YG7I9OlbfnqO1T1NZJFSd9ZiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7W4w2M1qz11xb for ; Sat, 07 Feb 2026 12:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3791d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 12:49:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Guido Falsi Subject: git: 4548149a8102 - main - netinet6: Fix my style issues List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4548149a81026ad9b1706b2b7e7ad47a4c1358b6 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 12:49:52 +0000 Message-Id: <698734f0.3791d.631908c8@gitrepo.freebsd.org> The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=4548149a81026ad9b1706b2b7e7ad47a4c1358b6 commit 4548149a81026ad9b1706b2b7e7ad47a4c1358b6 Author: Guido Falsi AuthorDate: 2026-02-07 12:46:05 +0000 Commit: Guido Falsi CommitDate: 2026-02-07 12:46:05 +0000 netinet6: Fix my style issues Reported by: pouria Reviewed by: pouria, ziaee, glebius Approved by: glebius Fixes: 31ec8b6407fdd5a87d70265762457c67ce618283 Differential Revision: https://reviews.freebsd.org/D55136 --- sbin/ifconfig/ifconfig.8 | 19 +++++++++++-------- sys/netinet6/in6_ifattach.c | 22 +++++++++------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 627b7cd3f9e3..e1d153aa7493 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1008,24 +1008,28 @@ Set a flag to disable Duplicate Address Detection. Clear a flag .Cm no_dad . .It Cm stableaddr -Set a flag to create SLAAC addresses using a stable algorithm according to RFC 7217 -The +Set a flag to create SLAAC addresses using a stable algorithm +according to RFC 7217. The .Xr sysctl 8 variable .Va net.inet6.ip6.use_stableaddr -controls whether this flag is set by default or not for newly created interfaces. -To get consistent defaults for interfaces created at boot it should be set as a tunable via loader.conf(8). +controls whether this flag is set by default +or not for newly created interfaces. +To get consistent defaults for interfaces created at boot +it should be set as a tunable via +.Xr loader.conf 8 . The .Xr sysctl 8 variable .Va net.inet6.ip6.stableaddr_maxretries -sets the maximum number of retries to generate a unique IPv6 address to be performed in case of DAD failures. +sets the maximum number of retries to generate a unique IPv6 address +to be performed in case of DAD failures. This defaults to 3 which is also the reccommended minimum value. The interface ID source can be configured using the .Xr sysctl 8 variable -.Va net.inet6.ip6.stableaddr_netifsource: -.Bl -tag -compact +.Va net.inet6.ip6.stableaddr_netifsource : +.Bl -tag -compact -width indent .It Cm 0 uses the interface name string (the default) .It Cm 1 @@ -1033,7 +1037,6 @@ uses the interface ID .It Cm 2 uses the MAC address of the interface (if one can be obtained for it) .El -.Pp .It Cm -stableaddr Clear the flag .Cm stableaddr . diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index c38fe90632f8..a952192b6b62 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -158,7 +158,7 @@ get_rand_ifid(struct ifnet *ifp, struct in6_addr *in6) } -/** +/* * Get interface link level sockaddr */ static struct sockaddr_dl * @@ -178,10 +178,10 @@ get_interface_link_level(struct ifnet *ifp) if (sdl->sdl_alen == 0) continue; - return sdl; + return (sdl); } - return NULL; + return (NULL); } /* @@ -250,10 +250,10 @@ in6_get_interface_hwaddr(struct ifnet *ifp, size_t *len) return (NULL); } - return addr; + return (addr); } - /* +/* * Get interface identifier for the specified interface. * XXX assumes single sockaddr_dl (AF_LINK address) per an interface * @@ -268,7 +268,7 @@ in6_get_hw_ifid(struct ifnet *ifp, struct in6_addr *in6) hwaddr = in6_get_interface_hwaddr(ifp, &hwaddr_len); if (hwaddr == NULL || (hwaddr_len != 6 && hwaddr_len != 8)) - return -1; + return (-1); /* make EUI64 address */ if (hwaddr_len == 8) @@ -314,7 +314,7 @@ validate_ifid(uint8_t *iid) static uint8_t reserved_eth[5] = { 0x02, 0x00, 0x5E, 0xFF, 0xFE }; static uint8_t reserved_anycast[7] = { 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; - /* Subnet-Router Anycast (RFC 4291)*/ + /* Subnet-Router Anycast (RFC 4291) */ if (memcmp(iid, allzero, 8) == 0) return (false); @@ -375,7 +375,7 @@ in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) /* Use hostuuid as constant "secret" key */ getcredhostuuid(curthread->td_ucred, hostuuid, sizeof(hostuuid)); if (strncmp(hostuuid, DEFAULT_HOSTUUID, sizeof(hostuuid)) == 0) { - // If hostuuid is not set, use a random value + /* If hostuuid is not set, use a random value */ arc4rand(hostuuid, HOSTUUIDLEN, 0); hostuuid[HOSTUUIDLEN] = '\0'; } @@ -383,11 +383,7 @@ in6_get_stableifid(struct ifnet *ifp, struct in6_addr *in6, int prefixlen) dad_failures = atomic_load_int(&DAD_FAILURES(ifp)); - /* - * RFC 7217 section 7 - * - * default max retries - */ + /* RFC 7217 section 7, default max retries */ if (dad_failures > V_ip6_stableaddr_maxretries) return (false);