From nobody Mon Mar 9 02:40:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTh7z4nG3z6VDFW for ; Mon, 09 Mar 2026 02:40:31 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic315-55.consmr.mail.gq1.yahoo.com (sonic315-55.consmr.mail.gq1.yahoo.com [98.137.65.31]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTh7y535Vz3y09 for ; Mon, 09 Mar 2026 02:40:30 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1773024023; bh=Tt6nqjxOivle9WK4jZyN8E6TekqxuLNNcQA4WxNtrIc=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=oPC5eYnZAF19u/xw/Bsc9XGRk0Qh2J/IG+QeAt/uaOFqED3uwlErveosQxuWsbR6p9jTYTqsQzy+qaBZXFKEZwPz2er/3BTXQ04go+3ZSb7MkTTuKtemNDxjGfhDfvLwApm/UJRvzeF4hQk3jScvu4DaAL6D+B26g/rEwdr6uFkVngQWY+vMRRzFhmVhh6Zp2qgXcvIU5lf/pb5OWZrNUnmyojlW/7obTkX6xDlIpVfRMVVQrf7sOrUO2ineFSnYeeAVg68Jmuq/umX7Wy8xwlKoSUz/9fVza8Si53dpzJjA+xXZpfxUA97kHUAYlq2yv188glpc1NRvRfRdPdIpzg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1773024023; bh=/oxWFkfCwBrour5Y+YH/jrJrx7Pbvx4938YH3iD2cNw=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=XsXrm4s6e7lKKsb9kn9UP6nbnsSp1xs11Pgi+4/w88MgyP8VyTV/R2LjcUc7VzMv83QauPW3TPwDpHanfTn9fN0z/ExWPgW88BArUn4LuUci5goEgrTpvu9Ezydua+xJDBxxk6iq+pa3rqkqoecQPq4SEFs/2yWgLwtoxWQbaRvmkWPkKd3PB/wXysCn0oc0aiPTFvYX8gzE7F0Gxb5SM8BAFPysfrhLKZLCgvB9Z6j/ni4iD7F09jRE2amEKv6ryK6C+uMBvrSCyzuJMNYWH8EBiU+9Q+vEf+tr5I6VkkVUu5gymFCPPoGq5ldBow1mSXY/yf8sYHiDzG/dFHqyhQ== X-YMail-OSG: OFhbhOkVM1lU0H3IINliboGAz_RlvVm5rP4XqBfQvRt9VR6v1ELKI2KO0F9i3Wy VgGQkr9C5nbDCow4R2np.L231LCAYGd3pfewDKtKkaOggJjOFw3HW8vhpzCL0YLFQVfnjXkcj9EY bpl4aHM6zUXMBtdFUDE.z5DDotWk09ibhfiP1OD6nkoQqQdQCi2dLRlLxntuQR35KX0prvG2n340 19t33KxxgqhflHmQfxisaBNJc00nd.ndlXiaPNwCj63q1UzC0BlUjwjJwwxUvSu7cL0OvNjT5P9Y T7hcrApSRssvVX1bUWEumaF5Tw07qbAie.cwy7xhrYTuiE5maXyhkrudEvkgtEyZjTCo.3BrNx9g 95OFg1fMHgR7pwMSD3KDmoxJdFBpAWzzF6wE6Z2DdP8vStv5QhRHJEMtz.y9wUratyiWeUzpLwh2 RoMKkK4DD6_cIHNddAfmdyDH1B4SwK4M7EwJ.JH_xWTxgxG2Jpqsl9N4we4Bu67sYxf.5g8Mj.dL JkxdkWEs.dNjmr5bJA4RmePP.0unwByZOATumMtBu.D.lxLbZx_HxgWRy0t6mwabVrslZcJFrA0d 9gAeyQRs0bb4BLKRs.WXHBCHjrUo2D0_BXoINGLhLqHnlr3z_7o7LnjiVLrzhboGw1eozLsysUdw 7DzxmEuZSBX.SmLyu.TqoO_dgltHIrnEJkfIqwhdLpw0XmRuqDxE.WbjhuTc17.0SD2DMoFOOwvq QakQWMzIHG9cPN4AWHX.bYa7ZlFp7Dy5XpuWu_LMXX1RJz.1Am8D1JFgYy_mTQBlazUMSweCfulK NLeyzBmUx69mhs005v0IveZ50xpX7CuWDUt6cLktBybtc8ciTjOu2KlW3HgVzoyuB99TnF3ytx1h 4aUvBU3jSugWobWqZNQAv7_sk8Dt_yis2EzFEDoyXiK2S8.LlHElhAJbXHOAcWg4Ii4xYjBWbYaA lJ.8XgX0K9GB_h_Qxtsw5H.YbPt6CVG01Kfyl.ijGUa81xsh.mT943mXujacnCwp5yZUWbi5S2Fz 5rq37hG4tuz8yIvRTIAORBRCoXPNtSyFLNJU8dk8qucvOM9SSQln4TV8N6n7kFIc9QmAuUSMB_30 mEOXNIB0PNeW5E9DfdfI89fn5yGjt5XWGF25fR8AfJuAa57BOe4vtudvwzbEHdHxGkFS7fz2LSf5 hq31TRgkMtMssWqIJVls3qs.LjLomQpn52sVojJ5FibzGiMSe0ftYUCs.VT5fj67lSoAIeaSbF92 L_obceX20PSfQF1Ot8s8gTL5KWIZNfjtXR7PyL9dFhDqqWXFiPr85givt94FNx6o2icY9WorBrIt 7BUaaJ6XIp7haKCLOzsV1D_xkWQwc0nQPLTE8zJTRGBtse6lpNZa.B5FaIsrit5cdwPtTNEATUlG N2LYbpXAvHQ9t7hEB1XGASNLDtRWD_Ii1MTZ7KcgBBflRH5ikKYrRKDzJpitVV89zlry2pa0OTTK dKfaKb1haamKjjZ3mcGDfj7hX0nZOsBztdJLu.IGbjNWCLAJP8hwVlQQEF9PT.IVOE6.hwuiAd4S 9gjKlWnJVRrK4N_a8W6rvMPlUzSyxuoHbmVdMgYUESQt6LWK1mGveaY8OpU0LqO5LDBVnEG7qev_ .GeaBXOSo.PdJRkbhk6Z_avBspaS_vlnAwuMrVYq2xosCB9XgG1_PKSEpaQOk5DuaUjl.khfqWaV sEGr6Ggtru9UX2UgiEBSSoSH5DLv9c4bikJn875MoY0YpsllVZ0a.vWkiYoedS_JJw5MIjCDwIYC TGJRNml4GK_3Bhn7oUPfZUZv68SqgwQ_MquakyTeieu.7YPLtAIXo6rDKdCocfvBtlWhexa4G.Fx kHQxKLzBrHP1mNipSRM4e5B_VkPB9bHsNSAe7SJUS9byMwQZE7Dk3o4uVUsjNfMl_AuksyXd00xw tsK6kMDyl8s.DHJAv462Y6dUP0brKYmNAoO9hM3wujj1E5l3lcjJN9biX7YT9ZBtIriSHcIQis_W ErLLVibrLpEan.80KNv8ZZ2RqnhrsURIGOZaU5xXJlK39n6bb9IYt_MpE_hx1lrjeiLplJgDm5sA AAWPrOq0dg2LsJmuhfX8zkSyenu.yCw34HbsL.L47q8SJP4ruRNFLV5Hb4ycKb9IYJhMZi6gHQg9 _.N625koGMJ6G7aSTl3YZ2FB465QYAxQ8EZDzDQCwPZfkX3ubtRlq3R2hKCGXT2CJGD6nghPt13f TTjNu5wgy3n3PSNGAjvEjiBqX0jJmMPfNB7OG1MXpHU2JarxQ_4OksA55lm9ND4qupjQ09iWUQvd .Umz_0i4JTIXYdccPnBET5xLCP0u8d0E3pdCHz1Dfe5SIE0MH2AnZ8_WpfXY- X-Sonic-MF: X-Sonic-ID: 46eff3a9-a793-4a2a-84d3-852b44ef0bae Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.gq1.yahoo.com with HTTP; Mon, 9 Mar 2026 02:40:23 +0000 Received: by hermes--production-gq1-6dfcf9f8b-zfjdz (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID fd2e4b550aa92039ffef18bbe5b36bf7; Mon, 09 Mar 2026 02:40:20 +0000 (UTC) Message-ID: <15dd35da-4c7c-482b-a212-8eaf761b23ca@yahoo.com> Date: Sun, 8 Mar 2026 19:40:19 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c499ad6f997c - main - virtio: Use bus_dma for ring and indirect buffer allocations [Really: kernel: vtnet0: watchdog timeout on queue xx] To: "Herbert J. Skuhra" , Andrew Turner Cc: dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, freebsd-current , Michael Butler , Philip Paeps References: <69a71c75.40215.43f39fc6@gitrepo.freebsd.org> <87ecludxuh.wl-herbert@gojira.at> Content-Language: en-US From: Mark Millard In-Reply-To: <87ecludxuh.wl-herbert@gojira.at> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Mailer: WebService/1.1.25198 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo 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:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4fTh7y535Vz3y09 X-Spamd-Bar: ---- On 3/8/26 10:39, Herbert J. Skuhra wrote: > On Tue, 03 Mar 2026 18:37:57 +0100, Andrew Turner wrote: >> >> The branch main has been updated by andrew: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=c499ad6f997c8c5f61c88925e6d1e826d0c0f6c4 >> >> commit c499ad6f997c8c5f61c88925e6d1e826d0c0f6c4 >> Author: Sarah Walker >> AuthorDate: 2026-03-03 16:08:11 +0000 >> Commit: Andrew Turner >> CommitDate: 2026-03-03 16:29:15 +0000 >> >> virtio: Use bus_dma for ring and indirect buffer allocations >> >> While the majority of virtio platforms will be fully coherent, some may >> require cache maintenance or other specific device memory handling (eg for >> secure partitioning). Using bus_dma allows for these usecases. >> >> The virtio buffers are marked as coherent; this should ensure that sync >> calls are no-ops in the common cases. >> >> Reviewed by: andrew >> Sponsored by: Arm Ltd >> Differential Revision: https://reviews.freebsd.org/D54959 >> --- >> sys/dev/virtio/virtio_ring.h | 27 ++++-- >> sys/dev/virtio/virtqueue.c | 216 +++++++++++++++++++++++++++++++++++++------ >> 2 files changed, 209 insertions(+), 34 deletions(-) > > After this change I see a lot of "kernel: vtnet0: watchdog timeout on > queue xx" errors on amd64 (arm64 seems to be OK). See below about other reports of the messages. > > Reverting this commit resolves the issue. > > freebsd-current has the following notes, implicitly referencing official builders doing official builds: QUOTE On 3/8/26 17:10, Philip Paeps wrote: > On 2026-03-08 07:10:01 (+0800), Michael Butler wrote: >> Is anyone else seeing timeouts on virtual interfaces? e.g. >> >> Mar 7 15:00:27 george kernel: vtnet0: watchdog timeout on queue 0 >> Mar 7 15:00:45 george kernel: vtnet0: watchdog timeout on queue 0 > > I started seeing these on today's build too. > > It seems to happen more or less randomly. I can't point at anything > specific that might be triggering it. > > Philip > > END QUOTE -- === Mark Millard marklmi at yahoo.com From nobody Mon Mar 9 05:50:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTmMh5v59z6VDDJ for ; Mon, 09 Mar 2026 05:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTmMh4Bk2z3GhZ for ; Mon, 09 Mar 2026 05: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=1773035456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOFP7UECkn1LNM0JH1d2LrhY3sbQW/Gipe6w3TRH3sg=; b=IQneura4745WaN1kf/8GNzcYPm+FKQOAqrQVf+L/HzEr/X5JaETaiNgO40DtiY+xdjLJn6 cQPwWauc2XNqt8U+CJ184oVgPYrV758WVSQ9du/JLTNrZXjsMofHQ9dkvlCS05vP9+yRn7 CIQtcd2mdWnyGpUlX6HKkH4mUjUlidHR6ldcKXGVbqqGF2ggckoFf+H5eRO3dy77drCSv8 i/3abkemRIJyvauo0UCMyO5ah8j1qHb+zBLIRcQHTMuBaX+S0XvVSJNTV7TjT4NKP1RmLg laRccCeCNBW4oprLIO3Po9fRPET/PBelQQ9mdVtDzXK/pjo30QfZfwXd3KP7Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773035456; a=rsa-sha256; cv=none; b=DeVqBynb+GT1aH96wpPMb0c8YE/0E6FImHlgPAjxP/siTcFCtI18psgXKU8o8Onz2fL8z7 GUDYJ5/4gb07HC13w0tBXeCI45SAnw+6i906JwnAXX0CIb4raNgKj2RVo7HPH3+dMnKXkd zATyErzEG6o2cTmYiOHL3InHHqB/GsCOKgWgyQF0FbfxfCAAJ6M4C1B+xQaB3jCnl5YbgY Up2rieA8nACYGu9aSZrysPrXU9KmAezNfs5SKR4qhM6FPRETclLZ3C+tROU5/AIm2mmT1Q 2vSPKx6qnZ3fMItHzxRxxILrwd5bcGS02F0kiVfy+baWxfr419sAM/RQca+Xpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773035456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOFP7UECkn1LNM0JH1d2LrhY3sbQW/Gipe6w3TRH3sg=; b=URB8hzq7kB35whMrRIkoDgFtjHVUogi2q/rJtCKN5Fl5b3lCuaKwlAnhjW1Yf4AfbFDJoB rhdJrvMaufeX8yNlpA5ELUX4CwR6amc8+cMwZUBCxPJCBgHTae7U7NnMGCnLcYyfkCMXRr mD4gtsycxLIKewSJt+1R2s7JCHWW+IeK35weDO4ZdTLukmU8t3JKf6FbRywK8E7JIdlN+I yI/tMrn7jWX3vF8NPmQtxUY9eXKmnf2+nDGkDBrI4OiMMqnJtcD9zY2K25XkWlCyrTMfHE GZzKGuYREOzh/W2jp95W4yJu7fQigKNYRGUoCZz9dxLhjsAtttudL7aOagu2oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTmMh3llHz1Qw4 for ; Mon, 09 Mar 2026 05:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f634 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 05:50:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 8f72d933cd18 - main - cxgbe(4): minor changes in code dealing with ncores List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f72d933cd18664c73b92f282503017bc6c87cf9 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 05:50:51 +0000 Message-Id: <69ae5fbb.1f634.20643ae2@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=8f72d933cd18664c73b92f282503017bc6c87cf9 commit 8f72d933cd18664c73b92f282503017bc6c87cf9 Author: Navdeep Parhar AuthorDate: 2026-03-08 19:59:07 +0000 Commit: Navdeep Parhar CommitDate: 2026-03-09 05:44:13 +0000 cxgbe(4): minor changes in code dealing with ncores 1. ncores and devlog information is read as a combination so it makes sense to validate them in the same routine (and nowhere else). 2. ncores is never 0 and idx % ncores is always a valid coreid. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 14 ++++++++------ sys/dev/cxgbe/t4_sge.c | 10 ++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index cb0ad2342e7c..40cc7777bd71 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -806,7 +806,7 @@ static int validate_mem_range(struct adapter *, uint32_t, uint32_t); static int fwmtype_to_hwmtype(int); static int validate_mt_off_len(struct adapter *, int, uint32_t, uint32_t, uint32_t *); -static int fixup_devlog_params(struct adapter *); +static int fixup_devlog_ncores_params(struct adapter *); static int cfg_itype_and_nqueues(struct adapter *, struct intrs_and_queues *); static int contact_firmware(struct adapter *); static int partition_resources(struct adapter *); @@ -1425,7 +1425,7 @@ t4_attach(device_t dev) */ setup_memwin(sc); if (t4_init_devlog_ncores_params(sc, 0) == 0) - fixup_devlog_params(sc); + fixup_devlog_ncores_params(sc); make_dev_args_init(&mda); mda.mda_devsw = &t4_cdevsw; mda.mda_uid = UID_ROOT; @@ -4565,11 +4565,15 @@ validate_mt_off_len(struct adapter *sc, int mtype, uint32_t off, uint32_t len, } static int -fixup_devlog_params(struct adapter *sc) +fixup_devlog_ncores_params(struct adapter *sc) { struct devlog_params *dparams = &sc->params.devlog; int rc; +#ifdef INVARIANTS + if (sc->params.ncores > 1) + MPASS(chip_id(sc) >= CHELSIO_T7); +#endif rc = validate_mt_off_len(sc, dparams->memtype, dparams->start, dparams->size, &dparams->addr); @@ -5559,7 +5563,7 @@ get_params__pre_init(struct adapter *sc) /* Read device log parameters. */ rc = -t4_init_devlog_ncores_params(sc, 1); if (rc == 0) - fixup_devlog_params(sc); + fixup_devlog_ncores_params(sc); else { device_printf(sc->dev, "failed to get devlog parameters: %d.\n", rc); @@ -5712,8 +5716,6 @@ get_params__post_init(struct adapter *sc) } if (sc->params.ncores > 1) { - MPASS(chip_id(sc) >= CHELSIO_T7); - param[0] = FW_PARAM_DEV(TID_QID_SEL_MASK); rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 1, param, val); sc->params.tid_qid_sel_mask = rc == 0 ? val[0] : 0; diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index a9243ff121a6..07e4165db4a0 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -4372,18 +4372,17 @@ qsize_to_fthresh(int qsize) static int ctrl_eq_alloc(struct adapter *sc, struct sge_eq *eq, int idx) { - int rc, cntxt_id, core; + int rc, cntxt_id; struct fw_eq_ctrl_cmd c; int qsize = eq->sidx + sc->params.sge.spg_len / EQ_ESIZE; - core = sc->params.tid_qid_sel_mask != 0 ? idx % sc->params.ncores : 0; bzero(&c, sizeof(c)); c.op_to_vfn = htobe32(V_FW_CMD_OP(FW_EQ_CTRL_CMD) | F_FW_CMD_REQUEST | F_FW_CMD_WRITE | F_FW_CMD_EXEC | V_FW_EQ_CTRL_CMD_PFN(sc->pf) | V_FW_EQ_CTRL_CMD_VFN(0)); c.alloc_to_len16 = htobe32(F_FW_EQ_CTRL_CMD_ALLOC | - V_FW_EQ_CTRL_CMD_COREGROUP(core) | + V_FW_EQ_CTRL_CMD_COREGROUP(idx % sc->params.ncores) | F_FW_EQ_CTRL_CMD_EQSTART | FW_LEN16(c)); c.cmpliqid_eqid = htonl(V_FW_EQ_CTRL_CMD_CMPLIQID(eq->iqid)); c.physeqid_pkd = htobe32(0); @@ -4420,18 +4419,17 @@ ctrl_eq_alloc(struct adapter *sc, struct sge_eq *eq, int idx) static int eth_eq_alloc(struct adapter *sc, struct vi_info *vi, struct sge_eq *eq, int idx) { - int rc, cntxt_id, core; + int rc, cntxt_id; struct fw_eq_eth_cmd c; int qsize = eq->sidx + sc->params.sge.spg_len / EQ_ESIZE; - core = sc->params.ncores > 1 ? idx % sc->params.ncores : 0; bzero(&c, sizeof(c)); c.op_to_vfn = htobe32(V_FW_CMD_OP(FW_EQ_ETH_CMD) | F_FW_CMD_REQUEST | F_FW_CMD_WRITE | F_FW_CMD_EXEC | V_FW_EQ_ETH_CMD_PFN(sc->pf) | V_FW_EQ_ETH_CMD_VFN(0)); c.alloc_to_len16 = htobe32(F_FW_EQ_ETH_CMD_ALLOC | - V_FW_EQ_ETH_CMD_COREGROUP(core) | + V_FW_EQ_ETH_CMD_COREGROUP(idx % sc->params.ncores) | F_FW_EQ_ETH_CMD_EQSTART | FW_LEN16(c)); c.autoequiqe_to_viid = htobe32(F_FW_EQ_ETH_CMD_AUTOEQUIQE | F_FW_EQ_ETH_CMD_AUTOEQUEQE | V_FW_EQ_ETH_CMD_VIID(vi->viid)); From nobody Mon Mar 9 09:21:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTs315bffz6VSFP for ; Mon, 09 Mar 2026 09:21: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTs314qCwz3Z5f for ; Mon, 09 Mar 2026 09:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773048109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nSK1qUyM3X6FldvKwdyivAyGlnWbUO5U5MvoTI5n3/c=; b=eFXNsctZ1KENouXUOvJtqPRmI0mMZcP4rAYYKb3b5a6MbHU0rgB4WE2xNJaMmhXI6dOeiO y1/McbSaA7pScNned7QxJSvt0FgJVOqHWQ1UG8O3TvH+m/QUwQ585abH3AUiR+5PXcxmhr pwL+0cR+bdcXPNt3WMFhaDbFmy84Lh2LUPL1mVU5/eKgXRT5tEKjMgSVKIupobLCACQoWh wDGkZUpzU+kxRzTDtdkKPCkX/r/EZ5XIkdIunkj1xsFotHhFtgX+MofM8GL/bRyLNBkMTa pE0cx2sTIWp2Ftyocne+4iJU9WEJ7xqpgtT3w2Xp58zMRp46ApYrf/9b/MILEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773048109; a=rsa-sha256; cv=none; b=XizaTjnq8g7jf3coljycknxxOds22YY25HoPzeuLMJEU7Vul/jw/m7pa6fW/cUUcvCo9bm SZDZTknJvFdK9fZ4aZmLRH40LADe3SkxfdqURVyYd65aFJuznnTTbn9p/IlKxPCiTKpCYU qXgpy85a1xy2xZ6LFlpAjq9tXL+Rfj1TJzF3SRgvQptwx7gT9gIfLJJPDf9fkeFYeQN+gC mLo2LNhtNNArcq5Hiq81awki/19LAPCnrMTdMtpzf6yzbNPQUc8xQD8WBV7U/wz7AEZ/4O NV648wp7J29BKNmOqkhSv0AwGcxgFHiSU9W6OYz7N/SunC/YwrseaYpMJNL/7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773048109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nSK1qUyM3X6FldvKwdyivAyGlnWbUO5U5MvoTI5n3/c=; b=mLdIsozlKAnMCn1UxgFh2U1sD/r32rM06M0V5CNfpoyhB0yE8iFgwYLuC2EQZ7mjeRZblL h03Qv806wa9vzHhU1z75pcr4rJzcyCh1cNXlQwn3uNCpe4FBxpi2nymSBtaAhlRgZA6GsM 6zOM9psUtzwTXiIJwjHf38ZTpous89YwDNz26wvkKlX4/Mz2LCd1WlIHpVxHAJCawi+YAd 8nKes6MXo9/IkKnVFgtO/tkLnv8d1Wlm5Xb7/IfrgB2NExLHCodn1IhxMsySGJi25FgkME 5T/nPo6yHIwhSv3EfVoPkuX1tJlrQkr8fhNuUzaR7ptPmVOgqs5/KFwLgsIw3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTs314Jftz3lS for ; Mon, 09 Mar 2026 09:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d042 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 09:21:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: f87ba4522ec9 - main - acpi_system76: Add support for battary charge thresholds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f87ba4522ec9e7b2227b8f20f3a4d7c6a129da1c Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 09:21:49 +0000 Message-Id: <69ae912d.3d042.77be2a85@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=f87ba4522ec9e7b2227b8f20f3a4d7c6a129da1c commit f87ba4522ec9e7b2227b8f20f3a4d7c6a129da1c Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-07 18:33:43 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-09 09:11:56 +0000 acpi_system76: Add support for battary charge thresholds Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D55710 --- sys/dev/acpi_support/acpi_system76.c | 147 +++++++++++++++++++++++++++-------- 1 file changed, 116 insertions(+), 31 deletions(-) diff --git a/sys/dev/acpi_support/acpi_system76.c b/sys/dev/acpi_support/acpi_system76.c index c20725f0174e..9ae7d116be0b 100644 --- a/sys/dev/acpi_support/acpi_system76.c +++ b/sys/dev/acpi_support/acpi_system76.c @@ -54,7 +54,9 @@ struct acpi_system76_softc { ACPI_HANDLE handle; struct acpi_ctrl kbb, /* S76_CTRL_KBB */ - kbc; /* S76_CTRL_KBC */ + kbc, /* S76_CTRL_KBC */ + bctl, /* S76_CTRL_BCTL */ + bcth; /* S76_CTRL_BCTH */ struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; @@ -72,19 +74,25 @@ static void acpi_system76_notify_handler(ACPI_HANDLE, uint32_t, void *); static void acpi_system76_check(struct acpi_system76_softc *); /* methods */ -#define S76_CTRL_KBB 1 /* Keyboard Brightness */ -#define S76_CTRL_KBC 2 /* Keyboard Color */ -#define S76_CTRL_MAX 3 +enum { + S76_CTRL_KBB = 1, /* Keyboard Brightness */ + S76_CTRL_KBC = 2, /* Keyboard Color */ + S76_CTRL_BCTL = 3, /* Battary Charging Start Thresholds */ + S76_CTRL_BCTH = 4, /* Battary Charging End Thresholds */ +}; +#define S76_CTRL_MAX 5 struct s76_ctrl_table { char *name; char *get_method; #define S76_CTRL_GKBB "\\_SB.S76D.GKBB" #define S76_CTRL_GKBC "\\_SB.S76D.GKBC" +#define S76_CTRL_GBCT "\\_SB.PCI0.LPCB.EC0.GBCT" char *set_method; #define S76_CTRL_SKBB "\\_SB.S76D.SKBB" #define S76_CTRL_SKBC "\\_SB.S76D.SKBC" +#define S76_CTRL_SBCT "\\_SB.PCI0.LPCB.EC0.SBCT" char *desc; }; @@ -102,6 +110,18 @@ static const struct s76_ctrl_table s76_sysctl_table[] = { .set_method = S76_CTRL_SKBC, .desc = "Keyboard Color", }, + [S76_CTRL_BCTL] = { + .name = "battary_thresholds_low", + .get_method = S76_CTRL_GBCT, + .set_method = S76_CTRL_SBCT, + .desc = "Battary charging start thresholds", + }, + [S76_CTRL_BCTH] = { + .name = "battary_thresholds_high", + .get_method = S76_CTRL_GBCT, + .set_method = S76_CTRL_SBCT, + .desc = "Battary charging end thresholds", + }, }; static device_method_t acpi_system76_methods[] = { @@ -135,10 +155,12 @@ acpi_system76_ctrl_map(struct acpi_system76_softc *sc, int method) switch (method) { case S76_CTRL_KBB: return (&sc->kbb); - break; case S76_CTRL_KBC: return (&sc->kbc); - break; + case S76_CTRL_BCTL: + return (&sc->bctl); + case S76_CTRL_BCTH: + return (&sc->bcth); default: device_printf(sc->dev, "Driver received unknown method\n"); return (NULL); @@ -150,6 +172,9 @@ acpi_system76_update(struct acpi_system76_softc *sc, int method, bool set) { struct acpi_ctrl *ctrl; ACPI_STATUS status; + ACPI_BUFFER Buf; + ACPI_OBJECT Arg[2], Obj; + ACPI_OBJECT_LIST Args; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_SERIAL_ASSERT(system76); @@ -157,12 +182,41 @@ acpi_system76_update(struct acpi_system76_softc *sc, int method, bool set) if ((ctrl = acpi_system76_ctrl_map(sc, method)) == NULL) return (EINVAL); - if (set) - status = acpi_SetInteger(sc->handle, s76_sysctl_table[method].set_method, - ctrl->val); - else - status = acpi_GetInteger(sc->handle, s76_sysctl_table[method].get_method, - &ctrl->val); + switch (method) { + case S76_CTRL_BCTL: + case S76_CTRL_BCTH: + Arg[0].Type = ACPI_TYPE_INTEGER; + Arg[0].Integer.Value = method == S76_CTRL_BCTH ? 1 : 0; + Args.Count = set ? 2 : 1; + Args.Pointer = Arg; + Buf.Length = sizeof(Obj); + Buf.Pointer = &Obj; + + if (set) { + Arg[1].Type = ACPI_TYPE_INTEGER; + Arg[1].Integer.Value = ctrl->val; + + status = AcpiEvaluateObject(sc->handle, + s76_sysctl_table[method].set_method, &Args, &Buf); + } else { + status = AcpiEvaluateObject(sc->handle, + s76_sysctl_table[method].get_method, &Args, &Buf); + if (ACPI_SUCCESS(status) && + Obj.Type == ACPI_TYPE_INTEGER) + ctrl->val = Obj.Integer.Value; + } + break; + case S76_CTRL_KBB: + case S76_CTRL_KBC: + if (set) + status = acpi_SetInteger(sc->handle, s76_sysctl_table[method].set_method, + ctrl->val); + else + status = acpi_GetInteger(sc->handle, s76_sysctl_table[method].get_method, + &ctrl->val); + break; + } + if (ACPI_FAILURE(status)) { device_printf(sc->dev, "Couldn't query method (%s)\n", s76_sysctl_table[method].name); @@ -183,8 +237,12 @@ acpi_system76_notify_update(void *arg) sc = (struct acpi_system76_softc *)device_get_softc(arg); ACPI_SERIAL_BEGIN(system76); - for (method = 1; method < S76_CTRL_MAX; method++) + for (method = 1; method < S76_CTRL_MAX; method++) { + if (method == S76_CTRL_BCTL || + method == S76_CTRL_BCTH) + continue; acpi_system76_update(sc, method, false); + } ACPI_SERIAL_END(system76); } @@ -201,6 +259,14 @@ acpi_system76_check(struct acpi_system76_softc *sc) if ((ctrl = acpi_system76_ctrl_map(sc, method)) == NULL) continue; + /* available in all models */ + if (method == S76_CTRL_BCTL || + method == S76_CTRL_BCTH) { + ctrl->exists = true; + acpi_system76_update(sc, method, false); + continue; + } + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, s76_sysctl_table[method].get_method, &ctrl->val))) { ctrl->exists = false; @@ -236,9 +302,10 @@ acpi_system76_notify_handler(ACPI_HANDLE handle, uint32_t notify, void *ctx) static int acpi_system76_sysctl_handler(SYSCTL_HANDLER_ARGS) { - struct acpi_ctrl *ctrl; + struct acpi_ctrl *ctrl, *ctrl_cmp; struct acpi_system76_softc *sc; int val, method, error; + bool update; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -253,27 +320,45 @@ acpi_system76_sysctl_handler(SYSCTL_HANDLER_ARGS) device_printf(sc->dev, "Driver query failed\n"); return (error); } - if (req->newptr == NULL) - return (error); - /* Input validation */ - switch (method) { - case S76_CTRL_KBB: - if (val > UINT8_MAX || val < 0) - return (EINVAL); - break; - case S76_CTRL_KBC: - if (val >= (1 << 24) || val < 0) - return (EINVAL); - break; - default: - break; + if (req->newptr == NULL) { + /* + * ACPI will not notify us if battary thresholds changes + * outside this module. Therefore, always fetch those values. + */ + if (method != S76_CTRL_BCTL && method != S76_CTRL_BCTH) + return (error); + update = false; + } else { + /* Input validation */ + switch (method) { + case S76_CTRL_KBB: + if (val > UINT8_MAX || val < 0) + return (EINVAL); + break; + case S76_CTRL_KBC: + if (val >= (1 << 24) || val < 0) + return (EINVAL); + break; + case S76_CTRL_BCTL: + if ((ctrl_cmp = acpi_system76_ctrl_map(sc, S76_CTRL_BCTH)) == NULL) + return (EINVAL); + if (val > 100 || val < 0 || val >= ctrl_cmp->val) + return (EINVAL); + break; + case S76_CTRL_BCTH: + if ((ctrl_cmp = acpi_system76_ctrl_map(sc, S76_CTRL_BCTL)) == NULL) + return (EINVAL); + if (val > 100 || val < 0 || val <= ctrl_cmp->val) + return (EINVAL); + break; + } + ctrl->val = val; + update = true; } - ctrl->val = val; - ACPI_SERIAL_BEGIN(system76); - error = acpi_system76_update(sc, method, true); + error = acpi_system76_update(sc, method, update); ACPI_SERIAL_END(system76); return (error); } From nobody Mon Mar 9 09:21:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTs333wP7z6VSZc for ; Mon, 09 Mar 2026 09:21: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTs326NCDz3ZJ3 for ; Mon, 09 Mar 2026 09:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773048110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YDKIGhbDBsO/9I1xt+AzVx0QvtM6pGpn1obBWLDGD0E=; b=vr+avFFt+wsMqvhgSVPVhcX6FNTmstyTki5qXC7rOgs4e+1tBKu2RQngHdMcANY5s/NRJe xLY1O4efDBKZ62IVDcy4mKst+r+CZmQerXwl/0vcRkcte2e55Ag0OYR3yZIdMM1Nx4FVFK BT4+EuAFKET1mbEMhBCC46h8G4OUU2r4I2w1cREB4kY29b13xfU2HiRoZ3A9mswPtS++ul ZI+TcklBCNp5FpxHGAHiX5hB8i7vYU1YaBoCwxQP5+vwaMmmalmaClkYFW5a4WFd+cVaU5 Evae7y9/EXCdFAuejf0AojZ42XP+AMjyUr9pbnSKS4s+WjjR9dm2hBZYcpIstA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773048110; a=rsa-sha256; cv=none; b=nC9WotsqMang+ApQWT1Hf69y+RLJDOgqu3kafWpA56/C9qSkZA4a3PJ70C1mQUfv7zyvzW /UiqIyegYTjs1q1NDOh+3hQGbvZMUEzb3lDGUw7SdDcJJDrcG5xiv1TRFbBjTqMHTHugNE 7ubeqEEvCRt+xSNOnc/nxkhoR38PYzEy6aLz1oTUFRYIsATDGlkajLpqRxe5utDR+5dtzA 6Db+MyNHKZvN7Ah5ooWrvK3CRlrUsbpltwiSOMWXbQDOvBYqXWfIsa/puOeW8wrGIJ7wuD KgApLgMkYDUU0sZwoQzMGH4/I8SJOyzyGLvxXY8N52IEEJGv7ed5LBy5ycLx3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773048110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YDKIGhbDBsO/9I1xt+AzVx0QvtM6pGpn1obBWLDGD0E=; b=VfK2ECk5HcxF6OGV7Y6b2a2ybnJ0PBYqWpAA5eolEYfI8zPjTWOFSSui/CF4koo2/4e8ON BeSxqwPcebAFJKJl+hjeE4/7O+VhpAv8teJoJ5+qnfEcHIYaQgks6dDkwkExYHgyQRQKyH ftJ7jFpJGx3zfZNwv/d/4nuGLrAJU84N9MjmEH/6//HZnTVoI/4CQCj9VUzgBgNMDJ5Rs/ kBVfWR8IZdn+35WKO05CrG99DJmoyJvPzSluAOurVfNga3ovJWea6QYsKgVR5Kwq8sRgQo c+kZAv0Eim4K7YDKYD9Td5zNvi99p78/5nFNnmx0WHIqLcIH/osf/UcJNCKe7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTs3258Ylz3lT for ; Mon, 09 Mar 2026 09:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d899 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 09:21:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 105869a2c78d - main - acpi_system76: Add backlight(9) support for keyboard List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 105869a2c78d21f310a8f271eaa510acea045805 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 09:21:50 +0000 Message-Id: <69ae912e.3d899.3605b43c@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=105869a2c78d21f310a8f271eaa510acea045805 commit 105869a2c78d21f310a8f271eaa510acea045805 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-07 22:40:21 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-09 09:12:01 +0000 acpi_system76: Add backlight(9) support for keyboard Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D55716 --- sys/dev/acpi_support/acpi_system76.c | 145 ++++++++++++++++++++++++++++++++ sys/modules/acpi/acpi_system76/Makefile | 1 + 2 files changed, 146 insertions(+) diff --git a/sys/dev/acpi_support/acpi_system76.c b/sys/dev/acpi_support/acpi_system76.c index 9ae7d116be0b..a4ac848a0fec 100644 --- a/sys/dev/acpi_support/acpi_system76.c +++ b/sys/dev/acpi_support/acpi_system76.c @@ -38,6 +38,9 @@ #include #include +#include +#include "backlight_if.h" + #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("system76") @@ -60,11 +63,16 @@ struct acpi_system76_softc { struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; + struct cdev *kbb_bkl; + uint8_t backlight_level; }; static int acpi_system76_probe(device_t); static int acpi_system76_attach(device_t); static int acpi_system76_detach(device_t); +static int acpi_system76_suspend(device_t); +static int acpi_system76_resume(device_t); +static int acpi_system76_shutdown(device_t); static void acpi_system76_init(struct acpi_system76_softc *); static struct acpi_ctrl * acpi_system76_ctrl_map(struct acpi_system76_softc *, int); @@ -72,6 +80,12 @@ static int acpi_system76_update(struct acpi_system76_softc *, int, bool); static int acpi_system76_sysctl_handler(SYSCTL_HANDLER_ARGS); static void acpi_system76_notify_handler(ACPI_HANDLE, uint32_t, void *); static void acpi_system76_check(struct acpi_system76_softc *); +static int acpi_system76_backlight_update_status(device_t dev, + struct backlight_props *props); +static int acpi_system76_backlight_get_status(device_t dev, + struct backlight_props *props); +static int acpi_system76_backlight_get_info(device_t dev, + struct backlight_info *info); /* methods */ enum { @@ -125,9 +139,18 @@ static const struct s76_ctrl_table s76_sysctl_table[] = { }; static device_method_t acpi_system76_methods[] = { + /* Device interface */ DEVMETHOD(device_probe, acpi_system76_probe), DEVMETHOD(device_attach, acpi_system76_attach), DEVMETHOD(device_detach, acpi_system76_detach), + DEVMETHOD(device_suspend, acpi_system76_suspend), + DEVMETHOD(device_resume, acpi_system76_resume), + DEVMETHOD(device_shutdown, acpi_system76_shutdown), + + /* Backlight interface */ + DEVMETHOD(backlight_update_status, acpi_system76_backlight_update_status), + DEVMETHOD(backlight_get_status, acpi_system76_backlight_get_status), + DEVMETHOD(backlight_get_info, acpi_system76_backlight_get_info), DEVMETHOD_END }; @@ -145,6 +168,33 @@ static driver_t acpi_system76_driver = { sizeof(struct acpi_system76_softc) }; +static const uint32_t acpi_system76_backlight_levels[] = { + 0, 6, 12, 18, 24, 30, 36, 42, + 48, 54, 60, 66, 72, 78, 84, 100 +}; + +static inline uint32_t +devstate_to_backlight(uint32_t val) +{ + return (acpi_system76_backlight_levels[val >> 4 & 0xf]); +} + +static inline uint32_t +backlight_to_devstate(uint32_t bkl) +{ + int i; + uint32_t val; + + for (i = 0; i < nitems(acpi_system76_backlight_levels); i++) { + if (bkl < acpi_system76_backlight_levels[i]) + break; + } + val = (i - 1) * 16; + if (val > 224) + val = 255; + return (val); +} + /* * Returns corresponding acpi_ctrl of softc from method */ @@ -244,6 +294,9 @@ acpi_system76_notify_update(void *arg) acpi_system76_update(sc, method, false); } ACPI_SERIAL_END(system76); + + if (sc->kbb_bkl != NULL) + sc->backlight_level = devstate_to_backlight(sc->kbb.val); } static void @@ -335,6 +388,8 @@ acpi_system76_sysctl_handler(SYSCTL_HANDLER_ARGS) case S76_CTRL_KBB: if (val > UINT8_MAX || val < 0) return (EINVAL); + if (sc->kbb_bkl != NULL) + sc->backlight_level = devstate_to_backlight(val); break; case S76_CTRL_KBC: if (val >= (1 << 24) || val < 0) @@ -386,6 +441,14 @@ acpi_system76_init(struct acpi_system76_softc *sc) if (!ctrl->exists) continue; + if (method == S76_CTRL_KBB) { + sc->kbb_bkl = backlight_register("system76_keyboard", sc->dev); + if (sc->kbb_bkl == NULL) + device_printf(sc->dev, "Can not register backlight\n"); + else + sc->backlight_level = devstate_to_backlight(sc->kbb.val); + } + SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, s76_sysctl_table[method].name, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, @@ -393,6 +456,45 @@ acpi_system76_init(struct acpi_system76_softc *sc) } } +static int +acpi_system76_backlight_update_status(device_t dev, struct backlight_props + *props) +{ + struct acpi_system76_softc *sc; + + sc = device_get_softc(dev); + if (sc->kbb.val != backlight_to_devstate(props->brightness)) { + sc->kbb.val = backlight_to_devstate(props->brightness); + acpi_system76_update(sc, S76_CTRL_KBB, true); + } + sc->backlight_level = props->brightness; + + return (0); +} + +static int +acpi_system76_backlight_get_status(device_t dev, struct backlight_props *props) +{ + struct acpi_system76_softc *sc; + + sc = device_get_softc(dev); + props->brightness = sc->backlight_level; + props->nlevels = nitems(acpi_system76_backlight_levels); + memcpy(props->levels, acpi_system76_backlight_levels, + sizeof(acpi_system76_backlight_levels)); + + return (0); +} + +static int +acpi_system76_backlight_get_info(device_t dev, struct backlight_info *info) +{ + info->type = BACKLIGHT_TYPE_KEYBOARD; + strlcpy(info->name, "System76 Keyboard", BACKLIGHTMAXNAMELENGTH); + + return (0); +} + static int acpi_system76_attach(device_t dev) { @@ -423,9 +525,51 @@ acpi_system76_detach(device_t dev) if (sysctl_ctx_free(&sc->sysctl_ctx) != 0) return (EBUSY); + AcpiRemoveNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, + acpi_system76_notify_handler); + + if (sc->kbb_bkl != NULL) + backlight_destroy(sc->kbb_bkl); + return (0); } +static int +acpi_system76_suspend(device_t dev) +{ + struct acpi_system76_softc *sc; + struct acpi_ctrl *ctrl; + + sc = device_get_softc(dev); + if ((ctrl = acpi_system76_ctrl_map(sc, S76_CTRL_KBB)) != NULL) { + ctrl->val = 0; + acpi_system76_update(sc, S76_CTRL_KBB, true); + } + + return (0); +} + +static int +acpi_system76_resume(device_t dev) +{ + struct acpi_system76_softc *sc; + struct acpi_ctrl *ctrl; + + sc = device_get_softc(dev); + if ((ctrl = acpi_system76_ctrl_map(sc, S76_CTRL_KBB)) != NULL) { + ctrl->val = backlight_to_devstate(sc->backlight_level); + acpi_system76_update(sc, S76_CTRL_KBB, true); + } + + return (0); +} + +static int +acpi_system76_shutdown(device_t dev) +{ + return (acpi_system76_detach(dev)); +} + static int acpi_system76_probe(device_t dev) { @@ -444,3 +588,4 @@ acpi_system76_probe(device_t dev) DRIVER_MODULE(acpi_system76, acpi, acpi_system76_driver, 0, 0); MODULE_VERSION(acpi_system76, 1); MODULE_DEPEND(acpi_system76, acpi, 1, 1, 1); +MODULE_DEPEND(acpi_system76, backlight, 1, 1, 1); diff --git a/sys/modules/acpi/acpi_system76/Makefile b/sys/modules/acpi/acpi_system76/Makefile index 86d2c91e712d..76bee091dfca 100644 --- a/sys/modules/acpi/acpi_system76/Makefile +++ b/sys/modules/acpi/acpi_system76/Makefile @@ -3,5 +3,6 @@ KMOD= acpi_system76 CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_system76.c opt_acpi.h acpi_if.h device_if.h bus_if.h +SRCS+= backlight_if.h .include From nobody Mon Mar 9 09:42:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTsVR1Rn4z6VTYp for ; Mon, 09 Mar 2026 09: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTsVR0ZRRz3c37 for ; Mon, 09 Mar 2026 09:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773049327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vB1UvnXjkt/YNRA42syKlE3c5gE1C7s3OCVXrge01Q=; b=PKudEg39kFWXctQ/4Vopu1HGMYHi3mhHLwokfExjvRsq/qoDKEKK7PXpiG3Uy126rqsH5/ BenWJQAXiv3aJGP20PrOstAcTacd1PFnzLD4lCgNd3myxkT2pVcu/7wFNlbLSB+bf4mbQ/ 8rmZIcwedhgICP43qTCVOYyB2uuAmShVEhNzKiYo4/VeHHORbGp0A18Wqsc9a28QN67IKv KIt4U1cahRPams2vO9SFs0pRP9f6Reg4D8ciIZ4bAfcn4MiMo15DuIgs5rDfvlikEENK2o TboKQejiNAnQKWMY+5VaAQeukDHv6rbLzCHACvgOk+buWaM+PKp0QACwWSZyVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773049327; a=rsa-sha256; cv=none; b=PL1wVz/3vh8F8jUxzZ0DRRohMsI9kplpozHe5SH87GEmjwbVsIKvEX35JcXtUirup92AW7 ZX+9DALKIu1ikC6furCD5TDVqHpKIkOcVrd7IElG77SWkXwg3RsiyJx+ei/juBuI+uq59T CznGDNX08Rmy2A6sFVqZMgzl4cqlFo5htgLJrLfnqT/VlaV9egaFXrm8kJWlGazBMS8rLA CziUD3fpxUGetjsDci4szxf6IIg8WZojAAH8uzm9B647+CS6Wh14DrDOSEny1edaQ7dMCO ZfDhHtmqhvHantHeprxmOiYSl+AfZvtRo/lQwX4j26IAU2x6l6udUHy9gebNMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773049327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vB1UvnXjkt/YNRA42syKlE3c5gE1C7s3OCVXrge01Q=; b=ZSODUbZqphlqjQpFKhPBeLZ3AobWbVbDASj6m1qTjDfSvgiWPabDeisAYdSfxRLylr84/P Jq1ngEv4hSBEsnbQK3spVbqU6h5MMuxaFR/UYTfmrx6j55c5FQbDtfj+Bv5Ky297vEddF+ epLlK20jEt+w8JXKoFEQwPdhgWu1j7IxShNLQnY7khnATlLEqLUQ8HsbqkB8u3VXVU8igo OsYdtFMht2sqJL6mEKpTKclX+OciL8IT1DiY/dy9Wcu3B2cE1XsCpg1h3BKjH5XyZdhfcn oUYBMU6IAtWWLumAV04P/JPy4i9NovYfkaggImEzKZl7gsgBu3fqWz40Vgwbyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTsVR08LLz4RJ for ; Mon, 09 Mar 2026 09:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f5b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 09:42:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 8f0ea068db8a - stable/15 - netinet6: Fix memory leak on auto_linklocal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 8f0ea068db8a4b48575146579f30f6ef4fff6584 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 09:42:01 +0000 Message-Id: <69ae95e9.3f5b8.240b934e@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=8f0ea068db8a4b48575146579f30f6ef4fff6584 commit 8f0ea068db8a4b48575146579f30f6ef4fff6584 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-02 15:24:23 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-09 09:36:40 +0000 netinet6: Fix memory leak on auto_linklocal release the refcount of link-local prefix information to ensure it gets freed when the address is deleted. Reviewed By: zlei, ivy MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55593 (cherry picked from commit b55bffeaaf9bae5dc7aa21eae441d89c999ebab8) --- sys/netinet6/in6_ifattach.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index c9e951e93ec8..c35bc16903a2 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -629,8 +629,8 @@ in6_ifattach_linklocal(struct ifnet *ifp, struct ifnet *altifp) /* Reference prefix */ ia->ia6_ndpr = pr; pr->ndpr_addrcnt++; - } else - nd6_prefix_rele(pr); + } + nd6_prefix_rele(pr); return 0; } From nobody Mon Mar 9 11:03:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJZ5c94z6VZL2 for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJZ4YGgz3lBD for ; Mon, 09 Mar 2026 11:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvToeuDWgn0Yznfj+BhQ1DxHF9wNcUiVBF0vxGuLdLE=; b=vN9cX5Ih6K4ZbRp97t99FlRKEtBSK08X8QW7rz34AZUobSxuqqAuHvkcvBiCTr27Bciv/f +t1kUC4R9V5rEHWEg1KHAlC9Oz/DYZx/ici3WyDdvDfLBu6bZMt9F1Lfb5Mj8aReafhYLR kV9ylFO49PwgbotJF6h3SIrK1oFnR2Y1I4dcwO5eJZjfbPqd50eUZFYpgNQvZhy6RdViga xpbmL3Na7aHzeP7+BihmYYhvPSXlBlpcIgkb8P3AejfcHA/hwAdHa7tSZ9cKanySRJPj/K 1LfnerlzVkcEIKGe4ZyTuq9VJYSk2tnJIiId7PazSSYUB9uhrdJ2Ra4iNrmbsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054222; a=rsa-sha256; cv=none; b=W7jOtvlKKzVbiPaN4yZSOMxFLli6WiXnEXuP2ELnlK8NUX+gSwRyQ8RDdzRiFKPj47zxRA x50DKt3+vzi9EGuUvJdrHLTib/m4rMeUPykXxeL2f7gQ4LZgrBQsgWkfYj8mX18uchjpq4 wxMhZ8tMbRXNSr7YVwwEql7znZUEzU0ZiLQfL1J4Q4DI9Ijl/DgUGhyyEJMYT/zTtV540q GUI51tkpSQmy2YB2R05zo3DGQ1897iFXgxPe97Fi1vo1rBINYeBUFKYPFpP8bCNoWPHxYl tjS07Rb4mkq0R8c5UnFBFxMwcMJIe0hqb6PkQ+3sZXi1Aon0cZfeoN1g8hF7hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvToeuDWgn0Yznfj+BhQ1DxHF9wNcUiVBF0vxGuLdLE=; b=LKMzkZeBLcnplj4wAlUuV31MBQLWXAEposiM2Za3pO1ssHJ5zaDN2DxqJV8NLNbeGkWNmf CIQHq1Z91HC9o9SUCpJXDd4eBlnlMRWWfIjhtXoLBx6oeKvh06xBSOQs9At3qsGpy66iG2 o2PQ/X99z3IceLfheea4YyNIIRZG1/mMPuN39AyWE3oXpswAjOG+wN7akTsIw3BEy1dTvE AadxbnstXcNjN+oSZDrZoZMn8WW6S1Crw2P6PXrLUR/87uEsmmLVW6x1h69xqQidzxrOsm DZyIWIg4o8+VjHG61XU51dNMMKl18nPxGmb8uqMt3HA8SMZPDLpUTV/FPuyVxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJZ3pJhz6QG for ; Mon, 09 Mar 2026 11:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46338 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 81b53d35c54a - stable/15 - LinuxKPI: 802.11: fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 81b53d35c54a529fb3b3706513b2ce35f9c9fee1 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:42 +0000 Message-Id: <69aea90e.46338.b251f90@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=81b53d35c54a529fb3b3706513b2ce35f9c9fee1 commit 81b53d35c54a529fb3b3706513b2ce35f9c9fee1 Author: Bjoern A. Zeeb AuthorDate: 2026-02-17 03:05:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:09 +0000 LinuxKPI: 802.11: fix typo Sponsored by: The FreeBSD Foundation (cherry picked from commit fa0f891d54449837b47f2ef2266163bdd9117879) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 48b87ae47751..20ab5a641415 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3508,7 +3508,7 @@ lkpi_iv_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) } else { ic_printf(vap->iv_ic, "%s: only station mode currently supported: " - "cap %p iv_opmode %d\n", __func__, vap, vap->iv_opmode); + "vap %p iv_opmode %d\n", __func__, vap, vap->iv_opmode); return (ENOSYS); } From nobody Mon Mar 9 11:03:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJb69y1z6VZfJ for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJb53PKz3lPc for ; Mon, 09 Mar 2026 11:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vpKKkW0+b5Ridfu2oTa4+G5R+HRvPtoP0P9CMeAUYa4=; b=GlEiwHgOkP4w3dAMjNMA1NPQLt63i68Uh+qeHLVdkeKcDtEddb3zJlXBv2b0719TCCkkEP W4dCxm3M9Gmqfkgt47JlE7FLpQKMia1vRCxyLgEF3SC93/w8cHAxIOpNqc6/ztVBERHzer tVXgnoHmm1r4W3RO2p+RhAq0LmKbr4X8/eQxziVTal5ofXZhFGv+eKOqrPkdf9Bc37SgK+ MCAlcmx8sSOrlJjrywfk5QDasVLZhzKXSoPYFoHtfVCuWig0r1Ls1aHjKSxnQvW+vyiXCA SCIubv4CcKhFD1pRirBkcuVDaeFACHFo+YdvF6W43j1Kx15dJG07vRx1a0VBfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054223; a=rsa-sha256; cv=none; b=LOYVVzvbUZ/HCphOCJQk7xLbOJbufaUOb/6/ku6SKICdA0Od0/6zBfv4NrnKboLKQfmPHq 7tIRiUAPndg2tm5Tmva/s325r+vbKnpRAdCQFpo9CckfIjhCtEAWSoE6VT0OoU7JN0uz9C 3zzuev9qH2bpxZXAbF1W5X6KHUONjZnfpq0LtI9hmp06ndG6cxJp4WmQOfgAJLkSRyh5Ep /+waRoL5wuGExUNsQq/Asp0WuRg9p1IP4Dz0uWF9/7qqGj9tFcWnl2qkf6xNCzs4fboMf5 1VmOv9CgN4m2DiDhfm16Jm0YCtM+14b9jn5ldebs2CYsNvdGicXpR3z9oom2PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vpKKkW0+b5Ridfu2oTa4+G5R+HRvPtoP0P9CMeAUYa4=; b=fEuwwKyqYEYIgEZKVwsfzzapdqVRkiCNT1eDScOB7ChiUXtuMNwDQO8wH2fCu7PXEtOcEF aJ0K/wUQXC1qpBbaTlHuowjDXX0wZcTBcdUI91w4WYj7aJQkCezN/USWRsIma9fs3EBiHG GL0QmoHJ21L2vFbajKcaUZf88F5CavC5Vr3Y4xkfQoPo94iz8AWLhraPfOZYr/8nmclxpX u5DLFQpM7tZ+b39Aq6w3tqPg9iZYyagkRIvN0vQfExaP3qMiyxohXY8jOwPDobx5JpP/fn /eltzfY+TfdhQEygAobzMP+xHeWXKZ5W4xdT3mvrq3I1NHrp9GTu4i1HzKmFjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJb4S0yz79Q for ; Mon, 09 Mar 2026 11:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47964 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ca69d10943b2 - stable/15 - LinuxKPI: 802.11: move linuxkpi_ieee80211_handle_wake_tx_queue() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ca69d10943b2eeaa551514bd77d410d470edf225 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:43 +0000 Message-Id: <69aea90f.47964.591c0b91@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ca69d10943b2eeaa551514bd77d410d470edf225 commit ca69d10943b2eeaa551514bd77d410d470edf225 Author: Bjoern A. Zeeb AuthorDate: 2026-03-04 08:11:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:09 +0000 LinuxKPI: 802.11: move linuxkpi_ieee80211_handle_wake_tx_queue() No functional changes. Just moved the function within the file. Sponsored by: The FreeBSD Foundation (cherry picked from commit 3d3303b756ad4ee3ae520f6d07df6978d049a871) --- sys/compat/linuxkpi/common/src/linux_80211.c | 76 ++++++++++++++-------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 20ab5a641415..7b61ff6603b7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -8574,6 +8574,43 @@ linuxkpi_ieee80211_wake_queue(struct ieee80211_hw *hw, int qnum) spin_unlock_irqrestore(&lhw->txq_lock, flags); } +void +linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, + struct ieee80211_txq *txq) +{ + struct lkpi_hw *lhw; + + lhw = HW_TO_LHW(hw); + + LKPI_80211_LHW_TXQ_LOCK(lhw); + ieee80211_txq_schedule_start(hw, txq->ac); + do { + struct lkpi_txq *ltxq; + struct ieee80211_txq *ntxq; + struct ieee80211_tx_control control; + struct sk_buff *skb; + + ntxq = ieee80211_next_txq(hw, txq->ac); + if (ntxq == NULL) + break; + ltxq = TXQ_TO_LTXQ(ntxq); + + memset(&control, 0, sizeof(control)); + control.sta = ntxq->sta; + do { + skb = linuxkpi_ieee80211_tx_dequeue(hw, ntxq); + if (skb == NULL) + break; + ltxq->frms_tx++; + lkpi_80211_mo_tx(hw, &control, skb); + } while(1); + + ieee80211_return_txq(hw, ntxq, false); + } while (1); + ieee80211_txq_schedule_end(hw, txq->ac); + LKPI_80211_LHW_TXQ_UNLOCK(lhw); +} + /* -------------------------------------------------------------------------- */ /* This is just hardware queues. */ @@ -8675,45 +8712,6 @@ out: /* -------------------------------------------------------------------------- */ -void -linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, - struct ieee80211_txq *txq) -{ - struct lkpi_hw *lhw; - - lhw = HW_TO_LHW(hw); - - LKPI_80211_LHW_TXQ_LOCK(lhw); - ieee80211_txq_schedule_start(hw, txq->ac); - do { - struct lkpi_txq *ltxq; - struct ieee80211_txq *ntxq; - struct ieee80211_tx_control control; - struct sk_buff *skb; - - ntxq = ieee80211_next_txq(hw, txq->ac); - if (ntxq == NULL) - break; - ltxq = TXQ_TO_LTXQ(ntxq); - - memset(&control, 0, sizeof(control)); - control.sta = ntxq->sta; - do { - skb = linuxkpi_ieee80211_tx_dequeue(hw, ntxq); - if (skb == NULL) - break; - ltxq->frms_tx++; - lkpi_80211_mo_tx(hw, &control, skb); - } while(1); - - ieee80211_return_txq(hw, ntxq, false); - } while (1); - ieee80211_txq_schedule_end(hw, txq->ac); - LKPI_80211_LHW_TXQ_UNLOCK(lhw); -} - -/* -------------------------------------------------------------------------- */ - struct lkpi_cfg80211_bss { u_int refcnt; struct cfg80211_bss bss; From nobody Mon Mar 9 11:03:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJd1KvSz6VZGB for ; Mon, 09 Mar 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJc5VDyz3lFC for ; Mon, 09 Mar 2026 11:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AxiIZpoRpRtyf6O/xnmZtDkPFbuqcbZhnrAihJKfcyI=; b=qErBPzPPpyQ7UNegLs+Go8L1RokpOv7Fe5EnBXMQ+vCHBGQ651NPidkviaf4lfet8CWkXU /jrtri3nXNAC183Op8Z2MzT2o/Of8mWFaIfqbKrR0Y7vyvhce+U19Soi55hsd+kZcgVJ/L 3OzI3DfcsPX9u0MU1YcrfIxXDHhOyP7Y10fG7cGn329jm8tE22dtAZb/rRNlMtEnvOjN0z s/OJbJcE4mkU19MholQPOTK9wgTiOW/7jYZwGk3y5PTqugWeKYeEfF/Nkl68knblICfoWR NIsLIBGI9H6tXAWpfWV8HqAQZe6oYMC0/HblbqTSJqR12Ruhazv3OHGQXTY/zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054224; a=rsa-sha256; cv=none; b=elY2NbvbE2herscp0xYB3j1vtgpFZkwYlgh5KhTJyjwKMq6lLZfy0iz1HO3+tOomVXFCpY bbMPZc9Ex+ry9LE6elgHVmlJ/waWbLWLiLNMirepYG/WGeKzbGBC1iBV0J3+amJNpmm/4U dV0b27MqcU6d5CnrVCJfktZAaJ0Y4BgB4/ISIPTgIf0hF0bwgDEzMsK2gnDUjBM6zitSas 9rFu8fpKIdywF0bq9v+5AwJN3B7ZDogt4t7ci1AGTnhLI2NqPR6YEiILRZzIE46bf1Mksm QIwhCx/Fu7n0akqCqG+6X+YxANtfumx35VVXKVQCFTowqB0Kt2hjHNU9dQnBUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AxiIZpoRpRtyf6O/xnmZtDkPFbuqcbZhnrAihJKfcyI=; b=hLev3Kpzzcu9QTtR3MnkjopTvIzYApDOq+dVepGZSFt8asidQyCuDOCPv7+TyhR+M2Ev/9 hFus4iPXtpwYUu2XduwM++ZGpGwCYYeonoxSpwSHv38Ot1OQjB2MmaI75r9PtsJyCj/FZ0 gMWolN/zKxbW5/LewjnQtSOk00ELowkl3Dz8ZnVEQlhBa5mrh+CryYYG1cP50McU5agCe2 xVfkr2Ryi8I3k6owwGv6yhebMg6gvgFrr+8GJvHYiCzd/dv9jM9QxHZnlQ32h2T27DsYkT Re85VmtYBgPn9bXP/WBZmGt0iB1QoAFaaaaiYgr/oJwkdx2eRkyce4OIo5O5eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJc4rWQz6QJ for ; Mon, 09 Mar 2026 11:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47996 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 748f77531805 - stable/15 - LinuxKPI: 802.11: improve prep_tx_info List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 748f77531805c9baa7226c24af765eed6a9263b0 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:44 +0000 Message-Id: <69aea910.47996.da1352a@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=748f77531805c9baa7226c24af765eed6a9263b0 commit 748f77531805c9baa7226c24af765eed6a9263b0 Author: Bjoern A. Zeeb AuthorDate: 2026-03-02 12:51:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 LinuxKPI: 802.11: improve prep_tx_info Over time struct ieee80211_prep_tx_info has grown further fields. One which is becoming mandatory is the subtype (of the mgmt frame). iwlwifi(mld) has a WARN for it if it does not match, so we now have to set this for proper operation. In addition we are tyring to improve the situation of setting/unsetting (prepare_tx/complete_tx) in various states and cleanup the use of other fields but link_id which we now leave as a marker for the future everywhere. The general problem we are facing is that our hook surface in this case is the state machine but likely would have to be tx/rx mgmt frames but we would alos have to driver the TX queues from there which is tricky. The long-term answer is to change net80211. Further the hardware flag DEAUTH_NEED_MGD_TX_PREP is dead and was removed again in favour of leting drivers deal with it. iwlwifi(mvm) likely being the only driver which ever used this. Sponsored by: The FreeBSD Foundation (cherry picked from commit 8f532c7b25d54906c307bfda6cb679632cc26313) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 1 - sys/compat/linuxkpi/common/src/linux_80211.c | 93 ++++++++++++++++++----- 2 files changed, 72 insertions(+), 22 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 18891d035094..4f3aad532810 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -431,7 +431,6 @@ enum ieee80211_hw_flags { IEEE80211_HW_BUFF_MMPDU_TXQ, IEEE80211_HW_CHANCTX_STA_CSA, IEEE80211_HW_CONNECTION_MONITOR, - IEEE80211_HW_DEAUTH_NEED_MGD_TX_PREP, IEEE80211_HW_HAS_RATE_CONTROL, IEEE80211_HW_MFP_CAPABLE, IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR, diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 7b61ff6603b7..bbda35cb2e38 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2502,7 +2502,9 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Start mgd_prepare_tx. */ memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; + prep_tx_info.duration = PREP_TX_INFO_DURATION; /* SAE */ + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); lsta->in_mgd = true; @@ -2638,6 +2640,7 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in /* End mgd_complete_tx. */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; prep_tx_info.success = true; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; @@ -2648,7 +2651,8 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in /* Start mgd_prepare_tx. */ if (nstate == IEEE80211_S_ASSOC && !lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); lsta->in_mgd = true; } @@ -2796,7 +2800,9 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* End mgd_complete_tx. (we do not have to check ostate == IEEE80211_S_ASSOC). */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = true; + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.success = true; /* Needs vif->cfg.assoc set! */ + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; } @@ -2860,6 +2866,9 @@ out: * DOWN1 * "to assoc" means we are going back to State 2 from State 4[/3]. * This means ni still is authenticated, so we keep sta, chanctx, .. + * We will send a (Re)Assoc Request in case net80211 handles roadming. + * Note: this can be called as part of a DEAUTH going to State 1 as well, + * so for RoC prep_tx_info we need to check nstate (see run_to_{auth,scan,init}). */ static int lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) @@ -2910,15 +2919,33 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); - IMPROVE("What are the proper conditions for DEAUTH_NEED_MGD_TX_PREP?"); - if (ieee80211_hw_check(hw, DEAUTH_NEED_MGD_TX_PREP) && - !lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; - prep_tx_info.was_assoc = true; - lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = true; + /* We should make this a KASSERT. */ + if (lsta->in_mgd) { + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p lsta %p in_mgd\n", + __func__, __LINE__, lvif, vap, lsta); } + /* + * Problem is that we should hook into the tx/rx flow and not + * try to re-model the state machine parts. We may miss a SME + * triggered frame this way. + */ + memset(&prep_tx_info, 0, sizeof(prep_tx_info)); + if (nstate == IEEE80211_S_ASSOC) { + if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) { + if (arg) + prep_tx_info.subtype = IEEE80211_STYPE_REASSOC_REQ; + else + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + } else { + /* wpa_supplicant upon RTM_IEEE80211_LEAVE. */ + prep_tx_info.subtype = IEEE80211_STYPE_DISASSOC; + } + } else + prep_tx_info.subtype = IEEE80211_STYPE_DEAUTH; + prep_tx_info.was_assoc = true; + prep_tx_info.link_id = 0; + lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); + lsta->in_mgd = true; wiphy_unlock(hw->wiphy); IEEE80211_LOCK(vap->iv_ic); @@ -2957,13 +2984,13 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), false); /* End mgd_complete_tx. */ - if (lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; - prep_tx_info.was_assoc = true; - lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = false; + /* We should make this a KASSERT. */ + if (!lsta->in_mgd) { + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p lsta %p !in_mgd\n", + __func__, __LINE__, lvif, vap, lsta); } + lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); + lsta->in_mgd = false; #if 0 /* sync_rx_queues */ @@ -3047,6 +3074,7 @@ lkpi_sta_assoc_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, in struct ieee80211_vif *vif; struct ieee80211_node *ni; struct lkpi_sta *lsta; + struct ieee80211_prep_tx_info prep_tx_info; int error; lhw = vap->iv_ic->ic_softc; @@ -3077,6 +3105,20 @@ lkpi_sta_assoc_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, in lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + /* End mgd_complete_tx. */ + if (lsta->in_mgd && vap->iv_state == IEEE80211_S_ASSOC) { + memset(&prep_tx_info, 0, sizeof(prep_tx_info)); + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.link_id = 0; + lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); + lsta->in_mgd = false; + } else if (lsta->in_mgd) { + ic_printf(vap->iv_ic, "%s:%d: in_mgd %d (%s) -> %d (%s) %d\n", + __func__, __LINE__, + vap->iv_state, ieee80211_state_name[vap->iv_state], + nstate, ieee80211_state_name[nstate], arg); + } + /* Take the station down. */ /* Update sta_state (AUTH to NONE). */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); @@ -3158,7 +3200,8 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* End mgd_complete_tx. */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; } @@ -3342,17 +3385,25 @@ lkpi_sta_a_to_a(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) /* End mgd_complete_tx. */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; + if (vap->iv_state == IEEE80211_S_AUTH) + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; + else + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; } - /* Now start assoc. */ + /* Now start auth/assoc. */ /* Start mgd_prepare_tx. */ if (!lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; + if (nstate == IEEE80211_S_AUTH) + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; + else + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); lsta->in_mgd = true; } From nobody Mon Mar 9 11:03:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJf1rRWz6VZGF for ; Mon, 09 Mar 2026 11:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJd65Ybz3lFN for ; Mon, 09 Mar 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTUJdjKx1jkUUpwCXFKoys6BLffS8SBknLwaSzev9as=; b=m3dTNNSSXIMt9XXqUI4D2HKfPupXACVI5cEkmh5LMkaY+W2TemUay7vxwPvP7P4AzpGpxJ +HHdNeovxCRDCvosqCknRSKGUwf5JLtSqU1etAdX99a9wwE3eGlI7Q6EV1aTisHI/fK4Ey 16JnzGX4dhy4Rlrr+ER42Eh33oJVqE2hlpoi/E7Adq6pGutt0JfD65dDG5OW3PUJRhDXed Zhhtj8rkEpqx2goLrXoNxGgbKOzkUmw9bDLm2nIPFdAvjA5UjcX9Hz62Xly/O+O7m/1/Bo HT8h/qn6imHejKdHmjLHdLMbsTkyEFcH75RPh1JbzDiuIWIWXXrvKGyc7fDaDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054225; a=rsa-sha256; cv=none; b=n0+kxk41pi4fmB02BdpcMUqFQEo08fg/h7GNoTGcml1F899Ut/0UKfNsrh/e95fpL+Yudr DYfb2vvm9H0oV6e+nw2dCc9eVm4zFH2mJrABGpcEaEKZN+7iOuQWuktoo+Pj3aGulPcRyF oaPXfC2f5oql/hKcaxI9WBmEiug3q3ZV5yNCCSssVa9Lj5AwWOCBFZsSzs50Hv81frlvXD m43qKJ+6YC4UK9C26e/DAR62+3HEA7Ho+YUuTHNqA9YYaQwxu6Z7cUr1RgnqPCo9apEYcR MQFNzu/9tmIUOWm4GyvNA7t5bp6CnMLDtITIR64BVtxCRbYS8KSH6jJFNqkwWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTUJdjKx1jkUUpwCXFKoys6BLffS8SBknLwaSzev9as=; b=HrocHMEkElEq4hGUktNTgokZVQMNQierosGpokl+C8fDXooTR0xvH+Awe+g3X8Z1YWEAs3 at9tk3/PW7gdGFb0dZA0G+fbUsU7FsHFYofzsBSV6kAbw8rqqOk16OqXyi9cFnO+yvJ/pk 4xZjf6Gn6ljauaim76dJW3aA/g3KceGmzdFQDQgFDI5N8nzEQVccAZ+sVFsUWFE1sXuOMX JKRb3Pl64EqzAGkgv9u5Ovtjo0TDK/iVnmiPJvwVa+P3LN/OZ+w1wazUMF5I9GB7Wogn6u mlBTajKdRhIEdiAhhRYs7Y8DI9+ozkJQ8Py6BA2yljkgSfkN2nd/6E7GqxqULQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJd5dP3z6Jk for ; Mon, 09 Mar 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45652 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9e989af660a9 - stable/15 - LinuxKPI: pass attrs in more places in dma-mapping.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9e989af660a9ee4fb69953306b5583e16693888b Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:45 +0000 Message-Id: <69aea911.45652.109a9b6d@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9e989af660a9ee4fb69953306b5583e16693888b commit 9e989af660a9ee4fb69953306b5583e16693888b Author: Bjoern A. Zeeb AuthorDate: 2026-02-19 23:17:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 LinuxKPI: pass attrs in more places in dma-mapping.h Various macros (dma_map_sg_attrs, dma_unmap_sg_attrs, dma_map_single_attrs, and dma_unmap_single_attrs) currently supress passing on the attrs argument. Their implementation (even though at times still marked the argument __unused; we remove that) have long gained support for handling the argument. With ofed fixed (5edf24aac1d09), pass the argument through so that other drivers using these functions may hopefully work just a bit better as well. Sponsored by: The FreeBSD Foundation Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55391 (cherry picked from commit 31c3cba807839a1a16e6f4bca91d530d9342b61a) --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 76efbfd51074..5e5d40ef8339 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -106,10 +106,10 @@ void lkpi_dma_unmap(struct device *, dma_addr_t, size_t, enum dma_data_direction, unsigned long); int linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction direction, - unsigned long attrs __unused); + unsigned long attrs); void linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg, int nents __unused, enum dma_data_direction direction, - unsigned long attrs __unused); + unsigned long attrs); void linuxkpi_dma_sync(struct device *, dma_addr_t, size_t, bus_dmasync_op_t); static inline int @@ -201,10 +201,10 @@ dma_map_page_attrs(struct device *dev, struct page *page, size_t offset, /* linux_dma_(un)map_sg_attrs does not support attrs yet */ #define dma_map_sg_attrs(dev, sgl, nents, dir, attrs) \ - linux_dma_map_sg_attrs(dev, sgl, nents, dir, 0) + linux_dma_map_sg_attrs(dev, sgl, nents, dir, attrs) #define dma_unmap_sg_attrs(dev, sg, nents, dir, attrs) \ - linux_dma_unmap_sg_attrs(dev, sg, nents, dir, 0) + linux_dma_unmap_sg_attrs(dev, sg, nents, dir, attrs) static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, @@ -361,10 +361,10 @@ dma_max_mapping_size(struct device *dev) } #define dma_map_single_attrs(dev, ptr, size, dir, attrs) \ - _dma_map_single_attrs(dev, ptr, size, dir, 0) + _dma_map_single_attrs(dev, ptr, size, dir, attrs) #define dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) \ - _dma_unmap_single_attrs(dev, dma_addr, size, dir, 0) + _dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0) #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0) From nobody Mon Mar 9 11:03:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJg3Qxkz6VZGG for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJg0sgKz3lKw for ; Mon, 09 Mar 2026 11:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ao0t3NS9EO2AV5wgYSM5qUI7pT1o6ircY6nA581UcCM=; b=owXkXxRwzc5CWV07in7j+F7TUSveog+1IxQeoi9sJMrlwXsbQ/pD+AF7fvV/nkT9avrDLk bWhoqkl/XgaW3VHmRbR2QrtE46v6uDthJP+iwW9enGjObnJ0dnzHSOW2ZF3WzR3te5TcT+ 9BnZrt7NrnYSDJIpW0oSOvTPAMgoqPQSRfM2V4tfh9ZUREDqSaaPc6XWroHXXhzjtUjihU mPGgnMsKHhCmjtxlnz7UdUJSXBQBqoZHMk1kSXcgquXRMm3usVKwxJ9Ztc2NX1HllDKLcK dK3zCDQ1HIe3so1vuJ5CuiQTTTl/KyjluyNE7wBx4f6UAIG2HYVB/rcCn4a7dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054227; a=rsa-sha256; cv=none; b=mReQ0IE2sjnBNcxwwnP+yEt+1Zc3WdgCMSpPk9voEZA/+Rx/OjAN77aaz9ZH37kEjjopb8 5LXylGEe7GQ4ybXUfolmuYmaQnYYexPSsP9Vg/dcShIISr22B49ej+dHNegd2TYPfLMXw8 VyjCFbWYKNR+tQYZ3U7Gb/EapeNL+0zzxndy3UbS08+PTC7+3NtUW7td5+ZE2NBSH5Y9iJ 4FuSt+GUznt+6iyDzo7xHXu4IwSu1WMjs3M/zpAvnXWrcanpsH4K88HGv1YHliR7nJoOE1 UQLQt/TJXduJGhXnwy6HXNjekImBGz3NsxDduTBLFpFzk/OV7kw9E5aXw3cY0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ao0t3NS9EO2AV5wgYSM5qUI7pT1o6ircY6nA581UcCM=; b=M0lAi9S0MoUh/CKcLELXJHlw/OyJWWh09gwTEme2nwQwT4x4jVr72Kc2tkttxiSqbtCU40 SowOFfc2b/bc5hCSeVOzKVBe6+a/NFjgJ2kxq6czMzyeQ7Xt+jX5o5GUR+glkG9Sirx4rj uLRQVUhrJJ0g5W7j/aavRo7tHvp64Crr1tvGe2huLw+hQZrUScwa+Z1dJgpzf82eLF3hyl l/ySpvFnALeYODXjyomzWUSN6u94/+DrMB5tItdCo3NNvQicKA2jX3ndsz1wBqlc+Vges5 65Kd6ovcuzK+96BtiJoDVNDjIgesliA1GlV1KOIeHSTGnikOgzskvOtN+3aAxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJf6R1Fz79R for ; Mon, 09 Mar 2026 11:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47968 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4e7b6254920b - stable/15 - net80211: sta: use IEEE80211_STATUS_SUCCESS instead of magic 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4e7b6254920becc840b5d7322ec8e2964284aa00 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:46 +0000 Message-Id: <69aea912.47968.39743a25@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4e7b6254920becc840b5d7322ec8e2964284aa00 commit 4e7b6254920becc840b5d7322ec8e2964284aa00 Author: Bjoern A. Zeeb AuthorDate: 2026-03-02 10:33:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 net80211: sta: use IEEE80211_STATUS_SUCCESS instead of magic 0 Rather than using the status != 0 check use the way more descriptive status != IEEE80211_STATUS_SUCCESS definition. This makes it a lot more clear what is checked here. While here add a comment in case aof the (Re)Assoc Resp failure as we do not update state in that case but rely on a timeout which will bounce us back to State 1 (cf. 802.11-2024, Figure 11-23) which means SCAN in our case, rather than possibly moving us back to AUTH. We will likely have to revisit this when SAE hits the tree. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55643 (cherry picked from commit 9b03cc2a70e4b6354c5f5b90e4c51b850b6b1dd2) --- sys/net80211/ieee80211_sta.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 19e5ffe9a367..3522b1b24742 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -1011,7 +1011,7 @@ sta_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh, vap->iv_stats.is_rx_bad_auth++; return; } - if (status != 0) { + if (status != IEEE80211_STATUS_SUCCESS) { IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, "open auth failed (reason %d)", status); vap->iv_stats.is_rx_auth_fail++; @@ -1100,7 +1100,7 @@ sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, IEEE80211_FREE(ni->ni_challenge, M_80211_NODE); ni->ni_challenge = NULL; } - if (status != 0) { + if (status != IEEE80211_STATUS_SUCCESS) { IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, wh, "shared key auth failed (reason %d)", status); @@ -1766,7 +1766,12 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, frm += 2; status = le16toh(*(uint16_t *)frm); frm += 2; - if (status != 0) { + if (status != IEEE80211_STATUS_SUCCESS) { + /* + * See ieee80211_tx_mgt_cb() for state handling. This + * essentially provokes a timeout bouncing us back to + * State 1 instead of dealing with it properly. + */ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, wh->i_addr2, "%sassoc failed (reason %d)", ISREASSOC(subtype) ? "re" : "", status); From nobody Mon Mar 9 11:03:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJg1fT5z6VZLC for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJf4KQSz3lFc for ; Mon, 09 Mar 2026 11:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xquofQbQQ4l0FrTjJ0WvW7/FryYN27lJhWEb0qYE1qM=; b=ft/Y2SV7Z3LoJblvJpe3RZ21doPcKPsGhIy4kRoubVcQqB3n4gjjYGfmad/9g33cC3SN5P c9tQaa1iAeN3KgS5vszwkMibRmGZk/OCS0ppKYTtpxdlWtdbiwA2bpGExvmE2jpMDU2Wy4 nadTZ3kQKkAMMbNbyrqEssgxfBJxhuUAsudDaPQLw6D6Fe0cswbamJOv6Rk0wuo9LUMADO icJqeoYNYx4cq4I/tZ3+N9MPRPPpGADIiKSFGakArgUrBJR88kUMrTYEeHZO/FlAokO6Xn aCVyeCVcc58lJ2/JAz1cj5gK6aJHYaNW8wmAymvEcMnHcN1lJDG6lDW7pAoZ2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054226; a=rsa-sha256; cv=none; b=Zk7KSetDZiBwbsBw6FvgIhBlI5MSi9Ik9MN0QF2KVx5Aa5Wp8URKNDcCuMrf4fCp8z8H8D yWzSAbVF1J58fA2KhjU3FnKjihO7AMvvsU7HTC9xT9WBITRH1k8eQg9i5mS6usQVZ1pEMY KSBDAg4iz2u5/3qK8N8Vt6IjXD8wXAvDwI7By8Gc0xsH847I2SFdgsVjaoMb7Y+Y4D1Pxv aHshGU4iSqfEBgrut08QO8eK08n+XwEF8/J1S0V94wuzOGA0RvwkXXsMmbjmNZa3h9LPY/ dToQOPE/UM7jezKZls3EhEjSCDOKqUwBgo92JfR/4OR9TsySuhkcw+0Ch+KNYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xquofQbQQ4l0FrTjJ0WvW7/FryYN27lJhWEb0qYE1qM=; b=jN8dWHyCDGL3Dq9S866sSOtghpmKxLvzGnOrts4c+UsB1OgUMdoZfk2rp9F+CkYiGDB+I2 WWpTfP9SdPknJtQgQHFnw1ibachrjwrhy8uwpE2M2USITobT8FLFK7g97bsHgziSoie9/E GRkmkojB5pt6224OkZsEbLXZYo4rBmGgGH72pU2cJM0dAgbtEMssXfqmjokirchluFtigj 5HR5ml2nJx1/4miFIEyDDn+EyoiH5c6OD8NzRvDIH5+/jnvL/FZfPT2ztTNU6WUTKKJ1Hh uORDztyrGqLnMvRkdaSyx9WyMLyBzKTieC6bwLUttsOUM0iCjJpkC4TMAkNJCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJf3s54z6wD for ; Mon, 09 Mar 2026 11:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44cfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ad85b6b7c71d - stable/15 - dpaa2: improve error messages and log requested cluster size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ad85b6b7c71de569695f9364687505154c76e8f4 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:41 +0000 Message-Id: <69aea90d.44cfe.3f4f2a97@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ad85b6b7c71de569695f9364687505154c76e8f4 commit ad85b6b7c71de569695f9364687505154c76e8f4 Author: Bjoern A. Zeeb AuthorDate: 2025-08-20 21:04:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:09 +0000 dpaa2: improve error messages and log requested cluster size If m_getjcl() fails we want to know the size we requested in order to have a chance to evaluate the problem better. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D55555 (cherry picked from commit c3577fcf3fd0494cc992021d4debbca09241a49e) --- sys/dev/dpaa2/dpaa2_buf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/dpaa2/dpaa2_buf.c b/sys/dev/dpaa2/dpaa2_buf.c index 7739eda5d8de..8505b074fe4f 100644 --- a/sys/dev/dpaa2/dpaa2_buf.c +++ b/sys/dev/dpaa2/dpaa2_buf.c @@ -154,7 +154,8 @@ dpaa2_buf_seed_rxb(device_t dev, struct dpaa2_buf *buf, int size, if (__predict_true(buf->m == NULL)) { buf->m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, size); if (__predict_false(buf->m == NULL)) { - device_printf(dev, "%s: m_getjcl() failed\n", __func__); + device_printf(dev, "%s: m_getjcl(%d) failed\n", + __func__, size); error = ENOMEM; goto fail_mbuf_alloc; } From nobody Mon Mar 9 11:03:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJh4vhTz6VZD4 for ; Mon, 09 Mar 2026 11:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJh0mz5z3lQC for ; Mon, 09 Mar 2026 11:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+B94TlW+iwcGoL9UXbbpCWPf1P62Kis0MXQryns/9RI=; b=ToFEFSfG5OX4tHjMWtHvBsMtAiW1n62kFlULfnpcd+UTmW2eSZmIvncs7OXrRGl7e2bKzt Utec+zwjch01MwnjaXNig+8S/zubq5C3BsamdSwHwYFxdPoETO50BINXGQmV2/nnHjVK5D 63mZUyD+XVSSDVjiSipM4Svik1NedSVvu5r+91l3n7yTb0SYGQO0FTgE6mxKbXOBpFiOFl ThoEwY17E4mDUaOXurHyI2z4eKVN+NFKU91FzrCNo4wuREARfBWRXm+LV5gwVfucJ/1bsQ pY7TbZhDlyKgY1ILYmKK8RSFZ6QnVt9CiMXpHp+adwniwyjQYX/Bi0DMoUr+og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054228; a=rsa-sha256; cv=none; b=hUPTKmNpGXkHT3mDY8dRM1Y8cJVzBGNc66KIfx5plDBek4sXGVPHPdkjwVA4qVErVQcUgb viIpWXkKZGevZwhf17TuM5TzknIm0rNAHLXOI8ESDawna61ArgKFGGtuM6lsWu6q6rSk40 y0qIK5MxmKMgM3SEBOy9nogS1LxVffWR4KUUqn6WmFoacz63bTbM6N2McdJfcD2LyDZSlx 2KOyDcM2aWRDQ2DqlRo9d8DFDsMSiCc8weY78o2UjSdul22R+99/jiqS1B65XCebMnO4+H 5hyQ1cuOgXRJOMs2QC6RGM6xpqTF7slKZpgoDNFioBmN3RKMr+mf6fofN+rWUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+B94TlW+iwcGoL9UXbbpCWPf1P62Kis0MXQryns/9RI=; b=IY5UziSwxGG33nSmZTGAPCvYcjjD7Cb8KwEbhTJEn5Mwi5PpL5wwEGxV54yorrKtXoBIYo AQpSCoTQ28Cm/fejrRemJv43oXhuj7rfM3wVM7TIJlptxEID72IPjFZDgiITGFif7ZU8r0 DJDoFXt3llDvwv/vtKeBumsT1OVlXQ3V0wD10Wt/s+Mvh1xaaPrebUsRf2lGS661U8C/hj PjxOqBiX8Pd5h7Otik7xy8ZgQP+ycfnBvFi41tKNdICegSDCDzJtkgrRs600RdtrXDVQTV P9Y2W1hZtLXogyGVP85bDMEJQ2q0mIM1oXxRGSt33iWYYJDq7HzSLvtfau0cow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJh05Pqz6wF for ; Mon, 09 Mar 2026 11:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d9f606424916 - stable/15 - iwlwifi: fixup link_id for certain cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d9f60642491649b6a05d8478ff16c3252acd8993 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:48 +0000 Message-Id: <69aea914.45b68.2eb90a93@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d9f60642491649b6a05d8478ff16c3252acd8993 commit d9f60642491649b6a05d8478ff16c3252acd8993 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 09:47:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 iwlwifi: fixup link_id for certain cases In iwl_mvm_mld_vif_cfg_changed_station() if we do not do MLO (which we do not do yet at all), dtim_period is not yet set but asssoc is (our common case) the link_id can become -1 as active_links is always 0 for the non-MLO case. This leads to logging of a WARN; Invalid link ID for session protection: 4294967295 Fixup the link_id if it is -1 to be 0. This is the deflink link_id so that should always be fine in this case. For Linux 7.0-rc2 that code is already gone so this is a local temporary stopgap measure for the mvm-mld devices (e.g., some AX210). Sponosred by: The FreeBSD Foundation (cherry picked from commit 760e0a18d3033152899fbd0e3f587dfe3c28d6bf) --- sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c b/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c index bf24f8cb673e..8b88f211066d 100644 --- a/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c +++ b/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c @@ -838,6 +838,14 @@ static void iwl_mvm_mld_vif_cfg_changed_station(struct iwl_mvm *mvm, */ unsigned int link_id = ffs(vif->active_links) - 1; +#if defined(__FreeBSD__) + /* link_id is gone in Linux v7.0. + * For us it can become -1 if this is non-MLO + * and dtim_period is still 0. + */ + if (link_id == -1) + link_id = 0; +#endif /* If we're not restarting and still haven't * heard a beacon (dtim period unknown) then From nobody Mon Mar 9 11:03:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJj54Qwz6VZNd for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJj1LMvz3lVw for ; Mon, 09 Mar 2026 11:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPT8QimST3di0T+l4yaNN4VnL8phJYh4S/RSzqv/Qq0=; b=VHHRGidHHBd7wero+1589INTcsAiXT44BviPbkLz9y8T1BubrFF2WLuOLmagltxiC63zEv G5XWSz0z7ySjjGh8ncYQBp3yGbruvwhQV4Fdf6Sa0E6C8bl/ESL2ZFqmqpm3F01KDAgeaY wt1dkhQr0x2ghOeQMih0Zm0k+8moaCkY+CrcD5p5A1fw5P8g+SoWj6Px9TY/p4F86t63gV x9d67LWae2s7pG/8F1WTluzZ/04yqr3+VZOaZtu9K9rtRkODqBu/uZD4K3A++d9Aadg153 xj8OyHXTkgR9wnQ8ETEB5teXqPbc1aYRv7LEbirajQ14gzi0gmaNm9wLirRqvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054229; a=rsa-sha256; cv=none; b=vEFBhDk9h1rZciNlrRoX0XMITOre+Ke/0c0b3xA8lBQCr9bzjcX8/kRmLC+IxEzyx0enxY Q61DtrmgZwJ+NtNs9tWpmHzst/aMnpKOcYIZXP/4SNQkYZxFjDZxLmV0LKmZbh8zNq5azh t/YVlIVuy4JsdpjAXjvxoALNaZH0Z7TaqRcsgMjrUVTPjlREE7PpGWaywyty6aYor6+T3G IheH4BdjrcxW3ycZzu1CTgMKRrpRRrZdGkdKAhfzTKV9eV7A+CsLg9zM8nM1LtFgS3G+qk exFZN8vxQXW5mQf/A4Ll5JGrk473LN2Zfg1Ff1JhSiv/oso5pR+1958l5syLXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPT8QimST3di0T+l4yaNN4VnL8phJYh4S/RSzqv/Qq0=; b=ywaRG9O+77yoNbaCARHHT2d0Y/4ejv5+iF3HCDizdTmNrBCsPOu7IYfZ2t4OaMe7pCwrZm +VdLyGp92KPL4qWK5GiMxtAJaY4KCy2CqpPLrAIEeLttjybSxkNxx7PFHMy+zJ6nXXweES O/415i+Rv4e1x3DUyAB2ltiPscsF6rUEi1tHtJoNDMuPE7gcLRGJoDhM+jcDkO9frGTU+j KooFvDhde7dYxJMQC3tfEi32BcmRDBo1OggFWqlNq8A6RJ97ohFCDdXw7iSR9FT2e1LH6X 93wfsu+lRXMzf2/NYDo6asPE4ZTLKCTJqc9SjxXFoCk+UzRUu1IFg3AyoZrXsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJj0rCwz79T for ; Mon, 09 Mar 2026 11:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18082 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 651fcd5fa414 - stable/15 - LinuxKPI: 802.11: fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 651fcd5fa41480d5aec1c3a8b3255e816f8fb105 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:49 +0000 Message-Id: <69aea915.18082.7047c674@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=651fcd5fa41480d5aec1c3a8b3255e816f8fb105 commit 651fcd5fa41480d5aec1c3a8b3255e816f8fb105 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 10:30:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 LinuxKPI: 802.11: fix typo Sponsored by: The FreeBSD Foundation (cherry picked from commit fa41408d6043df3779d94bd1ac871a5ba8f4dafb) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index bbda35cb2e38..799ecb245661 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2004,7 +2004,7 @@ lkpi_update_dtim_tsf(struct ieee80211_vif *vif, struct ieee80211_node *ni, * we set the BSS_CHANGED_BEACON_INFO on the non-teardown * path so make sure we only do run this check once we are * assoc. (*iv_recv_mgmt)() will be called before we enter - * here so the ni will be updates with information from the + * here so the ni will be updated with information from the * beacon via net80211::sta_recv_mgmt(). We also need to * make sure we do not do it on every beacon we still may * get so only do if something changed. vif->bss_conf.dtim_period From nobody Mon Mar 9 11:03:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJk3TZJz6VZD7 for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJk28hNz3lW2 for ; Mon, 09 Mar 2026 11:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PzZqpPQEdamULXcShxfRHvrTDQaROFiYReXK45xRpk=; b=LTX4sIh6baVlPt+lDGQhRMj65CQgt05Kd8YOt0wDbhD6vgffiBU15bueK8gx2AyemiDAp7 /8jH2gQkqoi8z9nBqL+ZrPSHatCc+ZHZB4d1ucFXD2fRt4cNwmWN2d0NUbtkk61Xw3wfds DNxW+ZNvLYD74eXr8jIjgqJ5rW9GK2kWQ3VQKGyXy6eDgQP2cod8+j7FrAC7CaWaQZIhgy yi92WAs4E9coNnABDI/mXpOY6HBPH5i/EQbtE6W+S0hFDKsm7RariydqFv+0A1ZQ6mhVHq 1aLIcPpSW69sCeZwkla/kZzdSdvFNKZHQaqnKv8mKCi+aINd7eCua9kwKQXV7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054230; a=rsa-sha256; cv=none; b=GgiYELgFe4pviCtJwCTLCJaVtJKGRqFoN4tj0XYapDH47SuF0FhO4hYLnkBf2Yuq/DlKRq fWN2VoBXFP18+ldQEAoM1ncVOcAbu8dfM5NvaufmPVMbLQpVW37FZfsIIyTQRVZi9RBLI4 ow6n1eFPs3Wkh2N0rcsR8Kwt6KLTyvXo/A3gJOb09HBexyzMiBYAsxA81/80LLXCAlWGgB driX+XHjn4in83W3aXDNXt1DsS+N3o8eh9onjbn3JuSmNbqrB72GSGiMH4k/GrQKH714Oc S2LH6tAAGkrfrSzHeQsWUsFmvqgdjgVeefm5uxfGc9Yi0TFe6kEhVgm8VLD2Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PzZqpPQEdamULXcShxfRHvrTDQaROFiYReXK45xRpk=; b=t2n9LFtCqKT5W8KE1KE43Y2BO9KUndq/T+jzUBQStlucMcLa4ti6SV6E9riXj4Hg1ouwzT JwIuDtXcYc3ofXtcwYFLjow1dLvMWKW0dDCCwR3L3jaZNuJm/6anKv1BCGnqP7dk+oWYlo UWoIBHWwf8uSm5+VDfSk/lk0M3SsNOA2c3efC0/87TtMzp3xiM3AFB/+8jE+dTX4nOzfk9 HozGGKP6/1RtEjlxAiqvoSqKdVqGPjuLZHAlw5NV9Qp9PZfI7C+k1aL71XH3+aSQ8xD++i Uhrl7hrLd7a6grw5EjhJdw1MIRSOUQjP9dV8jke0W85qnxJ5Jl0fiYTsmbQHfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJk1hshz5s4 for ; Mon, 09 Mar 2026 11:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46746 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8642c8c68d9e - stable/15 - LinuxKPI: 802.11: split (*bss_info_changed) up for more modern drivers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8642c8c68d9e0e52732265e7f038924859e4609f Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:50 +0000 Message-Id: <69aea916.46746.2d541a1f@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8642c8c68d9e0e52732265e7f038924859e4609f commit 8642c8c68d9e0e52732265e7f038924859e4609f Author: Bjoern A. Zeeb AuthorDate: 2026-01-03 20:10:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 LinuxKPI: 802.11: split (*bss_info_changed) up for more modern drivers With the advent of MLO some of the updates (*bss_info_changed) would have done are not per-link. This had (*vif_cfg_changed) and (*link_conf_changed) introduced which are used by iwlwifi, rtw89, select mt76 drivers, and ath12k currently it seems. A driver normally only supports on or the other set. Factor out the call to (*bss_info_changed) into an internal function. There split the options up depending on whether they are for the vif or a link and leave a fallback to (*bss_info_changed) for older drivers. Add the mac80211 ops implementations for the two new calls along with a currently unused backup option for (*bss_info_changed) for each as I assume we will eventually call the directly rather than from the internal wrapper function. Sponsored by: The FreeBSD Foundation (cherry picked from commit 9592f563c36bd207d98f1b3a13839b88d5760d97) --- sys/compat/linuxkpi/common/src/linux_80211.c | 75 ++++++++++++++++++---- sys/compat/linuxkpi/common/src/linux_80211.h | 4 ++ .../linuxkpi/common/src/linux_80211_macops.c | 70 ++++++++++++++++++-- 3 files changed, 128 insertions(+), 21 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 799ecb245661..c003075ae601 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2242,6 +2242,53 @@ lkpi_remove_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif) free(lchanctx, M_LKPI80211); } +/* -------------------------------------------------------------------------- */ + +/* Any other options belong here? Check more drivers. */ +#define BSS_CHANGED_VIF_CFG_BITS \ + (BSS_CHANGED_SSID | BSS_CHANGED_IDLE | BSS_CHANGED_PS | BSS_CHANGED_ASSOC | \ + BSS_CHANGED_ARP_FILTER | BSS_CHANGED_MLD_VALID_LINKS | BSS_CHANGED_MLD_TTLM) + +static void +lkpi_bss_info_change(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + enum ieee80211_bss_changed bss_changed) +{ + struct lkpi_vif *lvif; + enum ieee80211_bss_changed vif_cfg_bits, link_info_bits; + + if (ieee80211_vif_is_mld(vif)) { + TODO("This likely needs a subset only; split up into 3 parts."); + } + + /* Nothing to do? */ + if (bss_changed == 0) + return; + + /* + * If the vif is not known to the driver there is nothing to notifiy for. + * We MUST NOT check for !lvif_bss_synched here (the reasonable it seems) + * as we need to execute the update(s) or we will have follow-up issues. + */ + lvif = VIF_TO_LVIF(vif); + if (!lvif->added_to_drv) + return; + + /* + * With the advent of MLO bss_conf got split up into vif and link + * change notfications, while historically it was one. + * We now need to support all possible models. + */ + vif_cfg_bits = bss_changed & BSS_CHANGED_VIF_CFG_BITS; + if (vif_cfg_bits != 0) + lkpi_80211_mo_vif_cfg_changed(hw, vif, vif_cfg_bits, false); + + link_info_bits = bss_changed & ~(BSS_CHANGED_VIF_CFG_BITS); + if (link_info_bits != 0) + lkpi_80211_mo_link_info_changed(hw, vif, &vif->bss_conf, + link_info_bits, 0, false); + + lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); +} /* -------------------------------------------------------------------------- */ @@ -2457,7 +2504,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* RATES */ IMPROVE("bss info: not all needs to come now and rates are missing"); - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); /* * Given ni and lsta are 1:1 from alloc to free we can assert that @@ -2791,7 +2838,7 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int } bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); /* - change_chanctx (if needed) * - event_callback @@ -2851,7 +2898,7 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed = 0; bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); /* Prepare_multicast && configure_filter. */ lkpi_update_mcast_filter(vap->iv_ic); @@ -3289,7 +3336,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* XXX BSS_CHANGED_???? */ vif->bss_conf.dtim_period = 0; /* go back to 0. */ bss_changed |= BSS_CHANGED_BEACON_INFO; - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); LKPI_80211_LVIF_LOCK(lvif); /* Remove ni reference for this cache of lsta. */ @@ -3653,7 +3700,7 @@ lkpi_wme_update(struct lkpi_hw *lhw, struct ieee80211vap *vap, bool planned) struct chanAccParams chp; struct wmeParams wmeparr[WME_NUM_AC]; struct ieee80211_tx_queue_params txqp; - enum ieee80211_bss_changed changed; + enum ieee80211_bss_changed bss_changed; int error; uint16_t ac; @@ -3704,11 +3751,11 @@ lkpi_wme_update(struct lkpi_hw *lhw, struct ieee80211vap *vap, bool planned) ic_printf(ic, "%s: conf_tx ac %u failed %d\n", __func__, ac, error); } - changed = BSS_CHANGED_QOS; + bss_changed = BSS_CHANGED_QOS; if (!planned) - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); + lkpi_bss_info_change(hw, vif, bss_changed); - return (changed); + return (bss_changed); } #endif @@ -3774,7 +3821,7 @@ lkpi_iv_sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, * locking, see if queue_work() is fast enough. */ bss_changed = lkpi_update_dtim_tsf(vif, ni, ni->ni_vap, __func__, __LINE__); - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); } /* @@ -3820,7 +3867,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], struct ieee80211vap *vap; struct ieee80211_vif *vif; struct ieee80211_tx_queue_params txqp; - enum ieee80211_bss_changed changed; + enum ieee80211_bss_changed bss_changed; struct sysctl_oid *node; size_t len; int error, i; @@ -3937,8 +3984,8 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], LKPI_80211_LHW_LVIF_UNLOCK(lhw); /* Set bss_info. */ - changed = 0; - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); + bss_changed = 0; + lkpi_bss_info_change(hw, vif, bss_changed); /* Configure tx queues (conf_tx), default WME & send BSS_CHANGED_QOS. */ IMPROVE("Hardcoded values; to fix see 802.11-2016, 9.4.2.29 EDCA Parameter Set element"); @@ -3956,8 +4003,8 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], __func__, ac, error); } wiphy_unlock(hw->wiphy); - changed = BSS_CHANGED_QOS; - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); + bss_changed = BSS_CHANGED_QOS; + lkpi_bss_info_change(hw, vif, bss_changed); /* Force MC init. */ lkpi_update_mcast_filter(ic); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 3d25ab4a857b..8ae5c3d13d2d 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -469,6 +469,10 @@ void lkpi_80211_mo_change_chanctx(struct ieee80211_hw *, struct ieee80211_chanctx_conf *, uint32_t); void lkpi_80211_mo_remove_chanctx(struct ieee80211_hw *, struct ieee80211_chanctx_conf *); +void lkpi_80211_mo_vif_cfg_changed(struct ieee80211_hw *, struct ieee80211_vif *, + uint64_t, bool); +void lkpi_80211_mo_link_info_changed(struct ieee80211_hw *, struct ieee80211_vif *, + struct ieee80211_bss_conf *, uint64_t, uint8_t, bool); void lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, uint64_t); int lkpi_80211_mo_conf_tx(struct ieee80211_hw *, struct ieee80211_vif *, diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 634cffddea9e..42067e36c953 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -546,24 +546,80 @@ lkpi_80211_mo_remove_chanctx(struct ieee80211_hw *hw, } void -lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct ieee80211_bss_conf *conf, uint64_t changed) +lkpi_80211_mo_vif_cfg_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + uint64_t vif_cfg_bits, bool fallback) +{ + struct lkpi_hw *lhw; + + might_sleep(); + /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + + lhw = HW_TO_LHW(hw); + if (lhw->ops->vif_cfg_changed == NULL && + lhw->ops->bss_info_changed == NULL) + return; + + if (vif_cfg_bits == 0) + return; + + LKPI_80211_TRACE_MO("hw %p vif %p vif_cfg_bits %#jx", hw, vif, (uintmax_t)vif_cfg_bits); + if (lhw->ops->link_info_changed != NULL) + lhw->ops->vif_cfg_changed(hw, vif, vif_cfg_bits); + else if (fallback) + lhw->ops->bss_info_changed(hw, vif, &vif->bss_conf, vif_cfg_bits); +} + +void +lkpi_80211_mo_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *conf, uint64_t link_info_bits, uint8_t link_id, + bool fallback) { struct lkpi_hw *lhw; + might_sleep(); + /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + lhw = HW_TO_LHW(hw); if (lhw->ops->link_info_changed == NULL && lhw->ops->bss_info_changed == NULL) return; - if (changed == 0) + if (link_info_bits == 0) return; - LKPI_80211_TRACE_MO("hw %p vif %p conf %p changed %#jx", hw, vif, conf, (uintmax_t)changed); + if (!ieee80211_vif_link_active(vif, link_id)) + return; + + LKPI_80211_TRACE_MO("hw %p vif %p conf %p link_info_bits %#jx", hw, vif, conf, (uintmax_t)link_info_bits); if (lhw->ops->link_info_changed != NULL) - lhw->ops->link_info_changed(hw, vif, conf, changed); - else - lhw->ops->bss_info_changed(hw, vif, conf, changed); + lhw->ops->link_info_changed(hw, vif, conf, link_info_bits); + else if (fallback) + lhw->ops->bss_info_changed(hw, vif, conf, link_info_bits); +} + +/* + * This is basically obsolete but one caller. + * The functionality is now split between lkpi_80211_mo_link_info_changed() and + * lkpi_80211_mo_vif_cfg_changed(). Those functions have a flag whether to call + * the (*bss_info_changed) fallback or not. See lkpi_bss_info_change(). + */ +void +lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *conf, uint64_t bss_changed) +{ + struct lkpi_hw *lhw; + + /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + + lhw = HW_TO_LHW(hw); + if (lhw->ops->bss_info_changed == NULL) + return; + + if (bss_changed == 0) + return; + + LKPI_80211_TRACE_MO("hw %p vif %p conf %p changed %#jx", hw, vif, conf, (uintmax_t)bss_changed); + lhw->ops->bss_info_changed(hw, vif, conf, bss_changed); } int From nobody Mon Mar 9 11:03:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJl4g8tz6VZfy for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJl3DpZz3lQk for ; Mon, 09 Mar 2026 11:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zeoRtZe0ikSBKF5AdM7GJZq/xmDGMFB1+b+usL1cNl0=; b=igA8M9YYurPW4YdOAMumV5nP20T6O2YuHQCB/GJTT0+OSDBJ6kUAgMjH2Pc3b7vFeuraiB GdNojdW5xb0642e1LB536p7x8qxP33RxOkKUmloOJN4c4uEf91a96LkTfUskIayugrVx74 n/sadA0sH3z7m58f/eCeE1s4yK6ugH4I+VnUoUm6kNLxFcS/8pgGgSnUdT9bcCS71+zacU xwvht+/G5pvzl2q6yiYYzYthDWpIs8BdKw31PRsjdytpkTi7Wny/I//y0JLnEawXoklmQi meZ6eJ7cfhUOcT+pth6NdbTtvsAOU5sRCNATFD50Dx2YMVT1EZNrrkzGLra24Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054231; a=rsa-sha256; cv=none; b=yS51XVI3vIrtI/rwWS9ag+u/hferZGC4A5RijjM8Z6pvRtwAlBI4Gm0PYc0SAYVLqvkvR3 z0UZF7gIFCuCRKx0iHP+R34dQZAHmdzTQRQTBjTo3yl06M3fdB3mVBgU6X5nmx10zmWYW2 q1sxPiJH1AzyxyWzzclV8eDO07IiDEu56IaSYVRHVYskGM1CdcDkTEmhmbooZlj5jr6dvk K+ZU+aW1PW+3s0YxlWJJAXaD8FC8fRS2oaU9riBowZRQT9y3r7Ieo6wrjqU+5DelCug7xI mJjtHme/r0PRm89LVJ3AoMKe1+iS5m3oz/an41jOIZ8LAYhW8RJ5YbFm+Yksuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zeoRtZe0ikSBKF5AdM7GJZq/xmDGMFB1+b+usL1cNl0=; b=AHiO0Wxao4JMCg4acvwxk+B/uoEivkC0qPgOvuBEkhZwvOpp8NVbBQIu60HgFnyFIikW4X pb2voxvi6bQNyOpudmXoITevKcyfn5B8iKX2JGA2D4TvX4fqg61KlXdJXWqc3RryZVY/la TSwlDy02bDctzPAFnSBxxjQtDiDkUsLkfhwWHMh/qVJDi14snVTqK+gpsefGf5jFR/SsAO Mn1DOA1ld2h9pxgV3neWj6kjxWFlGiFVOCMwRhuAkQsFo/VPbDa5bGZOpuhtBZdKmoSlks KSkoCk++Gb76G3Lwf7WYRaf9qGQQDXfJMzrQY2r5upN2RBLwcsGlzT80KOZKXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJl2Wbgz772 for ; Mon, 09 Mar 2026 11:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 5f68af167bfe - stable/15 - LinuxKPI: 802.11: change teardown order of disassoc and sta rm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5f68af167bfe761dbd5f7a141a612ac998e6f922 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:51 +0000 Message-Id: <69aea917.45b6c.3956cdaa@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f68af167bfe761dbd5f7a141a612ac998e6f922 commit 5f68af167bfe761dbd5f7a141a612ac998e6f922 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 09:58:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 LinuxKPI: 802.11: change teardown order of disassoc and sta rm In lkpi_sta_auth_to_scan() we remove the sta from the firmware for everything supporting (*sta_state). We used to run into issues here with iwlwifi in that we had to use a specific order: set vif->cfg.assoc = false, .aid = 0, then remove the sta, and then send the mac update as otherwise we would either have the sta silently removed (if we run (*bss_info_change) first and fail then or silently not have the sta removed and upon sta add we would trigger the fw crash. The order of events seem to have changed now and especially BE200 (iwlwifi/mld) is picky about this and would crash the firmware with something like: iwlwifi0: 0x20103311 | ADVANCED_SYSASSERT iwlwifi0: 0x00000000 | umac branchlink1 iwlwifi0: 0xC00808AA | umac branchlink2 iwlwifi0: 0xD00D6E90 | umac interruptlink1 iwlwifi0: 0x0108C504 | umac interruptlink2 iwlwifi0: 0x00000000 | umac data1 (link_id? seen weird values there though) iwlwifi0: 0x00000006 | umac data2 (fw_sta_id) iwlwifi0: 0x00000001 | umac data3 if it would still think we were assoc. So the new order is as one would have expected initially: set assoc = false, aid = 0; do the remaining bss_conf (vif/link) changes and issue the (*vif_cfg_changed) / (*link_info_changed) or for older drivers (*bss_info_changed). That will tell the mac we are no longer associated. And only then remove the sta from the firmware. Update the comment there along so we do have the paper trail as to when and why this changed. Tested on: BE200, AX210 (11ac) Tested on: AX200. 9260, 8265, 3165 (11a) Sponsored by: The FreeBSD Foundation (cherry picked from commit f68ebebd8ae469e344f10ed2f3c4d9d983a29f41) --- sys/compat/linuxkpi/common/src/linux_80211.c | 57 +++++++++++++++------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index c003075ae601..63f92b8afb2b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3281,24 +3281,27 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed = 0; /* - * Start updating bss info (bss_info_changed) (assoc, aid, ..). + * Start updating bss info (*bss_info_changed) (assoc, aid, ..). * - * One would expect this to happen when going off AUTHORIZED. - * See comment there; removes the sta from fw if not careful - * (bss_info_changed() change is executed right away). + * One would expect this to happen when going off AUTHORIZED but + * not so. * - * We need to do this now, before sta changes to IEEE80211_STA_NOTEXIST - * as otherwise drivers (iwlwifi at least) will silently not remove - * the sta from the firmware and when we will add a new one trigger - * a fw assert. + * Immediately issuing the (*bss_info_changed) used to also remove the + * sta from firmware for iwlwifi; or we have problems with the sta + * silently not being removed and then crash upon the next sta add. + * Neither seems to be the case or a problem still. * - * The order which works best so far avoiding early removal or silent - * non-removal seems to be (for iwlwifi::mld-mac80211.c cases; - * the iwlwifi:mac80211.c case still to be tested): - * 1) lkpi_disassoc(): set vif->cfg.assoc = false (aid=0 side effect here) - * 2) call the last sta_state update -> IEEE80211_STA_NOTEXIST - * (removes the sta given assoc is false) - * 3) add the remaining BSS_CHANGED changes and call bss_info_changed() + * Contrary for BE200 (iwlwifi/mld) if we do not issue the + * (*vif_cfg_change) to tell FW that we are no longer assoc + * it will crash now upon sta rm. So the order now is as we once + * expected it: + * + * 1) lkpi_disassoc(): set vif->cfg.assoc = false and .aid=0 + * 2) add the remaining BSS_CHANGED changes and call (*bss_info_changed) + * (which may be split up into (*vif_cfg_change) and + * (*link_info_changed) for more modern drivers). + * 3) call the last sta_state update -> IEEE80211_STA_NOTEXIST + * (removes the sta given assoc is false) and tidy up our lists. * 4) call unassign_vif_chanctx * 5) call lkpi_hw_conf_idle * 6) call remove_chanctx @@ -3310,6 +3313,18 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + IMPROVE("Any bss_info changes to announce?"); + vif->bss_conf.qos = false; + bss_changed |= BSS_CHANGED_QOS; + vif->cfg.ssid_len = 0; + memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); + bss_changed |= BSS_CHANGED_BSSID; + vif->bss_conf.use_short_preamble = false; + /* XXX BSS_CHANGED_???? */ + vif->bss_conf.dtim_period = 0; /* go back to 0. */ + bss_changed |= BSS_CHANGED_BEACON_INFO; + lkpi_bss_info_change(hw, vif, bss_changed); + /* Adjust sta and change state (from NONE) to NOTEXIST. */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " @@ -3326,18 +3341,6 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - IMPROVE("Any bss_info changes to announce?"); - vif->bss_conf.qos = false; - bss_changed |= BSS_CHANGED_QOS; - vif->cfg.ssid_len = 0; - memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); - bss_changed |= BSS_CHANGED_BSSID; - vif->bss_conf.use_short_preamble = false; - /* XXX BSS_CHANGED_???? */ - vif->bss_conf.dtim_period = 0; /* go back to 0. */ - bss_changed |= BSS_CHANGED_BEACON_INFO; - lkpi_bss_info_change(hw, vif, bss_changed); - LKPI_80211_LVIF_LOCK(lvif); /* Remove ni reference for this cache of lsta. */ lvif->lvif_bss = NULL; From nobody Mon Mar 9 11:03:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJm6Ntgz6VZNn for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJm3mg3z3lcB for ; Mon, 09 Mar 2026 11:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu23WnGWAUMzFNVORijRmagplOMeOiHKU6gavvarBW4=; b=F5a0Qx/j3ibBzMd2+idxDjXAu4T58Pppfqlt5A9212HpJ3POdTBRie310O+Qm433FP9xve Dnz5vt/3NM/vGT6reeQprApmqaarn1cwm+UfS9MEBtsY5qLREDA04hMK9zCyqsRzqEOp6D P1Q2gIfxKGLOo/y2h5NK/hy/oqnDxyN+0Z6N+osPVTlKhEGRxRnBTVIETr10onhFkUCCjA QXNFV6/n1aP17E+glndlIxug/OYBDB4+Q4rcAT6Tmu4x1TF2ruLEGeqUbvKyKgVU9M6/em W62cDO367x1y6SKJ9ex11t156sA8kYFnsGITM2gaart8vWGaL74iZGsfH7UiKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054232; a=rsa-sha256; cv=none; b=SnAjZzsPn5eYpSByeXJsf7wlmPF+2zjyLsQPnToBmCWrPncwbo1PEk1LPaVhkM9Vzg2z4I STsRlYHowSlTqG6nhEvXsiTdqFJpxx6tHD23fnpigopEs+/lP6K5cDoxGWL8R5eJMPw/Ek FsPDs6bv7v39UyKSLOf6xbn2DnxGpjUAIasswV0gMCDdmJZfZJdMHoel59lukqGc63pz9v R6f9gOyrLjmUFXc6TJM+mhw7qnFgGMl28MgSk0hDD/Mnl03Vook+4pxcRAL8ykbea/Y2Gw tBtRC8SNZuA1vSFWzdkz/vSWPgb7ewwbG06Qjv+AtiSzUZvmiH9/AE10Bv+nNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu23WnGWAUMzFNVORijRmagplOMeOiHKU6gavvarBW4=; b=OheMQhlZCLFQQpi1hkNbfyNn7NJQsEyJb1bI9+5/voXftNjBRlS8t1KwyE8iliEtWbNczr Nq4Ig9fKXsPVxw8U1aqosifrp+lhxkxdl2dFn6wj+enqh/DGCDf/lS02fc39B8XRl6sBCl 24d6OvOyTUs0pJDcQPdIEmeKZLdnPYPTHtyqMbNDLEXRhPX0Fid89QjsPskn8/I+/dnv+T N1ZhA/LMEabM00iSeqd2klQk8sZtKGA9Odd3bW8T8JpCQLAPNM1cyxnySKP+F0yI9eXHgE fanNb7fHKeKrBJDjygpXTrA9BJprIlsh1Tk22rXMMNtr5Dx9jObyY3EfzlIpjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJm3JJwz6QN for ; Mon, 09 Mar 2026 11:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4726f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 169ab967e24b - stable/15 - iwlwifi: mld: move module_init() to SI_ORDER_SECOND List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 169ab967e24bbb097f228e22c07ddb89ae3bfe5f Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:52 +0000 Message-Id: <69aea918.4726f.1a8b1b@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=169ab967e24bbb097f228e22c07ddb89ae3bfe5f commit 169ab967e24bbb097f228e22c07ddb89ae3bfe5f Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 12:41:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 iwlwifi: mld: move module_init() to SI_ORDER_SECOND In FreeBSD the iwlwifi driver is a single kernel module. As for iwlwifi/mvm we need to make sure the common "iwlwifi drv" code is initialized before trying to register the mld sub-driver in order for lists, etc. in the registration code to be initialized. We do this by using an extended (FreeBSD specific) version of module_init which overrides the order parameter of the SYSINIT. Otherwise we can randomly (depending on SYSINIT run order) run into a NULL pointer deref panic. Sponsored by: The FreeBSD Foundation PR: 291120 (cherry picked from commit 551c4cb74a807ceae55288bf273f5cfeb37c7c91) --- sys/contrib/dev/iwlwifi/mld/mld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mld/mld.c b/sys/contrib/dev/iwlwifi/mld/mld.c index 7b46ccc306ab..8075b886ddbf 100644 --- a/sys/contrib/dev/iwlwifi/mld/mld.c +++ b/sys/contrib/dev/iwlwifi/mld/mld.c @@ -44,7 +44,11 @@ static int __init iwl_mld_init(void) return ret; } +#if defined(__linux__) module_init(iwl_mld_init); +#elif defined(__FreeBSD__) +module_init_order(iwl_mld_init, SI_ORDER_SECOND); +#endif static void __exit iwl_mld_exit(void) { From nobody Mon Mar 9 11:03:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJp2CqQz6VZQx for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJn4WpHz3lhk for ; Mon, 09 Mar 2026 11:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o5leoCGFqfyK7EFOG3/Yfdd3Xbr5SXwvupBXI2PsrXM=; b=Sa/9V8EFzZsEYQPC63ppBzGZ5YorSJ2UQxH2kFdJGNL450ATn9F36HTnJgG0RAnSysPzP/ oQ+AgCtyyaWbtZzeWpLerY6dbCt15Tszmvt5wZJG59RGc3HIaeXqdEU6wdTXpx43CpsJ3q USGDN52gNAbckC46AR8e95IGx3WvuFNiGWBER6ICjeDE/Yj9LlC7IakwyyxyVWRrR6CK/S aQMlgA0d6sEtYsZQS5hctW8yGdj9TnULhTwrcUSUmsF5ATaFgOXObn7i6kbBjFES747ZeF 0VjZyNQJiPLWjf0ZjZEn6nPxaBN7+CiMPGycRtM2w2HGEsNcWaKilbhBQ4aN7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054233; a=rsa-sha256; cv=none; b=qOKAlbhr7QNWj1c6ZQKx15mJnErxrEeuMoOZdYAZrKIG1SS1eDk2YUXf+zneMCIngpFDYa XjPAz6QHmlgzwCXmU0V9kxK0yAvk4x4u+2iMY9Ab6axdgTLJx5YIoaiOs3UXN9e7yc0oMQ +BtCHdvRP9NhM3IDzqmU4Immfb/9Oe2CJoq7lG4m8GTjBsNIj+J/ZMaaer4nB7vjw56sPM bbD2j8dGcPbkW2KBeDnSSyp75haJ5kOw1abDeDcY6gJuGw6hpGo2/pjaanxMKtgmSRa9A6 8q3W9uO5FD6RatWeT7ajPnK6mvTbjAffS9+oAwQlWyVyw8emNxXLEKeIuI6dmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o5leoCGFqfyK7EFOG3/Yfdd3Xbr5SXwvupBXI2PsrXM=; b=M6PGs735svN6fzEfuR1fmZj0GmTBMF7s8ma+aoz+sUnhKxYWVduj7j/6eg9iHRDpQB61J2 UqPioN9VlEZGsgyubInpsL4ROxnzn56UGB6C1MV7Hp6Wm45Nxy8mHTtgrVyKZGstT4OxAT 16G8kwv+oyGl+zSvEYyeSygVyTzPWbWrLhkKaHSw6eXeZBmJup2uGwpCptqHsTWHay2hie 9u2OAfikQ7ArySaIiVJsGY+AIPI0qQcffl9SSHcb+0OFJPzsZzPF7hTW4rWqxmOeUyyr9Q R+dcKrWWrO4OCr5ZhOPOokj8ElgvFFl7lkBDxRSJ2ikVVzzfeg8HZl61cgxXow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJn43hTz6Jn for ; Mon, 09 Mar 2026 11:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18002 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: a367a6264aac - stable/15 - iwlwifi: adjust driver description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a367a6264aac3745479ad5e5091595d15cac9009 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:53 +0000 Message-Id: <69aea919.18002.a1507b2@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a367a6264aac3745479ad5e5091595d15cac9009 commit a367a6264aac3745479ad5e5091595d15cac9009 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 19:40:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:12 +0000 iwlwifi: adjust driver description Adjust the module driver descriptions for mvm and mld to make it clear that this is not a driver for Linux but a Linux-based driver for FreeBSD. Cleanup surroundings. Sponsored by: The FreeBSD Foundation (cherry picked from commit 782fe2f8d90488a61ecdbe1d4b245900a88bee56) --- sys/contrib/dev/iwlwifi/mld/mld.c | 6 ++++++ sys/contrib/dev/iwlwifi/mvm/ops.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/mld/mld.c b/sys/contrib/dev/iwlwifi/mld/mld.c index 8075b886ddbf..3df9cabd34de 100644 --- a/sys/contrib/dev/iwlwifi/mld/mld.c +++ b/sys/contrib/dev/iwlwifi/mld/mld.c @@ -28,9 +28,15 @@ #include "iwl-nvm-parse.h" +#if defined(__linux__) #define DRV_DESCRIPTION "Intel(R) MLD wireless driver for Linux" +#elif defined(__FreeBSD__) +#define DRV_DESCRIPTION "Intel(R) MLD wireless Linux-based driver for FreeBSD" +#endif MODULE_DESCRIPTION(DRV_DESCRIPTION); +#if defined(__linux__) MODULE_LICENSE("GPL"); +#endif MODULE_IMPORT_NS("IWLWIFI"); static const struct iwl_op_mode_ops iwl_mld_ops; diff --git a/sys/contrib/dev/iwlwifi/mvm/ops.c b/sys/contrib/dev/iwlwifi/mvm/ops.c index 912fb6677a0d..2dee21163d4f 100644 --- a/sys/contrib/dev/iwlwifi/mvm/ops.c +++ b/sys/contrib/dev/iwlwifi/mvm/ops.c @@ -39,9 +39,8 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_LICENSE("GPL"); #elif defined(__FreeBSD__) -#define DRV_DESCRIPTION "The new Intel(R) wireless AGN/AC/AX based driver for FreeBSD" +#define DRV_DESCRIPTION "The new Intel(R) wireless AGN/AC/AX Linux-based driver for FreeBSD" MODULE_DESCRIPTION(DRV_DESCRIPTION); -MODULE_LICENSE("BSD"); #endif MODULE_IMPORT_NS("IWLWIFI"); From nobody Mon Mar 9 11:03:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJq0hJqz6VZR1 for ; Mon, 09 Mar 2026 11:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJp5Htdz3lRK for ; Mon, 09 Mar 2026 11:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pe3/rs09oRRgKTQW4Zk9AaQgbn3AMOakiP2UJ5juc1U=; b=T93ftL8qpbVTD7vdd5vsA0+caZeejv2sFfGHP3PRx5vGbC8mTc60DICoBKNuR8CkPMFkJk ubOiKRKFAP+WcFrcdVP0Bd8jq8eQlGlwNs76dGZMoVIFcmTcZ9Ut4zLLz4PmB3b2zssCS8 +accHPQXfAOCVumh8fCffMZBnrIHn5F6jqEPsF9wU4BJ7xpQE1EH3RmstwOlznVPNylU5h X0013whbKaKSOZ5L+gowV+SiAZOkXFrDoAx9HwLLvxlt4L1eXwMAvIRNW1TVAEaG0g9sqW ly5Zjmnra+ZP4tHDPjDTjIg4fedcRY9PLzcHostLaOTaIhbyyBpKO4dAMiT5jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054234; a=rsa-sha256; cv=none; b=Xy/E/JLvKDeBpWn0YNAWGDdFXE8UBrO5y+l2BW6TGIX2v6jYMDluaE1qYkJl9diPVW90dF rKAqrHzU5o0rD60/jKo/u9T8gPwGcZNSnJIvt1gAbOL0cknX5zsAzXA+C1bxKwM+qC5Uhn KKs9gybbF2REcT0ZLuMwXj+lOuPC86NiWSXgmvdRanmEIKI4v6hnNKfUd2CXvA48mv4p8z w56pDQttKgtwPAkv5n4GSuDxrxNVuFwxO1iY5CADMSNy1AJae9NeywDcKVHBELetPwi9By tTumYSLUt0kx0+dH3M5fgeUrBZfiy9PbHGkiTS/i8IfxAUAU4qOHXza72JnTxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pe3/rs09oRRgKTQW4Zk9AaQgbn3AMOakiP2UJ5juc1U=; b=oZijRuzoZOyrRRPmsQ2Qxf9x+OktylSdVUeWTDEc+oEP8zdWwVcigZXLaoV21RahTAcriM 3iNWxO4yCkA7VIgtPcRvXjpX2bQ9px5JI5hu5e5jHE58yq9Yu4ptCgxsKWNIkQatM5xVoN uMNDSeQBCYmpn/yvFzbakulFpbREOtBSm0R5v8r3zeDYfvGRlvYd7/J9mZkIu+W1baTsqH 8cZst4iMLTgZgNOf4jtkOTc2LVQscXacosvcSm0vF5vUPMDTXklP6cnbQ+Y5SaQyzSyFLA IjnS6vXzBObHsK2sKodmDN442PuI+b8c7cSYr2+3/OnJTKtdbKsaXw7Ji1G3gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJp4qLDz6sv for ; Mon, 09 Mar 2026 11:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47708 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 0cac46229c1b - stable/15 - iwlwifi: mld: add LINUXKPI_PARAM_PREFIX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0cac46229c1b0480b72ecbb52e3b533891d22939 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:54 +0000 Message-Id: <69aea91a.47708.65fc7d4d@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0cac46229c1b0480b72ecbb52e3b533891d22939 commit 0cac46229c1b0480b72ecbb52e3b533891d22939 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 19:42:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:12 +0000 iwlwifi: mld: add LINUXKPI_PARAM_PREFIX Add a LINUXKPI_PARAM_PREFIX to mld to properly export the power_scheme module_param (sysctl). This is especially needed given mvm has the same parameter and we need to avoid a clash. Sponsored by: The FreeBSD Foundation (cherry picked from commit 7db8503bda2724ae145475c3260d581bb98613ad) --- sys/contrib/dev/iwlwifi/mld/mld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mld/mld.c b/sys/contrib/dev/iwlwifi/mld/mld.c index 3df9cabd34de..c2cabe855c01 100644 --- a/sys/contrib/dev/iwlwifi/mld/mld.c +++ b/sys/contrib/dev/iwlwifi/mld/mld.c @@ -2,6 +2,10 @@ /* * Copyright (C) 2024-2025 Intel Corporation */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX iwlwifi_mld_ +#endif + #include #include From nobody Mon Mar 9 11:03:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJr2BM2z6VZln for ; Mon, 09 Mar 2026 11:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJr02TPz3lcq for ; Mon, 09 Mar 2026 11:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZODhngZxVFKxma17EZIrjCNZTr12iYjG3okWc9S8qM=; b=czN+kT80ZNBOBfUSUqOeITmhMtAwWThOHUgpyG4d3IfFf58wGNKZls1fKK9nmzSAPACOR+ 6QJ75ROGQHfV8OxQ6loue0WErBzNoAT32u+vHu0taO00KZ0tP2ijvK/NMcJB3+HNej/pgZ aRuiBL9A9CMuQGlZ2tNxa1ij7PSlxYT/739w2jLUWkl1sDW0MCT0kPFgegnyrnDnev1K/F RrjuHPmxIymOAxYQq4BVnYv73rguzhm76ufpQl64eRy95zz01E2LvevX8D8IpgT3HMciKX XicS6rAl029dO6WbTTGP7hqGAmlww6J+gJxmuLQ2NdV1Q7EUBH/o6FvIZpviUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054236; a=rsa-sha256; cv=none; b=fnkSgH0KS90ttSgkOX4uS5NhJgOE4llID+I/YrrMQQgboC4o5FuUv+FxMVeXam/3I5jt9C H4IoFeGdLRI3tT/qZzwG+ru6je8Qru6UoHm74t6Fxz7QwJ4h73ADZUkFIUC/3LcMFKgJRR yHDsBs3clzFs8AD8ru1ojvGPqJDmpQkjVksFGnTNPZORlLcP8hwXWmQZJbrA1oHjLzs/ku BV2u+pn3naa40c+lM84oK+gRTRJrZmmLBs3zzlmiBK1KEHWv3fBaz+KtC4ve7lvT55NkV/ fu3UgE2Xk1JCPuqOAyWOp3ll6g6C2Bd4bQQVOQhjCeKbkhGtYJfNK5ZWLZI8hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZODhngZxVFKxma17EZIrjCNZTr12iYjG3okWc9S8qM=; b=FNgCIcUzQrO4VK1ENGhVzx/xGvqTnkUiDThsgyGUOIv/SJ62VJ1tYrRkKxm5EZo4tBHvAC 8vzAyuyu54/ak0Hdo4/tVjnQOq7BgrNC2oeh/Mse8TmslnRDSS+rUfydrXIgWkl74m7ER8 xTKQ+9dhLZbj6vcJJFc92oq5vcZH2XuYBPRYxcMmFCpmqOQM+JGpu2Lx3U4buMwucz4eCV DNWbet4vXOzKHvSUC0CE1ADHP6hq97/HNiSsZUiTxiT6qtWeIGnqkZxO4/TekcGwgqMjdL wWsnKc8gkN2cZslqQ12rBJpx2g/WhBuC9UOPmncmV4ZTldXqzjPtTCodX5UseA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJq6hN2z6wJ for ; Mon, 09 Mar 2026 11:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47ae5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 79aafaec7e06 - stable/15 - iwlwifi: update Intel's mvm/mld drivers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 79aafaec7e06718af959defe3c1d3374707bbbbb Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:55 +0000 Message-Id: <69aea91b.47ae5.4207f984@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=79aafaec7e06718af959defe3c1d3374707bbbbb commit 79aafaec7e06718af959defe3c1d3374707bbbbb Author: Bjoern A. Zeeb AuthorDate: 2026-03-06 10:45:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:12 +0000 iwlwifi: update Intel's mvm/mld drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b ( tag: v6.19 ). Sponsored by: The FreeBSD Foundation (cherry picked from commit 95dd8736f846dee1208fe4c306caf1b0baf3caba) --- sys/contrib/dev/iwlwifi/cfg/22000.c | 1 - sys/contrib/dev/iwlwifi/cfg/8000.c | 1 - sys/contrib/dev/iwlwifi/cfg/9000.c | 1 - sys/contrib/dev/iwlwifi/cfg/ax210.c | 1 - sys/contrib/dev/iwlwifi/cfg/bz.c | 20 +- sys/contrib/dev/iwlwifi/cfg/dr.c | 14 +- sys/contrib/dev/iwlwifi/cfg/rf-fm.c | 1 + sys/contrib/dev/iwlwifi/cfg/rf-gf.c | 22 +- sys/contrib/dev/iwlwifi/cfg/rf-hr.c | 2 +- sys/contrib/dev/iwlwifi/cfg/rf-pe.c | 1 + sys/contrib/dev/iwlwifi/cfg/rf-wh.c | 24 + sys/contrib/dev/iwlwifi/cfg/sc.c | 19 +- sys/contrib/dev/iwlwifi/fw/acpi.c | 6 +- sys/contrib/dev/iwlwifi/fw/acpi.h | 3 +- sys/contrib/dev/iwlwifi/fw/api/alive.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/coex.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/commands.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/d3.h | 113 +- sys/contrib/dev/iwlwifi/fw/api/datapath.h | 5 + sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h | 14 +- sys/contrib/dev/iwlwifi/fw/api/debug.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/location.h | 8 +- sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h | 3 + sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h | 134 +- sys/contrib/dev/iwlwifi/fw/api/offload.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/power.h | 39 +- sys/contrib/dev/iwlwifi/fw/api/rs.h | 35 + sys/contrib/dev/iwlwifi/fw/api/rx.h | 286 ++++ sys/contrib/dev/iwlwifi/fw/api/scan.h | 78 +- sys/contrib/dev/iwlwifi/fw/api/sta.h | 6 +- sys/contrib/dev/iwlwifi/fw/api/stats.h | 39 +- sys/contrib/dev/iwlwifi/fw/api/tx.h | 2 +- sys/contrib/dev/iwlwifi/fw/dbg.c | 43 +- sys/contrib/dev/iwlwifi/fw/dump.c | 54 +- sys/contrib/dev/iwlwifi/fw/error-dump.h | 7 +- sys/contrib/dev/iwlwifi/fw/file.h | 74 +- sys/contrib/dev/iwlwifi/fw/img.h | 12 +- sys/contrib/dev/iwlwifi/fw/pnvm.c | 81 +- sys/contrib/dev/iwlwifi/fw/regulatory.c | 79 +- sys/contrib/dev/iwlwifi/fw/regulatory.h | 1 - sys/contrib/dev/iwlwifi/fw/runtime.h | 24 +- sys/contrib/dev/iwlwifi/fw/uefi.c | 7 +- sys/contrib/dev/iwlwifi/iwl-config.h | 51 +- sys/contrib/dev/iwlwifi/iwl-dbg-tlv.h | 4 +- sys/contrib/dev/iwlwifi/iwl-drv.c | 72 +- sys/contrib/dev/iwlwifi/iwl-drv.h | 12 +- sys/contrib/dev/iwlwifi/iwl-io.c | 96 +- sys/contrib/dev/iwlwifi/iwl-io.h | 2 +- sys/contrib/dev/iwlwifi/iwl-modparams.h | 4 +- sys/contrib/dev/iwlwifi/iwl-nvm-parse.c | 82 +- sys/contrib/dev/iwlwifi/iwl-nvm-parse.h | 91 +- sys/contrib/dev/iwlwifi/iwl-op-mode.h | 1 + sys/contrib/dev/iwlwifi/iwl-trans.c | 79 +- sys/contrib/dev/iwlwifi/iwl-trans.h | 87 +- sys/contrib/dev/iwlwifi/mld/constants.h | 2 + sys/contrib/dev/iwlwifi/mld/d3.c | 557 ++++--- sys/contrib/dev/iwlwifi/mld/debugfs.c | 8 +- sys/contrib/dev/iwlwifi/mld/fw.c | 14 +- sys/contrib/dev/iwlwifi/mld/iface.c | 54 +- sys/contrib/dev/iwlwifi/mld/iface.h | 5 +- sys/contrib/dev/iwlwifi/mld/key.c | 38 + sys/contrib/dev/iwlwifi/mld/key.h | 7 + sys/contrib/dev/iwlwifi/mld/link.c | 50 +- sys/contrib/dev/iwlwifi/mld/link.h | 2 + sys/contrib/dev/iwlwifi/mld/mac80211.c | 124 +- sys/contrib/dev/iwlwifi/mld/mld.c | 5 + sys/contrib/dev/iwlwifi/mld/mld.h | 25 +- sys/contrib/dev/iwlwifi/mld/mlo.c | 122 +- sys/contrib/dev/iwlwifi/mld/notif.c | 5 +- sys/contrib/dev/iwlwifi/mld/ptp.c | 7 + sys/contrib/dev/iwlwifi/mld/regulatory.c | 28 +- sys/contrib/dev/iwlwifi/mld/roc.c | 14 +- sys/contrib/dev/iwlwifi/mld/rx.c | 1717 ++++++++++++---------- sys/contrib/dev/iwlwifi/mld/rx.h | 5 +- sys/contrib/dev/iwlwifi/mld/scan.c | 4 +- sys/contrib/dev/iwlwifi/mld/sta.c | 10 +- sys/contrib/dev/iwlwifi/mld/stats.c | 11 +- sys/contrib/dev/iwlwifi/mld/tlc.c | 75 +- sys/contrib/dev/iwlwifi/mvm/coex.c | 131 -- sys/contrib/dev/iwlwifi/mvm/constants.h | 20 +- sys/contrib/dev/iwlwifi/mvm/d3.c | 398 +---- sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c | 94 -- sys/contrib/dev/iwlwifi/mvm/debugfs.c | 3 +- sys/contrib/dev/iwlwifi/mvm/fw.c | 17 +- sys/contrib/dev/iwlwifi/mvm/link.c | 809 ---------- sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c | 51 +- sys/contrib/dev/iwlwifi/mvm/mac80211.c | 124 +- sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 141 +- sys/contrib/dev/iwlwifi/mvm/mld-sta.c | 2 - sys/contrib/dev/iwlwifi/mvm/mvm.h | 136 +- sys/contrib/dev/iwlwifi/mvm/ops.c | 53 - sys/contrib/dev/iwlwifi/mvm/phy-ctxt.c | 24 +- sys/contrib/dev/iwlwifi/mvm/ptp.c | 7 + sys/contrib/dev/iwlwifi/mvm/rx.c | 135 +- sys/contrib/dev/iwlwifi/mvm/rxmq.c | 23 +- sys/contrib/dev/iwlwifi/mvm/scan.c | 101 -- sys/contrib/dev/iwlwifi/mvm/sta.c | 89 -- sys/contrib/dev/iwlwifi/mvm/sta.h | 24 - sys/contrib/dev/iwlwifi/mvm/time-event.c | 17 +- sys/contrib/dev/iwlwifi/mvm/tx.c | 8 +- sys/contrib/dev/iwlwifi/mvm/utils.c | 22 +- sys/contrib/dev/iwlwifi/pcie/drv.c | 19 +- sys/contrib/dev/iwlwifi/pcie/gen1_2/internal.h | 53 +- sys/contrib/dev/iwlwifi/pcie/gen1_2/trans-gen2.c | 6 +- sys/contrib/dev/iwlwifi/pcie/gen1_2/trans.c | 252 +++- sys/contrib/dev/iwlwifi/pcie/gen1_2/tx.c | 5 +- sys/contrib/dev/iwlwifi/tests/Makefile | 2 +- sys/contrib/dev/iwlwifi/tests/devinfo.c | 29 + 109 files changed, 3118 insertions(+), 4423 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/cfg/22000.c b/sys/contrib/dev/iwlwifi/cfg/22000.c index ca488931a33c..f0453f3f6ba6 100644 --- a/sys/contrib/dev/iwlwifi/cfg/22000.c +++ b/sys/contrib/dev/iwlwifi/cfg/22000.c @@ -38,7 +38,6 @@ static const struct iwl_family_base_params iwl_22000_base = { .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .apmg_not_supported = true, .mac_addr_from_csr = 0x380, - .min_umac_error_event_table = 0x400000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { diff --git a/sys/contrib/dev/iwlwifi/cfg/8000.c b/sys/contrib/dev/iwlwifi/cfg/8000.c index b56574006ee0..3c844cd419e8 100644 --- a/sys/contrib/dev/iwlwifi/cfg/8000.c +++ b/sys/contrib/dev/iwlwifi/cfg/8000.c @@ -50,7 +50,6 @@ static const struct iwl_family_base_params iwl8000_base = { .smem_offset = IWL8260_SMEM_OFFSET, .smem_len = IWL8260_SMEM_LEN, .apmg_not_supported = true, - .min_umac_error_event_table = 0x800000, }; static const struct iwl_tt_params iwl8000_tt_params = { diff --git a/sys/contrib/dev/iwlwifi/cfg/9000.c b/sys/contrib/dev/iwlwifi/cfg/9000.c index ac1fa291cf2f..5872fc9b8caf 100644 --- a/sys/contrib/dev/iwlwifi/cfg/9000.c +++ b/sys/contrib/dev/iwlwifi/cfg/9000.c @@ -41,7 +41,6 @@ static const struct iwl_family_base_params iwl9000_base = { .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .apmg_not_supported = true, .mac_addr_from_csr = 0x380, - .min_umac_error_event_table = 0x800000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 92 * 1024, .nvm_hw_section_num = 10, diff --git a/sys/contrib/dev/iwlwifi/cfg/ax210.c b/sys/contrib/dev/iwlwifi/cfg/ax210.c index ddf3d313da5a..582f61661062 100644 --- a/sys/contrib/dev/iwlwifi/cfg/ax210.c +++ b/sys/contrib/dev/iwlwifi/cfg/ax210.c @@ -33,7 +33,6 @@ static const struct iwl_family_base_params iwl_ax210_base = { .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .apmg_not_supported = true, .mac_addr_from_csr = 0x380, - .min_umac_error_event_table = 0x400000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { diff --git a/sys/contrib/dev/iwlwifi/cfg/bz.c b/sys/contrib/dev/iwlwifi/cfg/bz.c index 9f543946b285..d25445bd1e5c 100644 --- a/sys/contrib/dev/iwlwifi/cfg/bz.c +++ b/sys/contrib/dev/iwlwifi/cfg/bz.c @@ -9,11 +9,11 @@ #include "iwl-prph.h" #include "fw/api/txq.h" -/* Highest firmware API version supported */ -#define IWL_BZ_UCODE_API_MAX 102 +/* Highest firmware core release supported */ +#define IWL_BZ_UCODE_CORE_MAX 101 /* Lowest firmware API version supported */ -#define IWL_BZ_UCODE_API_MIN 98 +#define IWL_BZ_UCODE_API_MIN 100 /* Memory offsets and lengths */ #define IWL_BZ_SMEM_OFFSET 0x400000 @@ -38,7 +38,6 @@ static const struct iwl_family_base_params iwl_bz_base = { .smem_len = IWL_BZ_SMEM_LEN, .apmg_not_supported = true, .mac_addr_from_csr = 0x30, - .min_umac_error_event_table = 0xD0000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { @@ -75,7 +74,7 @@ static const struct iwl_family_base_params iwl_bz_base = { }, }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, - .ucode_api_max = IWL_BZ_UCODE_API_MAX, + .ucode_api_max = ENCODE_CORE_AS_API(IWL_BZ_UCODE_CORE_MAX), .ucode_api_min = IWL_BZ_UCODE_API_MIN, }; @@ -90,6 +89,7 @@ const struct iwl_mac_cfg iwl_bz_mac_cfg = { .low_latency_xtal = true, .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; +EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_bz_mac_cfg); const struct iwl_mac_cfg iwl_gl_mac_cfg = { .device_family = IWL_DEVICE_FAMILY_BZ, @@ -101,8 +101,8 @@ const struct iwl_mac_cfg iwl_gl_mac_cfg = { .low_latency_xtal = true, }; -IWL_FW_AND_PNVM(IWL_BZ_A_FM_B_FW_PRE, IWL_BZ_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_BZ_A_FM_C_FW_PRE, IWL_BZ_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_BZ_A_FM4_B_FW_PRE, IWL_BZ_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_GL_B_FM_B_FW_PRE, IWL_BZ_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_GL_C_FM_C_FW_PRE, IWL_BZ_UCODE_API_MAX); +IWL_CORE_FW(IWL_BZ_A_FM_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_BZ_A_FM_C_FW_PRE, IWL_BZ_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_BZ_A_FM4_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_GL_B_FM_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_GL_C_FM_C_FW_PRE, IWL_BZ_UCODE_CORE_MAX); diff --git a/sys/contrib/dev/iwlwifi/cfg/dr.c b/sys/contrib/dev/iwlwifi/cfg/dr.c index 807f4e29d55a..a279dcfd3083 100644 --- a/sys/contrib/dev/iwlwifi/cfg/dr.c +++ b/sys/contrib/dev/iwlwifi/cfg/dr.c @@ -8,11 +8,11 @@ #include "iwl-prph.h" #include "fw/api/txq.h" -/* Highest firmware API version supported */ -#define IWL_DR_UCODE_API_MAX 102 +/* Highest firmware core release supported */ +#define IWL_DR_UCODE_CORE_MAX 101 /* Lowest firmware API version supported */ -#define IWL_DR_UCODE_API_MIN 98 +#define IWL_DR_UCODE_API_MIN 100 /* Memory offsets and lengths */ #define IWL_DR_SMEM_OFFSET 0x400000 @@ -20,9 +20,6 @@ #define IWL_DR_A_PE_A_FW_PRE "iwlwifi-dr-a0-pe-a0" -#define IWL_DR_A_PE_A_FW_MODULE_FIRMWARE(api) \ - IWL_DR_A_PE_A_FW_PRE "-" __stringify(api) ".ucode" - static const struct iwl_family_base_params iwl_dr_base = { .num_of_queues = 512, .max_tfd_queue_size = 65536, @@ -36,7 +33,6 @@ static const struct iwl_family_base_params iwl_dr_base = { .smem_len = IWL_DR_SMEM_LEN, .apmg_not_supported = true, .mac_addr_from_csr = 0x30, - .min_umac_error_event_table = 0xD0000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { @@ -73,7 +69,7 @@ static const struct iwl_family_base_params iwl_dr_base = { }, }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, - .ucode_api_max = IWL_DR_UCODE_API_MAX, + .ucode_api_max = ENCODE_CORE_AS_API(IWL_DR_UCODE_CORE_MAX), .ucode_api_min = IWL_DR_UCODE_API_MIN, }; @@ -89,5 +85,5 @@ const struct iwl_mac_cfg iwl_dr_mac_cfg = { .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; -MODULE_FIRMWARE(IWL_DR_A_PE_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX)); +IWL_CORE_FW(IWL_DR_A_PE_A_FW_PRE, IWL_DR_UCODE_CORE_MAX); diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-fm.c b/sys/contrib/dev/iwlwifi/cfg/rf-fm.c index 456a666c8dfd..fd82050e33a3 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-fm.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-fm.c @@ -19,6 +19,7 @@ .non_shared_ant = ANT_B, \ .vht_mu_mimo_supported = true, \ .uhb_supported = true, \ + .eht_supported = true, \ .num_rbds = IWL_NUM_RBDS_EHT, \ .nvm_ver = IWL_FM_NVM_VERSION, \ .nvm_type = IWL_NVM_EXT diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-gf.c b/sys/contrib/dev/iwlwifi/cfg/rf-gf.c index 7ff5170faaa9..c16cda087a7c 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-gf.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-gf.c @@ -9,7 +9,7 @@ #define IWL_GF_UCODE_API_MAX 100 /* Lowest firmware API version supported */ -#define IWL_GF_UCODE_API_MIN 98 +#define IWL_GF_UCODE_API_MIN 100 #define IWL_SO_A_GF_A_FW_PRE "iwlwifi-so-a0-gf-a0" #define IWL_TY_A_GF_A_FW_PRE "iwlwifi-ty-a0-gf-a0" @@ -23,6 +23,18 @@ #define IWL_SC_A_GF_A_FW_PRE "iwlwifi-sc-a0-gf-a0" #define IWL_SC_A_GF4_A_FW_PRE "iwlwifi-sc-a0-gf4-a0" +#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \ + IWL_BZ_A_GF_A_FW_PRE "-" __stringify(api) ".ucode" + +#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \ + IWL_BZ_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode" + +#define IWL_SC_A_GF_A_MODULE_FIRMWARE(api) \ + IWL_SC_A_GF_A_FW_PRE "-" __stringify(api) ".ucode" + +#define IWL_SC_A_GF4_A_MODULE_FIRMWARE(api) \ + IWL_SC_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode" + /* NVM versions */ #define IWL_GF_NVM_VERSION 0x0a1d @@ -67,7 +79,7 @@ IWL_FW_AND_PNVM(IWL_MA_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX); IWL_FW_AND_PNVM(IWL_MA_B_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX); IWL_FW_AND_PNVM(IWL_MA_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX); IWL_FW_AND_PNVM(IWL_MA_B_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_BZ_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_BZ_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX); +MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_SC_A_GF_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_SC_A_GF4_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX)); diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-hr.c b/sys/contrib/dev/iwlwifi/cfg/rf-hr.c index 9f408d276ce9..6cf187d92dbf 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-hr.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-hr.c @@ -9,7 +9,7 @@ #define IWL_HR_UCODE_API_MAX 100 /* Lowest firmware API version supported */ -#define IWL_HR_UCODE_API_MIN 98 +#define IWL_HR_UCODE_API_MIN 100 #define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0" #define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0" diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-pe.c b/sys/contrib/dev/iwlwifi/cfg/rf-pe.c index 483f21659eff..408b9850bd10 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-pe.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-pe.c @@ -12,5 +12,6 @@ const char iwl_killer_bn1850i_name[] = "Killer(R) Wi-Fi 8 BN1850i 320MHz Wireless Network Adapter (BN201.NGW)"; const char iwl_bn201_name[] = "Intel(R) Wi-Fi 8 BN201"; +const char iwl_bn203_name[] = "Intel(R) Wi-Fi 8 BN203"; const char iwl_be221_name[] = "Intel(R) Wi-Fi 7 BE221"; const char iwl_be223_name[] = "Intel(R) Wi-Fi 7 BE223"; diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-wh.c b/sys/contrib/dev/iwlwifi/cfg/rf-wh.c index 97735175cb0e..b5803ea1eb78 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-wh.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-wh.c @@ -4,8 +4,31 @@ */ #include "iwl-config.h" +/* NVM versions */ +#define IWL_WH_NVM_VERSION 0x0a1d + +#define IWL_DEVICE_WH \ + .ht_params = { \ + .stbc = true, \ + .ldpc = true, \ + .ht40_bands = BIT(NL80211_BAND_2GHZ) | \ + BIT(NL80211_BAND_5GHZ), \ + }, \ + .led_mode = IWL_LED_RF_STATE, \ + .non_shared_ant = ANT_B, \ + .vht_mu_mimo_supported = true, \ + .uhb_supported = true, \ + .num_rbds = IWL_NUM_RBDS_EHT, \ + .nvm_ver = IWL_WH_NVM_VERSION, \ + .nvm_type = IWL_NVM_EXT + /* currently iwl_rf_wh/iwl_rf_wh_160mhz are just defines for the FM ones */ +const struct iwl_rf_cfg iwl_rf_wh_non_eht = { + IWL_DEVICE_WH, + .eht_supported = false, +}; + const char iwl_killer_be1775s_name[] = "Killer(R) Wi-Fi 7 BE1775s 320MHz Wireless Network Adapter (BE211D2W)"; const char iwl_killer_be1775i_name[] = @@ -13,3 +36,4 @@ const char iwl_killer_be1775i_name[] = const char iwl_be211_name[] = "Intel(R) Wi-Fi 7 BE211 320MHz"; const char iwl_be213_name[] = "Intel(R) Wi-Fi 7 BE213 160MHz"; +const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz"; diff --git a/sys/contrib/dev/iwlwifi/cfg/sc.c b/sys/contrib/dev/iwlwifi/cfg/sc.c index 6d4a3bce49b9..ee00b2af7a1d 100644 --- a/sys/contrib/dev/iwlwifi/cfg/sc.c +++ b/sys/contrib/dev/iwlwifi/cfg/sc.c @@ -9,11 +9,11 @@ #include "iwl-prph.h" #include "fw/api/txq.h" -/* Highest firmware API version supported */ -#define IWL_SC_UCODE_API_MAX 102 +/* Highest firmware core release supported */ +#define IWL_SC_UCODE_CORE_MAX 101 /* Lowest firmware API version supported */ -#define IWL_SC_UCODE_API_MIN 98 +#define IWL_SC_UCODE_API_MIN 100 /* NVM versions */ #define IWL_SC_NVM_VERSION 0x0a1d @@ -41,7 +41,6 @@ static const struct iwl_family_base_params iwl_sc_base = { .smem_len = IWL_SC_SMEM_LEN, .apmg_not_supported = true, .mac_addr_from_csr = 0x30, - .min_umac_error_event_table = 0xD0000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { @@ -78,7 +77,7 @@ static const struct iwl_family_base_params iwl_sc_base = { }, }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, - .ucode_api_max = IWL_SC_UCODE_API_MAX, + .ucode_api_max = ENCODE_CORE_AS_API(IWL_SC_UCODE_CORE_MAX), .ucode_api_min = IWL_SC_UCODE_API_MIN, }; @@ -94,8 +93,8 @@ const struct iwl_mac_cfg iwl_sc_mac_cfg = { .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; -IWL_FW_AND_PNVM(IWL_SC_A_FM_B_FW_PRE, IWL_SC_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC2_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC2_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX); +IWL_CORE_FW(IWL_SC_A_FM_B_FW_PRE, IWL_SC_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_SC_A_FM_C_FW_PRE, IWL_SC_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_SC_A_WH_A_FW_PRE, IWL_SC_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_SC2_A_FM_C_FW_PRE, IWL_SC_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_SC2_A_WH_A_FW_PRE, IWL_SC_UCODE_CORE_MAX); diff --git a/sys/contrib/dev/iwlwifi/fw/acpi.c b/sys/contrib/dev/iwlwifi/fw/acpi.c index 7ec22738b5d6..52edc19d8cdd 100644 --- a/sys/contrib/dev/iwlwifi/fw/acpi.c +++ b/sys/contrib/dev/iwlwifi/fw/acpi.c @@ -9,9 +9,9 @@ #include "acpi.h" #include "fw/runtime.h" -const guid_t iwl_guid = GUID_INIT(0xF21202BF, 0x8F78, 0x4DC6, - 0xA5, 0xB3, 0x1F, 0x73, - 0x8E, 0x28, 0x5A, 0xDE); +static const guid_t iwl_guid = GUID_INIT(0xF21202BF, 0x8F78, 0x4DC6, + 0xA5, 0xB3, 0x1F, 0x73, + 0x8E, 0x28, 0x5A, 0xDE); static const size_t acpi_dsm_size[DSM_FUNC_NUM_FUNCS] = { [DSM_FUNC_QUERY] = sizeof(u32), diff --git a/sys/contrib/dev/iwlwifi/fw/acpi.h b/sys/contrib/dev/iwlwifi/fw/acpi.h index 68d8fb5f6357..06cece4ea6d9 100644 --- a/sys/contrib/dev/iwlwifi/fw/acpi.h +++ b/sys/contrib/dev/iwlwifi/fw/acpi.h @@ -140,8 +140,6 @@ struct iwl_dsm_internal_product_reset_cmd { struct iwl_fw_runtime; -extern const guid_t iwl_guid; - union acpi_object *iwl_acpi_get_dsm_object(struct device *dev, int rev, int func, union acpi_object *args, const guid_t *guid); @@ -153,6 +151,7 @@ union acpi_object *iwl_acpi_get_dsm_object(struct device *dev, int rev, * @mcc: output buffer (3 bytes) that will get the MCC * * This function tries to read the current MCC from ACPI if available. + * Return: 0 on success, or a negative error code */ int iwl_acpi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc); diff --git a/sys/contrib/dev/iwlwifi/fw/api/alive.h b/sys/contrib/dev/iwlwifi/fw/api/alive.h index ad5b95cad0bf..ea2ba4b4cb7b 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/alive.h +++ b/sys/contrib/dev/iwlwifi/fw/api/alive.h @@ -88,7 +88,7 @@ struct iwl_imr_alive_info { __le32 enabled; } __packed; /* IMR_ALIVE_INFO_API_S_VER_1 */ -struct iwl_alive_ntf_v6 { +struct iwl_alive_ntf_v7 { __le16 status; __le16 flags; struct iwl_lmac_alive lmac_data[2]; diff --git a/sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h b/sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h index d130d4f85444..073f003bdc5d 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h +++ b/sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2005-2014 Intel Corporation + * Copyright (C) 2005-2014, 2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -98,7 +98,7 @@ struct iwl_cmd_header { } __packed; /** - * struct iwl_cmd_header_wide + * struct iwl_cmd_header_wide - wide command header * * This header format appears in the beginning of each command sent from the * driver, and each response/notification received from uCode. diff --git a/sys/contrib/dev/iwlwifi/fw/api/coex.h b/sys/contrib/dev/iwlwifi/fw/api/coex.h index ddc84430d895..616f00a8b603 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/coex.h +++ b/sys/contrib/dev/iwlwifi/fw/api/coex.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2023-2024 Intel Corporation + * Copyright (C) 2023-2025 Intel Corporation * Copyright (C) 2013-2014, 2018-2019 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2017 Intel Deutschland GmbH @@ -52,7 +52,7 @@ struct iwl_bt_coex_cmd { } __packed; /* BT_COEX_CMD_API_S_VER_6 */ /** - * struct iwl_bt_coex_reduced_txp_update_cmd + * struct iwl_bt_coex_reduced_txp_update_cmd - reduced TX power command * @reduced_txp: bit BT_REDUCED_TX_POWER_BIT to enable / disable, rest of the * bits are the sta_id (value) */ diff --git a/sys/contrib/dev/iwlwifi/fw/api/commands.h b/sys/contrib/dev/iwlwifi/fw/api/commands.h index 997b0c9ce984..8d64a271bb94 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/commands.h +++ b/sys/contrib/dev/iwlwifi/fw/api/commands.h @@ -60,7 +60,7 @@ enum iwl_legacy_cmds { * @UCODE_ALIVE_NTFY: * Alive data from the firmware, as described in * &struct iwl_alive_ntf_v3 or &struct iwl_alive_ntf_v4 or - * &struct iwl_alive_ntf_v5 or &struct iwl_alive_ntf_v6. + * &struct iwl_alive_ntf_v5 or &struct iwl_alive_ntf_v7. */ UCODE_ALIVE_NTFY = 0x1, diff --git a/sys/contrib/dev/iwlwifi/fw/api/d3.h b/sys/contrib/dev/iwlwifi/fw/api/d3.h index 53445087e9cb..d3bed0216df4 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/d3.h +++ b/sys/contrib/dev/iwlwifi/fw/api/d3.h @@ -367,6 +367,7 @@ enum iwl_wowlan_flags { ENABLE_NBNS_FILTERING = BIT(2), ENABLE_DHCP_FILTERING = BIT(3), ENABLE_STORE_BEACON = BIT(4), + HAS_BEACON_PROTECTION = BIT(5), }; /** @@ -631,9 +632,64 @@ struct iwl_wowlan_gtk_status_v3 { struct iwl_wowlan_all_rsc_tsc_v5 sc; } __packed; /* WOWLAN_GTK_MATERIAL_VER_3 */ +/** + * enum iwl_wowlan_key_status - Status of security keys in WoWLAN notifications + * @IWL_WOWLAN_NOTIF_NO_KEY: No key is present; this entry should be ignored. + * @IWL_WOWLAN_STATUS_OLD_KEY: old key exists; no rekey occurred, and only + * metadata is available. + * @IWL_WOWLAN_STATUS_NEW_KEY: A new key was created after a rekey; new key + * material is available. + */ +enum iwl_wowlan_key_status { + IWL_WOWLAN_NOTIF_NO_KEY = 0, + IWL_WOWLAN_STATUS_OLD_KEY = 1, + IWL_WOWLAN_STATUS_NEW_KEY = 2 +}; + +/** + * struct iwl_wowlan_gtk_status - GTK status + * @key: GTK material + * @key_len: GTK length, if set to 0, the key is not available + * @key_flags: information about the key: + * bits[0:1]: key index assigned by the AP + * bits[2:6]: GTK index of the key in the internal DB + * bit[7]: Set iff this is the currently used GTK + * @key_status: key status, see &enum iwl_wowlan_key_status + * @reserved: padding + * @tkip_mic_key: TKIP RX MIC key + * @sc: RSC/TSC counters + */ +struct iwl_wowlan_gtk_status { + u8 key[WOWLAN_KEY_MAX_SIZE]; + u8 key_len; + u8 key_flags; + u8 key_status; + u8 reserved; + u8 tkip_mic_key[IWL_MIC_KEY_SIZE]; + struct iwl_wowlan_all_rsc_tsc_v5 sc; +} __packed; /* WOWLAN_GTK_MATERIAL_VER_4 */ + #define IWL_WOWLAN_GTK_IDX_MASK (BIT(0) | BIT(1)) #define IWL_WOWLAN_IGTK_BIGTK_IDX_MASK (BIT(0)) +/** + * struct iwl_wowlan_igtk_status_v1 - IGTK status + * @key: IGTK material + * @ipn: the IGTK packet number (replay counter) + * @key_len: IGTK length, if set to 0, the key is not available + * @key_flags: information about the key: + * bits[0]: key index assigned by the AP (0: index 4, 1: index 5) + * (0: index 6, 1: index 7 with bigtk) + * bits[1:5]: IGTK index of the key in the internal DB + * bit[6]: Set iff this is the currently used IGTK + */ +struct iwl_wowlan_igtk_status_v1 { + u8 key[WOWLAN_KEY_MAX_SIZE]; + u8 ipn[6]; + u8 key_len; + u8 key_flags; +} __packed; /* WOWLAN_IGTK_MATERIAL_VER_1 */ + /** * struct iwl_wowlan_igtk_status - IGTK status * @key: IGTK material @@ -644,13 +700,17 @@ struct iwl_wowlan_gtk_status_v3 { * (0: index 6, 1: index 7 with bigtk) * bits[1:5]: IGTK index of the key in the internal DB * bit[6]: Set iff this is the currently used IGTK + * @key_status: key status, see &enum iwl_wowlan_key_status + * @reserved: padding */ struct iwl_wowlan_igtk_status { u8 key[WOWLAN_KEY_MAX_SIZE]; u8 ipn[6]; u8 key_len; u8 key_flags; -} __packed; /* WOWLAN_IGTK_MATERIAL_VER_1 */ + u8 key_status; + u8 reserved[3]; +} __packed; /* WOWLAN_IGTK_MATERIAL_VER_2 */ /** * struct iwl_wowlan_status_v6 - WoWLAN status @@ -700,7 +760,7 @@ struct iwl_wowlan_status_v6 { */ struct iwl_wowlan_status_v7 { struct iwl_wowlan_gtk_status_v2 gtk[WOWLAN_GTK_KEYS_NUM]; - struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM]; __le64 replay_ctr; __le16 pattern_number; __le16 non_qos_seq_ctr; @@ -735,7 +795,7 @@ struct iwl_wowlan_status_v7 { */ struct iwl_wowlan_info_notif_v1 { struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM]; - struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM]; __le64 replay_ctr; __le16 pattern_number; __le16 reserved1; @@ -817,8 +877,8 @@ struct iwl_wowlan_mlo_gtk { */ struct iwl_wowlan_info_notif_v3 { struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM]; - struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM]; - struct iwl_wowlan_igtk_status bigtk[WOWLAN_BIGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 bigtk[WOWLAN_BIGTK_KEYS_NUM]; __le64 replay_ctr; __le16 pattern_number; __le16 reserved1; @@ -832,6 +892,45 @@ struct iwl_wowlan_info_notif_v3 { u8 reserved2[2]; } __packed; /* WOWLAN_INFO_NTFY_API_S_VER_3 */ +/** + * struct iwl_wowlan_info_notif_v5 - WoWLAN information notification + * @gtk: GTK data + * @igtk: IGTK data + * @bigtk: BIGTK data + * @replay_ctr: GTK rekey replay counter + * @pattern_number: number of the matched patterns + * @qos_seq_ctr: QoS sequence counters to use next + * @wakeup_reasons: wakeup reasons, see &enum iwl_wowlan_wakeup_reason + * @num_of_gtk_rekeys: number of GTK rekeys + * @transmitted_ndps: number of transmitted neighbor discovery packets + * @received_beacons: number of received beacons + * @tid_tear_down: bit mask of tids whose BA sessions were closed + * in suspend state + * @station_id: station id + * @num_mlo_link_keys: number of &struct iwl_wowlan_mlo_gtk structs + * following this notif + * @tid_offloaded_tx: tid used by the firmware to transmit data packets + * while in wowlan + * @mlo_gtks: array of GTKs of size num_mlo_link_keys + */ +struct iwl_wowlan_info_notif_v5 { + struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 bigtk[WOWLAN_BIGTK_KEYS_NUM]; + __le64 replay_ctr; + __le16 pattern_number; + __le16 qos_seq_ctr; + __le32 wakeup_reasons; + __le32 num_of_gtk_rekeys; + __le32 transmitted_ndps; + __le32 received_beacons; + u8 tid_tear_down; + u8 station_id; + u8 num_mlo_link_keys; + u8 tid_offloaded_tx; + struct iwl_wowlan_mlo_gtk mlo_gtks[]; +} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_5 */ + /** * struct iwl_wowlan_info_notif - WoWLAN information notification * @gtk: GTK data @@ -854,7 +953,7 @@ struct iwl_wowlan_info_notif_v3 { * @mlo_gtks: array of GTKs of size num_mlo_link_keys */ struct iwl_wowlan_info_notif { - struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM]; + struct iwl_wowlan_gtk_status gtk[WOWLAN_GTK_KEYS_NUM]; struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM]; struct iwl_wowlan_igtk_status bigtk[WOWLAN_BIGTK_KEYS_NUM]; __le64 replay_ctr; @@ -869,7 +968,7 @@ struct iwl_wowlan_info_notif { u8 num_mlo_link_keys; u8 tid_offloaded_tx; struct iwl_wowlan_mlo_gtk mlo_gtks[]; -} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_5 */ +} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_6 */ /** * struct iwl_wowlan_wake_pkt_notif - WoWLAN wake packet notification diff --git a/sys/contrib/dev/iwlwifi/fw/api/datapath.h b/sys/contrib/dev/iwlwifi/fw/api/datapath.h index b1c6ee8ae2df..6a6e11a57dbf 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/datapath.h +++ b/sys/contrib/dev/iwlwifi/fw/api/datapath.h @@ -123,6 +123,11 @@ enum iwl_data_path_subcmd_ids { */ BEACON_FILTER_IN_NOTIF = 0xF8, + /** + * @PHY_AIR_SNIFFER_NOTIF: &struct iwl_rx_phy_air_sniffer_ntfy + */ + PHY_AIR_SNIFFER_NOTIF = 0xF9, + /** * @STA_PM_NOTIF: &struct iwl_mvm_pm_state_notification */ diff --git a/sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h b/sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h index 3173fa96cb48..b62f0687327a 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h +++ b/sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h @@ -16,7 +16,7 @@ #define IWL_FW_INI_PRESET_DISABLE 0xff /** - * struct iwl_fw_ini_hcmd + * struct iwl_fw_ini_hcmd - debug configuration host command * * @id: the debug configuration command type for instance: 0xf6 / 0xf5 / DHC * @group: the desired cmd group @@ -199,7 +199,7 @@ struct iwl_fw_ini_region_tlv { } __packed; /* FW_TLV_DEBUG_REGION_API_S_VER_1 */ /** - * struct iwl_fw_ini_debug_info_tlv + * struct iwl_fw_ini_debug_info_tlv - debug info TLV * * debug configuration name for a specific image * @@ -311,7 +311,7 @@ struct iwl_fw_ini_conf_set_tlv { } __packed; /* FW_TLV_DEBUG_CONFIG_SET_API_S_VER_1 */ /** - * enum iwl_fw_ini_config_set_type + * enum iwl_fw_ini_config_set_type - configuration set type * * @IWL_FW_INI_CONFIG_SET_TYPE_INVALID: invalid config set * @IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_MAC: for PERIPHERY MAC configuration @@ -337,7 +337,7 @@ enum iwl_fw_ini_config_set_type { } __packed; /** - * enum iwl_fw_ini_allocation_id + * enum iwl_fw_ini_allocation_id - allocation ID * * @IWL_FW_INI_ALLOCATION_INVALID: invalid * @IWL_FW_INI_ALLOCATION_ID_DBGC1: allocation meant for DBGC1 configuration @@ -356,7 +356,7 @@ enum iwl_fw_ini_allocation_id { }; /* FW_DEBUG_TLV_ALLOCATION_ID_E_VER_1 */ /** - * enum iwl_fw_ini_buffer_location + * enum iwl_fw_ini_buffer_location - buffer location * * @IWL_FW_INI_LOCATION_INVALID: invalid * @IWL_FW_INI_LOCATION_SRAM_PATH: SRAM location @@ -373,7 +373,7 @@ enum iwl_fw_ini_buffer_location { }; /* FW_DEBUG_TLV_BUFFER_LOCATION_E_VER_1 */ /** - * enum iwl_fw_ini_region_type + * enum iwl_fw_ini_region_type - region type * * @IWL_FW_INI_REGION_INVALID: invalid * @IWL_FW_INI_REGION_TLV: uCode and debug TLVs @@ -437,7 +437,7 @@ enum iwl_fw_ini_region_device_memory_subtype { }; /* FW_TLV_DEBUG_REGION_DEVICE_MEMORY_SUBTYPE_API_E */ /** - * enum iwl_fw_ini_time_point + * enum iwl_fw_ini_time_point - time point type * * Hard coded time points in which the driver can send hcmd or perform dump * collection diff --git a/sys/contrib/dev/iwlwifi/fw/api/debug.h b/sys/contrib/dev/iwlwifi/fw/api/debug.h index 0cf1e5124fba..61a850de26fc 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/debug.h +++ b/sys/contrib/dev/iwlwifi/fw/api/debug.h @@ -421,7 +421,7 @@ struct iwl_dbgc1_info { } __packed; /* INIT_DRAM_FRAGS_ALLOCATIONS_S_VER_1 */ /** - * struct iwl_dbg_host_event_cfg_cmd + * struct iwl_dbg_host_event_cfg_cmd - host event config command * @enabled_severities: enabled severities */ struct iwl_dbg_host_event_cfg_cmd { diff --git a/sys/contrib/dev/iwlwifi/fw/api/location.h b/sys/contrib/dev/iwlwifi/fw/api/location.h index 33541f92c7c7..2ee3a48aa5df 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/location.h +++ b/sys/contrib/dev/iwlwifi/fw/api/location.h @@ -1092,7 +1092,7 @@ struct iwl_tof_range_req_ap_entry { } __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_9 */ /** - * enum iwl_tof_response_mode + * enum iwl_tof_response_mode - TOF response mode * @IWL_MVM_TOF_RESPONSE_ASAP: report each AP measurement separately as soon as * possible (not supported for this release) * @IWL_MVM_TOF_RESPONSE_TIMEOUT: report all AP measurements as a batch upon @@ -1108,7 +1108,7 @@ enum iwl_tof_response_mode { }; /** - * enum iwl_tof_initiator_flags + * enum iwl_tof_initiator_flags - TOF initiator flags * * @IWL_TOF_INITIATOR_FLAGS_FAST_ALGO_DISABLED: disable fast algo, meaning run * the algo on ant A+B, instead of only one of them. @@ -1409,7 +1409,7 @@ enum iwl_tof_range_request_status { }; /** - * enum iwl_tof_entry_status + * enum iwl_tof_entry_status - TOF entry status * * @IWL_TOF_ENTRY_SUCCESS: successful measurement. * @IWL_TOF_ENTRY_GENERAL_FAILURE: General failure. @@ -1856,7 +1856,7 @@ struct iwl_tof_mcsi_notif { } __packed; /** - * struct iwl_tof_range_abort_cmd + * struct iwl_tof_range_abort_cmd - TOF range abort command * @request_id: corresponds to a range request * @reserved: reserved */ diff --git a/sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h b/sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h index b9f559dac39f..f76cea6e9ec8 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h +++ b/sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h @@ -420,6 +420,8 @@ struct iwl_mac_config_cmd { * eht_support set to true. No longer used since _VER_3 of this command. * @LINK_CONTEXT_MODIFY_BANDWIDTH: Covers iwl_link_ctx_cfg_cmd::modify_bandwidth. * Request RX OMI to the AP to modify bandwidth of this link. + * @LINK_CONTEXT_MODIFY_UHR_PARAMS: covers iwl_link_ctx_cfg_cmd::npca_params and + * iwl_link_ctx_cfg_cmd::prio_edca_params. Since _VER_7. * @LINK_CONTEXT_MODIFY_ALL: set all above flags */ enum iwl_link_ctx_modify_flags { @@ -432,6 +434,7 @@ enum iwl_link_ctx_modify_flags { LINK_CONTEXT_MODIFY_BSS_COLOR_DISABLE = BIT(6), LINK_CONTEXT_MODIFY_EHT_PARAMS = BIT(7), LINK_CONTEXT_MODIFY_BANDWIDTH = BIT(8), + LINK_CONTEXT_MODIFY_UHR_PARAMS = BIT(9), LINK_CONTEXT_MODIFY_ALL = 0xff, }; /* LINK_CONTEXT_MODIFY_MASK_E_VER_1 */ diff --git a/sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h b/sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h index e90f3187e55c..4644fc1aa1ec 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h +++ b/sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h @@ -18,13 +18,8 @@ enum iwl_regulatory_and_nvm_subcmd_ids { /** * @LARI_CONFIG_CHANGE: &struct iwl_lari_config_change_cmd_v1, - * &struct iwl_lari_config_change_cmd_v2, - * &struct iwl_lari_config_change_cmd_v3, - * &struct iwl_lari_config_change_cmd_v4, - * &struct iwl_lari_config_change_cmd_v5, * &struct iwl_lari_config_change_cmd_v6, - * &struct iwl_lari_config_change_cmd_v7, - * &struct iwl_lari_config_change_cmd_v10 or + * &struct iwl_lari_config_change_cmd_v8, * &struct iwl_lari_config_change_cmd */ LARI_CONFIG_CHANGE = 0x1, @@ -564,74 +559,6 @@ struct iwl_lari_config_change_cmd_v1 { __le32 config_bitmap; } __packed; /* LARI_CHANGE_CONF_CMD_S_VER_1 */ -/** - * struct iwl_lari_config_change_cmd_v2 - change LARI configuration - * @config_bitmap: bit map of the config commands. each bit will trigger a - * different predefined FW config operation - * @oem_uhb_allow_bitmap: bitmap of UHB enabled MCC sets - */ -struct iwl_lari_config_change_cmd_v2 { - __le32 config_bitmap; - __le32 oem_uhb_allow_bitmap; -} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_2 */ - -/** - * struct iwl_lari_config_change_cmd_v3 - change LARI configuration - * @config_bitmap: bit map of the config commands. each bit will trigger a - * different predefined FW config operation - * @oem_uhb_allow_bitmap: bitmap of UHB enabled MCC sets - * @oem_11ax_allow_bitmap: bitmap of 11ax allowed MCCs. - * For each supported country, a pair of regulatory override bit and 11ax mode exist - * in the bit field. - */ -struct iwl_lari_config_change_cmd_v3 { - __le32 config_bitmap; - __le32 oem_uhb_allow_bitmap; - __le32 oem_11ax_allow_bitmap; -} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_3 */ - -/** - * struct iwl_lari_config_change_cmd_v4 - change LARI configuration - * @config_bitmap: Bitmap of the config commands. Each bit will trigger a - * different predefined FW config operation. - * @oem_uhb_allow_bitmap: Bitmap of UHB enabled MCC sets. - * @oem_11ax_allow_bitmap: Bitmap of 11ax allowed MCCs. There are two bits - * per country, one to indicate whether to override and the other to - * indicate the value to use. - * @oem_unii4_allow_bitmap: Bitmap of unii4 allowed MCCs.There are two bits - * per country, one to indicate whether to override and the other to - * indicate allow/disallow unii4 channels. - */ -struct iwl_lari_config_change_cmd_v4 { - __le32 config_bitmap; - __le32 oem_uhb_allow_bitmap; - __le32 oem_11ax_allow_bitmap; - __le32 oem_unii4_allow_bitmap; -} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_4 */ - -/** - * struct iwl_lari_config_change_cmd_v5 - change LARI configuration - * @config_bitmap: Bitmap of the config commands. Each bit will trigger a - * different predefined FW config operation. - * @oem_uhb_allow_bitmap: Bitmap of UHB enabled MCC sets. - * @oem_11ax_allow_bitmap: Bitmap of 11ax allowed MCCs. There are two bits *** 11897 LINES SKIPPED *** From nobody Mon Mar 9 12:37:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTxPD266tz6VhBC for ; Mon, 09 Mar 2026 12:37: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTxPC6r79z3yf8 for ; Mon, 09 Mar 2026 12:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773059872; 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=ZdStLPnCT7KbqAo4d6JMReWQ7/BTIyzPq4SIl+9s/K4=; b=qNmKcFefgyExReGUd8UE+4j59b7kIegY2YIu3YkzM+65gLVVbPUQLarRuFrK9Yb/wOMPzk /oCmPKTjQFiRg2EiyYvi+NbRsKXsy0eoYH+B/ddkF86T2/Rbkegr7fgkisUejx9dJxhw4t 2UYkvZHcuO5OHVO31tg8GzPRdeI0cJO65uoXe+2PdWGF2AQkyjfRYZ+Tjsi6lfNbSJBdut uLRsTGNB0altuLJIFa9R0lpKkPCsyOiaPjdqh6uc6NZVJhnZLxNUawQtqzIRLvO11TGkfn ZcaAywL0j3cKdyVE8UaANzxPovYQfHkuJeQ1B3O1/AAVqI8kQzfBSn9FMjh2xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773059872; a=rsa-sha256; cv=none; b=P6k06pS4q2HB2GrS5Uo1kz1dH00kh7yp/OCSQF9jGhyVM15zJb2FRc2fCv0dKppK7Og83J JfSSn4Z6A3M5CHQZvqpCRSc5bgzCc5zAkE0PBD+9qVN2QFV13VN2xCT/vi4pF9tLdV2A/Q ThLkC/7NqWON82MtCkn4iPp65h4rISM6vg1Nc5hjNV8RAWtseOV02W5oXrsBJ9UsltgKkK j+IiMmXOuD1Ih8m911lLIAaflgSIxReIx2u4sfiCI43KMQsMvHTYqaHDyV2vfskHgRo0gD UnQ+Al2BxrNnhr5HOoYrrWJOZeQ1jQO0rKZPe/Z7i2UzJpVkpGq49aVei3pNsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773059872; 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=ZdStLPnCT7KbqAo4d6JMReWQ7/BTIyzPq4SIl+9s/K4=; b=iRnVZ7KsFE0CcktLHu88EB4lnzkxVxnksAb+2RuP5Y4h5N8OofEdpHopjVkf1jMVILFybG Zuk+XOI9VGjK7nNkOmpys4liS8JC7m3cDBWW8XjsfUNWQV41AUBYnxxcTpNPouNRM2z8aN jMGluFTNwrSV2D8+8a8+1TZ9C3drhFxRUx+4aAH9086pLbQIzyEPg1TQLFItkWr6/JdMkG nfHU/gLbTs9BxSDtGc9bQu8Q2Xwhv9Sp/8t0AFlFdgQpmv7F14Obd4ehZ5ABju7kX+Ah3G ApUgKbn7Pryfu08Eczbb3SVR2YJia9W43/YdxBU7dw7A/97lP6nNMRoTwJ6JkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTxPC5XjYz9JM for ; Mon, 09 Mar 2026 12:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21c85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 12:37:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Qi Wang From: Brooks Davis Subject: git: 2c5cd07828ad - main - rallocx path: only set errno on the realloc case. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c5cd07828ad76c332e3bedc29fc641809e85396 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 12:37:51 +0000 Message-Id: <69aebf1f.21c85.579be82e@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5cd07828ad76c332e3bedc29fc641809e85396 commit 2c5cd07828ad76c332e3bedc29fc641809e85396 Author: Qi Wang AuthorDate: 2026-03-03 11:55:23 +0000 Commit: Brooks Davis CommitDate: 2026-03-09 12:35:39 +0000 rallocx path: only set errno on the realloc case. PR: 291677 Obtained from: jemalloc (commit 83b075789b4239035931c1ee212576d00153bbf0) Fixes: c43cad871720 ("jemalloc: Merge from jemalloc 5.3.0 vendor branch") MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2059 --- contrib/jemalloc/src/jemalloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/jemalloc/src/jemalloc.c b/contrib/jemalloc/src/jemalloc.c index 352c18870e0b..edf23b9801b4 100644 --- a/contrib/jemalloc/src/jemalloc.c +++ b/contrib/jemalloc/src/jemalloc.c @@ -3561,7 +3561,9 @@ do_rallocx(void *ptr, size_t size, int flags, bool is_realloc) { return p; label_oom: - set_errno(ENOMEM); + if (is_realloc) { + set_errno(ENOMEM); + } if (config_xmalloc && unlikely(opt_xmalloc)) { malloc_write(": Error in rallocx(): out of memory\n"); abort(); From nobody Mon Mar 9 12:37:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTxPJ3Cbrz6VhBH for ; Mon, 09 Mar 2026 12:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTxPH6Sskz40CM for ; Mon, 09 Mar 2026 12:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773059875; 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=Funl93FUjlE47uWw/76pf/iQaEVBB/7mizvpFYRXNhY=; b=vp+I0f0u7MiRohI/RFMwfAkMsl6KLy4Az1SNsnu1Hv2XqKhZqKPZwevhgBa5S9j1piwIo+ xVYq8UTWXRV2ktoaFlERhQbUvf6DhC3nE+Koq5XK+d/WtaFgkeO16vUGZcxcnZ4W1N/SQG bEBXqGJqSt0Ed41LXdUYrA8g2GIhqq8v012ol1HhCYNnGBQyX/zNexV8GUy5yTU2y6ZHMj HaZfUYULiMnHtpUiqT1J4T+ABIMSzN2HVptx7tEam6Y2lN9BbYBBBnY9uZITSOdAZshUeo pHAY/0NShhyA2jgwL1Uk0rMngYXijbueQUgLu+OzG4luLBcyseJjV9ejO8tsUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773059875; a=rsa-sha256; cv=none; b=iHBBPsgRecV8uR3HOOEYcGQKp5I5FWb8gwUfWoj2FdluMqaD2ymrnJF4+yZKYvX9jNTJa4 o2PnJm4J0MQOWUYBUPocsC3jwnT/ESwaLmFYb9S1Umnu60+AYGbgEwqjU8CJYOu1lnytw2 +C2Sa5HJBS/exbutR1PxhtiHKydjzaSb0Fk0cRjnR93AV2Y5IBCpw1GMZGHkKRq4nsqj+L mb95DjMgHDv9N3WhvyEh5nr8WrRadDJmORkN0qzPyAUOeR40yNj+465j/Dye/0/yf9H2+1 NeVzoPwTb65cJZ1qzMfNSiCB1CYZrlZNT7OTiKs00qiUuMcVTKebgx7cHxTuYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773059875; 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=Funl93FUjlE47uWw/76pf/iQaEVBB/7mizvpFYRXNhY=; b=qN4cSdDllfNRS5kff9Ro5Wywl7RheIlF926WMfhGLY2ydnykxY9rtAIMv0i+5uK/xxTbA3 Ysh0MBCFk0BYF45oB2ps9zl2lOfFlvVdyB/8t5yBCGtuu7/3JD6M95KUj7EWFGY1BDWjfU 2v9bBmQQ+h32GpfaQXe/dttA4OYfjKqrh8RtebzagkObXgCHiDZHcjY5QhaMP1NRFn9D91 TyEaMOnxMpw27DLUF9ik1gTN2OCdfgQW8SJLPiy6VZP431U2Qr9pDXVUNOE71EiQHexoOj x/joQ51XogOQweVilIE6c2oHbhriTDL9QGY/s0K40kQmkd8kJR0yd1KSTLZndQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTxPH5zgCz93g for ; Mon, 09 Mar 2026 12:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 219b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 12:37:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Juhyung Park From: Brooks Davis Subject: git: 5583b64f230f - main - Set errno to ENOMEM on rallocx() OOM failures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5583b64f230fe0ea4e3d4bf4566205b521190fbb Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 12:37:50 +0000 Message-Id: <69aebf1e.219b1.569a0a61@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=5583b64f230fe0ea4e3d4bf4566205b521190fbb commit 5583b64f230fe0ea4e3d4bf4566205b521190fbb Author: Juhyung Park AuthorDate: 2026-03-03 09:59:33 +0000 Commit: Brooks Davis CommitDate: 2026-03-09 12:35:25 +0000 Set errno to ENOMEM on rallocx() OOM failures realloc() and rallocx() shares path, and realloc() should set errno to ENOMEM upon OOM failures. PR: 291677 Obtained from: jemalloc (commit 38056fea64c34ca4fef0a16212776eaa4de80b78) Fixes: c43cad871720 ("jemalloc: Merge from jemalloc 5.3.0 vendor branch") MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2059 --- contrib/jemalloc/src/jemalloc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/jemalloc/src/jemalloc.c b/contrib/jemalloc/src/jemalloc.c index e4b183d1a24d..352c18870e0b 100644 --- a/contrib/jemalloc/src/jemalloc.c +++ b/contrib/jemalloc/src/jemalloc.c @@ -3561,6 +3561,7 @@ do_rallocx(void *ptr, size_t size, int flags, bool is_realloc) { return p; label_oom: + set_errno(ENOMEM); if (config_xmalloc && unlikely(opt_xmalloc)) { malloc_write(": Error in rallocx(): out of memory\n"); abort(); From nobody Mon Mar 9 13:24:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTyRX5MVsz6VkBj for ; Mon, 09 Mar 2026 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTyRX4RF2z44f3 for ; Mon, 09 Mar 2026 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062696; 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=nBAkvEIw4OPyO5yEWLBjKbZtosnh3Bocs1++c8BifTA=; b=JamnToqxBVKIv11iSKBTNZuUPN1fjtLpImtvtq6nGifpkO2zZT6OCW6lSh2qWTkgZ7PUxi E76ImHpgP718WeTITIgy4jAH7iCIlit+1aRW/uyvZ7LP836hsUB2zbQWOSF3xspkmip8yT mEru0hKfT2YSgvwi7lmnEBQFjgV6YMYzJ9jERNF7wg3QsJFEZI3M23YvA1gj75+tg7W45N EcPzMru11jJ2ZnONcO28nPOWmOHcjnP8k9Uy/MbMwOm/R8nQi8Mb8O90KQmHMWGju9nLLt TjpdCxO7qqV4UfkwHYBKcY4MZokW+ivA8ODGJAVFZz9awOmC5IsuKsjqK36A0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773062696; a=rsa-sha256; cv=none; b=yRGfqg/0g7ci5VGVnsdZJBDAiP5i/Hf5ECxZVFxG21iLwKyemSGPgbKL0MB1Xr+8r1vAGd BkLSoJnp6YtyJjrO2XVAZ5S+MFePokPB/w7kuEi6QaU1hezKzL0PR2LMg0mdhE4yFbkVp7 PJuy8rpFbMQ2msZCWexqW7p/PR+IdDvcTCeP3h68p5Yv6h2qkbLo7/sjoRMvaw0Yc135Pm 5IxYBbvsDNkl8xbINTkKckaFJy6JrwMtu9Fj6G4C9Ea+trRVw/XRVRhBWBLI6mtPhrcfoT OEHfMQ3vJdm0gC70epTKUe8fcjO/NwLdeVY2lvXgS4jz7DLBhijZF/jcAeFxaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062696; 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=nBAkvEIw4OPyO5yEWLBjKbZtosnh3Bocs1++c8BifTA=; b=o90YpuzcqrY9VwAeMR86hFY9/TzVdHxTpiI21bTiLggfTQDOwK8UPU2dDiq40QPx9SW9jR PgUqflPEEbZT97XGWJ8HOndoS7f5bSkXwW6909cXHo+nzJK2Mi/s3jtWZBCq+R9JA0bhx6 PiK8BGUoqGouMept95myrALDk1X77NAJ5TJLbjmFWYfzjwaic1SwFeIYBVWs+w3+AgAHYV BptDiCbXxhbCrW9iJ2dhPaeQ7niNuGYa73sYDPVXW89hwn0x+v9/7ctmsr6nHcI/lqbNtu 3bkJp3yh0av9Z9DPR4SRX/lxJlH1nLH2Mra3tRGDDtoEBCCj3ffzMRRbof3iYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTyRX422XzBJh for ; Mon, 09 Mar 2026 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:24:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: 897711b7bd4b - stable/15 - Merge commit 81b20e110b3f from llvm git (by Roland McGrath): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 897711b7bd4ba8f34bab9e0b79495ce107cfef35 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:24:56 +0000 Message-Id: <69aeca28.24f1d.4ef6b441@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=897711b7bd4ba8f34bab9e0b79495ce107cfef35 commit 897711b7bd4ba8f34bab9e0b79495ce107cfef35 Author: John Baldwin AuthorDate: 2026-01-27 18:34:58 +0000 Commit: Ed Maste CommitDate: 2026-03-09 13:24:28 +0000 Merge commit 81b20e110b3f from llvm git (by Roland McGrath): [libc++] Work around new GCC 15 type_traits builtins that can't be used as Clang's can (#137871) GCC 15 has added builtins for various C++ type traits that Clang already had. Since `__has_builtin(...)` now finds these, the #if branches previously only used for Clang are now used for GCC 15. However, GCC 15 requires that these builtins only be used in type aliases, not in template aliases. For now, just don't use the `__has_builtin(...)` branches under newer GCC versions, so both 14 and 15 work during the transition. This can be cleaned up later to use all the GCC 15 builtins available. Fixed: #137704 Fixed: #117319 Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D54865 (cherry picked from commit bfc6e56f6327621171cef4fe29290c63edfc4d9c) --- .../llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h | 2 +- .../llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/decay.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h index a633e3904532..f583b4328830 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_lvalue_reference) +#if __has_builtin(__add_lvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_lvalue_reference_t = __add_lvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h index 5aac7d5cfa90..8f85ece33d6a 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h @@ -20,7 +20,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) +#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) && !defined(_LIBCPP_COMPILER_GCC) template using __add_pointer_t = __add_pointer(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h index a54aae7ec8de..e5dc920e6a44 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_rvalue_reference) +#if __has_builtin(__add_rvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_rvalue_reference_t = __add_rvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/decay.h b/contrib/llvm-project/libcxx/include/__type_traits/decay.h index 7412044f9317..861dc2eb10d0 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/decay.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/decay.h @@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__decay) +#if __has_builtin(__decay) && !defined(_LIBCPP_COMPILER_GCC) template using __decay_t _LIBCPP_NODEBUG = __decay(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h index d5373b51f522..a27e3bb48038 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_all_extents) +#if __has_builtin(__remove_all_extents) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_all_extents { using type _LIBCPP_NODEBUG = __remove_all_extents(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h index fe37b5c7266c..767331e102ad 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_extent) +#if __has_builtin(__remove_extent) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_extent { using type _LIBCPP_NODEBUG = __remove_extent(_Tp); From nobody Mon Mar 9 13:27:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVF6rn8z6VkrT for ; Mon, 09 Mar 2026 13:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTyVF4hQMz44mW for ; Mon, 09 Mar 2026 13:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062837; 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=GhvCPrMz9YmjmCn8958CKday9SJj7Gl5Nf/k6TFhp/Y=; b=h2PYkkPqBReMHYEHw/ndUh21jiHWLMzZoaAEmopG9+tX6PA/LbmcSDSDi9VGNDTRiZcnHg 0DcMO3S78IkHeZrrqwnu6oC9yGyQBcPMOgPse5y+ndPRcphjcekvLaLnePn24fontfvYPT ioxORFWQ9MXmfIvpbQsTYqL0+N3l53oDOKM3Oa9JcROFTi2aw+U073KYHTyX9WV5oD5dMA CfXKOtSlLoYptsY6MpzXCm6la2b6RaKKSYTdo9rI2qHYBlYPWgfTHJ8nOPMvl31aOm8zQf pHZ1x+TSj+jD3TjG8qzpvhX8w8Nj7bXBxQNaZShUuPMjhEpSEjdETEJBGR+C3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773062837; a=rsa-sha256; cv=none; b=uXe15TX0ECA8RyIYBdZilxiu/Dkk4BNX3rOqRQjH8GNO1DDWQcd7evVPyyktqNLHUljPqO TCfsSUCYe/mRmiVTS0qtsuaUGgcIkiVXEckYspsOJuED92yeR0YQyu6XwY6BDU1GmroivU 8JtuwY9aFEqm6PsbKF4ceFXuTnCfwTfWiwUnJnDAd2fgHDO7bJfDECB6T3VYbjhhdvY8qd oNoKA3F7b3BeP+Wz9K0G3hu0IhODlrl+QheOmIbsKuRhpO57q2E2mz2zZPnAfCdz5Zm2YE dae6DeVjKPLr0++6UfK3T18abz7ciTQM/GbIEVid4L12GBF+YOpYyYtlhOqGJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062837; 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=GhvCPrMz9YmjmCn8958CKday9SJj7Gl5Nf/k6TFhp/Y=; b=T5oaQSYQGKvd6XGDds6VWQOwxwJZxtnXXmB6GRaosMRpYJAHlfb88pW1qHH6YZp0ocQ7y1 462HrVeEtG/8DiH1oJu+0wzM7SWM6aG9RR3floM85om2BBSmIDiHawB9gFmFLkGawphIpo cqMaLCMuibHPOOR6cgvjn1FKhl6KNPlqhavnv4oQKwAQmsm5cNblCQNKOfnTULAMmwgToC Eg3r8eJSroE/3i3fbFo4ZB8me54cyzn/ji5GwRJRv1L3M7moIdaD/NJoWeb2mBIY6XB9Fb en0dX3BYIpn9mrFHjryIUhZsLwcYa5p575GC3FUUOoERjIzEVHLPju4p6lQEHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVF40bZzBLB for ; Mon, 09 Mar 2026 13:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27691 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:27:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: 7fd8a2028034 - stable/14 - Merge commit 81b20e110b3f from llvm git (by Roland McGrath): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7fd8a2028034968b8dc7984e83046f4b7c1696ff Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:27:17 +0000 Message-Id: <69aecab5.27691.20ec51eb@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7fd8a2028034968b8dc7984e83046f4b7c1696ff commit 7fd8a2028034968b8dc7984e83046f4b7c1696ff Author: John Baldwin AuthorDate: 2026-01-27 18:34:58 +0000 Commit: Ed Maste CommitDate: 2026-03-09 13:25:54 +0000 Merge commit 81b20e110b3f from llvm git (by Roland McGrath): [libc++] Work around new GCC 15 type_traits builtins that can't be used as Clang's can (#137871) GCC 15 has added builtins for various C++ type traits that Clang already had. Since `__has_builtin(...)` now finds these, the #if branches previously only used for Clang are now used for GCC 15. However, GCC 15 requires that these builtins only be used in type aliases, not in template aliases. For now, just don't use the `__has_builtin(...)` branches under newer GCC versions, so both 14 and 15 work during the transition. This can be cleaned up later to use all the GCC 15 builtins available. Fixed: #137704 Fixed: #117319 Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D54865 (cherry picked from commit bfc6e56f6327621171cef4fe29290c63edfc4d9c) (cherry picked from commit 897711b7bd4ba8f34bab9e0b79495ce107cfef35) --- .../llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h | 2 +- .../llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/decay.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h index a633e3904532..f583b4328830 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_lvalue_reference) +#if __has_builtin(__add_lvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_lvalue_reference_t = __add_lvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h index 5aac7d5cfa90..8f85ece33d6a 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h @@ -20,7 +20,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) +#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) && !defined(_LIBCPP_COMPILER_GCC) template using __add_pointer_t = __add_pointer(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h index a54aae7ec8de..e5dc920e6a44 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_rvalue_reference) +#if __has_builtin(__add_rvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_rvalue_reference_t = __add_rvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/decay.h b/contrib/llvm-project/libcxx/include/__type_traits/decay.h index 7412044f9317..861dc2eb10d0 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/decay.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/decay.h @@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__decay) +#if __has_builtin(__decay) && !defined(_LIBCPP_COMPILER_GCC) template using __decay_t _LIBCPP_NODEBUG = __decay(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h index d5373b51f522..a27e3bb48038 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_all_extents) +#if __has_builtin(__remove_all_extents) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_all_extents { using type _LIBCPP_NODEBUG = __remove_all_extents(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h index fe37b5c7266c..767331e102ad 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_extent) +#if __has_builtin(__remove_extent) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_extent { using type _LIBCPP_NODEBUG = __remove_extent(_Tp); From nobody Mon Mar 9 13:27:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVK5RPPz6VkxJ for ; Mon, 09 Mar 2026 13:27: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTyVK4Nfdz45HW for ; Mon, 09 Mar 2026 13:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062841; 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=IhhERmBOyzqPX0mfadWo74O5I7LCzopjpB3bPV0gRwc=; b=tz6COQZbdrJU4AUUy82l9wl4DPQ2P2Ic5JMpw5MUj7E4hiiFREV3zMdM8Oaz70LWG2qEpw IpReMfXqKprE4S2vQZdLM1tWSsISQWTh6Glk21VxfuXD/OHXsLyzLM2CiFpqwXa2ADQGsx m4GxMAAi0WqX7uwb5u5M3YMXPQzIGrgwvKIUF1FUK/mW/1qGrAY3IcpJEIGBmuh1rPn7CV FDt6M4psuwz9G2vU42JdekMN4Fv5Dwm1tsLe6zxJbUvmBKgYHZh9zLnDIANioH6SYeyvSN R9gwBqlxOXepRCftLETQ4qTj8bhPG638X8MeaKAWn0EBg2mB4SRjnWk4NV5mjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773062841; a=rsa-sha256; cv=none; b=C3k8Pb0021PR+cyDkulRteK10YzkBJlt3E4XOS2Uf1Fklg8E57IpRPUxqTFPqbXYLpiCaq 9NyGJSsFkXqBzWF6iDnDyozutYRwvSa25SYl/i9MBsn78pzVmnz6qd5BLqvfjmRc46orW9 N32gHusDMpZzWOsUseDdwTb20frcljRB6JO97Z/0CDpfW0aWyok+HDxb2bspsCvxxOdX2e xP8wLX3vK90nfD+iBr3tiI6WvC0hanBTUaX/onw7dtwFGKnxTVlFZqBwyutTjZ46wmCU1k 9D2Rsk5Xcq1zzSzClJKU1RThe5Tcy3ZTKtN2JapGiFWublM9XJTlS2/iZoAtkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062841; 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=IhhERmBOyzqPX0mfadWo74O5I7LCzopjpB3bPV0gRwc=; b=l2r1B2h5IsocTT9XJAhYkHatcm3t8sCtNvQe17qpMsXpfzkmg/06NTd5BfGVdrDgDpJT17 vmP5ijANseFXGRmsqE8L/44Ntj4BfsSfxthsOf4alRNpQEvXq0SsUA/TTYB5xpbud4hOD9 2z6gcbP6lxq4SuE2SSIj30WGs9/fYnJVMBNsilUACbbcj7F6KQ9qT9HAxR8I/v0IKkIpMV hrPV2qtmGwdjnDZS12PT3LVICIwttLNCawwGVNqf3IoLkbgC2ShLKzI5RgdCipcT38T9ex y6MWYZ1qq8744C8JZZHWZXWeNQaOxw2mnQva9nktsbFjIlmEMI9B/tUGpSxOgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVK3TnfzBLC for ; Mon, 09 Mar 2026 13:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2758a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:27:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Ed Maste Subject: git: 969c436a6c91 - stable/14 - bhyve: Fix truncate_iov() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 969c436a6c918be0f000bd317f06985a7dd92809 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:27:16 +0000 Message-Id: <69aecab4.2758a.5a1ad16f@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=969c436a6c918be0f000bd317f06985a7dd92809 commit 969c436a6c918be0f000bd317f06985a7dd92809 Author: Mark Johnston AuthorDate: 2026-02-24 15:14:39 +0000 Commit: Ed Maste CommitDate: 2026-03-05 23:57:56 +0000 bhyve: Fix truncate_iov() The implementation was simply wrong. It would always just return the first entry in the iovec, even if the requested length is larger than that first entry. Note, this function will be removed soon, see D53468. Reported by: Vinod p n Reviewed by: des, emaste, Hans Rosenfeld MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55438 (cherry picked from commit d7d4da91de201841c57a6b8f89b450754b9b8696) (cherry picked from commit 119bdea35792006cd0cce3c864d5007f092a10c1) --- usr.sbin/bhyve/iov.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bhyve/iov.c b/usr.sbin/bhyve/iov.c index d01c7a5601f4..7b8564c302af 100644 --- a/usr.sbin/bhyve/iov.c +++ b/usr.sbin/bhyve/iov.c @@ -82,19 +82,14 @@ count_iov(const struct iovec *iov, int niov) void truncate_iov(struct iovec *iov, int *niov, size_t length) { - size_t done = 0; int i; - for (i = 0; i < *niov; i++) { - size_t toseek = MIN(length - done, iov[i].iov_len); - done += toseek; - - if (toseek <= iov[i].iov_len) { - iov[i].iov_len = toseek; - *niov = i + 1; - return; - } + for (i = 0; i < *niov && length > 0; i++) { + if (length < iov[i].iov_len) + iov[i].iov_len = length; + length -= iov[i].iov_len; } + *niov = i; } ssize_t From nobody Mon Mar 9 13:39:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTymt5xKtz6VlYP; Mon, 09 Mar 2026 13:39:58 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTymt5Nw7z46GT; Mon, 09 Mar 2026 13:39:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773063598; 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=s8KUlrtztL3NBWNOzi4/qWI//tRvZIDQZr+gpp62EWU=; b=Pk0zHJ233HC9nYOGZJANjSVgNPQScNXDhP68r3+8rk0uoqKqisL0JBDJKxncI0NAhyMVmo st9DBuYsPWlghk7GOqSTR4HmlzbE9umgZpJMTUcoGNRt2jejhvG25vT1NdiOmD0sAfTFxX XkGXdgljKPAfk99E69q0hVYDhcuG84KBVj7nsRMyotGFSThYWDj35wjpM4m5V1z5kFB4wJ IqwJQpf3A44LFubShkWwNYZxrE79dxsKUrv/4VT5uzp3oMYJMQZ56GCXwFjdJ8iZeG5zx1 9rEZYLip/VtjrZ3rtGwY2GD1ZzHB4YPKZnBRzMrfZXkf83tmx8eJeCu+X2IddA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773063598; a=rsa-sha256; cv=none; b=coxqgOgXgN7fdEgGZKY+dQgQE9x5KyL49gwthlf2XDH1afl10HP2TKC6zrgfvoqSyVBPts sjfjF7i2z9EGkIoaQrZnJZTGgTjGvMRdAhkn6Wsnb+BL25NxMtbUiEG9ydQ30uguFpXwOv pNcn611LEU1F7mhL3KesFzVBbtBubn6XKevjuoj9dhM6gln/6B9tz5FMZ4EbNDxumWibqD PWgt9+LezxtIZ3GMjikFoq0dlinJIlfjp+wFLW2qFuKAhbEzJ7ymU7irr6Yvw/17fysU0t D1HR62rxiBhCjTI3h2Qx4dX9hXHsiFD4YLIhGl7MVopMuy1wdiTYOL7ab7p6bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773063598; 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=s8KUlrtztL3NBWNOzi4/qWI//tRvZIDQZr+gpp62EWU=; b=NaE+jaXc7sZBNrUspRNzopRQCZlLQrakY9mUzOU05aNjWR5IGGgASR9ihBo96mt6hpecd7 BaoJ2y1zusC0AfXUsa+WN9PzZw1opjJoer/lGQ3II7Eep1D6+1yT3Etb6VEd93Ja1znIVI EdtGPKko9dCJigRzt+E3MCKukscDC1bAVok7PwG6yAx5XSKF3d8o6thmgv4/f6jSwPWr3+ H0bLIQhGNT82afdxnSEVDY5m7Yzqw66rlIjCqgMgjLUZFWKBX/ZqOhpHzphhAN5mlUlQsa DhyJ5tdUGhC0MmzbuT8TEF3Jk8/n7vTYhsC2R2OczPFmehcS66zXlhtJZBUVAQ== Received: from [IPV6:2601:5c0:4202:5670:5853:86ec:97b9:344a] (unknown [IPv6:2601:5c0:4202:5670:5853:86ec:97b9:344a]) (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 4fTymt39krzLVX; Mon, 09 Mar 2026 13:39:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 9 Mar 2026 09:39:57 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: b3d9e5013f3e - main - nvme: Don't active memory space until all BARs are configured Content-Language: en-US To: Alexander Ziaee , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Matt Delco References: <69ab0f9b.18db4.5196b3f7@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <69ab0f9b.18db4.5196b3f7@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/6/26 12:32, Alexander Ziaee wrote: > The branch main has been updated by ziaee: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b3d9e5013f3e5016ffbd3d3d6091194658af2b92 > > commit b3d9e5013f3e5016ffbd3d3d6091194658af2b92 > Author: Matt Delco > AuthorDate: 2026-03-06 17:23:03 +0000 > Commit: Alexander Ziaee > CommitDate: 2026-03-06 17:28:41 +0000 > > nvme: Don't active memory space until all BARs are configured > > In the current current behavior the 2nd and 3rd BARs can be activated > when they're configured with address zero. This change defers the > activation of all BARs until after they've all been configured with an > address. > > This enables FreeBSD on Google Compute Engine C4-LSSD Machines. This hack is fine for now, but the real fix for this is that the PCI bus driver needs to ensure resources are reserved for all of the MEM or IO BARs before enabling MEM or IO decoding at which point this can (and should) be reverted. That's kind of a longstanding bug in the PCI bus driver that we haven't had to solve previously because the firmware in most systems assigns BARs during POST so that in practice we never have to deal with unreserved BARs. > Sponsored by: Google > Tested by: NetApp (previous version) > Reviewed by: gallatin, imp > Discussed with: jrtc27 (improved error reporting) > Differential Revision: https://reviews.freebsd.org/D55541 > --- > sys/dev/nvme/nvme_pci.c | 44 +++++++++++++++++++++++++++++++++++++------- > 1 file changed, 37 insertions(+), 7 deletions(-) > > diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c > index 5784c6d1be96..74191df52058 100644 > --- a/sys/dev/nvme/nvme_pci.c > +++ b/sys/dev/nvme/nvme_pci.c > @@ -151,24 +151,28 @@ nvme_pci_probe (device_t device) > static int > nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) > { > + int error; > + > ctrlr->resource_id = PCIR_BAR(0); > ctrlr->msix_table_resource_id = -1; > ctrlr->msix_table_resource = NULL; > ctrlr->msix_pba_resource_id = -1; > ctrlr->msix_pba_resource = NULL; > > + /* > + * Using RF_ACTIVE will set the Memory Space bit in the PCI command register. > + * The remaining BARs will get mapped in before they've been programmed with > + * an address. To avoid this we'll not set this flag and instead call > + * bus_activate_resource() after all the BARs have been programmed. > + */ > ctrlr->resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, > - &ctrlr->resource_id, RF_ACTIVE); > + &ctrlr->resource_id, 0); > > if (ctrlr->resource == NULL) { > nvme_printf(ctrlr, "unable to allocate pci resource\n"); > return (ENOMEM); > } > > - ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); > - ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); > - ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; > - > /* > * The NVMe spec allows for the MSI-X tables to be placed behind > * BAR 4 and/or 5, separate from the control/doorbell registers. > @@ -180,7 +184,7 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) > if (ctrlr->msix_table_resource_id >= 0 && > ctrlr->msix_table_resource_id != ctrlr->resource_id) { > ctrlr->msix_table_resource = bus_alloc_resource_any(ctrlr->dev, > - SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, RF_ACTIVE); > + SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, 0); > if (ctrlr->msix_table_resource == NULL) { > nvme_printf(ctrlr, "unable to allocate msi-x table resource\n"); > return (ENOMEM); > @@ -190,13 +194,39 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) > ctrlr->msix_pba_resource_id != ctrlr->resource_id && > ctrlr->msix_pba_resource_id != ctrlr->msix_table_resource_id) { > ctrlr->msix_pba_resource = bus_alloc_resource_any(ctrlr->dev, > - SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, RF_ACTIVE); > + SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, 0); > if (ctrlr->msix_pba_resource == NULL) { > nvme_printf(ctrlr, "unable to allocate msi-x pba resource\n"); > return (ENOMEM); > } > } > > + error = bus_activate_resource(ctrlr->dev, ctrlr->resource); > + if (error) { > + nvme_printf(ctrlr, "unable to activate pci resource: %d\n", error); > + return (error); > + } > + if (ctrlr->msix_table_resource != NULL) { > + error = bus_activate_resource(ctrlr->dev, ctrlr->msix_table_resource); > + if (error) { > + nvme_printf(ctrlr, "unable to activate msi-x table resource: %d\n", > + error); > + return (error); > + } > + } > + if (ctrlr->msix_pba_resource != NULL) { > + error = bus_activate_resource(ctrlr->dev, ctrlr->msix_pba_resource); > + if (error) { > + nvme_printf(ctrlr, "unable to activate msi-x pba resource: %d\n", > + error); > + return (error); > + } > + } > + > + ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); > + ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); > + ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; This is a gross hack that needs to die (ctlr->regs), and also, bus_tag and bus_handle should probably be removed as well. -- John Baldwin From nobody Mon Mar 9 13:42:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTyqv5yKsz6VlwX; Mon, 09 Mar 2026 13:42:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTyqv2xX1z46Y3; Mon, 09 Mar 2026 13:42:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773063755; h=from:from:reply-to:subject: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=PHYI6lAW9ngBdffLOj8nFuhhnIPnhxnCBWd9FACDnL4=; b=S/REDLhl7E9NfZr9K/H5GNN+6GLQpyWqR3gCoCljJgy190tHvNwz/pAkK6clzvJJGkW45u C/djmUYuOgEutmcMkKqirkTAyt3uFFnpw+CInxz09D9q32KLy38Ry4osXNEAwsDuB3x5a/ 9ALUfgRbfsdLCRROfP096VuOSKAyYUwXaAFncr/T7cNc1togT/bsbYZWHZGL+g9kuCNOVw Ptye9kWkcF05tDDt8oTnOTLFwiNM6tqeHvzoo+77YiO63aYCHEFfmzUDL9PpbMq2gOUaqK Hx+dSnjD6WOzP7yifj4qa6zaMbGuWnAjw7K67D8CoPepMUaxCP8/HzwU6l1DTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773063755; a=rsa-sha256; cv=none; b=ZLzrmo6SR/SaE68uyeqSPse6BCowXaHAFptCuc6qj2zlfsfhLYFJ0h0Yry5pOaos6kItHp I9kCM4rtfJHt0ztJwXKB1hAMGuiJ/+VH7lShmzt01MXmtn4aNVutR6zYo/M2M7Ywa736G/ 3SLspUnF+2iopX0mmZTdonN7JaFh5uyfZFV7khm0b7co8pICiMVqfa3LpkwTv7HF2qVSEI E50i5hOdnbnvjlFb/909kUvPM2qFhbQa7WphNbGSyWu4HfW37KzbOHxEAm/ljzIFohXopd /uGq8sn3FxKNUHUH+cGvA2UkH0SitUVENTmhqWwwH3u7J0sfxx+9iN4RNg+X6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773063755; h=from:from:reply-to:subject: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=PHYI6lAW9ngBdffLOj8nFuhhnIPnhxnCBWd9FACDnL4=; b=k4Li+zLhz8GVGKX8tli0DropW+Ttb4YB1yTSjGsrMKq1KtGXg5jrrCdu0bRAhcHNisrHRK KkQATl7NF9gDFH4nm0SFr5sW1Hwonte1/TXcxy6eyeoEDx9QOptTW7vMkWXezOq/fF/xKt 3Pa5rem6VhIteHbBxnM1slnhDyd+UUm1Lht/9XuYie74BLTBAvhdw3C+UdWoPoI4UipZk8 zv47MEH/dToDhrn8Wd5VzBKnyTyPYSjpfT9Y/kl3xZsdZavq5aP74Jy4bA3oQbFTMqi/9O ZS/CqfLctvVjQBVIX6qP0bkbU3yELXyGv6d5+tvBatUy7PcqTeBcsPo5uV9X9g== Received: from [IPV6:2601:5c0:4202:5670:e532:3e1b:5270:ef85] (unknown [IPv6:2601:5c0:4202:5670:e532:3e1b:5270:ef85]) (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 4fTyqv0yLLzL61; Mon, 09 Mar 2026 13:42:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 9 Mar 2026 09:42:34 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: fa4f625ed854 - main - acpi_system76: unbreak LINT Content-Language: en-US To: Pouria Mousavizadeh Tehrani , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <69ac7b46.250e5.986d69e@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <69ac7b46.250e5.986d69e@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/7/26 14:23, Pouria Mousavizadeh Tehrani wrote: > The branch main has been updated by pouria: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fa4f625ed854cec2d7657783b955426fce8ff9ba > > commit fa4f625ed854cec2d7657783b955426fce8ff9ba > Author: Pouria Mousavizadeh Tehrani > AuthorDate: 2026-03-07 19:15:40 +0000 > Commit: Pouria Mousavizadeh Tehrani > CommitDate: 2026-03-07 19:22:24 +0000 > > acpi_system76: unbreak LINT > > Reported by: tinderbox > Fixes: cdad55809ef5 ("acpi_system76: Support for ...") > Differential Revision: https://reviews.freebsd.org/D55694 > --- > sys/dev/acpi_support/acpi_system76.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/sys/dev/acpi_support/acpi_system76.c b/sys/dev/acpi_support/acpi_system76.c > index 916a9a61f471..c20725f0174e 100644 > --- a/sys/dev/acpi_support/acpi_system76.c > +++ b/sys/dev/acpi_support/acpi_system76.c > @@ -26,12 +26,14 @@ > * SUCH DAMAGE. > */ > > +#include "opt_acpi.h" > #include FYI, I believe the common style is to leave a blank line between "opt_foo.h" #includes and other #includes. (I am not sure if style(9) covers this case.) -- John Baldwin From nobody Mon Mar 9 13:55:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTz6S6b8xz6VmFw for ; Mon, 09 Mar 2026 13:55: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTz6S66SBz49cW for ; Mon, 09 Mar 2026 13:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773064512; 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=v9bFJuFfvk74h6316Gf0y8lQYfoDgFOSME2Avr3/d9A=; b=SnVtMTOSy5CyFZCm1beaG8u69OAEm5Yalfdln1GGrS6EdqvKcjB8Z8y3G7hEMlAgSKLZUd vnH7d/chjmSucRHChsaPKHJCCbfU+05Z72gwGkBeEPthyYUTa2cDkngEKA/lQ9UGftXvaf 0AKUmh087ONCbt0KIYB7eRBcqliTI+Sewori961/RPwaemPizUyieWYCC7YlbMJFDcU69R DpHmzQ4Ldz2S5mJml/rbo57ukqskxRe3jLKjst0FOQpNeILf5ri/76ILygIdBTWD0zmnev zchnKGDoQZuWLynLdFJsy7oxysUCM25PKQQ13ORsE5lwIuxBDdYEVHp/n+K8WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773064512; a=rsa-sha256; cv=none; b=a37UMnij+7wJug6ZawvtfyjkKz+3T7S1XzkK3M9bUhM6iFxdMfPzwkhQiD3aYbi8CcaE7X ZN9eY7unsE9ZKJDIB7fBbnhVNERAKNIqIsgg0GIfeVguww3DZU+iglx5/XVZDt9GEMSWTF 2vgQAmfpsRzy+V+fcRisFWN4/cIH32h7q18fVjgJkeCRDFEq6U1lnrU/dAq4c4F2W+jWwB /arAjJGqmKDcz2b8x6qVREoXMuOWgxF5J+n4OGNHoZ2+Vf/aZSjSkeK6ACthLIpYhV0VP7 TnvklzDbrD1JbRrBCVJdjfdoh9PGe+cZ7xDGsQpV70opyrAlfYsU4aBly+tlKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773064512; 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=v9bFJuFfvk74h6316Gf0y8lQYfoDgFOSME2Avr3/d9A=; b=rXMxjVOGTL+5MfiQCoWwgW1YBge4Pmmbck/sjjhVrYiiYJXfjYA8RSXhP+hbZG1kACtuyY pDozMoSpkWTYE8sQF5jVMwOm7/2+wC5jPoQkVaiuaClKLuFfRhfUWtmUpUZ+1JtAy87zUu P6p0RrYun+0rlRt57bnyix1r6F6gJIfOajml7kAIb4rb8KvQPvaPsFR8YWR6G08SsQ+HR/ RHUk1Wnp78qOKu+o1iGMN0OyOsUThB6R/EyvDNQxMItEFOjaxzqML0cp1tEiEXc2kgbwcP bwh/Kk9ofWwiHWeNGMKhxHeCOIq8fIKjSsNIJ8kECRynAFGcYFhP+/zA1zVYAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTz6S5PRHzCS9 for ; Mon, 09 Mar 2026 13:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30ed2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:55:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Paarth Shirsat From: Alexander Ziaee Subject: git: 02fd9fa29527 - main - freebsd-update: Document -v verbosity flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02fd9fa2952705ea0ed142061dd86aad7e01f8db Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:55:07 +0000 Message-Id: <69aed13b.30ed2.3a09812d@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=02fd9fa2952705ea0ed142061dd86aad7e01f8db commit 02fd9fa2952705ea0ed142061dd86aad7e01f8db Author: Paarth Shirsat AuthorDate: 2026-03-09 13:49:51 +0000 Commit: Alexander Ziaee CommitDate: 2026-03-09 13:54:23 +0000 freebsd-update: Document -v verbosity flag PR: 276099 MFC after: 3 days Reported by: michaelo Co-authored-by: Alexander Ziaee --- usr.sbin/freebsd-update/freebsd-update.8 | 13 ++++++++++++- usr.sbin/freebsd-update/freebsd-update.sh | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 7524087cb95b..cdb4915f7bfd 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -23,7 +23,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 2, 2024 +.Dd March 9, 2026 .Dt FREEBSD-UPDATE 8 .Os .Sh NAME @@ -42,6 +42,7 @@ .Op Fl r Ar newrelease .Op Fl s Ar server .Op Fl t Ar address +.Op Fl v Ar level .Ar command ... .Sh DESCRIPTION The @@ -135,6 +136,16 @@ Mail output of command, if any, to .Ar address . (default: root, or as given in the configuration file.) +.It Fl v Ar level +Set output verbosity. +.Ar level +must be one of +.Cm stats +(show progress statistics while fetching files; the default), +.Cm nostats +(suppress progress statistics), or +.Cm debug +(show all output from internal utilities). .It Fl -not-running-from-cron Force .Nm Cm fetch diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index a58b50e9ca2e..b23ada60e8aa 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -52,6 +52,7 @@ Options: (default: update.FreeBSD.org) -t address -- Mail output of cron command, if any, to address (default: root) + -v level -- Set output verbosity to stats, nostats, or debug --not-running-from-cron -- Run without a tty, for use by automated tools --currently-running release From nobody Mon Mar 9 14:35:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV01Q18gvz6Vpkx for ; Mon, 09 Mar 2026 14:35: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV01P6Lcsz4G7v for ; Mon, 09 Mar 2026 14:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773066953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Kn/vLr1pPPfIVV0JzVPOEOekTXsJ35WMyK7lABmcCQ=; b=qDvVGADb06ZzQrqpQ8C/uyUj5a1WEwCdA2zldq4DdxGCFyEXugA2fAkbsosJ7g9ITkODiJ Ibl/52hTpo3Kw1aJ3vPHywNeiurH7i07QWpt/mwniKEgSuPSoyNPOomoOCgibMgRhHqmwl SKF5Otr3w82SquOhFCdWE5FBm0NUaUgx/eTKzrh59gQyjqIbQNwWtwfufU+Odn5dUb68qo 4Zq4hblZ2bzftOw7uyp46PdfqwCm6Y127Vk0gN3XECQaadZ2BVC5P4ofL8bTm9GWIxfCIX 1t/NfXVbxX9LvlaD5978Z2hmzOpWbdcP9JTyZU/356huUlxCEE8NoNKKRyVhgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773066953; a=rsa-sha256; cv=none; b=AYGHzPagoDCZM2y4EivmDBwQXrDbSHq3HxNCOwt/vQS5hyqlnRZlsuneWpgz956KMi8mmU kyUxckK9jxRkastxbxXU1fxRymh1saqfQkALJXtgqWD9gCsqOYpzANdxFqoE1esVyu1Cbt AU5GPVm4bf9vZ3eNwXv30RfMbfvwY0R92a/O8Twit4NjLhrvvTtZNGTsdEkuMhQTP8KYBs TxW+hBmD+6qQtiuwMEfbxKFrxPbR6gUugiUPkVHKkDyYQ0GV4VHh4Z+/TTLG4Qj20US1+e zFNMTLfzyxwXwT6MDt8mF1C8zirkbw/MaX/Rs0snG0M561yf6VHHwColcV/O0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773066953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Kn/vLr1pPPfIVV0JzVPOEOekTXsJ35WMyK7lABmcCQ=; b=HiShTu5RMsyZ+Tpuiap50pPYJ3XHbKP/DKsYsUowbgknzY0VpgJ0jYT1ZSLBTvF1oicFvv wfuiUunehjjsGf/NmH97EXfBALtBjiJU6Om6tm6BjXlM4UCcXtTOAEeMZ/Ac/jgQATNG6z 1Y/tcWARHIV1q8dGPHsMFMAzBhm+Q797L8XepxWNC7ObYLSbDkg7U5GoV1aPmsbQO+q/jE mlb/5TnS6fIFvNZu2wlwZz7qoicWKR7/sj18j44FRygcZ6npB1yFy75EaEc3JBtpybB9fa dBspPEAG59wAOZPGNJ7rWg7j28ufB9QUV38mafFscWBvZ2FXARs9F7qENu/FSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV01P5cC4zD7g for ; Mon, 09 Mar 2026 14:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ef1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 14:35:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b4daeded66b5 - main - usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mode switch) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4daeded66b5e950ed8e618d66915b863c2414b1 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 14:35:48 +0000 Message-Id: <69aedac4.33ef1.717b7bd3@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b4daeded66b5e950ed8e618d66915b863c2414b1 commit b4daeded66b5e950ed8e618d66915b863c2414b1 Author: Bjoern A. Zeeb AuthorDate: 2026-01-26 13:19:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 14:35:31 +0000 usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mode switch) Several Realtek (and lots other) USB dongles present themselves as CDROM device first. Upon eject they do a mode switch and suddenly are a different kind of device (sometimes even with different IDs), e.g., a wireless dongle. In order to avoid the CDROM stage and rather than adding the quirk handling to more drivers, add support to umass and if enabled automatically eject the "CDROM" to make it the real device. Longer-term some other drivers could stop using their hand-rolled support for this. It is unclear as-to how much we need the list of (eject) quirks from u3g here, or if these are very specific to that kind of devices. Sponsored by: The FreeBSD Foundation Fixes: b3b6a959c85a, 9c0cce328363 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54901 --- sys/dev/usb/quirk/usb_quirk.c | 2 +- sys/dev/usb/storage/umass.c | 57 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 04441b2a344b..303f76f37fb0 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -532,7 +532,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { UQ_MSC_NO_INQUIRY, UQ_CFG_INDEX_0), USB_QUIRK(SMART2, G2MEMKEY, UQ_MSC_NO_INQUIRY), USB_QUIRK_REV(RALINK, RT_STOR, 0x0001, 0x0001, UQ_MSC_IGNORE), - USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_IGNORE), + USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_EJECT_SCSIEJECT), /* Non-standard USB MIDI devices */ USB_QUIRK(ROLAND, UM1, UQ_AU_VENDOR_CLASS), USB_QUIRK(ROLAND, SC8850, UQ_AU_VENDOR_CLASS), diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index cacf4ddf8f16..0ee6ea992fa7 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -115,6 +115,7 @@ #include #include #include +#include #include #include @@ -124,6 +125,7 @@ #include "usbdevs.h" #include +#include #include #include @@ -705,6 +707,59 @@ static const uint8_t fake_inq_data[SHORT_INQUIRY_LENGTH] = { #define UFI_COMMAND_LENGTH 12 /* UFI commands are always 12 bytes */ #define ATAPI_COMMAND_LENGTH 12 /* ATAPI commands are always 12 bytes */ +static void +umass_autoinst_eject_quirks(void *arg __unused, struct usb_device *udev, + struct usb_attach_arg *uaa) +{ + struct usb_interface *iface; + struct usb_interface_descriptor *id; + + if (uaa->dev_state != UAA_DEV_READY) + return; + + iface = usbd_get_iface(udev, 0); + if (iface == NULL) + return; + + id = iface->idesc; + if (id == NULL || id->bInterfaceClass != UICLASS_MASS) + return; + + if (usb_test_quirk(uaa, UQ_MSC_EJECT_SCSIEJECT)) { + int error; + + error = usb_msc_eject(uaa->device, 0, MSC_EJECT_STOPUNIT); + if (error == 0) + uaa->dev_state = UAA_DEV_EJECTING; + else + printf("UMASS failed to eject by SCSI eject STOPUNIT " + "command based on quirk: %d\n", error); + } +} + +static eventhandler_tag umass_drv_evh_tag; + +static int +umass_driver_evh(struct module *mod, int what, void *arg) +{ + + switch (what) { + case MOD_LOAD: + umass_drv_evh_tag = EVENTHANDLER_REGISTER(usb_dev_configured, + umass_autoinst_eject_quirks, NULL, EVENTHANDLER_PRI_ANY); + break; + case MOD_UNLOAD: + if (umass_drv_evh_tag != NULL) + EVENTHANDLER_DEREGISTER(usb_dev_configured, + umass_drv_evh_tag); + break; + default: + return (EOPNOTSUPP); + } + + return (0); +} + static device_method_t umass_methods[] = { /* Device interface */ DEVMETHOD(device_probe, umass_probe), @@ -725,7 +780,7 @@ static const STRUCT_USB_HOST_ID __used umass_devs[] = { {USB_IFACE_CLASS(UICLASS_MASS),}, }; -DRIVER_MODULE(umass, uhub, umass_driver, NULL, NULL); +DRIVER_MODULE(umass, uhub, umass_driver, umass_driver_evh, NULL); MODULE_DEPEND(umass, usb, 1, 1, 1); MODULE_DEPEND(umass, cam, 1, 1, 1); MODULE_VERSION(umass, 1); From nobody Mon Mar 9 14:42:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV08n4gfXz6VqTr for ; Mon, 09 Mar 2026 14:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV08n1jVtz4Hrw for ; Mon, 09 Mar 2026 14: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=1773067337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fAGku/mM5nqxOIvLoxlB6OqQ5dqfHwwZHND0SJeA+Y=; b=v4CphESEmogXWPc5xPN+n4LQ/cGJFnBuL7x533rCDQIfk50unl+AZVYS5S4o5/fYTMy1h9 EQnC0OlLN2IURXGuwcNrcgvaZSJt6aulWklX/agXUcWczbNoNY/AP9RThIbEUSu2zQCUlU 50YbDP7skpLi9q/f0FTRK2lAZnvtRU89DzQAZ1ooqkZo2vbS/dOOm5yc8DycW6ZVp95ixV pb1VFiLM30cf9rBCwTI4bIEGx78Jlf5k23BsJdz/n57NxPalnanMl6HME3YshHaCDM6NbE 6XZXkiGW+AzUTza7x4DP0F7J1byMn1dvs27h6scWRakzP86gi+Ii22+kwFkkdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773067337; a=rsa-sha256; cv=none; b=U5mBrHvtc54kMFO+sIRXoYvfBFisjh1uAecnMynmaFNl+TWqeETXUxpkOciBvJ6TJc2ZBK OKtaz597MOpRHvkgHxSzDAlkrNvJaeNrO0Y/6tTQaz2ZKR2Vor+p1JOQ1qxh3f21GpPhlK zI6PtMv5UGyCugiHfFdMiQVeG0DWBY6gxsvmIukkwxd4hfDuPVQSYXiDt2xc0Y7ZXDvtL9 PZs5gJL5Mqqt8TLfwigV1GwpD3wCzq3FB0O8wI6pAA/MRpOkFLy+kFs+1SBp8/q/5E+qNb ykxkVjoFMwNiNS+EouaFBiwolBPoOWx+YQyCU/3jcfZs2i08QMVhxAufkQHe1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773067337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7fAGku/mM5nqxOIvLoxlB6OqQ5dqfHwwZHND0SJeA+Y=; b=ZpwgRsmbwEuQ7OdAyjQbgBM8JFpECLbG2WTN6F7AnB6ZSpoU4hqKrZWPztQa+bN1mulyp3 Drt8AVq3FoQ2tZ4BXvAGRgljujiywEEOSlj45pNq3JrhcslxCIYZwpJgKdQa9mAs+LHK7p MwGkT/R6gM76sHl5jp8HMGUzDu3aNRFGIuZOxgqWFbjT9IliiK3ber6s392jgXlVRLi3DI oXTj7fDJXMuT/wA5Wcch7FUzT/E0Ck0Eppvv0Rx7Kj16eTq36wWwjNRXvyDeblwKQXhk1M PDKLanqIN7U4eoqp32syTxMBHQB8GQTXhKC8W1J037/rh5IfHDg5xN5b8z7MFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV08n1Cw7zDYY for ; Mon, 09 Mar 2026 14:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37067 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 14:42:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: e2ed7ee02f6b - main - bsd.progs.mk: Fix incremental META_MODE for prog sources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2ed7ee02f6bda705a7c8df3c512c6a43db56830 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 14:42:17 +0000 Message-Id: <69aedc49.37067.7a1d68b1@gitrepo.freebsd.org> The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=e2ed7ee02f6bda705a7c8df3c512c6a43db56830 commit e2ed7ee02f6bda705a7c8df3c512c6a43db56830 Author: Bryan Drewery AuthorDate: 2026-03-07 16:38:47 +0000 Commit: Bryan Drewery CommitDate: 2026-03-09 14:38:40 +0000 bsd.progs.mk: Fix incremental META_MODE for prog sources This fixes recursed builds not having meta mode enabled for them which disabled dependency and and command change tracking. We only want common objects marked .NOMETA when recursing, not non-common objects. The common code expects _PROGS_COMMON_SRCS does not contain the prog source or else it will be marked .NOMETA. Add comments explaining the intent and cases being covered. Fixes: 4ea5e107b1 (": Allow using SRCS for common sources") Differential Revision: https://reviews.freebsd.org/D55711 Reviewed by: vexeduxr, sjg --- share/mk/bsd.progs.mk | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 007e8a843944..2c6f6df33279 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -14,6 +14,7 @@ # we really only use PROGS below... PROGS += ${PROGS_CXX} +_save_srcs:= ${SRCS:U} .if defined(PROG) # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE CSTD CXXSTD DPSRCS MAN \ @@ -91,8 +92,29 @@ $v = # Find common sources among the PROGS to depend on them before building # anything. This allows parallelization without them each fighting over # the same objects. -_PROGS_COMMON_SRCS= ${DPSRCS} ${SRCS} -_PROGS_ALL_SRCS= ${SRCS} +# +# There are 3 cases to consider. +# 1. No common sources. +# SRCS= +# SRCS.prog1= prog1.c +# SRCS.prog2= prog2.c +# 2. Common sources in all SRCS.$prog. +# SRCS= +# SRCS.prog1= prog1.c common.c +# SRCS.prog2= prog2.c common.c +# 3. Common sources in SRCS. +# SRCS= common.c +# SRCS.prog1= prog1.c +# SRCS.prog2= prog2.c +# The intent is: +# a. Only build common objects in the parent make before recursing. +# b. When recursing only build non-common objects. +# c. When recursing disable meta mode for common objects so they are not +# inspected. +# _PROGS_COMMON_SRCS is expected to only contain common sources both +# in the parent and when recursing. +_PROGS_COMMON_SRCS:= ${DPSRCS} ${_save_srcs} +_PROGS_ALL_SRCS:= ${_save_srcs} .for p in ${PROGS} .for s in ${SRCS.${p}} .if ${_PROGS_ALL_SRCS:M${s}} && !${_PROGS_COMMON_SRCS:M${s}} @@ -115,6 +137,7 @@ _PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${OBJS_SRCS_FILTER:ts:}:S/$/ ${_PROGS_COMMON_OBJS}: .NOMETA .endif .endif +.undef _save_srcs .if !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG) # tell progs.mk we might want to install things From nobody Mon Mar 9 15:15:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV0w15hrmz6VsLf; Mon, 09 Mar 2026 15:16:17 +0000 (UTC) (envelope-from pouria@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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV0w14jwMz4Lv9; Mon, 09 Mar 2026 15:16:17 +0000 (UTC) (envelope-from pouria@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773069377; 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=KYGrA7Zz+vhmsVPi+ucCt6LdNTWejjCMCFazv3YqTZU=; b=MOfD8RG9yGpK76PCFxgdRHhMhOVSRIKzbRjTTH1tVgASS1coB5GcyMJvofr6pgVKwmWM2+ FyUhHym6mwSZX7OfYvn55vJ5y0yY+0tBIEayBfX5k8kaAzepoZD8Cv2E3sfc0dIQDJilYN l58ExuMyrk677bRzmybZbTkEOzg6LIr7BC4LkHcTjURFuSTfD7pEgQLo8Xc0rmLzp+HVWU Pmo+oIYxXJATU2+DPiAGtd9D7n8t6ep+EjGZadev4hr1q1e6CaB0gv5vSLtnGU8maEuapo uK7g9LHjAPkovuP3z8hU1blBr2hlBpWFJCwA9GgBLoeYoC9kJz3SYZ7+51niEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773069377; a=rsa-sha256; cv=none; b=wPJMMMFB98FX5g9CsGi8P0V+kr7zsYzPbmkYh4kHWvW9wqnMMuJDfn9ndKEgH6Q8WapAgm 1DWGxucWn199M+Z1cgZphd7XIROyqRt5EWPT0T3Jqce9HcMiQ5yzJMeWdCWUAuVxsDXZvm /1ArtjDeWp6UI6QIv/XTGADUChy8hre32bT76LjkjGXS2XmJ5cKaS/u+q2V1mmrTZyfJo0 hljAs9kRIjLgEzi9LI//lg0BiiXRlVs1CyPGZdRrIOt+p3+QziAFrUN3DeyPHPNtMMHVM+ lJhaCgBDsNGlZLZOlpPGHlrju0k7Hqus5prAFM0h8aKxtxrK6P3b9Zsa3xkwqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773069377; 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=KYGrA7Zz+vhmsVPi+ucCt6LdNTWejjCMCFazv3YqTZU=; b=KW5IcoOWn30JdJ3RlvsD58dXxuYySN2h51PHu/Y2ZKtWjSgJmH9YPINbQZDO4pUdJA795D JKmhNmE54zJcVq9OC/+NzuN4JzsY5kn0Q5rLMiZbfCGNlloPmImChWXjWY1mM3mD6je4al oqnZWFxk/JbJDMMtk9/xgGF8b8Yxr9u5pIAvp7vW+1hrCalipXtUXsynHj3M1E6R1yCoR5 DR4Sg6eacNH+Yta/3kiDlXitfN1wlAS6SylAx3APL2AZtwLEG1hWTwXTTZhLVTbrppgKsU 5cvVrixbZVqNnOkhdmD/Nui9jyDBa2zdSgBBCno+Z/l84tEuAlWSCtro83qJsQ== Received: from nl.mail.spmzt.net (mail.spmzt.net [193.148.248.214]) (using TLSv1.3 with cipher TLS_AES_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: pouria) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fV0w05PXszM5T; Mon, 09 Mar 2026 15:16:16 +0000 (UTC) (envelope-from pouria@FreeBSD.org) Received: by nl.mail.spmzt.net (OpenSMTPD) with ESMTPSA id 2b69daa4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 9 Mar 2026 18:46:08 +0330 (+0330) Message-ID: Date: Mon, 9 Mar 2026 18:45:31 +0330 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: fa4f625ed854 - main - acpi_system76: unbreak LINT To: John Baldwin References: <69ac7b46.250e5.986d69e@gitrepo.freebsd.org> Content-Language: en-US, fa-IR Cc: dev-commits-src-main@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Pouria Mousavizadeh Tehrani In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------LunO4NMWDzSzBuD0tK6iNz4p" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------LunO4NMWDzSzBuD0tK6iNz4p Content-Type: multipart/mixed; boundary="------------tRFDUCA9xdXDbpIfc1I36sqS"; protected-headers="v1" Message-ID: Date: Mon, 9 Mar 2026 18:45:31 +0330 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: fa4f625ed854 - main - acpi_system76: unbreak LINT To: John Baldwin References: <69ac7b46.250e5.986d69e@gitrepo.freebsd.org> Content-Language: en-US, fa-IR Cc: dev-commits-src-main@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Pouria Mousavizadeh Tehrani In-Reply-To: --------------tRFDUCA9xdXDbpIfc1I36sqS Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMy85LzI2IDU6MTIgUE0sIEpvaG4gQmFsZHdpbiB3cm90ZToNCj4gRllJLCBJIGJlbGll dmUgdGhlIGNvbW1vbiBzdHlsZSBpcyB0byBsZWF2ZSBhIGJsYW5rIGxpbmUgYmV0d2VlbiAN Cj4gIm9wdF9mb28uaCIgI2luY2x1ZGVzIGFuZA0KPiBvdGhlciAjaW5jbHVkZXMuwqAgKEkg YW0gbm90IHN1cmUgaWYgc3R5bGUoOSkgY292ZXJzIHRoaXMgY2FzZS4pDQoNClRoYW5rIHlv dSBmb3IgbGV0dGluZyBtZSBrbm93Lg0KSSdsbCBzdHlsZSBpdCBpbiB0aGUgbmV4dCBjaGFu Z2UuDQoNCi0tIA0KUG91cmlhDQo= --------------tRFDUCA9xdXDbpIfc1I36sqS-- --------------LunO4NMWDzSzBuD0tK6iNz4p Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQSqt7cppfvJ816gj0lUwVnUeMwagAUCaa7kFAAKCRBUwVnUeMwa gLDvAQC8ADKCzZl1Bcm7GN+ZgYX/fN9I/Uwp0xLmRyy18Gm9JgEAo1AKqh7SUkFE CgOcMamnfmDv8sXF5qvRqilvGuTO/ww= =AXwt -----END PGP SIGNATURE----- --------------LunO4NMWDzSzBuD0tK6iNz4p-- From nobody Mon Mar 9 16:38:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV2l370Psz6TV27 for ; Mon, 09 Mar 2026 16:38:39 +0000 (UTC) (envelope-from bounce.q2lildups38nra0=b4ueu3n9w9y2=kxjzjbl84idvn7@return.smtpservice.net) Received: from e3i531.smtp2go.com (e3i531.smtp2go.com [158.120.86.19]) (using TLSv1.3 with cipher TLS_AES_256_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 4fV2l34CxCz3Kcy for ; Mon, 09 Mar 2026 16:38:39 +0000 (UTC) (envelope-from bounce.q2lildups38nra0=b4ueu3n9w9y2=kxjzjbl84idvn7@return.smtpservice.net) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smtpservice.net; i=@smtpservice.net; q=dns/txt; s=a1-4; t=1773074314; h=feedback-id : x-smtpcorp-track : date : message-id : to : subject : from : reply-to : sender : list-unsubscribe : list-unsubscribe-post; bh=IWgZyHABWKYN1DiRQDarLERHtJuJ8IqGYhmYjp+KdRU=; b=ocBvXINYdyhanaZPejyzu/cLq/lE1zTEpa7NaW34egH+MjFKCsBCeQmeDuDRr4DYbSUwj KMaoYn+mNjQ1pwg7lcS/V7Bh2HinQt58iI0Yn37mE0ip5nt0FBH4zEoQ194kNB05mj+nEhg 18mPGPeNXJA5IqwPLe8MKhPTog5+RnX4qRRPgGhgbyCwfqgqx+zojN1Xw2jhS0JU0tNP0iU T6OvPThl18lwkWFTSGb+bMuON1Raka/ieIkLAfCzkPdX+7e4czp1R4Q5TGNp7XNEZsvRRI/ WPWLl9C8/jw/FrYL7vry/7BsCTsRpIT+BHi/47DP3B1c+wIHfYTxrMjcxxIQ== Received: from [10.99.243.232] (helo=morbo.fubar.geek.nz) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.99.1-S2G) (envelope-from ) id 1vzdcq-4o5NDgroRPr-kLOy; Mon, 09 Mar 2026 16:38:36 +0000 Received: from smtpclient.apple (unknown [IPv6:2a02:8012:a6a8:0:8835:d8b5:711e:47ee]) by morbo.fubar.geek.nz (Postfix) with ESMTPSA id 6282F4773E; Mon, 09 Mar 2026 16:38:35 +0000 (UTC) From: Andrew Turner Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_35E9251D-96F6-4D90-905F-5A2D21E10EAE" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: c499ad6f997c - main - virtio: Use bus_dma for ring and indirect buffer allocations Date: Mon, 9 Mar 2026 16:38:24 +0000 In-Reply-To: <87ecludxuh.wl-herbert@gojira.at> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Sarah Walker To: "Herbert J. Skuhra" References: <69a71c75.40215.43f39fc6@gitrepo.freebsd.org> <87ecludxuh.wl-herbert@gojira.at> X-Mailer: Apple Mail (2.3826.700.81) X-Report-Abuse: Please forward a copy of this message, including all headers, to Feedback-ID: 790814m:790814amQcrys:790814sxRKYBK6LQ X-smtpcorp-track: 252ju4s4zCjx.FVfOWIPBxZru.fQ_i2w6xc9M 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:23352, ipnet:158.120.84.0/22, country:US] X-Rspamd-Queue-Id: 4fV2l34CxCz3Kcy X-Spamd-Bar: ---- --Apple-Mail=_35E9251D-96F6-4D90-905F-5A2D21E10EAE Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On 8 Mar 2026, at 17:39, Herbert J. Skuhra wrote: >=20 > On Tue, 03 Mar 2026 18:37:57 +0100, Andrew Turner wrote: >>=20 >> The branch main has been updated by andrew: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc499ad6f997c8c5f61c88925e6d1e826= d0c0f6c4 >>=20 >> commit c499ad6f997c8c5f61c88925e6d1e826d0c0f6c4 >> Author: Sarah Walker >> AuthorDate: 2026-03-03 16:08:11 +0000 >> Commit: Andrew Turner >> CommitDate: 2026-03-03 16:29:15 +0000 >>=20 >> virtio: Use bus_dma for ring and indirect buffer allocations >>=20 >> While the majority of virtio platforms will be fully coherent, = some may >> require cache maintenance or other specific device memory handling = (eg for >> secure partitioning). Using bus_dma allows for these usecases. >>=20 >> The virtio buffers are marked as coherent; this should ensure that = sync >> calls are no-ops in the common cases. >>=20 >> Reviewed by: andrew >> Sponsored by: Arm Ltd >> Differential Revision: https://reviews.freebsd.org/D54959 >> --- >> sys/dev/virtio/virtio_ring.h | 27 ++++-- >> sys/dev/virtio/virtqueue.c | 216 = +++++++++++++++++++++++++++++++++++++------ >> 2 files changed, 209 insertions(+), 34 deletions(-) >=20 > After this change I see a lot of "kernel: vtnet0: watchdog timeout on > queue xx" errors on amd64 (arm64 seems to be OK). >=20 > Reverting this commit resolves the issue. Can you try the change in https://reviews.freebsd.org/D55766? It re-adds = memory barriers for amd64. Andrew --Apple-Mail=_35E9251D-96F6-4D90-905F-5A2D21E10EAE Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii
On 8 Mar = 2026, at 17:39, Herbert J. Skuhra <herbert@gojira.at> = wrote:

On Tue, 03 Mar 2026 = 18:37:57 +0100, Andrew Turner wrote:

The branch main has been updated by = andrew:

URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc499ad6f997c8c5f61c88925e6d1e826= d0c0f6c4

commit = c499ad6f997c8c5f61c88925e6d1e826d0c0f6c4
Author: =     Sarah Walker = <sarah.walker2@arm.com>
AuthorDate: 2026-03-03 16:08:11 = +0000
Commit:     Andrew Turner = <andrew@FreeBSD.org>
CommitDate: 2026-03-03 16:29:15 = +0000

   virtio: Use bus_dma for ring and indirect = buffer allocations

   While the majority of virtio = platforms will be fully coherent, some may
   require = cache maintenance or other specific device memory handling (eg = for
   secure partitioning). Using bus_dma allows for = these usecases.

   The virtio buffers are marked = as coherent; this should ensure that sync
   calls are = no-ops in the common cases.

   Reviewed by: =    andrew
   Sponsored by: =   Arm Ltd
   Differential Revision: =  https://reviews.freebsd.org/D54959
---
sys/dev/virtio/virtio_r= ing.h |  27 ++++--
sys/dev/virtio/virtqueue.c   | 216 = +++++++++++++++++++++++++++++++++++++------
2 files changed, 209 = insertions(+), 34 deletions(-)

After = this change I see a lot of "kernel: vtnet0: watchdog timeout = on
queue xx" errors on = amd64 (arm64 seems to be OK).

Reverting this commit resolves the = issue.

Can you try the change = in https://reviews.freebsd.org/D= 55766? It re-adds memory barriers for = amd64.

Andrew

= --Apple-Mail=_35E9251D-96F6-4D90-905F-5A2D21E10EAE-- From nobody Mon Mar 9 17:18:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV3d41N3Kz6TXk7 for ; Mon, 09 Mar 2026 17:18: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV3d40vPYz3QkV for ; Mon, 09 Mar 2026 17:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773076712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a3ctg7zqq4yK9ZYpzdahhvITnLuSU+NtVSuyxkiVvTw=; b=HojrTL1W7wXLzPVu01ipJWronAJOHT/9OCMezl41mP/rLSRa8BnNXgflIEXhmI55AtmZuJ lp3xtuXAOhhqjEDrkcPi1X76J63YIHkGDvHC0IHVLmQ1nrJYYcTIa59aHoDbFAdHPh3YNX fAUR59a38t/oszSIi//QAcgADm3GbF4v/1bA1V6m3TlJEo7YSsqEqApiDkrGgnM2iTtVI/ rylwsQM43lrUng9S04ulmS0fxiJDZk4fJp5R5/eXVJrsSbJdj8BMPaS4k1JMFIt5b5jk57 VoaCrW32UKRsQgVX8OWV7YDYM9Pzd29dk2q+644vi6lsKEmBXafI8DggIlQniA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773076712; a=rsa-sha256; cv=none; b=SxTv6FKIxST+p4o0PqSFY7Df9OJpM2yhKZCfTRwV2LaCd1GkvWs047Cdy1iqWj9Jplivhc O4GSjXXRJyWgyDxtde6gGAeUyiX52gjidFJzB730NLIZkNz/WFAlgzftBiRu0IlKJTLD7G hwyP89sNpv25eljyo320gOoNqFKbPkA/5ZO5ZLDm0mo1Je4Gw9NMEsc34TfAjjEcKmvbv2 iiUoUFaBXbQA8gply1ehYit539b9BM8rSkK7jZcUYD4aO2PcPqaQ57QWnD1zVCXKHUThi+ b03WqbU1a/Y/Gd0XTGtjk0OhD4SO8XAQBcqw977kSIZr8G6lWr338bIOLvlVKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773076712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a3ctg7zqq4yK9ZYpzdahhvITnLuSU+NtVSuyxkiVvTw=; b=wzXrzaVlv6PQ6lmqPGamCRZ1K4MU/ql1xehpSXFW87N/6FeTRDkJ2YphqJn92Exp7e6dMH ApB/E+Oiy6sUxMByhwBvuZR2lKqMS/fGr21JLpBmAGgXESaJa7FaI+d+I+bGyQVmdQvs+0 j8jkbtuYF+/iGO3GGceyDAua8gvL6FYWW7royCvPs9iqtnWdTEiF1iBwVLFonCXAXVrMqv i8AH1nh53iFFxAhY2G/jvEyTyKvcZROTXD6rdI0z4lwU5bI53TYOl5RnrmwpxiawGdMCZ3 v7V8CT67r8EN+9pEVIdutddqjecaCNio88/3Izm8ZbvBWinfK5xEFpBG14rdvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV3d370ktzZsx for ; Mon, 09 Mar 2026 17:18:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 454bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 17:18:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 87c6ec168579 - main - cxgbetool: create one backend routine for all the loadX cmds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87c6ec16857939693ee4d5bef9e8aa8b04bad5dc Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 17:18:26 +0000 Message-Id: <69af00e2.454bf.7c493fdc@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=87c6ec16857939693ee4d5bef9e8aa8b04bad5dc commit 87c6ec16857939693ee4d5bef9e8aa8b04bad5dc Author: Navdeep Parhar AuthorDate: 2026-03-08 19:34:15 +0000 Commit: Navdeep Parhar CommitDate: 2026-03-09 17:04:37 +0000 cxgbetool: create one backend routine for all the loadX cmds They are all doing almost the same thing so it makes sense to have one common routine. The new routine supports non-regular files too. eg. # cxgbetool chnex0 loadfw <(fetch -qo - http://srv/t7fw.bin) MFC after: 1 week Sponsored by: Chelsio Communications Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D55747 --- usr.sbin/cxgbetool/cxgbetool.c | 164 ++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 102 deletions(-) diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c index 68de86d74092..49ba547e5dae 100644 --- a/usr.sbin/cxgbetool/cxgbetool.c +++ b/usr.sbin/cxgbetool/cxgbetool.c @@ -2169,16 +2169,19 @@ get_sge_context(int argc, const char *argv[]) } static int -loadfw(int argc, const char *argv[]) +real_load_file(unsigned long ioc, const char *iocname, const char *fname, + struct t4_bootrom *br) { - int rc, fd; + int rc, fd, n; struct t4_data data = {0}; - const char *fname = argv[0]; struct stat st = {0}; + const int bufsz = 2 * 1024 * 1024; - if (argc != 1) { - warnx("loadfw: incorrect number of arguments."); - return (EINVAL); + if (strcmp(fname, "clear") == 0) { + if (br == NULL) + return (real_doit(ioc, &data, iocname)); + else + return (real_doit(ioc, br, iocname)); } fd = open(fname, O_RDONLY); @@ -2193,61 +2196,75 @@ loadfw(int argc, const char *argv[]) return (errno); } - data.len = st.st_size; - data.data = mmap(0, data.len, PROT_READ, MAP_PRIVATE, fd, 0); - if (data.data == MAP_FAILED) { - warn("mmap"); - close(fd); - return (errno); + if (st.st_mode & S_IFREG) { + data.len = st.st_size; + data.data = mmap(0, data.len, PROT_READ, MAP_PRIVATE, fd, 0); + if (data.data == MAP_FAILED) { + warn("mmap %u", data.len); + return (errno); + } + } else { + data.data = malloc(bufsz); + if (data.data == NULL) { + warnx("malloc failed."); + return (ENOMEM); + } + for (data.len = 0; data.len <= bufsz; data.len += n) { + n = read(fd, data.data + data.len, bufsz - data.len); + if (n == -1) { + warn("read(%s, %u)", fname, data.len); + free(data.data); + close(fd); + return (errno); + } + if (n == 0) + break; + } + if (data.len == bufsz) + warnx("file '%s' contents > %u ignored.", fname, bufsz); } - rc = doit(CHELSIO_T4_LOAD_FW, &data); - munmap(data.data, data.len); + if (br == NULL) + rc = real_doit(ioc, &data, iocname); + else { + br->len = data.len; + br->data = data.data; + rc = real_doit(ioc, br, iocname); + } + if (st.st_mode & S_IFREG) + munmap(data.data, data.len); + else + free(data.data); close(fd); return (rc); } +#define load_file(ioc, fname) real_load_file(ioc, #ioc, fname, NULL) +#define load_file_br(ioc, fname, br) real_load_file(ioc, #ioc, fname, br) static int -loadcfg(int argc, const char *argv[]) +loadfw(int argc, const char *argv[]) { - int rc, fd; - struct t4_data data = {0}; const char *fname = argv[0]; - struct stat st = {0}; if (argc != 1) { - warnx("loadcfg: incorrect number of arguments."); + warnx("loadfw: incorrect number of arguments."); return (EINVAL); } - if (strcmp(fname, "clear") == 0) - return (doit(CHELSIO_T4_LOAD_CFG, &data)); - - fd = open(fname, O_RDONLY); - if (fd < 0) { - warn("open(%s)", fname); - return (errno); - } + return (load_file(CHELSIO_T4_LOAD_FW, fname)); +} - if (fstat(fd, &st) < 0) { - warn("fstat"); - close(fd); - return (errno); - } +static int +loadcfg(int argc, const char *argv[]) +{ + const char *fname = argv[0]; - data.len = st.st_size; - data.len &= ~3; /* Clip off to make it a multiple of 4 */ - data.data = mmap(0, data.len, PROT_READ, MAP_PRIVATE, fd, 0); - if (data.data == MAP_FAILED) { - warn("mmap"); - close(fd); - return (errno); + if (argc != 1) { + warnx("loadcfg: incorrect number of arguments."); + return (EINVAL); } - rc = doit(CHELSIO_T4_LOAD_CFG, &data); - munmap(data.data, data.len); - close(fd); - return (rc); + return (load_file(CHELSIO_T4_LOAD_CFG, fname)); } static int @@ -2317,12 +2334,10 @@ done: static int loadboot(int argc, const char *argv[]) { - int rc, fd; long l; char *p; struct t4_bootrom br = {0}; const char *fname = argv[0]; - struct stat st = {0}; if (argc == 1) { br.pf_offset = 0; @@ -2344,75 +2359,20 @@ loadboot(int argc, const char *argv[]) return (EINVAL); } - if (strcmp(fname, "clear") == 0) - return (doit(CHELSIO_T4_LOAD_BOOT, &br)); - - fd = open(fname, O_RDONLY); - if (fd < 0) { - warn("open(%s)", fname); - return (errno); - } - - if (fstat(fd, &st) < 0) { - warn("fstat"); - close(fd); - return (errno); - } - - br.len = st.st_size; - br.data = mmap(0, br.len, PROT_READ, MAP_PRIVATE, fd, 0); - if (br.data == MAP_FAILED) { - warn("mmap"); - close(fd); - return (errno); - } - - rc = doit(CHELSIO_T4_LOAD_BOOT, &br); - munmap(br.data, br.len); - close(fd); - return (rc); + return (load_file_br(CHELSIO_T4_LOAD_BOOT, fname, &br)); } static int loadbootcfg(int argc, const char *argv[]) { - int rc, fd; - struct t4_data bc = {0}; const char *fname = argv[0]; - struct stat st = {0}; if (argc != 1) { warnx("loadbootcfg: incorrect number of arguments."); return (EINVAL); } - if (strcmp(fname, "clear") == 0) - return (doit(CHELSIO_T4_LOAD_BOOTCFG, &bc)); - - fd = open(fname, O_RDONLY); - if (fd < 0) { - warn("open(%s)", fname); - return (errno); - } - - if (fstat(fd, &st) < 0) { - warn("fstat"); - close(fd); - return (errno); - } - - bc.len = st.st_size; - bc.data = mmap(0, bc.len, PROT_READ, MAP_PRIVATE, fd, 0); - if (bc.data == MAP_FAILED) { - warn("mmap"); - close(fd); - return (errno); - } - - rc = doit(CHELSIO_T4_LOAD_BOOTCFG, &bc); - munmap(bc.data, bc.len); - close(fd); - return (rc); + return (load_file(CHELSIO_T4_LOAD_BOOTCFG, fname)); } /* From nobody Mon Mar 9 17:43:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV49t4rMtz6TZHB for ; Mon, 09 Mar 2026 17:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV49t3jDzz3WZr for ; Mon, 09 Mar 2026 17:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773078210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FivjyOaq5/1IH2dFP4+shk+Ug4uXFWem5wYbf9JbpN0=; b=aFdCian7loPygkM38tg3V9TBfxMAeT8ULEgrQcalMlv6SvyVotLKgGgioyzAAxJHAiGwZS XR5j390aXk5dJNEcbsvAnOvOm55hu4w+k0tlDfu3QYHPEhBc84nRGsh8/z41AANgTMlvIP LhObvBY/KwvBpKOZrbN6w2MaxO9FfF88FkS08kHLN4NLf7UFr1IWnLQYIhgSXZvULvn/ZM 0nvGFNJEurL4jOvfIB6frzokHkJpwhDmW9aEEiKix6wPjy6ZCBhcnXDpXHWzRovUqHJjbj z1hn0b9xOvf5JtBz4oH7U7y7NdTQVty4adBkYeqMCv/XK9u8N+cp3H/gokpmcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773078210; a=rsa-sha256; cv=none; b=tsq4hQ/IVvqCQkBYFb10xW6YOm+lS/YU0yHf8I9tNZbhdhQQL4wSmxorGYzYIxuLfqgfO8 0oIfw8ytcaN6O8PStth4aXCaKUEAHfR4sXpnLO8q2Ka2Es3/14NQOg5ReYflDsViGVlyPL bGmpr6i5HVOOwcZCeq49Rhm4rCBOMNiFto4aNggFjZIGfDmNSKWinAtDLcsoXCW6pdq5hD 73FgrwDrCxLjZHz14oobWR1eRsIqGhJMdJvbS7gz0P5ryvdaSICiLc3yw3jFaXsaZMiLoS FHchzpxxCWzgRYoDxMqojKjssMGnuIKzPeW/F3wdH7m3sQ+tExByquAJ8+tjaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773078210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FivjyOaq5/1IH2dFP4+shk+Ug4uXFWem5wYbf9JbpN0=; b=qhBlUYRaPy91GLfwqgx8dZPs+ZIqjikBms81jvtND3QXbEKTkgtDQFDbvqwGg+77w/wxXh Rk79Z70X77tp8vlJN0edFIhjdLpIgAcL+Fs/rcWIQqmdoMmh3FLoagLkXKrywhC+1TPtXw 7osIimx0F+DSmNLs9T6X73fj/YCwFO4G0KsHPxfqbP26LzRlgq/CMgJbukMqpL8N6P1g+P Mis1Tb+XBEYL4EIL0a5d99ZSkGqHlEfesf8Tf7VKsVmTgl8Qoj9eWOT9ypUmIjRMpppMDT Sh8Vg8tVPk12YOgv7rxErJBEFvRaAXOkyGmPUASRgj1cJa7IyijRseOQIylfgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV49t3FrLzc9s for ; Mon, 09 Mar 2026 17:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1952b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 17:43:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 6560ee97e8f5 - main - igc.4: Describe better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6560ee97e8f51d5147521319dfd9d1e7afe74d34 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 17:43:25 +0000 Message-Id: <69af06bd.1952b.4ede4342@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=6560ee97e8f51d5147521319dfd9d1e7afe74d34 commit 6560ee97e8f51d5147521319dfd9d1e7afe74d34 Author: Alexander Ziaee AuthorDate: 2026-03-09 16:34:00 +0000 Commit: Alexander Ziaee CommitDate: 2026-03-09 17:43:10 +0000 igc.4: Describe better MFC after: 3 days --- share/man/man4/igc.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/igc.4 b/share/man/man4/igc.4 index a67ed1c15ee8..757c7dd4510d 100644 --- a/share/man/man4/igc.4 +++ b/share/man/man4/igc.4 @@ -1,14 +1,14 @@ -.\"- +.\" .\" Copyright 2021 Intel Corp .\" Copyright 2021 Rubicon Communications, LLC (Netgate) .\" SPDX-License-Identifier: BSD-3-Clause .\" -.Dd January 9, 2023 +.Dd March 9, 2026 .Dt IGC 4 .Os .Sh NAME .Nm igc -.Nd "Intel Ethernet Controller I225 driver" +.Nd Intel Ethernet Controller I225 2.5GbE driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -77,7 +77,7 @@ mode is supported at this speed. .Sh HARDWARE The .Nm -driver supports the following models: +driver supports the following 2.5Gb Ethernet controllers: .Pp .Bl -bullet -compact .It From nobody Mon Mar 9 18:25:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV56Y1rf5z6TgKb; Mon, 09 Mar 2026 18:25:41 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) (using TLSv1.3 with cipher TLS_AES_256_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 4fV56X4DBJz3kgv; Mon, 09 Mar 2026 18:25:40 +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 mailfout.phl.internal (Postfix) with ESMTP id 2F802EC0D71; Mon, 9 Mar 2026 14:25:39 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Mon, 09 Mar 2026 14:25:39 -0400 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=fm1; t=1773080739; x=1773167139; bh=ZF6gVt9Dia SAFaPaEj3oodOilyXef49HYC5+14JOrZc=; b=Y8O3dQwbL6l6LIHb7uhb8PJ21N yTZ4e94Cavsfqee/mGCvlbr0RtwW6uvfpTBsaD76P0oUvRBFiT48l4WDBVOPbsfQ A/MUTz4NEXxp3KZR4o6R5c+iv7UIjHp2UvK2veKIqJ3421uhsqr6Lauvs+tUZGuu Oh89pC4KRAGmfVuBx7wOOV2AhBEIq6QyVBLiD4ISMUSOPWtyZAK31mWhlMeEhFxp 4DfGV5Ibv/C+6Y4r1HJS4qhqUxH3E1YAMXNalDUbSDgasyVxk0+Xdc9R2Ve8rMo4 i8nNFmxh32QPGlQsgONGu6Lt+X/iZZzaFRO/fnkIYDU9a3u4YYlQIkZd9mdg== 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=fm1; t= 1773080739; x=1773167139; bh=ZF6gVt9DiaSAFaPaEj3oodOilyXef49HYC5 +14JOrZc=; b=oJP66tQLibj9Sc/FbUP0kXeGce8ALnc/0f2nGPMgDjLXL0CJdCK BYvYd/Z+rV9U7r5POcb2+d0P8+xZXHuA3ilrDZejNhJ86kBZiL+U4+kHh7OelRx3 tpH4aOzh74BVrOtBBem70YW7gPEqn3SJqVTxC4U5paDCBWQa4XaPuSP6FgbYwC0G FlrfeF3pKUTNk4w/7I/lBfr8NDnICKlmFpYp4WQpnZz8XRE56YfaJwkO7gViXWtf ndn/KGUxeuP2u1r3SBPWMRIVQa0SXQwdSBX6HBUUBrWBIcldjM1nYDD3Vw55XnjB ian6++e/GbqLRypYmMx7Bu33POD7qJoxAuw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddvjeekkeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepfffkhffvvefujghffgggtgesthdtredttdervdenucfhrhhomhepfdfjvghrsggv rhhtucflrdcuufhkuhhhrhgrfdcuoehhvghrsggvrhhtsehgohhjihhrrgdrrghtqeenuc ggtffrrghtthgvrhhnpeefhfehffegvdehuedtuefgkeefieffieejhfeggeekgeevjeeg feffgeeglefhtdenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhvghrsggvrhhtsehgohhj ihhrrgdrrghtpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtph htthhopegrnhgurhgvfiesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgt ohhmmhhithhtvghrshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtoh hmmhhithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggv vhdqtghomhhmihhtshdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhgpdhrtghpth htohepshgrrhgrhhdrfigrlhhkvghrvdesrghrmhdrtghomh X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Mar 2026 14:25:37 -0400 (EDT) Date: Mon, 09 Mar 2026 19:25:32 +0100 Message-ID: <87pl5c5083.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Andrew Turner Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Sarah Walker Subject: Re: git: c499ad6f997c - main - virtio: Use bus_dma for ring and indirect buffer allocations In-Reply-To: References: <69a71c75.40215.43f39fc6@gitrepo.freebsd.org> <87ecludxuh.wl-herbert@gojira.at> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 (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: 4fV56X4DBJz3kgv X-Spamd-Bar: ---- On Mon, 09 Mar 2026 17:38:24 +0100, Andrew Turner wrote: > > > > On 8 Mar 2026, at 17:39, Herbert J. Skuhra wrote: > > > > On Tue, 03 Mar 2026 18:37:57 +0100, Andrew Turner wrote: > >> > >> The branch main has been updated by andrew: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=c499ad6f997c8c5f61c88925e6d1e826d0c0f6c4 > >> > >> commit c499ad6f997c8c5f61c88925e6d1e826d0c0f6c4 > >> Author: Sarah Walker > >> AuthorDate: 2026-03-03 16:08:11 +0000 > >> Commit: Andrew Turner > >> CommitDate: 2026-03-03 16:29:15 +0000 > >> > >> virtio: Use bus_dma for ring and indirect buffer allocations > >> > >> While the majority of virtio platforms will be fully coherent, some may > >> require cache maintenance or other specific device memory handling (eg for > >> secure partitioning). Using bus_dma allows for these usecases. > >> > >> The virtio buffers are marked as coherent; this should ensure that sync > >> calls are no-ops in the common cases. > >> > >> Reviewed by: andrew > >> Sponsored by: Arm Ltd > >> Differential Revision: https://reviews.freebsd.org/D54959 > >> --- > >> sys/dev/virtio/virtio_ring.h | 27 ++++-- > >> sys/dev/virtio/virtqueue.c | 216 +++++++++++++++++++++++++++++++++++++------ > >> 2 files changed, 209 insertions(+), 34 deletions(-) > > > > After this change I see a lot of "kernel: vtnet0: watchdog timeout on > > queue xx" errors on amd64 (arm64 seems to be OK). > > > > Reverting this commit resolves the issue. > > Can you try the change in https://reviews.freebsd.org/D55766? It re-adds memory barriers for amd64. Yes, the patch seems to resolve the issue. Thanks. From nobody Mon Mar 9 18:34:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV5K51QZ6z6TjJZ for ; Mon, 09 Mar 2026 18: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV5K50F3qz46M9 for ; Mon, 09 Mar 2026 18: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=1773081289; 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=H+KHBVkc/zUq7piuY3FEiQYceJ7gogEm+7vr/L29zmo=; b=RCBbl2rZAkK/1rYhfhCuNMuZDuzIdvrRvCnek+l4Wna8ErKc7A+AHVoe6Dt0gOUnIfLfyj mxNnCETAJs/PxDKZnMViRBmYwW2ws2rPW+TPJpzvxRm4U7rW2kToYJFoQnhHAC3VJUmEkU piS6fWFfJaj2nc8rmvHFDCCj+6VGtBu2EKcR9HFUIdLxiC2wt+R/Z6/vlnMaxQaJsJifcc fFUJte57fB09kg4nWgKOXpLZzN18kAqcHxbQhi6WingXCnczIL1El9OKtjO4aEic7dTKg6 T8ZghbzdtEh0dQllTcoTpANXVIR52D6zVcyjkenSM7Un9W6ptBBHWslhUAK76Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773081289; a=rsa-sha256; cv=none; b=qgQ5B29Qd03Ezcej8aNSR0k8DyVFQ05QNTg9U2QDYjWSGTNwrQZwYV6B+QFfvUeLcIpUxa nzU32wfF5tdviz4adD44MT00jP2eWqVQ9DvPnnE836pVPdnKv4KoNQY2pzJgUjuHuOBZj1 Jgp0HbZH2HEtZB0z9RMsh22mUHlfQfDZ+QEHcu42f3ful65SWaVkfZ6RMjHR/7lZY2U9PF RBwgmCeuqoQLG9oyr9zYcqnMYQJKlOhrQzkwCji4rxeExbZcoGM4PgpsbavrRdjUm6S51Q BHZgDVP5/YgBxCc/nl4J1oIXM5Ab0SvglB5Kqft9CXnOQm64LS117dQqLSIpNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773081289; 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=H+KHBVkc/zUq7piuY3FEiQYceJ7gogEm+7vr/L29zmo=; b=bwTsxIz7nzXkjWAvs4ql59dgea3J5CTjfSxXq1WAcMjWGjUGT3nrYNtR+/nfGLp2lItfVQ UYDiM1P1186SvXm5v9z6z7k2ShFm7XtQwS81L91veBtu7UrIgSyTGYbb5wowoxVU+epygD fTAYP3cCUc8DA9LZyc8r/XgNOVodOyEfEhtJyIKlJxSkM2dW9dyc9L4I405Xb45fydWh0n /32YxisC5qovwocz4CKT6cWjRazhXIJWxAXfth8wIbZXSrlnMXHS7BWxMsRXc2JyNrqPuo +WMhYebj8Nt6XmOCfN7mQEmGmJ1UoxDKDDebF2huFNUmClzv/eeCMsAPtV3d8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV5K46v0vzf30 for ; Mon, 09 Mar 2026 18:34:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fb37 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 18:34:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christos Longros From: Ed Maste Subject: git: 6ccfa67ac422 - main - Fix typos in manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ccfa67ac422a307c3e9624fb080d9616b0c6b05 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 18:34:43 +0000 Message-Id: <69af12c3.1fb37.3fd5aa85@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6ccfa67ac422a307c3e9624fb080d9616b0c6b05 commit 6ccfa67ac422a307c3e9624fb080d9616b0c6b05 Author: Christos Longros AuthorDate: 2026-03-09 18:33:32 +0000 Commit: Ed Maste CommitDate: 2026-03-09 18:34:27 +0000 Fix typos in manual pages bpf.4: accomodate -> accommodate hier.7: compatability -> compatibility namei.9: succesfull -> successful Signed-off-by: Christos Longros Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D55746 --- share/man/man4/bpf.4 | 2 +- share/man/man7/hier.7 | 2 +- share/man/man9/namei.9 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4 index dcf321c40782..107d531cb466 100644 --- a/share/man/man4/bpf.4 +++ b/share/man/man4/bpf.4 @@ -293,7 +293,7 @@ The can be used to limit the output to first .Va count entries, otherwise shall be 0. -On return, if the buffer length was enough to accomodate all desired entries, +On return, if the buffer length was enough to accommodate all desired entries, then the supplied buffer is filled with NUL-terminated names of available tapping points and .Vt bi_count diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index c438511678d4..6abce682b627 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -511,7 +511,7 @@ local library headers .It Pa lib/ local libraries .It Pa lib32/ -local 32-bit compatability libraries +local 32-bit compatibility libraries .It Pa libdata/ local utility data files .It Pa libexec/ diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9 index a42043587432..d920f4e934aa 100644 --- a/share/man/man9/namei.9 +++ b/share/man/man9/namei.9 @@ -443,7 +443,7 @@ The .Vt struct namei member .Dv ni_resflags -returns the following flags giving some details of the succesfull operation: +returns the following flags giving some details of the successful operation: .Bl -tag -width NIRES_EMPTYPATH .It Dv NIRES_ABS The path passed was absolute. From nobody Mon Mar 9 19:05:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV6154Rhrz6TlWb for ; Mon, 09 Mar 2026 19:06: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV6153b5Yz3pPq for ; Mon, 09 Mar 2026 19:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773083161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gx4tWZeKtVZygXhoN8cJQ1ogN5wWq7JXOPDeXjL2BwM=; b=nZ27Au4l9OBITLUjwHuVLWoPjh83skU0N34T+vljP+CYnL7oYkHuF4hZTcrzjpcY0wbGPx o6rKrWftDOVoZrlwgUWW483Y+cyydLRxhCwUhQD2fcgbArPPpoHymiyIhWBXih4f/KUo4J pim6OGH3bEsSsaFxFeLOkA+8XGaYzpXs6BxlCGe/giYNj7F0XlrngJjrqE7Zkth/BibK/Z Beyzk77CrROQPFkdXQETjuyGJb4PAf3DZmZBRm/kHGPJEV6ujh6Mc0IFmB3zwv3AVQ6t+G YN5B6em9sB26HKlIUsNoMXb5aXyrYwRL/8YXGQ2EettsfRPSSfpwTXGZfpjp3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773083161; a=rsa-sha256; cv=none; b=aOcjauVoBEWxN+8ts7xcmUEZ1audvr3U5QVqiyYG6nyVOdWdrVJQ3UyGVsnjAYYU0DOoxC CeBFgcHbtNWdz5vNu2UHKvrrzArd+yGroqtIeEiPromH+XiDqf9EkD8EgAptsyi+2Mx+3k /nBtvFT+uVOXzT8mC69zL0Eq8eEzhElF6Kk6VinJZ2hX5wtjLqpyU2iw1AI506dNxDlVwi WQFWP62oE//bkxVByEdJT1R3UONTVLM1/f4XN71y6UFL+H/zY1nGm2hxuyDPgSZ55EDAbI +MFGRfsySODGa6gyJ9QcmehGP9SC0UoLWMyIyp9GTzZdJpYObCgXdgevG1YWUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773083161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gx4tWZeKtVZygXhoN8cJQ1ogN5wWq7JXOPDeXjL2BwM=; b=NWxzc62m7A+zMpEA3doPIH9LCRhkMDO+lm2dZK7IEMWss4VmXRu1OuXg/Px5y+k1aRrgzC Ysz05cZpChZnkgkXOIj+M9jVAnoOJa6pQlZyYe9SWq7wTrO2iE0auH8/ISfkRa956yQ2HX ozitS6OCKHQ3U8NrBytfN6ZVuTPRr1KGRGGMrQvquy18TfM+OqruqGiLM//pO5kNS1Hjxk aN+WabHyY2pJLVlbKDSDmSVRhx8/9tQt/GsCIEgyoQPTGY4swx8gUq7K3nUxuGeiyW1RbD k8u61/NfsvhkM7KxoyC0gQMMItMiekYy6V4Ztrxm5f46vR5QY7F2DC7blmmdEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV6152zk1zfrt for ; Mon, 09 Mar 2026 19:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 19:05:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: f37fbe30f559 - main - ndp: implement delayed anycast and proxy NA List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f37fbe30f559acfb269f67d3efe59569878a3ee1 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 19:05:56 +0000 Message-Id: <69af1a14.235dd.3027cfe1@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=f37fbe30f559acfb269f67d3efe59569878a3ee1 commit f37fbe30f559acfb269f67d3efe59569878a3ee1 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-09 17:00:15 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-09 19:00:49 +0000 ndp: implement delayed anycast and proxy NA Reviewed by: bms Differential Revision: https://reviews.freebsd.org/D55141 --- sys/netinet6/nd6.h | 3 ++ sys/netinet6/nd6_nbr.c | 78 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 57 insertions(+), 24 deletions(-) diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index eca9f6262568..d9fccce33980 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -155,11 +155,13 @@ struct in6_ndifreq { /* ND6 queue flags */ #define ND6_QUEUE_FLAG_NEWGUA 0x01 /* new global unicast address event */ #define ND6_QUEUE_FLAG_LLADDR 0x02 /* link-layer address change event */ +#define ND6_QUEUE_FLAG_ANYCAST 0x04 /* delay NA for anycast or proxy address */ /* protocol constants */ #define MAX_RTR_SOLICITATION_DELAY 1 /* 1sec */ #define RTR_SOLICITATION_INTERVAL 4 /* 4sec */ #define MAX_RTR_SOLICITATIONS 3 +#define MAX_ANYCAST_DELAY_TIME 1 /* 1sec */ #define ND6_INFINITE_LIFETIME 0xffffffff @@ -373,6 +375,7 @@ void nd6_dad_start(struct ifaddr *, int); void nd6_dad_stop(struct ifaddr *); void nd6_grand_start(struct ifaddr *, uint32_t); void nd6_queue_stop(struct ifaddr *); +void nd6_delayed_na_start(struct ifaddr *, struct in6_addr *, u_int, uint32_t); /* nd6_rtr.c */ void nd6_rs_input(struct mbuf *, int, int); diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 6a1f29c31eed..0a34e0e3628e 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -124,6 +124,7 @@ SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861, struct nd_queue { TAILQ_ENTRY(nd_queue) ndq_list; struct ifaddr *ndq_ifa; + struct in6_addr ndq_daddr; uint32_t ndq_flags; struct callout ndq_callout; }; @@ -355,8 +356,17 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len) rflag |= ND_NA_FLAG_SOLICITED; } - nd6_na_output_fib(ifp, &saddr6, &taddr6, rflag, tlladdr, - proxy ? (struct sockaddr *)&proxydl : NULL, M_GETFIB(m)); + /* + * RFC 4861, anycast or proxy NA sent in response to a NS SHOULD + * be delayed by a random time between 0 and MAX_ANYCAST_DELAY_TIME + * to reduce the probability of network congestion. + */ + if (anycast == 0 && proxy == 0) + nd6_na_output_fib(ifp, &saddr6, &taddr6, rflag, tlladdr, + proxy ? (struct sockaddr *)&proxydl : NULL, M_GETFIB(m)); + else + nd6_delayed_na_start(ifa, &saddr6, arc4random() % + (MAX_ANYCAST_DELAY_TIME * hz), ND6_QUEUE_FLAG_ANYCAST); freeit: if (ifa != NULL) ifa_free(ifa); @@ -648,10 +658,6 @@ nd6_ns_output(struct ifnet *ifp, const struct in6_addr *saddr6, * * Based on RFC 2461 * Based on RFC 2462 (duplicate address detection) - * - * the following items are not implemented yet: - * - proxy advertisement delay rule (RFC2461 7.2.8, last paragraph, SHOULD) - * - anycast advertisement delay rule (RFC2461 7.2.7, SHOULD) */ void nd6_na_input(struct mbuf *m, int off, int icmp6len) @@ -966,10 +972,6 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len) * * Based on RFC 2461 * - * the following items are not implemented yet: - * - proxy advertisement delay rule (RFC2461 7.2.8, last paragraph, SHOULD) - * - anycast advertisement delay rule (RFC2461 7.2.7, SHOULD) - * * tlladdr: * - 0x01 if include target link-layer address * - 0x02 if target address is CARP MASTER @@ -1669,7 +1671,6 @@ nd6_queue_timer(void *arg) struct ifaddr *ifa = ndq->ndq_ifa; struct ifnet *ifp = ifa->ifa_ifp; struct in6_ifextra *ext = ifp->if_inet6; - struct in6_addr taddr6 = IN6ADDR_ANY_INIT; struct epoch_tracker et; int delay, tlladdr; u_long flags; @@ -1685,12 +1686,10 @@ nd6_queue_timer(void *arg) flags &= ~ND_NA_FLAG_ROUTER; /* - * RFC 9131 Section 6.1.2: if new global address added, - * use the all-routers multicast address. - * If the address is preferred, then the Override flag SHOULD NOT be set. + * RFC 9131 Section 6.1.2: If the address is preferred, + * then the Override flag SHOULD NOT be set. */ if ((ndq->ndq_flags & ND6_QUEUE_FLAG_NEWGUA) != 0) { - taddr6 = in6addr_linklocal_allrouters; /* * XXX: If the address is in the Optimistic state, * then the Override flag MUST NOT be set. @@ -1700,29 +1699,31 @@ nd6_queue_timer(void *arg) flags |= ND_NA_FLAG_OVERRIDE; } /* - * RFC 4891 Section 7.2.6: if link-layer address changed, - * use the all-nodes multicast address. + * RFC 4861 Section 7.2.6: if link-layer address changed, * The Override flag MAY be set to either zero or one. */ - if ((ndq->ndq_flags & ND6_QUEUE_FLAG_LLADDR) != 0) { - taddr6 = in6addr_linklocal_allnodes; + if ((ndq->ndq_flags & ND6_QUEUE_FLAG_LLADDR) != 0) flags |= ND_NA_FLAG_OVERRIDE; - } + /* anycast advertisement delay rule (RFC 4861 7.2.7, SHOULD) */ + if ((ndq->ndq_flags & ND6_QUEUE_FLAG_ANYCAST) != 0) + flags |= ND_NA_FLAG_SOLICITED; /* Wait at least a RetransTimer before removing from queue */ delay = ext->nd_retrans * hz / 1000; callout_reset(&ndq->ndq_callout, delay, nd6_queue_rel, ndq); IF_ADDR_WUNLOCK(ifp); - if (__predict_true(in6_setscope(&taddr6, ifp, NULL) == 0)) - nd6_na_output_fib(ifp, &taddr6, IFA_IN6(ifa), flags, tlladdr, NULL, ifp->if_fib); + if (__predict_true(in6_setscope(&ndq->ndq_daddr, ifp, NULL) == 0)) + nd6_na_output_fib(ifp, &ndq->ndq_daddr, IFA_IN6(ifa), flags, tlladdr, + NULL, ifp->if_fib); NET_EPOCH_EXIT(et); CURVNET_RESTORE(); } static void -nd6_queue_add(struct ifaddr *ifa, int delay, uint32_t flags) +nd6_queue_add(struct ifaddr *ifa, struct in6_addr *daddr, + int delay, uint32_t flags) { struct nd_queue *ndq; struct ifnet *ifp = ifa->ifa_ifp; @@ -1749,6 +1750,7 @@ nd6_queue_add(struct ifaddr *ifa, int delay, uint32_t flags) ndq->ndq_ifa = ifa; ifa_ref(ndq->ndq_ifa); + memcpy(&ndq->ndq_daddr, daddr, sizeof(struct in6_addr)); ndq->ndq_flags = flags; TAILQ_INSERT_TAIL(&ext->nd_queue, ndq, ndq_list); @@ -1765,6 +1767,7 @@ nd6_grand_start(struct ifaddr *ifa, uint32_t flags) { struct nd_queue *ndq; struct in6_ifextra *ext = ifa->ifa_ifp->if_inet6; + struct in6_addr daddr = IN6ADDR_ANY_INIT; int delay, count = 0; NET_EPOCH_ASSERT(); @@ -1794,8 +1797,22 @@ nd6_grand_start(struct ifaddr *ifa, uint32_t flags) return; } + /* + * RFC 9131 Section 6.1.2: if new global address added, + * use the all-routers multicast address. + */ + if ((flags & ND6_QUEUE_FLAG_NEWGUA) != 0) + daddr = in6addr_linklocal_allrouters; + + /* + * RFC 4861 Section 7.2.6: if link-layer address changed, + * use the all-nodes multicast address. + */ + if ((flags & ND6_QUEUE_FLAG_LLADDR) != 0) + daddr = in6addr_linklocal_allnodes; + delay = ext->nd_retrans * hz / 1000; - nd6_queue_add(ifa, count * delay, flags); + nd6_queue_add(ifa, &daddr, count * delay, flags); } /* @@ -1817,3 +1834,16 @@ nd6_queue_stop(struct ifaddr *ifa) } IF_ADDR_WUNLOCK(ifa->ifa_ifp); } + +/* + * Send delayed NA for specified address. + * Called by nd6_ns_input for anycast or proxy NA + */ +void +nd6_delayed_na_start(struct ifaddr *ifa, struct in6_addr *daddr, + u_int delay, uint32_t flags) +{ + + NET_EPOCH_ASSERT(); + nd6_queue_add(ifa, daddr, delay, flags); +} From nobody Mon Mar 9 19:40:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV6nC5Lbnz6TpcF for ; Mon, 09 Mar 2026 19:40: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV6nC3q55z40k3 for ; Mon, 09 Mar 2026 19:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773085247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WDw70knxISdJ6l3K4HeKosOW3gmULFLg3wY/gIcrokw=; b=Chb8EtqYYnCKNUg4k0ECOgqoxe5k3/O4NdCAg/s8LihqDHhyHn6d6+7xQQvVRXazYceqLx 6WOf072I1T1W5F+iQO1qphudiOVL3FOhHSTViCqZGR2yZdxssZUwm64CD/3v3DQnbCNeam tI1qBeUVSgTjVpCJdPYGNdQXCB7+T7okxlhdlKvByQf+f/CcAZ0aEaW6q+02GqsyY6kiwX ngxSp8UZKswSTrOaZ7XxyPs6qoPts9JN0y696KhJxxFZwAyEjxLHGe9inWpWfB/jjbA311 hF0lL+U0qcUYVKkbXBCPWn/7bofWZnaWyXLn1ZQ70eN4luU+g/Ro6rRp2BiLzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773085247; a=rsa-sha256; cv=none; b=OZv3BTMoqlPS3Jujq1MPd/0wZOlq7zhER04H2Yd3kQPqLQpBIMdFx2aWIZJcudmEaByM/d jauKDjcr83e+ZfxCykbx10AH5rgVlLc5/Wj/lM+RJ62QP45EaTg4AEYNbqYD/NyWV9Z9sH XCDotM8l+tsDC23R8TDHBxhrpxj9x1LmaAnxyLmey/2Nn1+GBUXtfte2T/4PmI/eoVkBa7 uZcCVfoeCsVFZDz/qQj8DVhkunIV8li46jFwXJPHvYeIm5a9DtozGK6WE8/koEPBjJRYIj QZsb4LgCGDzesFePwzmClyuqT5Qnjb41CvBGJWo65aQO21SFDHS3FxwZ1+Pw3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773085247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WDw70knxISdJ6l3K4HeKosOW3gmULFLg3wY/gIcrokw=; b=PAjxE84L1MPsFEyiGHnXjqn6jfOKCq3svuXjuNV1ilxNl2eLPqapYZFV3o8o1UKYeukFyE iljgYvwfdZmrc/OyBvjiZTUn58e7JvZAMz+fW5qJvQuP8NEgSQyRRpQzEvyecJOwZOoaxj BUAjXvf+AAAyc8mwjSWo7vHVsFYIfHTdL4OZ5fx1ICcjKkbY/SDkgJcymAWbhHSx0CCyO1 qTYxzc+FigtzWgocZOeGf4nIzjWZostokk1HPBHDq0o4q5jAlVYEYUAeq7BepVjtwN1nhb AJu7548XHF4O3eVHLeIM+lesnpVb9WFbCSN2ql5/2wVcaj7uOcnoDxiYO2LSEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV6nC39MjzgMw for ; Mon, 09 Mar 2026 19:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25cfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 19:40:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 72f0bc868bf0 - main - share/dict/web2: Sort List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72f0bc868bf00586cba1e50057d8f1998b4abe80 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 19:40:42 +0000 Message-Id: <69af223a.25cfb.2e75232d@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=72f0bc868bf00586cba1e50057d8f1998b4abe80 commit 72f0bc868bf00586cba1e50057d8f1998b4abe80 Author: Ed Maste AuthorDate: 2026-03-09 19:35:53 +0000 Commit: Ed Maste CommitDate: 2026-03-09 19:40:31 +0000 share/dict/web2: Sort PR: 293659 Fixes: e49b6ead4114 ("Add a number of five letter words to the dictionary") --- share/dict/web2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/dict/web2 b/share/dict/web2 index bcb6b779d634..5e7369d565b6 100644 --- a/share/dict/web2 +++ b/share/dict/web2 @@ -31891,7 +31891,6 @@ caul cauld cauldrife cauldrifeness -caulk Caulerpa Caulerpaceae caulerpaceous @@ -31914,6 +31913,7 @@ cauline caulis Caulite caulivorous +caulk caulocarpic caulocarpous caulome @@ -78895,7 +78895,6 @@ Gonzalo goo goober good -gooey Goodenia Goodeniaceae goodeniaceous @@ -78926,6 +78925,7 @@ goodyish goodyism goodyness goodyship +gooey goof goofer goofily From nobody Mon Mar 9 20:41:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV8782cBnz6TvCM for ; Mon, 09 Mar 2026 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV8781fw2z3FBD for ; Mon, 09 Mar 2026 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773088884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTX6Krqe1+ZRfeewM4r3dmvKNQGsNuhMMp6+2R2zv2w=; b=PXiI7rLLt+kwJVnA/7V3bHRP9tRu6F2EX63bfEJ8mnk1Y9FnusY3D4E4RfxXoX8wxYj8Ly 8Gt+b8MaLuhsTEKhGD29c6jD+LP9jiavLISgK/tswBjvd3ZYbrNe6xFAfNZf6l1yTaFblN Sron9au4EBHAj0FmxqwyDbNouxApIiLH5g74Mw5ORdpdGEn5k6x6sMKQAM7vQjjoF6wauI yEFF1hBwoLO2tQMwr3Wne8UGN+7rWLwXZ6l5kHzJIEZT1fIe7eJiR33cdnDE0ZDr0XgKgQ dVdoTn6+ER5SQW5ysILA7nIR7kuYKA2+IQ8eTyLhzPtHg/9Hy1teIf1GsETUlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773088884; a=rsa-sha256; cv=none; b=E7hXE0lGYnCscRfeplLIc3Bf5P41QRzqok/qAlx3/ajuMJc8gf5n7gt00yK8SH72WV0w2C 2B2wLJgsLBlCXpKKhw2U+YH5ZaiA3VrSAfgbPFktfhyyIErh699A/Vp8CRIB1Ek/Fm4dMw fM5i6fCTLhT//N/MWprN2gWAranz3L1qtDFVpMmftVVFaZJy9h2X2Jcj8vB95qvvr6vcHh f7TitN30sIn/rb0yXX4TZ0xjlNBdtAqEbaG55dW306vfMx+FyRgA+TDX/2Llk0PtdFZ0xk QcHy5m1zMX8Dgr1PfHU3gAk/rnXlvZSxT572aJxeDf3culVatzJBD6kz6fW94A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773088884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTX6Krqe1+ZRfeewM4r3dmvKNQGsNuhMMp6+2R2zv2w=; b=uYvpoRJRA9rY38RO1W0hLQ39lV+hwYGwFMurv1FRc3uuOtkt3qz59W7v3PHz5AfSeztVYl qxxG9kXPAk+Qotmr7L93opSahvq2X2uI1Vm+wMVA7/7xItvaFYCG6ClkLZ2AcD3MGa+Ig2 VL4ze5d2gY1QSATF8EcVfIwfRT5ylNNamKT5D5RzgLNnP+YP5vSq4/qp9hJAn0un9ry81H BLC5NrKpNqmPyq/0rEEsij8tMPoLz3BxsAKqWvt3frYwHp4neihGVwkFoyE2o2vEXsK0Vu lKvCR9V0Yab5ER+NBoQ3wtvPYnKXRREK/9mnyfHnlGs+Bg1Woxlu+VTDZj3zQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV8781C9Jzhvv for ; Mon, 09 Mar 2026 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 361d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 20:41:24 +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: 48368f702423 - main - system(3): Address test robustness issue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48368f702423742b2a7dff7ad3191625e8bf26f0 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 20:41:24 +0000 Message-Id: <69af3074.361d5.acc2bce@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=48368f702423742b2a7dff7ad3191625e8bf26f0 commit 48368f702423742b2a7dff7ad3191625e8bf26f0 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-09 20:41:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-09 20:41:04 +0000 system(3): Address test robustness issue Don't assume that SIGINT and SIGQUIT are set to SIG_DFL at the start of the test. Instead, retrieve their current dispositions and verify that they are restored at the end of the test. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55709 --- lib/libc/tests/stdlib/system_test.c | 38 ++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/lib/libc/tests/stdlib/system_test.c b/lib/libc/tests/stdlib/system_test.c index b6a31583d52d..cb6ecdb28065 100644 --- a/lib/libc/tests/stdlib/system_test.c +++ b/lib/libc/tests/stdlib/system_test.c @@ -92,6 +92,12 @@ system_thread(void *arg) return ((void *)(intptr_t)system(cmd)); } +static inline int +sigcmpset(const sigset_t *a, const sigset_t *b) +{ + return (memcmp(a, b, sizeof(sigset_t))); +} + ATF_TC(system_concurrent); ATF_TC_HEAD(system_concurrent, tc) { @@ -99,7 +105,8 @@ ATF_TC_HEAD(system_concurrent, tc) } ATF_TC_BODY(system_concurrent, tc) { -#define N 3 + enum { N = 3 }; + struct sigaction sigint, sigquit, sigact; sigset_t normset, sigset; pthread_t thr[N]; char fn[8]; @@ -119,8 +126,10 @@ ATF_TC_BODY(system_concurrent, tc) ATF_REQUIRE_EQ(0, symlink(fn, fn)); } - /* Get the current and expected signal mask */ - sigprocmask(0, NULL, &normset); + /* Save the current signal dispositions */ + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigint)); + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigquit)); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &normset)); /* Spawn threads which block on these files */ for (int i = 0; i < N; i++) { @@ -140,10 +149,12 @@ ATF_TC_BODY(system_concurrent, tc) /* Release the locks */ for (int i = 0; i < N; i++) { /* Check the signal dispositions */ - ATF_CHECK_EQ(SIG_IGN, signal(SIGINT, SIG_IGN)); - ATF_CHECK_EQ(SIG_IGN, signal(SIGQUIT, SIG_IGN)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); #ifndef PROCMASK_IS_THREADMASK - sigprocmask(0, NULL, &sigset); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); ATF_CHECK(sigismember(&sigset, SIGCHLD)); #endif @@ -156,11 +167,16 @@ ATF_TC_BODY(system_concurrent, tc) } /* Check the signal dispositions */ - ATF_CHECK_EQ(SIG_DFL, signal(SIGINT, SIG_DFL)); - ATF_CHECK_EQ(SIG_DFL, signal(SIGQUIT, SIG_DFL)); - sigprocmask(0, NULL, &sigset); - ATF_CHECK_EQ(0, memcmp(&sigset, &normset, sizeof(sigset_t))); -#undef N + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(sigquit.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigquit.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigquit.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); + ATF_CHECK_EQ(sigint.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigint.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigint.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); + ATF_CHECK_EQ(0, sigcmpset(&sigset, &normset)); } ATF_TP_ADD_TCS(tp) From nobody Mon Mar 9 21:04:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV8fL4BCQz6Tx0J for ; Mon, 09 Mar 2026 21:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV8fL2T6Zz3MFN for ; Mon, 09 Mar 2026 21:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773090298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYSSR9bqVIBDN6w+cA7YcB1hBNFSs5ZXdUN8yszSB5g=; b=OCcNq3TaMrXvjD3wOOIfZQyb/HYa6suRNhvVFpCU7H/T1lHaMrajKOIT1aEVV3XLrklI6P RP0uPead3qOiJQSRah6SHe+e3HKRqao9M0jKsw+PzmLwQLxqpi9gSpDGUAaWtnxLyHZgAs YquAkDYQYaCuPRwAGaLn1I5oy3KMq2l078R6e+cCSKnMBcmRADV1edxlzbYyuW4GDaMf4l VApAjX9D0mpkb58TUl/dg1UGIQfdL6JEKFUbgK4OnDkwtkbfLEoyPXvY0d3njz4PogpERW i/c1q8jT96LOC1MxBgvf9z0cuAztu1wx1D3I+SHQMx9z4BMvwptRMyjvMycC6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773090298; a=rsa-sha256; cv=none; b=V5n0mEEQ5T5ra6G8YBxT0GXW7isQAJY7eYwOlBmwGjjHxZwdp/pfBwXaN4ABbKNcA3WC2w T9ByFSc4g44c4cTaMcN+gzYmBbo13yUXFWkFxYAc/ZR+5W6+H1PyQ1JgufYV8yLNrhvM7h WmMSk6wF57/0hrIkLS08z2HASg2jHTP8YVZO5Ri0ClOgEvPnIVT+AziYgAdHEiq0yQmzYH 9qPBlQH4dl3L85EdOG3F8g5L/CNgK1AosjMT4JRCqMw3Lp1N/2rOYUispdlSTXuE23LoK/ oudfZShEQclrC7E5xk5J5nMr/N13/3CbVkepqrJ61T1rxTs+86q1+Uol5hlYKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773090298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYSSR9bqVIBDN6w+cA7YcB1hBNFSs5ZXdUN8yszSB5g=; b=T8EkxE2Ywo5ynyb9pEDrIa9ca5RcSkI7S8qA6gnU8PBVv8JEMqClyKb4vg5bht32N1TxrZ ItGfMAoELLPe1bCp4Ux3edJiPwDDj0yO+Vs3lCmC5+7vRWSf45nF3qpCEJNWzfjxBSXYf1 zZcYGeRhI/R3p2ja7Yc+KeJoOyCNr7evWuKe3DAIsCREdFb+rwKbofoq7SewAWtSoh1fgm fOZnOJRTnl1TqK/t0+0BFgPKV5QzsOGYcCnYkkOPGSHdA155iRWae8nKPnw0JMDPs3epZk DpWCUbiOMxRzk3QuhIrQcMXB8JbIL9/O7Py1lenHrOGkCIC5BG7UrXqlP2/sXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV8fL1D1vzjdl for ; Mon, 09 Mar 2026 21:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 374ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 21:04: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: 863b5c137a98 - main - system(3): Fix brain glitch in previous commit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 863b5c137a98d29dc6964cba0e0c4fe2a8bebab8 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 21:04:52 +0000 Message-Id: <69af35f4.374ca.7489b814@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=863b5c137a98d29dc6964cba0e0c4fe2a8bebab8 commit 863b5c137a98d29dc6964cba0e0c4fe2a8bebab8 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-09 21:00:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-09 21:01:41 +0000 system(3): Fix brain glitch in previous commit We were saving SIGINT twice instead of SIGINT and SIGQUIT. Also restore original order of operations (SIGINT then SIGQUIT), which matches the order in which they're discussed in the POSIX description of system(3). MFC after: 1 week Sponsored by: Klara, Inc. Fixes: 48368f702423 ("system(3): Address test robustness issue") --- lib/libc/tests/stdlib/system_test.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libc/tests/stdlib/system_test.c b/lib/libc/tests/stdlib/system_test.c index cb6ecdb28065..9e556f257791 100644 --- a/lib/libc/tests/stdlib/system_test.c +++ b/lib/libc/tests/stdlib/system_test.c @@ -128,7 +128,7 @@ ATF_TC_BODY(system_concurrent, tc) /* Save the current signal dispositions */ ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigint)); - ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigquit)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigquit)); ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &normset)); /* Spawn threads which block on these files */ @@ -149,10 +149,10 @@ ATF_TC_BODY(system_concurrent, tc) /* Release the locks */ for (int i = 0; i < N; i++) { /* Check the signal dispositions */ - ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); - ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); #ifndef PROCMASK_IS_THREADMASK ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); ATF_CHECK(sigismember(&sigset, SIGCHLD)); @@ -167,14 +167,14 @@ ATF_TC_BODY(system_concurrent, tc) } /* Check the signal dispositions */ - ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); - ATF_CHECK_EQ(sigquit.sa_handler, sigact.sa_handler); - ATF_CHECK_EQ(sigquit.sa_flags, sigact.sa_flags); - ATF_CHECK_EQ(0, sigcmpset(&sigquit.sa_mask, &sigact.sa_mask)); ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); ATF_CHECK_EQ(sigint.sa_handler, sigact.sa_handler); ATF_CHECK_EQ(sigint.sa_flags, sigact.sa_flags); ATF_CHECK_EQ(0, sigcmpset(&sigint.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(sigquit.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigquit.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigquit.sa_mask, &sigact.sa_mask)); ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); ATF_CHECK_EQ(0, sigcmpset(&sigset, &normset)); } From nobody Mon Mar 9 21:39:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV9QZ327jz6V093 for ; Mon, 09 Mar 2026 21:39: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV9QZ2TTZz3PWm for ; Mon, 09 Mar 2026 21:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773092390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtR9skqJgEIDj2Bn4hJYBqAEuf7le4TGQlw/IWzzWpg=; b=mISOykFu9O9G17O8xqmRnsQlajlq8UwXj8iCARudFjSpKBChJT3pCMwSSnyAfYckt+bXMG C6xyj0VQ0+DWE9J+EHN+KahdpllgxOQaXCPkgEZ71ly4dtb+GH1IzQV2FlI43WJKnXqzys LtB1cJdyxnmhh86ArSYtfIPjnxZkWlqJxURiZn8edrJdl4DvpSTR6KPMA1ypAihQqeMLFc 08kW02UEX80GYwY3X5GktyC+Z5VL0IADP/PwHp4Ih4u30BAhUrj3bQRrnhw5VdG3Apq98H hu7+htxwq9/IIybmG9h7F5lfWEm8zp5Wr/nO3VkmOBOoo94vFcKai1yxNdQ98Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773092390; a=rsa-sha256; cv=none; b=ttwqsQtEE2JkanIbbnNeWOaex2/iUXkz4JM6Ayle5tcAl43tAmCL2YVTNdixcSQNjWOk5+ XSlbkUg1HeXxSO7vHG/4aLmvzyNrnZxTc+qtMOYg0oVgkKMnOU/0R6GpnxtMRnQhy/wYsx 3WgxVlIIw65ZfXxS/lp84pxoo5pAjHsJXCCODKnxXa4cenO7DApWYeS7hMNFfVTaY/Rylp 9fwksDNi1FldkFVj7V9wUpeNJF1aoGgp1Cfbfg6Y3xHma1tpYjha28Pf9NAp1NZ9e7OPys 7XWiG6nWsPnB+T9nTXYBpCL0x8w9NLYIEN+71M9NNtcFPvk8CXqLH8a9gHvm1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773092390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtR9skqJgEIDj2Bn4hJYBqAEuf7le4TGQlw/IWzzWpg=; b=YQBF3J2CR73vZ6kP0K2RVYMCQXOPtTux3jeryhUhtFi/fnYmPeNP+EkdPSpypLowFCu4Fy 5bCDdjJioKqEpchK6sDtQxETwqzsZOiexg3129kSAJev01GQ272JF3VciWwKZQ5vRb7X4z L1rb7Knj9sSE0mKJMw4RYKcM1CZrRMrcRDrjBkfVkbhl7srI8b8Mb2n6Q0eyz0mbRSkGcA dLmB1bOSRmdCSfuop6nFT14bxAH5RHz6Hl+oJpgvoNRbDylPiPVz2ANxe9Ubv73kQIN0tx 2blvTq4tth+qorKdquyyV8AKxE1jTlCg4D5BSTV+CDaFa1ymtZCWy9oG6dCo6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV9QZ23VxzkjG for ; Mon, 09 Mar 2026 21:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b94e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 21:39:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: bc531a96c9b2 - main - stand: lua: break out a few more dirent types in lfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc531a96c9b28b1cabcd5deb0c9f8f6d815cfebc Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 21:39:45 +0000 Message-Id: <69af3e21.3b94e.30938090@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bc531a96c9b28b1cabcd5deb0c9f8f6d815cfebc commit bc531a96c9b28b1cabcd5deb0c9f8f6d815cfebc Author: Kyle Evans AuthorDate: 2026-03-09 21:38:57 +0000 Commit: Kyle Evans CommitDate: 2026-03-09 21:39:10 +0000 stand: lua: break out a few more dirent types in lfs These are non-standard and specific to the version used in loader. We have some desire to recognize symlinks to avoid filtering out kernel symlinks in the autodetection bits when they would be perfectly fine to `load`. This won't be usable right away, so any impending use will need to be careful to account for nil. Reported by: leres --- libexec/flua/lfs/lfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/flua/lfs/lfs.c b/libexec/flua/lfs/lfs.c index 517e16ae65c8..a3594d2b7d97 100644 --- a/libexec/flua/lfs/lfs.c +++ b/libexec/flua/lfs/lfs.c @@ -444,6 +444,10 @@ luaopen_lfs(lua_State *L) /* Non-standard extension for loader, used with lfs.dir(). */ lua_pushinteger(L, DT_DIR); lua_setfield(L, -2, "DT_DIR"); + lua_pushinteger(L, DT_REG); + lua_setfield(L, -2, "DT_REG"); + lua_pushinteger(L, DT_LNK); + lua_setfield(L, -2, "DT_LNK"); #endif return 1; } From nobody Mon Mar 9 21:47:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV9c134Vpz6V0tR for ; Mon, 09 Mar 2026 21:48: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV9c12SMcz3QKB for ; Mon, 09 Mar 2026 21:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773092881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=woKjSErnYp64uGYi5D9hamEGHg1ePmHe+1Wp1VJAZ7E=; b=unvtOYww13LkXp8cABEYrm5EyAye/r6xRGVD4n+El+cc3Uew2DdlIGWNGjTS/0NHn1O4Pj 5rrBh3GMopl2p0atrfm890AGeP5lP3avvlPVjV3xWY567f5Lr3qQrPqV9RdEV1n801HsXJ Sgevgtd5pc5Hb/uOiIwQOnGdsnFDhEhVYkakQpoRP5zdldWMGvtizG7DtpaDJSuqCYqQET FyGszHjKe9eyQrrz2du8KiQgveUgQpz8CLgPAhFnApyzl82C6mOZlNfwNo9cUfdbScvL9o WihHVeDjGsce+M6bupUd2jpPrUS+bRkfnM7OYwZuHFLLxqm9jiuawdEp8p76cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773092881; a=rsa-sha256; cv=none; b=jh8F6++pu1HzWGXdRTMMbGi9XHB9v3kg3GUxV3735DOdaq8nycKUdWdXhfRvKpNc2g+g9O w5MQYKSOaUnNDOcan3nxFTgcdv9vYZY2VvUvSEUOV1j9ClPIHI/RCYXc4RAP0rGLYGfe4p P1QSVA2jB8QBN7NuHT4NQ6KypHiYdIPyzSOh/0HvYLEkslhQEw42E6i3t5Dcm4OQO8V484 tUPVv9J/UXNYr/W7kXLEZA8Ve+lbfcdHkI6s8u/MBxEdQkJTWvYehEYhn+Icij1CspVfC+ /2qbyRMotrmy9kWaoe7DtEygH8l4XvfxyYkYPrnVvfif/YGA4KM+RPVe9AZ+1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773092881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=woKjSErnYp64uGYi5D9hamEGHg1ePmHe+1Wp1VJAZ7E=; b=yu7KPveuZhYq0wRbK/NZAmaQn/NQSDRBpipmi/ZfSf5jYDs0MNKuLe2muSWIFend0Vu1mG D+1kfILnzm0n6lAyXEJ7fVKigOK1kLwqNcTDJKs0oAHFvMxfR2hhh7v7aOYBQQZGy26wX7 kFVigj/82x/CsZs6FxPXAztMAwBa/rOThyQtkMjS9oM69BbdZbbwkUZfzyCCKoimGSCBMS 36jU2drOUX26rtaftnbsZgIAlSX2Cn7ZDVOleG7WzrVzeATBHfUOg9v8Ijq7+3bGINqDFx 30602qNv0f4K2JVTH+rxHACoyVGG94evTUi9qJPC0hZ9WBXtyZq7fnBeDW/OSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV9c11dtzzkFL for ; Mon, 09 Mar 2026 21:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 21:47:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Craig Leres Subject: git: e6d579be4255 - main - core.lua: follow symlinks when looking for bootable kernels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6d579be42550f366cc85188b15c6eb0cad27367 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 21:47:56 +0000 Message-Id: <69af400c.3be4b.1e02aa00@gitrepo.freebsd.org> The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=e6d579be42550f366cc85188b15c6eb0cad27367 commit e6d579be42550f366cc85188b15c6eb0cad27367 Author: Craig Leres AuthorDate: 2026-03-09 21:47:10 +0000 Commit: Craig Leres CommitDate: 2026-03-09 21:47:47 +0000 core.lua: follow symlinks when looking for bootable kernels PR: 293654 Reviewed by: kevans Approved by: kevans Differential Revision: https://reviews.freebsd.org/D55713 --- stand/lua/core.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index b1b321d10868..92cbd20b25a0 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -255,7 +255,7 @@ function core.kernelList() end if ftype then - if ftype ~= lfs.DT_DIR then + if ftype ~= lfs.DT_DIR and ftype ~= (lfs.DT_LNK or 10) then goto continue end elseif lfs.attributes(fname, "mode") ~= "directory" then From nobody Tue Mar 10 01:43:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVGqH30nmz6VKmv for ; Tue, 10 Mar 2026 01:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVGqH1zpWz43ZD for ; Tue, 10 Mar 2026 01:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773106987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=npVEWZcRBlk5tur+rP/w8f2tXaCBR81G4i27LkQrFvc=; b=t5jnaWoDJdHPV4IAQI/2/Jb12IoFL9pnnRTTSqSDH20io+FT6TZFqOh3FqAAeqR6qjSQ7J wHOqLeHjn41QvtPwRW9sAhmV/Xki3yIOKnwZdqbtIzWtujJAFMmwwLxm6I+DIEVt13D9P6 MAfKV01YEmWP5tjcFee743Axm9zJHiiSaADiH59FSvjIyyLsmCzmLv6ZRJaBnHlNAFr8Dv 7SkHoiMcgNahgv/NXGT0jSS8I0+FTUzrSc1fldATKxkxsxSKIbSIML2M9VIdInlyWLgZkh VTGMdsW9aj3FZUNkfN0DH76dE6FHtkzBDsuEFILOWVA9ewnvZmLCetkqS/gwgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773106987; a=rsa-sha256; cv=none; b=eH3FqY90MIClcsbxGOfOWNoJyea+mrqNRTiQrWVdO81hposFid924qte/u8mq1ArTuw1p1 eYhESnaR6uxEJLBSErDDZuVfrFV3c1bvxhQvUFMOYZUJRZ4ghHaCWLlOI8vznY8Fz1QmZW 0aXPoRBHcTalOhJ/6gjEsKShtyUef5oatL53EcFzbMu1Jvlzdn42mis17nr0/vEDRQdOAu QNXCIReKv9vxMu5yFDzZG3/uJEM6ZuwMdJXOK1MmpHOEsxg7QcuKUO+W+hu8xWRrYUGBP+ o12TxO99wb3xIvrNwY3ikjUty9lee6vlxHY/UgShNr33j02BD4K1vIvIh18pzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773106987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=npVEWZcRBlk5tur+rP/w8f2tXaCBR81G4i27LkQrFvc=; b=ENX9RpebX8DJ8KqFOd3Nv9H7fOH4QQBA9ipxMFQjZ6DKz1j1VojvXShXeanjxatHFc2yBd 5Ksj/fWAvjhnaYclFsy3yg1NdKngTeVCbuqWrwc4sOzEhhyiyvrImE7j8g5PG66v3hUkb7 y7YxJt/tRaXd6L7cCKQS7HAXoC0Cg7Ezflz55LoBHxTVAVCZerZO9FRv0yse7deOB2kYrV ip+/mgC27HtRCC/ROveZouwAd5gd3cT0S+YEAjQ3msSvF3+Q5OpzFgAI7VsRo6KJ7A1EHa j48KXLa5oaewG8ArPRV8Be8ezFiRQe0oghudnaIGZxrRZhZ6dM0kJGZzOGCQmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVGqH1NjfzrbD for ; Tue, 10 Mar 2026 01:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 01:43:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: d1180d47c965 - main - bsd-family-tree: add FreeBSD 14.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1180d47c9653335c75f6ec9e18eff19109f0119 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 01:43:07 +0000 Message-Id: <69af772b.228eb.660bae06@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=d1180d47c9653335c75f6ec9e18eff19109f0119 commit d1180d47c9653335c75f6ec9e18eff19109f0119 Author: Maxim Konovalov AuthorDate: 2026-03-10 01:42:40 +0000 Commit: Maxim Konovalov CommitDate: 2026-03-10 01:42:40 +0000 bsd-family-tree: add FreeBSD 14.4 --- share/misc/bsd-family-tree | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 36910c9ad94a..ee528f6ec0dd 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -480,11 +480,13 @@ FreeBSD 5.2 | | | | | | | | | DragonFly 6.4.2 | FreeBSD | | | | | 14.3 | | | | - | macOS | | | - | 26 | | | - | | | OpenBSD 7.8 | - *--FreeBSD | | | | - | 15.0 | | | | + | | macOS | | | + | `------. 26 | | | + | | | | OpenBSD 7.8 | + *--FreeBSD | | | | | + | 15.0 | | | | | + | FreeBSD | | | | + | 14.4 | | | | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -933,6 +935,7 @@ FreeBSD 14.3 2025-06-10 [FBD] macOS 26 2025-09-15 [APL] OpenBSD 7.8 2025-10-22 [OBD] FreeBSD 15.0 2025-12-02 [FBD] +FreeBSD 14.4 2026-03-10 [FBD] Bibliography ------------------------ From nobody Tue Mar 10 08:22:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVRhL30tfz6V8r4 for ; Tue, 10 Mar 2026 08:22: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVRhL2PD1z3hSq for ; Tue, 10 Mar 2026 08:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773130962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wc2cpVpNAvZLsnxfPDECVh3w0E+vdsD3aGdaLNJ87kc=; b=Aw+QI04qgjljFIBn60wceuHnrHpXvdPWr/a2hjqASaabQTu3dLifqABoeBJaW3mGHtCmZx inqukW51YXPu8bcmO7BG2l0iUmfRWUFVcEeQkpqlLbZl7IMcYRjNt/97yCHXGXcVoAbpyv F06j4leMfG44aRRJi1Z/O7MPN7O2Ym+ZeXvAV5utD+vm0938GlHuLWBJcnnz12cGoeqlkx dzc0l+Bp4tXGOdAwalJivtxcf25QBCA6L6EAArjx/YBih19uZXX9mh4pUhDRMcggk8+MUN y6QPQxmxVljfYMajGh8sUDqkqVD4eB+J86zAcfzkt9Hyk/1vLnX09wpwmRlKWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773130962; a=rsa-sha256; cv=none; b=CzGmaXrkpFci6OO8UhmzkM7si2+V1gPXM91wvbZctpCXzxhoYPUWqdoQw+/HSNQuqhiw55 o5xvLIMJ1JxpzY48kXO5zQJ3fn2ccLofCpD/ljdOj2d/wcBPhMYZbB4vYTFdqK1cKf3GEu XNJHCUzlWkvctZR4cjEepHGgZW04l99sR9Mo98clvOyugM+zXGoEsxc09rzGeZwW+b3ReQ bzBDSK3fvVmNy3UMQaVMvhS5XMd889KtUpdSNSbCBKSCyDFZXf5PDiJdPdFWCIJVACSsSG S8u9831mr8tNnZA2DQpkRQSgrUixYhO4fGGfofpb5WbVMSzJMY38K6M5efV1Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773130962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wc2cpVpNAvZLsnxfPDECVh3w0E+vdsD3aGdaLNJ87kc=; b=B/n/9PjfGfK/Vc38lhRb5fXs0MVsYE9Dc3A4ZhBX4eprKdNK/F7X8rzZg9Sn9Ax1Hn5e2K XYGFPw7ml0U1aQY9eCgzDBebbKKW12WjsrHgPK6tSk1s/fYijTTqkyHmbMM8lqSXWbZyek AII3e4UNIE3cnP6ApcrPWz6+G8jg1v3hzBSLD9XlY6EusWbvlVlp07irSf12r7ywg+Rjpx nLCMoc9LMz9YrrVEC0unSaHmEZVVRKvCj0vJgvtJhMsp0XlTBpW91nlglbZoE5Q48P7o4e PxKwTVaEx7IzlddPMtzSWN7CQOpqrtk8oXuE/xU9U1/9AGR1VBAiMSM+WAGCwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVRhL1kSdz14S6 for ; Tue, 10 Mar 2026 08:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38587 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 08:22:37 +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: df5b2cf2b31b - main - Complete removal of GNU diff List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df5b2cf2b31bf66e3b21c772b39f6cc6406dcb7b Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 08:22:37 +0000 Message-Id: <69afd4cd.38587.61f40234@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=df5b2cf2b31bf66e3b21c772b39f6cc6406dcb7b commit df5b2cf2b31bf66e3b21c772b39f6cc6406dcb7b Author: Dag-Erling Smørgrav AuthorDate: 2026-03-10 08:21:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-10 08:21:32 +0000 Complete removal of GNU diff Fixes: 9a44e42a2b8f ("Retire GNU diff3") Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D55423 --- usr.bin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index d536f26ab0da..6ca784ef6cb6 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -29,6 +29,7 @@ SUBDIR= apply \ ctlstat \ cut \ diff \ + diff3 \ dirname \ dtc \ du \ @@ -206,7 +207,6 @@ SUBDIR.${MK_GAMES}+= pom SUBDIR.${MK_GAMES}+= primes SUBDIR.${MK_GAMES}+= random SUBDIR+= gh-bc -SUBDIR+= diff3 SUBDIR.${MK_HESIOD}+= hesinfo SUBDIR.${MK_ICONV}+= iconv SUBDIR.${MK_ICONV}+= mkcsmapper From nobody Tue Mar 10 10:18:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVVGT1CRdz6VPBC for ; Tue, 10 Mar 2026 10:18: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVVGT0fc8z3vSX for ; Tue, 10 Mar 2026 10:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773137937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+sPKo20/r4fsNFw/lfzGX7vZQSn+QH+HelMisTQzFnc=; b=nv4AuIjIbJQsILMQadMfNMEC0Y/0tmjKVJ6fkHqwgbBiAkAlQ3YlmTFcbSkNX0do3YKVfE 92cvCdCmORFZFIzdMovF/lA2ouyxuIIjmLaAEW+JcPbKlsLOPn0MRmJ1Nzmo1YIv8L0B9K F8WuKIw2VOjj77+jrGpFozOncznK6waQHA24P9BbgfczHhYs0bKd0nOrxQrqkMot2nCvZ4 buYItA5uv6dg45ionjL6T/Jtnqu6M3gmo4oDTdtZesDVP8ghQlSPxo8Wx6Uc9L/RWZnh9+ LuX5LZK5F6vXkTeUQEYUJzG/LqvxWjVHZd9wwy05s8zWhyokYgLBHlCNUO7Odw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773137937; a=rsa-sha256; cv=none; b=WnqzFB8UEpYBAqfGd6jgEhcmaRCw+jw18LEMqARHjddeG5Tk/x24Ybc5w6GeTwryy69v0b LVTHAB9GRMwOLV6eqEThI31SDESWyKtNVGdhWdQCY8ql2SxmzGsetylIaA2Cs/9QAM7L+f Wgql5WUtx9hmn5+2CEb5aPCFDeYp5UKDGBzLgRgqAwPZbIDSW33DCrmE/1DY9hR1yiCjHH na0YXqMpU/2ozmUcg3bU8aiNMuThu3jmtnZVCDC18rf02VOto0L+MwqAT/UZ97kZ7viQCU iesD3I1WJ4i1Z/1HHewckme/GFAjLqutZxl+hn+8I8O0XCEnTKaLchpg0F0SvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773137937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+sPKo20/r4fsNFw/lfzGX7vZQSn+QH+HelMisTQzFnc=; b=am52cdYkB57bm+mHeeYyBnBDcNEafD3gG5F+Gt/TW2/A8yopL6/MkNr6S4uGNzb8rgWjMo quPp7ItmAKQxq60aPWZYNns6oFUWp+Npa7SK/Vt4lVqwjgWMB0E6QIiF+k4xYbS4H5VifZ UV1Fnppj2C/qO1Q6IlQ/yDWv1uaUUVEuy4nDlCPn5hr8JTLvAb+5vJKtj3VQYoJ4XLRPQ5 CxwtdXBoZ94+5VQbjBrXS1CPN+lwg1VwAFDgmgJ4nrZIZCLVlN1FQ3VHVAeOZg5rXhUC51 7xu2qwq7RR+3eDovinrcw+GbS987bfM3mjnLWqBsLSoFymk7Tu/aRUU2+8e7jQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVVGS72y7z16lK for ; Tue, 10 Mar 2026 10:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43817 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:18:51 +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: cf74b63d61b4 - main - yes: Completely overengineer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf74b63d61b49db848ecc20b87e7ee5f16671320 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:18:51 +0000 Message-Id: <69aff00b.43817.51bdaf7b@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cf74b63d61b49db848ecc20b87e7ee5f16671320 commit cf74b63d61b49db848ecc20b87e7ee5f16671320 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-10 10:18:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-10 10:18:08 +0000 yes: Completely overengineer If we're going to overengineer this, we may as well go all the way. * If multiple arguments are given, concatenate them into a space- separated list like GNU coreutils does. * When duplicating the expletive, do so exponentially. * Most importantly, don't modify the memory that argv points to. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, allanjude Differential Revision: https://reviews.freebsd.org/D55617 --- usr.bin/yes/yes.1 | 6 +++-- usr.bin/yes/yes.c | 75 +++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 57 insertions(+), 24 deletions(-) diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1 index 8ed8beab0d28..689031345dc3 100644 --- a/usr.bin/yes/yes.1 +++ b/usr.bin/yes/yes.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 4, 2014 +.Dd March 2, 2026 .Dt YES 1 .Os .Sh NAME @@ -33,7 +33,7 @@ .Nd be repetitively affirmative .Sh SYNOPSIS .Nm -.Op Ar expletive +.Op Ar expletive ... .Sh DESCRIPTION The .Nm @@ -42,6 +42,8 @@ utility outputs or, by default, .Dq y , forever. +If multiple arguments are given, they are concatenated into a single +space-separated string. .Sh SEE ALSO .Xr jot 1 , .Xr seq 1 diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c index d9e896b6ea27..53224603cf95 100644 --- a/usr.bin/yes/yes.c +++ b/usr.bin/yes/yes.c @@ -35,40 +35,71 @@ #include #include +/* + * Default expletive + */ +#define EXP "y\n" +#define EXPLEN strlen(EXP) + +/* + * Optimum and maximum buffer size. The optimum is just a little less + * than the default value of kern.ipc.pipe_mindirect; writing more than + * that is significantly slower, but we want to get as close as possible + * to minimize the number of system calls. The maximum is enough for a + * maximal command line plus a newline and terminating NUL. + */ +#define OPTBUF 8190 +#define MAXBUF (ARG_MAX + 2) + int main(int argc, char **argv) { - char buf[8192]; - char y[2] = { 'y', '\n' }; - char * exp = y; - size_t buflen = 0; - size_t explen = sizeof(y); - size_t more; - ssize_t ret; + static char buf[MAXBUF] = EXP; + char *end = buf + sizeof(buf), *exp, *pos = buf + EXPLEN; + size_t buflen, explen = EXPLEN; + ssize_t wlen = 0; if (caph_limit_stdio() < 0 || caph_enter() < 0) err(1, "capsicum"); - if (argc > 1) { - exp = argv[1]; - explen = strlen(exp) + 1; - exp[explen - 1] = '\n'; - } + argc -= 1; + argv += 1; - if (explen <= sizeof(buf)) { - while (buflen < sizeof(buf) - explen) { - memcpy(buf + buflen, exp, explen); - buflen += explen; + /* Assemble the expletive */ + if (argc > 0) { + /* Copy positional arguments into expletive buffer */ + for (pos = buf, end = buf + sizeof(buf); + argc > 0 && pos < end; argc--, argv++) { + /* Separate with spaces */ + if (pos > buf) + *pos++ = ' '; + exp = *argv; + while (*exp != '\0' && pos < end) + *pos++ = *exp++; } - exp = buf; - explen = buflen; + /* This should not be possible, but check anyway */ + if (pos > end - 2) + pos = end - 2; + *pos++ = '\n'; + explen = pos - buf; } - more = explen; - while ((ret = write(STDOUT_FILENO, exp + (explen - more), more)) > 0) - if ((more -= ret) == 0) - more = explen; + /* + * Double until we're past OPTBUF, then reduce buflen to exactly + * OPTBUF. It doesn't matter if that's not a multiple of explen; + * the modulo operation in the write loop will take care of that. + */ + for (buflen = explen; buflen < OPTBUF; pos += buflen, buflen += buflen) + memcpy(pos, buf, buflen); + if (explen < OPTBUF && buflen > OPTBUF) + buflen = OPTBUF; + /* Dump it to stdout */ + end = (pos = buf) + buflen; + do { + pos = buf + (pos - buf + wlen) % explen; + wlen = write(STDOUT_FILENO, pos, end - pos); + } while (wlen > 0); err(1, "stdout"); /*NOTREACHED*/ } From nobody Tue Mar 10 10:54:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3t21NLz6VRk9 for ; Tue, 10 Mar 2026 10:54: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVW3t0zVcz433d for ; Tue, 10 Mar 2026 10:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gshTLW+yged2rCXsvOXPlReSsS4GBMH6XayFJSBgMJM=; b=UD17rGQQ2WBjBYHLqZNh7iEgCZB+sBO4a89GmH48XMHLYLcyIJPBkncGf6yzklpnym5VW5 tUbQsdQRI7q1M5NyNRT896hL3092TfbOc9zQGalW2YSZgdnvCnYrVX5MZkHHL/Qg64C1Cm oKj1XTPC8GxDKyhXux3FLWqYTjlZkfFKq1SM87/R6d8gt0s7N0n64+WF3h81oyneS6l68n WgVlkkQCMMYhLYykPm8/kwTuhxfbpM+EaHvExUGzbf4jKAqO2N0Vnf0FW5mUNjPOLEC2qF /c8L16DdBpp+uHpuAydyoNjsXFyF0bg2AbZ1RkTJaME3F16ok5JdEV6QA2gDIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773140090; a=rsa-sha256; cv=none; b=ceDlzYv1yz3iEeE9aQEQyhRbU4UBHixtHgWkeen4Crhlq7lGgrs8Xf8rO2UkJvyVfY6PY5 NU+C9ssBNKf28FFlbdqU//3W+946quWDlmMt+fZatRcY1+r2998AqoojDf0LUcoy3YdoXL YsrOxA6fbkNyhPnIsppYIoWo0sc8Ugsg1dqejlLM5ZmopLFaVI0atWiyAEykbIcGP/r3Xs KEfEsS+eNzotAnHWUm4VjmZSlRw+G51P3RG2+/0ppsFEkqWN5rstycmQ6gKiETTg1oIZZj WPGYlUNHfCmRg6PCSH0PUFuOsZ1JpbWpTKMrbvWo4kQvFlCFc9ZqTjl9qNRt1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gshTLW+yged2rCXsvOXPlReSsS4GBMH6XayFJSBgMJM=; b=FTTMnys+cFxnyBEzCe8EHXDT0xHWtsctyQjaUwuvzycqVeuj73K/2x01N0rCX1y8ya/7HH 8Z8D9Jd//BOfpC7YAzx2Ap6wqjsIZOACJdmZ4lgnAqLREGrQe7mUzMXvpZgn7ce/R+Sh0y 0TF8rWFvtPG+D2/YJ6RO7Nh5WorWBJzbA6dNbWuj7JqPBaDam+GfoDuKPFH4MDcxwnkTV9 ViHVAobn+OnGeQJ0S6ZwblbVp63pj6/oEgeGLBDV+ltwvNz9Mq5QWJGHIB2Mv5zUByuByk YVPlyXfg/UyrAYf+I9aaxBP1KkOLXIQju3dpY6QlnmNFDy+/0Cf+r1XyJvqm6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3t0JJVz17pL for ; Tue, 10 Mar 2026 10:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46543 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:54:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0b27b79f357c - stable/15 - sound: Notify devd when no devices are connected List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0b27b79f357cd7bafbe7a400a09c0c66e3443b80 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:54:50 +0000 Message-Id: <69aff87a.46543.49fd93c1@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0b27b79f357cd7bafbe7a400a09c0c66e3443b80 commit 0b27b79f357cd7bafbe7a400a09c0c66e3443b80 Author: Christos Margiolis AuthorDate: 2026-03-03 11:32:38 +0000 Commit: Christos Margiolis CommitDate: 2026-03-10 10:54:42 +0000 sound: Notify devd when no devices are connected Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55531 (cherry picked from commit 428517a7712e44b58e0687fbee4037a8ebe5bf5a) --- sbin/devd/devd.conf.5 | 4 +++- sbin/devd/snd.conf | 10 ++++++++++ sys/dev/sound/pcm/sound.c | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index 8df3e910e076..67d73d4ebf49 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -38,7 +38,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.Dd July 9, 2025 +.Dd February 26, 2026 .Dt DEVD.CONF 5 .Os .Sh NAME @@ -666,6 +666,8 @@ variable. Connected output device specified in .Pa cdev variable. +.It Li SND Ta Li CONN Ta Li NODEV Ta +No connected devices. .El .Pp .\" diff --git a/sbin/devd/snd.conf b/sbin/devd/snd.conf index a45f427f6c79..5ca0be86e246 100644 --- a/sbin/devd/snd.conf +++ b/sbin/devd/snd.conf @@ -24,3 +24,13 @@ notify 0 { # See comment above. action "/usr/sbin/virtual_oss_cmd /dev/vdsp.ctl -P /dev/$cdev"; }; + +notify 0 { + match "system" "SND"; + match "subsystem" "CONN"; + match "type" "NODEV"; + + # No connected devices. Disable both recording and playback to avoid + # repeated virtual_oss error messages. + action "/usr/sbin/virtual_oss_cmd /dev/vdsp.ctl -f /dev/null"; +}; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index abd92d93e02d..305d663cd6ad 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -483,6 +483,8 @@ pcm_unregister(device_t dev) snd_unit = pcm_best_unit(-1); if (snd_unit_auto == 0) snd_unit_auto = 1; + if (snd_unit < 0) + devctl_notify("SND", "CONN", "NODEV", NULL); } return (0); From nobody Tue Mar 10 10:54:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3v4V2bz6VRdM for ; Tue, 10 Mar 2026 10:54: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVW3v1hWMz43F6 for ; Tue, 10 Mar 2026 10:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrOIOmefVV8U4AwIdhvsEO9NNRcNh24ndSSLZpB7uxw=; b=ZnQ/ztf/Q/2ckyg3DCcex38JCSZmJrFLG/cYhSNbmGQ3pMe1K8pUGvOcHAmprXmi+7mEsJ BFCVZ5kTYKs1KLtkrNM6EJ4zGUKv/zuMmjtC4pTNhSeA7505zOBs4QgUrBBzwhzQwX7GIn LnEjjwAAMuj1rxUtUNj5IYolLYRh+u6YBqQrl+h/raqIN1gwoVvo8bF2N1HTcBKlwlYb7u DRwPcyEAWwYQ9Ow0s43Fs9AWvwaAKAhc3t15ah2dhTHvuvwPM9vhd6JPBpKNObQNrGEJIb P1vdVdfR7YjIH3q2ui+Y22xFDvFYm4dg4y5FFebLh4a4GU7EcIP+CrQmM01QXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773140091; a=rsa-sha256; cv=none; b=P/Q5R7y4VkBajCvUlBKsz4sup2gvTKJvA1Hffdqn4N3ozMgEXvvl0PofwO4EiuEXxRUXv4 e4rn3WuL8m9LsWIS7XjSwaQVmS0brOJprrmss/+PNetU59+LeSTkGbH2w2i34EaJPSzvbS Px3qdP3Zblco5OyffDeGnAKUPdrwIFtcHYVcA6E6a3lJOdyRUh0PVIEAM4uOmqEsrPZidN EFna/ARsdS/BGIiiX+byH1SlGc/6bKJTgzvt/XKniJckXjTDZ5HXv5ANr9fgAu7Xzta4af xbaafNudpzeB3i6uf/NT7IsCFPQH4oZD1x2mph9JS8VeJ2iBkbOJjoyI/HyqAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrOIOmefVV8U4AwIdhvsEO9NNRcNh24ndSSLZpB7uxw=; b=MYwvUmtdZStBzArx1Cx5ACmejuGNM2UShvdVrU1ZREEMTiywHWXuZWp18BpxdfDcBh5Kxh L7ZbFzRqBF/iK0jadochf5sTKurDiPigQG9gfbCBoqtyYWoKNfsKzFs7FEFRxX2L3YpPmg PiKOHSQ7rHUkN5rN3MYppjAx3AIpresuR4/F/ULuEMgRq2kc9ingHnIqr+sczAzd+qzBBG 0fJKzEZx6+PqFtfx75ljEsr2+hWH7/Zs2kSq0RVgyrJmr6EKw+CKNADpS/fC0C3WX6PLD1 S2Zpmm4ZSWDUAbMdKbMPM4G55siUWc5Oe+CHxu+xIDihPCTjRXQTlBKU5RWJJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3v0wkPz17kG for ; Tue, 10 Mar 2026 10:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4744a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:54:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 10aa4c8ce852 - stable/15 - Revert "mixer(8): Implement hot-swapping" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10aa4c8ce852cf77c7bedb8cb0df62eccb7b7a71 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:54:51 +0000 Message-Id: <69aff87b.4744a.368065b@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=10aa4c8ce852cf77c7bedb8cb0df62eccb7b7a71 commit 10aa4c8ce852cf77c7bedb8cb0df62eccb7b7a71 Author: Christos Margiolis AuthorDate: 2026-03-03 11:32:42 +0000 Commit: Christos Margiolis CommitDate: 2026-03-10 10:54:42 +0000 Revert "mixer(8): Implement hot-swapping" We now have devd rules in snd.conf that achieve this in a much cleaner way. This reverts commit 9aac27599acaffa21ff69c5be8a2d71d29cc3d6b. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55532 (cherry picked from commit d00b32c2d70ce79fddb94dd990d2b162c8fc3a85) --- usr.sbin/mixer/mixer.8 | 75 +++------------------------------------------- usr.sbin/mixer/mixer.c | 81 +++++--------------------------------------------- 2 files changed, 11 insertions(+), 145 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index d7de675bceee..bdff0dbedc11 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -19,7 +19,7 @@ .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN .\" THE SOFTWARE. .\" -.Dd October 31, 2025 +.Dd February 26, 2026 .Dt MIXER 8 .Os .Sh NAME @@ -28,7 +28,7 @@ .Sh SYNOPSIS .Nm .Op Fl f Ar device -.Op Fl d Ar pcmX | X Op Fl V Ar voss_device:mode +.Op Fl d Ar pcmX | X .Op Fl os .Op Ar dev Ns Op Cm \&. Ns Ar control Ns Op Cm \&= Ns Ar value .Ar ... @@ -43,7 +43,7 @@ The utility is used to set and display soundcard mixer device controls. .Pp The options are as follows: -.Bl -tag -width "-V voss_device:mode" +.Bl -tag -width "-d pcmN | N" .It Fl a Print the values for all mixer devices available in the system .Pq see Sx FILES . @@ -54,30 +54,6 @@ where X is the device's unit number (e.g for pcm0, the unit number is 0). See .Sx EXAMPLES on how to list all available audio devices in the system. -.Pp -There is also the possibility of hot-swapping to the new default device if -.Xr virtual_oss 8 -exists in the system and is running, in which case the -.Fl V -option needs to be specified as well. -.Pp -Hot-swapping generally cannot happen with plain -.Xr sound 4 , -so the user has to restart the track in order to get sound coming out of the -new default device. -This is because applications usually open a device at the start of the track -and do not check for default device changes, in order to open the new device -mid-track. -.Xr virtual_oss 8 , -on the other hand, can do hot-swapping, because it creates a virtual device for -applications to open, and then does all the necessary routing and conversions -to the appropriate device(s). -.Pp -Note that hot-swapping will work only for applications that are using -.Xr virtual_oss 8 -devices, and not plain -.Xr sound 4 -ones. .It Fl f Ar device Open .Ar device @@ -90,33 +66,6 @@ Print mixer values in a format suitable for use inside scripts. The mixer's header (name, audio card name, ...) will not be printed. .It Fl s Print only the recording source(s) of the mixer device. -.It Fl V Ar voss_device:mode -Specify a -.Xr virtual_oss 8 -control device, as well as a mode (see below), in order to hot-swap devices. -This option is meant to only be used in combination with the -.Fl d -option. -.Pp -The available modes are as follows: -.Bl -column play -.It Sy Mode Ta Sy Action -.It all Ta Playback and recording -.It play Ta Playback -.It rec Ta Recording -.El -.Pp -The -.Pa mode -part is needed, so that -.Nm -will not accidentally hot-swap both the recording and playback device in -.Xr virtual_oss 8 , -if only one direction is to be hot-swapped. -.Pp -See -.Sx EXAMPLES -on how to use this option. .El .Pp The list of mixer devices that may be modified are: @@ -316,26 +265,10 @@ $ mixer -f /dev/mixer0 -o > info \&... $ mixer -f /dev/mixer0 `cat info` .Ed -.Pp -Suppose -.Xr virtual_oss 8 -is running with -.Pa /dev/vdsp.ctl -as its control device, and -.Pa pcm0 -as the playback device. -Change the default device to -.Pa pcm1 , -and hot-swap to it for both recording and playback in -.Xr virtual_oss 8 : -.Bd -literal -offset indent -$ mixer -d pcm1 -V /dev/vdsp.ctl:all -.Ed .Sh SEE ALSO .Xr mixer 3 , .Xr sound 4 , -.Xr sysctl 8 , -.Xr virtual_oss 8 +.Xr sysctl 8 .Sh HISTORY The .Nm diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 15e0eae69952..a0fc9705a301 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -20,9 +20,6 @@ * THE SOFTWARE. */ -#include -#include - #include #include #include @@ -43,7 +40,7 @@ static void printall(struct mixer *, int); static void printminfo(struct mixer *, int); static void printdev(struct mixer *, int); static void printrecsrc(struct mixer *, int); /* XXX: change name */ -static int set_dunit(struct mixer *, int, char *); +static int set_dunit(struct mixer *, int); /* Control handlers */ static int mod_volume(struct mix_dev *, void *); static int mod_mute(struct mix_dev *, void *); @@ -57,13 +54,13 @@ main(int argc, char *argv[]) { struct mixer *m; mix_ctl_t *cp; - char *name = NULL, buf[NAME_MAX], *vctl = NULL; + char *name = NULL, buf[NAME_MAX]; char *p, *q, *devstr, *ctlstr, *valstr = NULL; int dunit, i, n, pall = 1, shorthand; int aflag = 0, dflag = 0, oflag = 0, sflag = 0; int ch; - while ((ch = getopt(argc, argv, "ad:f:hosV:")) != -1) { + while ((ch = getopt(argc, argv, "ad:f:hos")) != -1) { switch (ch) { case 'a': aflag = 1; @@ -86,9 +83,6 @@ main(int argc, char *argv[]) case 's': sflag = 1; break; - case 'V': - vctl = optarg; - break; case 'h': /* FALLTHROUGH */ case '?': default: @@ -125,7 +119,7 @@ main(int argc, char *argv[]) initctls(m); if (dflag) { - if (set_dunit(m, dunit, vctl) < 0) + if (set_dunit(m, dunit) < 0) goto parse; else { /* @@ -217,8 +211,7 @@ next: static void __dead2 usage(void) { - fprintf(stderr, "usage: %1$s [-f device] [-d pcmN | N " - "[-V voss_device:mode]] [-os] [dev[.control[=value]]] ...\n" + fprintf(stderr, "usage: %1$s [-f device] [-d pcmN | N] [-os] [dev[.control[=value]]] ...\n" " %1$s [-os] -a\n" " %1$s -h\n", getprogname()); exit(1); @@ -331,32 +324,9 @@ printrecsrc(struct mixer *m, int oflag) } static int -set_dunit(struct mixer *m, int dunit, char *vctl) +set_dunit(struct mixer *m, int dunit) { - const char *opt; - char *dev, *mode; - char buf[32]; - size_t size; - int n, rc; - - /* - * Issue warning in case of hw.snd.basename_clone being unset. Omit the - * check and warning if the -V flag is used, since the user is most - * likely to be aware of this, and the warning might be confusing. - */ - if (vctl == NULL) { - size = sizeof(int); - if (sysctlbyname("hw.snd.basename_clone", &n, &size, - NULL, 0) < 0) { - warn("hw.snd.basename_clone failed"); - return (-1); - } - if (n == 0) { - warnx("warning: hw.snd.basename_clone not set. " - "/dev/dsp is managed externally and does not " - "change with the default unit change here."); - } - } + int n; if ((n = mixer_get_dunit()) < 0) { warn("cannot get default unit"); @@ -368,43 +338,6 @@ set_dunit(struct mixer *m, int dunit, char *vctl) } printf("default_unit: %d -> %d\n", n, dunit); - /* Hot-swap in case virtual_oss exists and is running. */ - if (vctl != NULL) { - dev = strsep(&vctl, ":"); - mode = vctl; - if (dev == NULL || mode == NULL) { - warnx("voss_device:mode tuple incomplete"); - return (-1); - } - if (strcmp(mode, "all") == 0) - opt = "-f"; - else if (strcmp(mode, "play") == 0) - opt = "-P"; - else if (strcmp(mode, "rec") == 0) - opt = "-R"; - else { - warnx("please use one of the following modes: " - "all, play, rec"); - return (-1); - } - snprintf(buf, sizeof(buf), "/dev/dsp%d", dunit); - switch (fork()) { - case -1: - warn("fork"); - break; - case 0: - rc = execl("/usr/sbin/virtual_oss_cmd", - "virtual_oss_cmd", dev, opt, buf, NULL); - if (rc < 0) - warn("virtual_oss_cmd"); - _exit(0); - default: - if (wait(NULL) < 0) - warn("wait"); - break; - } - } - return (0); } From nobody Tue Mar 10 10:54:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3y2v73z6VRkH for ; Tue, 10 Mar 2026 10:54: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVW3y1f5Kz4348 for ; Tue, 10 Mar 2026 10:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLWmiM7sPGluVmC3u0+6ZSjQ+R+yJkg3wDJ4e46MIK4=; b=AyczJbZvwpIJzYpZH14U7jHhxuMjIhrTRpCj6iVbo05+Fat+5EAq62GwCX230WCmnsB9tY oVHBmAy1B3LtseiNyK0xKqVz8DtH6Uup79tQFkNn1jbLD0c2VvdlNEgC7CmBreUS51jFo4 NVJ71l5Lkcgn28xNDHM3B0xduN6WUy6pNImjNsb3+OpnSSprcMuZodWZ8paVnQcWDqQxV5 DwgqjtCdxpKmmUVdPM6HPRLUH20HIpZ4IGFYJNbPruoK04OqQaxPMRtIv/NDm3tMTRyp2s wSFIIX3YJDCpIH2gmd+IyNjDaCM+mC3+jBGuf0QD2h28x3AB5vPgTo9xG6yuKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773140094; a=rsa-sha256; cv=none; b=Ytu55Z9xF9NGXCnp5fLFlbNGKhNHW/hibXvQCs/v7oQ4FGYK4QzJQdRxPNJTv522CpI5kd dm86Zza0Q/AI+Xfa6Yinr3Iylxdd1jHzPovYjE/el/GC16GsOc71wZwPcm2HeZNUdsKc6B HocXAyiK0yGdqt3oOneLdMoSuBr8EXYPDL7cH8AwtqwysJZnZUtMeZV8Xt2bdvy7i31/OT 0iuN+uXXMTSJdLkFAeDVejG1aSoDvyyAZhneJb9KnEgj+xE3NvTbkC1EXUEkpujdnuWd0i cSjcISMomZonGgJmWaRZMNr0B5WQhVig9eemqjF3HaJ17G9y7x7/kAcoLYAkxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLWmiM7sPGluVmC3u0+6ZSjQ+R+yJkg3wDJ4e46MIK4=; b=dzDgdqSPMmLHW/W2lXBgrXFUyXgm39xJUMZSkyy9zuEpXUWVXmeZKOGQfIU2oo+PktFSml 8j3nxyBmQ2dU914/PkjWsHB88w94o5/sI8oA1ZcA13j+l9vu7OVsGEMax/I7MU8yPFxSdW w19Qw/DCR5X00Mzp1or8BsVjPXl3tRo6B0As+bUn6L9sIlzwBlLx3U2KXLUYEeE0aPm1Z0 zqpV4el6IdrOk5J8lqd6GS6tqj/Dpo01eSeiJiLCJqHQ+puRrv+7fd2tkEo6EdIynF4RDR d1GS52hNz7Ff1xCromC6NgbW2xE99tgOQObQpf0VLPC3P/i3rZjrkKhQIjVkQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3y15pGz17pM for ; Tue, 10 Mar 2026 10:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 454e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:54:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 716773278a03 - stable/15 - sound: Notify devd on hw.snd.default_unit change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 716773278a0349dcb468d13d22a957ed91602d1c Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:54:48 +0000 Message-Id: <69aff878.454e3.73552e57@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=716773278a0349dcb468d13d22a957ed91602d1c commit 716773278a0349dcb468d13d22a957ed91602d1c Author: Christos Margiolis AuthorDate: 2026-03-03 11:32:32 +0000 Commit: Christos Margiolis CommitDate: 2026-03-10 10:54:42 +0000 sound: Notify devd on hw.snd.default_unit change If we have virtual_oss running, this devd notification will make sure to automatically transfer sound to the new default unit, while also making sure that we switch to it only for the supported directions (recording and/or playback). For more information, please refer to 2ffaca551eaf ("snd_hda: Implement automatic redirection between associations"). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55530 (cherry picked from commit d40189f8259e3565c69a40194f7b603d0ca648de) --- sys/dev/sound/pcm/sound.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 8ce369bfce5e..abd92d93e02d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -81,6 +81,7 @@ static int sysctl_hw_snd_default_unit(SYSCTL_HANDLER_ARGS) { struct snddev_info *d; + char buf[32]; int error, unit; unit = snd_unit; @@ -95,6 +96,12 @@ sysctl_hw_snd_default_unit(SYSCTL_HANDLER_ARGS) snd_unit = unit; snd_unit_auto = 0; bus_topo_unlock(); + + snprintf(buf, sizeof(buf), "cdev=dsp%d", snd_unit); + if (d->reccount > 0) + devctl_notify("SND", "CONN", "IN", buf); + if (d->playcount > 0) + devctl_notify("SND", "CONN", "OUT", buf); } return (error); } From nobody Tue Mar 10 10:55:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVW4k0rH1z6VRdk for ; Tue, 10 Mar 2026 10:55: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVW4j6rNqz44MB for ; Tue, 10 Mar 2026 10:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjTy4+SE21t7hi6B5AGr9a0dVMLnv/z81Um3qtrdxo4=; b=d23u0HOIhYSgLX8fRSk3pol0grv2s7BZ68jrMeER8TjbzbQsstTW5aDkz4mVUjwH8W59dp eGLtblZOqi96VX1WvCGsUHsKvwd9QE3ixPzZF98rOnIp4bcQDPo7C26R3a+g/UwVz9DQZD Vwezzc9WsEVTYz1nisXkQhW4/c134ua3zWOjfNpvSI0dUFSN9yfheqKqB78U1lTn0qk+mu z6Itd1DKMuVvsEET6Zq31snQb9ebe9BK7ZFMOJnHMHXidhqlZqSwr8XtxypsAtkviDHRZd vBo6PQ9CTKNsBH/BH2SxqzVUagBRa6mEwroiAfyfshaAizOgmZvFMWvt/apEmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773140134; a=rsa-sha256; cv=none; b=GMEmU7DD9rIZ4o81hKDOWy1xTWKuPjQ8e/IvyA0n2ZYFWKREnOqRc3cz5PrfI/219xGzOo 4nsOQupknTQ4CUVeHYUCHgmCGOG1kQLwSNmOexp2TLMAN4UMfQfwIJxL0ONbM2RVSzLIiL WRAsg1ThfUcGMK6QVLkrAzy5J0wJRLZQXs9s2Sq74gl1J9gOoPIvImCPqDiymCccKTOnh8 VM57et26WZQ2fVhq09HlEwcXIjuunmGmC02ibIdLZQajPe9oLJ8D/r12vIjuvoDWuBJnQ0 NaJeRIYQyavUkqqV19vZQIS3lUyPTGBdjpC86JkHU40Z11SQFHDqvppWK1PAOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjTy4+SE21t7hi6B5AGr9a0dVMLnv/z81Um3qtrdxo4=; b=BzlNW8a7bHt74vTU+0CUa0qfKpdcdoqKy6YC2QGYxqHItmGIFtfK02i6fo+hkGeVOrbW/w aQcKHrXAlqN8A+pm7aAHdBLBNrdf+6gWHQR7j8RB/Zo3co62vYUZxRZobNbQucdI5rxQ9R mTnD9xTvvjZSjiMS1mZ3pLhf1jzMyh79UTzpSrAfv6zW4Tc1lsxbWONEBmgnEgFB+wpDBA PnWQc3DJEJyamN67qBZPDgIAsy7SoH8Mg1sbtg1fNjCBPhc7803u0DO1a8o3d6iXuSwRLE 0wnc2hujQu3lQ8HpS1xv6x+wh4PaWVMoWgZ67DDVz3VP1YcQC52uvrMPpRNsUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVW4j68kvz17lr for ; Tue, 10 Mar 2026 10:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46547 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:55:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a2b601343bf9 - main - virtual_oss: Combine -d, -l and -L option getopt code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2b601343bf9261c4ada51e4d4c30c5b9320bb2b Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:55:28 +0000 Message-Id: <69aff8a0.46547.1503cad9@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b601343bf9261c4ada51e4d4c30c5b9320bb2b commit a2b601343bf9261c4ada51e4d4c30c5b9320bb2b Author: Christos Margiolis AuthorDate: 2026-03-10 10:55:21 +0000 Commit: Christos Margiolis CommitDate: 2026-03-10 10:55:21 +0000 virtual_oss: Combine -d, -l and -L option getopt code Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55671 --- usr.sbin/virtual_oss/virtual_oss/main.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index 6c5ba8112c8b..6a56adbc6075 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -2228,24 +2228,6 @@ parse_options(int narg, char **pparg, int is_main) strncpy(profile.wav_name, optarg, sizeof(profile.wav_name)); break; case 'd': - if (strlen(optarg) > VMAX_STRING - 1) - return ("Device name too long"); - strncpy(profile.oss_name, optarg, sizeof(profile.oss_name)); - - if (profile.bits == 0 || voss_dsp_sample_rate == 0 || - profile.channels == 0 || voss_dsp_samples == 0) - return ("Missing -b, -r, -c or -s parameters"); - - val = (voss_dsp_samples * - profile.bits * profile.channels) / 8; - if (val <= 0 || val >= (1024 * 1024)) - return ("-s option value is too big"); - - ptr = dup_profile(&profile, opt_amp, opt_pol, - opt_mute[0], opt_mute[1], 0, 1); - if (ptr != NULL) - return (ptr); - break; case 'L': case 'l': if (strlen(optarg) > VMAX_STRING - 1) @@ -2254,7 +2236,7 @@ parse_options(int narg, char **pparg, int is_main) if (profile.bits == 0 || voss_dsp_sample_rate == 0 || profile.channels == 0 || voss_dsp_samples == 0) - return ("Missing -b, -r, -r or -s parameters"); + return ("Missing -b, -r, -c or -s parameters"); val = (voss_dsp_samples * profile.bits * profile.channels) / 8; @@ -2262,7 +2244,7 @@ parse_options(int narg, char **pparg, int is_main) return ("-s option value is too big"); ptr = dup_profile(&profile, opt_amp, opt_pol, - opt_mute[0], opt_mute[1], c == 'L', 0); + opt_mute[0], opt_mute[1], c == 'L', c == 'd'); if (ptr != NULL) return (ptr); break; From nobody Tue Mar 10 11:43:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8369Vzz6VVq0 for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX83533Cz49cG for ; Tue, 10 Mar 2026 11:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4Xq66L+WAXsArZq8KihwJJ00jwGwADhQoMBWu6VWAE=; b=JuRNwMPpIZqClj6qfjdV6RT5g9ksiO5YM4Yp60tw6bWj6Us7E1gYOfBr6zgzLWN/Phh4m/ l8gGD7MT9AL0BNFpch1w4wOP4aN2tc0esMuKGnJmvlByXOFXizL1l3ttmg4289XJAHclBd QRLKav6NWsrynSTNiG7wNv2wfyVahLIaZOthq+/iI9A04jLIqCnh0fyykLbUbWwe8wkeH6 RGADseVcvUVCsJeg5YW8aO1m2wLe3lI8N/Ps+VIzBw5XVXP8f9r/aJh1NxCdYVVwfbOEgq +ixQYe+SuIQrKf8BeV9BGX3UlFhh+3wuI16GwYpFdXI+3IW0k6GukdxmGpggKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143011; a=rsa-sha256; cv=none; b=kFnyb6vj7VDtomesol+B/thC93uYPXzy3JxSYe8+v5PuNoWQKLuWMFn7d/6Ji0K/ILPhJ5 4zCAfS8Sh23c+IooewIBKpS2tNnqKZMwRQO2yrfvHfleX9a8OeI9r9qeBEIAt8Hi9DjyZC +OBiOKrC7h8QbuCzweg8LMMkRf5dgiOY0g5hjkViqB7uxZhiDR+ufvNtfSxiz0u/LdgmQ8 0zrBVan8A7mBZw2mjflMWid6PX4HNKL4vrtwbZJt+VCrEjfMnwRdlpeVdgvnhDdaeEP2MA PqXRzPeRtmBz1O28DPDbYqchILlIZs9zlmdXO2c1v7lAXdJiAt2MLcpp0DeXAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4Xq66L+WAXsArZq8KihwJJ00jwGwADhQoMBWu6VWAE=; b=aHzfNrya0CpMyKYcKH6V9AxD5/wwkRtwgkXh5HHyCrxKIm071h+mOm0RvZjRUhc7Ngdx2g WbP9d2DQAsiF5LxGS0oI21hPf+bQAR7y0pIF8wHewKMtLbyWd3p92BHhqtSthG7ofUD1Ax Us6+u4TntXhrsLf4isOB9l/pbYF7UlN4Pv1kDJJMlAgGNqqa8uejRbtpNnuNNv55JIXrUD GNSYSVKLGlRmKjinbSQ/8xkCMADQ74AzO3MBGAoNSFfNXIjbIMmP6HbEfNZUrwA1O73+ht 6N2CrPTo4z6ljD2Ovqpox6XWo3TsafU1UcfKS/Gf4Bx2joTeMR1C4/5zkoBbzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX832jTlz18v9 for ; Tue, 10 Mar 2026 11:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ade737514f5a - stable/15 - amd64: align stack on 16 bytes when calling into a EFIRT method List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ade737514f5aa4e8af61e322c7d04d2a539692fa Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:31 +0000 Message-Id: <69b003e3.1c6f3.1c7e7768@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ade737514f5aa4e8af61e322c7d04d2a539692fa commit ade737514f5aa4e8af61e322c7d04d2a539692fa Author: Konstantin Belousov AuthorDate: 2026-03-05 08:37:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 amd64: align stack on 16 bytes when calling into a EFIRT method (cherry picked from commit 347cec10e25eacb2906a0a8105eff036850db766) --- sys/amd64/amd64/efirt_support.S | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/amd64/amd64/efirt_support.S b/sys/amd64/amd64/efirt_support.S index 98063ad561aa..54578f573750 100644 --- a/sys/amd64/amd64/efirt_support.S +++ b/sys/amd64/amd64/efirt_support.S @@ -58,6 +58,7 @@ ENTRY(efi_rt_arch_call) cmovbl %eax, %ecx shll $3, %ecx subq %rcx, %rsp + andq $~0xf, %rsp cmpl $0, %ebx jz 1f From nobody Tue Mar 10 11:43:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX846vr1z6VWK7 for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX843wWfz48vs for ; Tue, 10 Mar 2026 11:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdGtNl/Lnvr5Rf6Yu8tez4Fbhh01de2RnDCkCtNDeYM=; b=q5oVl6Ds2pdxRdc1jEwkpXlTuh7L7FbW0ktwuGEqwyaRyrIb09wqmoF4AING0+Xlp37R2r NDGJsrI9On04DnqiaMhIEVABrOKbQVSZ+QF9c5K5ORFNM13f5XYLggAejZr3KX6N6sIq0i 2SkrgqygmDX7I6gg3kkIpcXBs9jUAGDg152m3h/tiVWzqaYm0sxGMsU2cHua5E3fI608mK yk9ktlUL7P4qnY+am3x6qMHN1T6PJrLx8KEX6al1Ab7uqAQLlzYpeziCfEqrk7r27wPkOg cYmNCxpb4unN3P9Fom70AzsdcChBP3qOe9ftFfiZY8tooJK1i0M1Gn8kiVT9EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143012; a=rsa-sha256; cv=none; b=shcRXGwjnierGchd5phsPuVwMFcrC2sDETasLhZ1K0VRVCXZ+JEq8HXCnPUntizDA+drnf 7T1kbggZmS3V3Hnw2JwD9ZYM5Gga67idP+DNFN543vMUasjMTETcgL8No2Cw+CHW2r6H5O 0mE4VJ9eR5FhELHXkW1I03EWfMgBD2HTAqFhdNljZ9a+99LQFVjoPqGCaPo7Nn8KDgMuA3 b4/66qgpzCvl18LTpAbR5fU47B5YfZrR229p6rub7i0zTyKjn8ZKNb83lZwRHz5XWNlcKe 8u4hRaNrQNsUn/eu9acRHpBEiWpMl4nZ4whSx4185aTuMFwWjVF6fzLuwBgnOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdGtNl/Lnvr5Rf6Yu8tez4Fbhh01de2RnDCkCtNDeYM=; b=RTtyrkX7cO27CgQS/CIt2w1CQj7vEurczpF4uRwTIX3aDQySo5V3ZWoJLrj81jZ0wyHQSn 337rtp/2YexGZT4DkdZViZXNwNPeDIQB/d7xKblZyPZrFgNcas136PYPCg1iHf3OLg0XiZ IoapS5q9SWuZnHAxu4Y72uZrLdZ+cdQ8Q44BsNzw8qGmcPd64c1X+4xEsHvMBtUk/kCIGM jXdMKhjdNgBa7MjOBeEjtwXbMVk+850Ffb7R9bOSS8NkDqiWPOvlrtPnoCxn9VikggG8eO nJ7/fNM0JlXDG3RvsDh5smVxpzD+tO75pSbeyIkx1W2d5nmGBELGLhIV3mv5Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX843T0xz19Y8 for ; Tue, 10 Mar 2026 11:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ab2b871e82e1 - stable/15 - amd64: extract uprintf_signal printing into a helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab2b871e82e1d0a6cf5d6faeb1800116237a5a67 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:32 +0000 Message-Id: <69b003e4.1be48.4406298e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ab2b871e82e1d0a6cf5d6faeb1800116237a5a67 commit ab2b871e82e1d0a6cf5d6faeb1800116237a5a67 Author: Konstantin Belousov AuthorDate: 2026-02-18 19:04:39 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 amd64: extract uprintf_signal printing into a helper (cherry picked from commit 3e8a9995e9541a0bdd707f111e51ef46a544ee3e) --- sys/amd64/amd64/trap.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 84305ca918df..d07fbc223193 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -177,6 +177,30 @@ SYSCTL_INT(_machdep, OID_AUTO, nmi_flush_l1d_sw, CTLFLAG_RWTUN, &nmi_flush_l1d_sw, 0, "Flush L1 Data Cache on NMI exit, software bhyve L1TF mitigation assist"); +static void +trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, + int signo, int ucode) +{ + struct proc *p; + + if (!uprintf_signal) + return; + p = td->td_proc; + uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " + "addr %#lx rsp %#lx rip %#lx rax %#lx " + "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", + p->p_pid, p->p_comm, signo, frame->tf_err, ucode, frame->tf_trapno, + addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, + fubyte((void *)(frame->tf_rip + 0)), + fubyte((void *)(frame->tf_rip + 1)), + fubyte((void *)(frame->tf_rip + 2)), + fubyte((void *)(frame->tf_rip + 3)), + fubyte((void *)(frame->tf_rip + 4)), + fubyte((void *)(frame->tf_rip + 5)), + fubyte((void *)(frame->tf_rip + 6)), + fubyte((void *)(frame->tf_rip + 7))); +} + /* * Table of handlers for various segment load faults. */ @@ -626,21 +650,7 @@ trap(struct trapframe *frame) ksi.ksi_code = ucode; ksi.ksi_trapno = type; ksi.ksi_addr = (void *)addr; - if (uprintf_signal) { - uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " - "addr %#lx rsp %#lx rip %#lx rax %#lx " - "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", - p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, - addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, - fubyte((void *)(frame->tf_rip + 0)), - fubyte((void *)(frame->tf_rip + 1)), - fubyte((void *)(frame->tf_rip + 2)), - fubyte((void *)(frame->tf_rip + 3)), - fubyte((void *)(frame->tf_rip + 4)), - fubyte((void *)(frame->tf_rip + 5)), - fubyte((void *)(frame->tf_rip + 6)), - fubyte((void *)(frame->tf_rip + 7))); - } + trap_uprintf_signal(td, frame, addr, signo, ucode); KASSERT((read_rflags() & PSL_I) != 0, ("interrupts disabled")); trapsignal(td, &ksi); From nobody Tue Mar 10 11:43:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX860R3Rz6VVxq for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX854mBmz49fY for ; Tue, 10 Mar 2026 11:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV7mtXhBVCrIxYLv97rk2cYdALer5CjpXWh/iGbuqtY=; b=GvGNlwJcSf+HAzyEkhjxCL1sjxEgkpF+dkpIVyMDciUlqRy3kZLUeiDZVv9L6W7qM0fKwg HvqCJUeC2oA2XWVbU/rgxEoPckRzfIszx8ALNhbAXR0QJH4UW+Wx/N8w6oamWDuXA+haIO SCJ4AX4yt9udI0yHa9iXmGd6wwY72g1Li5ojgaTGHijsTAsao1yiau1WPiBKPkKxrFd9i/ F79rwh0ZQphvqfhSQChCYbz+s+8S6WoJotQG3ipUMhmgP8JsEVP+i+pUJIni1l2At/7y6t xgge9NmHHU4NDhcbNp0iBfRLJDXm6NTtnNry4E92sQHPtIBLkelfzByRYZBR2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143013; a=rsa-sha256; cv=none; b=HEP8vhvwmnhlmLizo9kbmNOIgjYO1ndB3dYhzKEMr3Re35nJpsV3nTdqPHcBEcrTeut7Xf Deag/vLtUwV7pTxdcxA1YpbmbosuvBmuoJKjOjDkufFuaBrO17BqooCcREfIrfenmHurth mSuiV5lgTjidFu3qa1CvYw/do50Y5ZScOPZuzCxfyndNqJtvqaaVLQwVDuUYKUMX71a2YS rn9VwuK+DIxSCFFvuIm9fbZ6/z9HHU7Kg2AGd4KF0qmjnn/kgRCy2/aJJvg5IkJptU16wE ofOP3j7508qonLQv+z7MGBmrdX21bqMlYfeBEbwe1wxKJqWzr+VY33WHu1PbQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV7mtXhBVCrIxYLv97rk2cYdALer5CjpXWh/iGbuqtY=; b=C79xSnGEIKA+H1U/RKOOOhGwvTzsbeEdI+pNP1ly5exSSsnbgXFBlig2X3rQj/wO83hJNc VarFQjR78Ev8iTWXiOEUZ1KjQOg8NOLx8BMKAUfgW8Bm62EEgU+8lcKtc5P9bgH/Hc1GlH qH6qpa9nQqha5r1MH12LtTmFHWwiykdQBE4zx1nYBIOrZ60PKSkJgubUmofS/YqrWecEiK nH4w5Qp03BPt8k2hrQgXuTX8+UHVzywVlQNztHQ0cQPCcK+SxJRdK4R0VH+29qZlemBkoi EMhkadsDZ1IStB+UjZ9vfdWSXiE3K6W817EnvLUKiq8XUnpkqtsFrl210H5yGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX854HZCz18vB for ; Tue, 10 Mar 2026 11:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5061709d8f7c - stable/15 - amd64: print userspace fsbase and gsbase for uprintf_signal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5061709d8f7c42a873e09721509d24aba1316fe2 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:33 +0000 Message-Id: <69b003e5.1df33.d00bdc5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5061709d8f7c42a873e09721509d24aba1316fe2 commit 5061709d8f7c42a873e09721509d24aba1316fe2 Author: Konstantin Belousov AuthorDate: 2026-03-04 03:22:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 amd64: print userspace fsbase and gsbase for uprintf_signal (cherry picked from commit 272ea451199462dffd55dd580532eb28ddc92174) --- sys/amd64/amd64/trap.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index d07fbc223193..d173f57e2e4f 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -182,15 +182,32 @@ trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, int signo, int ucode) { struct proc *p; + struct pcb *pcb; + register_t fsbase, gsbase, r; if (!uprintf_signal) return; p = td->td_proc; + pcb = td->td_pcb; + if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) { + r = intr_disable(); + if ((pcb->pcb_flags & PCB_FULL_IRET) == 0) { + fsbase = rdfsbase(); + gsbase = rdmsr(MSR_KGSBASE); + } else { + fsbase = pcb->pcb_fsbase; + gsbase = pcb->pcb_gsbase; + } + intr_restore(r); + } else { + fsbase = pcb->pcb_fsbase; + gsbase = pcb->pcb_gsbase; + } uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " - "addr %#lx rsp %#lx rip %#lx rax %#lx " + "addr %#lx rsp %#lx rip %#lx rax %#lx fsb %#lx gsb %#lx " "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, signo, frame->tf_err, ucode, frame->tf_trapno, - addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, + addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, fsbase, gsbase, fubyte((void *)(frame->tf_rip + 0)), fubyte((void *)(frame->tf_rip + 1)), fubyte((void *)(frame->tf_rip + 2)), From nobody Tue Mar 10 11:43:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX875jmdz6VVxw for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX870WS8z49Z9 for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qmd2iDgM2lRCvQwYOhZN4RJ4x+sdBYsE2mvSVfsBOb0=; b=SXvysv6hWjfCLcnI0+kFWzgcEzM1UvxiJOU3YiwV3WfXnzjRBck2zLM27f83pDTzPEUWsT bTLjmBzHt6sEFNJI/W6rt/rIJhX0IgPQDMiKLKVPzww51W5aULwdhdHxjSrkZNRBwK8pDr U0+SqbBJekeREz52ThR+5CAVkJnQrfA3ZSWY4PM+jH0p0Lk5QFX1ZG3ElysnNvMvkMcOXA e+aODlf0dZYHXQ6Gb5q1/LPCU7o1hZCO5Tiwa0M2yQ6n7lPdXqSVNPDLC3jzmd6XkNLfq/ 4l0IqWoZkEafVY0RVs0Cn1dQ4rb5cEXUrfzjaPY+MMPqoYaMICnaOJrpOactwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143015; a=rsa-sha256; cv=none; b=yxHZLqvGYEEbAb2J2wUqvinXXuLyK2vOw7jz9XDJbOd4vajY3+6VVNNqQJvjoEdt79u75Y 2Av41L6F76gXE6yryC4eAs362M2InCjhAjuWlY7yDCwNWToaIOfmzHK4YisSz8PGiLi6pN K9XUqriTJU3AR3AnVOqTDbdHBIDU3uXe6DmFwcbULTDmpghC2l4rjBsYh76V1tdbTWGwQU QFcjZ9PxwPUnFu5wCa4xNS6pQQoBe5AWAffP4posqlWfSYbyKQ1g6IPocVh/AGwsK2vyf9 8Y4vv8LgMR8RDna7Vm+wa0w97zFfxMFk/6dYErVnIvM2xCYXDb7ktkw2gtap6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qmd2iDgM2lRCvQwYOhZN4RJ4x+sdBYsE2mvSVfsBOb0=; b=FGO8rNo2iqU50WY3LTh37Hx9zCbDRbArIxRVTyy5xw7FFcuZGdO1erDGlq43eID+gHIy+i KIoMFC6urvHdTRIfismzrrnsDGD8HuubRuFOy0VVtHfpDWD3idzFk6E5pskDHPQLVfWVpE CSFvTdGEJXV1AaERK595L5l9f3bic7wLAoAKu0XZVRdE7JnQK0I2E8HaFht9OBFv1EVMZw M4Hh0sy8yq3cn6eGRjxZ/luRxrkHsbBEfblqkloHMwZ8jYM++6I1cS3RjnokMzofdekfms HGfe4PmGT6ZEowsRVz/cq+0K9sLt9fwxQ1RnkvSRR97YvxW80eEbfS2EkwCsIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8655yKz195N for ; Tue, 10 Mar 2026 11:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c272 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b0ca929c27ea - stable/15 - x86: change signatures of ipi_{bitmap,swi}_handler() to take pointer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b0ca929c27ea012b648be9a5b6373f851e4ccf40 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:34 +0000 Message-Id: <69b003e6.1c272.209f7832@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0ca929c27ea012b648be9a5b6373f851e4ccf40 commit b0ca929c27ea012b648be9a5b6373f851e4ccf40 Author: Konstantin Belousov AuthorDate: 2026-02-27 03:54:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 x86: change signatures of ipi_{bitmap,swi}_handler() to take pointer (cherry picked from commit fdc1f34506346fd26db8bfb80ba69d1af844c53a) --- sys/amd64/amd64/apic_vector.S | 2 ++ sys/i386/i386/apic_vector.S | 4 ++-- sys/i386/i386/mp_machdep.c | 14 ++++++++++++++ sys/x86/include/x86_smp.h | 4 ++-- sys/x86/x86/mp_x86.c | 10 +++++----- sys/x86/xen/xen_apic.c | 4 ++-- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index e98bae9eb6c5..d3ff3c238b48 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -179,6 +179,7 @@ IDTVEC(spuriousint) INTR_HANDLER ipi_intr_bitmap_handler call as_lapic_eoi KMSAN_ENTER + movq %rsp,%rdi call ipi_bitmap_handler KMSAN_LEAVE jmp doreti @@ -209,6 +210,7 @@ IDTVEC(spuriousint) INTR_HANDLER ipi_swi call as_lapic_eoi KMSAN_ENTER + movq %rsp,%rdi call ipi_swi_handler KMSAN_LEAVE jmp doreti diff --git a/sys/i386/i386/apic_vector.S b/sys/i386/i386/apic_vector.S index 5d248409718d..0037f1c968fb 100644 --- a/sys/i386/i386/apic_vector.S +++ b/sys/i386/i386/apic_vector.S @@ -261,7 +261,7 @@ IDTVEC(ipi_intr_bitmap_handler) cld KENTER call as_lapic_eoi - movl $ipi_bitmap_handler, %eax + movl $ipi_bitmap_handler_i386, %eax call *%eax jmp doreti @@ -306,7 +306,7 @@ IDTVEC(ipi_swi) cld KENTER call as_lapic_eoi - movl $ipi_swi_handler, %eax + movl $ipi_swi_handler_i386, %eax call *%eax jmp doreti diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 18ec0d83fad3..0913a0f70d14 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -736,3 +736,17 @@ invlcache_handler(void) wbinvd(); PCPU_SET(smp_tlb_done, generation); } + +void ipi_bitmap_handler_i386(struct trapframe frame); +void +ipi_bitmap_handler_i386(struct trapframe frame) +{ + ipi_bitmap_handler(&frame); +} + +void ipi_swi_handler_i386(struct trapframe frame); +void +ipi_swi_handler_i386(struct trapframe frame) +{ + ipi_swi_handler(&frame); +} diff --git a/sys/x86/include/x86_smp.h b/sys/x86/include/x86_smp.h index 5cecfab9d183..84601a379e19 100644 --- a/sys/x86/include/x86_smp.h +++ b/sys/x86/include/x86_smp.h @@ -96,10 +96,10 @@ void init_secondary_tail(void); void init_secondary(void); void ipi_startup(int apic_id, int vector); void ipi_all_but_self(u_int ipi); -void ipi_bitmap_handler(struct trapframe frame); +void ipi_bitmap_handler(struct trapframe *frame); void ipi_cpu(int cpu, u_int ipi); int ipi_nmi_handler(void); -void ipi_swi_handler(struct trapframe frame); +void ipi_swi_handler(struct trapframe *frame); void ipi_selected(cpuset_t cpus, u_int ipi); void ipi_self_from_nmi(u_int vector); void set_interrupt_apic_ids(void); diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index 8345117f5b6f..a04b4aaa704e 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -1328,14 +1328,14 @@ ipi_send_cpu(int cpu, u_int ipi) } void -ipi_bitmap_handler(struct trapframe frame) +ipi_bitmap_handler(struct trapframe *frame) { struct trapframe *oldframe; struct thread *td; int cpu = PCPU_GET(cpuid); u_int ipi_bitmap; - kasan_mark(&frame, sizeof(frame), sizeof(frame), 0); + kasan_mark(frame, sizeof(*frame), sizeof(*frame), 0); td = curthread; ipi_bitmap = atomic_readandclear_int(&cpuid_to_pcpu[cpu]-> @@ -1353,7 +1353,7 @@ ipi_bitmap_handler(struct trapframe frame) td->td_intr_nesting_level++; oldframe = td->td_intr_frame; - td->td_intr_frame = &frame; + td->td_intr_frame = frame; #if defined(STACK) || defined(DDB) if (ipi_bitmap & (1 << IPI_TRACE)) stack_capture_intr(); @@ -1707,10 +1707,10 @@ cpususpend_handler(void) * Handle an IPI_SWI by waking delayed SWI thread. */ void -ipi_swi_handler(struct trapframe frame) +ipi_swi_handler(struct trapframe *frame) { - intr_event_handle(clk_intr_event, &frame); + intr_event_handle(clk_intr_event, frame); } /* diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c index 43a253cc2860..c8760545c8e9 100644 --- a/sys/x86/xen/xen_apic.c +++ b/sys/x86/xen/xen_apic.c @@ -217,7 +217,7 @@ static int xen_ipi_bitmap_handler(void *arg) { - ipi_bitmap_handler(*curthread->td_intr_frame); + ipi_bitmap_handler(curthread->td_intr_frame); return (FILTER_HANDLED); } @@ -296,7 +296,7 @@ static int xen_ipi_swi_handler(void *arg) { - ipi_swi_handler(*curthread->td_intr_frame); + ipi_swi_handler(curthread->td_intr_frame); return (FILTER_HANDLED); } From nobody Tue Mar 10 11:43:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX880d7xz6VWF6 for ; Tue, 10 Mar 2026 11:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX876SrMz49cf for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqWufFMpVBsB33fsbFrYQfWa/1wmDvgZ5qENSSVkfEQ=; b=oIlVn3v7G7G8liJdGxyv5Q77obPcF+4KBeW3lQVyFp6IsJuIDBDUd5t/nVingJ+FnGMfqw YyLvatCytroM0cSUOSX+u5Qj1+9BSeB4IaIbTJ4fcEFHxOXoOlkI1TEa2gBfKzDFQHy8v+ KWfRQVevvfqH8Wi9C4NwNCSnkFHebtzvw5heoF14dV4FPmE5T1/X9bVi+8Ik+610eSHszA K64YvnT36rdCgLIpwBbk8UPEgA1070pQkuD+F9EOZnUaeSaAXiqwzNrlMCEBtFYvk+xZr2 Xzd6W3lnGxMSZqf5GvEKt0Qzb+26v8/vgKKEWzbpkZNUKQnFZ3a68UVQW2vc2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143015; a=rsa-sha256; cv=none; b=OG8srDnDUJuddTn9gZmt1n4yrsUfLyAQifo4eEzvsuYYyBS3jOaQdLzirVk/0lWtBY8Km8 RQ+4n8YvRtm/8tC20A3mI8GSk/AvcAM/uErgSgXO10vdGOE3vKdatPV3dwiJdt/B6qlekE 4QOOe6ktw5TjULj8Hyra0V5ggdQ6DYmyK+Q15NGxenjpCVUKNZcmGenrrf4KW0yijrudGh lQ7tSq2QLXUVLZ+T7tls2KKSubMiFZ2qPI+7XGmlwHQ5Rk/36ebizHohnLusGHv0I8QB9x 1r7BExtSV4dIy6WLdVp1UcjQAO+45j5IpnyPRr5uTzAsazn8QSzGhBj69loREw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqWufFMpVBsB33fsbFrYQfWa/1wmDvgZ5qENSSVkfEQ=; b=Se8KcXab6bOJfP6C18kGFiA/FSJbvMLoV10McbNdqeu4rAzLwlKnK/DS382rarpGbU2xNO frp+MXVLez6wDlA/X3lRI3EfjsyedYRd8vYQ7xI6/m3phj7breWcodkeJXafxBBjAZ8V8L YrIGjo53U7lCQtNSUeB9a2xBoVP3WlyWPEH4zoJ1fLCu38t92fp/WcawRZ0ZZJ7GgI4vbg zMPCxszcBslOlBFtLWOCK71AuwJ2xtlZr8zKGPhFrnJ5XKz/CQFCd29fKcnOyLzZCDj1PL aaX5ubBVPIWOUXevigZdnvU0iOWEcn5uEwgRUOmcYHaHzQObBB+bV7NrnkQu2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX875x8lz195P for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0b0bbdac18d1 - stable/15 - zfs rename: properly cleanup on errors occuring before zfs_do_rename() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0b0bbdac18d153e365e20989e23636d51214f972 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:35 +0000 Message-Id: <69b003e7.1be4c.68b43bb6@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0b0bbdac18d153e365e20989e23636d51214f972 commit 0b0bbdac18d153e365e20989e23636d51214f972 Author: Konstantin Belousov AuthorDate: 2026-03-05 02:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 zfs rename: properly cleanup on errors occuring before zfs_do_rename() (cherry picked from commit ed87040311b88e2c95a791aa049f2c37c857f048) --- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 42565b579de7..7ea6f119130b 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -5518,15 +5518,24 @@ zfs_freebsd_rename(struct vop_rename_args *ap) } #endif - if (error == 0) + if (error == 0) { error = zfs_do_rename(fdvp, &fvp, ap->a_fcnp, tdvp, &tvp, ap->a_tcnp, ap->a_fcnp->cn_cred); - - vrele(fdvp); - vrele(fvp); - vrele(tdvp); - if (tvp != NULL) - vrele(tvp); + vrele(fdvp); + vrele(fvp); + vrele(tdvp); + if (tvp != NULL) + vrele(tvp); + } else { + if (tdvp == tvp) + vrele(tdvp); + else + vput(tdvp); + if (tvp != NULL) + vput(tvp); + vrele(fdvp); + vrele(fvp); + } return (error); } From nobody Tue Mar 10 11:43:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX892p5Bz6VW8F for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX890F07z49g2 for ; Tue, 10 Mar 2026 11:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7mGFUf+DGslPxgliQWaPZc6jSUozPaK7SjYjyXw62g=; b=ZZs3d0ZqIIu+mhapqwO5bQ/J1xJ60q55/9Y5OJ3KfwkSumw6dnHOZLTx9vQWo4TX0XkDDR ekdVuSJfr78yHNdiyO8ew9PO6zeixPMLsAc7IiWUmKcpHSA0zxKNrDISTm3kPdm3zdcKeV ZEg+Qf8KkWwXR10fQY6h19RGQ4/LvYu0hv8HQZv+tQfVDzjwthFiBBTfLS5Lmx4kYKShee U27gNT24upn0KLS9Vt44rlzwxvYFg1lmY9/8Hpis4+sBoeeSR1uak6cAlloNKakHe1JQ7K S4QA8j4VD+drZbm/I9wM4oNTtQrAJRjsBMK8A7/LNqwNUgPTFeBliRbGWplEvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143017; a=rsa-sha256; cv=none; b=DqzjUI1RwNCDfRfdpeHuo/oD6JB7RMMGQqFE6wxHfSDwekDEHfqQp5v//Ctuhn1mDlmyF6 Mhkp77PaXQHZzzIqWH+YXNH1pGbhoLhFJBful4ba+39S4NCe0zENuiKSjkvxvada92i9Oe DfzAnrAX8EP9y9AykNEIxTM+C8aLQdJRFNQP1xnLGZrWgcIJC/5x34NZ/wit5A2jVhgs+j RIHGFcJp+RhfI+1hzbGJYzxfcdctVyDXjYeM/7iNPBFEe0H8mEBhXot7IS8BQwGdRhZkuS /NrqeshIOdYsxKokJ6fm854l9PMRtfq1binjmf3qfLJgfOACP8PLDuqbGf8KJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7mGFUf+DGslPxgliQWaPZc6jSUozPaK7SjYjyXw62g=; b=isF1FkNN2U2PyIScxZGv1ylgEJ8fpHE2scVvPcpRvIuI8nAVkW6I1p0iwq//1NC3hfobPt faGVz00VqafNIAl+VYUMJIJOSLDpUTqvbOh5BlKEsLYnsMSgJlLwEOBdkDDz1w5iKzO9gH 2IpEnckz80RuCha5kU7l/8Yd6K/kfjLIESGkI5Em9Inpv5PUMLO9A+8b3enMFpGozC814k wNoMt08AQ/Q0HWyuywxfSW9n11cLFSrGv77qOf5jrflFHEO7bNUyCCtlFAO/T8PgDBLs9m 1HsLoemnbCBZpYAILU1iyhv5feiy+JVarqd3XUWT/7wtNuJeaZuje8aTsf1dlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX886rhgz18sP for ; Tue, 10 Mar 2026 11:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19cfa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 45401a4bdec4 - stable/15 - VOP_RENAME(9): add flags argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 45401a4bdec4a1c2d6bf7bc9deaaf858da7e41e4 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:36 +0000 Message-Id: <69b003e8.19cfa.68a865e7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=45401a4bdec4a1c2d6bf7bc9deaaf858da7e41e4 commit 45401a4bdec4a1c2d6bf7bc9deaaf858da7e41e4 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:22:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 VOP_RENAME(9): add flags argument (cherry picked from commit e486066cf48a89ba87fab6b3d2b56f271f50439b) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 3 +++ sys/fs/fuse/fuse_vnops.c | 4 ++++ sys/fs/msdosfs/msdosfs_vnops.c | 5 +++++ sys/fs/nfsclient/nfs_clvnops.c | 6 ++++++ sys/fs/nfsserver/nfs_nfsdport.c | 2 +- sys/fs/nullfs/null_vnops.c | 3 ++- sys/fs/p9fs/p9fs_vnops.c | 5 +++++ sys/fs/smbfs/smbfs_vnops.c | 5 +++++ sys/fs/tmpfs/tmpfs_vnops.c | 5 +++++ sys/fs/unionfs/union_vnops.c | 7 ++++++- sys/kern/vfs_syscalls.c | 2 +- sys/kern/vnode_if.src | 1 + sys/ufs/ufs/ufs_vnops.c | 7 +++++++ 13 files changed, 51 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 7ea6f119130b..ed4aa19b96e5 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -5518,6 +5518,9 @@ zfs_freebsd_rename(struct vop_rename_args *ap) } #endif + if (error == 0 && ap->a_flags != 0) + error = EOPNOTSUPP; + if (error == 0) { error = zfs_do_rename(fdvp, &fvp, ap->a_fcnp, tdvp, &tvp, ap->a_tcnp, ap->a_fcnp->cn_cred); diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 9c0fa0a5b6f9..3bfc5396c365 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2171,6 +2171,10 @@ fuse_vnop_rename(struct vop_rename_args *ap) err = EXTERROR(EXDEV, "Cross-device rename"); goto out; } + if (ap->a_flags != 0) { + err = EOPNOTSUPP; + goto out; + } cache_purge(fvp); /* diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 6dfac1b4ebd2..3e28a7ce9d05 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -970,6 +970,11 @@ msdosfs_rename(struct vop_rename_args *ap) goto abortit; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto abortit; + } + /* * If source and dest are the same, do nothing. */ diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 0d54b869d74c..5eea16d0f129 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2196,6 +2196,12 @@ nfs_rename(struct vop_rename_args *ap) error = EXDEV; goto out; } + + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto out; + } + nmp = VFSTONFS(fvp->v_mount); if (fvp == tvp) { diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 567de6422b7c..63f7b5ecf564 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -1715,7 +1715,7 @@ out: if (error == 0) { error = VOP_RENAME(fromndp->ni_dvp, fromndp->ni_vp, &fromndp->ni_cnd, tondp->ni_dvp, tondp->ni_vp, - &tondp->ni_cnd); + &tondp->ni_cnd, 0); lockmgr(&mp->mnt_renamelock, LK_RELEASE, 0); vfs_rel(mp); } else { diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index acbe4cb03f76..a3daa2d8dd54 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -737,7 +737,8 @@ null_rename(struct vop_rename_args *ap) ltvp = NULL; } - error = VOP_RENAME(lfdvp, lfvp, ap->a_fcnp, ltdvp, ltvp, ap->a_tcnp); + error = VOP_RENAME(lfdvp, lfvp, ap->a_fcnp, ltdvp, ltvp, ap->a_tcnp, + ap->a_flags); vrele(fdvp); vrele(fvp); vrele(tdvp); diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index acb73973d93b..ad1eb50276e3 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -2084,6 +2084,11 @@ p9fs_rename(struct vop_rename_args *ap) goto out; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto out; + } + /* warning if you are renaming to the same name */ if (fvp == tvp) error = 0; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index 63b249c93771..690f30681332 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -577,6 +577,11 @@ smbfs_rename(struct vop_rename_args *ap) goto out; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto out; + } + if (tvp && vrefcnt(tvp) > 1) { error = EBUSY; goto out; diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index e1bc0d156baa..5596f8794546 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -993,6 +993,11 @@ tmpfs_rename(struct vop_rename_args *v) goto out; } + if (v->a_flags != 0) { + error = EOPNOTSUPP; + goto out; + } + /* If source and target are the same file, there is nothing to do. */ if (fvp == tvp) { error = 0; diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 602d5fdfcb97..9dccecaef5f7 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1413,6 +1413,11 @@ unionfs_rename(struct vop_rename_args *ap) goto unionfs_rename_abort; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto unionfs_rename_abort; + } + /* Renaming a file to itself has no effect. */ if (fvp == tvp) goto unionfs_rename_abort; @@ -1581,7 +1586,7 @@ unionfs_rename(struct vop_rename_args *ap) if (rfvp == rtvp) goto unionfs_rename_abort; - error = VOP_RENAME(rfdvp, rfvp, fcnp, rtdvp, rtvp, tcnp); + error = VOP_RENAME(rfdvp, rfvp, fcnp, rtdvp, rtvp, tcnp, ap->a_flags); if (error == 0) { if (rtvp != NULLVP && rtvp->v_type == VDIR) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 5eaa9d0ef120..0af4e9d08253 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3887,7 +3887,7 @@ again1: out: if (error == 0) { error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, - tond.ni_dvp, tond.ni_vp, &tond.ni_cnd); + tond.ni_dvp, tond.ni_vp, &tond.ni_cnd, 0); NDFREE_PNBUF(&fromnd); NDFREE_PNBUF(&tond); } else { diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 3faefb607f24..6b7448d9f1df 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -336,6 +336,7 @@ vop_rename { IN WILLRELE struct vnode *tdvp; IN WILLRELE struct vnode *tvp; IN struct componentname *tcnp; + IN u_int flags; }; diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 736c5a66267e..429e6b5c8dd7 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1255,6 +1255,7 @@ ufs_rename( struct vnode *a_tdvp; struct vnode *a_tvp; struct componentname *a_tcnp; + u_int a_flags; } */ *ap) { struct vnode *tvp = ap->a_tvp; @@ -1293,6 +1294,12 @@ ufs_rename( goto releout; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + mp = NULL; + goto releout; + } + fdvp_s = fvp_s = tdvp_s = tvp_s = SEQC_MOD; relock: /* From nobody Tue Mar 10 11:43:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8B2qMKz6VW8J for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8B1lTVz49XH for ; Tue, 10 Mar 2026 11:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TIM224sA3TchGMr8pvslAMclzE5JtbZyTj3IHhdY8hk=; b=lsTMlgsEGjdEugSCgr8QvQUAOjJOZ8vHRXk6ISGwWnnlm4dICLpxiwpqI6pKDNrtHdblRg bc0/sDsXnl6rDQkirQKQTaVyy1KUVXJOYfMUVXogF2FTCQLd2AiAvNoGgcmfGi6otbvdln XbwSgR+MDCg4ivYnSIhNeJokZcvBb8XOW2G8du+pMaFkRT8VBJ+Rd1zhFkpAQzSL8FgC7Q 53tTK+v6NqPzPlPk45dYTmmBSoEWaf44v3yCXG2qXTao0pI/sGgDXONzn565GRDw60P8V7 Hk5IpI8OOf/tzFY2L/r1kLQWqiBCED2q//HFB2FywPGxt8+0sHR7lOHihdSe2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143018; a=rsa-sha256; cv=none; b=CwI8pR7PMKHCI0mwvu3wTzjpul+Ds1sgWEw/cuMSOZ/Wj7CkBQVR9CiX3KDA45H22WKVNC MlUJ2ZpDD6dDejdxzdOIZyhuzB5zVv9ujNH5crQiyuyYzdInVODwk3KNRje8P34tT4w/Wm nw0MirJ22fJduATmPpT/SzN95XEecBNxm8TDdCuZUl/j436KXU/zluu0hfg00jgMY99HDp r0k4oMCV8RiC5H07m4EkuOxuKxoCoYFxI2PSLJDySZBf/XG3fueilVLPI8L2snz5f0Fb1o 4Y65HufUelqNLsTvRq+M7s75+BEBOGiYleW3bkaHtEH9T40JuFDYcoZE+caIxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TIM224sA3TchGMr8pvslAMclzE5JtbZyTj3IHhdY8hk=; b=ZFagyJrtuHXuD4d5sSdrNTxrfGLBBfmZCNQuymAhzBLDY8cQtUsx5sdZic3kvvTRSp8R5j VI10/KIJH8Fif/W75yTfXsd8at0VGMhhNCuIsjE/SR0XcwoV3h57GVbWAzozijRItBpI6R E8n2zjAWQAyq3/Y1uF/iS3DYONo4OnTTW0cfigNDZPMT2EeyuX9jWZQS9wBkQkIagxkOtv 2zzK4w0+0l02WzwbDjGCjaYdjQNZJbYERMPJ86dg0FlHcR/VpA0WVUjaGhXaV56eSBLCFB 3OiIO5Z7j5nRl8MdondtRqyIYBEFObLijif9bRpvJZdlyfBU7iWpvxdeczL6Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8B0Z9Dz19H6 for ; Tue, 10 Mar 2026 11:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d188 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bbdf04567777 - stable/15 - kern_renameat(9): add flags argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bbdf045677774b7307e0b93e126f0cfc769a7139 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:38 +0000 Message-Id: <69b003ea.1d188.677f7bdb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bbdf045677774b7307e0b93e126f0cfc769a7139 commit bbdf045677774b7307e0b93e126f0cfc769a7139 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:30:14 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 kern_renameat(9): add flags argument (cherry picked from commit 1f3020067ab3f3c5043d01ea1e3a3d2998a39d4a) --- sys/compat/linux/linux_file.c | 4 ++-- sys/kern/vfs_syscalls.c | 8 ++++---- sys/sys/syscallsubr.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index ca089585bb95..43ccac0308d3 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -811,7 +811,7 @@ linux_rename(struct thread *td, struct linux_rename_args *args) { return (kern_renameat(td, AT_FDCWD, args->from, AT_FDCWD, - args->to, UIO_USERSPACE)); + args->to, UIO_USERSPACE, 0)); } #endif @@ -858,7 +858,7 @@ linux_renameat2(struct thread *td, struct linux_renameat2_args *args) olddfd = (args->olddfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->olddfd; newdfd = (args->newdfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->newdfd; return (kern_renameat(td, olddfd, args->oldname, newdfd, - args->newname, UIO_USERSPACE)); + args->newname, UIO_USERSPACE, 0)); } #ifdef LINUX_LEGACY_SYSCALLS diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 0af4e9d08253..59bdedf184c6 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3720,7 +3720,7 @@ sys_rename(struct thread *td, struct rename_args *uap) { return (kern_renameat(td, AT_FDCWD, uap->from, AT_FDCWD, - uap->to, UIO_USERSPACE)); + uap->to, UIO_USERSPACE, 0)); } #ifndef _SYS_SYSPROTO_H_ @@ -3736,7 +3736,7 @@ sys_renameat(struct thread *td, struct renameat_args *uap) { return (kern_renameat(td, uap->oldfd, uap->old, uap->newfd, uap->new, - UIO_USERSPACE)); + UIO_USERSPACE, 0)); } #ifdef MAC @@ -3766,7 +3766,7 @@ kern_renameat_mac(struct thread *td, int oldfd, const char *old, int newfd, int kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, - const char *new, enum uio_seg pathseg) + const char *new, enum uio_seg pathseg, u_int flags) { struct mount *mp, *tmp; struct vnode *tvp, *fvp, *tdvp; @@ -3887,7 +3887,7 @@ again1: out: if (error == 0) { error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, - tond.ni_dvp, tond.ni_vp, &tond.ni_cnd, 0); + tond.ni_dvp, tond.ni_vp, &tond.ni_cnd, flags); NDFREE_PNBUF(&fromnd); NDFREE_PNBUF(&tond); } else { diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 908a3b89259b..1154e73a6fd3 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -305,7 +305,7 @@ int kern_readv(struct thread *td, int fd, struct uio *auio); int kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, struct mbuf **controlp); int kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, - const char *new, enum uio_seg pathseg); + const char *new, enum uio_seg pathseg, u_int flags); int kern_frmdirat(struct thread *td, int dfd, const char *path, int fd, enum uio_seg pathseg, int flag); int kern_sched_getparam(struct thread *td, struct thread *targettd, From nobody Tue Mar 10 11:43:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8C3YhNz6VWH4 for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8C1tw5z49gX for ; Tue, 10 Mar 2026 11:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5m/r8dUzVyYf8vR3sxVSHZEnXNFG0Z4HnQo/7fj27cc=; b=ik6fwUbV3mwVvYj+CQpLAlNv54kj1voO91Eq12xyHwnBscV3CmuZ/L+6f4hrwh5DwOjiiM 70Hl1kkuX4Gp705fiQZFzEEp8p84xK8AJT4NlMk4lizj84zyy1kWaT1wWU+QVtsQ4f/9JF QaJrecHZ5ZdTABcnNTSHrA8525Iv15YdkYrlpLN02BCiFN4BH/7wx1dbS5ufEK+07yeOmy GjoxwJKEWa+VVOhW4dkOSlHyIWW6mD0dIu+iHDFPm1NuWmV9XYcBg3TgJ4gDXEks4u4YXH F7iuA1FnPItHz+8Ase6i9PSsXBTr5f0NlV6uMwpRscsyH8/18Cp5lj0jKT5gqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143019; a=rsa-sha256; cv=none; b=Gy2GIwYDI/oJ8ALeb6LPQ2Iem7tgQwwSRvkn5a+4V1dpeFdmv3mkOFt7d6HdCNN7XP7on1 M0yhp7V2kgtsvRPgZ/ZK+NkOecSAf7wR+JzU5nNJGCqHaQd73ycjElp1YPl/B36xZcJhQm z15id2i3Z+sPPHUi0F31mlptiK8eypZ1Wkh2PzwXwQJbdt0KhCKh6QtZ6u+FQ0UUpKg5ZB 6RcIEKzPx1zFJaITpKXHos4v29k0WWeyRubOM+c2YaTu0JvLXYYgiVzFWr42yy94TbwkaC BfIrA14Ju6myPTcNp2dS1b6qalePZAyr5T4JndrAhxR5shp/hG2JFER6fb2KIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5m/r8dUzVyYf8vR3sxVSHZEnXNFG0Z4HnQo/7fj27cc=; b=utQwcXUVy2Sciag3EWyYoTHvaVRgF3bnH9t8Q0WXCer0kTbznlOAHUXh4VghINoBJkxWxM MDf7h5pl0f2xKJ053nPlNRNauVZesTp/tY21tb1m4JOs99G6Y9KMRoIGxodCYqI7FFJLLE n+W3WsGzV8e4PvXzEBFNBjN8VsndmkM+Fxj2udg6hchZKNaiD9hoGBRGHopWll9PxIKA3/ O1TVHLyDbz+uhMYnlD9U9gi5FesjiOA/oOQ4PgIdZS05rSWUyCQ+aV9wXdXEjJxCAaYb1Q J2L4p9a32QYMs63EpTRjnxqktR9hQjY0pY3zQm/wtzKLQc+y8ONu/bay9Qiy7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8C16SDz19Sn for ; Tue, 10 Mar 2026 11:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bebb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 522dbeb9f259 - stable/15 - sys: add renameat2(2) syscall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 522dbeb9f259ab333927685fb7ecda41ffd96b77 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:39 +0000 Message-Id: <69b003eb.1bebb.51e4118c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=522dbeb9f259ab333927685fb7ecda41ffd96b77 commit 522dbeb9f259ab333927685fb7ecda41ffd96b77 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:33:33 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 sys: add renameat2(2) syscall (cherry picked from commit 28599a1e5f1b90676a818e0a4818cddd0839ad25) --- include/stdio.h | 1 + lib/libsys/Symbol.sys.map | 1 + sys/kern/syscalls.master | 10 +++++++++- sys/kern/vfs_syscalls.c | 10 ++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/stdio.h b/include/stdio.h index 34e877b60c14..753c7f3df03f 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -398,6 +398,7 @@ int fdclose(FILE *, int *); char *fgetln(FILE *, size_t *); const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); +int renameat2(int, const char *, int, const char *, unsigned int); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); int vasprintf(char **, const char *, __va_list) diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 46767f5b6a4d..7f5c252af91b 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -393,6 +393,7 @@ FBSD_1.8 { FBSD_1.9 { pdrfork; pdrfork_thread; + renameat2; }; FBSDprivate_1.0 { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index d711f21bee4d..6856a0907d48 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3413,5 +3413,13 @@ _Out_opt_ _Contains_long_ptr_ struct __siginfo *info ); } - +602 AUE_RENAMEAT STD|CAPENABLED { + int renameat2( + int oldfd, + _In_z_ const char *old, + int newfd, + _In_z_ const char *new, + int flags + ); + } ; vim: syntax=off diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 59bdedf184c6..fdd215f1c9f9 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3739,6 +3739,14 @@ sys_renameat(struct thread *td, struct renameat_args *uap) UIO_USERSPACE, 0)); } +int +sys_renameat2(struct thread *td, struct renameat2_args *uap) +{ + + return (kern_renameat(td, uap->oldfd, uap->old, uap->newfd, uap->new, + UIO_USERSPACE, uap->flags)); +} + #ifdef MAC static int kern_renameat_mac(struct thread *td, int oldfd, const char *old, int newfd, @@ -3775,6 +3783,8 @@ kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, int error; short irflag; + if (flags != 0) + return (EINVAL); again: tmp = mp = NULL; bwillwrite(); From nobody Tue Mar 10 11:43:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8F4NjCz6VWKS for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8F31Bkz49Vx for ; Tue, 10 Mar 2026 11:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LiZqazwtjKJbu/Gs6vVxTzopWWs1Xoou4leDN908bqM=; b=bJCm7qvCCesF2ilJRFXrRFDtcLZyepbS/DGYuIMtDpNg8QceEauoMArOSnIpAjpuBNtrcb 1r7IdPjrr3aMaOkQNiJpfqNq3whW+5bVTKnjt+zsy5OQWWlXcQwR6OJhu48fyoUYmak1os 7mJRxlRNRyi2gJweZAj6nP3tXk+pC64AVH8c7+EqlvziI+fp81PV35r+bIBPsaWKmDRJQJ +3oVmVCADEtXuloPtCEuDt3efccRx+tB1CFyLmROhHq9zxNpp3nqIceoAUw5LdIXJLhhQg VAkQLIFO2gKkBEkip6pR6k2Ivz6HPPW86qfAxeA+pGDcrBKwG8s5Y00GVcJUJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143021; a=rsa-sha256; cv=none; b=FBgZr6F4HGPJb93/7e0LYZFNfWiG9hkpUBA6T2C8F7RR1Phfqv7VBmMMtxIuPHmZFG1tID j8qla6x7kGO/QlDFriG85vWql9KZMxdp4bRwDNQlLTo3ZsXvd0eNDOTKkoIHsbNIAGrM0c +nGT6jsjfxCiNo59BtKuAoU+Sp+rGDY3lU7DULNj+wSIFCR0jYmT9ETLs/5MvB3nHnBN8+ 33bYC2otqD39BNin25904LS/vLkDwfmagQlAp6icZxYslFSuyE51bCwV29XZZy2f1Vhy0Z RgVUuXDBfAaBhs2V5iuIHK9qLcJh5ieyiXYKX+BSi5VT4nEoeB7wtzA19z/h2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LiZqazwtjKJbu/Gs6vVxTzopWWs1Xoou4leDN908bqM=; b=ny/nYgbeD7OlvkrYjDMv/2KAASykP0F4Qjx7Zrwp7xJBW3BslIOrXsmxs5vTTRcHYoe6M2 sgQh7t7T6d+RMjLvD83VcWE38bF4XvA+yTfXjidv9WDg5dk4EOA/+xvz4T9fgBGIw95I4S u8RKMzB2eqU7ap6gOGe/n2kWdr/tMszuZ1vNzDVGWVyh7QgjMLDerilDmnFd5P0MDAWlHU bQBwc7pWu5k3INIOnGolYZY0yvO/RklPiN/CYYRRzAMRvcLMYJviRBYyaDtN385IW5fPaD 6l00XVHMCYYycK83NFnrBMgI8RTvXXlxIKhxYLzxBP4YHLr24rCbZZHiG4mJAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8F2Yjjz19H7 for ; Tue, 10 Mar 2026 11:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 72cf8b9e680b - stable/15 - zfs: implement AT_RENAME_NOREPLACE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 72cf8b9e680b65cd07e883a3a872d38825f267c5 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:41 +0000 Message-Id: <69b003ed.1df82.8f7e3a0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=72cf8b9e680b65cd07e883a3a872d38825f267c5 commit 72cf8b9e680b65cd07e883a3a872d38825f267c5 Author: Konstantin Belousov AuthorDate: 2026-03-01 13:16:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 zfs: implement AT_RENAME_NOREPLACE (cherry picked from commit 7a1217ff3bbdd1ef40d1b94170c53611fadeb026) --- .../include/os/freebsd/zfs/sys/zfs_vnops_os.h | 4 ++-- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 25 +++++++++++++++------- sys/contrib/openzfs/module/zfs/zfs_replay.c | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h index e27c6527e2b6..17ba5255b7b2 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h @@ -42,8 +42,8 @@ extern int zfs_rmdir(znode_t *dzp, const char *name, znode_t *cwd, extern int zfs_setattr(znode_t *zp, vattr_t *vap, int flag, cred_t *cr, zidmap_t *mnt_ns); extern int zfs_rename(znode_t *sdzp, const char *snm, znode_t *tdzp, - const char *tnm, cred_t *cr, int flags, uint64_t rflags, vattr_t *wo_vap, - zidmap_t *mnt_ns); + const char *tnm, cred_t *cr, int flags, uint64_t rflags, u_int at_flags, + vattr_t *wo_vap, zidmap_t *mnt_ns); extern int zfs_symlink(znode_t *dzp, const char *name, vattr_t *vap, const char *link, znode_t **zpp, cred_t *cr, int flags, zidmap_t *mnt_ns); extern int zfs_link(znode_t *tdzp, znode_t *sp, diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index ed4aa19b96e5..1b3eeb4353fe 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -3247,7 +3247,7 @@ zfs_rename_check(znode_t *szp, znode_t *sdzp, znode_t *tdzp) static int zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr); + cred_t *cr, u_int at_flags); /* * Move an entry from the provided source directory to the target @@ -3258,6 +3258,7 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, * tdvp - Target directory to contain the "new entry". * tcnp - New entry name. * cr - credentials of caller. + * at_flags - AT_RENAME_* * INOUT: svpp - Source file * tvpp - Target file, may point to NULL initially * @@ -3269,7 +3270,7 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, static int zfs_do_rename(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr) + cred_t *cr, u_int at_flags) { int error; @@ -3298,7 +3299,8 @@ zfs_do_rename(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, return (error); } - error = zfs_do_rename_impl(sdvp, svpp, scnp, tdvp, tvpp, tcnp, cr); + error = zfs_do_rename_impl(sdvp, svpp, scnp, tdvp, tvpp, tcnp, cr, + at_flags); VOP_UNLOCK(sdvp); VOP_UNLOCK(*svpp); out: @@ -3313,7 +3315,7 @@ out: static int zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr) + cred_t *cr, u_int at_flags) { dmu_tx_t *tx; zfsvfs_t *zfsvfs; @@ -3422,6 +3424,11 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, * Does target exist? */ if (tzp) { + if ((at_flags & AT_RENAME_NOREPLACE) != 0) { + error = SET_ERROR(EEXIST); + goto out; + } + /* * Source and target must be the same type. */ @@ -3542,7 +3549,8 @@ out: int zfs_rename(znode_t *sdzp, const char *sname, znode_t *tdzp, const char *tname, - cred_t *cr, int flags, uint64_t rflags, vattr_t *wo_vap, zidmap_t *mnt_ns) + cred_t *cr, int flags, uint64_t rflags, u_int at_flags, vattr_t *wo_vap, + zidmap_t *mnt_ns) { struct componentname scn, tcn; vnode_t *sdvp, *tdvp; @@ -3574,7 +3582,8 @@ zfs_rename(znode_t *sdzp, const char *sname, znode_t *tdzp, const char *tname, goto fail; } - error = zfs_do_rename(sdvp, &svp, &scn, tdvp, &tvp, &tcn, cr); + error = zfs_do_rename(sdvp, &svp, &scn, tdvp, &tvp, &tcn, cr, + at_flags); fail: if (svp != NULL) vrele(svp); @@ -5518,12 +5527,12 @@ zfs_freebsd_rename(struct vop_rename_args *ap) } #endif - if (error == 0 && ap->a_flags != 0) + if (error == 0 && (ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) error = EOPNOTSUPP; if (error == 0) { error = zfs_do_rename(fdvp, &fvp, ap->a_fcnp, tdvp, &tvp, - ap->a_tcnp, ap->a_fcnp->cn_cred); + ap->a_tcnp, ap->a_fcnp->cn_cred, ap->a_flags); vrele(fdvp); vrele(fvp); vrele(tdvp); diff --git a/sys/contrib/openzfs/module/zfs/zfs_replay.c b/sys/contrib/openzfs/module/zfs/zfs_replay.c index 78be046f2262..d8b7c4e8a83e 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_replay.c +++ b/sys/contrib/openzfs/module/zfs/zfs_replay.c @@ -710,7 +710,7 @@ do_zfs_replay_rename(zfsvfs_t *zfsvfs, _lr_rename_t *lr, char *sname, wo_vap, zfs_init_idmap); #else error = zfs_rename(sdzp, sname, tdzp, tname, kcred, vflg, rflags, - wo_vap, NULL); + 0, wo_vap, NULL); #endif zrele(tdzp); From nobody Tue Mar 10 11:43:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8D5hvbz6VVsQ for ; Tue, 10 Mar 2026 11: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8D2MNmz49Xn for ; Tue, 10 Mar 2026 11: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=1773143020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EB3H1aLVIAsl6mgdYi8U1qWMhN7+x6R2k0FcA9ij6yA=; b=lTQzWz12JhxKW68gE+2AeJ3J6wrLoyrHVg80c/zFS8pE6de6uux1UqQpfHmaRJVkoAoyUU KGqaSPNuWvMFUY9hDaJXZutCDk9LvebKlaYKLF6qR81tOCfwdHm1lJ0VOJhqIqWvlg+zvl UIemc+Ds71Owa5nkk72D526wOXp16HK6QtZL6Q6vnK0oLDeYmIus0C4p2gzhZSpWEqhP8X EsSdkvC95XJARs1jzqYo8caC7/UVAq5fsmB/lOfjDdlBxvfH2VoImwJnoZolfFNG158Dlo rkYoKryBNJKrTV8BPkq2tsv+s6KMV+JT4j0E1HL+AHi0mB9EYzItY2sC+W3B9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143020; a=rsa-sha256; cv=none; b=PonnQT3Ox2ji4fNVTLm9L65LBFGJInh0wO8/zJANxE6QcneqgGwywCygyiAc1ktJrQaHAz R9nHI5UlXcyvCqO+k7kgDfA+HpM+LkVBJB2fNqr1bvHzAjK6fLDbUSSUQyb7pigDmN3miU DJDCKEk6J5mxtjpU5ydpsIXap69FYmUusWrZDZMaf2v34r7dwh5YIyD43EeLyGewGlHPyc UiJT+oZRdSmn6WFUm9GX0BCLOwBAYOgjUzlTiZniCoOFeS03buLVk3OAimIEV+i9xtm01k qyarH5ctvxfGJWUjUiSFgOP+L1cD8aRN8gn3lnCiPuXRDRgl7f6fWae0lYRVtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EB3H1aLVIAsl6mgdYi8U1qWMhN7+x6R2k0FcA9ij6yA=; b=aKyvyq4kqzFS0+JGvEjxuhN9MXaeg5gb5Qjjli8o+5VVKJGV4qmuHtEIoVjmW5THwRVN0i naNLvyv6sI/MMx8oc9bAFBYHwG9uji+UEMZ1maWyOIfw+ZG6/LwjlaZo/XmIoiFwvQ7Hqy mmRIZNKE7vhbFRZw3JAjO4VvghlP0GWFB1FyFVwRVb8BbriiQ9Csf98T77XpEXq92qQ1Ij eNpkeAWf4smZyQ2a9NEhMs+F4CA+PnSV6O5pSq0UigfiC8DqiSsBREqrcrPJ3hDQ0YuA76 NSOCjvPIDzcMdYiIfduAWVByu45JSA7Hh6+nUtfWpkGE+fzNfQ3IfpeJD+JzIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8D1yYjz19L3 for ; Tue, 10 Mar 2026 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d109 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9c37c82f526c - stable/15 - renameat2(2): implement AT_RENAME_NOREPLACE flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c37c82f526cc6f70e775e52f1e537d23202dd35 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:40 +0000 Message-Id: <69b003ec.1d109.3f2bbf2e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c37c82f526cc6f70e775e52f1e537d23202dd35 commit 9c37c82f526cc6f70e775e52f1e537d23202dd35 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:57:24 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 renameat2(2): implement AT_RENAME_NOREPLACE flag (cherry picked from commit 7aaec5f3faecf98e377c97e24dddb9c65f4b2e75) --- sys/fs/msdosfs/msdosfs_vnops.c | 9 +++++++-- sys/fs/tmpfs/tmpfs_vnops.c | 9 +++++++-- sys/kern/vfs_syscalls.c | 24 ++++++++++++++++++++---- sys/sys/fcntl.h | 3 +++ sys/ufs/ufs/ufs_vnops.c | 7 ++++++- 5 files changed, 43 insertions(+), 9 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 3e28a7ce9d05..d626aed28076 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -49,12 +49,12 @@ * October 1992 */ -#include #include #include #include #include #include +#include #include #include #include @@ -970,7 +970,7 @@ msdosfs_rename(struct vop_rename_args *ap) goto abortit; } - if (ap->a_flags != 0) { + if ((ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; goto abortit; } @@ -1041,6 +1041,11 @@ relock: vrele(tvp); tvp = NULL; } + if (error == 0 && tvp != NULL && + (ap->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto unlock; + } if (error == 0) { nip = NULL; error = deget(pmp, scn, blkoff, LK_EXCLUSIVE | LK_NOWAIT, diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 5596f8794546..edd620cfdb5b 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -993,7 +993,7 @@ tmpfs_rename(struct vop_rename_args *v) goto out; } - if (v->a_flags != 0) { + if ((v->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; goto out; } @@ -1018,9 +1018,14 @@ tmpfs_rename(struct vop_rename_args *v) "tmpfs_rename: fdvp not locked"); ASSERT_VOP_ELOCKED(tdvp, "tmpfs_rename: tdvp not locked"); - if (tvp != NULL) + if (tvp != NULL) { ASSERT_VOP_ELOCKED(tvp, "tmpfs_rename: tvp not locked"); + if ((v->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto out_locked; + } + } if (fvp == tvp) { error = 0; goto out_locked; diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index fdd215f1c9f9..92b43672bae0 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3783,7 +3783,7 @@ kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, int error; short irflag; - if (flags != 0) + if ((flags & ~(AT_RENAME_NOREPLACE)) != 0) return (EINVAL); again: tmp = mp = NULL; @@ -3820,6 +3820,19 @@ again: } tdvp = tond.ni_dvp; tvp = tond.ni_vp; + if (tvp != NULL && (flags & AT_RENAME_NOREPLACE) != 0) { + /* + * Often filesystems need to relock the vnodes in + * VOP_RENAME(), which opens a window for invalidation + * of this check. Then, not all filesystems might + * implement AT_RENAME_NOREPLACE. This leads to + * situation where sometimes EOPNOTSUPP might be + * returned from the VOP due to race, while most of + * the time this check works. + */ + error = EEXIST; + goto out; + } error = vn_start_write(fvp, &mp, V_NOWAIT); if (error != 0) { again1: @@ -3912,9 +3925,12 @@ out: vrele(fromnd.ni_dvp); vrele(fvp); } - lockmgr(&tmp->mnt_renamelock, LK_RELEASE, 0); - vfs_rel(tmp); - vn_finished_write(mp); + if (tmp != NULL) { + lockmgr(&tmp->mnt_renamelock, LK_RELEASE, 0); + vfs_rel(tmp); + } + if (mp != NULL) + vn_finished_write(mp); out1: if (error == ERESTART) return (0); diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 18d3928e91c7..8f2fc1e2debb 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -245,6 +245,9 @@ typedef __pid_t pid_t; #define AT_RESOLVE_BENEATH 0x2000 /* Do not allow name resolution to walk out of dirfd */ #define AT_EMPTY_PATH 0x4000 /* Operate on dirfd if path is empty */ + +#define AT_RENAME_NOREPLACE 0x0001 /* Fail rename if target exists */ +#define RENAME_NOREPLACE AT_RENAME_NOREPLACE #endif /* __BSD_VISIBLE */ /* diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 429e6b5c8dd7..4abbd4ee807f 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1294,7 +1294,7 @@ ufs_rename( goto releout; } - if (ap->a_flags != 0) { + if ((ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; mp = NULL; goto releout; @@ -1394,6 +1394,11 @@ relock: } } + if (tvp != NULL && (ap->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto unlockout; + } + if (DOINGSUJ(fdvp) && (seqc_in_modify(fdvp_s) || !vn_seqc_consistent(fdvp, fdvp_s) || seqc_in_modify(fvp_s) || !vn_seqc_consistent(fvp, fvp_s) || From nobody Tue Mar 10 11:43:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8G5bFGz6VWN4 for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8G3wdCz49kp for ; Tue, 10 Mar 2026 11:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfsH7hkJeO+kc9gSdNAhdXXe6DLwBjW/xlOR9ev9WjU=; b=IssJWhoKaBZNccAe92T8t1/nKi1LvjqElak//UkbVxShY1fKQwnwMKsbawFVmCvUdSdlNr qefa08Qi1PNpoNj/eo661KmLvlwhnNR5bkwlc/86VZLPV8OV1x9Y8W3yzBFReAVcYkQ11R +IRe4/Dn8tM4ouDLOsCX/cXdqxxEJ6q3o1c5F7zYjx48VngGGg6aTbhk95g+jyV5bzzIhX xmSAKN+08IJynAeiKU0sIWZCQmvzsR+lzU3f1+6wWoFBSfha52Pt0gwMyXTtxhsik/cbJN SrTPBR0WGHZOWHENdJTm7m3bUxJ5IK80ws+VaI6/8B4K4NOxp9cx95N491Nn+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143022; a=rsa-sha256; cv=none; b=pB2cZsPPCkky9N9BedHAryo/8wuC0X5+MZ+VNiC7kTHBaLky2Yi+p/W/uOTARrHjvwErYo ShIGUeDPP84jFYhUjT2PoR0w7VETbS6SFMezXKwnRzwVSQQUXeAEDq1uK/YBbp7ZjFQ+Rp tO+bt27u78uPBonilrj9TGGrYFOaQuXmKk6B+1uXjK1LGTZDqJQaBDNJUDvLYk56XFsNMg DJIuzmnRBJZHRzRp3b111qtCx9dkO6ioAdCA38JnJCZbWRHGjn5Jd5GXq5DqSJADwZ3hDr bPImUiWcY8aXSIsPyzO2d7r+/RZSNA0Oww2FP9tg0noNSptlRQ0hKD3aWhcflg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfsH7hkJeO+kc9gSdNAhdXXe6DLwBjW/xlOR9ev9WjU=; b=wXCW3ICiOD+PW+hV1k3gxJKRjuNX8UrHsyNQyIqIz2Pma5/go3Qg5YxzWfR6aei/bYUKhQ Sh9zS0x7QktbgtQgiZ/NompbKVvizqVyvNPr5ftOjuIAZgo5D6uO/1kB1kE0UEfAEoKNo1 50tNBDxApzzmT65yIXUDRl5GB1C/TJXw13AObC+lEo4eiD6qSoQgHMrLm5+nshYa9YW/jk LMDsM7Qgg6NCFypcifpveFsyMCev5rVgTUGvOCUDTk1GWjTARvBinL5JtnjmSEILWvhfxU quPeC6SVl/hug3m/6Mj5ShFNZrZLUlplkTymlYZlR9qCKN9V27wEful25Bsjfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8G3Vlgz19c7 for ; Tue, 10 Mar 2026 11:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d523 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b2ae957e9c8f - stable/15 - linuxolator: translate LINUX_RENAME_NOREPLACE into our AT_RENAME_NOREPLACE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:42 +0000 Message-Id: <69b003ee.1d523.11768c3b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 commit b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 Author: Konstantin Belousov AuthorDate: 2026-02-26 19:21:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 linuxolator: translate LINUX_RENAME_NOREPLACE into our AT_RENAME_NOREPLACE (cherry picked from commit 8feb8d221cfb842ee11d744d22571baec6c18cd8) --- sys/compat/linux/linux_file.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 43ccac0308d3..30e79a53ad2a 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -833,23 +833,34 @@ int linux_renameat2(struct thread *td, struct linux_renameat2_args *args) { int olddfd, newdfd; + u_int atflags; - if (args->flags != 0) { - if (args->flags & ~(LINUX_RENAME_EXCHANGE | - LINUX_RENAME_NOREPLACE | LINUX_RENAME_WHITEOUT)) - return (EINVAL); - if (args->flags & LINUX_RENAME_EXCHANGE && - args->flags & (LINUX_RENAME_NOREPLACE | - LINUX_RENAME_WHITEOUT)) + atflags = 0; + if ((args->flags & ~(LINUX_RENAME_EXCHANGE | + LINUX_RENAME_NOREPLACE | LINUX_RENAME_WHITEOUT)) != 0) + return (EINVAL); + if ((args->flags & LINUX_RENAME_EXCHANGE) != 0 && + (args->flags & (LINUX_RENAME_NOREPLACE | + LINUX_RENAME_WHITEOUT)) != 0) + return (EINVAL); + if ((args->flags & LINUX_RENAME_NOREPLACE) != 0) { + if ((args->flags & (LINUX_RENAME_EXCHANGE | + LINUX_RENAME_WHITEOUT)) != 0) return (EINVAL); -#if 0 + args->flags &= ~LINUX_RENAME_NOREPLACE; + atflags |= AT_RENAME_NOREPLACE; + } + + if (args->flags != 0) { /* * This spams the console on Ubuntu Focal. * - * What's needed here is a general mechanism to let users know - * about missing features without hogging the system. + * What's needed here is a general mechanism to let + * users know about missing features without hogging + * the system. */ - linux_msg(td, "renameat2 unsupported flags 0x%x", +#if 0 + linux_msg(td, "renameat2 unsupported flags %#x", args->flags); #endif return (EINVAL); @@ -858,7 +869,7 @@ linux_renameat2(struct thread *td, struct linux_renameat2_args *args) olddfd = (args->olddfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->olddfd; newdfd = (args->newdfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->newdfd; return (kern_renameat(td, olddfd, args->oldname, newdfd, - args->newname, UIO_USERSPACE, 0)); + args->newname, UIO_USERSPACE, atflags)); } #ifdef LINUX_LEGACY_SYSCALLS From nobody Tue Mar 10 11:43:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8J0S1rz6VWBT for ; Tue, 10 Mar 2026 11:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8H52Pcz49hZ for ; Tue, 10 Mar 2026 11:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r155N0cqgjK6+gUgWAOfQ3rRcsQnlD7VoUa/kL793/o=; b=lJyw2SqokJImZCm1rfovEdAbF+Il+o43N86f2JgeDiyIX9efSx6OoBPCsUBB/Fmeev6pes LgXps5i79jXIzaP6Cylc/NliAyhxtgHYNCgWlYSj9dixOv+Z8KmeznUH37bcfP/mB9YJQI VuQ3lvQWkyKfBQICeYzdOnHHGoU6R0Z0hXuzYudvDM5du1Uqi+j3RLp+YYbj1TBwLOm2Ri t0nArR4bYeoZ0S9zdB+iHfe5AcKruUjbLu1jI4QZ0blHqlSCTzflif/cI0OnD0IhpoJKwT jleY6aW2FxxeBXeF0PNGO9k943RHWw8ow22mhl/ZCWdz2wFLPdSW0yQ4LVTU0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143023; a=rsa-sha256; cv=none; b=kVReZWDSaL8H0Cx+sLMDU103cwhORst2FkyOviiszCX1pZtmNgk8lZBVDv2QM3PAFxvckP MuZXnJ6M9zzUOaDCebBxqfHzsOB0bUtO38Da9gLmjR7fea8jl16s42Nid+THulwuQ0ggpK 6IfNETWAzFk4mzBqfAnOSwL2w6/kfUuV0xkkwFDV6rmv5PhS3JtpPRx0EvKOjG4n2hmhU/ xXWriRKApPdsNolbth1A7qmdHxpDrWz60ELAINTzPmhxtYCE0lP/Io//K5hFElyWPi7uCX nJK1S/UgIWiJ3B0ifXpQbLAjnuFvhugIjFw57NbLgKGpVxX4a0cmLY184e2GvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r155N0cqgjK6+gUgWAOfQ3rRcsQnlD7VoUa/kL793/o=; b=Rs5GPH801q8c1kopMET/NOvAzFy63T8vqd9Zb37e14UFPbMIDyG8NP2dHZTsrUrjF10Vzq DClJvgw9a2tNHru19vTm12S2YOhhQO4SSu6VSN2jEpomEwvzOdJUiUTbyJ1kUiNNcMgw0w Cut2n9a1D/Y89a746AMY7tRkszBT3RpJMtEMVsL8tIVYXuu3SP9/2wGwDidQegMYhDRpgE wwk4XAsKGXf2PxnB4/zYQY49xdV62sMcmCTmc9gTn1U8E8DiOYkKUcjz0JgzM64mZcZX/M M8wcm4AYgXh7K5s69fHqcPAQAR7fGX6kDVHazn2GIuTatmaMlux0FhkzOX8ExA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8H4RZSz19Y9 for ; Tue, 10 Mar 2026 11:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1bb58ba12b47 - stable/15 - libsys/rename.2: remove commented-out CAVEAT section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1bb58ba12b47ed58144784b3b68e41cced330642 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:43 +0000 Message-Id: <69b003ef.1c6f7.6a4de7b7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1bb58ba12b47ed58144784b3b68e41cced330642 commit 1bb58ba12b47ed58144784b3b68e41cced330642 Author: Konstantin Belousov AuthorDate: 2026-02-27 00:03:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 libsys/rename.2: remove commented-out CAVEAT section (cherry picked from commit 5f911eaba017645487a1eaee3609b26a77f0f174) --- lib/libsys/rename.2 | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/lib/libsys/rename.2 b/lib/libsys/rename.2 index 4faba81ff509..1806321245ec 100644 --- a/lib/libsys/rename.2 +++ b/lib/libsys/rename.2 @@ -112,32 +112,6 @@ or .Fa tofd parameter, the current working directory is used in the determination of the file for the respective path parameter. -.\".Sh CAVEAT -.\"The system can deadlock if a loop in the file system graph is present. -.\"This loop takes the form of an entry in directory -.\".Pa a , -.\"say -.\".Pa a/foo , -.\"being a hard link to directory -.\".Pa b , -.\"and an entry in -.\"directory -.\".Pa b , -.\"say -.\".Pa b/bar , -.\"being a hard link -.\"to directory -.\".Pa a . -.\"When such a loop exists and two separate processes attempt to -.\"perform -.\".Ql rename a/foo b/bar -.\"and -.\".Ql rename b/bar a/foo , -.\"respectively, -.\"the system may deadlock attempting to lock -.\"both directories for modification. -.\"Hard links to directories should be -.\"replaced by symbolic links by the system administrator. .Sh RETURN VALUES .Rv -std rename .Sh ERRORS From nobody Tue Mar 10 11:43:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8K1Yhtz6VWKY for ; Tue, 10 Mar 2026 11:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8J5s9sz49rg for ; Tue, 10 Mar 2026 11:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qWjF/Bs93dyGHSYJXz3TQa0sShNKA4OOU7ahQ7YOq4=; b=EDad+ocO+7Cr+tzgmvpxYJHzXCdqrkRI922lADJ7uUnvaa+mIyvTC7nCwM4tWoZrQIBcEa pIetcQmGOzjvB9BIyHdylRS1c1Z4O1QKx2554Z2SLNP80nE+nShZ2L6yb+q2vtTV5VzBOw h/SimYkGuEiGpFf1R7bUiMBNetGa0irgeD39yCPcSzrlMeA7z0tQCNHjhXyJsBpq3lxYMe r8eTgR9xy8RvZQHGXtzGVZBHIbyzE9oN6QPGYf9ThEZudq4tWGjWEWGdto/Ar8L43TbFmL et3rSY/D36bd/e5eyuMZTNva6NcWYWG3Qr4YmnOn3iK+38NEoAjNKuklHlr0SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143024; a=rsa-sha256; cv=none; b=OPnP4l8O0xOpcnaBPlWZfKWg7HO8VkSCRtaD2BQagI8jevQ8F90QBTOyn4D7PXkXxobZdI LrVf//hcQlSX/PMUv4ZeHwEe1LWk5qC7YTvXgxuMu7RsIqn1ZUJmreHR6ZIRaSfpj0ZLtP K+nu5Nq68A9uzBE8b6DWtzdDGMgdW5+ySBW1vDUMBOiqKq7/eumTjyZDWzGpBtq+nox0Zn qK/ZmM7yHIcb9niW2E5m73+r/VrxqwN+c6tEmj9aOIGNKDqfKbRbTQEHVIti0+g7/z2iLG ZPtO4uxJ5ijtAudOeanUbfbSouGodtFccuMFl8BRx4PcOX0fJgRdz7uILVgpCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qWjF/Bs93dyGHSYJXz3TQa0sShNKA4OOU7ahQ7YOq4=; b=n41OMbrCMT7z9092LbaQQ5OK4CUn8yrv7tOwwylGqCdgvjhlq6kUS7Ty+FvBEzUfUXbrI4 xxyzJT/8FYlj7KNDjIlhnLkwZlwwvnO3olsz0XKhJ81vWd/4ANkI3G3lSRk8QR6FWcJQrE 2cpf/mJ2LwKMFN6SBlhxgC5DPePMAlM5zJ8ApY+BLxfBMutCFimHPHlX/eQHaPKwnbuqhu /71t7VDL9aDKq+sUD4xDeT/vPCl9Kd2h1QHfLwb8siJuEOMC3WiTPaxXRSvQrWVlTH9UfP Ps4sp18b2P0pp2T24McvpW9Q5WAY4a5fD7yKBqcYtoSyIutYKPRVSSAdBqlAkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8J5Nhwz195Q for ; Tue, 10 Mar 2026 11:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cf18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3ccc39d38ed8 - stable/15 - renameat2(2): document List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3ccc39d38ed8c805383f261d67fe18a6b7eb29e6 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:44 +0000 Message-Id: <69b003f0.1cf18.3af4cd8d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3ccc39d38ed8c805383f261d67fe18a6b7eb29e6 commit 3ccc39d38ed8c805383f261d67fe18a6b7eb29e6 Author: Konstantin Belousov AuthorDate: 2026-02-27 00:10:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 renameat2(2): document (cherry picked from commit 619e49b2ba58e1ffd2ab111fef6d1e87d77e7391) --- lib/libsys/Makefile.sys | 3 ++- lib/libsys/rename.2 | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 4ad1ad4db7e9..fc948ae9c5c7 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -510,7 +510,8 @@ MLINKS+=readlink.2 readlinkat.2 MLINKS+=recv.2 recvfrom.2 \ recv.2 recvmmsg.2 \ recv.2 recvmsg.2 -MLINKS+=rename.2 renameat.2 +MLINKS+=rename.2 renameat.2 \ + rename.2 renameat2.2 MLINKS+=rtprio.2 rtprio_thread.2 MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \ sched_get_priority_max.2 sched_rr_get_interval.2 diff --git a/lib/libsys/rename.2 b/lib/libsys/rename.2 index 1806321245ec..dbad50edb9a9 100644 --- a/lib/libsys/rename.2 +++ b/lib/libsys/rename.2 @@ -39,6 +39,16 @@ .Fn rename "const char *from" "const char *to" .Ft int .Fn renameat "int fromfd" "const char *from" "int tofd" "const char *to" +.In sys/fcntl.h +.In stdio.h +.Ft int +.Fo renameat2 +.Fa "int fromfd" +.Fa "const char *from" +.Fa "int tofd" +.Fa "const char *to" +.Fa "unsigned int flags" +.Fc .Sh DESCRIPTION The .Fn rename @@ -112,6 +122,28 @@ or .Fa tofd parameter, the current working directory is used in the determination of the file for the respective path parameter. +.Pp +The +.Fn renameat2 +system call takes an additional +.Fa flags +argument. +If +.Fa flags +is zero, the +.Fn renameat2 +call operates identically to +.Fn renameat . +Additionally, the following flags can be specified: +.Bl -tag -width AT_RENAME_NOREPLACE +.It Dv AT_RENAME_NOREPLACE +If the path specified by +.Fa tofd +and +.Fa to +exists, the request fails with the error +.Er EEXIST . +.El .Sh RETURN VALUES .Rv -std rename .Sh ERRORS @@ -298,6 +330,35 @@ file descriptor lacks the .Dv CAP_RENAMEAT_TARGET right. .El +.Pp +In addition to the errors returned by the +.Fn renameat +system call, the +.Fn renameat2 +system call may fail if: +.Bl -tag -width Er +.It Bq Er EEXIST +The +.Dv AT_RENAME_NOREPLACE +flag was provided, and a file exists at the path specified by +.Fa to . +.It Bq Er EOPNOTSUPP +One of the +.Fa flags +specified is not supported by the filesystem where the to-be +renamed file is located. +.El +.Sh CAVEATS +If the filesystem which owns the file to be renamed does not +implement the +.Dv AT_RENAME_NOREPLACE +flag, it is possible that due to race with target file creation, +the error returned by the +.Fn renameat2 +system call would be non-deterministically either +.Er EEXIST +or +.Er EOPNOTSUPP . .Sh SEE ALSO .Xr chflags 2 , .Xr open 2 , @@ -315,3 +376,7 @@ The .Fn renameat system call appeared in .Fx 8.0 . +The +.Fn renameat2 +system call appeared in +.Fx 16.0 . From nobody Tue Mar 10 11:43:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8L3pg9z6VWHK for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8K74w4z49SK for ; Tue, 10 Mar 2026 11:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n8Jb0Ppnab5VzWK8UR7PuY7Bm554rJlKLlQU2v701tA=; b=mT4oIQFI98gI1m2p3PJxj4LGPvYju4AAmdjRjBC5x3pk3FUkcRHn0GAIhPX+uL3IcGIgel G4ZLWwy79p1ApxU8Zx0h0FF7X5n1/umomAXaWb42E3/1IGOuiFiy+Rkyyce0+E4c0Axpc6 XEIY2r41/WJXTTDBm49PwUvQruEEa603F9pGvWF6+IGlrh5QBcKulynrFio/5vyLvvHog8 CvfDG8LNejY+olLV3E3R9yEBTNzVjJIhVWDB/AC00onfLLGNSRid5pj5VZ/k1KyXpbk94P fYl4RtAozIKQfub/6cdXSP4AtBKK0ant7Fa3k9F11HOBfGlp5tsXkEardwKVUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143026; a=rsa-sha256; cv=none; b=No1xPWOza5gbbvU8H0CTuZYDnWwtGxgxJh7DhlDr9uzBVulaV0e84e4XggPkUcIMBaXY6t my+uCKGFzNfhEJS21Ct2ovQpfkm7SqAx1Efd8Gcf7ZgJzANBB2iq81Co1WcjC8T2m90vAq 9AkABsWMl4JoYVPkBygVX2z16g8p5KFlBy/YfhdC40nR/AeNrwIs8c6b/dtDT/FBsiTOiQ z0pz1fthZ+/yQJ7otYEQnzjx6JcFMk4gFErTNqUU2vL//yGTf+ObTM4mimEO9GlJf8ewR1 YXSrIZzuF7/xf0N0RaUC4RYIgIBlt3NcRO3jEUnB1gORiJRzD3iiHmdcSs5DtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n8Jb0Ppnab5VzWK8UR7PuY7Bm554rJlKLlQU2v701tA=; b=KIvVK5KyDM/J8KUIHS59fqGAyCeDA+xf2KfqvDgPCvLau6XJvSRuaJe8WjbKRBSvKtlxgH +1NKKrQn8xQKLXp3vaGiJfsxXHj+r2N2OtCuBTkjjf5QjNcTCc2zUGG2s8F2lB6/KXxLaq CQkiXhboGU8SnkSHAuNMQDuyYzAvTR5CJVc/XanxR/0JEZ5HkNK2c7ByjedFijmLewSFmX MQgpy/flU4vc6f7w5OrXBKByk2yyHXKCt9FkjE8rQRiAFN4XLM84uwlWUBkl/ku9YEAtlO 8KItl3NEvHSdQCV334RIVILb34+QTgMdq4xkhdW8yRJvrHhHWg9Mqz0/vzGHYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8K6ZTFz19Sr for ; Tue, 10 Mar 2026 11:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b5e307d41e2e - stable/15 - Regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b5e307d41e2e347989033aa6ed39feb91624987d Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:45 +0000 Message-Id: <69b003f1.1d7dc.4a1c29d8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b5e307d41e2e347989033aa6ed39feb91624987d commit b5e307d41e2e347989033aa6ed39feb91624987d Author: Konstantin Belousov AuthorDate: 2026-02-26 18:47:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 Regen --- lib/libsys/_libsys.h | 2 ++ lib/libsys/syscalls.map | 2 ++ sys/compat/freebsd32/freebsd32_syscall.h | 3 +- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/compat/freebsd32/freebsd32_systrace_args.c | 38 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 38 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 +- sys/sys/syscall.mk | 3 +- sys/sys/sysproto.h | 9 ++++++ 12 files changed, 99 insertions(+), 3 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index 46a2687216b0..0c61bcd2dd23 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -472,6 +472,7 @@ typedef int (__sys_jail_attach_jd_t)(int); typedef int (__sys_jail_remove_jd_t)(int); typedef int (__sys_pdrfork_t)(int *, int, int); typedef int (__sys_pdwait_t)(int, int *, int, struct __wrusage *, struct __siginfo *); +typedef int (__sys_renameat2_t)(int, const char *, int, const char *, int); _Noreturn void __sys__exit(int rval); int __sys_fork(void); @@ -880,6 +881,7 @@ int __sys_jail_attach_jd(int fd); int __sys_jail_remove_jd(int fd); int __sys_pdrfork(int * fdp, int pdflags, int rfflags); int __sys_pdwait(int fd, int * status, int options, struct __wrusage * wrusage, struct __siginfo * info); +int __sys_renameat2(int oldfd, const char * old, int newfd, const char * new, int flags); __END_DECLS #endif /* __LIBSYS_H_ */ diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index 18d65b64ab8d..795844d6e748 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -821,4 +821,6 @@ FBSDprivate_1.0 { __sys_pdrfork; _pdwait; __sys_pdwait; + _renameat2; + __sys_renameat2; }; diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 67ff022922a8..9fed7ec58669 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -519,4 +519,5 @@ #define FREEBSD32_SYS_jail_remove_jd 598 #define FREEBSD32_SYS_pdrfork 600 #define FREEBSD32_SYS_freebsd32_pdwait 601 -#define FREEBSD32_SYS_MAXSYSCALL 602 +#define FREEBSD32_SYS_renameat2 602 +#define FREEBSD32_SYS_MAXSYSCALL 603 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 54b826098a9d..d91d45130c89 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -607,4 +607,5 @@ const char *freebsd32_syscallnames[] = { "#599", /* 599 = kexec_load */ "pdrfork", /* 600 = pdrfork */ "freebsd32_pdwait", /* 601 = freebsd32_pdwait */ + "renameat2", /* 602 = renameat2 */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 1b0e5a4a5b86..ce2ce8a0eb4f 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -669,4 +669,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 599 = kexec_load */ { .sy_narg = AS(pdrfork_args), .sy_call = (sy_call_t *)sys_pdrfork, .sy_auevent = AUE_PDRFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 600 = pdrfork */ { .sy_narg = AS(freebsd32_pdwait_args), .sy_call = (sy_call_t *)freebsd32_pdwait, .sy_auevent = AUE_PDWAIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 601 = freebsd32_pdwait */ + { .sy_narg = AS(renameat2_args), .sy_call = (sy_call_t *)sys_renameat2, .sy_auevent = AUE_RENAMEAT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 602 = renameat2 */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 59a74d365e1c..e85cf4765c98 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3447,6 +3447,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 5; break; } + /* renameat2 */ + case 602: { + struct renameat2_args *p = params; + iarg[a++] = p->oldfd; /* int */ + uarg[a++] = (intptr_t)p->old; /* const char * */ + iarg[a++] = p->newfd; /* int */ + uarg[a++] = (intptr_t)p->new; /* const char * */ + iarg[a++] = p->flags; /* int */ + *n_args = 5; + break; + } default: *n_args = 0; break; @@ -9314,6 +9325,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* renameat2 */ + case 602: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "userland const char *"; + break; + case 4: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11242,6 +11275,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* renameat2 */ + case 602: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index fcfee33c3fec..6345293dfb7f 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -668,4 +668,5 @@ struct sysent sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 599 = kexec_load */ { .sy_narg = AS(pdrfork_args), .sy_call = (sy_call_t *)sys_pdrfork, .sy_auevent = AUE_PDRFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 600 = pdrfork */ { .sy_narg = AS(pdwait_args), .sy_call = (sy_call_t *)sys_pdwait, .sy_auevent = AUE_PDWAIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 601 = pdwait */ + { .sy_narg = AS(renameat2_args), .sy_call = (sy_call_t *)sys_renameat2, .sy_auevent = AUE_RENAMEAT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 602 = renameat2 */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 82adf3f79970..1594b03016da 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -607,4 +607,5 @@ const char *syscallnames[] = { "#599", /* 599 = kexec_load */ "pdrfork", /* 600 = pdrfork */ "pdwait", /* 601 = pdwait */ + "renameat2", /* 602 = renameat2 */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 973c2ed8e97a..dc6f55de9fa4 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3534,6 +3534,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 5; break; } + /* renameat2 */ + case 602: { + struct renameat2_args *p = params; + iarg[a++] = p->oldfd; /* int */ + uarg[a++] = (intptr_t)p->old; /* const char * */ + iarg[a++] = p->newfd; /* int */ + uarg[a++] = (intptr_t)p->new; /* const char * */ + iarg[a++] = p->flags; /* int */ + *n_args = 5; + break; + } default: *n_args = 0; break; @@ -9459,6 +9470,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* renameat2 */ + case 602: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "userland const char *"; + break; + case 4: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11477,6 +11510,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* renameat2 */ + case 602: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index a754c1b5b534..e1d3e7daa7d2 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -539,4 +539,5 @@ #define SYS_jail_remove_jd 598 #define SYS_pdrfork 600 #define SYS_pdwait 601 -#define SYS_MAXSYSCALL 602 +#define SYS_renameat2 602 +#define SYS_MAXSYSCALL 603 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 71b59ec44fd8..8b0f61233cee 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -442,4 +442,5 @@ MIASM = \ jail_attach_jd.o \ jail_remove_jd.o \ pdrfork.o \ - pdwait.o + pdwait.o \ + renameat2.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index abd8145ff01a..b458b9426db7 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1919,6 +1919,13 @@ struct pdwait_args { char wrusage_l_[PADL_(struct __wrusage *)]; struct __wrusage * wrusage; char wrusage_r_[PADR_(struct __wrusage *)]; char info_l_[PADL_(struct __siginfo *)]; struct __siginfo * info; char info_r_[PADR_(struct __siginfo *)]; }; +struct renameat2_args { + char oldfd_l_[PADL_(int)]; int oldfd; char oldfd_r_[PADR_(int)]; + char old_l_[PADL_(const char *)]; const char * old; char old_r_[PADR_(const char *)]; + char newfd_l_[PADL_(int)]; int newfd; char newfd_r_[PADR_(int)]; + char new_l_[PADL_(const char *)]; const char * new; char new_r_[PADR_(const char *)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; int sys__exit(struct thread *, struct _exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2327,6 +2334,7 @@ int sys_jail_attach_jd(struct thread *, struct jail_attach_jd_args *); int sys_jail_remove_jd(struct thread *, struct jail_remove_jd_args *); int sys_pdrfork(struct thread *, struct pdrfork_args *); int sys_pdwait(struct thread *, struct pdwait_args *); +int sys_renameat2(struct thread *, struct renameat2_args *); #ifdef COMPAT_43 @@ -3327,6 +3335,7 @@ int freebsd14_setgroups(struct thread *, struct freebsd14_setgroups_args *); #define SYS_AUE_jail_remove_jd AUE_JAIL_REMOVE #define SYS_AUE_pdrfork AUE_PDRFORK #define SYS_AUE_pdwait AUE_PDWAIT +#define SYS_AUE_renameat2 AUE_RENAMEAT #undef PAD_ #undef PADL_ From nobody Tue Mar 10 12:46:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVYXQ5S3Zz6Vbg4 for ; Tue, 10 Mar 2026 12:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVYXQ29sPz4QMQ for ; Tue, 10 Mar 2026 12:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773146774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H8ZsEKn97deeVRF/5CLH4Wkqr1bswpclqRUxxASCLro=; b=UOJQTPILZUu262ZPm3TX1q3k9YP6Z0zpj3PWZOwjRFLaE/ny7voP692fHabLtzNrCbH08+ JRp7KoIaqqzZilywLqLOG+6bvrLP29LE6XRKCW5hufOLDe+hbCcfMRuLBYQrlzZg0Jgk/t mPyycRLyi8TzrAJiNLClp69FZC1uFPpj6Pa2X+G5R29LUIdQ7U0QynPUNcLxiI5J3s2z8I ezVUgLJ70O1svHmKVXPJz3B0W28WYbu3mqGeWAFxm6eHDaq/XIi69/77g73gN+SGvQjcnU NFCm5He08kk5li7hct6iRa9Fk4h189HNKTt8cN2sflEmbffqtuqvI5epEGKjqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773146774; a=rsa-sha256; cv=none; b=SH9XDl8WB2t2NsljsJ+YKdUbN6kBiJQ5xeVCxPBopNwzAOcJxyd1OJ42lgs4OJ60iS43tf E20BPjqcCmFoeD80L26v61sIAvOtgWE18OQmCqFWpOcQFlYgzrqtgWXPvELLgu2Xja75cq pDVZop3RL8VpCrF5mF/Ri1SVO9iQfmm0jlob3bG+K5CiTUl/V7VDYxRmPT10T3pu/ki24v SY68hGBO6aUL62dN51FFUuZzJ1wowWWVCvcAFf9zt8NVaH23rGF9MouGWdTn0ZeU8TPIV3 KZCXh12Zw1diDPXM2rbWT1pRvnldO+Bn8jwHrlHagA/T5GLZM2F3qd5FfywBJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773146774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H8ZsEKn97deeVRF/5CLH4Wkqr1bswpclqRUxxASCLro=; b=X9YCbQhyyPi6rVE/jF+kGypz3GsyuRn1iGIX2DniRolGKfW/RsTlNxnmzlTQI3uRc5Uk0v p1/z29WIrSaJjf6Ieof53lKmeAk6e4d6XmRUt0e9blHuenqR3jRHrTG444peFkMFADqw8U +HKTof5NFcBy9evBS06Vs9swwxHi4EgS3FIll5JcWT3/GEQPixPHYl4w1chyrDCfDmiLiQ tnR2fW7/vDXTq5LapfNTb67MriEWkubBiPlbICfxAQcEb+2pipVqzOf84MZe/K44hCgrDb q3NCAoZSDhlGWQgHM1DWOw89qTJMvcFLHtYBgkiinHYdyWrkil2szQvBrjP1MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVYXQ15fRz1BvL for ; Tue, 10 Mar 2026 12:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23915 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 12:46:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2b256f00aaee - main - p9fs: locking improvements for p9fs_stat_vnode_dotl() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b256f00aaee4713b8e6f0e3c0f3493065f710c4 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 12:46:14 +0000 Message-Id: <69b01296.23915.81ee5f2@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2b256f00aaee4713b8e6f0e3c0f3493065f710c4 commit 2b256f00aaee4713b8e6f0e3c0f3493065f710c4 Author: Konstantin Belousov AuthorDate: 2026-03-05 12:35:43 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 12:44:34 +0000 p9fs: locking improvements for p9fs_stat_vnode_dotl() If the vnode is share-locked: - Use vn_delayed_setsize() to avoid calling vnode_pager_setsize() with the vnode only shared locked. - Interlock the vnode to get exclusive mode for updating the node fields. Reciprocally, interlock the vnode in p9fs_getattr_dotl() to observe the consistent values on read. PR: 293492 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55665 --- sys/fs/p9fs/p9fs_vnops.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index e64d7840f7f9..c6d35548e9ed 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -896,6 +896,7 @@ p9fs_getattr_dotl(struct vop_getattr_args *ap) /* Basic info */ VATTR_NULL(vap); + VI_LOCK(vp); vap->va_atime.tv_sec = inode->i_atime; vap->va_mtime.tv_sec = inode->i_mtime; vap->va_ctime.tv_sec = inode->i_ctime; @@ -916,6 +917,7 @@ p9fs_getattr_dotl(struct vop_getattr_args *ap) vap->va_filerev = inode->data_version; vap->va_vaflags = 0; vap->va_bytes = inode->blocks * P9PROTO_TGETATTR_BLK; + VI_UNLOCK(vp); return (0); } @@ -951,16 +953,36 @@ p9fs_stat_vnode_dotl(struct p9_stat_dotl *stat, struct vnode *vp) { struct p9fs_node *np; struct p9fs_inode *inode; + bool excl_locked; np = P9FS_VTON(vp); inode = &np->inode; + /* + * This function might be called with the vnode only shared + * locked. Then, interlock the vnode to ensure the exclusive + * access to the inode fields: the thread either owns + * exclusive vnode lock, or shared vnode lock plus interlock. + * + * If the vnode is locked exclusive, do not take the + * interlock. We directly call vnode_pager_setsize(), which + * needs the vm_object lock, and that lock is before vnode + * interlock in the lock order. + */ ASSERT_VOP_LOCKED(vp, __func__); + excl_locked = VOP_ISLOCKED(vp) == LK_EXCLUSIVE; + if (!excl_locked) + VI_LOCK(vp); + /* Update the pager size if file size changes on host */ if (inode->i_size != stat->st_size) { inode->i_size = stat->st_size; - if (vp->v_type == VREG) - vnode_pager_setsize(vp, inode->i_size); + if (vp->v_type == VREG) { + if (excl_locked) + vnode_pager_setsize(vp, inode->i_size); + else + vn_delayed_setsize_locked(vp); + } } inode->i_mtime = stat->st_mtime_sec; @@ -979,11 +1001,12 @@ p9fs_stat_vnode_dotl(struct p9_stat_dotl *stat, struct vnode *vp) inode->gen = stat->st_gen; inode->data_version = stat->st_data_version; - ASSERT_VOP_LOCKED(vp, __func__); /* Setting a flag if file changes based on qid version */ if (np->vqid.qid_version != stat->qid.version) np->flags |= P9FS_NODE_MODIFIED; memcpy(&np->vqid, &stat->qid, sizeof(stat->qid)); + if (!excl_locked) + VI_UNLOCK(vp); return (0); } @@ -2213,12 +2236,25 @@ p9fs_putpages(struct vop_putpages_args *ap) return (rtvals[0]); } +static int +p9fs_delayed_setsize(struct vop_delayed_setsize_args *ap) +{ + struct vnode *vp; + struct p9fs_node *np; + + vp = ap->a_vp; + np = P9FS_VTON(vp); + vnode_pager_setsize(vp, np->inode.i_size); + return (0); +} + struct vop_vector p9fs_vnops = { .vop_default = &default_vnodeops, .vop_lookup = p9fs_lookup, .vop_open = p9fs_open, .vop_close = p9fs_close, .vop_access = p9fs_access, + .vop_delayed_setsize = p9fs_delayed_setsize, .vop_getattr = p9fs_getattr_dotl, .vop_setattr = p9fs_setattr_dotl, .vop_reclaim = p9fs_reclaim, From nobody Tue Mar 10 12:46:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVYXR6yVtz6Vbrj for ; Tue, 10 Mar 2026 12:46: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVYXR4kPGz4Q1P for ; Tue, 10 Mar 2026 12:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773146775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EuO3PlBGWxGDMKIgfUZhjf/4Qeb01Uf5DHKF4tvQPdM=; b=OGT9GLQOTBjC6P/iWbIid8T8F/+5DVGbXfIkVRVdkVv+qKqfG7x1+TWYygfuYRZhhMsTZ/ O5bKZNPLr0YZ+eHa8ZFaXddijlGYTakj7ACAbT9T7EDsNn0/8N4MGFJwmQn1dx/ehsR1fq opEfwIz9UXpCrLej0i/A8hXVK8ppvnPHw0FQBI7DjREchCwQvYmPttovcf1HSTbBBxz2k9 DpdqIEkgmJbS5iS5+fzLz0n7WpeOUb6pabdZmc8u+e1GT0fBT+AlW2/6koYdI1+IjZt8KQ Lyi6okYjLYTNxSa4BYWyjWd0sOMd07vut13gvvTCFgihiBuCsDfrWqjz5usRrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773146775; a=rsa-sha256; cv=none; b=sjmV3CcNVKKmHOg7jc7ye+sNHUsaeAwfQQpzi9AK2qLo+Da51dHgwWh5SIw6FEbBSmVseK 5xKYIghaLkg+yp5hzkCXXRN8w/1ETNdaet63tYgP41tuDZ495mnNIcLQZqMMm+jrtAauCw qyvA2I0KO6AJQsGf7jhRRe+cjSqViXBdcKrUr2QwiIx8HgnixXWq22RJU573woNtEHhpvD ekTGcw+8mmcQBEr82zn4ePVGW9+KDBUTPlLEMup0sJhVn9yFQu0BT5M+E9z2fD4MvJHOXv +h+0QuP505n72khMTJzkUpq20PUzR+tS/RnixB//+DucD5Wxlsw+sbTHtJV2HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773146775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EuO3PlBGWxGDMKIgfUZhjf/4Qeb01Uf5DHKF4tvQPdM=; b=UAnz8EnIAq5IrmNSlkOP8pieNLgpyAshg8tFkH4ztQUHmUcf308totXY7CPV30s7+CVjFj aTxdncmcxO+8Y+TnYB84sodA1MdaPmT6GdXVjiOaFvszL2sfaDN5tFxpPujXMnG8mTdQrd oV6LX9ZKqGEYriWr1wypLyUqyU1JudEoSJjr1+bO4MHWkXEaTKMLDXPfyym4soNk5LcWAk EMjOVZg7YepLNROzaFVBMEyyP8R2N1/1dJe/ZxQ97zd3JWtKYUTZV+UIMlrPx38DzJixlu s1ry1/Gpu80gfVVK4G+9P7qSgwVqFiqmQeImgYRHSnlcvhP7MQArvHZDYZA+nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVYXR1tl3z1BYk for ; Tue, 10 Mar 2026 12:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 227b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 12:46:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c2012c7faf74 - main - p9fs: use atomics for updating node->flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2012c7faf74c9e7b4e3de2472e10b58ed096996 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 12:46:15 +0000 Message-Id: <69b01297.227b7.53cc52dd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c2012c7faf74c9e7b4e3de2472e10b58ed096996 commit c2012c7faf74c9e7b4e3de2472e10b58ed096996 Author: Konstantin Belousov AuthorDate: 2026-03-08 04:44:33 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 12:44:34 +0000 p9fs: use atomics for updating node->flags This should prevent seeing inconsistent flags values when updating it under the shared vnode lock. Noted and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55665 --- sys/fs/p9fs/p9fs.h | 9 ++++++--- sys/fs/p9fs/p9fs_vfsops.c | 6 +++--- sys/fs/p9fs/p9fs_vnops.c | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/fs/p9fs/p9fs.h b/sys/fs/p9fs/p9fs.h index a270d8b5ce5f..2470734fef4d 100644 --- a/sys/fs/p9fs/p9fs.h +++ b/sys/fs/p9fs/p9fs.h @@ -103,7 +103,7 @@ struct p9fs_node { struct p9fs_inode inode; /* in memory representation of ondisk information*/ struct p9fs_session *p9fs_ses; /* Session_ptr for this node */ STAILQ_ENTRY(p9fs_node) p9fs_node_next; - uint64_t flags; + u_int flags; }; #define P9FS_VTON(vp) ((struct p9fs_node *)(vp)->v_data) @@ -111,10 +111,13 @@ struct p9fs_node { #define VFSTOP9(mp) ((struct p9fs_mount *)(mp)->mnt_data) #define QEMU_DIRENTRY_SZ 25 #define P9FS_NODE_MODIFIED 0x1 /* indicating file change */ -#define P9FS_ROOT 0x2 /* indicating root p9fs node */ +#define P9FS_NODE_ROOT 0x2 /* indicating root p9fs node */ #define P9FS_NODE_DELETED 0x4 /* indicating file or directory delete */ #define P9FS_NODE_IN_SESSION 0x8 /* p9fs_node is in the session - virt_node_list */ -#define IS_ROOT(node) (node->flags & P9FS_ROOT) +#define IS_ROOT(node) (((node)->flags & P9FS_NODE_ROOT) != 0) + +#define P9FS_NODE_SETF(n, f) atomic_set_int(&(n)->flags, (f)) +#define P9FS_NODE_CLRF(n, f) atomic_clear_int(&(n)->flags, (f)) #define P9FS_SET_LINKS(inode) do { \ (inode)->i_links_count = 1; \ diff --git a/sys/fs/p9fs/p9fs_vfsops.c b/sys/fs/p9fs/p9fs_vfsops.c index 953e6eda547a..0e09c58e57b6 100644 --- a/sys/fs/p9fs/p9fs_vfsops.c +++ b/sys/fs/p9fs/p9fs_vfsops.c @@ -284,7 +284,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, node = vp->v_data; /* Remove stale vnode from hash list */ vfs_hash_remove(vp); - node->flags |= P9FS_NODE_DELETED; + P9FS_NODE_SETF(node, P9FS_NODE_DELETED); vput(vp); *vpp = NULL; @@ -372,7 +372,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, if (*vpp == NULL) { P9FS_LOCK(vses); STAILQ_INSERT_TAIL(&vses->virt_node_list, np, p9fs_node_next); - np->flags |= P9FS_NODE_IN_SESSION; + P9FS_NODE_SETF(np, P9FS_NODE_IN_SESSION); P9FS_UNLOCK(vses); vn_set_state(vp, VSTATE_CONSTRUCTED); *vpp = vp; @@ -448,7 +448,7 @@ p9_mount(struct mount *mp) P9FS_VOFID_LOCK_INIT(p9fs_root); STAILQ_INIT(&p9fs_root->vofid_list); p9fs_root->parent = p9fs_root; - p9fs_root->flags |= P9FS_ROOT; + P9FS_NODE_SETF(p9fs_root, P9FS_NODE_ROOT); p9fs_root->p9fs_ses = vses; vfs_getnewfsid(mp); strlcpy(mp->mnt_stat.f_mntfromname, from, diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index c6d35548e9ed..081903d73e5e 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -111,7 +111,7 @@ p9fs_cleanup(struct p9fs_node *np) P9FS_LOCK(vses); if ((np->flags & P9FS_NODE_IN_SESSION) != 0) { - np->flags &= ~P9FS_NODE_IN_SESSION; + P9FS_NODE_CLRF(np, P9FS_NODE_IN_SESSION); STAILQ_REMOVE(&vses->virt_node_list, np, p9fs_node, p9fs_node_next); } else { P9FS_UNLOCK(vses); @@ -675,7 +675,7 @@ p9fs_open(struct vop_open_args *ap) error = vinvalbuf(vp, 0, 0, 0); if (error != 0) return (error); - np->flags &= ~P9FS_NODE_MODIFIED; + P9FS_NODE_CLRF(np, P9FS_NODE_MODIFIED); } vfid = p9fs_get_fid(vses->clnt, np, ap->a_cred, VFID, -1, &error); @@ -1003,7 +1003,7 @@ p9fs_stat_vnode_dotl(struct p9_stat_dotl *stat, struct vnode *vp) /* Setting a flag if file changes based on qid version */ if (np->vqid.qid_version != stat->qid.version) - np->flags |= P9FS_NODE_MODIFIED; + P9FS_NODE_SETF(np, P9FS_NODE_MODIFIED); memcpy(&np->vqid, &stat->qid, sizeof(stat->qid)); if (!excl_locked) VI_UNLOCK(vp); @@ -1549,7 +1549,7 @@ remove_common(struct p9fs_node *dnp, struct p9fs_node *np, const char *name, cache_purge(vp); vfs_hash_remove(vp); - np->flags |= P9FS_NODE_DELETED; + P9FS_NODE_SETF(np, P9FS_NODE_DELETED); return (error); } From nobody Tue Mar 10 12:46:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVYXV4PwJz6VbcY for ; Tue, 10 Mar 2026 12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVYXV1VlTz4QMx for ; Tue, 10 Mar 2026 12: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=1773146778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNL7lli2dJbid2iYCs3r8hkxbhN5OU3riLS5FhrTs+Y=; b=H5OpFwzYFOzdBX+0yi8LOd80PLO5m/tRRizmnUj2m5GgtjRJHZn9c8ynXN1i0AGq8gUil+ kDz6t2x+tPBmKzYEOs5ILHNoYBUpDYSF8n4CQ7q1h3Lajh0goXeKrrnoMmOXY/oJ/ooeox 8T708lGOaxIxD4oMpXf50i2qqROr9Y5nJFQ9nQb6tj8CLEEGJT+3ygpqN17xTOPXbRege7 ai+zEmWLFL3gD+dIxC78a6bWzjrjVva6EVZaAW9ICcc5SwR3+VIujhpxREPckBZyzTxJxz +tX4TdmuczPwjUXMpXcQ786xn5LBmW5LIP8b5iGHAfdEUZA+PJMmFCy8GaFIpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773146778; a=rsa-sha256; cv=none; b=NHSBEOqzhxBg/yWAWJcFdAEmMH4bPistMahBQ0Yqq2scjqADBqm8oE84PP5c4e1ciQ8dxV DsQlewULxSa9Sa3rwcMmEUtrOw5DA3VoI6cSREg0V3oe7/g3J3jhsasVig+rcr55Arf5Jl 41KcskbXTzKd2PILRuizmzBkBRktqdC30DF34TAVchWPx8VCmfNDV/6IMhQaPhbwO5wf5x 0hR1MwEx79vZfB5gOoNnZ8dzuZV4fGY7z40sQRNcawQ1n64mbYCG+U6BP4ivnwXNe9RTDB y4yyGuuHIxBKVC+G+P/zIT3jhnqs5jx6+d7CtwQLUScL//swl6GaeWOPH8y3LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773146778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNL7lli2dJbid2iYCs3r8hkxbhN5OU3riLS5FhrTs+Y=; b=gBJK4GM46CT4qh72uP2uL1p5E6PvnDnGDLarioaz2rtdUFHnTFf/LHDKVTUipVCUiRcQdR SOqgk3i1TNZk6itf51chUZg8C7dGEjj74GoWnytb4MkZpxob4EvxceDHIFseDjft5BLfAP viXBx0NJJccjcg18vl+MnSSzwrpmvUSjQeVHtDZDVAyZnC1fTwpnzURsksuqmylDr86yT9 wX1+9wW4kAVr4mpEQKYauMwEMSP4+CE2NBPi5naUWpiVcq3kbM5oK9iYmgHDO5HerLr53M ByjyI0YTjVz4m8+MYVqC8z7pe7zXY47eMYOIObFkoPKzvvCwfLpGt+QhD6kAew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVYXV0qT9z1C86 for ; Tue, 10 Mar 2026 12:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23911 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 12:46:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 92d7808d88f0 - main - vn_delayed_setsize(): post-commit review' changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92d7808d88f0de979d76446c76c7324731c41302 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 12:46:13 +0000 Message-Id: <69b01295.23911.21b35adf@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=92d7808d88f0de979d76446c76c7324731c41302 commit 92d7808d88f0de979d76446c76c7324731c41302 Author: Konstantin Belousov AuthorDate: 2026-03-06 00:18:11 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 12:44:27 +0000 vn_delayed_setsize(): post-commit review' changes Handle doomed vnodes after LK_RETRY. Rename the flag from VI_DELAYEDSSZ to VI_DELAYED_SETSIZE. Change signature of vn_lock_delayed_setsize() to take flatten values list instead of vop args structure. __predict_true() for VI_DELAYED_SETSIZE not set. Minor editings like removing tautological assert, and sorting items. Noted by: markj Fixes: 45117ffcd533ddf995f654db60b10899ae8370ec Reviewed by: markj, rmacklem Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55681 --- sys/fs/deadfs/dead_vnops.c | 6 ++--- sys/fs/nfsclient/nfs_clport.c | 2 +- sys/kern/vfs_vnops.c | 52 +++++++++++++++++++++---------------------- sys/sys/vnode.h | 12 +++++----- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index b6d6fa55d221..c793ef2ebf4d 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -55,6 +55,9 @@ struct vop_vector dead_vnodeops = { .vop_bmap = VOP_EBADF, .vop_close = dead_close, .vop_create = VOP_PANIC, + .vop_delayed_setsize = VOP_NULL, + .vop_fplookup_symlink = VOP_EOPNOTSUPP, + .vop_fplookup_vexec = VOP_EOPNOTSUPP, .vop_getattr = VOP_EBADF, .vop_getwritemount = dead_getwritemount, .vop_inactive = VOP_NULL, @@ -78,9 +81,6 @@ struct vop_vector dead_vnodeops = { .vop_vptocnp = VOP_EBADF, .vop_unset_text = dead_unset_text, .vop_write = dead_write, - .vop_fplookup_vexec = VOP_EOPNOTSUPP, - .vop_fplookup_symlink = VOP_EOPNOTSUPP, - .vop_delayed_setsize = VOP_NULL, }; VFS_VOP_VECTOR_REGISTER(dead_vnodeops); diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 1156e1738703..cf163adc02de 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -646,7 +646,7 @@ ncl_pager_setsize(struct vnode *vp, u_quad_t *nsizep) (curthread->td_pflags2 & TDP2_SBPAGES) == 0) setnsize = true; else - vn_delay_setsize(vp); + vn_delayed_setsize(vp); } if (nsizep == NULL) { NFSUNLOCKNODE(np); diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 24efdf4ac0d5..ea8f8437b743 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1960,25 +1960,25 @@ _vn_lock_fallback(struct vnode *vp, int flags, const char *file, int line, } static int -vn_lock_delayed_setsize(struct vop_lock1_args *ap) +vn_lock_delayed_setsize(struct vnode *vp, int flags, const char *file, int line) { - struct vnode *vp; + struct vop_lock1_args ap; int error, lktype; bool onfault; - vp = ap->a_vp; - lktype = ap->a_flags & LK_TYPE_MASK; + ASSERT_VOP_LOCKED(vp, "vn_lock_delayed_setsize"); + lktype = flags & LK_TYPE_MASK; if (vp->v_op == &dead_vnodeops) return (0); VI_LOCK(vp); - if ((vp->v_iflag & VI_DELAYEDSSZ) == 0 || (lktype != LK_SHARED && + if ((vp->v_iflag & VI_DELAYED_SETSIZE) == 0 || (lktype != LK_SHARED && lktype != LK_EXCLUSIVE && lktype != LK_UPGRADE && lktype != LK_TRYUPGRADE)) { VI_UNLOCK(vp); return (0); } - onfault = (ap->a_flags & LK_EATTR_MASK) == LK_NOWAIT && - (ap->a_flags & LK_INIT_MASK) == LK_CANRECURSE && + onfault = (flags & LK_EATTR_MASK) == LK_NOWAIT && + (flags & LK_INIT_MASK) == LK_CANRECURSE && (lktype == LK_SHARED || lktype == LK_EXCLUSIVE); if (onfault && vp->v_vnlock->lk_recurse == 0) { /* @@ -1990,35 +1990,38 @@ vn_lock_delayed_setsize(struct vop_lock1_args *ap) VOP_UNLOCK(vp); return (EBUSY); } - if ((ap->a_flags & LK_NOWAIT) != 0 || + if ((flags & LK_NOWAIT) != 0 || (lktype == LK_SHARED && vp->v_vnlock->lk_recurse > 0)) { VI_UNLOCK(vp); return (0); } if (lktype == LK_SHARED) { VOP_UNLOCK(vp); - ap->a_flags &= ~LK_TYPE_MASK; - ap->a_flags |= LK_EXCLUSIVE | LK_INTERLOCK; - error = VOP_LOCK1_APV(&default_vnodeops, ap); + ap.a_gen.a_desc = &vop_lock1_desc; + ap.a_vp = vp; + ap.a_flags = (flags & ~LK_TYPE_MASK) | LK_EXCLUSIVE | + LK_INTERLOCK; + ap.a_file = file; + ap.a_line = line; + error = VOP_LOCK1_APV(&default_vnodeops, &ap); if (error != 0 || vp->v_op == &dead_vnodeops) return (error); if (vp->v_data == NULL) goto downgrade; - MPASS(vp->v_data != NULL); VI_LOCK(vp); - if ((vp->v_iflag & VI_DELAYEDSSZ) == 0) { + if ((vp->v_iflag & VI_DELAYED_SETSIZE) == 0) { VI_UNLOCK(vp); goto downgrade; } } - vp->v_iflag &= ~VI_DELAYEDSSZ; + vn_clear_delayed_setsize_locked(vp); VI_UNLOCK(vp); VOP_DELAYED_SETSIZE(vp); downgrade: if (lktype == LK_SHARED) { - ap->a_flags &= ~(LK_TYPE_MASK | LK_INTERLOCK); - ap->a_flags |= LK_DOWNGRADE; - (void)VOP_LOCK1_APV(&default_vnodeops, ap); + ap.a_flags &= ~(LK_TYPE_MASK | LK_INTERLOCK); + ap.a_flags |= LK_DOWNGRADE; + (void)VOP_LOCK1_APV(&default_vnodeops, &ap); } return (0); } @@ -2026,7 +2029,6 @@ downgrade: int _vn_lock(struct vnode *vp, int flags, const char *file, int line) { - struct vop_lock1_args ap; int error; VNASSERT((flags & LK_TYPE_MASK) != 0, vp, @@ -2034,15 +2036,11 @@ _vn_lock(struct vnode *vp, int flags, const char *file, int line) VNPASS(vp->v_holdcnt > 0, vp); error = VOP_LOCK1(vp, flags, file, line); if (__predict_false(error != 0 || VN_IS_DOOMED(vp))) - return (_vn_lock_fallback(vp, flags, file, line, error)); - if (__predict_false((vp->v_iflag & VI_DELAYEDSSZ) == 0)) - return (0); - ap.a_gen.a_desc = &vop_lock1_desc; - ap.a_vp = vp; - ap.a_flags = flags; - ap.a_file = file; - ap.a_line = line; - return (vn_lock_delayed_setsize(&ap)); + error = _vn_lock_fallback(vp, flags, file, line, error); + if (error != 0 || __predict_true((atomic_load_short(&vp->v_iflag) & + VI_DELAYED_SETSIZE) == 0)) + return (error); + return (vn_lock_delayed_setsize(vp, flags, file, line)); } /* diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 36e10fd8d8b7..3fd2c770cda1 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -268,7 +268,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define VI_DEFINACT 0x0010 /* deferred inactive */ #define VI_FOPENING 0x0020 /* In open, with opening process having the first right to advlock file */ -#define VI_DELAYEDSSZ 0x0040 /* Delayed setsize */ +#define VI_DELAYED_SETSIZE 0x0040 /* Delayed setsize */ #define VV_ROOT 0x0001 /* root of its filesystem */ #define VV_ISTTY 0x0002 /* vnode represents a tty */ @@ -1253,17 +1253,17 @@ vn_get_state(struct vnode *vp) }) static inline void -vn_delay_setsize_locked(struct vnode *vp) +vn_delayed_setsize_locked(struct vnode *vp) { ASSERT_VI_LOCKED(vp, "delayed_setsize"); - vp->v_iflag |= VI_DELAYEDSSZ; + vp->v_iflag |= VI_DELAYED_SETSIZE; } static inline void -vn_delay_setsize(struct vnode *vp) +vn_delayed_setsize(struct vnode *vp) { VI_LOCK(vp); - vn_delay_setsize_locked(vp); + vn_delayed_setsize_locked(vp); VI_UNLOCK(vp); } @@ -1271,7 +1271,7 @@ static inline void vn_clear_delayed_setsize_locked(struct vnode *vp) { ASSERT_VI_LOCKED(vp, "delayed_setsize"); - vp->v_iflag &= ~VI_DELAYEDSSZ; + vp->v_iflag &= ~VI_DELAYED_SETSIZE; } static inline void From nobody Tue Mar 10 14:59:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVcVD49qQz6Vn2J for ; Tue, 10 Mar 2026 14: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVcVD162pz3WGn for ; Tue, 10 Mar 2026 14: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=1773154772; 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=CkIcIkIjmZS721MdYi9HwQ4wE/ZPllLqWGPLpw8sxWk=; b=po8hrvwHz/D6g6W409cgPbwz6HFL5cI2+WfESR5X6Vf5uQQjjkvrXcOx6RUW1OmuEipHdt Toh4jo+yrtQcm5D43+t5bW1c3os7ll5G3Bp+AzmTDzhSFVEiPpEHgyc5rsy//Vq8afxc+I XDn443TzSaxi5+b4nRzrFjRyP3hoO7AFMNnz2gN2seFlUzhvlxPoiS4iHEUP5HNUDCLOhG KwAE4KOUFoLSXhAVzvjn2lKvCBLT7+9wKGiZaiD32N/QtnKxu5WIe3ycEEzDnEZjLwyqg+ oCZTDBphliekDKUl+cbKBuF7kv9+syxXxUSBep9qb6pynbUXVWCCmOiIVXJK9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773154772; a=rsa-sha256; cv=none; b=DpngYkTrsjnMHuJOfZA63FdBPbkYR8kAMIxiin2GhLW7DocTZvdWcabFdI0Cxo8ajXvrcu DoloK6KsJolcbJEgq+/yIFG/UpGThkUJrzttOHFptUihcKbb9wsF/7NBpLkJ/AC7zeITMF icwjBKNkcl9oWhqUjvUVxvPas80ErW0eDFE8hhUGgC/Li5mqP/QkNNeXwomM/AJSa1+HMr soSS9r/ueew3FojSSGZAyl/ycKtQ6cisAVeDM8nIprhRz+3ELJ/tyF45Z4WrtJeArOx60m Ak7/DhKoPqCp05lLNpYmdo02a5ULltAiK9fH/5aOHGqI4ir6WpIIhi8PfnAmQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773154772; 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=CkIcIkIjmZS721MdYi9HwQ4wE/ZPllLqWGPLpw8sxWk=; b=cK05th2spRhji0PRmWlBMuvvBeZ3DWnGoDl9ejA0lqnH2SX/RAK6t/aKQaheTk6635dzy0 BMR723ZoJv6myAddI+3Bqe33G+P1XNv3pUPBY0rrUxFHAneHEBt3s3t3roFUKpGoFPzv30 FbwFRgpvQGcaPmArLO7LKG87Mj5y+HSvmYfvzWBiUObn7aQRWKGWQimYyKEb4+PksPCYiy 48GAVfcfq8bEvIDJP+JjLTvVIxzCgHI58qOyg0j+Pp0cefKPeUx8+gzUwRskI/F0oB6BCE ouBDoi29Z8VxV55/D1ea0NP6WXm+MPsM8J/zZhFlaXeSw2rEM5rP0bkmamh7DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVcVD0LBMz1x0 for ; Tue, 10 Mar 2026 14:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a2a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 14:59:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Nathaniel Braun From: Ed Maste Subject: git: 1fd1b699bda2 - stable/14 - vt: Fix handling of backtab List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fd1b699bda2ec32be3e0c7afa894c615113afc2 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 14:59:27 +0000 Message-Id: <69b031cf.3a2a6.19a9fc4f@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1fd1b699bda2ec32be3e0c7afa894c615113afc2 commit 1fd1b699bda2ec32be3e0c7afa894c615113afc2 Author: Nathaniel Braun AuthorDate: 2026-01-17 17:14:42 +0000 Commit: Ed Maste CommitDate: 2026-03-09 13:25:55 +0000 vt: Fix handling of backtab PR: 292463 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2002 (cherry picked from commit 5fec99caff3ac4f476bb88078ebf85fbecf6afb3) (cherry picked from commit 3ca02a70f7f94f7479ffcd3ed7ca6d83ec58af10) --- sys/dev/vt/vt_core.c | 6 ++++++ sys/teken/teken.c | 4 ++++ sys/teken/teken.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 5cf45a7c61b2..9ca2a547b067 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -948,6 +948,9 @@ vt_processkey(keyboard_t *kbd, struct vt_device *vd, int c) VT_UNLOCK(vd); break; } + case BKEY | BTAB: /* Back tab (usually, shift+tab). */ + terminal_input_special(vw->vw_terminal, TKEY_BTAB); + break; case FKEY | F(1): case FKEY | F(2): case FKEY | F(3): case FKEY | F(4): case FKEY | F(5): case FKEY | F(6): case FKEY | F(7): case FKEY | F(8): case FKEY | F(9): @@ -1967,6 +1970,9 @@ vtterm_cngetc(struct terminal *tm) VTBUF_SLCK_DISABLE(&vw->vw_buf); } break; + case SPCLKEY | BTAB: /* Back tab (usually, shift+tab). */ + vw->vw_kbdsq = "\x1b[Z"; + break; /* XXX: KDB can handle history. */ case SPCLKEY | FKEY | F(50): /* Arrow up. */ vw->vw_kbdsq = "\x1b[A"; diff --git a/sys/teken/teken.c b/sys/teken/teken.c index b0161a2e3b20..a1522e00ecf7 100644 --- a/sys/teken/teken.c +++ b/sys/teken/teken.c @@ -703,6 +703,8 @@ static const char * const special_strings_cons25[] = { [TKEY_F7] = "\x1B[S", [TKEY_F8] = "\x1B[T", [TKEY_F9] = "\x1B[U", [TKEY_F10] = "\x1B[V", [TKEY_F11] = "\x1B[W", [TKEY_F12] = "\x1B[X", + + [TKEY_BTAB] = "\x1B[Z", }; static const char * const special_strings_ckeys[] = { @@ -726,6 +728,8 @@ static const char * const special_strings_normal[] = { [TKEY_F7] = "\x1B[18~", [TKEY_F8] = "\x1B[19~", [TKEY_F9] = "\x1B[20~", [TKEY_F10] = "\x1B[21~", [TKEY_F11] = "\x1B[23~", [TKEY_F12] = "\x1B[24~", + + [TKEY_BTAB] = "\x1B[Z", }; const char * diff --git a/sys/teken/teken.h b/sys/teken/teken.h index 38a85e80110e..c8c73db55f06 100644 --- a/sys/teken/teken.h +++ b/sys/teken/teken.h @@ -206,6 +206,8 @@ void teken_set_winsize_noreset(teken_t *, const teken_pos_t *); #define TKEY_F10 0x13 #define TKEY_F11 0x14 #define TKEY_F12 0x15 + +#define TKEY_BTAB 0x16 const char *teken_get_sequence(const teken_t *, unsigned int); /* Legacy features. */ From nobody Tue Mar 10 16:53:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2B50pDz6Vwmg for ; Tue, 10 Mar 2026 16:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVg2B3ffMz3lCx for ; Tue, 10 Mar 2026 16:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JeVFDjTiofdrYk8VBh76wspnnkxz704Hf1z7AiU/kkg=; b=iKK/BYHZN5Twtav6fKOzbEhvBEh5EdrBDsQJEmTiq5ZAQA1Cs16ghnGq1VC32jzvgcSIaL 4b9BhAqQGgdFJsWXS5QJ7kEXE7FbzMFt/ZmBsturJdeT83r2CtGFBzVD3/rW0H15CB8HcL XY+X+PMuIepD8g3YhRFoMjHVKN32NIyIaImUxJG8juFzSb90X68R88tg9GVkp62L9Xav+q AY27EkZkCUzOFyGZLHPaAVD/bFABQf775ExhVJPTNJieiTrimEW8aIvQB2q6GPIFUmXldL hekpE2zOXM9sm8pclLAXPxPk4X2rD6BZvQEWfVl0KNtjtWvSMyvt500ZiYA0bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773161634; a=rsa-sha256; cv=none; b=sPDPpGGvpkoPytU/XclQLZBavewL8VG6yVUIWBkOV7OzHa9ov5tGLI73iZALJqsk3oGsKd hv/5m7aa3Gxu1jW3NA0xRbNrcYS0j2dBhQODiPxjqQkoJ2qAWJxqwbb5xF/YztKT7YPXXF 4Vctt0Y/Sr1l7TD50GlJQQr+e5JWAwcPBu1Jzk9QDAPvsqs+tIPX2gRmVhXsSNbp9I4afh Ga/H2AQNxsVraU8IrQUmtW5P2N8nR0FLF86xzR2Sobt6T2hM+T4Uii3frvvtRGCkDnFkBr bt81O6xM1kfAdfOnpKQO2tQS0e0cGIPjwrUkGT3o1bMniyCUJJxecW01mSW3Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JeVFDjTiofdrYk8VBh76wspnnkxz704Hf1z7AiU/kkg=; b=XRoC/W/kq/QP5JTwtpLQAMH4INvICLMIjSm6ISSGxH0tfFRxjyk+YINvgQa7VHwvfdhv2e tixhQhRyNhPx4kYZ2CZhS858A6GJMYZXWXXOS40id1mG5OMWwRf1BaOEWRVE3gdiTYr3Xj f9TWMsi6EFX7YeYldOSgexokXfD7Y4P8yrTIhn1RzaukIeOI7VdHyqTVziyD7CVPpwZl3E GBHrtqq5FKlNP1P9XjUKK30j7gKSxlM4KNsj3OejKZoBqisdM/filEDv2N0nsBThMQA+ui a/hxaP6xqwF6I0OI+GDVp5+KS/te12yYIZndwFxv5xDyDGxtxzer5mC2UEdlrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2B1Rf3z574 for ; Tue, 10 Mar 2026 16:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4540f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 16:53:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c8fb16542a52 - main - pciconf: Use a single enum to track the current operation mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8fb16542a52ca889c1adf56b2ce13b4ad4cf887 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 16:53:54 +0000 Message-Id: <69b04ca2.4540f.6a857cbc@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c8fb16542a52ca889c1adf56b2ce13b4ad4cf887 commit c8fb16542a52ca889c1adf56b2ce13b4ad4cf887 Author: John Baldwin AuthorDate: 2026-03-10 16:48:16 +0000 Commit: John Baldwin CommitDate: 2026-03-10 16:48:16 +0000 pciconf: Use a single enum to track the current operation mode Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55769 --- usr.sbin/pciconf/pciconf.c | 66 ++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index 6aa33d332c08..6c26621ae186 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -71,7 +71,7 @@ static struct pcisel getsel(const char *str); static void list_bridge(int fd, struct pci_conf *p); static void list_bars(int fd, struct pci_conf *p); static void list_devs(const char *name, int verbose, int bars, int bridge, - int caps, int errors, int vpd, int listmode); + int caps, int errors, int vpd, int compact); static void list_verbose(struct pci_conf *p); static void list_vpd(int fd, struct pci_conf *p); static const char *guess_class(struct pci_conf *p); @@ -103,17 +103,17 @@ int main(int argc, char **argv) { int c, width; - int listmode, readmode, writemode, attachedmode, dumpbarmode; - int bars, bridge, caps, errors, verbose, vpd; + enum { NONE, LIST, READ, WRITE, ATTACHED, DUMPBAR } mode; + int compact, bars, bridge, caps, errors, verbose, vpd; - listmode = readmode = writemode = attachedmode = dumpbarmode = 0; - bars = bridge = caps = errors = verbose = vpd= 0; + mode = NONE; + compact = bars = bridge = caps = errors = verbose = vpd = 0; width = 4; while ((c = getopt(argc, argv, "aBbcDehlrwVvx")) != -1) { switch(c) { case 'a': - attachedmode = 1; + mode = ATTACHED; break; case 'B': @@ -130,7 +130,7 @@ main(int argc, char **argv) break; case 'D': - dumpbarmode = 1; + mode = DUMPBAR; break; case 'e': @@ -142,15 +142,17 @@ main(int argc, char **argv) break; case 'l': - listmode++; + if (mode == LIST) + compact = 1; + mode = LIST; break; case 'r': - readmode = 1; + mode = READ; break; case 'w': - writemode = 1; + mode = WRITE; break; case 'v': @@ -170,30 +172,38 @@ main(int argc, char **argv) } } - if ((listmode && optind >= argc + 1) - || (writemode && optind + 3 != argc) - || (readmode && optind + 2 != argc) - || (attachedmode && optind + 1 != argc) - || (dumpbarmode && (optind + 2 > argc || optind + 4 < argc)) - || (width == 8 && !dumpbarmode)) - usage(); - - if (listmode) { + switch (mode) { + case LIST: + if (optind >= argc + 1) + usage(); list_devs(optind + 1 == argc ? argv[optind] : NULL, verbose, - bars, bridge, caps, errors, vpd, listmode); - } else if (attachedmode) { + bars, bridge, caps, errors, vpd, compact); + break; + case ATTACHED: + if (optind + 1 != argc) + usage(); chkattached(argv[optind]); - } else if (readmode) { + break; + case READ: + if (optind + 2 != argc || width == 8) + usage(); readit(argv[optind], argv[optind + 1], width); - } else if (writemode) { + break; + case WRITE: + if (optind + 3 != argc || width == 8) + usage(); writeit(argv[optind], argv[optind + 1], argv[optind + 2], width); - } else if (dumpbarmode) { + break; + case DUMPBAR: + if (optind + 2 > argc || optind + 4 < argc) + usage(); dump_bar(argv[optind], argv[optind + 1], optind + 2 < argc ? argv[optind + 2] : NULL, optind + 3 < argc ? argv[optind + 3] : NULL, width, verbose); - } else { + break; + default: usage(); } @@ -258,7 +268,7 @@ fetch_devs(int fd, const char *name, struct pci_conf **confp, size_t *countp) static void list_devs(const char *name, int verbose, int bars, int bridge, int caps, - int errors, int vpd, int listmode) + int errors, int vpd, int compact) { int fd; struct pci_conf *conf, *p; @@ -279,11 +289,11 @@ list_devs(const char *name, int verbose, int bars, int bridge, int caps, return; } - if (listmode == 2) + if (compact) printf("drv\tselector\tclass rev hdr " "vendor device subven subdev\n"); for (p = conf; p < conf + count; p++) { - if (listmode == 2) + if (compact) printf("%s%d@pci%d:%d:%d:%d:" "\t%06x %02x %02x " "%04x %04x %04x %04x\n", From nobody Tue Mar 10 16:53:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2C5Pq1z6VwKl for ; Tue, 10 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVg2C2G0mz3lBN for ; Tue, 10 Mar 2026 16:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPEFoEQh2uyhZM/rGYcUegUpVrfKXPOkX+1cxNzOcOs=; b=b6db6psS6tWIIGYmIOtL3tEJ/i7sH5p6OeXyY3GXm04Nwa07qt2sFYRVjrdOAORp164zmb LEpjjvpnCC2M83bsknzZih4trpv/5aUhR92781GZrPKv/cV5rXnj3RAdHTvr1QfHZwHMF2 2YtdiTXSvj3CFIeyen2wQLTN5cZSYr7tngy4Z+kBTD6zzXJKeMZVVHk+yLtcHaRN4FwtRA ey9TmFM0NS/y4ewzapuoOAgmS0DZkSZEKDE6Btc2SGoCpJxzDvFK8Yo2pOswqNx2pEuK6h kWAJQlEczy2HGoMJ64ttuqBfYikBy/vODCrVTB5Xwek0UJEvINT7OJzGZ31plw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773161635; a=rsa-sha256; cv=none; b=VzM8/s6Tf3yAFwfSZKv/Argp8z8tf4lqHQyETPhH5I+idtWO4V/7vk7RQ02Kua7oIKv8Lq ud9E+m+r10C51mJV7z4ZfHyehS9mfrPVz5KUzSqr9TN1QkZ+dZkMDKrEg2l+3UVMQkU3lN UiIzo9saKM3Q8O4K0mkB1J7+xEajxAyqNGnanYySjHuhGIi44O6oDvkkbroyOMUIUcVR0T H5J7e9JTl1Z1T3M5U9WtM+gigbgjKNaxGG+AA8TJ8YnLQ7WI1Q8sB51DCyFsnJUBiEkhXF vjVvdlCkYSiuII8QggLeHWk51JuIbIdPY/cyzE2DI8TUM4E2vp7GCHPbjBlj9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPEFoEQh2uyhZM/rGYcUegUpVrfKXPOkX+1cxNzOcOs=; b=dXbt4+fctTPW73/lZlpesDmempY6cCHbAL3CT8FXAZnpqPH+LDcIdRwsaHHZiU2cEfDNnD fxBQkLckmoNWa046sowvtjibm//8A53HogyL14IuBfNWWxHcEbfnDIFWac+Ht2YXuyy7wK nDYL4nKwUKsYLKlFgbsUX7CaeR8Ons4UlSVbhlg4aj/JuZiMzeKzieKTXh9Lk82130gTfE vmAIBvKmOiAzHH8cUjYXwl+SP3DVMFRBpLcKOA1Vq9MwWImtydOSgzqfszheNOFB3Y7kHc dwobXqJxHcPWDZtGkKdkV863Ya/KrL61RJ1i5HnSyvCVkK8/psnx4Jz1oq1T/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 4fVg2C1pC4z5Sl for ; Tue, 10 Mar 2026 16:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42efc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 16:53:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c3ac5f14c8b3 - main - pci.4: Quote argument to -width for a list block List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3ac5f14c8b330c036149d1d24cd3369d1418de2 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 16:53:55 +0000 Message-Id: <69b04ca3.42efc.584229ec@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c3ac5f14c8b330c036149d1d24cd3369d1418de2 commit c3ac5f14c8b330c036149d1d24cd3369d1418de2 Author: John Baldwin AuthorDate: 2026-03-10 16:49:10 +0000 Commit: John Baldwin CommitDate: 2026-03-10 16:49:10 +0000 pci.4: Quote argument to -width for a list block This fixes an mdoc warning and also properly indents this list. While here, update the quoted argument to be the longest tag in the list. Also while here, correct the description of pd_numa_domain. NUMA domains are a property of the device, not of the driver. Reviewed by: ziaee, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55770 --- share/man/man4/pci.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4 index b99747969035..f5d42efb4f37 100644 --- a/share/man/man4/pci.4 +++ b/share/man/man4/pci.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 31, 2025 +.Dd March 10, 2026 .Dt PCI 4 .Os .Sh NAME @@ -236,7 +236,7 @@ Driver name. .It pd_unit Driver unit number. .It pd_numa_domain -Driver NUMA domain. +Device NUMA domain. .It pc_reported_len Length of the valid portion of the encompassing .Vt pci_conf @@ -382,7 +382,7 @@ the memory-mapped PCI BAR into its address space. The input parameters and results are passed in the .Va pci_bar_mmap structure, which has the following fields: -.Bl -tag -width Vt struct pcise pbm_sel +.Bl -tag -width "uint64_t pbm_bar_length" .It Vt void *pbm_map_base Reports the established mapping base to the caller. If From nobody Tue Mar 10 16:53:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2D6wr3z6VwkH for ; Tue, 10 Mar 2026 16:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVg2D3FWFz3lD1 for ; Tue, 10 Mar 2026 16:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VS7BCez3ZEJcWYbrF6VUBfCpzrP75htjis1zL+fUQRs=; b=qLvTJ9bBM4MrssOx7a32omZRCAKcn9jKhL4M1MhbPa0XUumTxOo1q5+ndvXnCXvMFA//Ha 3vsyhsrLEoEH17xgMUfPhqk4AdbAZ3tMl6NOwcgWeZyS9B4McATsCkBIbkscjCam73DcKM YLMJM2qTkdS7N1JwJUKHcdoAJeSquPsP5PS6RIKk1IapheDZzbXb7HMyT0JTv5gOonEp1F yAX4PUeyOZ78fP51u2CIRq2kGxFHhEDN3LK7TxQZjxA5P+6RINq9mrXh0He5oXuCNAIYhj ySbrAjHls7edH2d7e5qAOENs+R1gUUoLT/Z0LQf3CzITkB7hNlb/va+A6yf7Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773161636; a=rsa-sha256; cv=none; b=DgZ/ebYs9pbYYNhD5z+ZKYBDG/M5RTy367MN+4AmSyCTCHf7V/lUcEewjJC0xMO8mdpUvQ yKxQb85YLIRQE7Y9mmu3EePmW9Y+JDFNElq/St36yXBFCxkpw5gdqmS5WihSsqqwNKDua4 WKBOHHl5998XM11T1R3AcUzqAzu2YwevjinrrlY+C6E/eAEuKsz3hPn4lu+2zbZ74PaDz4 TgmsauJeWfxdV+7eXTR+5DfckrUYltJInqZ0846EN/wXSepAnPRSutSkqf7aEEXMnRixcS Tej0rAZLmR5NAzwgscI5tbiz2fKgA7SAB177GWotOQ4xUwuMS5RuUjEN/5lKHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VS7BCez3ZEJcWYbrF6VUBfCpzrP75htjis1zL+fUQRs=; b=cIi1f6reVLW+TBOs4Cf1o3mTnj2iG80nEG0W6jWsii5xzFGyh7EOfVut8krDJwfcZxdh+Z QidmmYCjGFzVYZ/SptSjf1YbsLveBMkIsdeto3Q8OagbWLnUbEM654byVvP7xKOJRx86W2 21xL9ISDjyi1YNGq5dDql8sQz+amYfytEd5+/03BirmcNDvAkVX2x9Vo3ELKGTfUFE9xuW l9VVudUPtRwozUDlnTOqKqSSPpOPurgC78seKVQhLNo9WMXuu/Qa/M1rAT/Oa21nGijp5G TQ/x89E1b53yo5zqDHzJD/N1Lc/gt4cefsFhOkadJgv22SSsusuTXbJMCpA2dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2D2gbMz5Xr for ; Tue, 10 Mar 2026 16:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 440c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 16:53:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7e7a1b61531a - main - pci: Export bus numbers for bridge devices in struct pci_conf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e7a1b61531a29b4a0a5cdac66b96f420e6c66e4 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 16:53:56 +0000 Message-Id: <69b04ca4.440c3.3acee0c5@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7e7a1b61531a29b4a0a5cdac66b96f420e6c66e4 commit 7e7a1b61531a29b4a0a5cdac66b96f420e6c66e4 Author: John Baldwin AuthorDate: 2026-03-10 16:49:21 +0000 Commit: John Baldwin CommitDate: 2026-03-10 16:49:21 +0000 pci: Export bus numbers for bridge devices in struct pci_conf This exports bus information about bridges to userspace via the less-privileged PCIOCGETCONF ioctl. Previously if userspace wished to query this information, it had to use direct PCI config register access which requires higher privilege. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55771 --- share/man/man4/pci.4 | 6 ++++++ sys/dev/pci/pci.c | 3 +++ sys/dev/pci/pci_user.c | 32 +++++++++++++++++++++++++++++++- sys/sys/pciio.h | 4 +++- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4 index f5d42efb4f37..38a427e64f4f 100644 --- a/share/man/man4/pci.4 +++ b/share/man/man4/pci.4 @@ -244,6 +244,12 @@ structure. This should always be equivalent to the offset of the .Va pc_spare member. +.It pc_secbus +Secondary PCI bus number. +.Pq Only valid for bridge devices +.It pc_subbus +Subordinate PCI bus number. +.Pq Only valid for bridge devices .It pc_spare Reserved for future use. .El diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index a46813cc155a..0dddd2dd263f 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -798,6 +798,9 @@ pci_fill_devinfo(device_t pcib, device_t bus, int d, int b, int s, int f, devlist_entry->conf.pc_progif = cfg->progif; devlist_entry->conf.pc_revid = cfg->revid; + devlist_entry->conf.pc_secbus = cfg->bridge.br_secbus; + devlist_entry->conf.pc_subbus = cfg->bridge.br_subbus; + pci_numdevs++; pci_generation++; diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c index 9768030995e7..0e23363fba73 100644 --- a/sys/dev/pci/pci_user.c +++ b/sys/dev/pci/pci_user.c @@ -81,7 +81,9 @@ struct pci_conf32 { u_int32_t pd_unit; /* device unit number */ int pd_numa_domain; /* device NUMA domain */ u_int32_t pc_reported_len;/* length of PCI data reported */ - char pc_spare[64]; /* space for future fields */ + uint8_t pc_secbus; /* secondary bus number */ + uint8_t pc_subbus; /* subordinate bus number */ + char pc_spare[62]; /* space for future fields */ }; struct pci_match_conf32 { @@ -889,6 +891,8 @@ pci_conf_for_copyout(const struct pci_conf *pcp, union pci_conf_union *pcup, pcup->pc32.pd_unit = (uint32_t)pcp->pd_unit; if (cmd == PCIOCGETCONF32) { pcup->pc32.pd_numa_domain = pcp->pd_numa_domain; + pcup->pc32.pc_secbus = pcp->pc_secbus; + pcup->pc32.pc_subbus = pcp->pc_subbus; pcup->pc32.pc_reported_len = (uint32_t)offsetof(struct pci_conf32, pc_spare); } @@ -1315,6 +1319,32 @@ pci_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *t else dinfo->conf.pd_numa_domain = 0; + if (dinfo->cfg.dev != NULL) { + /* + * Re-read the values in case a driver + * changed them after the device was + * initially scanned. + */ + switch (dinfo->conf.pc_hdr) { + case PCIM_HDRTYPE_BRIDGE: + dinfo->conf.pc_secbus = + pci_read_config(dinfo->cfg.dev, + PCIR_SECBUS_1, 1); + dinfo->conf.pc_subbus = + pci_read_config(dinfo->cfg.dev, + PCIR_SUBBUS_1, 1); + break; + case PCIM_HDRTYPE_CARDBUS: + dinfo->conf.pc_secbus = + pci_read_config(dinfo->cfg.dev, + PCIR_SECBUS_2, 1); + dinfo->conf.pc_subbus = + pci_read_config(dinfo->cfg.dev, + PCIR_SUBBUS_2, 1); + break; + } + } + if (pattern_buf == NULL || pci_conf_match(cmd, pattern_buf, num_patterns, &dinfo->conf) == 0) { diff --git a/sys/sys/pciio.h b/sys/sys/pciio.h index 64c0b32cb8e2..58928544f171 100644 --- a/sys/sys/pciio.h +++ b/sys/sys/pciio.h @@ -79,7 +79,9 @@ struct pci_conf { u_long pd_unit; /* device unit number */ int pd_numa_domain; /* device NUMA domain */ size_t pc_reported_len;/* length of PCI data reported */ - char pc_spare[64]; /* space for future fields */ + uint8_t pc_secbus; /* secondary bus number */ + uint8_t pc_subbus; /* subordinate bus number */ + char pc_spare[62]; /* space for future fields */ }; struct pci_match_conf { From nobody Tue Mar 10 16:53:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2F6BZYz6Vwdq for ; Tue, 10 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVg2F3vq0z3lJY for ; Tue, 10 Mar 2026 16:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3qdaVA7SKhirRCfPz9VZGcA7lVWxzZZscafi1WjRwbc=; b=gOJnrtO/RT8DFzgPSCdbg3Og2kSCh5zzk0mwuaYTLkGfLkb7K2gdLodWgEWDr/mk8kD9fK E25Nw8eSed3m/CruHFsSMrm0skQ22guHuNPvufn1jtX3g0Suy945R8k+e4xKrYotwEgDM4 ly6ytN+WgslhCTYDOQqyWtsVlQ72DGubMHBzFOERTTL0TS+sCZbeT6w26JmywE1IhED9jt J2GvO4dTFCazGmPR3+GaoOqVZ7ooH80fnzfp7iufbXnMTtNTaf6Q9MZh72eJKP7TCNzWCU AehU6gKNTVzYeBPUnNUcawGMzhOXbMjjFQ0w84wWZkmlNmLhezrBOM6ne9cgDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773161637; a=rsa-sha256; cv=none; b=mE8UqaY4UR+AQlEDQILXtvmT0dAuI+PDIjV6xxlBMmUxcrW+wSLQJ/BgSp0/ApyeNp79z/ qfApdXcMVBfywMHPbbji4velpu9yQUDoF/4o2X/hk6ZUqcNR0thVNZYwLx+RdejSBbpFPJ RYx+FWYXrzH2v3jxY8FY48rn0sVSBotiScqg3QHlkIi/fK0mZJV33wopOrGHa5PED9xUSy 8gx6aL4BDpBMDVtW00Sa+2iPMKHaXg9W+ArdpsdKugUlfPPhKZzewlbIDPkrXpE0+YupeH nI2fJUnMc6abSVaDqe6KoqAR0aMLvXwN48uxQArhD/x3V7vzE0sbbSVtMfzaig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3qdaVA7SKhirRCfPz9VZGcA7lVWxzZZscafi1WjRwbc=; b=gVnnG5f+ROtboA8cNQjy6pmDFvW8DlEiE9z4ZOpETJL3RO+hB74YTZTkOjKFiDqtYSRhvf 7jLJW06PqEJ34HU7o7uMPZehBgzyhTltg+059YtVouGxSHWSUMKld5KYQSGKpt9VyU/oWC HpilgIufCnIdIeNxtJ8RhEHBYi2Gxwr3f3MwdX9z+A7QszrcXpt4E93xNeKksx4RqqTGpJ mlbgdQ1sAUs2LyVrv6YieC9wyrjec7BfpHPHvbrOWnIPJDWT9rD6WXmBFKL2mdNz2ai36H alkMRk9rmwRuMOyjn3p+yk6fWjKmQdiDrTbqOYqIeNkjwS6n7mby72Jt7vM4TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2F3TYLz55r for ; Tue, 10 Mar 2026 16:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 440c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 16:53:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9a1394957c30 - main - pciconf: Use the exported values of bus numbers for PCI bridges List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a1394957c3054c24995d684e8bc26878702dc6b Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 16:53:57 +0000 Message-Id: <69b04ca5.440c7.49f4f906@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9a1394957c3054c24995d684e8bc26878702dc6b commit 9a1394957c3054c24995d684e8bc26878702dc6b Author: John Baldwin AuthorDate: 2026-03-10 16:50:08 +0000 Commit: John Baldwin CommitDate: 2026-03-10 16:50:08 +0000 pciconf: Use the exported values of bus numbers for PCI bridges Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55772 --- usr.sbin/pciconf/pciconf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index 6c26621ae186..48520687197b 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -339,13 +339,9 @@ list_devs(const char *name, int verbose, int bars, int bridge, int caps, } static void -print_bus_range(int fd, struct pci_conf *p, int secreg, int subreg) +print_bus_range(struct pci_conf *p) { - uint8_t secbus, subbus; - - secbus = read_config(fd, &p->pc_sel, secreg, 1); - subbus = read_config(fd, &p->pc_sel, subreg, 1); - printf(" bus range = %u-%u\n", secbus, subbus); + printf(" bus range = %u-%u\n", p->pc_secbus, p->pc_subbus); } static void @@ -511,11 +507,11 @@ list_bridge(int fd, struct pci_conf *p) switch (p->pc_hdr & PCIM_HDRTYPE) { case PCIM_HDRTYPE_BRIDGE: - print_bus_range(fd, p, PCIR_SECBUS_1, PCIR_SUBBUS_1); + print_bus_range(p); print_bridge_windows(fd, p); break; case PCIM_HDRTYPE_CARDBUS: - print_bus_range(fd, p, PCIR_SECBUS_2, PCIR_SUBBUS_2); + print_bus_range(p); print_cardbus_windows(fd, p); break; } From nobody Tue Mar 10 16:53:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2G3322z6VwkM for ; Tue, 10 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVg2G1RTzz3lLx for ; Tue, 10 Mar 2026 16:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OET05qBqLgb5atTo1v3vdhRaKr9d1ANnDpDZ+0Ucjoo=; b=BFTMttOOJkhKTdVuUtVoMNNNX0g9dAKHK6JrqqVJyqtIpL0Jbmt9Ktxpi8iV04XzGrXUpb Jbxlr+e6DoRrdyDGe6/8rXSo1uIACCAAVx+MwQYNikkDOqRyPMKUx5aLYYJcIYRPa83A4m R71JK58FIenc0mrpgrp4LMH+5gkcudRif1GmEZme2L8/20sCc2MpGYjeln6Gsz1kK6KbSH bJA30m5e2UhoOMhATzipd6nOrbtnHv1OXpeYU+XVh9nhlpniUAxP+NHgonFJNCmuYHxFlg ezMlEzE4/gq7/iQHoidoQX0U389xJ4PhklMaDdfTycbmUmnGZt2ojUuvXyioOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773161638; a=rsa-sha256; cv=none; b=E8xqAxyKnEqsFNWoexkAfY1aMPE8lRh/fyVeis8Z8cWX7ZdxGjhbKvKIAebTuGByRKBhDa fTmqQWnRHzrRlUiOzYZsxsI20zy2+pYhFtuQVDkWcJwlfrlzDJCYn7DyZNMssqE/fHDOmt ThyCJa90La/NKEqgOznngtsq186YdKsJ2MbUHkURUKUu2st6p7RAxrJ0tfSFjnr6pB/wuR aZinwWqSBg0Uzu+KVEe200iKg91p+B00YytGa6iqxrV/fkOYkkcnjj2kixoXXG4vWQagfA 2u3oHnTHuX5UWcDgSsUBrNJcEYMDzZ8c1W1agXdGCfMplf2DRJ/7GkbIjQZW+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OET05qBqLgb5atTo1v3vdhRaKr9d1ANnDpDZ+0Ucjoo=; b=DjIjl96DI0gdoBBEdgfku6dc4KuDTt3JDSMrVcyUX3WWjKKUEv7rPEMnhBAGYyXeLY0v4a Go50AYKjyY/K9PAHN7SdrIh7xeb09sSntXKT3QiJLAr6cfASpNijPzPaIp74la0TgNF23/ OxSAyS2i7MLpzlJcVfB3f+ubq5NlmllxDEgDgpKVCOHl+WV2MdrxkskuBM70m1bkfbw+gq NTzPsswdUzW40K5spGYiAvyPYTt8kaiUbNqPpxwznIW6AhUIF1daeHH74Hj0ExXM00K2aC RgCZGUYGSwnCmGDokm/BQuo6WZthXcFTaYYxCGVysf9uoLDG+PN6MutSKrHFXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2G0jr3z5cV for ; Tue, 10 Mar 2026 16:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 454f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 16:53:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9eb035ff8439 - main - pciconf: Factor out fetching of matching devices from list_devs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9eb035ff8439195f565b9e3180b727333a4e7170 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 16:53:53 +0000 Message-Id: <69b04ca1.454f4.3db1a766@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9eb035ff8439195f565b9e3180b727333a4e7170 commit 9eb035ff8439195f565b9e3180b727333a4e7170 Author: John Baldwin AuthorDate: 2026-03-10 16:48:04 +0000 Commit: John Baldwin CommitDate: 2026-03-10 16:48:04 +0000 pciconf: Factor out fetching of matching devices from list_devs The new fetch_devs function fetches the entire list of PCI devices into a single list, retrying if the list changes while it is being fetched. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55768 --- usr.sbin/pciconf/pciconf.c | 168 ++++++++++++++++++++++++++------------------- 1 file changed, 96 insertions(+), 72 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index 4d3941131858..6aa33d332c08 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -200,23 +200,13 @@ main(int argc, char **argv) return (exitstatus); } -static void -list_devs(const char *name, int verbose, int bars, int bridge, int caps, - int errors, int vpd, int listmode) +static bool +fetch_devs(int fd, const char *name, struct pci_conf **confp, size_t *countp) { - int fd; struct pci_conf_io pc; struct pci_conf conf[255], *p; struct pci_match_conf patterns[1]; - int none_count = 0; - - if (verbose) - load_vendors(); - - fd = open(_PATH_DEVPCI, (bridge || caps || errors) ? O_RDWR : O_RDONLY, - 0); - if (fd < 0) - err(1, "%s", _PATH_DEVPCI); + size_t count; bzero(&pc, sizeof(struct pci_conf_io)); pc.match_buf_len = sizeof(conf); @@ -232,75 +222,109 @@ list_devs(const char *name, int verbose, int bars, int bridge, int caps, pc.patterns = patterns; } + p = NULL; + count = 0; do { if (ioctl(fd, PCIOCGETCONF, &pc) == -1) err(1, "ioctl(PCIOCGETCONF)"); - /* - * 255 entries should be more than enough for most people, - * but if someone has more devices, and then changes things - * around between ioctls, we'll do the cheesy thing and - * just bail. The alternative would be to go back to the - * beginning of the list, and print things twice, which may - * not be desirable. - */ if (pc.status == PCI_GETCONF_LIST_CHANGED) { - warnx("PCI device list changed, please try again"); - exitstatus = 1; - close(fd); - return; - } else if (pc.status == PCI_GETCONF_ERROR) { + free(p); + p = NULL; + count = 0; + pc.offset = 0; + continue; + } + + if (pc.status == PCI_GETCONF_ERROR) { warnx("error returned from PCIOCGETCONF ioctl"); - exitstatus = 1; - close(fd); - return; + return (false); } - if (listmode == 2) - printf("drv\tselector\tclass rev hdr " - "vendor device subven subdev\n"); - for (p = conf; p < &conf[pc.num_matches]; p++) { - if (listmode == 2) - printf("%s%d@pci%d:%d:%d:%d:" - "\t%06x %02x %02x " - "%04x %04x %04x %04x\n", - *p->pd_name ? p->pd_name : "none", - *p->pd_name ? (int)p->pd_unit : - none_count++, p->pc_sel.pc_domain, - p->pc_sel.pc_bus, p->pc_sel.pc_dev, - p->pc_sel.pc_func, (p->pc_class << 16) | - (p->pc_subclass << 8) | p->pc_progif, - p->pc_revid, p->pc_hdr, - p->pc_vendor, p->pc_device, - p->pc_subvendor, p->pc_subdevice); - else - printf("%s%d@pci%d:%d:%d:%d:" - "\tclass=0x%06x rev=0x%02x hdr=0x%02x " - "vendor=0x%04x device=0x%04x " - "subvendor=0x%04x subdevice=0x%04x\n", - *p->pd_name ? p->pd_name : "none", - *p->pd_name ? (int)p->pd_unit : - none_count++, p->pc_sel.pc_domain, - p->pc_sel.pc_bus, p->pc_sel.pc_dev, - p->pc_sel.pc_func, (p->pc_class << 16) | - (p->pc_subclass << 8) | p->pc_progif, - p->pc_revid, p->pc_hdr, - p->pc_vendor, p->pc_device, - p->pc_subvendor, p->pc_subdevice); - if (verbose) - list_verbose(p); - if (bars) - list_bars(fd, p); - if (bridge) - list_bridge(fd, p); - if (caps) - list_caps(fd, p, caps); - if (errors) - list_errors(fd, p); - if (vpd) - list_vpd(fd, p); + + p = reallocf(p, (count + pc.num_matches) * sizeof(*p)); + if (p == NULL) { + warnx("failed to allocate buffer for PCIOCGETCONF results"); + return (false); } + + memcpy(p + count, conf, pc.num_matches * sizeof(*p)); + count += pc.num_matches; } while (pc.status == PCI_GETCONF_MORE_DEVS); + *confp = p; + *countp = count; + return (true); +} + +static void +list_devs(const char *name, int verbose, int bars, int bridge, int caps, + int errors, int vpd, int listmode) +{ + int fd; + struct pci_conf *conf, *p; + size_t count; + int none_count = 0; + + if (verbose) + load_vendors(); + + fd = open(_PATH_DEVPCI, (bridge || caps || errors) ? O_RDWR : O_RDONLY, + 0); + if (fd < 0) + err(1, "%s", _PATH_DEVPCI); + + if (!fetch_devs(fd, name, &conf, &count)) { + exitstatus = 1; + close(fd); + return; + } + + if (listmode == 2) + printf("drv\tselector\tclass rev hdr " + "vendor device subven subdev\n"); + for (p = conf; p < conf + count; p++) { + if (listmode == 2) + printf("%s%d@pci%d:%d:%d:%d:" + "\t%06x %02x %02x " + "%04x %04x %04x %04x\n", + *p->pd_name ? p->pd_name : "none", + *p->pd_name ? (int)p->pd_unit : + none_count++, p->pc_sel.pc_domain, + p->pc_sel.pc_bus, p->pc_sel.pc_dev, + p->pc_sel.pc_func, (p->pc_class << 16) | + (p->pc_subclass << 8) | p->pc_progif, + p->pc_revid, p->pc_hdr, + p->pc_vendor, p->pc_device, + p->pc_subvendor, p->pc_subdevice); + else + printf("%s%d@pci%d:%d:%d:%d:" + "\tclass=0x%06x rev=0x%02x hdr=0x%02x " + "vendor=0x%04x device=0x%04x " + "subvendor=0x%04x subdevice=0x%04x\n", + *p->pd_name ? p->pd_name : "none", + *p->pd_name ? (int)p->pd_unit : + none_count++, p->pc_sel.pc_domain, + p->pc_sel.pc_bus, p->pc_sel.pc_dev, + p->pc_sel.pc_func, (p->pc_class << 16) | + (p->pc_subclass << 8) | p->pc_progif, + p->pc_revid, p->pc_hdr, + p->pc_vendor, p->pc_device, + p->pc_subvendor, p->pc_subdevice); + if (verbose) + list_verbose(p); + if (bars) + list_bars(fd, p); + if (bridge) + list_bridge(fd, p); + if (caps) + list_caps(fd, p, caps); + if (errors) + list_errors(fd, p); + if (vpd) + list_vpd(fd, p); + } + + free(conf); close(fd); } From nobody Tue Mar 10 16:53:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2H1jVcz6Vwbl for ; Tue, 10 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVg2G4zdhz3lLy for ; Tue, 10 Mar 2026 16:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZouUllapgp5m1oaRVeLYzmX04Z0Sgv3zMmMumlt8qE=; b=CRjzeurUsRjVMPwrxzW1dMLQkNzYPamLPrBBWWRwD1QS5Y+XF30gfInWrVqODfv160M/rg wCsX+T0wUHYzzid4b60wbjcXsBSupw/VeXzloAdS9B6ZeU8Hh1Ovm1u9/5PgnXE6AWocQ+ 2s5mwzcuNCf6DH+E17u9++xEVfEZLQ0LVfZuubznQq89K4ecCUzshEG6ri73Kh6Yx6oCry bFJ1+kyRj57DmodXpfUvkRawW5PoMBmgRaIYz/uKwIFoCqBj7CVcfyQnDf4aBelbmrVTWb bqy7mxBCZm2szN86X4Y+1mZAygSVKozDC8Q2J6QVUAgWxvpmunl1qhr6Rej8LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773161638; a=rsa-sha256; cv=none; b=yK0wOGH5TPpPw0Kif/axcJzE6gzzxBc3DSI03h8dBf9WEt6MlLKE5mFDlmiTBU5s09H+F6 qsLpzTdgdkKwjOnwkcvZmdbE2qhHuJ5ypEbcNlbsQkwIoPh5wJTPVxWH/Uizk3nu0GLLBd b2i2dCPbySn1rkfgn8RtQtblrusNESm4j71uyrzGhpYZJeeiCJPanMKEsisImDMyaIe3ei WTVqZ6LeAKPJoNsXrUuyMGZ4iW66aBIrSEXoV54kn+g/sOjoIuBExr8TbpclzeSbeKVIt6 dRvUSLw5hJEPIo9NDqD8XBba8AyhsVvLmFn9VFCQyDQ9fCdU1eqUliFUngkn+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZouUllapgp5m1oaRVeLYzmX04Z0Sgv3zMmMumlt8qE=; b=GrOQG4YzfKykHCV7o9PBT1uTZAxgF0zqeWYORPdu9QTIHKlnmusJm/fdanNiD1zm+G1Nxe 0+C6UsS2SFMXRNpFANOawMh1fmp/986mjfyL80mUk/yLB3gOOiJoG0QXCfxZQpI7P09upe aPOpto0GVYdLvNoG+XS17ACtZv1pnMsJXQ1jiCylnUnld/ASJjb28UorOW4QzZyKqdClIX eFdzvLTK0+alca1SY7tTaTnBCbwIKYQxgY1qH+O0TqhWBCjtfSqbERGr+TRCyNkypuML99 4Cqbb2zx1CqGmYEUcnFpfaNHSQxz9mhhTEqjF/pp/8VNJ8ACxX38vdxKczCf/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 4fVg2G4KlLz55t for ; Tue, 10 Mar 2026 16:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4568b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 16:53:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 98a0d2283701 - main - pciconf.8: Reorganize slightly to handle additional modes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98a0d2283701e08353ce670c8023803c58a4994c Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 16:53:58 +0000 Message-Id: <69b04ca6.4568b.5c5c5c32@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=98a0d2283701e08353ce670c8023803c58a4994c commit 98a0d2283701e08353ce670c8023803c58a4994c Author: John Baldwin AuthorDate: 2026-03-10 16:50:52 +0000 Commit: John Baldwin CommitDate: 2026-03-10 16:50:52 +0000 pciconf.8: Reorganize slightly to handle additional modes Move the description of the optional device argument earlier before describing individual command modes. Add a subsection for list mode and a second subsection for the other modes that work with a single device. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55773 --- usr.sbin/pciconf/pciconf.8 | 58 +++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8 index 6c67e9e50df6..c9cbe483a1ac 100644 --- a/usr.sbin/pciconf/pciconf.8 +++ b/usr.sbin/pciconf/pciconf.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 19, 2025 +.Dd March 10, 2026 .Dt PCICONF 8 .Os .Sh NAME @@ -52,6 +52,31 @@ access to .Pa /dev/pci , normally only the super-user. .Pp +A +.Ar device +can be identified either by a device name if the device is +attached to a driver or by a selector. +Selectors identify a PCI device by its address in PCI config space and +can take one of the following forms: +.Pp +.Bl -bullet -offset indent -compact +.It +.Li pci Ns Va domain Ns \&: Ns Va bus Ns \&: Ns Va device Ns \&: \ +Ns Va function Ns +.It +.Li pci Ns Va bus Ns \&: Ns Va device Ns \&: Ns Va function Ns +.It +.Li pci Ns Va bus Ns \&: Ns Va device Ns +.El +.Pp +In the case of an abridged form, omitted selector components are assumed to be 0. +An optional leading device name followed by @ and an optional final colon +will be ignored; this is so that the first column in the output of +.Nm +.Fl l +can be used without modification. +All numbers are base 10. +.Ss List Mode With the .Fl l option, @@ -260,36 +285,7 @@ argument is given with the flag, .Nm will only list details about a single device instead of all devices. -.Pp -All invocations of -.Nm -except for -.Fl l -require a -.Ar device . -The device can be identified either by a device name if the device is -attached to a driver or by a selector. -Selectors identify a PCI device by its address in PCI config space and -can take one of the following forms: -.Pp -.Bl -bullet -offset indent -compact -.It -.Li pci Ns Va domain Ns \&: Ns Va bus Ns \&: Ns Va device Ns \&: \ -Ns Va function Ns -.It -.Li pci Ns Va bus Ns \&: Ns Va device Ns \&: Ns Va function Ns -.It -.Li pci Ns Va bus Ns \&: Ns Va device Ns -.El -.Pp -In the case of an abridged form, omitted selector components are assumed to be 0. -An optional leading device name followed by @ and an optional final colon -will be ignored; this is so that the first column in the output of -.Nm -.Fl l -can be used without modification. -All numbers are base 10. -.Pp +.Ss Device Information Modes With the .Fl a flag, From nobody Tue Mar 10 16:53:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2J4FDyz6Vwbp for ; Tue, 10 Mar 2026 16:54: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVg2H62Pbz3kwk for ; Tue, 10 Mar 2026 16:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/uaPRRX5rQg1EuDz3wiZsF0w+OeKfYK2aH+KCGV7WQ=; b=gK/8lguOn5Z6ujKsVMl9hz2J+O9FVystGiWH+DIcAxW8ZuvdHstffhRCLCP8OsQeOpLYeI 72bH/hb4XEsEjdJfY//iM6K52YOUnrvU6ROkYUFbGUuW6vf1oHfjzbAwiVNudbSPZYehUj CkIt87pSp+yyXkY3YlXZN1Ms8Vf++Q05DAhmXt2Oqqqewe3+v1IFgMXmrRsF3oskhXq+xi xWMuUVS/MtTnA83zWWl3e1LN2agRJaYVYFBVfMqpz9AB2ufXxnRGzc2Bbl+OSfNif4p4Rz 3HSboOZvkSVQrvUx5vXjQ17bm9OjUyP/hn6At5ZCUfjBbdKvcNvGAPajPHg3rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773161639; a=rsa-sha256; cv=none; b=UArMZxhyHRmje08hobGyRel1QyhsBirJQIvzz+RCZYAC9MCVMrlfb47jfzCHPbdUHDKstU SJvLYVSXP1X3d14lhEvsy9O1aFOd0OsulmCg6vbN5aPkjptb6MjSQfFlVfuruB3MZwn3C5 C9wgPsdFU0crAyq6BsM/CA7/uVHaKHtaxc7324b88aIdSYhJbhLlUPknplrMtdXAbXMMMJ DlINoSZvp3Wgqo4NmcBb3w9/RK1995nmxGjI0QAVuB0OclzvUaunVFAKYjzAR1dLgKbRaP XbZH/WaJRzybhDA1+6n8NPdfjKTiHN5FxjzGNE8i5+UG9Cj0Zjxy15IhpEkl0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773161639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/uaPRRX5rQg1EuDz3wiZsF0w+OeKfYK2aH+KCGV7WQ=; b=jCnqPh6HojVGWUdhCrd/6M9Ch40yYo+eUPbInuQz5XlLXPSh8p0VA+6V//r4BWUlQICCPi u5C+mOoGDTVFWTKdCwHOc4R//XeDAeV5bdSV2QjlCuYBTz02vl3P6rWZ0RPoUm+QBCigsr n6KjQCDwcYbd0dvLItbZ9icM6zdPSwRjIOY5RM+lYrd/dUKWzmVZ4Gu3WNAP824n9nNowI lSIkxzsE0lUETMHXSa/kdTU8xZwifF7zCFI2H/fFrmm9Sj8Bq1DuD85sQjfNw+Hby5aENa W+rh1y/rdJu8FIet4oVSkeKdS1Orotm+LF9mS+3Co6105PES2RnMi6dpEgbKMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVg2H54nSz5l4 for ; Tue, 10 Mar 2026 16:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43a7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 16:53:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 14b8a27883c1 - main - pciconf: Add a tree mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14b8a27883c15d3add3114f855eff7c6bda1b015 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 16:53:59 +0000 Message-Id: <69b04ca7.43a7d.58a4e367@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=14b8a27883c15d3add3114f855eff7c6bda1b015 commit 14b8a27883c15d3add3114f855eff7c6bda1b015 Author: John Baldwin AuthorDate: 2026-03-10 16:51:00 +0000 Commit: John Baldwin CommitDate: 2026-03-10 16:51:00 +0000 pciconf: Add a tree mode This lists PCI devices in a hierarchy showing the parent/child relationship of PCI devices and bridges. While this is inspired by lspci -t output, the format is closer to ps -d and also prefers using new-bus device names when possible. If a device does not have a driver, the PCI selector is output in place of the device name. When the -v flag is given, the vendor and device ID strings are output after the device name. If a string for an ID isn't found, the hex ID values are output instead. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55774 --- usr.sbin/pciconf/pciconf.8 | 24 +++++ usr.sbin/pciconf/pciconf.c | 254 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 276 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8 index c9cbe483a1ac..7958a538f3d9 100644 --- a/usr.sbin/pciconf/pciconf.8 +++ b/usr.sbin/pciconf/pciconf.8 @@ -33,6 +33,8 @@ .Nm .Fl l Oo Fl BbceVv Oc Op Ar device .Nm +.Fl t Oo Fl v Oc +.Nm .Fl a Ar device .Nm .Fl r Oo Fl b | h Oc Ar device addr Ns Op : Ns Ar addr2 @@ -285,6 +287,28 @@ argument is given with the flag, .Nm will only list details about a single device instead of all devices. +.Ss Tree Mode +With the +.Fl t +flag, +.Nm +lists PCI devices in a tree prefixing each device with indentation text showing +the sibling and parent/child relationships. +If the device has an attached driver, the device is identified by the driver +name and unit number; +otherwise, the device is identified by a PCI selector. +.Pp +Top-level entries in the tree identify top-level PCI buses. +Each bus is named as a partial PCI selector: +.Li pci Ns Va domain Ns \&: Ns Va bus Ns . +.Pp +If the +.Fl v +flag is specified, +the device name or PCI selector is followed by the device's vendor and device +strings from the vendor/device information database. +If an identification string is not found in the database, +the ID register values are output instead. .Ss Device Information Modes With the .Fl a diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index 48520687197b..7da8aeadae93 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -65,6 +66,13 @@ struct pci_vendor_info char *desc; }; + +struct pci_tree_entry { + TAILQ_ENTRY(pci_tree_entry) link; + TAILQ_HEAD(pci_tree_list, pci_tree_entry) children; + struct pci_conf *p; +}; + static TAILQ_HEAD(,pci_vendor_info) pci_vendors; static struct pcisel getsel(const char *str); @@ -72,6 +80,7 @@ static void list_bridge(int fd, struct pci_conf *p); static void list_bars(int fd, struct pci_conf *p); static void list_devs(const char *name, int verbose, int bars, int bridge, int caps, int errors, int vpd, int compact); +static void show_tree(int verbose); static void list_verbose(struct pci_conf *p); static void list_vpd(int fd, struct pci_conf *p); static const char *guess_class(struct pci_conf *p); @@ -91,6 +100,7 @@ usage(void) fprintf(stderr, "%s", "usage: pciconf -l [-BbcevV] [device]\n" + " pciconf -t [-v]\n" " pciconf -a device\n" " pciconf -r [-b | -h] device addr[:addr2]\n" " pciconf -w [-b | -h] device addr value\n" @@ -103,14 +113,14 @@ int main(int argc, char **argv) { int c, width; - enum { NONE, LIST, READ, WRITE, ATTACHED, DUMPBAR } mode; + enum { NONE, LIST, TREE, READ, WRITE, ATTACHED, DUMPBAR } mode; int compact, bars, bridge, caps, errors, verbose, vpd; mode = NONE; compact = bars = bridge = caps = errors = verbose = vpd = 0; width = 4; - while ((c = getopt(argc, argv, "aBbcDehlrwVvx")) != -1) { + while ((c = getopt(argc, argv, "aBbcDehlrtwVvx")) != -1) { switch(c) { case 'a': mode = ATTACHED; @@ -151,6 +161,9 @@ main(int argc, char **argv) mode = READ; break; + case 't': + mode = TREE; + break; case 'w': mode = WRITE; break; @@ -179,6 +192,11 @@ main(int argc, char **argv) list_devs(optind + 1 == argc ? argv[optind] : NULL, verbose, bars, bridge, caps, errors, vpd, compact); break; + case TREE: + if (optind != argc) + usage(); + show_tree(verbose); + break; case ATTACHED: if (optind + 1 != argc) usage(); @@ -338,6 +356,238 @@ list_devs(const char *name, int verbose, int bars, int bridge, int caps, close(fd); } +static int +pci_conf_compar(const void *lhs, const void *rhs) +{ + const struct pci_conf *l, *r; + + l = lhs; + r = rhs; + if (l->pc_sel.pc_domain != r->pc_sel.pc_domain) + return (l->pc_sel.pc_domain - r->pc_sel.pc_domain); + if (l->pc_sel.pc_bus != r->pc_sel.pc_bus) + return (l->pc_sel.pc_bus - r->pc_sel.pc_bus); + if (l->pc_sel.pc_dev != r->pc_sel.pc_dev) + return (l->pc_sel.pc_dev - r->pc_sel.pc_dev); + return (l->pc_sel.pc_func - r->pc_sel.pc_func); +} + +static void +tree_add_device(struct pci_tree_list *head, struct pci_conf *p, + struct pci_conf *conf, size_t count, bitstr_t *added) +{ + struct pci_tree_entry *e; + struct pci_conf *child; + size_t i; + + e = malloc(sizeof(*e)); + TAILQ_INIT(&e->children); + e->p = p; + TAILQ_INSERT_TAIL(head, e, link); + + switch (p->pc_hdr) { + case PCIM_HDRTYPE_BRIDGE: + case PCIM_HDRTYPE_CARDBUS: + break; + default: + return; + } + if (p->pc_secbus == 0) + return; + + assert(p->pc_subbus >= p->pc_secbus); + for (i = 0; i < count; i++) { + child = conf + i; + if (child->pc_sel.pc_domain < p->pc_sel.pc_domain) + continue; + if (child->pc_sel.pc_domain > p->pc_sel.pc_domain) + break; + if (child->pc_sel.pc_bus < p->pc_secbus) + continue; + if (child->pc_sel.pc_bus > p->pc_subbus) + break; + + if (child->pc_sel.pc_bus == p->pc_secbus) { + assert(bit_test(added, i) == 0); + bit_set(added, i); + tree_add_device(&e->children, conf + i, conf, count, + added); + continue; + } + + if (bit_test(added, i) == 0) { + /* + * This really shouldn't happen, but if for + * some reason a child bridge doesn't claim + * this device, display it now rather than + * later. + */ + bit_set(added, i); + tree_add_device(&e->children, conf + i, conf, count, + added); + continue; + } + } +} + +static bool +build_tree(struct pci_tree_list *head, struct pci_conf *conf, size_t count) +{ + bitstr_t *added; + size_t i; + + TAILQ_INIT(head); + + /* + * Allocate a bitstring to track which devices have already + * been added to the tree. + */ + added = bit_alloc(count); + if (added == NULL) + return (false); + + for (i = 0; i < count; i++) { + if (bit_test(added, i)) + continue; + + bit_set(added, i); + tree_add_device(head, conf + i, conf, count, added); + } + + free(added); + return (true); +} + +static void +free_tree(struct pci_tree_list *head) +{ + struct pci_tree_entry *e, *n; + + TAILQ_FOREACH_SAFE(e, head, link, n) { + free_tree(&e->children); + TAILQ_REMOVE(head, e, link); + free(e); + } +} + +static void +print_tree_entry(struct pci_tree_entry *e, const char *indent, bool last, + int verbose) +{ + struct pci_vendor_info *vi; + struct pci_device_info *di; + struct pci_tree_entry *child; + struct pci_conf *p = e->p; + char *indent_buf; + + printf("%s%c--- ", indent, last ? '`' : '|'); + if (p->pd_name[0] != '\0') + printf("%s%lu", p->pd_name, p->pd_unit); + else + printf("pci%d:%d:%d:%d", p->pc_sel.pc_domain, p->pc_sel.pc_bus, + p->pc_sel.pc_dev, p->pc_sel.pc_func); + + if (verbose) { + di = NULL; + TAILQ_FOREACH(vi, &pci_vendors, link) { + if (vi->id == p->pc_vendor) { + printf(" %s", vi->desc); + TAILQ_FOREACH(di, &vi->devs, link) { + if (di->id == p->pc_device) { + printf(" %s", di->desc); + break; + } + } + break; + } + } + if (vi == NULL) + printf(" vendor=0x%04x device=0x%04x", p->pc_vendor, + p->pc_device); + else if (di == NULL) + printf(" device=0x%04x", p->pc_device); + } + printf("\n"); + + if (TAILQ_EMPTY(&e->children)) + return; + + asprintf(&indent_buf, "%s%c ", indent, last ? ' ' : '|'); + TAILQ_FOREACH(child, &e->children, link) { + print_tree_entry(child, indent_buf, TAILQ_NEXT(child, link) == + NULL, verbose); + } + free(indent_buf); +} + +static void +show_tree(int verbose) +{ + struct pci_tree_list head; + struct pci_tree_entry *e, *n; + struct pci_conf *conf; + size_t count; + int fd; + bool last, new_bus; + + if (verbose) + load_vendors(); + + fd = open(_PATH_DEVPCI, O_RDONLY); + if (fd < 0) + err(1, "%s", _PATH_DEVPCI); + + if (!fetch_devs(fd, NULL, &conf, &count)) { + exitstatus = 1; + goto close_fd; + } + + if (count == 0) + goto close_fd; + + if (conf[0].pc_reported_len < offsetof(struct pci_conf, pc_subbus)) { + warnx("kernel too old"); + exitstatus = 1; + goto free_conf; + } + + /* First, sort devices by DBSF. */ + qsort(conf, count, sizeof(*conf), pci_conf_compar); + + if (!build_tree(&head, conf, count)) { + warnx("failed to build tree of PCI devices"); + exitstatus = 1; + goto free_conf; + } + + new_bus = true; + TAILQ_FOREACH(e, &head, link) { + if (new_bus) { + printf("--- pci%d:%d\n", e->p->pc_sel.pc_domain, + e->p->pc_sel.pc_bus); + new_bus = false; + } + + /* Is this the last entry for this bus? */ + n = TAILQ_NEXT(e, link); + if (n == NULL || + n->p->pc_sel.pc_domain != e->p->pc_sel.pc_domain || + n->p->pc_sel.pc_bus != e->p->pc_sel.pc_bus) { + last = true; + new_bus = true; + } else + last = false; + + print_tree_entry(e, " ", last, verbose); + } + + free_tree(&head); +free_conf: + free(conf); +close_fd: + close(fd); +} + static void print_bus_range(struct pci_conf *p) { From nobody Tue Mar 10 17:21:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVgdd55rxz6TkQ4; Tue, 10 Mar 2026 17:21:09 +0000 (UTC) (envelope-from jhb@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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVgdd0Mgqz3qV8; Tue, 10 Mar 2026 17:21:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773163269; h=from:from:reply-to:subject: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=qnsvs0F+9otKopVVuf88Ltv01QAEqsRuDyGoeSiWFko=; b=JAtA3xFWl1Yf1ftpG0pc6vEyIZ7/tU8hHdTnHdF0EFo2os0nm+DoMV1xwByFrKaXusUrym SvgaF0B0luup2X/EWspvNyHSex2riRi7BrIUpTTIxDEx845NxaAaw6Ig7nDGHYgKBGIcC7 83A/L5Y6400iA5kPIT66ENQcJ9Zv39knNfmWPQlZsXP/vBxa7kLpa3Lljo04AsGFwQ5By6 FDGZsvces17KmmlAh/gy+YLuEcMTBTQDoH0yDFbLYmWADh1XgTdX/h29kJSg8p+aYLJyyr 9DrVkTy1jr7Ba1C5+i9JDFXhDRMQSMQP8W/QrpedVtZppUYC1dFxTYJrK5LiqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773163269; a=rsa-sha256; cv=none; b=f2fd0gyjem7APKnxtNXatJxdVABnf4CNC5GoBV2DV90u1NXRkte4fIUtEiJJdQBtTCusnA /nDjKQ7oSldjq+SAKpEU8lwf1PJ28wYjstgTVCzYRzS8pGpzrhXPICMqYCidJ9/uZp8PN7 h81rHEuqA6Ous2qGDVCcf5ZNI4hQ1xOqs9s7JFxpZddO6PXXLQCQ9taJciCDcDRsLIaoIR O48dbT25AKROAqhk1W6pXX4YBENcA5+lALvgDj1Ujw8apVbcQoKWKRTAry0Ok+0jSl4hnm p+xgaE8uHVkRKR/TKipNXF58/Ii43d6HyKlQQUBjSZJc22f3h88BvzXYyojHSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773163269; h=from:from:reply-to:subject: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=qnsvs0F+9otKopVVuf88Ltv01QAEqsRuDyGoeSiWFko=; b=Dy6S6YQjIt9lJuIKvtdyz2a1QrBnIDqPJOLVfxLWELzG84vPsi5my3KAIOVIVKseC74vXT tsJhKbmhLROt/Euh3H9yJKu69mrTSyhH/doZPhfn5AR5qIrfGwn1vYkvu1AZy/KjrQ8ab/ l3kRLzwmKg7ZHkHgHFU/uiQOpzlo52p7uHOgSuLBlJGN1qhY/2H6NXbw4tfHnN7cdbtW4h gyDQZXG6qqqOXrML2uJrNTinGPi2ktNYyVojvfNxoJ9INqZh9KIHE0Sscbpe9uphzrp66w 0mQkAWYSLHLfu4o8+mpKciiY2uOiDKxiUXYNYW3FwtU3Ibu7Avz7KwQ0V7pZEQ== Received: from [IPV6:2601:5c0:4202:5670:41db:1f31:9abb:a71c] (unknown [IPv6:2601:5c0:4202:5670:41db:1f31:9abb:a71c]) (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 4fVgdc63Xyz1CqK; Tue, 10 Mar 2026 17:21:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <98d8aa2f-a312-4b33-afca-5e83d90e4bf7@FreeBSD.org> Date: Tue, 10 Mar 2026 13:21:08 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 14b8a27883c1 - main - pciconf: Add a tree mode 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: <69b04ca7.43a7d.58a4e367@gitrepo.freebsd.org> In-Reply-To: <69b04ca7.43a7d.58a4e367@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/10/26 12:53, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=14b8a27883c15d3add3114f855eff7c6bda1b015 > > commit 14b8a27883c15d3add3114f855eff7c6bda1b015 > Author: John Baldwin > AuthorDate: 2026-03-10 16:51:00 +0000 > Commit: John Baldwin > CommitDate: 2026-03-10 16:51:00 +0000 > > pciconf: Add a tree mode > > This lists PCI devices in a hierarchy showing the parent/child > relationship of PCI devices and bridges. While this is inspired by > lspci -t output, the format is closer to ps -d and also prefers using > new-bus device names when possible. If a device does not have a > driver, the PCI selector is output in place of the device name. > > When the -v flag is given, the vendor and device ID strings are output > after the device name. If a string for an ID isn't found, the hex ID > values are output instead. > > Reviewed by: imp > Sponsored by: Chelsio Communications > Differential Revision: https://reviews.freebsd.org/D55774 I did play with enabling some of other list options like -b and -B to output as indented under each node in the tree. If there is a desire for that, I could add it. I found it a bit distracting when I prototyped it. OTOH, it might be useful for -c at least. One of the things I think is helpful in this view is that you can easily see the PCI bridge that is the upstream port of a PCI-e link connecting to a leaf device. -- John Baldwin From nobody Tue Mar 10 17:41:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVh5N1pf2z6Tlww for ; Tue, 10 Mar 2026 17:41: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVh5N0yk4z3rj0 for ; Tue, 10 Mar 2026 17:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773164504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ox43ZYeo02AJbrWXB00YQUiD1Q1stbtfOh76gSitL+Y=; b=EU6OhESu8HTrkwSO5vPe6S/e4a5liVe3BrZqn8fYvbu/awgS/sDvP2uFXmLvL/RIWgmDXo mpf2Sp7IjNmxO5Q9fv3G8XasKmTrrlGj38CkIDfCUXBCcKEGObBsjpCROkZ1pUTQ+fEzjU kC00vyVjTzYdlHrYGDzZCy8w7Q3X374Ab/a26OkbF3n90AxtN0J6r2f6NgRL52bzRc52A5 yTOxZbrJzLaA6CQwwSDw5qHIy1liIurL1CrzY0n1aBj7MkF3S6ZY19rz/JgTJlbSSOtHVq 7wWbfhyPFauo8GVwA0Cb+2jtIyGF3JyrdfKvv//UFK2Ep+18crsUmTRVnubSJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773164504; a=rsa-sha256; cv=none; b=G7DJ8h5D/SkYNIlLW6sZPUwC+YOgpVdULgsBNKKdGPdoz8MwlM0HbrPKZ0tAh2M/1KmSzv FFOsSHDRBwYVgno+lJVAdlb0IwoVZ+eGtKB2yOYPMyhMuVMhHovBxUH9nPCirMcBuBiw57 qpTRvbsgHR4ZfP2PpWNdto1c5QikL2pcnzHbd46Qfq7lxNrKfnGvEhj71N294ughj/ryPU IPhwchQM4nJ2RDBvPy3dzrRVrSJy2rbqekXUnuK+kSalupf5Q/dKugr5HDHhNl+obK6ukN NnsmOmb3yr//I5JLb0mde4DY3QarTIsH2Ehz5VZriLMB8PkkLuQWQSGCNMKIMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773164504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ox43ZYeo02AJbrWXB00YQUiD1Q1stbtfOh76gSitL+Y=; b=Qdf4tB0ouSxqQJQdfi5Sw4G+DLiIvRE0qemAHlH9PavDG3apdrHEXKnRQun7f4vtNHZ56d 6jD4KGgvaxJJV347WQQUeBP9UJWHB/7i3Uvzw8B55X57PtH8jhwqPNcKsh4ajexTWZY35J f8Z6RUtE0Bula70nNgkEksYGTdlPQoTf2PtAkTtsk8mCwsQDV15cZkawrtYCIuTkg1/onc EFnG3Y0Nk+tvNBp0kjhttQxbpppYfLZLytFPBoqsuhoahaqPBq7NxvVO+QzAsv+uQaEPAV azzzUimeieHj6po5al3qi9q8QIyl6p7zDzGoCkM9Tf+p46UCHQOtCVmVFIoaNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVh5N0X45z5sN for ; Tue, 10 Mar 2026 17:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19c24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 17:41: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: ba7439f0a960 - main - yes: Add missing header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba7439f0a9604b15bfef8084816f34d55eb6bdf2 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 17:41:44 +0000 Message-Id: <69b057d8.19c24.61499773@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ba7439f0a9604b15bfef8084816f34d55eb6bdf2 commit ba7439f0a9604b15bfef8084816f34d55eb6bdf2 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-10 17:40:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-10 17:41:27 +0000 yes: Add missing header This is a no-op on FreeBSD due to namespace pollution. MFC after: 1 week Sponsored by: Klara, Inc. Fixes: cf74b63d61b4 ("yes: Completely overengineer") --- usr.bin/yes/yes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c index 53224603cf95..86022c82f453 100644 --- a/usr.bin/yes/yes.c +++ b/usr.bin/yes/yes.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include From nobody Tue Mar 10 18:11:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVhlK0HZmz6Tp3m for ; Tue, 10 Mar 2026 18:11: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVhlJ6rtvz3vnl for ; Tue, 10 Mar 2026 18:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773166269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v9hHeqA2u5BWUlSmPBE5SpMEA/34WNqwU2kr2lILm3c=; b=HAoEEUQ53aFr++1HkMe4HoHX5g/SRBGANHFtPAjEmqcCwRijek7Pwq9dQnt99PXoPMchuT 1JTqD+BHXTG59cSTkZ0VUo8bQhqasIYF6VGSlrjfZzy0g7+VFmePy60Ck3M0mSRILTui2y xkShzCD8VVpxnoSJBL1Z0oG/bVP1O6wKkIYloSb16r++k8W5Yno+GMlPqmhgP8XZVnTOZ3 Rsi9gau7GUH5pW7M5hKxfb9VhR2r8XmT7Tr9qrp+ffticm8mZsNkEsGhzd/99koNpHI+Gw 32jG4RFzg5BTOdhisnBxUPtOJfy5czUkwbuwpERWSSsciXoKXl6RGdzEUiV1PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773166269; a=rsa-sha256; cv=none; b=HD6I2cDHtlDnLTYFSB9OrU6IOLggh7uewuOXsHAZQI7vFQciL+J7uqj0VJKs63O85qXm0o qSbfLuQachljGP/TmB2MTZVxfZjm4W0uZT5MGkiFPCD4GwU48J6j72fzJoMoHeWgPQ1h5O nJYDJnzN/G0P+7FjFOWLYiSsCO92G6UiR0LLJr7/QnvzU1muOnt6zeH/9q5QO1lW0uENaJ nFSK9Z/W+RAMLizWS/BTF1frZ+dHKgEHpER9mMihvt4nZWecAkxHdsp616Q6dxcwN16yC7 M4iSp8SZunqYKHTyBHIscUEGmesRjCg1WQrQyzvO04nJZy7LON3R4WRpAwR+kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773166269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v9hHeqA2u5BWUlSmPBE5SpMEA/34WNqwU2kr2lILm3c=; b=bdzO34vwqftkv4G0zhYNNNk4hQ6L72Iqfa28i15dj7WdrJN/Fvl4JWeVEHmGhgP0qUKpMm 9SG25hpytFqdPgOXc6+jxK9Qc+u1t9LPd7sevY9xwhbFMX/BwDT8CBOZA3kKVEZ7ZnwIQL NjfSDkMGsw03VQTaTxd56QTQP4LP0xRg81BnB2+K0UuVxX1lf2zr9+PgVJGfuue7Ez3ald I0HGWRJaao5O6HK2VpkdcZiG0woeCKugo2msCGUltoCgYSsqbrdnq6vmHtsIw2s7dA13b4 U+WYx9QzeFR+xCjuIJCvLo/quCbTTADl6XWlPePphsJedX3O3xnDY3klwUsTnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVhlJ66vzz7LK for ; Tue, 10 Mar 2026 18:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e444 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 18:11:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: 6409980cbba7..17ecafb37c65 - vendor/openssh - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openssh X-Git-Reftype: branch X-Git-Commit: 17ecafb37c65632e1e2f6afb7049332f544b75a0 X-Git-Oldrev: 6409980cbba7323bd1c86249ed16f8bea9fa5490 X-Git-Newrev: 17ecafb37c65632e1e2f6afb7049332f544b75a0 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 18:11:03 +0000 Message-Id: <69b05eb7.1e444.4750525c@gitrepo.freebsd.org> The branch vendor/openssh has been updated by emaste: URL: https://cgit.FreeBSD.org/src/log/?id=6409980cbba7..17ecafb37c65 17ecafb37c65 Vendor import of OpenSSH 10.2p1 From nobody Tue Mar 10 18:11:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVhlW35njz6Tp67 for ; Tue, 10 Mar 2026 18:11: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVhlW2ZRNz3wJc for ; Tue, 10 Mar 2026 18:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773166279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGswFUT01XydrI7M7SBmf27iYBh43t7KAQDVGAsrIXs=; b=rVmx0LWxiHpKao+5nFcWObeG5hQ35DQf9kqWbANLyP65xsBA1+c0zBsJ7wYaDzYzOzK9X8 NjyVyOzQpSrEeLbwL2kGqfsf5zOQZ8+SC2uVBSpRIZC55dsL7XduYMta1vySWWUv82uZXx KXXdWetGLTKAV0zoYjkQf9Q5XnwyfBXMxhjgXjIyNedngWQuPzNJGR4esjlZu9ToPCF9u8 e+wOvrC5WIvevGsMVZzLWVLVSblAS3/sSWHWiEcrkPmesLP7hkqArkFF4ARgr7TMVjH83/ w1cdJcfvCB3q+JC0h0L2656B0G5GZl3sYk0ZyT6fmIHRF432mEPU96OmGV2qZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773166279; a=rsa-sha256; cv=none; b=gBHyN8aVjlpdeuDEZIldE34Kw1njrZ1oNqAz0qxvSSCtzv/dh5emEy7UL5y5tokRllA7qc TIYehV4nu2oHbDOGAX/GPbTQb0jg47sMc/y4vlvvYX+mzATZm0qiP1wFwQv615OmwOq2Ds uoVz6kCDhrFK3l/+bjsk55pTZ2wGve7dOp+Xg44RESdm8mkeK+AeW/EGMrcbnuj2A/L1sy 4x+ecrZnUFUN2TbBhk2TUAYXn6bW83me2Qi+xwvMsZ5mkh5uZQ/c+dTlTOa2WJE3aHjH2L Zn5sYUGCgivF/Zaoa8BWB8V/Yf0fQ0qwTlxP60T0h8s6nVG4JPiac2WFNBfI7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773166279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGswFUT01XydrI7M7SBmf27iYBh43t7KAQDVGAsrIXs=; b=k6Pw/vaGtVWPb2kizuq2l6JCGXiODdp1KNyRukJLVTBh56fu1lFKKRAXTNMA9w6sovRNms iFscuKPcQ0Acl9Q4hSCL0z6bjxbOjOjb5AEhbeEe6uWWLjQB9xOZ+vqH37aeDIfMDxx7cC Onv/QXKJyFsktceeK+o/Rpphm8Cb9NQ3sdRUomCp1eqHUuwqysnzPb/7iuKCbAz/EY/YYr jElnWkHEIcFoD1K+SHodxARrD5YT1QHvLBHBCWnWv7xCo50isQdU7SYMsvPkDHglLXWIUP ibb4GatiHj9Gl/ECM5oYjWTkeAgckvdF0fKPKq/aOl1Hi3r+C3+msn0w/AuzzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVhlW1b7yz7b5 for ; Tue, 10 Mar 2026 18:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1edc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 18:11:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: 94d519106853 - Create tag vendor/openssh/10.2p1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/tags/vendor/openssh/10.2p1 X-Git-Reftype: annotated tag X-Git-Commit: 94d519106853d2121f047d059998317b7e7421f9 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 18:11:19 +0000 Message-Id: <69b05ec7.1edc8.6ddcbc9f@gitrepo.freebsd.org> The annotated tag vendor/openssh/10.2p1 has been created by emaste: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openssh/10.2p1 tag vendor/openssh/10.2p1 Tagger: Ed Maste TaggerDate: 2026-03-10 18:10:49 +0000 Tag OpenSSH 10.2p1 commit 17ecafb37c65632e1e2f6afb7049332f544b75a0 Author: Ed Maste AuthorDate: 2026-03-10 18:04:03 +0000 Commit: Ed Maste CommitDate: 2026-03-10 18:04:03 +0000 Vendor import of OpenSSH 10.2p1 Sponsored by: The FreeBSD Foundation From nobody Tue Mar 10 19:09:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVk2J6sF1z6Tt8n for ; Tue, 10 Mar 2026 19:09: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVk2J5bK4z44vL for ; Tue, 10 Mar 2026 19:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773169752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8N6GlJ17vxTuyVK/YhdycgfvqVBwNHdwlx+ozpUPkYY=; b=vtj4RS6h/OSI58vu4A828lIlqD7qYXVHtfB+garU7cwCBUx8sTLGTBKphSBu2kcYqP2jEI NXQg+IGLaXj8kWuun5ony4WcnakcN1w+wnrBAcHuFoPp99SbnW2HpGwZQoR2z60zQZXj/3 mynnxjYAwemnIuGAJ6N4BQNgfe/8fzKBxpuMuN6W+CsKQWXtCDqf6/++OXqeYLGtiiccBw zZzYdFNOeXG8jVL1iTHPc+GgNQpb81DvJaM4uCnWMvlN841wuie/FjZ8X/H7Z0AD1uXP/v GMqVcjtyX05cEsG40lphTxcp7wn2ciBqTNUc9+mcvgMeUC2+PlVdQ8VBP0CSPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773169752; a=rsa-sha256; cv=none; b=DPqW93fRTQCXFxRxbf0wp0a868kB0o+DFTPGoCNSGs7oxp0L83LEoKzFVWNMiWuURp2B5z J438ZZVdmpqs4Kuj93h0xHdL4r+iM3kdJ9gPvN1/MUvzKuBW07Qi+haUxoFx4vdVCjAaaF Yb5QPyRiv0n0oAEJDdfbsJSSKWv3B1hniSQ9HSRVCn9Dj3ZTwPAQEZZkcI2XqtTzOOwRpZ qomAJKAnHsXx9Q02PX5OkZCTLg1bo8r1xDb0mTan6C0TC/msnqapibU4Gg1dXTHpJ9h2FP zvH1phapdUX8IfcsCf4N9rVbjK31aYsieaWxh5sfCFweGVLD7SQGvhbbVxfE1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773169752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8N6GlJ17vxTuyVK/YhdycgfvqVBwNHdwlx+ozpUPkYY=; b=W6LCW+7KNQftWxsofVqB0yMonjxBuFgoya9GJdgKIyOUi0WMI69y2q5ZjYu1LWBBkMOmSA OCDV7lL3ENBzClTXKqZYLoeSyMJCIWC9m2P+ozbdRMD2EaohwdnIGyjMHPUYSGK6AQxy8M dQ0+vTQB/IVmr/4gw35gmmcbWZCmCcBxBv7At+V4Cje9U9/K3wobqSr2g0NyxI7fRTAsEv 7ePzUgQUOk1J3x9wUuXwGXyjUCKDtKkxSmePv8NR4eNOau6EN0w/MehnzaaeCwvTcZraXo /D9z6x+NNh+gtoiesOCwCF04yfqozBXLY4jUn/p7pRosAKaJoOzz9F9Agr0kuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVk2J5BQ2z937 for ; Tue, 10 Mar 2026 19:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 236b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 19:09:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d99e725c26a7 - main - virtio: Restore mb() calls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d99e725c26a7745aa349eab01ae56ca630b6d0f5 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 19:09:07 +0000 Message-Id: <69b06c53.236b3.73c1f491@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d99e725c26a7745aa349eab01ae56ca630b6d0f5 commit d99e725c26a7745aa349eab01ae56ca630b6d0f5 Author: Andrew Turner AuthorDate: 2026-03-10 19:08:38 +0000 Commit: Andrew Turner CommitDate: 2026-03-10 19:08:38 +0000 virtio: Restore mb() calls Until an issue seen on amd64 can be investigated restore two mb() calls to virtio. Reviewed by: andrew Fixes: c499ad6f997c ("virtio: Use bus_dma for ring and indirect buffer allocations") Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55766 --- sys/dev/virtio/virtqueue.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c index dbd55e02e091..b7fdb4703ccb 100644 --- a/sys/dev/virtio/virtqueue.c +++ b/sys/dev/virtio/virtqueue.c @@ -565,6 +565,9 @@ virtqueue_notify(struct virtqueue *vq) /* Ensure updated avail->idx is visible to host. */ bus_dmamap_sync(vq->vq_ring_dmat, vq->vq_ring_mapp, BUS_DMASYNC_PREWRITE); +#if defined(__i386__) || defined(__amd64__) + mb(); +#endif if (vq_ring_must_notify_host(vq)) vq_ring_notify_host(vq); @@ -960,6 +963,9 @@ vq_ring_enable_interrupt(struct virtqueue *vq, uint16_t ndesc) bus_dmamap_sync(vq->vq_ring_dmat, vq->vq_ring_mapp, BUS_DMASYNC_PREWRITE); +#if defined(__i386__) || defined(__amd64__) + mb(); +#endif /* * Enough items may have already been consumed to meet our threshold From nobody Tue Mar 10 19:10:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVk4D3PT4z6Tt9B for ; Tue, 10 Mar 2026 19:10: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVk4D1SJYz45P0 for ; Tue, 10 Mar 2026 19:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773169852; 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=DGvGj0PQsARdbj1G0pzaWP+hBafSY+MdwT3hGWgMXf4=; b=o4R7dTFvdg+QG+G26lin6lBds4BDQ2OzrmSufgVJYIb+GZ1+FTL69a7d92inOFZLd6bvzH 3IjmnDUjiuqO2NCBa0+yMmOKqHYbdK859szQHxLCtmfTS0z8JWBAfckiJJjtoKGb3yNA2U /ov3EBm2yYErL8SGEpXVCPJZF0uvClsDZ9gk6SaX1snI8/ffTUS+YjEmu+41wSZ7ujlt2o 7A72/YqhmDmxouc8sc1ll6FFKBDzT/ZFCUAc9f4PPTnqMtgtLGA1K1F2f/OxmX719O57zz ZpVTqHi4gBNhNRJmWXkv36ReVWdm4uJjiBTFUTe+MKCQMdGLMttQUv6iVOvgCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773169852; a=rsa-sha256; cv=none; b=UuNstdc7pADFPRcTlfQ3h7uww4xpWj+f/bTSZNYI1PpdqiyL0luEH4Alj4kY6JQbmgqQtQ l3TZVQz6TKxglZXkaJsvJHc/CCeLip1yUtnlNLYy0K4zEOEgo4Y+rdn0/ydA0RE5NoWSfs pq04A5JeIJR8iu0mD9norC6nb4VeRe2fiqS2bCmY3kqBe217MWoUo1rsc9tZ9GqsR2PrIQ f6UyHrncl6+uDIF6x6zPOBSnmqJ3yNZq1EyRI9lBVV0L526ZHRAHtd+fCb8MTUY6Lokpr1 ZMK93Qz+8rZ9fRFB8AjDuMLsWGOLWAchtQfyZ8cSlFgcXyDEIj5BLveNhAqNRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773169852; 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=DGvGj0PQsARdbj1G0pzaWP+hBafSY+MdwT3hGWgMXf4=; b=BhDAibPzSG5GHpopYGABXqYC15jbIrTlY4/TAp7n31NsGR5JjPbNPH5r9k/asOg10Ac1ny XgCZYuMunQw1pPMhr6oxdW+3ACxecm+H7Enm3JYwNJ6Csmkf69Sp0jZ4XujFDiyH1VJrL9 qzCxioi2f9sht5wRKZE4+Cv899Nw4RPDI4joYC72zkdSfb2lm/0sjNdmkPT2C8zlxSnYdl XFdXG3sjzJvLLlCgpbQC7tI2YA5voUlLSG5I9RiEWWWIPCmHVe8gF0q9dvkQGjicDsRBEi p3sSbT4UH+VqQGEcknEMRWTzIw/MPocJiqtwBwY/5pQGJPQ2OqMhQf1O73eJ9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVk4D0kywz9Hj for ; Tue, 10 Mar 2026 19:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 244f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 19:10:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 1a92fc9c1210 - main - virtio: Restore mb() calls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a92fc9c1210f9c99a19fda5a86682a78d39872f Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 19:10:52 +0000 Message-Id: <69b06cbc.244f4.657b42c@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1a92fc9c1210f9c99a19fda5a86682a78d39872f commit 1a92fc9c1210f9c99a19fda5a86682a78d39872f Author: Sarah Walker AuthorDate: 2026-03-10 19:08:38 +0000 Commit: Andrew Turner CommitDate: 2026-03-10 19:10:21 +0000 virtio: Restore mb() calls Until an issue seen on amd64 can be investigated restore two mb() calls to virtio. Reviewed by: andrew Fixes: c499ad6f997c ("virtio: Use bus_dma for ring and indirect buffer allocations") Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55766 --- sys/dev/virtio/virtqueue.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c index dbd55e02e091..b7fdb4703ccb 100644 --- a/sys/dev/virtio/virtqueue.c +++ b/sys/dev/virtio/virtqueue.c @@ -565,6 +565,9 @@ virtqueue_notify(struct virtqueue *vq) /* Ensure updated avail->idx is visible to host. */ bus_dmamap_sync(vq->vq_ring_dmat, vq->vq_ring_mapp, BUS_DMASYNC_PREWRITE); +#if defined(__i386__) || defined(__amd64__) + mb(); +#endif if (vq_ring_must_notify_host(vq)) vq_ring_notify_host(vq); @@ -960,6 +963,9 @@ vq_ring_enable_interrupt(struct virtqueue *vq, uint16_t ndesc) bus_dmamap_sync(vq->vq_ring_dmat, vq->vq_ring_mapp, BUS_DMASYNC_PREWRITE); +#if defined(__i386__) || defined(__amd64__) + mb(); +#endif /* * Enough items may have already been consumed to meet our threshold From nobody Tue Mar 10 19:10:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVk4J383Qz6Tsyg for ; Tue, 10 Mar 2026 19:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVk4J1Mfnz45SF for ; Tue, 10 Mar 2026 19:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773169856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9NhHnE1VZyhGAp/uXFwbkhPhMW2k0XhnGDlDjEJH/0=; b=JjU9yrp+nbUPTbyRya+Qe7wZcC0Hh5ZYtlQIcSbJwpJU/pZ8mdBQzY6NcvRPfZW7VNBa3J 24HJGeLLhe7N40E5AUiOokk/qAq7Ywf0l+XbN/yuNWEi6pNJ22z9tu7xV5R//vR0sQwxHX tkr/IsHubSTNelgrTyA8mN6pekVRuBiyTZm+FM2APdmhVJ9yF4tne5LRTwH49ED/f8dEpb 0AR4FbcURsGJMaofw0l1oCwzCJxMPx6M29jcCDkDSYL2DSyboO7n4UVAB/KnLisggekU4A DV01AJAnRUxF0uCo7nf/3hLS2z+HMY/WWCianiMV06VWtS4PJNTgL/PEG8Nn4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773169856; a=rsa-sha256; cv=none; b=c5kIH6Wd3yVtsRRSOVwR9PAF2eTCGLnwt4ISplEDxR7TcK8JkfAggnp9P/HJFs/sL6b9fS nY0Krb93yeN8T8P/UEvXzedcAxUfzCXdXQobGHiVv9QaLknv0EwjKFmcDfENL5GgLAMyK8 2bttkmymp3wZZ6+o5vhtWR147aQhk4PtH51I4jBt6mIAxO0pJqSYW7Lrg5xpqRlZH5snhb zAtHlxogulepCqMGSQzv2p/gaDsxmFryNx0JDwKFnGvy43+l0A21xbUmDJBUzBDwOFGUSi XEjoNHZF0HJf+oQiWaOUn5dqMhdek/2oyyTILNBycOQ0Fh06adLkhLH5sSe48Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773169856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9NhHnE1VZyhGAp/uXFwbkhPhMW2k0XhnGDlDjEJH/0=; b=XuhgySveqiHZhB33KJD/o0V/j+hRbsnKm6wpqClQzDfJW63lohuZRZHvSyLDJieSUxlrKk tvj3IxQplIBBgUYDKlObRYwFF48B2d5M+VoqaeVGTeS+SN5Ziq09KLW7OPRyFNwi23hYzw 9XhZx/YhWtGhrg7Si/6WcZo4PDWWQhFf9BW9oJ4t5n+xjGYMhxI6rNBJS6VsA6PHDjte90 bHKTiHcCQep7XnxKmzGgfe1l+zi5YXk6o/JyQ7Fl/j9ihsSaltDpoPeObLuKbXAjGjxqLn Bql74kgDVyMm693qEsQY0aO28qjoXlDm8x+D9QupUzBFjyf7N8WP1msR5sTLmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVk4J0sr7z8y4 for ; Tue, 10 Mar 2026 19:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24fe2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 19:10:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 522012c8bd07 - main - Revert "virtio: Restore mb() calls" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 522012c8bd079879b82aaa403e4da3c1ab9fc8a9 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 19:10:51 +0000 Message-Id: <69b06cbb.24fe2.5c550203@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=522012c8bd079879b82aaa403e4da3c1ab9fc8a9 commit 522012c8bd079879b82aaa403e4da3c1ab9fc8a9 Author: Andrew Turner AuthorDate: 2026-03-10 19:09:41 +0000 Commit: Andrew Turner CommitDate: 2026-03-10 19:09:41 +0000 Revert "virtio: Restore mb() calls" This reverts commit d99e725c26a7745aa349eab01ae56ca630b6d0f5. --- sys/dev/virtio/virtqueue.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c index b7fdb4703ccb..dbd55e02e091 100644 --- a/sys/dev/virtio/virtqueue.c +++ b/sys/dev/virtio/virtqueue.c @@ -565,9 +565,6 @@ virtqueue_notify(struct virtqueue *vq) /* Ensure updated avail->idx is visible to host. */ bus_dmamap_sync(vq->vq_ring_dmat, vq->vq_ring_mapp, BUS_DMASYNC_PREWRITE); -#if defined(__i386__) || defined(__amd64__) - mb(); -#endif if (vq_ring_must_notify_host(vq)) vq_ring_notify_host(vq); @@ -963,9 +960,6 @@ vq_ring_enable_interrupt(struct virtqueue *vq, uint16_t ndesc) bus_dmamap_sync(vq->vq_ring_dmat, vq->vq_ring_mapp, BUS_DMASYNC_PREWRITE); -#if defined(__i386__) || defined(__amd64__) - mb(); -#endif /* * Enough items may have already been consumed to meet our threshold From nobody Tue Mar 10 19:50:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVkyL0ngcz6TxKC for ; Tue, 10 Mar 2026 19:50: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVkyL05jgz3Cdr for ; Tue, 10 Mar 2026 19:50:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773172250; 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=x8e2oe+gQQKwACs15tZtidE7itqmarUGL+cKoZVjc1M=; b=ChrFFDRZj1EsExzERWTblWIU0sU7zCfHciWbKvwpZvbA4euPaIoZFa+uK9S4xGCGoOWnne pckJ4ysClwPIOzgQE1v050p4vKzExTNHLhQSIFj9BrC137uW824eCmEWYQ/4lKAjX3fKTi LiS2VTN3YbnOWVxoValoQQIHyCIpy00s5vToQ2k9dPIBswZOvYnBIcYHfogTjCaR0qQe2d 5lfCedUtO5AURx4WXclI1DGJEFgLFoJPCW0pJuhtpd0sjlN9u+oqb0eXXljWG4ElS0w3Xv hkUS/ZMTYmbF3Jo4qI+fpenQ1wGpZdRfEtNxIeMTj6D6wsrS+2X/2GUn1sUP4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773172250; a=rsa-sha256; cv=none; b=hCkt2KKAk08oX+T4Uuvk5K5DhyeBvfzQiOf8zbvWI5qqha+f+Uuz+f14JM98zVprk9pAy+ ex687q0Zdb5nUmOzswVRInDfeyhSaSYcnFhcTcD5H6DWGGoixQNosUfHnOZueMh4KnSFJv oIyNjJUWUmXvKbPRFcxxsX5hJXuwgdiq/qYs8k18+6s4+/doLRvje12QiDSxuKyFIy7UEN ZNSbpNgp+kWyPb8T9VJ0sEDhkO2TF+/AJYGgrsf+qtqPjbUtd/vQGcw30Iv90RIYcJ8u59 mlO4iQpQ7x+FDhnbC9IlNZcNZEWsnAXZgbZHV1Cn5NvY9FQiuyBci1qzY5mA2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773172250; 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=x8e2oe+gQQKwACs15tZtidE7itqmarUGL+cKoZVjc1M=; b=JKdstGAk08gMJ7PpAHxxyLkDGWLAjIXFyyZxQAW8qomAkCEFsUpnzBXfyVoK3Yn+PVzAJO 8HoLHWezw1MKPX2XQOnOIoxQnslk7ta5w7F9eeO62VyuhGzdNjG6Fjcd24I/FACo2nghDT zosbNAydUdyLwXTbGClpnSkkDN5lJzDbnPsW3Q+Hlj2E7RXF+H+vBLJo5KyWzU1ftIqsTS NedadW4/w0Ylf6GqP40cdkY9LeQNcp6EWsQFoSWann9ch9YDbEx6vlREHIBvfff29y5RTg SR5aLuKLWThlTQ2LPw8/JGbEvdpW+/zLcElnPEs/pWHRK+XiPA00It2QPQP5Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVkyK6hK9zBDN for ; Tue, 10 Mar 2026 19:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27d73 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 19:50:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: David Arinzon From: Arthur Kiyanovski Subject: git: 97e84c587d6f - main - ena: Verify that an ENA ring is in netmap only in native mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97e84c587d6f86aa883720296449b380adcf6915 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 19:50:49 +0000 Message-Id: <69b07619.27d73.841b5b5@gitrepo.freebsd.org> The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=97e84c587d6f86aa883720296449b380adcf6915 commit 97e84c587d6f86aa883720296449b380adcf6915 Author: David Arinzon AuthorDate: 2026-02-05 14:21:13 +0000 Commit: Arthur Kiyanovski CommitDate: 2026-03-10 19:48:39 +0000 ena: Verify that an ENA ring is in netmap only in native mode netmap operates in two modes: 1) Emulated - netmap handling is done by the network stack, the NIC driver operates transparently to netmap. 2) Native - netmap management is done by the NIC driver. When checking whether a specific ENA ring is running in netmap mode, only the following checks were done: 1. IFCAP_NETMAP - Check whether netmap capability is enabled on the device. 2. NKR_NETMAP_ON - Check whether netmap is actively using this ring. The above checks implied that the netmap mode is native and the ENA driver needs to handle the netmap logic. The code was missing an explicit check on whether native mode is actually on (NAF_NATIVE). This led to a case where though emulated mode was used and a netmap application was turned on, the ENA driver still managed netmap logic partially and caused missing buffers and lack of refill as part of the datapath. Note: Enabling netmap emulated mode is insufficient and there's a need to load a netmap program in order to trigger this use-case. Add an explicit check of whether NAF_NATIVE mode is set. The issue was reported in [1]. [1]: https://github.com/amzn/amzn-drivers/issues/361 Fixes: 358bcc4c6cde ("Add support for ENA NETMAP partial initialization") MFC after: 2 weeks Sponsored by: Amazon, Inc. Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D55697 --- sys/dev/ena/ena_netmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/ena/ena_netmap.c b/sys/dev/ena/ena_netmap.c index 8a220373ec3f..0e8c95fb289a 100644 --- a/sys/dev/ena/ena_netmap.c +++ b/sys/dev/ena/ena_netmap.c @@ -223,9 +223,11 @@ ena_ring_in_netmap(struct ena_adapter *adapter, int qid, enum txrx x) if (if_getcapenable(adapter->ifp) & IFCAP_NETMAP) { na = NA(adapter->ifp); - kring = (x == NR_RX) ? na->rx_rings[qid] : na->tx_rings[qid]; - if (kring->nr_mode == NKR_NETMAP_ON) - return true; + if (na->na_flags & NAF_NATIVE) { + kring = (x == NR_RX) ? na->rx_rings[qid] : na->tx_rings[qid]; + if (kring->nr_mode == NKR_NETMAP_ON) + return true; + } } return false; } From nobody Tue Mar 10 19:50:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVkyM2GPzz6TxKW for ; Tue, 10 Mar 2026 19:50: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVkyM0tpRz3CS0 for ; Tue, 10 Mar 2026 19:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773172251; 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=ny9g5U7WyRUGOpMLgxo3c4NuvCWKcqOI562ZGtISHSE=; b=JzxYUzHZMwrapHKGXTfsOrYNZhfz4Qs0j+BVrW4oCrMlbwz8kmPzYpMXcTXvQV862Xfq+2 QcPwGvqSbygEJkhikpnP+9jPx11TAymHuMBXlOusz0SL3azPFuFnjZ2ajIabcr32aEi19o 7CNK+icaQHUhVrOMCkGNSyrP7C6oQ1hTxya1porJsS6lAhmiyOxn8wr6TTDgeHm7jmXtTy mwZyOcZlNvWKyxcooiTEnlfGfrCYEtnw/I/MG94lt7uXkzxW6xfwGM3FcQpas4ROhbA2VH Ac4cDp8BJn9bj/CvQH3IOWdN0uIE9xJCmexGsyOjj/plXbrxg0Q/0UsnylgJrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773172251; a=rsa-sha256; cv=none; b=i+NKpWyEcAD4UlBJ1nO5CJR5RbFf/a0sOgCsStV+5EHvZwXyjOQwmqhZ08BkOIZwtNOH7n 7w5U4tF/ZwgkDIhpqQaFwKzWKxbruK9A+VKHBV7bfBoxeV5U807AAwIcRR3V+bDEyPW8we asdMKC1yUZ/OXqfXCDQOI3iupbup04myOk6TDlfSeCoqaE4Krj7PXYYUAm46iO2GuRr6TJ 7FuU9/Dr61d3+VPu8y4gyRSuRHQCFAdbYLy9oZbEPkK2Z/+a6M/QjbK+uWkx2w0ytJZETl KF1fKOZq70um4lEENKWZBtyS0ac9ViyHvcGQu8gd+/oD9r8vF9kDL2PH/DN0jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773172251; 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=ny9g5U7WyRUGOpMLgxo3c4NuvCWKcqOI562ZGtISHSE=; b=uG2iBaJS5evdrtFC4p44n/0bSBVhn8tktcEBfnjYLjhte2hdhQEiglG9s/o62UMMR1Pna7 7hroICgxII2z53h3vePL7RTbCXCwq9C/Wa6bBMPwDf8lQEfFwAWSTTzFR00MGXcgNSKqER fPRET6PAEhcFCHIvMy87Oy8zqBGUCYTapXr5EUC0DtQCtA8hVwDLzQ+roHAufaM5L7RulL FuqdN/e+33N0JupifmXl96a+O8nAnySMoWznRFZyg1VbcA/mf9tYuEetNBZp1u8bDikVr/ q/WAMqmbENPvnYzP2N6loqV52182ywone+UeABBobl0MAJR3oSaQkpfr8UbBqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVkyM0MzczBDP for ; Tue, 10 Mar 2026 19:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30ecc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 19:50:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Arthur Kiyanovski From: Arthur Kiyanovski Subject: git: 96c5eaf0ac6b - main - ena: Update driver version to v2.8.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96c5eaf0ac6b98d0832e1037d672064de43a7e00 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 19:50:51 +0000 Message-Id: <69b0761b.30ecc.1ec86c3f@gitrepo.freebsd.org> The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=96c5eaf0ac6b98d0832e1037d672064de43a7e00 commit 96c5eaf0ac6b98d0832e1037d672064de43a7e00 Author: Arthur Kiyanovski AuthorDate: 2026-02-13 05:32:22 +0000 Commit: Arthur Kiyanovski CommitDate: 2026-03-10 19:48:56 +0000 ena: Update driver version to v2.8.2 Bug Fixes: * Verify that an ENA ring is in netmap only in native mode Minor Changes: * Move parenthesis to correct place in switch * Add comment * Reorder define MFC after: 2 weeks Sponsored by: Amazon, Inc. Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D55698 --- sys/dev/ena/ena.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 3b01605b4ba7..f67c7002327d 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -39,7 +39,7 @@ #define ENA_DRV_MODULE_VER_MAJOR 2 #define ENA_DRV_MODULE_VER_MINOR 8 -#define ENA_DRV_MODULE_VER_SUBMINOR 1 +#define ENA_DRV_MODULE_VER_SUBMINOR 2 #define ENA_DRV_MODULE_NAME "ena" From nobody Tue Mar 10 19:50:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVkyQ0lmgz6TxZV for ; Tue, 10 Mar 2026 19:50: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVkyP6fRJz3CWL for ; Tue, 10 Mar 2026 19:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773172253; 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=no63a0U9KDsSdXQ8ehEBTFx12+NpXpzC/1jmDqWp6bs=; b=mBTTbpy08CRxTN8t4+W25++61LtjrrF63aFNkUtf4dE2c7jw8dlei2VftT5PWp+luwOMGm Bfef6rF9TJvxqPeolpIaliXCY9RpmPgn0owKuYa6JN6txAJruc5y07CkYihoFeH1+rKkmb Gh3T3SVlm75Yza5utCt8o9zCuSmrAsh+n/zgdqfNm2CidnzmskeX+inQ9AMP0jUdKWBl4U UyQ2h/rLiWxD60MfLFIiU1WF/0WGr34J0a22kpXsedKLFP2aQmIgsWux2Gc9+EhMxIUdJ1 yZFdOuzkvLUm7XJAhMcUHaTzQBGCP8TgHljVSBZK8MqTGJ1v0xvRYzywKSNi5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773172253; a=rsa-sha256; cv=none; b=fsYSPJeWalRVNA5kSnP37NChi+oLj+5aMMtaAxAr+jIGqX/qX1akD+C9ysyXYH6KJeOmHz MR9jxaWE+wbKsriJq2EIh9lDClZDwWhUbOCnQekCKuEEy7ayr1MMQhr1kUfb7DTd6M85KK hd9FhXvc/HtG4ZV0OsLZqcQ0JvO9RlNieLLs0O71apx73eK5FwGABfuIbFkz+dqqpyi+Wv zmdgKNfkNNGDmBNEZrBMqJPf3wvsyrZvTgTzOg/wKk0PnNGcPF7dpuE6AnmLjV3MEIg7+X clEwxOcBKCqKjdjOaXrmMgXDItyp8bUE3dJBIdlngWTLC5jRTd/NzlZ88wdjgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773172253; 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=no63a0U9KDsSdXQ8ehEBTFx12+NpXpzC/1jmDqWp6bs=; b=S7+7AVhLODm/HXW+NdjYq7DgaoDERl2ckkSai14CpxN7g/iHaKbAzQWr/erZ1ftOCiI6Wy zham2fW9cGY0LItlhl2uLNdqvXAmJgKQY2wKVZOWFjTmQwXi8K97fK9AM0+6NldX9PHEdc K13TRFjkIveqU9oRln+lr02wLdXbUqoHGpcT8tt5x+fNIuDPJXysYX9QsBouriDDE725Os aXdE7sDvS0EUNsz29QVjg5+ukTjzIHONG5V7Qu8KVKB8ec0Y4YdpQ1UW6ZqIfb1Wn0/oOH ebnlN1Io7oRjZrXQuAfUD7+5SOeiZMteZUvPX79VvzLgCgPkleDFE7RBJqv/Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVkyP688Pz9vR for ; Tue, 10 Mar 2026 19:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27dc1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 19:50:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Arthur Kiyanovski From: Arthur Kiyanovski Subject: git: 2667a8454cff - main - ena: Minor changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: akiyano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2667a8454cff5896c7b467c78cd4ace5ad40f5eb Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 19:50:48 +0000 Message-Id: <69b07618.27dc1.15f185b9@gitrepo.freebsd.org> The branch main has been updated by akiyano: URL: https://cgit.FreeBSD.org/src/commit/?id=2667a8454cff5896c7b467c78cd4ace5ad40f5eb commit 2667a8454cff5896c7b467c78cd4ace5ad40f5eb Author: Arthur Kiyanovski AuthorDate: 2026-02-13 22:27:59 +0000 Commit: Arthur Kiyanovski CommitDate: 2026-03-10 19:48:19 +0000 ena: Minor changes 1. Move parenthesis to correct place in switch and fix include order 2. Add comment at the end of an ifdef for clarity 3. Change include order. MFC after: 2 weeks Sponsored by: Amazon, Inc. Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D55696 --- sys/dev/ena/ena.c | 5 ++--- sys/dev/ena/ena_rss.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index af158b5aea1d..eddb7dbd42e8 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -1861,7 +1861,7 @@ ena_setup_io_intr(struct ena_adapter *adapter) adapter->que[i].domain = idx; #else adapter->que[i].domain = -1; -#endif +#endif /* RSS */ } return (0); @@ -2766,8 +2766,7 @@ ena_set_llq_configurations(struct ena_llq_configurations *llq_config, llq_config->llq_num_decs_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_2; - switch (ena_force_large_llq_header) - { + switch (ena_force_large_llq_header) { case ENA_LLQ_HEADER_SIZE_POLICY_REGULAR: use_large_llq = false; break; diff --git a/sys/dev/ena/ena_rss.h b/sys/dev/ena/ena_rss.h index b7c5181397af..d1236ef26c33 100644 --- a/sys/dev/ena/ena_rss.h +++ b/sys/dev/ena/ena_rss.h @@ -35,11 +35,10 @@ #include "opt_rss.h" #include +#include "ena.h" #include -#include "ena.h" - #define ENA_RX_RSS_MSG_RECORD_SZ 8 struct ena_indir { From nobody Tue Mar 10 20:46:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVmBk3t1Bz6V2d6; Tue, 10 Mar 2026 20:46:38 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from mail.protected-networks.net (mail.protected-networks.net [IPv6:2001:470:8d59:1::8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.protected-networks.net", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVmBj3DjPz3Jwg; Tue, 10 Mar 2026 20:46:37 +0000 (UTC) (envelope-from imb@protected-networks.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=protected-networks.net header.s=201508 header.b=TWwSFCmE; dmarc=pass (policy=reject) header.from=protected-networks.net; spf=pass (mx1.freebsd.org: domain of imb@protected-networks.net designates 2001:470:8d59:1::8 as permitted sender) smtp.mailfrom=imb@protected-networks.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= protected-networks.net; h=content-transfer-encoding:content-type :content-type:in-reply-to:from:from:content-language:references :subject:subject:user-agent:mime-version:date:date:message-id; s=201508; t=1773175590; bh=+My2ry4SPkF5DNA+07hu5MVwo3QIx29WD2JZ 6bQ/iLA=; b=TWwSFCmE+KQM/RtsD241Fc+Z04z7S5ktSHMOf2PoWGNWqBG93Emq DtLOXNUsRehjOKcfxl9HNEkkSNDHZWrq0zU9MWokiyvC2oN2atcSP+/c6h0C1XmT z+NYovrnlJ/oH91Nic+GlCJQVleVsElZERWwY4oqkzkj2PEA8VUqRHo= Received: from [192.168.1.9] (d5540.auburn.protected-networks.net [192.168.1.9]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: imb@mail.protected-networks.net) by mail.protected-networks.net (Postfix) with ESMTPSA id 4DE8B6AF65; Tue, 10 Mar 2026 16:46:30 -0400 (EDT) Message-ID: <2d25962d-d2fd-41e5-8aec-2ffad3622024@protected-networks.net> Date: Tue, 10 Mar 2026 16:46:30 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c499ad6f997c - main - virtio: Use bus_dma for ring and indirect buffer allocations [Really: kernel: vtnet0: watchdog timeout on queue xx] To: Mark Millard , "Herbert J. Skuhra" , Andrew Turner Cc: dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, freebsd-current , Philip Paeps References: <69a71c75.40215.43f39fc6@gitrepo.freebsd.org> <87ecludxuh.wl-herbert@gojira.at> <15dd35da-4c7c-482b-a212-8eaf761b23ca@yahoo.com> Content-Language: en-NZ From: Michael Butler In-Reply-To: <15dd35da-4c7c-482b-a212-8eaf761b23ca@yahoo.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; DMARC_POLICY_ALLOW(-0.50)[protected-networks.net,reject]; R_DKIM_ALLOW(-0.20)[protected-networks.net:s=201508]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_SEVEN(0.00)[7]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_TO(0.00)[yahoo.com,gojira.at,FreeBSD.org]; RCVD_TLS_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org,freebsd-current@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[protected-networks.net:+] X-Rspamd-Queue-Id: 4fVmBj3DjPz3Jwg X-Spamd-Bar: --- Commit 1a92fc9 appears to work around the issue on amd64. Thanks! On 3/8/26 22:40, Mark Millard wrote: > On 3/8/26 10:39, Herbert J. Skuhra wrote: >> On Tue, 03 Mar 2026 18:37:57 +0100, Andrew Turner wrote: >>> >>> The branch main has been updated by andrew: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=c499ad6f997c8c5f61c88925e6d1e826d0c0f6c4 >>> >>> commit c499ad6f997c8c5f61c88925e6d1e826d0c0f6c4 >>> Author: Sarah Walker >>> AuthorDate: 2026-03-03 16:08:11 +0000 >>> Commit: Andrew Turner >>> CommitDate: 2026-03-03 16:29:15 +0000 >>> >>> virtio: Use bus_dma for ring and indirect buffer allocations >>> >>> While the majority of virtio platforms will be fully coherent, some may >>> require cache maintenance or other specific device memory handling (eg for >>> secure partitioning). Using bus_dma allows for these usecases. >>> >>> The virtio buffers are marked as coherent; this should ensure that sync >>> calls are no-ops in the common cases. >>> >>> Reviewed by: andrew >>> Sponsored by: Arm Ltd >>> Differential Revision: https://reviews.freebsd.org/D54959 >>> --- >>> sys/dev/virtio/virtio_ring.h | 27 ++++-- >>> sys/dev/virtio/virtqueue.c | 216 +++++++++++++++++++++++++++++++++++++------ >>> 2 files changed, 209 insertions(+), 34 deletions(-) >> >> After this change I see a lot of "kernel: vtnet0: watchdog timeout on >> queue xx" errors on amd64 (arm64 seems to be OK). > > See below about other reports of the messages. > >> >> Reverting this commit resolves the issue. >> >> > > freebsd-current has the following notes, implicitly referencing official > builders doing official builds: > > QUOTE > On 3/8/26 17:10, Philip Paeps wrote: >> On 2026-03-08 07:10:01 (+0800), Michael Butler wrote: >>> Is anyone else seeing timeouts on virtual interfaces? e.g. >>> >>> Mar 7 15:00:27 george kernel: vtnet0: watchdog timeout on queue 0 >>> Mar 7 15:00:45 george kernel: vtnet0: watchdog timeout on queue 0 >> >> I started seeing these on today's build too. >> >> It seems to happen more or less randomly. I can't point at anything >> specific that might be triggering it. >> >> Philip >> >> > END QUOTE > From nobody Tue Mar 10 21:03:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVmZk1k4zz6V3Wj for ; Tue, 10 Mar 2026 21:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVmZk0mlTz3NTh for ; Tue, 10 Mar 2026 21:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773176638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJK1drnuOGvdPQz/GfQS6HD71P0KYgfiulwG5CVE/5Q=; b=JRN9qxCN8vdEDvGShhQGBn8HVjJFXAurEA31FxhbwyYKfpBpQq0QeTUCgfQf6SP6GVhVkv Jr54o2bimWM7bc0UNfTEHDBNwVxpipkJFz3mP114X+26yRBcdc7v8eIzh36AVWLA/8D94U VGdJXZascVfDwROG9eC2W++YSWJTexi9pAUN5R1uOeNDTrp8geFMhv1cuKJ8RNRydut8nD MDA3nE7cEu3CmNAy70uIRUMMP7sQbLb6nhJbxFxNPt4fJpyMWvfutLlSI9UKYXMUGiwjmO wpcqYesY3xMmnts+ClVn6gnCVb/ZoT9NKA+lUjoxcMWDpClZkDTxy+l08NB7wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773176638; a=rsa-sha256; cv=none; b=mUCiUT+7zmPTyNu8eFWGAWdsVVtRdiWcYWiRxjwVaEXyvQekb9myhWA5nwtIGOaRpkKNL/ eToC9nHYCgiE7JRUh5uFBojxxhPdy6I39bvNItqte6nYn9CNoeyYEFScTZfpH15nniYBVS hgJlvYY9gKOBO6hbcudWmfeZsfoBD86rJ+vETljOSu3YWuanMkhM1IOmf8CE/0byy/c21k xvl6yzdKUgi2+4u7PosRp1r0BwyHmmegQnFlGgnEnLp8ZeRl8q+nDPjCRU9zRYX0kZiQxo 6qsFMM/jHWyY3/R6/B9uB2oeReIAfYA2UJDEFNAMGKGzmXHsBSN0lacQI+mzIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773176638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJK1drnuOGvdPQz/GfQS6HD71P0KYgfiulwG5CVE/5Q=; b=mR7u8yh5OsMUZzoVOEAKoOq8gwYRMt84YYyUofk9/xwAMabEd4qxYca9amDNEJFoWPo+px nbGN0ZdnrqFZrmYIpmOKfIYCQ3kFqJsv9WnI4DCk81y9Eg0iGiIPRyX+MkdxRPhngvdlJx 2tTLWj1qZPrLT9fSThheL1s6h/jwiNuwYyF8DiBG+PhR+fpzZXb5FzgVk42FoyX2GPZ83e HJMMGVjaSwu+O+3n5md05SScW8zsL8qcD7HEPvyPbeWAk/nVIDU95X4DjrBFFjLiD72jPw veBIR5BgmP5R/hRlEmFdr7d3ZNnfveGtptp2mkSVb4YoZe2W3jHYlNoeIbSf4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVmZj73zxzCLP for ; Tue, 10 Mar 2026 21:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38322 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 21:03:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 35b976c6ce61 - main - tests/kern/ssl_sendfile: reduce copy & paste List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35b976c6ce6145678ab378b21fdeab687a0a76d5 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 21:03:57 +0000 Message-Id: <69b0873d.38322.74eb5f2d@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=35b976c6ce6145678ab378b21fdeab687a0a76d5 commit 35b976c6ce6145678ab378b21fdeab687a0a76d5 Author: Gleb Smirnoff AuthorDate: 2026-03-10 17:36:21 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-10 21:02:40 +0000 tests/kern/ssl_sendfile: reduce copy & paste Provide sendme_locked_wait() for a common pattern. Not functional change. --- tests/sys/kern/ssl_sendfile.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/sys/kern/ssl_sendfile.c b/tests/sys/kern/ssl_sendfile.c index 884079e80be5..066674f5fb03 100644 --- a/tests/sys/kern/ssl_sendfile.c +++ b/tests/sys/kern/ssl_sendfile.c @@ -252,6 +252,14 @@ sendme_locked(struct ctx *c, off_t offset, size_t size, bool nb) ATF_REQUIRE(pthread_cond_signal(&c->cv) == 0); } +static void +sendme_locked_wait(struct ctx *c, off_t offset, size_t size, bool nb) +{ + sendme_locked(c, offset, size, nb); + while (c->state != READY) + ATF_REQUIRE(pthread_cond_wait(&c->cv, &c->mtx) == 0); +} + static void sendme(struct ctx *c, off_t offset, size_t size, bool nb) { @@ -454,9 +462,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) * socket. Internall sendfile(2) returns -1 and errno == EAGAIN. */ ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); - sendme_locked(&c, 0, FSIZE, true); - while (c.state != READY) - ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + sendme_locked_wait(&c, 0, FSIZE, true); ATF_REQUIRE(c.sbytes > 0); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == 0); #if 0 /* see https://github.com/openssl/openssl/issues/29742 */ @@ -466,9 +472,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) /* * Exercise second attempt on already full buffer. */ - sendme_locked(&c, 0, FSIZE, true); - while (c.state != READY) - ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + sendme_locked_wait(&c, 0, FSIZE, true); ATF_REQUIRE(c.sbytes == -1); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == SSL_ERROR_WANT_WRITE); ATF_REQUIRE(BIO_should_retry(SSL_get_wbio(c.srv))); @@ -489,9 +493,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) * legitimate one. This test just documents the existing behavior * rather than asserts that this is a correct behavior. */ - sendme_locked(&c, FSIZE, 0, true); - while (c.state != READY) - ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + sendme_locked_wait(&c, FSIZE, 0, true); ATF_REQUIRE(c.sbytes == 0); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == SSL_ERROR_SYSCALL); #if 0 /* see https://github.com/openssl/openssl/issues/29742 */ @@ -501,9 +503,7 @@ ATF_TC_BODY(eagain_vs_eof, tc) /* * Exercise short write due to end of file. */ - sendme_locked(&c, FSIZE - 100, 0, true); - while (c.state != READY) - ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + sendme_locked_wait(&c, FSIZE - 100, 0, true); ATF_REQUIRE(c.sbytes == 100); ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == 0); #if 0 /* see https://github.com/openssl/openssl/issues/29742 */ From nobody Tue Mar 10 21:03:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVmZl4JdLz6V3mM for ; Tue, 10 Mar 2026 21:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVmZl1Kdkz3NHN for ; Tue, 10 Mar 2026 21:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773176639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8vK88qi4PllhlKW0xhQgN9rmZVCyEG5ey6paVkdr1Dk=; b=KUm1kRnUuNANAS3RdpGjPOQjJ80nlFQ4YrCj9HbUH9NG4aAijFrRKo5mNeFJVfoAIyWcqs n+nVickf4sJIJyJFNfRg40A7NP7gxarr0dME3vaBJw2Gaq2VgfQA9KgyDE4SOSWmCboIsS 06YZAPuRpglL3H4oT4U9Jh9dCDCa0KS4NXMWA4ayekoGW4jOz2BUrpOMqTNOLy7oibZpx7 kLWAnKHRa7KZZ540fQeFnY2SAAhVRnrQSgE1HCh3dukIAJ/08yh4eRQYD9YsCOXl/yEiri lor9GQoUUhQsolX7eLF6rIBfWE1xrdkvQv5dxTjfVxZeu2HATpBSdKkBY3MjVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773176639; a=rsa-sha256; cv=none; b=TXYlDwrXUs1fy727nw3k3bzeHYq9ev0OOvRisZ6Aa9+AwJNdxb88pxro06j8ARz9/POxGh z/fVCcINqslc0UOd2GxatPuuvTWlokOi4fy2b1TEd+L/YJu1fDkXnLVXbmEUrFxTZh3Gc9 2FmmlIuG9vLuNb2v4pWUBjFJpxEaefDqXIdtIkJYtS7IxeKK6gcq2R+H1xy5NORxym0oGO juNGNET2XAJRp6JQ/HN/5ih6SSUSOf2UAGdwN0f5E22hIxDxFE+4s6pbL9fDdnIylMO+Nh mhDmHtAW/87MvH7vvH+lSr9q3DGaUTEdVvlh3UllGPvm0RAwkZaNDoARuEdkKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773176639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8vK88qi4PllhlKW0xhQgN9rmZVCyEG5ey6paVkdr1Dk=; b=aqakLYqLmuiCn49Gxi10b/zyTwJkAIDGpMOrRJiAFRhhoeRAWnvPkD5m7cdEuZh6rn148+ g4e+JdcbLDZ7E8PGEjaROLzaYF3FqaFW1rhy3X2W1bprO7ufxyrpfqpWm3xnglMl+d3WaE hyI1MRNwe20v4xxd8yfIPbjV/FKM3apPnPdSCrFEiKJZuoylI+fbnWG4J4YihUvcLbZvGy lDrZpZGSv7iksNfkTt24um1cdFB39EqRhz91HR+MyXl+f+wQZvZSCy61fuBJQtQ6tEPL5l ZVOtE2VEhHis1m33MgYOQi6xsd1f4BsZTHzlzP9bC+M5DZYWt2SywO/gLYGDpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVmZl0lcjzD7C for ; Tue, 10 Mar 2026 21:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38c1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 21:03:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ded881f9056d - main - tests/kern/ssl_sendfile: fix 'random' and 'basic' flakyness List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ded881f9056d2ecb224490e56e95877af54164c4 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 21:03:59 +0000 Message-Id: <69b0873f.38c1e.49ef7c6e@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ded881f9056d2ecb224490e56e95877af54164c4 commit ded881f9056d2ecb224490e56e95877af54164c4 Author: Gleb Smirnoff AuthorDate: 2026-03-10 21:02:02 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-10 21:03:25 +0000 tests/kern/ssl_sendfile: fix 'random' and 'basic' flakyness The read of c.sbytes needs to be synchronized with mutex. The problem was fixed for 'truncate' and 'grow' with 8a9508563542, but these two suffer from the same problem. Provide require_sbytes(), a locked wrapper around ATF_REQUIRE() to reduce copy and paste. Submitted by: olivier Differential Revision: https://reviews.freebsd.org/D55781 --- tests/sys/kern/ssl_sendfile.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/sys/kern/ssl_sendfile.c b/tests/sys/kern/ssl_sendfile.c index 066674f5fb03..c16640572bb1 100644 --- a/tests/sys/kern/ssl_sendfile.c +++ b/tests/sys/kern/ssl_sendfile.c @@ -285,6 +285,14 @@ SSL_read_b(SSL *ssl, void *buf, int size) return (rv); } +static void +require_sbytes(struct ctx *c, ssize_t expect) +{ + ATF_REQUIRE(pthread_mutex_lock(&c->mtx) == 0); + ATF_REQUIRE(c->sbytes == expect); + ATF_REQUIRE(pthread_mutex_unlock(&c->mtx) == 0); +} + ATF_TC_WITHOUT_HEAD(basic); ATF_TC_BODY(basic, tc) { @@ -302,7 +310,7 @@ ATF_TC_BODY(basic, tc) nread += n; } ATF_REQUIRE(nread == FSIZE); - ATF_REQUIRE(c.sbytes == FSIZE); + require_sbytes(&c, FSIZE); common_cleanup(&c); } @@ -332,7 +340,7 @@ ATF_TC_BODY(random, tc) nread += n; } ATF_REQUIRE(nread == expect); - ATF_REQUIRE(c.sbytes == (ssize_t)expect); + require_sbytes(&c, (ssize_t)expect); } common_cleanup(&c); @@ -367,9 +375,7 @@ ATF_TC_BODY(truncate, tc) nread += n; } ATF_REQUIRE(nread == TRUNC); - ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); - ATF_REQUIRE(c.sbytes == TRUNC); - ATF_REQUIRE(pthread_mutex_unlock(&c.mtx) == 0); + require_sbytes(&c, TRUNC); common_cleanup(&c); } @@ -418,9 +424,7 @@ ATF_TC_BODY(grow, tc) nread += n; } ATF_REQUIRE(nread == GROW); - ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); - ATF_REQUIRE(c.sbytes == FSIZE + GROW); - ATF_REQUIRE(pthread_mutex_unlock(&c.mtx) == 0); + require_sbytes(&c, FSIZE + GROW); common_cleanup(&c); } From nobody Tue Mar 10 22:20:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVpH40f17z6V94P for ; Tue, 10 Mar 2026 22:20: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVpH34stBz3btP for ; Tue, 10 Mar 2026 22:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773181231; 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=b0rtPjQ71fS1cBGmo+8kImfiCNB0SZ2pOfkl/kQU/8A=; b=xUtaHuyroS3ti81XZt9FjiAf/Du0C3ubkArFozUrXm+2uNEs7iLf0bY+gtZi9MuBQJnNko 5kcHyguh4AUdTjDtXvmzlmcRLjzUvbIy2kYBTg/rv2W34VT0kFluNc0iXu1GtYDno9Ml4A RV3M5R96BWM6ThIGSYSP8kLw7CSjPvZ2jYk9kPAMXNS5RajKEy5zwF9L6/YfEkFloKl6Q/ /hZTAmif3lgk9SkjjJEXtOym/QDjAR98r1A1J035zFhs5E+WO69M6aEduyGOQVkbvcEcvM gCQYJTAOQ8jxA4kMehkFNLa8Xzcsz2W1LHQeITvQPeI0O2qfb5ocohppB/RutQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773181231; a=rsa-sha256; cv=none; b=UlL+WXNP4/ZakoBx3hZ4qCqbw6MLri3RKj6fmV2OMYp6UZbKlhSVtRZJk33vMLZ5QNPZss 8xQE3w3vwWh8ASRWAJM+fZkXYJrsY1zpDFfw7dSoEELuVhl3p6Qa1nfe1YJ4lhInkBA8tl 732h73Xb1rWZW0R+YUugJ69key+WaSqHnvZp7Sja6Gl+j0At+IawTZSHPm1zvTuxMk+Evi ki60WBZ420uic8/UoPeT46z8QU5k11M4ctoKL6sZ7AxBeXceOA1LnKGPbJw3zuoUKH72vi j+2afNIQQW6keR3oeFhK8opZpwpqznfToTJ7rSkA29daNItvikdRf09ekZweyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773181231; 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=b0rtPjQ71fS1cBGmo+8kImfiCNB0SZ2pOfkl/kQU/8A=; b=SACpxuXPpZM/M/1e2qZ0e3aFKhRGX7WjSNOHHfOpLEiQP2vqMEnYEiNF97KutR6dUZgzp2 ZxiBYI3SeHLOiBP/HY12yBcxFCsvCsh2Qy+NRmW7Fs6qN+ILffEkCu6M03uxmZxaKJJ5nK BxdZLw8RGK0B11ExrFu49iKYMCQny4UBlMuQlLCSergvU+dE3BOEvcxwf7Canf8Cpye+wH bHS1bBEu/tiaQ4j6waxpKfrJfwh2krpf1Rd9Ym6tVoNZuNZEQdcQPj73ytSMJJVWozDrR1 tG422J/vr2wKsGeukp/0c3HQHtWmE2CYNByELAU4h/Myafxs8nhL+nAoD2wl4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVpH34QsbzWqt for ; Tue, 10 Mar 2026 22:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f8e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 22:20:26 +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: bfb2fd5f6618 - main - libpmc: Explicitly whitelist json fields List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfb2fd5f66183454cfe8771595df09c0f23c7efb Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 22:20:26 +0000 Message-Id: <69b0992a.3f8e0.623c0715@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bfb2fd5f66183454cfe8771595df09c0f23c7efb commit bfb2fd5f66183454cfe8771595df09c0f23c7efb Author: Ali Mashtizadeh AuthorDate: 2026-02-28 20:45:27 +0000 Commit: Warner Losh CommitDate: 2026-03-10 22:20:17 +0000 libpmc: Explicitly whitelist json fields Adds all missing Intel fields and turns jevents.c into an explicit white list mechanism so that we no longer ignore important fields that often invalidate the counter. The json event parser must now parse every field on each architecture that we support. This has been tested by running tinderbox and manually running jevent against our current json repository. As a bonus I fixed spelling errors in the AMD JSON definitions. Sponsored by: Netflix Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2055 --- lib/libpmc/libpmc.c | 5 +- lib/libpmc/libpmc_pmu_util.c | 19 +++ lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json | 2 +- .../pmu-events/arch/x86/amdzen5/load-store.json | 2 +- .../pmu-events/arch/x86/amdzen6/load-store.json | 2 +- lib/libpmc/pmu-events/jevents.c | 129 ++++++++++++++++----- 6 files changed, 126 insertions(+), 33 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index 155da7cf6a7b..6be91a7501fe 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -1121,8 +1121,11 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, r = spec_copy = strdup(ctrspec); ctrname = strsep(&r, ","); if (pmc_pmu_enabled()) { - if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) + errno = pmc_pmu_pmcallocate(ctrname, &pmc_config); + if (errno == 0) goto found; + if (errno == EOPNOTSUPP) + goto out; } free(spec_copy); spec_copy = NULL; diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 0832ab32e2f1..5db60fe6dafe 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -241,6 +241,7 @@ struct pmu_event_desc { uint8_t ped_edge; uint8_t ped_fc_mask; uint8_t ped_ch_mask; + uint8_t ped_pebs; }; static const struct pmu_events_map * @@ -377,6 +378,8 @@ pmu_parse_event(struct pmu_event_desc *ped, const char *eventin) ped->ped_allcores = strtol(value, NULL, 10); else if (strcmp(key, "allsources") == 0) ped->ped_allsources = strtol(value, NULL, 10); + else if (strcmp(key, "pebs") == 0) + ped->ped_pebs = strtol(value, NULL, 10); else { debug = getenv("PMUDEBUG"); if (debug != NULL && strcmp(debug, "true") == 0 && value != NULL) @@ -487,6 +490,8 @@ pmc_pmu_print_counter_full(const char *ev) continue; if (strcasestr(pe->name, ev) == NULL) continue; + if (pe != pme->table) + printf("\n"); printf("name: %s\n", pe->name); if (pe->long_desc != NULL) printf("desc: %s\n", pe->long_desc); @@ -603,6 +608,7 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, strcasestr(event_name, "uncore") != NULL) { pm->pm_class = PMC_CLASS_UCP; pm->pm_caps |= PMC_CAP_QUALIFIER; + /* XXX Check and block unsupported uncore counters */ } else if (ped->ped_event == 0x0) { pm->pm_class = PMC_CLASS_IAF; } else { @@ -631,6 +637,19 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, iap->pm_iap_config |= IAP_INV; if (pm->pm_caps & PMC_CAP_INTERRUPT) iap->pm_iap_config |= IAP_INT; + + /* XXX Implement alone flag in the kernel module */ + + /* + * PEBS counters are not implemented on FreeBSD yet. Counters labeled + * with PEBS = 2 in the JSON definitions require PEBS. It seems that + * some of them return bogus counts if you attempt to use them. + */ + if (ped->ped_pebs == 2) { + printf("PEBS only counters are not supported!\n"); + return (EOPNOTSUPP); + } + return (0); } diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json index e6d710cf3ce2..01c848a9dbb3 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json @@ -182,7 +182,7 @@ { "EventName": "ls_inef_sw_pref.all", "EventCode": "0x52", - "BriefDescript6ion": "Software prefetches that did not fetch data outside of the processor core for any reason.", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core for any reason.", "UMask": "0x03" }, { diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json b/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json index 06bbaea15925..f36b58031d4b 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json @@ -345,7 +345,7 @@ { "EventName": "ls_inef_sw_pref.all", "EventCode": "0x52", - "BriefDescript6ion": "Software prefetches that did not fetch data outside of the processor core for any reason.", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core for any reason.", "UMask": "0x03" }, { diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json b/lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json index 4291eb59426f..4adba70bffb1 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json @@ -351,7 +351,7 @@ { "EventName": "ls_inef_sw_pref.all", "EventCode": "0x52", - "BriefDescript6ion": "Software prefetches that did not fetch data outside of the processor core for any reason.", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core for any reason.", "UMask": "0x03" }, { diff --git a/lib/libpmc/pmu-events/jevents.c b/lib/libpmc/pmu-events/jevents.c index 4e4f53a0c0d0..25119cd3c7b8 100644 --- a/lib/libpmc/pmu-events/jevents.c +++ b/lib/libpmc/pmu-events/jevents.c @@ -242,27 +242,33 @@ static struct msrmap *lookup_msr(char *map, jsmntok_t *val) return NULL; } +/* + * Converts the unit names to add a prefix used to identify the counter class + * in other parts of libpmc. The fallback path for unknown units prefixes the + * unit with "uncore_". + */ static struct map { const char *json; const char *perf; } unit_to_pmu[] = { + /* Intel */ + { "cpu_core", "cpu_core" }, + { "cpu_atom", "cpu_atom" }, { "CBO", "uncore_cbox" }, { "QPI LL", "uncore_qpi" }, { "SBO", "uncore_sbox" }, { "iMPH-U", "uncore_arb" }, - { "CPU-M-CF", "cpum_cf" }, - { "CPU-M-SF", "cpum_sf" }, { "UPI LL", "uncore_upi" }, + /* AMD */ + { "L3PMC", "amd_l3" }, + { "DFPMC", "amd_df" }, + /* ARM HiSilicon */ { "hisi_sicl,cpa", "hisi_sicl,cpa"}, { "hisi_sccl,ddrc", "hisi_sccl,ddrc" }, { "hisi_sccl,hha", "hisi_sccl,hha" }, { "hisi_sccl,l3c", "hisi_sccl,l3c" }, - /* it's not realistic to keep adding these, we need something more scalable ... */ + /* ARM FreeScale */ { "imx8_ddr", "imx8_ddr" }, - { "L3PMC", "amd_l3" }, - { "DFPMC", "amd_df" }, - { "cpu_core", "cpu_core" }, - { "cpu_atom", "cpu_atom" }, {} }; @@ -586,14 +592,24 @@ static int json_events(const char *fn, "Expected string value"); nz = !json_streq(map, val, "0"); - /* match_field */ - if (json_streq(map, field, "UMask") && nz) { - addfield(map, &umask, "", "umask=", val); - } else if (json_streq(map, field, "EnAllCores") && nz) { + /* + * Match the field against known fields. This list is + * an explicit whitelist so that the build will break + * if we add new json definitions with unimplemented + * fields. If a field may contain a zero value that + * results in ignoring the field, do not check nz in + * the top level conditional statement as it will + * result in executing the else clause that reports an + * error. + */ + if (json_streq(map, field, "UMask")) { + if (nz) + addfield(map, &umask, "", "umask=", val); + } else if (json_streq(map, field, "EnAllCores")) { addfield(map, &allcores, "", "allcores=", val); - } else if (json_streq(map, field, "EnAllSlices") && nz) { + } else if (json_streq(map, field, "EnAllSlices")) { addfield(map, &allslices, "", "allslices=", val); - } else if (json_streq(map, field, "SliceId") && nz) { + } else if (json_streq(map, field, "SliceId")) { /* * We use sourceid because there's a * descripency where the JSON from linux calls @@ -603,18 +619,26 @@ static int json_events(const char *fn, * the references in hwpmc_amd.h. */ addfield(map, &sliceid, "", "sourceid=", val); - } else if (json_streq(map, field, "ThreadMask") && nz) { - addfield(map, &threadmask, "", "l3_thread_mask=", val); - } else if (json_streq(map, field, "CounterMask") && nz) { - addfield(map, &cmask, "", "cmask=", val); - } else if (json_streq(map, field, "Invert") && nz) { - addfield(map, &inv, "", "inv=", val); - } else if (json_streq(map, field, "AnyThread") && nz) { - addfield(map, &any, "", "any=", val); - } else if (json_streq(map, field, "EdgeDetect") && nz) { - addfield(map, &edge, "", "edge=", val); - } else if (json_streq(map, field, "SampleAfterValue") && nz) { - addfield(map, &period, "", "period=", val); + } else if (json_streq(map, field, "ThreadMask")) { + if (nz) + addfield(map, &threadmask, "", "l3_thread_mask=", val); + } else if (json_streq(map, field, "CounterMask")) { + if (nz) + addfield(map, &cmask, "", "cmask=", val); + } else if (json_streq(map, field, "RdWrMask")) { + /* AMD UMC */ + } else if (json_streq(map, field, "Invert")) { + if (nz) + addfield(map, &inv, "", "inv=", val); + } else if (json_streq(map, field, "AnyThread")) { + if (nz) + addfield(map, &any, "", "any=", val); + } else if (json_streq(map, field, "EdgeDetect")) { + if (nz) + addfield(map, &edge, "", "edge=", val); + } else if (json_streq(map, field, "SampleAfterValue")) { + if (nz) + addfield(map, &period, "", "period=", val); } else if (json_streq(map, field, "FCMask") && nz) { addfield(map, &fc_mask, "", "fc_mask=", val); } else if (json_streq(map, field, "PortMask") && nz) { @@ -695,22 +719,69 @@ static int json_events(const char *fn, addfield(map, &arch_std, "", "", val); for (s = arch_std; *s; s++) *s = tolower(*s); + } else if (json_streq(map, field, "Offcore")) { + /* Check the relevant MSR has been set */ + } else if (json_streq(map, field, "CounterType")) { + /* Unsupported Intel Offcore counters */ + } else if (json_streq(map, field, "UMaskExt")) { + /* Unsupported Intel Offcore counters */ + } else if (json_streq(map, field, "PDIR_COUNTER")) { + /* Intel PEBS not supported */ + } else if (json_streq(map, field, "CollectPEBSRecord")) { + /* Intel PEBS not supported */ + } else if (json_streq(map, field, "PEBScounters")) { + /* Intel PEBS not supported */ + } else if (json_streq(map, field, "Counter")) { + /* Intel PEBS not supported */ + } else if (json_streq(map, field, "CounterHTOff")) { + /* Intel PEBS not supported */ + } else if (json_streq(map, field, "PRECISE_STORE")) { + /* Intel PEBS not supported */ + } else if (json_streq(map, field, "L1_Hit_Indication")) { + /* Intel PEBS not supported */ + } else if (json_streq(map, field, "RetirementLatencyMin")) { + /* Intel TPEBS not supported */ + } else if (json_streq(map, field, "RetirementLatencyMax")) { + /* Intel TPEBS not supported */ + } else if (json_streq(map, field, "RetirementLatencyMean")) { + /* Intel TPEBS not supported */ + } else if (json_streq(map, field, "Speculative")) { + /* Intel informative */ + } else if (json_streq(map, field, "Experimental")) { + /* Intel informative */ + } else if (json_streq(map, field, "ELLC")) { + /* Intel informative */ + } else if (json_streq(map, field, "TakenAlone")) { + /* + * Do not measure with other counters, usually + * this is because it uses an MSR to filter the + * event in a way that affects other counters. + */ + if (json_streq(map, val, "1")) + addfield(map, &event, ",", "alone", NULL); } else { /* - * We shouldn't ignore unknown fields that - * makes the counter invalid! + * We shouldn't ignore unknown fields that may + * make the counter invalid! + * + * Often the JSON definitions are copied + * without checking if any fields require + * handling. */ json_copystr(map, field, buf, sizeof(buf)); fprintf(stderr, "Unknown field '%s'!\n", buf); + _Exit(1); } } if (precise && je.desc && !strstr(je.desc, "(Precise Event)")) { - if (json_streq(map, precise, "2")) + if (json_streq(map, precise, "2")) { addfield(map, &extra_desc, " ", "(Must be precise)", NULL); - else + addfield(map, &event, ",", "pebs=", precise); + } else { addfield(map, &extra_desc, " ", "(Precise event)", NULL); + } } if (configcode_present) snprintf(buf, sizeof buf, "config=%#llx", configcode); From nobody Wed Mar 11 00:00:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVrW216gdz6VMSy for ; Wed, 11 Mar 2026 00:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVrW13YqBz3q3d for ; Wed, 11 Mar 2026 00:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773187261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e39P87ywQAvs2OJ56uaLbZ+33JiEE7yV/43vB7bXgLM=; b=ISiPsVii9gMNYiud8g1RswsYdg6BeUWDdKYQEQTlVGFLbkmWeQK7sYYlpejczeZm2wSsMo GoePgvwewk+xT2LPZbT4rpsZp4OgE0EoKFn05tjsBiP3gSo53btPM/5bbAjJZus5GRZ12Y h7wyW5z9BiBLueXef88W9q3q+7TbT48AQrEn5PXxHPzb+G4HfoJ6P6h4TnIQgqlyJx9Lj7 3hii4xzer/BSqncmS833DtFT+16Yh2ml4A0GzPG6UY9/3nCjTOY0HZh0HV3CC2QwTG2fPM j2OnhfEST4uYNrKlQdDAa0xOF87h+FzoS0WlYc3A7lzw5xaP7Eb0sE6wp0XAfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773187261; a=rsa-sha256; cv=none; b=JSUZalgtRli+p1whgMYmfr6w+MznIbmY2yBa2XhBgaxhMlvmT3ZX03iyknD1q/lLHkXCM9 UZ5NaWdYaMh9OOkkjHvfTx4qHLH0Htww/l5LItcSUopYfYGurjR7fbiDohJp6F++xHDVwN BXpYOORstfn3P/kuF2RZJnbmUTflh99c+4kPBDcUdXfd8+6DDGuOSyHFO7i7PgrhxpanyO pd4k8Dgdn/DtYkzY6otaseJ5GrGWZwmAU+/mSnibZZsork3IXm/JQRwrcUGNR+Nve8IceR 1qrA2W7XWX9aq4T7u0uiAmU3Uh93D1NVCr+97V+Byx2jAUnLqfbMmH+lNKErEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773187261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e39P87ywQAvs2OJ56uaLbZ+33JiEE7yV/43vB7bXgLM=; b=GpS2dGHTDR4/Urdra4UN/Cb/UJz9DewWWjQI0lR3zzgZKG+IXkKbZTcLR6hCfhRZIlHt/G +YvUOYN94al7ozs2aFo8DQB9YkfVXlPRt/36aAU6UsJlyzsM4Malf48udfE7WGKI8Yc2v1 pTKLg7Yjg4COiJk+IDZjAaq8TgxkVfHIU5bx2w80C0oA05ga0qWG8ifH3ZUEZvVE4JiseE bKb4UwH8BXGJQd+66fUflYGPAIMYB2LEO3dnZAQweS1At9ffo+Fx4z3eDtSWfkQdCSdkl/ Ri2m3NFr20GylDk83jA6v9zWz8z0iI6+IXvZXg8oBzyDzzptErs0hUYSe4EdNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVrW12mPVzbVD for ; Wed, 11 Mar 2026 00:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46ff0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 00:00:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 96294c22f7e5 - main - build: Stop testing LINKER_FEATURES for ifunc and build-id List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96294c22f7e54a48df44c86a4ee5848e71ac4470 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 00:00:56 +0000 Message-Id: <69b0b0b8.46ff0.4fbc2718@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=96294c22f7e54a48df44c86a4ee5848e71ac4470 commit 96294c22f7e54a48df44c86a4ee5848e71ac4470 Author: Ed Maste AuthorDate: 2026-03-05 19:09:19 +0000 Commit: Ed Maste CommitDate: 2026-03-11 00:00:17 +0000 build: Stop testing LINKER_FEATURES for ifunc and build-id These features are available in all supported linkers, and we can expect that they'll be supported by any GNU-compatible linker that we'd use to link FreeBSD. Reviewed by: imp, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55676 --- lib/libc/Makefile | 6 ------ stand/i386/Makefile.inc | 2 -- sys/conf/kern.pre.mk | 6 ------ sys/conf/kmod.mk | 2 -- 4 files changed, 16 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 56818e07aa96..fd546dfcef61 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -190,12 +190,6 @@ SUBDIR.${MK_TESTS}+= tests .include -.if (${LIBC_ARCH} == amd64 || ${LIBC_ARCH} == i386) && \ - ${.TARGETS:Mall} == all && \ - defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" -.error ${LIBC_ARCH} libc requires linker ifunc support -.endif - .if !defined(_SKIP_BUILD) # We need libutil.h, get it directly to avoid # recording a build dependency diff --git a/stand/i386/Makefile.inc b/stand/i386/Makefile.inc index 324c211420ae..bd4b893df0ac 100644 --- a/stand/i386/Makefile.inc +++ b/stand/i386/Makefile.inc @@ -23,9 +23,7 @@ CFLAGS+= -I${BTXLIB} LDSCRIPT= ${BOOTSRC}/i386/boot.ldscript LDFLAGS_ORG= -Wl,--defsym,ORG=${ORG},-T,${LDSCRIPT} LDFLAGS_BIN= -e start ${LDFLAGS_ORG} -Wl,-N,-S,--oformat,binary -.if ${LINKER_FEATURES:Mbuild-id} != "" LDFLAGS_BIN+= -Wl,--build-id=none -.endif LD_FLAGS_BIN= -static -N --gc-sections .if ${MACHINE_CPUARCH} == "amd64" diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index cf5e4a96ad49..d4b29aac5e63 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -115,14 +115,8 @@ CFLAGS+= ${GCOV_CFLAGS} # the others. CFLAGS+= ${CONF_CFLAGS} -.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id} LDFLAGS+= --build-id=sha1 -.endif -.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" && \ - !make(install) -.error kernel requires linker ifunc support -.endif .if ${MACHINE_CPUARCH} == "amd64" LDFLAGS+= -z max-page-size=2097152 .if ${LINKER_TYPE} != "lld" diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 4f1509592483..aacd7a17ef99 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -159,9 +159,7 @@ LDFLAGS+= -d .endif LDFLAGS+= -warn-common -.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id} LDFLAGS+= --build-id=sha1 -.endif CFLAGS+= ${DEBUG_FLAGS} .if ${MACHINE_CPUARCH} == aarch64 || ${MACHINE_CPUARCH} == amd64 || \ From nobody Wed Mar 11 03:44:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVxTF4BZCz6Vdts for ; Wed, 11 Mar 2026 03:44: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVxTF3gqRz3D70 for ; Wed, 11 Mar 2026 03:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773200689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZVY4MzyzAP3vKNgFamTn9cYnlqFaL05ZNoXmOA+9WNQ=; b=krhBtGlP1dwWbKtYjyittzu2MePMUK8kRInAMrBYo4oHC9z9uDTWphirvif/WOqW/E4WAD Bk2uYodO7P0Z0PaZJHpv7hpFJgumg9CLgjnoLBqN9IEwq9J15IhYtUEvn6SL9ak7JKly5V 8gmCLSL+KD5JJ3lPflLLUX6aHE1K+GxdO1Sx2Z00feJPG5Mldg9QcY+35IZdHeWiuhX171 80lTUro6ESF8QR3VgW31fNsFL4VRr26xfYv5JrGgusnMbLK5Ql+OkBrvl928SSycvd5C0P dgbZYsVFXS/xRqLgm6kCefcC6m0H6mEE0L/raOz/l7v8WYZNO6/aV3i0oyjZoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773200689; a=rsa-sha256; cv=none; b=PyULfXY/UTpMcr9G8fAXNMPAvUdpHs+Jk0dR9b0V7aDW3zGknenSgnlfRHWxXJQG8+g+31 hpmOZsLBVhPoXpUCAqsVxxHXa125uPATtCesn2K1Kvnxr7pjnFx14coluFNzjAyN6BmUn8 A2EjGSwxcOrN0rlEbKb+GypcX3L282VE+nDvm0fso6DpUe/cxomsKSc2tKDO1H/haQlMlU 4UdiMWLKEbNsLNaOyO8jrV6FBGKQvgTynGFZIOLIVHyZLbzyGFKsPxkZRYs9AtMCyGmcpO qgILOQ9grZXb1AA9+miewLvRgK4zLn1040jOY9zrqJWLV9ZsV1fjA5+LB7w6qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773200689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZVY4MzyzAP3vKNgFamTn9cYnlqFaL05ZNoXmOA+9WNQ=; b=o0Jj7qoWolr7K0k9vFUfkeKQL64JkxUFw1m5PymBDySrtTQnI4VPYDp3uJwBHUwAwPCcY0 bHPV7G/EDGLOevoAPsg2+o9wQ3wkNmrKDSHsbSEBeZj25yB8q6rJs1PhgzB39dJWmhYXrr KM9OTsbN6/+TYihY7Drkw6b29u2mkCvDbVFnIGOyJkb+OCBIslX7LxBnw5vvFEHOnce91K gP4UBxXc43khpny9yR6dWtqqOlKPZm0f7P73ME4E8U8/2aB6emGfxHMoYFB8khWu1J3VQt aqz7D+nw0xA+oUNmjxgBKeHjLldEQsljiY4cjFebgaNgVpRmR0MvoCglMcUFtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVxTF2qB9zjFK for ; Wed, 11 Mar 2026 03:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a826 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 03:44: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: 67728a18b9c1 - main - yes: Add tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67728a18b9c18e55cc60e063380825b80f25b1b9 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 03:44:44 +0000 Message-Id: <69b0e52c.3a826.c9c4e07@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=67728a18b9c18e55cc60e063380825b80f25b1b9 commit 67728a18b9c18e55cc60e063380825b80f25b1b9 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-11 03:44:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-11 03:44:17 +0000 yes: Add tests MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55802 --- etc/mtree/BSD.tests.dist | 2 + usr.bin/yes/Makefile | 4 ++ usr.bin/yes/tests/Makefile | 4 ++ usr.bin/yes/tests/yes_test.sh | 85 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 770f3434ac11..4fa35d1a17d0 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1265,6 +1265,8 @@ yacc .. .. + yes + .. .. usr.sbin certctl diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile index b1d4075b5917..545c95d00624 100644 --- a/usr.bin/yes/Makefile +++ b/usr.bin/yes/Makefile @@ -1,3 +1,7 @@ +.include + PROG= yes +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests .include diff --git a/usr.bin/yes/tests/Makefile b/usr.bin/yes/tests/Makefile new file mode 100644 index 000000000000..874a1bc21751 --- /dev/null +++ b/usr.bin/yes/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= yes_test + +.include diff --git a/usr.bin/yes/tests/yes_test.sh b/usr.bin/yes/tests/yes_test.sh new file mode 100644 index 000000000000..f4c04e186536 --- /dev/null +++ b/usr.bin/yes/tests/yes_test.sh @@ -0,0 +1,85 @@ +# +# Copyright (c) 2026 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +atf_test_case none +none_head() +{ + atf_set "descr" "No arguments" +} +none_body() +{ + atf_check \ + -o inline:"y\ny\ny\ny\ny\n" \ + -x "yes | head -5" +} + +atf_test_case one +one_head() +{ + atf_set "descr" "One argument" +} +one_body() +{ + local y="Hello, world!" + atf_check \ + -o inline:"${y}\n${y}\n${y}\n${y}\n${y}\n" \ + -x "yes '${y}' | head -5" +} + +atf_test_case multi +multi_head() +{ + atf_set "descr" "Multiple arguments" +} +multi_body() +{ + set -- The Magic Words are Squeamish Ossifrage + local y="$*" + atf_check \ + -o inline:"${y}\n${y}\n${y}\n${y}\n${y}\n" \ + -x "yes $* | head -5" +} + +atf_test_case argv +argv_head() +{ + atf_set "descr" "Verify that argv is unmolested" +} +argv_body() +{ + yes y >/dev/null & + local pid=$! + atf_check -o inline:"yes y\n" ps -o args= $pid + kill $pid + wait +} + +atf_test_case stdout +stdout_head() +{ + atf_set descr "Error writing to stdout" +} +stdout_body() +{ + ( + trap "" PIPE + # Give true(1) some time to exit. + sleep 1 + yes 2>stderr + echo $? >result + ) | true + atf_check -o inline:"1\n" cat result + atf_check -o match:"stdout" cat stderr +} + +atf_init_test_cases() +{ + atf_add_test_case none + atf_add_test_case one + atf_add_test_case multi + atf_add_test_case argv + atf_add_test_case stdout +} From nobody Wed Mar 11 03:50:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVxc11cMTz6VfQh for ; Wed, 11 Mar 2026 03:50: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVxc03T3sz3DWF for ; Wed, 11 Mar 2026 03:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773201040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyGEi8cHnY8580ayZYiKxjh6F0xZUryShNjqEwfW1cc=; b=xoW7T4o6RO2QTgyR4XN1QNEkAsmH/eqq74ysgGBgky2tvjcm/BCmrh94WaeR3eFry9NWE0 Y8h5RAAGgkTGbEzMG/koxPOeIVPIo1afJdrb9U9jfyKwOLrcUzYhtbvVfzbHeuuRqvsyvX 1zsbQ2HJCSWTJDQzVVrNJApCQDLRzlqB6s6hztMc9rvNYVi3OW6S7y8zU9IPTaGsi3RDYX 12tloWI9ZojAxvkXR6i9FQVz3etenp/db2d10wwaQpibnJb03PgC6S4hAT7/Kf/SjfdozB bMT8nQgpRB6bu5Z2TzGzsw/tRt2C7Je+9ylbxkUzALEECv2nUsBN6OLGRF/L7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773201040; a=rsa-sha256; cv=none; b=CmhG4hnk8zNuiyf0ya2MNNeTB1425F6hp3WKvYTMQWjWJKct3my/WK84AgSOe95v2Ap2pE Zoq6kCfowR/XA4UUHGLb127ng5C2mAYCm2W01CxXdYnwI+cvzf47hz1NzaynWZT+iBP5bm 01IWHR5DUexVJUPFN9Gk73ljPfXBMiq7NPsv3eGdd7VDdUKgCKWGwEN1S7DNdinYT2Hc3v l/ko5hssn0g8GZ7QXbejpEsR+v12ykPUGz5/+EzT73A34T512R02mzbXEkHH9xLVsCkBhy RJWiaLaH1WIUSnhI+UgLQC6U6q07W62QCItSeINGl3B5N/4o8DfHn0hjkliToQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773201040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyGEi8cHnY8580ayZYiKxjh6F0xZUryShNjqEwfW1cc=; b=NXaDEh3Un0H2XxPvcTvBicDFwcltWyCjbCF7o0Tevj7UY3w0R2CfozYDR+0xNHCsAEC3w7 aHP7DnWqvbnaVXVRLLVX1njIKTMSqsTjCDDMCkkHsbmcOpWC0llL8qfVprOAMGhJjpcaip YNUXmoxI8SP+8SsIGihmZwuHAOsFhLkwPGgi5oh0lUpmDOwcOEtJ33qsmn+Vrdh0jG3mXC eVd+BN4K028wPvLysvopSsGjD0/Vfr5jMnWuUc7XCgyRhO097b2+9xzgh3tU/rHDEFA8pC O6HQ7XpfT05tgNzke9gNz/MgjVHIsnq/axrEQIFzabS4sqDSeyzPjfR81QZd2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVxc02TvjzjHm for ; Wed, 11 Mar 2026 03:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bad3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 03:50:40 +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: ff2c98b30b57 - main - tzcode: Update to 2026a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff2c98b30b57b9763e2a6575f729bab676e6c025 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 03:50:40 +0000 Message-Id: <69b0e690.3bad3.5e857ff6@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ff2c98b30b57b9763e2a6575f729bab676e6c025 commit ff2c98b30b57b9763e2a6575f729bab676e6c025 Merge: 67728a18b9c1 cd59570c180e Author: Dag-Erling Smørgrav AuthorDate: 2026-03-11 03:47:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-11 03:48:58 +0000 tzcode: Update to 2026a Many thanks to Paul Eggert for adopting most of our adaptations as optional features upstream in the previous release (2025c). MFC after: 1 week Reviewed by: philip Differential Revision: https://reviews.freebsd.org/D55741 contrib/tzcode/CONTRIBUTING | 36 +- contrib/tzcode/Makefile | 236 ++++-- contrib/tzcode/NEWS | 232 ++++++ contrib/tzcode/README | 14 +- contrib/tzcode/SECURITY | 2 +- contrib/tzcode/calendars | 27 +- contrib/tzcode/date.1 | 4 +- contrib/tzcode/date.c | 7 +- contrib/tzcode/localtime.c | 1747 ++++++++++++++++++++++++----------------- contrib/tzcode/newctime.3 | 28 +- contrib/tzcode/newstrftime.3 | 2 +- contrib/tzcode/newtzset.3 | 47 +- contrib/tzcode/private.h | 372 +++++---- contrib/tzcode/strftime.c | 5 +- contrib/tzcode/theory.html | 383 ++++----- contrib/tzcode/time2posix.3 | 118 +-- contrib/tzcode/tz-art.html | 423 +++++----- contrib/tzcode/tz-how-to.html | 250 +++--- contrib/tzcode/tz-link.html | 398 +++++----- contrib/tzcode/tzconfig.h | 36 +- contrib/tzcode/tzfile.5 | 30 +- contrib/tzcode/tzfile.h | 30 +- contrib/tzcode/tzselect.ksh | 15 +- contrib/tzcode/version | 2 +- contrib/tzcode/workman.sh | 36 +- contrib/tzcode/zdump.c | 21 +- contrib/tzcode/zic.8 | 85 +- contrib/tzcode/zic.c | 783 ++++++++++-------- 28 files changed, 3146 insertions(+), 2223 deletions(-) diff --cc contrib/tzcode/Makefile index 2130582c2deb,000000000000..1e0a5903534d mode 100644,000000..100644 --- a/contrib/tzcode/Makefile +++ b/contrib/tzcode/Makefile @@@ -1,1383 -1,0 +1,1447 @@@ +# Make and install tzdb code and data. +# This file is in the public domain, so clarified as of +# 2009-05-17 by Arthur David Olson. +# Request POSIX conformance; this must be the first non-comment line. +.POSIX: ++# By default, builds of code and data assume POSIX.1-2001 or later; ++# this assumption can be relaxed by tailoring the build as described below. +# On older platforms you may need to scrounge for POSIX conformance. +# For example, on Solaris 10 (2005) with Sun Studio 12 aka Sun C 5.9 (2007), +# use 'PATH=/usr/xpg4/bin:$PATH make CC=c99'. ++# Reproducible builds of distribution tarballs also need a copy of the ++# Git repository, and assume the behavior of the following programs ++# (or later versions): ++# Git 2.7.0 (2016) ++# GNU Coreutils 6.3 (2006) ++# GNU Tar 1.14 (2004) ++# GnuPG 1.4 (2004) ++# Although tzdb does not come with a software bill of materials, ++# you should be able to construct one based on the above information, ++# your platform, and the way you use this Makefile. + +# To affect how this Makefile works, you can run a shell script like this: +# +# #!/bin/sh - # make CC='gcc -std=gnu23' "$@" ++# make CFLAGS='-O2 -DHAVE_GETTEXT=0' "$@" +# - # This example script is appropriate for a circa 2024 GNU/Linux system - # where a non-default setting enables this package's optional use of C23. ++# This example script is appropriate for a GNU/Linux system ++# which needs more optimization than default, and which does not want ++# gettext's internationalization of diagnostics. +# +# Alternatively, you can simply edit this Makefile to tailor the following +# macro definitions. + +############################################################################### +# Start of macros that one plausibly might want to tailor. + +# Package name for the code distribution. +PACKAGE= tzcode + +# Version number for the distribution, overridden in the 'tarballs' rule below. +VERSION= unknown + +# Email address for bug reports. +BUGEMAIL= tz@iana.org + +# DATAFORM selects the data format. +# Available formats represent essentially the same data, albeit +# possibly with minor discrepancies that users are not likely to notice. +# To get new features and the best data right away, use: +# DATAFORM= vanguard +# To wait a while before using new features, to give downstream users +# time to upgrade zic (the default), use: +# DATAFORM= main +# To wait even longer for new features, use: +# DATAFORM= rearguard +# Rearguard users might also want "ZFLAGS = -b fat"; see below. +DATAFORM= main + +# Change the line below for your timezone (after finding the one you want in +# one of the $(TDATA) source files, or adding it to a source file). +# Alternatively, if you discover you've got the wrong timezone, you can just +# 'zic -l -' to remove it, or 'zic -l rightzone' to change it. +# Use the command +# make zonenames +# to get a list of the values you can use for LOCALTIME. + +LOCALTIME= Factory + - # The POSIXRULES macro controls interpretation of POSIX-like TZ - # settings like TZ='EET-2EEST' that lack DST transition rules. - # If POSIXRULES is '-', no template is installed; this is the default. - # Any other value for POSIXRULES is obsolete and should not be relied on, as: - # * It does not work correctly in popular implementations such as GNU/Linux. - # * It does not work even in tzcode, except for historical timestamps - # that precede the last explicit transition in the POSIXRULES file. - # Hence it typically does not work for current and future timestamps. - # If, despite the above, you want a template for handling these settings, - # you can change the line below (after finding the timezone you want in the - # one of the $(TDATA) source files, or adding it to a source file). - # Alternatively, if you discover you've got the wrong timezone, you can just - # 'zic -p -' to remove it, or 'zic -p rightzone' to change it. - # Use the command - # make zonenames - # to get a list of the values you can use for POSIXRULES. - - POSIXRULES= - - - # Also see TZDEFRULESTRING below, which takes effect only - # if POSIXRULES is '-' or if the template file cannot be accessed. - + +# Installation locations. +# +# The defaults are suitable for Debian, except that if REDO is +# posix_right or right_posix then files that Debian puts under +# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead +# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps, +# respectively. Problems with the Debian approach are discussed in +# the commentary for the right_posix rule (below). + +# Destination directory, which can be used for staging. +# 'make DESTDIR=/stage install' installs under /stage (e.g., to +# /stage/etc/localtime instead of to /etc/localtime). Files under +# /stage are not intended to work as-is, but can be copied by hand to +# the root directory later. If DESTDIR is empty, 'make install' does +# not stage, but installs directly into production locations. +DESTDIR = + +# Everything is installed into subdirectories of TOPDIR, and used there. +# TOPDIR should be empty (meaning the root directory), +# or a directory name that does not end in "/". +# TOPDIR should be empty or an absolute name unless you're just testing. +TOPDIR = + +# The default local timezone is taken from the file TZDEFAULT. +TZDEFAULT = $(TOPDIR)/etc/localtime + +# The subdirectory containing installed program and data files, and +# likewise for installed files that can be shared among architectures. +# These should be relative file names. +USRDIR = usr +USRSHAREDIR = $(USRDIR)/share + +# "Compiled" timezone information is placed in the "TZDIR" directory +# (and subdirectories). +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. +TZDIR_BASENAME= zoneinfo +TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME) + +# The "tzselect" and (if you do "make INSTALL") "date" commands go in: +BINDIR = $(TOPDIR)/$(USRDIR)/bin + +# The "zdump" command goes in: +ZDUMPDIR = $(BINDIR) + +# The "zic" command goes in: +ZICDIR = $(TOPDIR)/$(USRDIR)/sbin + +# Manual pages go in subdirectories of. . . +MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man + +# Library functions are put in an archive in LIBDIR. +LIBDIR = $(TOPDIR)/$(USRDIR)/lib + + +# Types to try, as an alternative to time_t. +TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL) +TIME_T_ALTERNATIVES_HEAD = int_least64_t.ck +TIME_T_ALTERNATIVES_TAIL = int_least32_t.ck uint_least32_t.ck \ + uint_least64_t.ck + +# What kind of TZif data files to generate. (TZif is the binary time +# zone data format that zic generates; see Internet RFC 9636.) +# If you want only POSIX time, with time values interpreted as +# seconds since the epoch (not counting leap seconds), use +# REDO= posix_only +# below. If you want only "right" time, with values interpreted +# as seconds since the epoch (counting leap seconds), use +# REDO= right_only +# below. If you want both sets of data available, with leap seconds not +# counted normally, use +# REDO= posix_right +# below. If you want both sets of data available, with leap seconds counted +# normally, use +# REDO= right_posix - # below. POSIX mandates that leap seconds not be counted; for compatibility - # with it, use "posix_only" or "posix_right". Use POSIX time on systems with ++# below. POSIX mandates that leap seconds not be counted, and a ++# nonnegative TZ_CHANGE_INTERVAL also assumes this, so to be compatible with ++# these, use "posix_only" or "posix_right". Use POSIX time on systems with +# leap smearing; this can work better than unsmeared "right" time with +# applications that are not leap second aware, and is closer to unsmeared +# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error). + - REDO= posix_right ++REDO= posix_only + +# Whether to put an "Expires" line in the leapseconds file. +# Use EXPIRES_LINE=1 to put the line in, 0 to omit it. +# The EXPIRES_LINE value matters only if REDO's value contains "right". +# If you change EXPIRES_LINE, remove the leapseconds file before running "make". +# zic's support for the Expires line was introduced in tzdb 2020a, +# and was modified in tzdb 2021b to generate version 4 TZif files. +# EXPIRES_LINE defaults to 0 for now so that the leapseconds file +# can be given to pre-2020a zic implementations and so that TZif files +# built by newer zic implementations can be read by pre-2021b libraries. +EXPIRES_LINE= 0 + +# To install data in text form that has all the information of the TZif data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward +# To omit these links, use +# BACKWARD= + +BACKWARD= backward + +# If you want out-of-scope and often-wrong data from the file 'backzone', +# but only for entries listed in the backward-compatibility file zone.tab, use +# PACKRATDATA= backzone +# PACKRATLIST= zone.tab +# If you want all the 'backzone' data, use +# PACKRATDATA= backzone +# PACKRATLIST= +# To omit this data, use +# PACKRATDATA= +# PACKRATLIST= + +PACKRATDATA= +PACKRATLIST= + +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + ++# Extra flags for producing man page files like tzfile.5.txt. ++# These flags are used only if groff (or mandoc) is present. ++# Each option should begin with "-" and should lack shell metacharacters. ++# Plausible options include -Tascii and -Tutf8. ++MANFLAGS= -Tutf8 ++ +# Non-default libraries needed to link. +# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0. +LDLIBS= + +# Add the following to an uncommented "CFLAGS=" line as needed +# to override defaults specified in the source code or by the system. +# "-DFOO" is equivalent to "-DFOO=1". +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. ++# -DFREE_PRESERVES_ERRNO=[01] if the 'free' function munges or preserves errno ++# (default is guessed) +# -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# on POSIX platforms predating POSIX.1-2024 +# -DHAVE_DECL_ENVIRON if declares 'environ' +# -DHAVE_DECL_TIMEGM=0 if does not declare timegm +# -DHAVE_DIRECT_H if mkdir needs (MS-Windows) ++# -DHAVE_FCHMOD=0 if your system lacks the fchmod function +# -DHAVE__GENERIC=0 if _Generic does not work* ++# -DHAVE_GETEUID=0 if gete?[ug]id do not work +# -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux), +# -DHAVE_GETRANDOM=0 to avoid using getrandom ++# -DHAVE_GETRESUID=0 if getres[ug]id do not work +# -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris), +# where LDLIBS also needs to contain -lintl on some hosts; +# -DHAVE_GETTEXT=0 to avoid using gettext +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares +# ctime_r and asctime_r incompatibly with POSIX.1-2017 and earlier +# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). +# -DHAVE_INTTYPES_H=0 if does not work*+ ++# -DHAVE_ISSETUGID=1 if issetugid works, 0 otherwise (default is guessed) ++# If 0, you may also use -DHAVE_SYS_AUXV_H=1 if works, ++# 0 otherwise (default is guessed). +# -DHAVE_LINK=0 if your system lacks a link function +# -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function +# -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz +# localtime_rz can make zdump significantly faster, but is nonstandard. +# -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure. ++# -DHAVE_MEMPCPY=1 if your system has mempcpy, 0 if not (default is guessed) +# -DHAVE_POSIX_DECLS=0 if your system's include files do not declare - # functions like 'link' or variables like 'tzname' required by POSIX ++# variables like 'tzname' required by POSIX ++# -DHAVE_PWD_H=0 if your system lacks pwd.h, grp.h and corresponding functions ++# If 0, you may also need -Dgid_t=G -Duid_t=U ++# to define gid_t and uid_t to be types G and U. +# -DHAVE_SETENV=0 if your system lacks the setenv function ++# -DHAVE_SETMODE=[01] if your system lacks or has the setmode and getmode ++# functions (default is guessed) +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+ +# -DHAVE_STDCKDINT_H=0 if neither nor substitutes like +# __builtin_add_overflow work* +# -DHAVE_STDINT_H=0 if does not work*+ +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l +# -DHAVE_STRDUP=0 if your system lacks the strdup function ++# -DHAVE_STRNLEN=0 if your system lacks the strnlen function+ +# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+ ++# -DHAVE_STRUCT_STAT_ST_CTIM=0 if struct stat lacks a status-change member ++# of type struct timespec, so code should use st_ctime instead; ++# but if the status-change member name is st_ctimespec, ++# use -Dst_ctim=st_ctimespec instead (default is guessed)+ ++# -DHAVE_STRUCT_TIMESPEC=0 if your system lacks struct timespec+ +# -DHAVE_SYMLINK=0 if your system lacks the symlink function +# -DHAVE_SYS_STAT_H=0 if does not work* ++# If 0, you may also need -Dmode_t=M to define mode_t to be type M. +# -DHAVE_TZSET=0 if your system lacks a tzset function +# -DHAVE_UNISTD_H=0 if does not work* +# -DHAVE_UTMPX_H=0 if does not work* +# -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -DMKTIME_MIGHT_OVERFLOW if mktime might fail due to time_t overflow ++# -DOPENAT_TZDIR if tzset should use openat on TZDIR then a relative open. ++# See localtime.c for details. +# -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+ +# Typically it is better to use a later standard. For example, +# with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'. +# Even with -DPORT_TO_C89, the code needs at least one C99 +# feature (integers at least 64 bits wide) and maybe more. +# -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers +# with external linkage, e.g., applications cannot define 'localtime'. +# -Dssize_t=int on hosts like MS-Windows that lack ssize_t +# -DSUPPORT_C89=0 if the tzcode library should not support C89 callers +# Although -DSUPPORT_C89=0 might work around latent bugs in callers, +# it does not conform to POSIX. +# -DSUPPORT_POSIX2008 if the library should support older POSIX callers+ +# However, this might cause problems in POSIX.1-2024-or-later callers. +# -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has +# security implications and is not recommended for general use +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; +# not needed by the main-program tz code, which is single-threaded. +# Append other compiler flags as needed, e.g., -pthread on GNU/Linux. ++# The following options can also be used: ++# -DTHREAD_PREFER_SINGLE to prefer speed in single-threaded apps, ++# at some cost in CPU time and energy in multi-threaded apps. ++# The following options can also be used: ++# -DHAVE___ISTHREADED=1 if there is an extern int __isthreaded ++# variable, 0 otherwise (default is guessed) ++# -DHAVE_SYS_SINGLE_THREADED_H=0 if works, ++# 0 otherwise (default is guessed) ++# -DTHREAD_RWLOCK to use read-write locks instead of mutexes. ++# This can improve parallelism and thus save real time ++# if many threads call tzcode functions simultaneously. ++# It also costs CPU time and thus energy. ++# -DTHREAD_TM_MULTI to have gmtime, localtime, and offtime ++# return different struct tm * addresses in different threads. ++# This supports nonportable programs that call ++# gmtime/localtime/offtime when they should call ++# gmtime_r/localtime_r/offtime_r to avoid races. ++# Because the corresponding storage is freed on thread exit, ++# this option is incompatible with POSIX.1-2024 and earlier. ++# It also costs CPU time and memory. +# -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. ++# -DTZ_CHANGE_INTERVAL=N if functions depending on TZ should check ++# no more often than every N seconds for TZif file changes. ++# If N is negative (the default), no such checking is done. ++# This option is intended for platforms that want localtime etc. ++# to respond to changes to a file selected by TZ, including to ++# TZDEFAULT (normally /etc/localtime) if TZ is unset. ++# On these platforms, REDO should be "posix_only" or "posix_right". ++# This option does not affect tzalloc-allocated objects. +# -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" +# -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; +# the default is system-supplied, typically "/usr/lib/locale" ++# -DTZ_RUNTIME_LEAPS=0 to disable runtime support for leap seconds. ++# This conforms to POSIX, shrinks tzcode's attack surface, ++# and is more efficient. However, it fails to support Internet ++# RFC 9636's leap seconds. +# -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified - # DST transitions for proleptic format TZ strings lacking them, - # in the usual case where POSIXRULES is '-'. If not specified, - # TZDEFRULESTRING defaults to US rules for future DST transitions. ++# DST transitions for proleptic format TZ strings lacking them. ++# If not specified, it defaults to US rules for future DST transitions. +# This mishandles some past timestamps, as US DST rules have changed. +# It also mishandles settings like TZ='EET-2EEST' for eastern Europe, +# as Europe and US DST rules differ. +# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 254) +# -DUNINIT_TRAP if reading uninitialized storage can cause problems +# other than simply getting garbage data +# -DUSE_LTZ=0 to build zdump with the system time zone library +# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. +# -DZIC_BLOAT_DEFAULT=\"fat\" to default zic's -b option to "fat", and +# similarly for "slim". Fat TZif files work around incompatibilities +# and bugs in some TZif readers, notably older ones that +# ignore or otherwise mishandle 64-bit data in TZif files; +# however, fat TZif files may trigger bugs in newer TZif readers. +# Slim TZif files are more efficient, and are the default. +# -DZIC_MAX_ABBR_LEN_WO_WARN=3 +# (or some other number) to set the maximum time zone abbreviation length +# that zic will accept without a warning (the default is 6) +# -g to generate symbolic debugging info +# -Idir to include from directory 'dir' +# -O0 to disable optimization; other -O options to enable more optimization +# -Uname to remove any definition of the macro 'name' +# $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking +# +# * Options marked "*" can be omitted if your compiler is C23 compatible. +# * Options marked "+" are obsolescent and are planned to be removed +# once the code assumes C99 or later (say in the year 2029) +# and POSIX.1-2024 or later (say in the year 2034). +# +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ - -fsanitize-undefined-trap-on-error -fstack-protector ++ -fsanitize-trap=all -fstack-protector +# Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow. +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wcast-qual \ + -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wduplicated-branches -Wduplicated-cond -Wflex-array-member-not-at-end \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes \ + -Wmissing-variable-declarations -Wnested-externs \ + -Wnull-dereference \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-overflow \ + -Wstrict-prototypes -Wstringop-overflow=4 \ - -Wstringop-truncation -Wsuggest-attribute=cold \ ++ -Wsuggest-attribute=cold \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=malloc \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wunused-macros -Wuse-after-free=3 \ + -Wvariadic-macros -Wvla -Wwrite-strings \ ++ -Wzero-as-null-pointer-constant \ + -Wno-format-nonliteral -Wno-sign-compare -Wno-type-limits +# +# If your system has a "GMT offset" field in its "struct tm"s +# (or if you decide to add such a field in your system's "time.h" file), +# add the name to a define such as +# -DTM_GMTOFF=tm_gmtoff +# to the end of the "CFLAGS=" line. If not defined, the code attempts to +# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. +# Similarly, if your system has a "zone abbreviation" field, define +# -DTM_ZONE=tm_zone +# and define NO_TM_ZONE to suppress any guessing. +# Although POSIX.1-2024 requires these fields and they are widely available +# on GNU/Linux and BSD systems, some older systems lack them. +# +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 # do not support "tzname" +# # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library +# # -DHAVE_TZNAME=2 # support and define "tzname" +# # to the "CFLAGS=" line. Although "tzname" is required by POSIX.1-1988 +# # and later, its contents are unspecified if you use a geographical TZ +# # and the variable is planned to be removed in a future POSIX edition. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 # do not support +# # -DUSG_COMPAT=1 # support, and variables are defined by system library +# # -DUSG_COMPAT=2 # support and define variables +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix +# # Systems Group code and are required by POSIX.1-2008 and later (with XSI), +# # although their contents are unspecified if you use a geographical TZ +# # and the variables are planned to be removed in a future edition of POSIX. +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE=0 # do not support +# # -DALTZONE=1 # support "altzone", which is defined by system library +# # -DALTZONE=2 # support and define "altzone" +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If not defined, the code attempts to guess ALTZONE from other macros. +# +# If you want functions that were inspired by early versions of X3J11's work, +# add +# -DSTD_INSPIRED +# to the end of the "CFLAGS=" line. This arranges for the following +# functions to be added to the time conversion library. +# "offtime" is like "gmtime" except that it accepts a second (long) argument +# that gives an offset to add to the time_t when converting it. - # I.e., "offtime" is like calling "localtime_rz" with a fixed-offset zone. ++# "offtime_r" is to "offtime" what "gmtime_r" is to "gmtime". ++# I.e., "offtime" and "offtime_r" are like calling "localtime_rz" ++# with a fixed-offset zone. +# "timelocal" is nearly equivalent to "mktime". +# "timeoff" is like "timegm" except that it accepts a second (long) argument +# that gives an offset to use when converting to a time_t. +# I.e., "timeoff" is like calling "mktime_z" with a fixed-offset zone. +# "posix2time" and "time2posix" are described in an included manual page. +# X3J11's work does not describe any of these functions. +# These functions may well disappear in future releases of the time +# conversion package. +# +# If you don't want functions that were inspired by NetBSD, add +# -DNETBSD_INSPIRED=0 +# to the end of the "CFLAGS=" line. Otherwise, the functions +# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the +# time library, and if STD_INSPIRED is also defined to nonzero the functions +# "posix2time_z" and "time2posix_z" are added as well. +# The functions ending in "_z" (or "_rz") are like their unsuffixed +# (or suffixed-by-"_r") counterparts, except with an extra first +# argument of opaque type timezone_t that specifies the timezone. +# "tzalloc" allocates a timezone_t value, and "tzfree" frees it. +# +# If you want to allocate state structures in localtime, add +# -DALL_STATE +# to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. +# +# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put +# out by the National Institute of Standards and Technology +# which claims to test C and POSIX conformance. If you want to pass PCTS, add +# -DPCTS +# to the end of the "CFLAGS=" line. +# +# If you want strict compliance with XPG4 as of 1994-04-09, add +# -DXPG4_1994_04_09 +# to the end of the "CFLAGS=" line. This causes "strftime" to always return +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 +# falls on a Friday, Saturday, or Sunday. +# +# POSIX says CFLAGS defaults to "-O 1". +# Uncomment the following line and edit its contents as needed. + +#CFLAGS= -O 1 + + +# The name of a POSIX-like library archiver, its flags, C compiler, +# linker flags, and 'make' utility. Ordinarily the defaults suffice. +# The commented-out values are the defaults specified by POSIX.1-2024. +#AR = ar +#ARFLAGS = -rv +#CC = c17 +#LDFLAGS = +#MAKE = make + +# Where to fetch leap-seconds.list from. +leaplist_URI = \ + https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list +# The file is generated by the IERS Earth Orientation Centre, in Paris. +leaplist_TZ = Europe/Paris ++# ++# To fetch leap-seconds.list from NIST via a less-secure protocol ++# and with less-volatile metadata, use these settings: ++#leaplist_URI = ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list ++#leaplist_TZ = America/Denver + +# The zic command and its arguments. + +zic= ./zic +ZIC= $(zic) $(ZFLAGS) + +# To shrink the size of installed TZif files, +# append "-r @N" to omit data before N-seconds-after-the-Epoch. +# To grow the files and work around bugs in older applications, +# possibly at the expense of introducing bugs in newer ones, +# append "-b fat"; see ZIC_BLOAT_DEFAULT above. +# See the zic man page for more about -b and -r. +ZFLAGS= + +# How to use zic to install TZif files. + +ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' + +# The name of a POSIX-compliant 'awk' on your system. +# mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work. +# Also, it is better (though not essential) if 'awk' supports UTF-8, +# and unfortunately mawk and busybox awk do not support UTF-8. +# Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems. +AWK= awk + +# The full path name of a POSIX-compliant shell, preferably one that supports +# the Korn shell's 'select' statement as an extension. +# These days, Bash is the most popular. +# It should be OK to set this to /bin/sh, on platforms where /bin/sh +# lacks 'select' or doesn't completely conform to POSIX, but /bin/bash +# is typically nicer if it works. +KSHELL= /bin/bash + +# Name of curl , used for HTML validation +# and to fetch leap-seconds.list from upstream. +# Set CURL=: to disable use of the Internet. +CURL= curl + +# Name of GNU Privacy Guard , used to sign distributions. +GPG= gpg + +# This expensive test requires USE_LTZ. +# To suppress it, define this macro to be empty. +CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives + +# SAFE_CHAR is a regular expression that matches a safe character. +# Some parts of this distribution are limited to safe characters; +# others can use any UTF-8 character. +# For now, the safe characters are a safe subset of ASCII. +# The caller must set the shell variable 'sharp' to the character '#', +# since Makefile macros cannot contain '#'. +# TAB_CHAR is a single tab character, in single quotes. +TAB_CHAR= ' ' +SAFE_CHARSET1= $(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@' +SAFE_CHARSET2= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`' +SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~' +SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3) +SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]' + - # These non-alphabetic, non-ASCII printable characters are Latin-1, - # and so are likely displayable even in editors like XEmacs 21 - # that have limited display capabilities. - UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷ - # Non-ASCII non-letters that OK_CHAR allows, as these characters are - # useful in commentary. - UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1) ++# These non-alphabetic, non-ASCII printable characters are ++# used in commentary or in generated *.txt files ++# and are not likely to cause confusion. ++UNUSUAL_OK_CHARSET= §«°±»½¾×–‘’“â€â€¢â†’−≤★⟨⟩⯪ + +# Put this in a bracket expression to match spaces. +s = [:space:] + +# OK_CHAR matches any character allowed in the distributed files. +# This is the same as SAFE_CHAR, except that UNUSUAL_OK_CHARSET and +# multibyte letters are also allowed so that commentary can contain a +# few safe symbols and people's names and can quote non-English sources. - # Other non-letters are limited to ASCII renderings for the - # convenience of maintainers using XEmacs 21.5.34, which by default - # mishandles Unicode characters U+0100 and greater. +OK_CHAR= '[][:alpha:]$(UNUSUAL_OK_CHARSET)'$(SAFE_CHARSET)'-]' + +# SAFE_LINE matches a line of safe characters. +# SAFE_SHARP_LINE is similar, except any OK character can follow '#'; +# this is so that comments can contain non-ASCII characters. +# OK_LINE matches a line of OK characters. +SAFE_LINE= '^'$(SAFE_CHAR)'*$$' +SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$' +OK_LINE= '^'$(OK_CHAR)'*$$' + +# Flags to give 'tar' when making a distribution. +# Try to use flags appropriate for GNU tar. +GNUTARFLAGS= --format=pax --pax-option=delete=atime,delete=ctime \ + --numeric-owner --owner=0 --group=0 \ + --mode=go+u,go-w --sort=name +SETUP_TAR= \ + export LC_ALL=C && \ + if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; then \ + TAR='tar $(GNUTARFLAGS)'; \ + else \ + TAR=tar; \ + fi + +# Flags to give 'gzip' when making a distribution. +GZIPFLAGS= -9n + +# When comparing .tzs files, use GNU diff's -F'^TZ=' option if supported. +# This makes it easier to see which Zone has been affected. +SETUP_DIFF_TZS = \ + if diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1; then \ + DIFF_TZS='diff -u -F^TZ='; \ + else \ + DIFF_TZS='diff -u'; \ + fi + +# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. +RANLIB= : + +# POSIX prohibits defining or using SHELL. However, csh users on systems +# that use the user shell for Makefile commands may need to define SHELL. +#SHELL= /bin/sh + +# End of macros that one plausibly might want to tailor. +############################################################################### + + +TZCOBJS= zic.o +TZDOBJS= zdump.o localtime.o strftime.o +DATEOBJS= date.o localtime.o strftime.o +LIBSRCS= localtime.c asctime.c difftime.c strftime.c +LIBOBJS= localtime.o asctime.o difftime.o strftime.o +HEADERS= tzfile.h private.h +NONLIBSRCS= zic.c zdump.c +NEWUCBSRCS= date.c +SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \ + tzselect.ksh workman.sh +MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \ + tzfile.5 tzselect.8 zic.8 zdump.8 +MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \ + time2posix.3.txt \ + tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ + date.1.txt +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README SECURITY theory.html version +WEB_PAGES= tz-art.html tz-how-to.html tz-link.html +CHECK_WEB_PAGES=theory.ck tz-art.ck tz-how-to.ck tz-link.ck +DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) +PRIMARY_YDATA= africa antarctica asia australasia \ + europe northamerica southamerica +YDATA= $(PRIMARY_YDATA) etcetera +NDATA= factory +TDATA_TO_CHECK= $(YDATA) $(NDATA) backward +TDATA= $(YDATA) $(NDATA) $(BACKWARD) +ZONETABLES= zone.tab zone1970.tab zonenow.tab +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) +LEAP_DEPS= leapseconds.awk leap-seconds.list +TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \ + $(PACKRATDATA) $(PACKRATLIST) +DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA) $(PACKRATLIST) +DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \ + leapseconds $(ZONETABLES) +AWK_SCRIPTS= checklinks.awk checknow.awk checktab.awk leapseconds.awk \ + ziguard.awk zishrink.awk +MISC= $(AWK_SCRIPTS) +TZS_YEAR= 2050 +TZS_CUTOFF_FLAG= -c $(TZS_YEAR) +TZS= to$(TZS_YEAR).tzs +TZS_NEW= to$(TZS_YEAR)new.tzs +TZS_DEPS= $(YDATA) localtime.c private.h \ + strftime.c tzfile.h zdump.c zic.c +TZDATA_DIST = $(COMMON) $(DATA) $(MISC) +# EIGHT_YARDS is just a yard short of the whole ENCHILADA. +EIGHT_YARDS = $(TZDATA_DIST) $(DOCS) $(SOURCES) tzdata.zi +ENCHILADA = $(EIGHT_YARDS) $(TZS) + +# Consult these files when deciding whether to rebuild the 'version' file. +# This list is not the same as the output of 'git ls-files', since +# .gitignore is not distributed. +VERSION_DEPS= \ + calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \ + africa antarctica asctime.c asia australasia \ + backward backzone \ + checklinks.awk checknow.awk checktab.awk \ + date.1 date.c difftime.c \ + etcetera europe factory iso3166.tab \ + leap-seconds.list leapseconds.awk localtime.c \ + newctime.3 newstrftime.3 newtzset.3 northamerica \ + private.h southamerica strftime.c theory.html \ + time2posix.3 tz-art.html tz-how-to.html tz-link.html \ + tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ + workman.sh zdump.8 zdump.c zic.8 zic.c \ + ziguard.awk zishrink.awk \ + zone.tab zone1970.tab zonenow.tab + +all: tzselect zic zdump libtz.a $(TABDATA) \ + vanguard.zi main.zi rearguard.zi + +ALL: all date $(ENCHILADA) + +install: all $(DATA) $(REDO) $(MANS) + mkdir -p '$(DESTDIR)$(BINDIR)' \ + '$(DESTDIR)$(ZDUMPDIR)' '$(DESTDIR)$(ZICDIR)' \ + '$(DESTDIR)$(LIBDIR)' \ + '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \ + '$(DESTDIR)$(MANDIR)/man8' + $(ZIC_INSTALL) -l $(LOCALTIME) \ - -p $(POSIXRULES) \ + -t '$(DESTDIR)$(TZDEFAULT)' + cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.' + cp tzselect '$(DESTDIR)$(BINDIR)/.' + cp zdump '$(DESTDIR)$(ZDUMPDIR)/.' + cp zic '$(DESTDIR)$(ZICDIR)/.' + cp libtz.a '$(DESTDIR)$(LIBDIR)/.' + $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a' + cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.' + cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.' + cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.' + +INSTALL: ALL install date.1 + mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' + cp date '$(DESTDIR)$(BINDIR)/.' + cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.' + +# Calculate version number from git, if available. +# Otherwise, use $(VERSION) unless it is "unknown" and there is already +# a 'version' file, in which case reuse the existing 'version' contents +# and append "-dirty" if the contents do not already end in "-dirty". +version: $(VERSION_DEPS) + { (type git) >/dev/null 2>&1 && \ + V=$$(git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty) || \ + if test '$(VERSION)' = unknown && read -r V <$@; then \ + V=$${V%-dirty}-dirty; \ + else \ + V='$(VERSION)'; \ + fi; } && \ + printf '%s\n' "$$V" >$@.out + mv $@.out $@ + +# These files can be tailored by setting BACKWARD, PACKRATDATA, PACKRATLIST. +vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS) + $(AWK) \ + -v DATAFORM=$(@:.zi=) \ + -v PACKRATDATA='$(PACKRATDATA)' \ + -v PACKRATLIST='$(PACKRATLIST)' \ + -f ziguard.awk \ + $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ +# This file has a version comment that attempts to capture any tailoring +# via BACKWARD, DATAFORM, PACKRATDATA, PACKRATLIST, and REDO. +tzdata.zi: $(DATAFORM).zi version zishrink.awk + read -r version $@.out + mv $@.out $@ + +tzdir.h: + printf '%s\n' >$@.out \ + '#ifndef TZDEFAULT' \ + '# define TZDEFAULT "$(TZDEFAULT)" /* default zone */' \ + '#endif' \ + '#ifndef TZDIR' \ + '# define TZDIR "$(TZDIR)" /* TZif directory */' \ + '#endif' + mv $@.out $@ + +version.h: version + read -r VERSION $@.out + mv $@.out $@ + +zdump: $(TZDOBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) + +zic: $(TZCOBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) + +leapseconds: $(LEAP_DEPS) + $(AWK) -v EXPIRES_LINE=$(EXPIRES_LINE) \ + -f leapseconds.awk leap-seconds.list >$@.out + mv $@.out $@ + +# Awk script to extract a Git-style author from leap-seconds.list comments. +EXTRACT_AUTHOR = \ + author_line { sub(/^.[[:space:]]*/, ""); \ + sub(/:[[:space:]]*/, " <"); \ + printf "%s>\n", $$0; \ + success = 1; \ + exit \ + } \ + /Questions or comments to:/ { author_line = 1 } \ + END { exit !success } + +# Fetch leap-seconds.list from upstream. +fetch-leap-seconds.list: + $(CURL) -OR $(leaplist_URI) + +# Fetch leap-seconds.list from upstream and commit it to the local repository. +commit-leap-seconds.list: fetch-leap-seconds.list + author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \ + date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \ + git commit --author="$$author" --date="$$date" -m'make $@' \ + leap-seconds.list + +# Arguments to pass to submakes. +# They can be overridden by later submake arguments. +INSTALLARGS = \ + BACKWARD='$(BACKWARD)' \ + DESTDIR='$(DESTDIR)' \ + PACKRATDATA='$(PACKRATDATA)' \ + PACKRATLIST='$(PACKRATLIST)' \ + TZDEFAULT='$(TZDEFAULT)' \ + TZDIR='$(TZDIR)' \ + ZIC='$(ZIC)' + +INSTALL_DATA_DEPS = zic leapseconds tzdata.zi + +posix_only: $(INSTALL_DATA_DEPS) + $(ZIC_INSTALL) tzdata.zi + +right_only: $(INSTALL_DATA_DEPS) + $(ZIC_INSTALL) -L leapseconds tzdata.zi + +# In earlier versions of this makefile, the other two directories were +# subdirectories of $(TZDIR). However, this led to configuration errors. +# For example, with posix_right under the earlier scheme, +# TZ='right/Australia/Adelaide' got you localtime with leap seconds, +# but gmtime without leap seconds, which led to problems with applications +# like sendmail that subtract gmtime from localtime. +# Therefore, the other two directories are now siblings of $(TZDIR). +# You must replace all of $(TZDIR) to switch from not using leap seconds +# to using them, or vice versa. +right_posix: right_only + rm -fr '$(DESTDIR)$(TZDIR)-leaps' + ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \ + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only + +posix_right: posix_only + rm -fr '$(DESTDIR)$(TZDIR)-posix' + ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \ + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only + +zones: $(REDO) + +# dummy.zd is not a real file; it is mentioned here only so that the +# top-level 'make' does not have a syntax error. +ZDS = dummy.zd +# Rule used only by submakes invoked by the $(TZS_NEW) rule. +# It is separate so that GNU 'make -j' can run instances in parallel. +$(ZDS): zdump + ./zdump -i $(TZS_CUTOFF_FLAG) "$$PWD/$(@:.zd=)" >$@ + +TZS_NEW_DEPS = tzdata.zi zdump zic +$(TZS_NEW): $(TZS_NEW_DEPS) + rm -fr tzs$(TZS_YEAR).dir + mkdir tzs$(TZS_YEAR).dir + $(zic) -d tzs$(TZS_YEAR).dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out + x=$$($(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \ + tzdata.zi \ + | LC_ALL=C sort -t . -k 2,2) && \ + set x $$x && \ + shift && \ + ZDS=$$* && \ + $(MAKE) TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \ + ZDS="$$ZDS" $$ZDS && \ + sed 's,^TZ=".*\.dir/,TZ=",' $$ZDS >>$@.out + rm -fr tzs$(TZS_YEAR).dir + mv $@.out $@ + +# If $(TZS) exists but 'make tzs.ck' fails, a maintainer should inspect the *** 1838 LINES SKIPPED *** From nobody Wed Mar 11 07:21:23 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fW2HD5B7dz6Vvqs for ; Wed, 11 Mar 2026 07:21: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fW2HD4D7Fz3WLj for ; Wed, 11 Mar 2026 07:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eh/0YyDRrc2p+Cg/+YqBUxOlh6YHvz1RY9eEYlDpt5g=; b=u3hoWs/g0at18PdBTl+oMwk9gL7VbvNJ3Bfvg+k42ZncwrR0PBg2bxFspI4arMMzGLX8kN Q5luTyAM9pk7omLovjq9bTVxTLGZkBoa66kXIxFkZNLSteGtB2dOsgZ0gp1OToqU+ZXoRI X7yhXHLPqjb7lNvrsJfJng34MQgNxUSYRwUKp1rhru9S8ZRnKJqoDW+97waml8LtO8qTbF lcg/0tmUtFz8wIrpFegrOz7BbXc5vGqj+M+A+KMzYsUKMnBl1iO0Jr5mNUT8unFPbMzG// qBeCqycx1qn8d8WdI321AormlAe8aTZssDezCYvNekuJaZ0Lbl3FHpDYH5gxbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773213688; a=rsa-sha256; cv=none; b=X1RvjiEhfkD+Drr6502UFoonQ+hw9gVEUMlMgVgkQav0U9ZZg5OSbhF8ssu6yJ8aOchJAK IwAiRhu9cxufkN89NHncNtZ2pkbZz0Gx4ZQIBBdtD42VcLa5Dt21X0WjXc/Qrwlq/myCw+ FIeT8Jl2mXB0nIz9F9wouEJW7LXi9YyoaAXjTsEBEzmHOzF7Hu/+4i2wS1mu7GaFkeip85 Xd3WJ0JYQIm0mIzX92dyPNy+FyFZaT/OHo4pSs9M3/87idRObH3pYJg96ju8eE23QgYcKd NoM1Apw1gA5qJZxmyRlfer71eX7AnVVSaH/URx19pRXJnLI9MayxjOdAiF+8HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eh/0YyDRrc2p+Cg/+YqBUxOlh6YHvz1RY9eEYlDpt5g=; b=vmWQ9UxI0tXK5xY7KcRV8RUCigIIhOrwwZN3ViP1ndLg9wcy4mXHUVl4FQAKBIKeCEccTQ EpZGRHiegDFfvQCsngPPDS2X1Vt/zyJV+OfI+OV8BR+y5M0tCj6AQ9Feh9pe5x/aYuV4e1 gQI47R7oYBFvfXZR5pmZF9Wt6bbJGghFPknpKTOhNbMaC+eL4cc/3Y5FFn6qFyjf5XEr6I 9qZqwliYo5Fr7KNKcqxIK8IkJP4keqEZMdCTuee6e1zaA5zsH4H0DyTqkaw3k+Ky7zaqBc m1Exhtrc+JgaskKgIjj+0ryB49nlyUX/2WBA8xU43x+feLjAcwB0AUlYQYkdSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fW2HD3gnvzpZQ for ; Wed, 11 Mar 2026 07:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30e11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 07:21:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 077da2a9e37c - stable/15 - me.4: MFC: link if_me kernel module to its manual page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 077da2a9e37c7734e7c527c7d184b3ad8c61f31f Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 07:21:23 +0000 Message-Id: <69b117f3.30e11.159f6926@gitrepo.freebsd.org> The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=077da2a9e37c7734e7c527c7d184b3ad8c61f31f commit 077da2a9e37c7734e7c527c7d184b3ad8c61f31f Author: Eugene Grosbein AuthorDate: 2026-03-04 07:29:26 +0000 Commit: Eugene Grosbein CommitDate: 2026-03-11 07:19:59 +0000 me.4: MFC: link if_me kernel module to its manual page. (cherry picked from commit 46ba263d6eeb1c6029841b4c42f54912ad61de5c) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2b3bf620fe48..47e624f9c014 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -758,6 +758,7 @@ MLINKS+=lge.4 if_lge.4 MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 +MLINKS+=me.4 if_me.4 MLINKS+=mem.4 kmem.4 MLINKS+=mfi.4 mfi_linux.4 \ mfi.4 mfip.4 From nobody Wed Mar 11 07:22:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fW2Hy18zcz6VvcG for ; Wed, 11 Mar 2026 07:22: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fW2Hy0Gghz3WYR for ; Wed, 11 Mar 2026 07:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gR6wWriBtiS1/oXLWqXdySeCxwnb27WaomdbN1Vcg+g=; b=cO0tKGhqkiWHeiFDtpJiIGR3OJYBVufRJZboFOImvcEDsItmCVdXbj/geD0klX0suZRTs3 9PvMIexXliAvaseZsQt/DQ26icEGJ7I6SL9924Hl115xoO/rV2P2MgVKGyeD4jlry371Tj YNgY4POmyLqpLVyu/kKFLVzZHuEM/96KXAsLEK3HIscBROI1Z1GlE7fnfytOsUtayzOq9U pD6Y7OkL3+4f2LH+Z6NfWVGczvD3GFWNFNhU8U9H1BpNCN/LrTW6yrcnhg/m9JfhfAOety 6lUP5SfB1k4ZFd6RX5wvkJn3w1mZrSNhzzRF/s59JMYrY7Rgv1IBjA6hE18SrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773213726; a=rsa-sha256; cv=none; b=wFC1gj2KxzQtdPIkvPbiZ4K1ykeg4c8osZfUDlkKSsohP4oy72LUWhQMf58Ta4AxJKQWIq b6Ny9eATDcT8gHrom4hLJNzXDOOvy6ErEgXBugbM74wKIKNfEbuE+RLlAFYRopNLDq+0Qr D+yoI8xto5JVtDNXlwWumdwxkUz5xaWxSNl2IF6+INfXiYvvl9UtJinN5dGrzD94bwcwFj rWw3+YJDBfjvidoXiEklPcpHy/VF/5r91CDD7qxvMWnwvzX0GHY4JozKOI8SKpXujSueeH aeaL4ZAfleocFfYp9hNkKgIX8GM2A7Xf3XaMf5GP0Jzzj929WB1LcIW85aPgHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gR6wWriBtiS1/oXLWqXdySeCxwnb27WaomdbN1Vcg+g=; b=iWWgxODURotLk0BU8+nOE0EUeyRkqrdswpr5vyXhxSXohWgYSaDEwLTAE5Ao8/fG96PQLq HdLkgYdgRo1WFpoZ8fY75tw13qUujGqY5YEwlumyXmDvEbXYlH6+irnFjV+k43bAtP1rAM N4x7iXokVSFutu3JyT3IXDx8Nof7B0OIRnOeFqhaX7dlLuX7V5pXvIFdBfqiBY7BUu4Nu/ yJwBmLI18d005X1xauijTSiHmKeTe5op18efWVfZvYMb4lqRPKDPfCftJQbSaHWunSIR4O y4MIryPk9y0wd66/y8jktczCflDs/S5Tlz3USFCtWWUJ1vr9u0YzLlQ5MdwA0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fW2Hx6qzxzpvs for ; Wed, 11 Mar 2026 07:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27df5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 07:22:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 51ffffe9be91 - stable/14 - me.4: MFC: link if_me kernel module to its manual page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 51ffffe9be917a001dd61be91464aa4aad8f7d84 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 07:22:05 +0000 Message-Id: <69b1181d.27df5.6bbca99f@gitrepo.freebsd.org> The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=51ffffe9be917a001dd61be91464aa4aad8f7d84 commit 51ffffe9be917a001dd61be91464aa4aad8f7d84 Author: Eugene Grosbein AuthorDate: 2026-03-04 07:29:26 +0000 Commit: Eugene Grosbein CommitDate: 2026-03-11 07:21:45 +0000 me.4: MFC: link if_me kernel module to its manual page. (cherry picked from commit 46ba263d6eeb1c6029841b4c42f54912ad61de5c) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2db6e350a401..eba7fe341c8a 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -722,6 +722,7 @@ MLINKS+=lge.4 if_lge.4 MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 +MLINKS+=me.4 if_me.4 MLINKS+=mem.4 kmem.4 MLINKS+=mfi.4 mfi_linux.4 \ mfi.4 mfip.4 From nobody Wed Mar 11 07:23:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fW2Km0YTnz6Vw3l for ; Wed, 11 Mar 2026 07:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fW2Kl547hz3Wy1 for ; Wed, 11 Mar 2026 07:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EMtGR0uKLDdU+v4WEOUGWIvXBpVdbJXJ3T51EcpbXdA=; b=GIyRfL+UiDa2+rjVVfJoJEOG/NekWFfveGO8/potj9CAEj9gXX6c/ARLGRyWShDzdaeXAb jczGOeeKxmjlqbde0yt6BS+vm1m0QoPRcbNx2Y9FtxoyXDCpXXbPgonDhJxjmoRNXJ+47z CEOUxaXCfG91Sxt4TKx1Uo61oumU2ODuONPjnRmDoT1jp6X41t7cRDpCeiylVGXHziH6xq MlKY1l4FQW99a6VGaLbwdJlONgMa3IjTiYddq8dWWCTzLnpvC02h389QaVbN+/LHbrcdL0 gzKQpiOXqMMXkxkdbvW1s9lx/rpOuZnISYCpJledG8qem/iyunpkDz3M5E/hZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773213819; a=rsa-sha256; cv=none; b=lCJ+sbfcCNXsFgq44t2ZBQxGFL/ctAsMEmPnuYrcTugB4MKbOs8lb71ZLaEtH2Y8FzIuQA 5A6DL+XNNEC5fmMdOpzifCUGc97vog+3CDsdf9xmzp4zrrte4PgayiRJT+4D7m/bdHyrRw DQJ8jcPpnM6hwu0+TkXQQWrOGB52kyoncCmt6NEIBl1uA6EudBFCkZQntWMNVvsXFtvs8X zjVxdJt0AGEyApDEya+nBFFGyB2cw4n4zVD5NxYtvpHHiZrNwzj0AGtDilOxgEpt7GLTXd kikgpeUz4HDoyIOjSaxyjgDWAuJypwgpfDsqWm9da3gzPzLK2KtL2Uk4NL1ogA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EMtGR0uKLDdU+v4WEOUGWIvXBpVdbJXJ3T51EcpbXdA=; b=T2cTOrieVk2loUPxihz15tI2LIan/Xt4sug/9W9Q5UGhPa0pE2Qg2tTRP2uwJ3Tk/5Byph QBeV+YcxuRyVMZ1+uqL1ecRL580JwakLnW3n7Q69o5tPmF1FMxKQKsvcbxUDGiPUA2s6AW nYejacFbV7Mw/cqHEJaqs1zEtxAjhfeiB9Asts+TnLRm8xEIvjhEoqeN1987vyD8xyLjJG Prwiz4Sl2+roNcCXoKQE/nZuedbMOtdF9wlD+Zxsa2n/i6CkeJ6NojocmbRY20khppbSbC a7JdvXGVJjfNhDZpjk8FXT/I5E0TxG08mvBoUa6gzjQencsbZBBttEisQyEZrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fW2Kl4TDSzpvw for ; Wed, 11 Mar 2026 07:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 311ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 07:23:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 242346cb89f8 - stable/13 - me.4: MFC: link if_me kernel module to its manual page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 242346cb89f8d4ca97d933fc215bf2cf25f2ed0b Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 07:23:39 +0000 Message-Id: <69b1187b.311ea.7b49608@gitrepo.freebsd.org> The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=242346cb89f8d4ca97d933fc215bf2cf25f2ed0b commit 242346cb89f8d4ca97d933fc215bf2cf25f2ed0b Author: Eugene Grosbein AuthorDate: 2026-03-04 07:29:26 +0000 Commit: Eugene Grosbein CommitDate: 2026-03-11 07:23:00 +0000 me.4: MFC: link if_me kernel module to its manual page. (cherry picked from commit 46ba263d6eeb1c6029841b4c42f54912ad61de5c) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 5ea51eb02eb0..55acde8c7f30 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -733,6 +733,7 @@ MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 MLINKS+=md.4 vn.4 +MLINKS+=me.4 if_me.4 MLINKS+=mem.4 kmem.4 MLINKS+=mfi.4 mfi_linux.4 \ mfi.4 mfip.4 From nobody Wed Mar 11 12:28:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fW95s0PCgz6V602; Wed, 11 Mar 2026 12:28:49 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fW95r6yTqz43Yx; Wed, 11 Mar 2026 12:28:48 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773232129; 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=mjEBDVfahUx8rfxaEyl256KX/MzSOdRmatboVocIXeI=; b=gOKOKmrTMC5d26hw9SBe1X4WbxtdMCIMNY+HBYZfouAfV/evb9mRXdFFbUk0ZXBmv2AxJv slIgfqd2NePz2BN+SDYQ306MR/wR+NZT+LayQ88thab3RjVStJAkFZImfOPZ9to9uBBYD5 jwJBCXdmzO0aIpp7DajH3VNVhViyYKidD0PieAblr7iyca7PLPprzafKrpW7y+UpXbOgcU 3qcFq5ey9A1LnhkabMoUBU20DgRLmlsPtVTjKWJkAf0SK6l5KBM9kdE93zChvdleOTn4ke Y+W6Gpcq/idX1G3thdo/WbWJ0aMO1xM3airnHNXxFQW4Tk1Z6180p8rF3rSr3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773232129; a=rsa-sha256; cv=none; b=RtxmFMGxXGUa0SUQ3GB+LWf9Kv0CSh6zapNgSadCpxDjOztF8EXlUoTJ77m3KVU8ZjW27R zTfaqZTDSLurcx+N7vnew1SYo0oCER+4qeeeeVvIfacDM2rVnX5ASTsqZs52Z4vmyZBr5P 7Km4xUhsXDtJ191NQwsm8xTAD9jexXc8rdjJh24SFKbKlPvjOOjuP84IDT6k85Mfl/BAxF 4eQoOvUEUiwWbvvykS4jfMEstjG4jbyPj0hwqYCw+UwIXL0Xq8tLsPtDwTAGjqKcRwKaHf RunAweuh6Jrn/AXG3ko1kjr5uNuCXSJnDjNbx5px/iAAGqKQwvYh668VJNi7Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773232129; 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=mjEBDVfahUx8rfxaEyl256KX/MzSOdRmatboVocIXeI=; b=pRT3hENk9M2U/7pgPuJSUG6T+hQqPUoyStvmyoP0TWYJg9Aw57BdC4LOKifB1ozyvjMcI5 tl3MaUaRXEEvxPDqONHR7c47uR+H1NLwlF2uQhFzaX1E96GyUIKrtxNnmBjXTfgkqGjGuK waX07DQV8endiwuskug0dAnWKpBaVeZu8EElNnF5xmUJXbMl7Ke309WCC1EKFqe0tXnZAz PA4SSt/adylpP547Z5PtloeoOulQBQG7lvCgMjaEdkIVosh88amb/07CXEKCpM17UzMrg/ UNfalVXwhQC8C+v4aBanubOYRcpxHzAjkfZ6Pngs2sSLTO68dZTJNQgUXOPryw== 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 4fW95r5XZVzPTB; Wed, 11 Mar 2026 12:28:48 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 629C81234DB; Wed, 11 Mar 2026 13:28:47 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, Hans Rosenfeld Subject: Re: git: 2a514d377b37 - main - bhyve/virtio-scsi: Preallocate all I/O requests In-Reply-To: <86zf4igufb.fsf@ltc.des.dev> ("Dag-Erling =?utf-8?Q?Sm=C3=B8r?= =?utf-8?Q?grav=22's?= message of "Sun, 08 Mar 2026 17:25:28 +0100") References: <69a86c2c.3eae0.6544adfe@gitrepo.freebsd.org> <86zf4igufb.fsf@ltc.des.dev> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 11 Mar 2026 13:28:47 +0100 Message-ID: <86bjguh7nk.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dag-Erling Sm=C3=B8rgrav writes: > Ed Maste writes: > > + assert(iov_to_buf(req->vsr_iov_in, req->vsr_niov_in, > > + (void **)&req->vsr_cmd_rd) =3D=3D VTSCSI_IN_HEADER_LEN(q->vsq_sc)= ); > This assertion breaks the gcc build. It's been a week since this was committed. It still hasn't been fixed and is causing Jenkins to nag everyone who commits anything to main. Please attend to it. As a reminder, you can install an alternate toolchain (e.g. amd64-gcc15) from ports or packages and run either make buildworld WITHOUT_TOOLCHAIN=3D1 CROSS_TOOLCHAIN=3Damd64-gcc15 to build world with that toolchain, or make buildenv CROSS_TOOLCHAIN=3Damd64-gcc15 to get a shell in which `make` will use that toolchain instead of the default. Simply running `make CROSS_TOOLCHAIN=3Damd64-gcc15` in `usr.sbin/bhyve` will not work; you need the full environment. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Mar 11 12:58:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fW9mM2Npcz6V7jL; Wed, 11 Mar 2026 12:58:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fW9mL6qLyz475K; Wed, 11 Mar 2026 12:58:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773233923; 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=6JJiPYPEPYE9QEy6Mn1krK3K3Hdt+lND8oZmyxxuvh4=; b=QjzQ6Y1GQnkCgBaeCak0aZnSAMhGVPcV/70SO+HvKiSKF2qho0E1Caxm/7CRuRiFVV49vz gHMNknrL5UiOXMoevjCip7SMlwfeXf3iFL/cMrn/zJkzE7WhwmvWQBZ2HCjvjmmv2WNLTC G+B8Fn1HFfU7sVTHEJU3dFEO/tKgLvpHV8dpZpPzQycIdyO48dK5CEvCXNNOYS2mCMji0K m9P65q5XAkUEhLwx1VoZBXobNjyWvbUhHRZXRCZmhllV4UFJDjDXCVv0RuZBz/5Vxcjrpk 5JFqgr4iSl5d+cLlcoq7Xiq+wTa6vzLUbJn/RMkROLfIJyJGEZiP5adiv0TuGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773233923; a=rsa-sha256; cv=none; b=kqX02tqNbQhgZzNwhMYE1wx5ZLVonyj0tJnkhT3BHPGYLWl1Gylj9VdjbGdC3iCMwHVqDK MAKXwnpIsaP5ZaSxLlPLmCWD9XHxAQm5B+2MyUyAuTiJOwHkFMGKY8zTJC+ULa6yKHReJU /EQ3vR9A267+1I8O/gxSpF5fFMAvAkNG5pzC4vg850WY1rOdmAJUxsaQz16lmfpujldf2X cG8wsZschsObartHaNMRNQOa5QB877Al8CIc7KMuQtQzbuolkuHlOjmlhAjbu72opagS17 wShq5Ogz1IcA/CjD0BhPN0alR+NxI7epptoPJyfle2Zx/T3HZMyQgxjmhZzp8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773233923; 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=6JJiPYPEPYE9QEy6Mn1krK3K3Hdt+lND8oZmyxxuvh4=; b=MSbbKOeinwXK8BKUC4udga71oth3m+nw9vDyLRp4eQhOR5K5t0+bAwa9rQBZ/zOHnE+9MT LpjbF/1TasQ7PrxEStf5GCVa7p2EqLdzkX1kNRfKGCyIZUbmsqv5462UhaLvlldNsivRJq IsRIqjPgkRNxfTy4nimXmYJl1E39yYKVlSK/dRRvz4YTgKU4tgL1bHly4W32VdCeykyfNd yAyL29ipCkgnA8il2djxnSCPyY3/wr8Do/7Meq1O7wwR36v2E6VYsCzf9EoCYpLG2FmFBl AT6sBkAVFf+ziHhnE/wwdVl/95imaWYIWNPh28hygFbQA/GBDQzHPlbhpVOzuQ== Received: from [IPV6:2601:5c0:4202:5670:41db:1f31:9abb:a71c] (unknown [IPv6:2601:5c0:4202:5670:41db:1f31:9abb:a71c]) (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 4fW9mL4LnPzNCP; Wed, 11 Mar 2026 12:58:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <2da8e812-9e49-48c2-92e2-d421f74c178e@FreeBSD.org> Date: Wed, 11 Mar 2026 08:58:41 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 2a514d377b37 - main - bhyve/virtio-scsi: Preallocate all I/O requests Content-Language: en-US To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, Hans Rosenfeld References: <69a86c2c.3eae0.6544adfe@gitrepo.freebsd.org> <86zf4igufb.fsf@ltc.des.dev> <86bjguh7nk.fsf@ltc.des.dev> From: John Baldwin In-Reply-To: <86bjguh7nk.fsf@ltc.des.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 3/11/26 08:28, Dag-Erling Smørgrav wrote: > Dag-Erling Smørgrav writes: >> Ed Maste writes: >>> + assert(iov_to_buf(req->vsr_iov_in, req->vsr_niov_in, >>> + (void **)&req->vsr_cmd_rd) == VTSCSI_IN_HEADER_LEN(q->vsq_sc)); >> This assertion breaks the gcc build. > > It's been a week since this was committed. It still hasn't been fixed > and is causing Jenkins to nag everyone who commits anything to main. > Please attend to it. > > As a reminder, you can install an alternate toolchain (e.g. amd64-gcc15) > from ports or packages and run either > > make buildworld WITHOUT_TOOLCHAIN=1 CROSS_TOOLCHAIN=amd64-gcc15 > > to build world with that toolchain, or > > make buildenv CROSS_TOOLCHAIN=amd64-gcc15 > > to get a shell in which `make` will use that toolchain instead of the > default. Simply running `make CROSS_TOOLCHAIN=amd64-gcc15` in > `usr.sbin/bhyve` will not work; you need the full environment. There are fixes in active review (I commented on the reviews yesterday). -- John Baldwin From nobody Wed Mar 11 13:16:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWB926ffzz6V964 for ; Wed, 11 Mar 2026 13:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWB925xvTz49cj for ; Wed, 11 Mar 2026 13:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773234998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xb4AMyr5jp77TO4Rbjp+IoBJHfCYKvDQfGJVAe+HVlM=; b=o2WOBCkzxktnHFT20dOuSgXrggMEfTZqOCplKDPPnal2OlcnR/Y9s8YcLdcd5w8TsfxrV8 rdTVGSy1h2MW1lqMWQ+w4d1cnevgf4nUWz64j8TdahP2fhzBtFsJXoabmVNZL47JihRG9V K/csRyhrqqt/6Q7V0p3WfjOEPbSU9C8+odWbwWdneFeQQLFs1Ejx3Tv6pBWjbsqp2zZG/L MAwDNe85flb44kiR/QD8ej8HhhMyesLD7ZzxQFQHY1Ey5z+8Bb0pYyKPtxpBPsN62jT93e 1Yp8m8xKmRSFGKK2OHouX+xvv3oSon04RdKWAntMN6f53tlajB7bDg5uwF2rEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773234998; a=rsa-sha256; cv=none; b=oehuXn+16u5InzIYtEkwb71Xh03GF48SyHliCcZTd/XD/z3cD7M2oGixxBeAeOsxawO4F4 ZnG9ahhxUIFhvgOr/LeazOjErLHWFeWxf/Pw5uHIFQ3fczZLuCtllGgQEJUTrnremcYSPO Bl+76chnoY9CAsM2g98btJ+tUP3EKoNiJ6Yf7iGfeY8+XEODDEhwqYqz3y9J1IKiDHr3Bd 8lwoVqUSvSCfkgtFSfTuGIJEpZ5VQHiZ/sopU16yGomEYppGwkQm2nwWa/c+jNrGdrcjrh 01ydO1j8a9bXtwK6JLZKegJSa00t0IswWTOVSrXHKSsRix/gDYLnILO4O6kVlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773234998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xb4AMyr5jp77TO4Rbjp+IoBJHfCYKvDQfGJVAe+HVlM=; b=XFz3YpSlwfQPXMxtb4kd58idbABg2ZYmGt7hT0N9/mvAuRVVzapH6Qzdx6V4/rPWqNE0kk be2o8JYBZR+vIh2pKNG71+zauDTEJVEWZdNwrMeGcm/zWEErIffAwnaqOEvDseIqGlky+U 1p7nTU7IbhBZaymxpmOhdJO/MsQf/jIR2mxnG55KI0DzBcfgIHL55EHOkuhrOKchZd3clm NHdQai4TW3d/5YjsvZR6Bu/UDopgj9hFsekcUII7BZko5VXkDIjfZ7XZeaUFMmgSNkZBEA 3hX09U3nrZVPGk2tI3kjrErZE/HqYthHW+GFWXXsuHbPxyCZ8xA82Wv8gRyedw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWB925Pcdz114j for ; Wed, 11 Mar 2026 13:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 275ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 13:16:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3d394a1da079 - stable/15 - system(3): Unwrap execve() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 13:16:38 +0000 Message-Id: <69b16b36.275ef.6ffc5448@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 commit 3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-04 15:22:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-11 13:16:00 +0000 system(3): Unwrap execve() There is no need to call execl(), which will allocate an array and copy our arguments into it, when we can use a static array and call execve() directly. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55648 (cherry picked from commit 40e52e0edd038460a2a2aca017b3ac5a513fe37b) --- lib/libc/stdlib/system.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c index 94f7460c9b68..a2f472502bfd 100644 --- a/lib/libc/stdlib/system.c +++ b/lib/libc/stdlib/system.c @@ -60,6 +60,8 @@ __libc_system(const char *command) static struct sigaction ointact, oquitact; struct sigaction ign; sigset_t sigblock, osigblock; + char *argv[] = { "sh", "-c", __DECONST(char *, command), NULL }; + extern char **environ; int pstat = -1, serrno = 0; pid_t pid; @@ -101,7 +103,7 @@ __libc_system(const char *command) /* * Exec the command. */ - execl(_PATH_BSHELL, "sh", "-c", command, NULL); + _execve(_PATH_BSHELL, argv, environ); _exit(127); } else { /* parent */ /* From nobody Wed Mar 11 13:16:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWB940kcHz6V9Cx for ; Wed, 11 Mar 2026 13:16: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWB936d11z49FY for ; Wed, 11 Mar 2026 13:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773235000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kiM76rDd+YLgKTUk9AnnkRW8sWLmS62bkg5bERT+3kc=; b=yNWuF0ByPelx1OsENFmfmywtA0DcucdSeeJIam7Bfhqdu8CnA1bSbmkL0BQdSfJTFTpoqo GFldmw67qWEpjPx5fIPbLgkwDhbK42SVfw3ItFArsYz4PYS/oIxLYqvMA/+1XQnWZFZrbY ivpiIX58F7l0CGhZA7jz5eOG2aQ+mhkEMwZx3ww09Qol3tj786Z3q275eTPtAzveBHQ7vw LwSl9d4/tn3OH+T54LtGup5Av9Xh96noEgm4dwDiQ/4JH6eSZAhC4bp/1kcD+dM43+Rgrp krIL+isPvRULFNNMSrb+gxzE2QTjuBFEEYHFGICfOwzk5ndnQ5lLiA2Kd4JxpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773235000; a=rsa-sha256; cv=none; b=x+VR97BybKDuAOp8PgnalPXLulGAv7N8gueWz2hOkVY0nVf9gm3jdI1T1U2J4zkPiiRJFL cLb1TwbSNdF9Lx2msXBYJ4RTLiaQH5TeFj9L9CVwjQOLcBaQ5rt+3oDh0zGNAtg6rotkbg OIldn3eWaxVXCdI9qxAAfXHbYvD3ibkF+fDvlzvOCjV+thcM808iWfhf/xjB8PbwVcWQwn 57sMZv7Rv5GYbXUdtEJpY2/dvN6Dw9X+AWVSqePS4huE/FiBzJ6dgFPy55l1QU1utroEE5 3LNtniyZif2zebc38XqJ1FTWZ9PG9MdMIdm27ixW6SuoDrPk7HmwSUpnO9bGGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773235000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kiM76rDd+YLgKTUk9AnnkRW8sWLmS62bkg5bERT+3kc=; b=yJvRHrHaDBEl4kaapDAlfTxmYTr3u7LrWyEwqrBaGH6U1LkGnxGUsUxcBPT8tiYHW49ufY nd859wLN14fNvPgkglc81Tq8SC4+WHHVHuch9YnN6+TGGA2T0QWrCQpjjev1wVznQlJBxt B+fGjLmn014w7WvFKf2DHz7GdDYfyX5WVB59UTpPZ6UdX63aSnQti+5VUzjlGifX7ErNNo uy/0anxx6aMZIlQKSkOYu9/rXUQpcvFSYNJDV0wTZKv6eug5lz3zoC4BQSpJ5a3aFcwliy 3jdgU2HsusyH9VZ6jDhPl0Dz1R0RjAAj83jicKfa70TqP0AbjdXy2Z9igiRI6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWB936D40z10Zm for ; Wed, 11 Mar 2026 13:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ac0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 13:16:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c4c375354287 - stable/15 - system(3): Address test robustness issue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c4c375354287d6eb9fa71ebb5d9fd6a765faf795 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 13:16:39 +0000 Message-Id: <69b16b37.25ac0.41aa2574@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c4c375354287d6eb9fa71ebb5d9fd6a765faf795 commit c4c375354287d6eb9fa71ebb5d9fd6a765faf795 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-09 20:41:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-11 13:16:10 +0000 system(3): Address test robustness issue Don't assume that SIGINT and SIGQUIT are set to SIG_DFL at the start of the test. Instead, retrieve their current dispositions and verify that they are restored at the end of the test. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55709 (cherry picked from commit 48368f702423742b2a7dff7ad3191625e8bf26f0) system(3): Fix brain glitch in previous commit We were saving SIGINT twice instead of SIGINT and SIGQUIT. Also restore original order of operations (SIGINT then SIGQUIT), which matches the order in which they're discussed in the POSIX description of system(3). MFC after: 1 week Sponsored by: Klara, Inc. Fixes: 48368f702423 ("system(3): Address test robustness issue") (cherry picked from commit 863b5c137a98d29dc6964cba0e0c4fe2a8bebab8) --- lib/libc/tests/stdlib/system_test.c | 38 ++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/lib/libc/tests/stdlib/system_test.c b/lib/libc/tests/stdlib/system_test.c index b6a31583d52d..9e556f257791 100644 --- a/lib/libc/tests/stdlib/system_test.c +++ b/lib/libc/tests/stdlib/system_test.c @@ -92,6 +92,12 @@ system_thread(void *arg) return ((void *)(intptr_t)system(cmd)); } +static inline int +sigcmpset(const sigset_t *a, const sigset_t *b) +{ + return (memcmp(a, b, sizeof(sigset_t))); +} + ATF_TC(system_concurrent); ATF_TC_HEAD(system_concurrent, tc) { @@ -99,7 +105,8 @@ ATF_TC_HEAD(system_concurrent, tc) } ATF_TC_BODY(system_concurrent, tc) { -#define N 3 + enum { N = 3 }; + struct sigaction sigint, sigquit, sigact; sigset_t normset, sigset; pthread_t thr[N]; char fn[8]; @@ -119,8 +126,10 @@ ATF_TC_BODY(system_concurrent, tc) ATF_REQUIRE_EQ(0, symlink(fn, fn)); } - /* Get the current and expected signal mask */ - sigprocmask(0, NULL, &normset); + /* Save the current signal dispositions */ + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigint)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigquit)); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &normset)); /* Spawn threads which block on these files */ for (int i = 0; i < N; i++) { @@ -140,10 +149,12 @@ ATF_TC_BODY(system_concurrent, tc) /* Release the locks */ for (int i = 0; i < N; i++) { /* Check the signal dispositions */ - ATF_CHECK_EQ(SIG_IGN, signal(SIGINT, SIG_IGN)); - ATF_CHECK_EQ(SIG_IGN, signal(SIGQUIT, SIG_IGN)); + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); #ifndef PROCMASK_IS_THREADMASK - sigprocmask(0, NULL, &sigset); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); ATF_CHECK(sigismember(&sigset, SIGCHLD)); #endif @@ -156,11 +167,16 @@ ATF_TC_BODY(system_concurrent, tc) } /* Check the signal dispositions */ - ATF_CHECK_EQ(SIG_DFL, signal(SIGINT, SIG_DFL)); - ATF_CHECK_EQ(SIG_DFL, signal(SIGQUIT, SIG_DFL)); - sigprocmask(0, NULL, &sigset); - ATF_CHECK_EQ(0, memcmp(&sigset, &normset, sizeof(sigset_t))); -#undef N + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); + ATF_CHECK_EQ(sigint.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigint.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigint.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(sigquit.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigquit.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigquit.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); + ATF_CHECK_EQ(0, sigcmpset(&sigset, &normset)); } ATF_TP_ADD_TCS(tp) From nobody Wed Mar 11 13:38:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWBfY1s1yz6VBkj for ; Wed, 11 Mar 2026 13: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWBfY1L1wz4FDd for ; Wed, 11 Mar 2026 13: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=1773236325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2vvQvt3ukKY1eoqDM9dfqyzKDOkXSYzAYenzYe1qpSw=; b=FXOXn5zA6AQKDYhm2O5r2AztHPaGxVGWTihQ+HI4Lz+4TkbKj7jNjfQwlETL+htQJ3MZzB QRa7tqHY/3U7l0E3O72VY0BiqK8RFjBnOOwwvPmZbky51sKwCRU63aOwD8MNQH2U/YFnn3 HgBChwiCRDcg3N618sx9ecujeWq22Xn3w4kJym+kz1+ElIHFOKVEMRsvrdR5UhymiWaofb kxmvhIRLYXF+kuy6kkWcmIv4ERJj//QbilpJpLLa/boohnO97+CRxKm8HbrUB5xGio1Fkx 1j1TP0+umk/fh19/0OkBLGO4IfHbyexVm1K+dckNZZmjXi8rsIs7CKPor8lgaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773236325; a=rsa-sha256; cv=none; b=FwP6spQUcATTWQm5XZEsWzgRby1mYqkmvX7mG/4u+x/mkETwKtvrdc9mfjOo2+LKawsD+z o30AOrQgJR2U8wZOnYmu7fwOOKwhdJ5PadCHPl37Y8+VOZ47e7YWpEwwmH5aVF4VHEYhad HmMNCxPmGa/3A9mvMSNparObGfyIjYD8ZASPuaNvqWKcDnLKoTHLNNgfl5aeRM2HieHm6u qZR1BK7NU88N6KuExaGpngXLE3LOTAQG6kebTxyCdVWZQTSLcS8o4+f9KMUXdY3+KrcBvG JVsK/rjJf12G1rRddOUs82NCYgvsT9w5RAEqRaXQuauUM/6vPHa+8IuCJwD1mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773236325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2vvQvt3ukKY1eoqDM9dfqyzKDOkXSYzAYenzYe1qpSw=; b=TALQsajN24LnDVCf+rqSYWEBNV54jGL6NRmUSKFduYUVIYq3Q/fNivsd7Aa++yz6t8Y7p9 yDE1okwc3z50BC/iS7tWXcFFj8RddCefUzatkQr/7AJbdlED1s+Xq99vujpbWZFDhiTDHv qXaSdLkwCusRrp1xblYeNqgibr6cHVckQ79Muat7CXLfnc2Ww4PgtRoWcXk4+CdORHivOf 5a/Z8Xsx4TaJGpSuwKQjSutlxYepNKAtxKdbdxoJNZWmf38pft/3Gyr3X+mi+Lajz0iJ+y pLKueHqjFh8pr9rDTmv1ZKMIL1cPrkVGqtzQvQoldTVxbhqBRbGWgl1opFEeuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWBfY0xWNz11h7 for ; Wed, 11 Mar 2026 13:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 13:38:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e71bfbe2f58f - main - llvm-*: Use SYMLINKS for unprefixed LLVM binutils List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e71bfbe2f58ffff8f16a9da075d98fff41671bac Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 13:38:39 +0000 Message-Id: <69b1705f.24a4c.61c52bd9@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e71bfbe2f58ffff8f16a9da075d98fff41671bac commit e71bfbe2f58ffff8f16a9da075d98fff41671bac Author: Ed Maste AuthorDate: 2026-03-06 17:52:15 +0000 Commit: Ed Maste CommitDate: 2026-03-11 13:37:05 +0000 llvm-*: Use SYMLINKS for unprefixed LLVM binutils Previously they were hard links. This change will support future packaging changes by decoupling the prefixed (e.g. llvm-ar) and unprefixed (e.g. ar) names. Reviewed by: dim, ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55693 --- usr.bin/clang/llvm-ar/Makefile | 3 ++- usr.bin/clang/llvm-cov/Makefile | 2 +- usr.bin/clang/llvm-cxxfilt/Makefile | 2 +- usr.bin/clang/llvm-nm/Makefile | 2 +- usr.bin/clang/llvm-objcopy/Makefile | 4 ++-- usr.bin/clang/llvm-objdump/Makefile | 2 +- usr.bin/clang/llvm-readobj/Makefile | 2 +- usr.bin/clang/llvm-size/Makefile | 2 +- usr.bin/clang/llvm-symbolizer/Makefile | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index e019c89b3581..ee776a7c0d9e 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -11,7 +11,8 @@ SRCS+= llvm-ar.cpp LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib .if ${MK_LLVM_BINUTILS} != "no" -LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib +SYMLINKS+= llvm-ar ${BINDIR}/ar +SYMLINKS+= llvm-ranlib ${BINDIR}/ranlib MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 .endif diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index 3eb14eb37139..3c02d4b7d144 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -1,7 +1,7 @@ .include PROG_CXX= llvm-cov -LINKS= ${BINDIR}/llvm-cov ${BINDIR}/gcov +SYMLINKS= llvm-cov ${BINDIR}/gcov MLINKS= llvm-cov.1 gcov.1 SRCDIR= llvm/tools/llvm-cov diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index f53503378ea8..26a5d9e8975d 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -23,7 +23,7 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-cxxfilt ${BINDIR}/c++filt +SYMLINKS= llvm-cxxfilt ${BINDIR}/c++filt MLINKS= llvm-cxxfilt.1 c++filt.1 .endif diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 7e089d1b408d..333513246cb6 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -24,7 +24,7 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .if ${MK_LLVM_BINUTILS} != "no" -LINKS+= ${BINDIR}/llvm-nm ${BINDIR}/nm +SYMLINKS+= llvm-nm ${BINDIR}/nm MLINKS+= llvm-nm.1 nm.1 .endif diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index fcf59e4b4bca..13bbab97899f 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -27,8 +27,8 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LINKS= ${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip .if ${MK_LLVM_BINUTILS} != "no" -LINKS+= ${BINDIR}/llvm-objcopy ${BINDIR}/objcopy \ - ${BINDIR}/llvm-strip ${BINDIR}/strip +SYMLINKS+= llvm-objcopy ${BINDIR}/objcopy \ + llvm-strip ${BINDIR}/strip MLINKS= llvm-objcopy.1 objcopy.1 \ llvm-objcopy.1 strip.1 .endif diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index ad1c7beee95f..86281217ee0a 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -29,7 +29,7 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -LINKS= ${BINDIR}/llvm-objdump ${BINDIR}/objdump +SYMLINKS= llvm-objdump ${BINDIR}/objdump MLINKS= llvm-objdump.1 objdump.1 .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index f532358ea79e..3f705431e509 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -36,7 +36,7 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LINKS+= ${BINDIR}/llvm-readobj ${BINDIR}/llvm-readelf .if ${MK_LLVM_BINUTILS} != "no" -LINKS+= ${BINDIR}/llvm-readelf ${BINDIR}/readelf +SYMLINKS+= llvm-readelf ${BINDIR}/readelf MLINKS+= llvm-readelf.1 readelf.1 .endif diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index 9d3505cdd319..1991065b61b2 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -24,7 +24,7 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .if ${MK_LLVM_BINUTILS} != "no" -LINKS+= ${BINDIR}/llvm-size ${BINDIR}/size +SYMLINKS+= llvm-size ${BINDIR}/size MLINKS+= llvm-size.1 size.1 .endif diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index c45300c92a90..1a3a65c774c9 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -26,7 +26,7 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line .if ${MK_LLVM_BINUTILS} != "no" -LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line +SYMLINKS+= llvm-addr2line ${BINDIR}/addr2line MLINKS+= llvm-addr2line.1 addr2line.1 .endif From nobody Wed Mar 11 14:01:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWC930pT9z6VD2k; Wed, 11 Mar 2026 14:01:43 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWC8z6GHhz4JJr; Wed, 11 Mar 2026 14:01:39 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 62BE1UbB025154 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 11 Mar 2026 15:01:30 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 62BE1U2Y025153; Wed, 11 Mar 2026 15:01:30 +0100 (CET) (envelope-from fuz) Date: Wed, 11 Mar 2026 15:01:30 +0100 From: Robert Clausecker To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 3d394a1da079 - stable/15 - system(3): Unwrap execve() Message-ID: References: <69b16b36.275ef.6ffc5448@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <69b16b36.275ef.6ffc5448@gitrepo.freebsd.org> 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:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Queue-Id: 4fWC8z6GHhz4JJr X-Spamd-Bar: ---- Hi des, Am Wed, Mar 11, 2026 at 01:16:38PM +0000 schrieb Dag-Erling Smørgrav: > The branch stable/15 has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 > > commit 3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 > Author: Dag-Erling Smørgrav > AuthorDate: 2026-03-04 15:22:42 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2026-03-11 13:16:00 +0000 > > system(3): Unwrap execve() > > There is no need to call execl(), which will allocate an array and copy > our arguments into it, when we can use a static array and call execve() > directly. > > MFC after: 1 week > Sponsored by: Klara, Inc. > Reviewed by: kevans > Differential Revision: https://reviews.freebsd.org/D55648 > > (cherry picked from commit 40e52e0edd038460a2a2aca017b3ac5a513fe37b) > --- > lib/libc/stdlib/system.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c > index 94f7460c9b68..a2f472502bfd 100644 > --- a/lib/libc/stdlib/system.c > +++ b/lib/libc/stdlib/system.c > @@ -60,6 +60,8 @@ __libc_system(const char *command) > static struct sigaction ointact, oquitact; > struct sigaction ign; > sigset_t sigblock, osigblock; > + char *argv[] = { "sh", "-c", __DECONST(char *, command), NULL }; How about > + const char *argv[] = { "sh", "-c", command, NULL }; instead? > + extern char **environ; > int pstat = -1, serrno = 0; > pid_t pid; > > @@ -101,7 +103,7 @@ __libc_system(const char *command) > /* > * Exec the command. > */ > - execl(_PATH_BSHELL, "sh", "-c", command, NULL); > + _execve(_PATH_BSHELL, argv, environ); > _exit(127); > } else { /* parent */ > /* Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Wed Mar 11 14:39:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWD0L6YVjz6VGc4 for ; Wed, 11 Mar 2026 14:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWD0L5w40z4QcP for ; Wed, 11 Mar 2026 14:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773239954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=96oXSKpx0us9dPWt9oXe8jmHPYrPLZiAQRljzIpv0YE=; b=c8Mzz5phQhlN8P51HmZ6cnhuD3vwDP+JEfjfwNC98QL/p86yzbO6iE7voL3vsH5m0yZ98f UT/xo6JsyQjz6IMNFY2geFZ8o4GVlh5mZi1jOEp45EJzEnm974ONY0FamcDkPlPM5NAJjj WiDbXl+YRIpIV2uM+yhSGdu9yNEIPRT6HyS7UafSYp0N1eDl2ntTnuZ6ln7swkwCmAraQF Yn/nfQR6XJ0/tjp/ATwQo9jN6oztPzBt2sMocwU1re3KeFtTF10nSz8m/AH5xWBQf43KCh YL6v3jmx81isPrnF2a3hD9SH9F/l6pUYmxKioarXrGl7dsIU8dPv79eZAkYd0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773239954; a=rsa-sha256; cv=none; b=h0jQUXUbAxOL6KVHSmfWo5IGmWoKPMymRfLzMyCyvYI6l2BI1qsl2AVG3RNOUNAR1Kg+nE JiRgx+RznXEnjR0bnieYK8k+9fFt9SCPqCoyNE0Y1G/RIymw4bB4xS1XRFAlbGeHEuaqmP iHoeSJNgKcXHgSd01wUKdvTLLGT6p9XZpBiCBDWuGAwFkC8FZT+hqyLG89mRfHTLQSgMQN NOQicx5t9fLw1+I86TFvZvfhahHP7AWZGw0+gbO1wQ4pxw998BdKI+XoEfaI6QJ3nDBbVP jU7fYKqjT36q4Nlu+UIfJ5AqL62br3pPmN2GPfcIz8LPymrD56QAEzvwPaflDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773239954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=96oXSKpx0us9dPWt9oXe8jmHPYrPLZiAQRljzIpv0YE=; b=vmTQVzUElat35nKuq8lXCezATWxLo+dDmGPSsuA2LqY7ZKyKaxz5acMt9paip+xK3gTUNo BgYFERI5u/yh4HWdjSID1EFKQebpLZbz+bin5VpmJcYk86QpusdyGqvhrZW5RP/DaBVMMg t/B3U+6Qkt5FBxRFQBi2r2/YICy3rAgQBNygsRLDknLzygPmaNOB0elgXIBYkkDuIsZRQk HzQ016ocUVE2zXD+bBAdSsbTuIL/8knpqUwPIG8xovGP1thdANeCd9oM2K25K0VGRaRBjg gM/cTnXUMgTOaSM4ZuE9nLgkZdOt3LanRa1IIGbphlPZFSi5I+a5TxDUgoYlkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWD0L5Br2z12WB for ; Wed, 11 Mar 2026 14:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3791a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 14:39:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9da4a804f091 - main - sigreturn.2: refresh the man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9da4a804f0916b24519b8baa7ed460a7ba23d8c8 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 14:39:09 +0000 Message-Id: <69b17e8d.3791a.b59e630@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9da4a804f0916b24519b8baa7ed460a7ba23d8c8 commit 9da4a804f0916b24519b8baa7ed460a7ba23d8c8 Author: Konstantin Belousov AuthorDate: 2026-03-08 20:08:42 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-11 14:38:34 +0000 sigreturn.2: refresh the man page Remove mention of the longjmp(3), which does not use sigreturn. Try to be more precise when describing the syscall effects. Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D55750 --- lib/libsys/sigreturn.2 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/libsys/sigreturn.2 b/lib/libsys/sigreturn.2 index 4effeaa5abc7..0e7bca507fc7 100644 --- a/lib/libsys/sigreturn.2 +++ b/lib/libsys/sigreturn.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 6, 2013 +.Dd March 11, 2026 .Dt SIGRETURN 2 .Os .Sh NAME @@ -47,17 +47,25 @@ The thread's signal mask and stack status are restored from the context structure pointed to by .Fa scp . The system call does not return; -the users stack pointer, frame pointer, argument pointer, -and processor status longword are restored from the context. -Execution resumes at the specified pc. -This system call is used by the trampoline code and -.Xr longjmp 3 +the whole userspace context as specified by +.Fa scp , +including the userspace stack pointer, all general-purpose registers, +coprocessor state, process status register, and program counter +are restored from the context. +Execution resumes at the program counter from the specified context. +.Pp +This system call is used by the kernel-provided signal trampoline code, +located in the virtual DSO (VDSO) on some architectures or as raw code +in the shared page if VDSO is not provided, when returning from a signal to the previously executing program. .Sh RETURN VALUES If successful, the system call does not return. -Otherwise, a value of -1 is returned and +Otherwise, a value of -1 may be returned, with .Va errno -is set to indicate the error. +set to indicate the error. +Some conditions detected by hardware result in the delivery of +a synchronous trap signal to the thread, in addition to or instead of +setting the system call error code. .Sh ERRORS The .Fn sigreturn From nobody Wed Mar 11 14:48:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWDC34Kplz6VHF5; Wed, 11 Mar 2026 14:48:31 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWDC33m57z3CjB; Wed, 11 Mar 2026 14:48:31 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773240511; 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=aAFn8aXTdXcvOhU1p0k4ywXjxV6GsBMMW5ABvl0LU20=; b=TgfMyYiEUT1LJnGp23O83lBtuObPMcTtKwbULF/XSw6veY0Lfc/SMtR1qVIDtT78uhEfBr a1swqENBgZVDP8YnDIovpk8uG12VSfh3YvDlocuNPUo9B8YriMZgMQNs1hneybLpXZXZwc GtUJ9ympthumhsFmBip0ZuSeILW3b1wOYF9wbuvp0iam+/Mie+t4zUQW20aMUIUylOvvTq lv8WrvHmmVX4a0Dm1aNyOA9jFfjRNkn4g7Da4yjwX5ze8wRPiLy0SEulU3sdcJKz+Lv468 y7+FxsKea4yt2X91J95hd6rtSnROhPSaDE1RCZBaeqGNzKG2wfIXGvDZ2aA7kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773240511; a=rsa-sha256; cv=none; b=FqmkLm6WvY+XIsp4o1WttQ2cf6SKjyn++/TKY0cEbbPkEF4rzOFbWAPX2nZxqCTCjpwkLH wKvhOCFHY+u0YECkG4nXpFeKg7HbpEVWR0Ric+dEsdIbdPreGK+k7Yq/xt4ypF8T+Q108E I9zNiCwhvdwlMj6hwPr2eWoMDgBQuJuTqdpit/tOTtNcLFkchRJSjqN7xcGa96J3iPTk8Z FKn6PmgnaYrmDG5158ePHgFWghW41/a12ntTDqEfX85vhAJzlxfhbFd5KkJGlX++GwVuSP D9UU6r8r+7ghaMmE4msunKICxLSXN/p3twRGK3kufF/vp93R1tWfdzmkoXIVjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773240511; 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=aAFn8aXTdXcvOhU1p0k4ywXjxV6GsBMMW5ABvl0LU20=; b=Wu5U3dik00OPr87x+818/AXdWIHrj77iQkpbZ56eVwMQLv9szWj5JIbWMD7X/NJgme/vXu fUjlQdnSvS1hvQWf03ydQdOdAZj0O5se/L8Xez3yP+kiNEyuVowmj3ib3AvJQBfZJMk/Lm Nci89RQkR4zdml3hVCS/LLwAOY/Lb+Nw5PBQml6tvSOyUt0AdkZsNDlkD0CSWGaLvzjVFj A33aR+oJNBiUcnT8/PHDuV8IfKcN3BKafjfGIAMSismdKZWCzJdyc1lct0RUCyj5jzj7BZ BkPbTF0RS+CB2bbztigLqvx5GXO/Od744gXCgDDZ+bz3bwHBGDQc2v1LnPtRzw== 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 4fWDC32HZXzjq2; Wed, 11 Mar 2026 14:48:31 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 3003448105; Wed, 11 Mar 2026 15:48:30 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Robert Clausecker Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 3d394a1da079 - stable/15 - system(3): Unwrap execve() In-Reply-To: (Robert Clausecker's message of "Wed, 11 Mar 2026 15:01:30 +0100") References: <69b16b36.275ef.6ffc5448@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 11 Mar 2026 15:48:30 +0100 Message-ID: <867bripgld.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Robert Clausecker writes: > Dag-Erling Sm=C3=B8rgrav writes: > > + char *argv[] =3D { "sh", "-c", __DECONST(char *, command), NULL }; > > How about > > > + const char *argv[] =3D { "sh", "-c", command, NULL }; > > instead? That would not work. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Mar 11 14:50:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWDF344lRz6VHM3 for ; Wed, 11 Mar 2026 14:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWDF323Msz3DZg for ; Wed, 11 Mar 2026 14:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773240615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M2avOQFTxf+LQ62X03iP0WjbHycOnh8K+q7SghPFlWw=; b=GqHdl7k+lvzXeRPMorQ6vDuoIDpm5H+TQftgoGEuZwWtY643G+pPGn8Ei454fW0IqRpqmx gvcoDJjeZccdvn2s+UgRMkB3XG/ttGtQfyFTcsurMgKZzwnbOnYw0XDodAta4l3P2MybCI 4DfXXMqcIT4XIbWemrd/LRaPurm+q0KgUL+2bu89GTddanC+6Pf3vJLNSLBRhRyiUWOkn6 4mvIzGoPJ46IpjXvxftkmr/6/Zu1gumIZFNUA0CNclBXX2XS6UJ2+o++rRU+AYM8PTlT1h fOxVjh/sd/0jkV5J4qGMgZZbq48IRLIK0hAr7dGxW2zFBRip8r6QCghfQ4511Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773240615; a=rsa-sha256; cv=none; b=CDoT/kW3i+RZLo9Euky1+DHIPQXVlOvcFhSsF1+La39wkRHOUss83pdHL+eJxLph/zbDy1 eQx5ix1M04KRwdRDI5K7GTxWhJk2bJffVf2Vwya8RkOLxORIr8X+FhtSwR01QOZYp7vSPI y+/9zJeveig4PjijYhyqjmts3Itdcnpg4t7ObU7EuJ1U/7WSSX2pcaloY4BBkXKnIx4KVl 83fklUTYy0XnaU1mK2OisxGlEN6kY3dQpm1QtNBIR4q8C1j2/F7M/R3R+nAmBFdInhzsAH taPktvItrCQf5RnlaILvGodUc3MlvaJ76Ot7GiJHzvL15uavEABDgEHH7tdvig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773240615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M2avOQFTxf+LQ62X03iP0WjbHycOnh8K+q7SghPFlWw=; b=o8M/PYecXI/GBS44a00mYvV8jL7aOvuRou40xRDKawan+SZGuhY8K1eWjmZxJce9rNGDYY V/JuJHQOPe1MjW959dfxEySkheoTNdal1tsa9OMtplwn3iNdHFCsn+3p/jodMD0enA1+tF TG2teE+SZnwEmRpVhG/nYqIvk9n3Jip8sFfWVKEBzXkn9CENbb9ba4BrGKsz9YGRA++m5i ajPNjIYFT/aX/AvfKwKomxfvRSBlT17zG8z4pUqAqR4t83x/Wwv4T59n/C9Cq9n+j3YINv EFT1fzlzXqB2X+ThfFzgmZfetQSF9faQClDaP9WXn/Ip5cbPiuoZ0AsRKgXLQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWDF31b3nz13Pq for ; Wed, 11 Mar 2026 14:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3980f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 14:50:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 738aea3387d8 - main - Calendars: Update status reports deadlines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 738aea3387d831c95024fd28076dadde132ceaec Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 14:50:15 +0000 Message-Id: <69b18127.3980f.7ee7872b@gitrepo.freebsd.org> The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/src/commit/?id=738aea3387d831c95024fd28076dadde132ceaec commit 738aea3387d831c95024fd28076dadde132ceaec Author: Lorenzo Salvadore AuthorDate: 2026-02-24 14:41:20 +0000 Commit: Lorenzo Salvadore CommitDate: 2026-03-11 14:49:23 +0000 Calendars: Update status reports deadlines Also move the deadlines in their own calendar file. Reported by: jhs Reviewed by: jhs, adamw, Graham Percival Differential Revision: https://reviews.freebsd.org/D55491 --- usr.bin/calendar/calendars/calendar.freebsd | 4 ---- usr.bin/calendar/calendars/calendar.status_reports | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index bfcdfe5f9a75..37dad2d237a7 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -123,7 +123,6 @@ 03/14 Eric Turgeon born in Edmundston, New Brunswick, Canada, 1982 03/15 Paolo Pisati born in Lodi, Italy, 1977 03/15 Brian Fundakowski Feldman born in Alexandria, Virginia, United States, 1983 -03/15 First quarterly status reports are due on 03/31 03/17 Michael Smith born in Bankstown, New South Wales, Australia, 1971 03/17 Alexander Motin born in Simferopol, Ukraine, 1979 03/18 Koop Mast born in Dokkum, the Netherlands, 1981 @@ -260,7 +259,6 @@ 06/09 Stanislav Galabov born in Sofia, Bulgaria, 1978 06/11 Alonso Cardenas Marquez born in Arequipa, Peru, 1979 06/14 Josh Paetzel born in Minneapolis, Minnesota, United States, 1973 -06/15 Second quarterly status reports are due on 06/30 06/15 Aymeric Wibo born in Plaistow, London, United Kingdom, 2004 06/17 Tilman Linneweh born in Weinheim, Baden-Wuerttemberg, Germany, 1978 06/18 Li-Wen Hsu born in Taipei, Taiwan, Republic of China, 1984 @@ -382,7 +380,6 @@ 09/14 Matthew Seaman born in Bristol, United Kingdom, 1965 09/15 Aleksandr Rybalko born in Odessa, Ukraine, 1977 09/15 Dima Panov born in Khabarovsk, Russian Federation, 1978 -09/15 Third quarterly status reports are due on 09/30 09/16 Maksim Yevmenkin born in Taganrog, USSR, 1974 09/17 Maxim Bolotin born in Rostov-on-Don, Russian Federation, 1976 09/18 Matthew Fleming born in Cleveland, Ohio, United States, 1975 @@ -488,7 +485,6 @@ 12/11 Koichiro Iwao born in Oita, Japan, 1987 12/15 James FitzGibbon born in Amersham, Buckinghamshire, United Kingdom, 1974 12/15 Timur I. Bakeyev born in Kazan, Republic of Tatarstan, USSR, 1974 -12/15 Fourth quarterly status reports are due on 12/31 12/18 Chris Timmons born in Ellensburg, Washington, United States, 1964 12/18 Dag-Erling Smorgrav born in Brussels, Belgium, 1977 12/18 Muhammad Moinur Rahman born in Dhaka, Bangladesh, 1983 diff --git a/usr.bin/calendar/calendars/calendar.status_reports b/usr.bin/calendar/calendars/calendar.status_reports new file mode 100644 index 000000000000..f4e1e7b822cf --- /dev/null +++ b/usr.bin/calendar/calendars/calendar.status_reports @@ -0,0 +1,28 @@ +/* + * FreeBSD + */ + +#ifndef _calendar_status_reports_ +#define _calendar_status_reports_ + +03/01 Status Reports: First call for Q1 +03/15 Status Reports: 1 month left reminder for Q1 +03/31 Status Reports: 2 weeks left reminder for Q1 +04/14 Status Reports: Q1 deadline + +06/01 Status Reports: First call for Q2 +06/15 Status Reports: 1 month left reminder for Q2 +06/30 Status Reports: 2 weeks left reminder for Q2 +07/14 Status Reports: Q2 deadline + +09/01 Status Reports: First call for Q3 +09/15 Status Reports: 1 month left reminder for Q3 +09/30 Status Reports: 2 weeks left reminder for Q3 +10/14 Status Reports: Q3 deadline + +12/01 Status Reports: First call for Q4 +12/15 Status Reports: 1 month left reminder for Q4 +12/31 Status Reports: 2 weeks left reminder for Q4 +01/14 Status Reports: Q4 deadline + +#endif /* !_calendar_status_reports_ */ From nobody Wed Mar 11 16:45:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGnw6Znlz6VQdq for ; Wed, 11 Mar 2026 16:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGnw4kssz3VWJ for ; Wed, 11 Mar 2026 16:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773247524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/0XPvcZaC/z5nvfOTk1tIEW7LwDQKm98a5h1G3v2vU=; b=LYEMUJrEJ0LY0XetzJXymd3Ipwx/aKM+jA2bU3Or9PJQ3cdRqqTzJ3yvPwYXnsPYZmlCR3 fSSMW1+UellsOnbKMaeTVmV6TJTgFMTRhw/XFTwkat0tMKMwoRGfsqJhKtHDK8RX3Jm0Q2 9P3VSpWfRvrF6jBqZfy2PDf1Ks8QFPYBhy8Ul7mP8deWv2tEnp5GZ68iB/TAyZmgoefSfX TA8BBTaZauEnW1LvSDAFnyeLosZ5U2BOy+TFYaCFK94MxRwRMZQVJINU06Tz1ICMLTCweF gCh8cdObIBZgQN/rzzZRL6CfJB/sA3wraW2RHCj+MxjiofJxJW0MHIZULF0Qyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773247524; a=rsa-sha256; cv=none; b=uVsdaFyrj/5uD+0ePVGqLWaWt6tvzv5C5zMlAyriI7aNNLcmTljIzJ2N12rckxot4Xk3kr z/61z6JWRBlvTyn0DskWAln4kRZgWTfmRfWXd57qKFktogn2t8it/Xa/lkHU2R8Q3htkoo H27i+CNswGmS53SHWgKf8KN0C1NqMUEpSWQVs9uIAw55CgNI3fQ74oK414yuAdkH4fYLA8 nB+JhngOn3u+zU09VQoFpCeP3cZuGCqbFluPJU+B70Jt/3OhWb/jzFRN0N8EPtZ3jjcJmq 3CYLJnOdxa8fCx4vaGIr28zbmA4rz4XpKRz6DF5PMia9O+/80dQOTDTq9XIGMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773247524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/0XPvcZaC/z5nvfOTk1tIEW7LwDQKm98a5h1G3v2vU=; b=gYnzRn5/jLpbhorjsFWSF+hweyLivowsHT3rsPkBRLpvjRUHsPO2iI/UdiRDYd6YorhHBw KOvhDaUL+ORNKwn9ISyboaxdXP4PB+Oy/5PK9iNns+6up4ILalvdx72zil/aXDrd3x3z6l XNF8rT6pFQYt1DtYCLxm5OuGHj0CEbat3S3Bih7CF6zYxbPEHc8RTKML41L+b2l2pYdQ7U HZ+8AxxW3XUsCqU5c/6EsknBmb4CUAL8cEcWayBkXapdz2iMbUc2VKXQ4c7KsxTNxqGUjE LaGQkedSPh6EHTXeIXUWDQyv9Ou39eDxrOzNOCCI4RUxojjGOuysYgt0+RfR4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGnw3y0bz165P for ; Wed, 11 Mar 2026 16:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 440e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:45:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 56401a9c3459 - stable/15 - LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 56401a9c3459f8f4151ac0da1f820863119c1749 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:45:19 +0000 Message-Id: <69b19c1f.440e6.2e993800@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=56401a9c3459f8f4151ac0da1f820863119c1749 commit 56401a9c3459f8f4151ac0da1f820863119c1749 Author: Siva Mahadevan AuthorDate: 2026-03-03 19:09:35 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-11 16:16:17 +0000 LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() The BUILD_BUG_ON_ZERO() macro returns an (int)0 if it does not fail at build time. LinuxKPI sort() has it as a guard for an unsupported argument but ignores the return value. This leads to gcc complaining: /usr/src/sys/compat/linuxkpi/common/include/linux/build_bug.h:60:33: error: statement with no effect [-Werror=unused-value] 60 | #define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) != 0); })) | ^ /usr/src/sys/compat/linuxkpi/common/include/linux/sort.h:37:9: note: in expansion of macro 'BUILD_BUG_ON_ZERO' 37 | BUILD_BUG_ON_ZERO(swap); \ | ^~~~~~~~~~~~~~~~~ /usr/src/sys/contrib/dev/rtw89/core.c:2575:9: note: in expansion of macro 'sort' 2575 | sort(drift, RTW89_BCN_TRACK_STAT_NR, sizeof(*drift), cmp_u16, NULL); Change to BUILD_BUG_ON() for the statement version. Reported by: CI Co-authored-by: bz Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55634 (cherry picked from commit f26cb4757eb74ceace39144933ae198ebf1b4f28) --- sys/compat/linuxkpi/common/include/linux/sort.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sort.h b/sys/compat/linuxkpi/common/include/linux/sort.h index e6196d1f41c7..361b37c587c8 100644 --- a/sys/compat/linuxkpi/common/include/linux/sort.h +++ b/sys/compat/linuxkpi/common/include/linux/sort.h @@ -34,7 +34,7 @@ #include #define sort(base, num, size, cmp, swap) do { \ - BUILD_BUG_ON_ZERO(swap); \ + BUILD_BUG_ON(swap); \ qsort(base, num, size, cmp); \ } while (0) From nobody Wed Mar 11 16:47:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGr601C0z6VQwr for ; Wed, 11 Mar 2026 16:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGr56VP7z3W1S for ; Wed, 11 Mar 2026 16:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773247637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWc4LIY5oJnAWlhWBfAS10kOD4AsEumUI61e79m96ak=; b=NwpMHF1oisRjz0PxAg2NlKjcOfHUzhfT7+LGExNUMGvZA/rc5x5Cdb9GavYrCY9/ovxGmz kZ7BLeFu4HZfYjnY/vZVW2sodJqBMXMpoVfJMhVris0V44wssEdj6rOi6uCyPz+QID2+7C +Qvan4mJLHJfAaRWqEC8+zCQ21fUQoq4AVL8V5zYxwU9JcCTdqwMgpzUd3e4eZMLPY26o+ cAvEeXbV2/NZa8KUbNnX7mXTK7O1YmGo7Az4h/8ntMErnww4LKx9XAlZjh8XS4gxaHg+m1 C8450rupDAsjRt6Lzg/Mpw9FmhpDL+P5bm8Knzm1D2w3DBRq9Q0cJZ3LCDDWNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773247637; a=rsa-sha256; cv=none; b=lL0wgbQSqt9B4yu9QpCpjLeU1t3Rgld+WHfYIGbFOKQi5NMPYq4p+wAXWA/OjkAav164Ka bQZbAw0DGja9jmvLvnEZ+jFviLx3elgcJprK45i0FaNv9ALJXJCJeIxEQucqQ6qUl6ZDQK 7u0g9MP6BZo5z0LYqpomS3Cx/8OtO5eLLmEqEpwF1N20Hk/0k+19hnR3zytyGS+cw8hJWY 593MCKxLwOBXWt0dO1Qyi2GrilIvM72rOWsCp+fVIbghwpWT6D479UAIb8nakvxO4Z9vJc EYkjprJMLWDscYDv40OQVCo6KeQVgohY9An4RwQPevd1pmtssnTkzS/mTiJcPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773247637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWc4LIY5oJnAWlhWBfAS10kOD4AsEumUI61e79m96ak=; b=ZOOpWlkbF/Kp0DMZyGeQ2zCX9k/dppiKVfFYxzwFvn+tyS0hbLtQLuS3JT9BpkZVir7HZO PmNf/Dw+ZQTUhKBbwzV0pk6eMRWTuTMBejeOsEnM19koCFLvQdPPU+YO5pFhvUmMZwdv/j hk/gAcI63HqxHwuQNiQDNl5PHI6nCwI4MNo89ZcOcXI6xMe888yumtg2rQ0Vb9KaiiqQ5n Oa9X2WG1QSZ5UFoCGzuf62OD8U3CHKX6Z3UXGymOYH/gmdksAZ/NXMPf37gXd5ItTEaNKN BvbgHQ5fzGez8Sb2BoO95a1W0b7CwPyx1ub+w/MZ4QivmPbl0vA398YjUJOhSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGr55x32z16QM for ; Wed, 11 Mar 2026 16:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 435ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:47:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 945099520368 - stable/15 - share/dict/web2: Sort List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 945099520368481f1f5d6fd76028db7802a96d13 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:47:12 +0000 Message-Id: <69b19c90.435ed.b8ee527@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=945099520368481f1f5d6fd76028db7802a96d13 commit 945099520368481f1f5d6fd76028db7802a96d13 Author: Ed Maste AuthorDate: 2026-03-09 19:35:53 +0000 Commit: Ed Maste CommitDate: 2026-03-11 16:46:55 +0000 share/dict/web2: Sort PR: 293659 Fixes: e49b6ead4114 ("Add a number of five letter words to the dictionary") (cherry picked from commit 72f0bc868bf00586cba1e50057d8f1998b4abe80) --- share/dict/web2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/dict/web2 b/share/dict/web2 index bcb6b779d634..5e7369d565b6 100644 --- a/share/dict/web2 +++ b/share/dict/web2 @@ -31891,7 +31891,6 @@ caul cauld cauldrife cauldrifeness -caulk Caulerpa Caulerpaceae caulerpaceous @@ -31914,6 +31913,7 @@ cauline caulis Caulite caulivorous +caulk caulocarpic caulocarpous caulome @@ -78895,7 +78895,6 @@ Gonzalo goo goober good -gooey Goodenia Goodeniaceae goodeniaceous @@ -78926,6 +78925,7 @@ goodyish goodyism goodyness goodyship +gooey goof goofer goofily From nobody Wed Mar 11 16:53:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzV5Pfqz6VRNc for ; Wed, 11 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGzV4GTJz3Wgw for ; Wed, 11 Mar 2026 16:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xo1f2ReEP7u6eUDgfcINmyT3lnYnFW4dme6XJu0huvo=; b=qp3wcp3YXF04PQgJAswxRFXe7D35nNRGsPhyYyIyoeQTp0aC5t6uuIU/9IqlId+h+IlmDZ uB/4xm6Qk2gYpf1R2vR/cbeBh1k2u0LluYUYTxK7NQairFqsloBSd2EkdhU1rdE61G6Ofg ag38q1jeMO/XMirFSQmASm8KvcwZJHIEVZdmMdLEu20oLvW+1/6RLw1rv7Gkd1f/w77xj3 9iE2Rs4R9Xt5W2RDAH2O+eZbbYGGK+V24vRMwuMGaLqnSpE0essVUcteZEc87XV0ggBgXV VZyzYeyxhkOTKW5QZAYsmIET4tncxxhf/OnimI9qpyr9kisGlPwW8BXdJUjnwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773248022; a=rsa-sha256; cv=none; b=rzR5es494Ry7OQ9OfJsK/EFsg4CBLQgHtRcUglyJ+8AZb9WBRIfKVTDF29gCHOR7X9sjIt j7x8LBQikoAYdjrhl3uykJuoqVEvnyWZ2VaQyV8BX7NNUcZuMJzlTXg+o2W2Pd6dKacCnI Whd3yvpJTc4WIrL4/GeQPZHo5q4g0KgZFmDvBMM6DUfRiwazeV83JRC7oeYtSGk6KKKfk6 5bUc3vNRP+iZrCrok/AlUCTxBjpp0NKSUck84SWkpMfSK5Kl4ku8mWSmk/gn6g7Kahy9Kp QAA2oh7xRoUO2/fbywXKOT6o8waytiC/SErgdY//4bg+0BXTlF9KcdGtPyL5fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xo1f2ReEP7u6eUDgfcINmyT3lnYnFW4dme6XJu0huvo=; b=bIO8q7a9Cm6coPiBxERG31ed43/WFl3xd7ETG4Gnju1ZXUobCaAhEDMg+QFr3j85WoOGwM xUzVfnH269CDqSsqrhpVLApOap/3sQMOdpDuT95TqISRlBcz4Q99wgnf8Bxx5tpRRh4po4 4o5aOrJvia2E1981p/QGMV35xaeDkZ2mKuwULj5+G+BfUaKRZNC8kE+oFHduTrnyMCxCZx rv/J81VXgc5Bqzs5MDJM1mCNEBwHc9cSoyKGR81/Mat6KMJiBkRYQVNbtrfT/JIUtfw3R2 ig3m5nxmbmug5ZNMAwUnajEoEmQ0k72kYyMiPL66XkVHmWPwqOEQ8yDLKwgpNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzV3pc6z16pH for ; Wed, 11 Mar 2026 16:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44acb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:53:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 68fcf0b94c51 - stable/15 - net80211: fix VHT160/80P80/80 chanwidth selection in the "40-" case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 68fcf0b94c5167f89481052f358064c9b6732553 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:53:42 +0000 Message-Id: <69b19e16.44acb.13ff800e@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=68fcf0b94c5167f89481052f358064c9b6732553 commit 68fcf0b94c5167f89481052f358064c9b6732553 Author: Bjoern A. Zeeb AuthorDate: 2026-03-08 00:57:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-11 16:53:24 +0000 net80211: fix VHT160/80P80/80 chanwidth selection in the "40-" case Depending on the base channel ni_vht_chan2 - ni_vht_chan1 can be negative. Apply abs() as indicated in the comments right above | CCFS1 - CCFS0 | = 8 or > 16 in order to fix the channel width selection. Sponsored by: The FreeBSD Foundation PR: 293645 Fixes: 4bf049bfeefd9 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55717 (cherry picked from commit 6cfd2b93e68061c7831016b91c2e308d01658764) --- sys/net80211/ieee80211_ht.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index b3c9532764d9..508ddc7de920 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -2036,11 +2037,11 @@ do { \ } /* CCFS1 > 0 and | CCFS1 - CCFS0 | = 8 */ - if (ni->ni_vht_chan2 > 0 && (ni->ni_vht_chan2 - ni->ni_vht_chan1) == 8) + if (ni->ni_vht_chan2 > 0 && abs(ni->ni_vht_chan2 - ni->ni_vht_chan1) == 8) can_vht160 = can_vht80 = true; /* CCFS1 > 0 and | CCFS1 - CCFS0 | > 16 */ - if (ni->ni_vht_chan2 > 0 && (ni->ni_vht_chan2 - ni->ni_vht_chan1) > 16) + if (ni->ni_vht_chan2 > 0 && abs(ni->ni_vht_chan2 - ni->ni_vht_chan1) > 16) can_vht80p80 = can_vht80 = true; /* CFFS1 == 0 */ From nobody Wed Mar 11 16:53:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzW6w8Vz6VR8n for ; Wed, 11 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGzW5TZLz3XHJ for ; Wed, 11 Mar 2026 16:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Koy6hQNJcgGp5Fk4P3BnIR4uw/QfFc+1a7+58EsSaTc=; b=vo9ZxMwMPYczeG7XM9wnqByjvBJWRuYWjaYgT5b3XUpGnU4Qv+Knvxo7Bw5C1s+EGOVvnu OCVWURjp8QNCNB/LT+BjwIET1ocIjrhtQhI9sUkzxKoxep8xe7yxH+dPl8eJ9MHyWqcuSQ Uqd8XGHMlGRdqraebTm4ZVpKjtTb7IXtWP1iqccFXZkjodyzeoB8kVu40Bu65HPrpGzGJ4 a5/JcwSR8C3ddyVsMopQRqO1uDASjDxSLLXrmRKocd+XYDyAfQGYhgE93eaFwukcDzJDx/ M/HCQEAygXG3lTeTpfTSMAb0TReFsc9sUOCZk5Jr4yoI/bYIagP4whIYwdoWqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773248023; a=rsa-sha256; cv=none; b=ACGFyxoSenm3NKtMgdZRqepASWVUN+JxUZDXgssl7TpQfJeanwc/8g87YObLME0jcosnY/ U+1YsuyjoZzaey/IhUX9AgBytRrBRr6wE5ryUGQ3UJOZQBOIxBGfa6ssVbzqHnc2ZOghe6 ztwZaKeKbQY2ca1Tf3oeOJvC9PuXZ0dAVIYVF5ih37m8u4r9+tpUN6JkSEGtz60XYox24l /Yl+qu4VWPC4U40BUvkwfbZZiGy1k82w1yIbF0AnfQrW6UeNnBbSrRdJwmrG6RufYOCCg9 foLpf8pZsbItJUaMkQXIQL4QO3Qsa+xO0avhcLBr1sq2JwFFNEcaW6XetcAHwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Koy6hQNJcgGp5Fk4P3BnIR4uw/QfFc+1a7+58EsSaTc=; b=nvb5p2rQvFGUHmiyRsKNypwdoLPbYpBCIy7uXF28bI6PfGjyuPu07lFuxM2fzbSuLsx1El dvWXJZddkty7rVa5SibWyXGrAMs372tR7+xctnn/iAZjqlIJRSqZOYC8gfCKQDLFTXt/hV 1QJbQYRHAXgYqVSCDnresCFD0nP5iq2uEgiRJillE3m5XGlJ2+2qEONMr4PAeS/mMvXi7i BFg2/tcxIzD/iFGpOVS+h7H5Eaid99obZVYE8mi37wMjvHG3DjbsVhCh4iSkvamvaBSMPK I3qhPzzxEefXWsEFU7dgPZ/WgVK97P/fFbQhBMAd5bi0H22VEFhwW5s3Zo6YYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzW4fPgz16bg for ; Wed, 11 Mar 2026 16:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 456d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:53:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4c7dbe9f794f - stable/15 - usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mode switch) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4c7dbe9f794f601c8abf791078fbe57e0a8a63e5 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:53:43 +0000 Message-Id: <69b19e17.456d1.47de9198@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4c7dbe9f794f601c8abf791078fbe57e0a8a63e5 commit 4c7dbe9f794f601c8abf791078fbe57e0a8a63e5 Author: Bjoern A. Zeeb AuthorDate: 2026-01-26 13:19:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-11 16:53:25 +0000 usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mode switch) Several Realtek (and lots other) USB dongles present themselves as CDROM device first. Upon eject they do a mode switch and suddenly are a different kind of device (sometimes even with different IDs), e.g., a wireless dongle. In order to avoid the CDROM stage and rather than adding the quirk handling to more drivers, add support to umass and if enabled automatically eject the "CDROM" to make it the real device. Longer-term some other drivers could stop using their hand-rolled support for this. It is unclear as-to how much we need the list of (eject) quirks from u3g here, or if these are very specific to that kind of devices. Sponsored by: The FreeBSD Foundation Fixes: b3b6a959c85a, 9c0cce328363 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54901 (cherry picked from commit b4daeded66b5e950ed8e618d66915b863c2414b1) --- sys/dev/usb/quirk/usb_quirk.c | 2 +- sys/dev/usb/storage/umass.c | 57 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 802ea2b2ae6a..69e16c91604f 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -532,7 +532,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { UQ_MSC_NO_INQUIRY, UQ_CFG_INDEX_0), USB_QUIRK(SMART2, G2MEMKEY, UQ_MSC_NO_INQUIRY), USB_QUIRK_REV(RALINK, RT_STOR, 0x0001, 0x0001, UQ_MSC_IGNORE), - USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_IGNORE), + USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_EJECT_SCSIEJECT), /* Non-standard USB MIDI devices */ USB_QUIRK(ROLAND, UM1, UQ_AU_VENDOR_CLASS), USB_QUIRK(ROLAND, SC8850, UQ_AU_VENDOR_CLASS), diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index cacf4ddf8f16..0ee6ea992fa7 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -115,6 +115,7 @@ #include #include #include +#include #include #include @@ -124,6 +125,7 @@ #include "usbdevs.h" #include +#include #include #include @@ -705,6 +707,59 @@ static const uint8_t fake_inq_data[SHORT_INQUIRY_LENGTH] = { #define UFI_COMMAND_LENGTH 12 /* UFI commands are always 12 bytes */ #define ATAPI_COMMAND_LENGTH 12 /* ATAPI commands are always 12 bytes */ +static void +umass_autoinst_eject_quirks(void *arg __unused, struct usb_device *udev, + struct usb_attach_arg *uaa) +{ + struct usb_interface *iface; + struct usb_interface_descriptor *id; + + if (uaa->dev_state != UAA_DEV_READY) + return; + + iface = usbd_get_iface(udev, 0); + if (iface == NULL) + return; + + id = iface->idesc; + if (id == NULL || id->bInterfaceClass != UICLASS_MASS) + return; + + if (usb_test_quirk(uaa, UQ_MSC_EJECT_SCSIEJECT)) { + int error; + + error = usb_msc_eject(uaa->device, 0, MSC_EJECT_STOPUNIT); + if (error == 0) + uaa->dev_state = UAA_DEV_EJECTING; + else + printf("UMASS failed to eject by SCSI eject STOPUNIT " + "command based on quirk: %d\n", error); + } +} + +static eventhandler_tag umass_drv_evh_tag; + +static int +umass_driver_evh(struct module *mod, int what, void *arg) +{ + + switch (what) { + case MOD_LOAD: + umass_drv_evh_tag = EVENTHANDLER_REGISTER(usb_dev_configured, + umass_autoinst_eject_quirks, NULL, EVENTHANDLER_PRI_ANY); + break; + case MOD_UNLOAD: + if (umass_drv_evh_tag != NULL) + EVENTHANDLER_DEREGISTER(usb_dev_configured, + umass_drv_evh_tag); + break; + default: + return (EOPNOTSUPP); + } + + return (0); +} + static device_method_t umass_methods[] = { /* Device interface */ DEVMETHOD(device_probe, umass_probe), @@ -725,7 +780,7 @@ static const STRUCT_USB_HOST_ID __used umass_devs[] = { {USB_IFACE_CLASS(UICLASS_MASS),}, }; -DRIVER_MODULE(umass, uhub, umass_driver, NULL, NULL); +DRIVER_MODULE(umass, uhub, umass_driver, umass_driver_evh, NULL); MODULE_DEPEND(umass, usb, 1, 1, 1); MODULE_DEPEND(umass, cam, 1, 1, 1); MODULE_VERSION(umass, 1); From nobody Wed Mar 11 16:53:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzb14zCz6VRX1 for ; Wed, 11 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGzZ5JkQz3X4t for ; Wed, 11 Mar 2026 16:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hqSRQfiad1sHFfh4694UJzforYMQ8+lHpYal8e42vzM=; b=iWraQ2rijAhJZT9v3+vBkzjWTilfpoUY9HCj5LJgbZURdg6crwR6z1009bFtw3mRVkWB22 ToCdscW64Wx1BzLEB6Pozy6t3LsAaYEq5/5EdFU+KboPUyc3tKQgqjvY9rxD3PinluOXyA gNcULd/mCISPdaZmVTg5b+1G1mx5k6d2QvKH93X13zOh4mq6fO2CH50uS6nc7/FqY117k4 30xMEL6F/icnQwj3+XlIbeJy8z5HM9WXe82jX2vAfLSfk259Bw/yw5aaSF4qTRRm0s9kag jbuG0gdYWGluure9wplQp324FICe9AWuZJ5/7BxziQjvmnAKC72ppRm1PmJEbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773248026; a=rsa-sha256; cv=none; b=E/kCNFjaikYXZ3jxydPkhPthWwUBmPz2+bv5kO0hHxKIFJu2+jRsAx6L3jVSIJ7TxlHokR 22i/GZMlUPyk9oR/WUjX98dUvr9SRKH/PjJ9wr54C6Fi7I8CUaiesGFhryK/ttJVHlrG9U 2T6vAtj1AOuLsqOaJZc2ysSEw1qxVX1wAuEuma58A/czpeTgY4itR1hQoms38uWBiQmUYQ RGl6g+3Rtm/+FWqvtY/Wykqavf1nSn2qZTshyx0iuD6zlW4skQqdIEwlZtzYV1uS2lZnL0 TocUaUR3YXIzVdag05fJWYA+G9DxO9SeAXzz6JC3dV+fkihRmvLkW8gDQMWNwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hqSRQfiad1sHFfh4694UJzforYMQ8+lHpYal8e42vzM=; b=ajbT8TkfGgoghndzsfJZq6cjCJ5fCgWuxjP4rFdnezLrWcYTCMTaYjHmYvFnRHjhD2L9pQ BJ8Itu1kalTjeSpKdfjvOoQgq4S01Ha19/qgT1276hcE8jO245GA8SuAkLhWL/Ry8lIZQQ AzGGYjNN/HLbFQ+gNgYhPxgMAthRrneVU/ebyCWGxBBvhDCCJ4VEyTrczsHREqwmRkJllM z1FMf+KIbFcitjyeWyBizTQp9y6QEKGkDfcrb6LueTKA6ellPAKBsTZN8ej3Od+a7XAw8r fsZoM/DFqdXfZcLYATPq1RFmH8GYt5x2a9I8P6gvfEnqQouWkVhgTvpf3R151w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzZ4ZDpz16NX for ; Wed, 11 Mar 2026 16:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 436d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:53:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 86417d5b061f - stable/15 - LinuxKPI: 802.11: lkpi_sta_auth_to_scan() fail graciously on lsta == NULL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 86417d5b061f7d385a09ae557504e8ef306ecbf9 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:53:41 +0000 Message-Id: <69b19e15.436d7.3804426e@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=86417d5b061f7d385a09ae557504e8ef306ecbf9 commit 86417d5b061f7d385a09ae557504e8ef306ecbf9 Author: Bjoern A. Zeeb AuthorDate: 2026-03-08 12:48:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-11 16:53:24 +0000 LinuxKPI: 802.11: lkpi_sta_auth_to_scan() fail graciously on lsta == NULL Usually after a firmware crash, we see reports of crashes in lkpi_sta_auth_to_scan(). One of the last ones was in the PR mentioned below. These crashes are often attributed as the problem while the real problem happened before. At this point try avoid the NULL pointer and to fail graciously if lvif->iv_bss (lsta) is no longer set. This way users have a chance to possibly recover using netif restart wlan0 rather than dealing with a panic. See if this helps us to better track down the original problems rather than the follow-up crash. On a debug kernel the KASSERT should normally have caught that condition as well but we see panics on page faults were the log line was there but then the lsta->ni deref has happened, which is after the KASSERT. I have not checked if this is a reordering problem or if the people reporting had IEEE80211_DEBUG on but not INVARIANTS. Sponsored by: The FreeBSD Foundation PR: 286219 #c11 (cherry picked from commit 53c69fd933dc49f69d5603fb27ce51064ebe681e) --- sys/compat/linuxkpi/common/src/linux_80211.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 63f92b8afb2b..01347586ef63 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3215,16 +3215,28 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int wiphy_lock(hw->wiphy); LKPI_80211_LVIF_LOCK(lvif); -#ifdef LINUXKPI_DEBUG_80211 - /* XXX-BZ KASSERT later; state going down so no action. */ - if (lvif->lvif_bss == NULL) - ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " - "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + /* + * XXX-BZ KASSERT later; state going down so no action in theory + * but try to avoid a NULL-pointer derref for now and gracefully + * fail for non-debug kernels. + */ + if (lvif->lvif_bss == NULL) { + ic_printf(vap->iv_ic, "%s:%d: ERROR: lvif %p vap %p iv_bss %p " + "lvif_bss %p lvif_bss->ni %p synched %d; " + "expect follow-up problems\n", __func__, __LINE__, lvif, vap, vap->iv_bss, lvif->lvif_bss, (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, lvif->lvif_bss_synched); -#endif - + LKPI_80211_LVIF_UNLOCK(lvif); + /* + * This will likely lead to a firmware crash (if there + * was not one before already) and need a + * ieee80211_restart_hw() but still better than a panic + * for users as they can at least recover. + */ + error = ENOTRECOVERABLE; + goto out; + } lsta = lvif->lvif_bss; LKPI_80211_LVIF_UNLOCK(lvif); KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " From nobody Wed Mar 11 17:15:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWHSm21QYz6VSPN for ; Wed, 11 Mar 2026 17:15: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWHSm1H6gz3Zvt for ; Wed, 11 Mar 2026 17:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773249336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGrKZbEUGz5u+CaELk8n6BRj0yltdkFEvhv/rvxk/bI=; b=QcF14jjV3xP2KsDKjNeHb6ZqdYYgbKDC0vBbQ6ZrmPVdJTfmKNeLvzw38mc9HxAwplxLIf pIEZ6er63dUU4uF8xYyoU7UYoWbYN99B+dns78Cad7l/Ul28ZJGqOL5RkjXBkBMID6Vb9v Ul4H6NlHQrUP3HtKAOqsgulsWYyR4cJ8MaUTP8Cht5fyKwVfVHTubuSTnbigDi9J57NvR8 49wFdNlJivI1BWNAOSBigExXlikB3DmHTc7Vdi+4zPoBUbhsqsirX3PQ3L5w0liXIsMs+x DGa7W6WuUTpHwUNogueE6kzUsQ63o2M88CM8NR/GJuIQbxJNbgVzC5hB+MBSOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773249336; a=rsa-sha256; cv=none; b=I+7OWBPGE7YZuthbThYNTHFhzRPkYIZVMjvBLUp8l0xRtmksrq4Fv5PbN8TB0Hm8E4xGpB G8ZxmhTc94iVBE78/6n346Iof/o8K5179YDIc/TeuV23TwzRHKFesi8uQFVTfec9xcJT/G uhTlPfW4EuHDj9H27SD2pjyvZfj41FE/++MoGu7v2BZLhAlnUuL/HNbp6DIplafB1sBIBQ jkP5JXNa6V2DQs2XX6bp9hT54zpeIIYb2Aw5VB5T0pNKovREiadyZgjgwUAzLonc8nhabL X1hExQws0lvzMY8YFU8tBLUJg8aK7G1+Q/8vWBK9B7bPky8gRUEPH8vMOlMy4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773249336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGrKZbEUGz5u+CaELk8n6BRj0yltdkFEvhv/rvxk/bI=; b=EzqbXgOnSvTbXq1HxI/YIwmO3zSIq7JzaHXNwQ8hBliv/Q0botJy7Yf0b3U9mU4ifJW258 ytZ+pAhQ2hhFHc9Dxz7FfXHE9oPoewkggm7oNcZo58kCtqi8XyQCRbwrk5DfooGocZXu/I zS71F79VV0lzKQl+0ziYPtKel4g7foW6Lj55u1qWXz5nnWo/pRZsIEqY1+CtA1SGRmqna9 yd+UKzfS7iVgO/Zw4SxFrVsHhio3Gucz9tGMJoGRNxl5vCUgFp9WNUqcksgTypS9DDYs4+ GCZJu5CmuOm4dEBhWFPp2t5xzhdbCFGyqKVVSoWK62aqMWt37Y3PV0rNvJ1lDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWHSm0rBSz176v for ; Wed, 11 Mar 2026 17:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47872 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 17:15:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: b9c0e0c77036 - stable/14 - LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b9c0e0c77036a83b2d1b6993224370b686446d6a Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 17:15:36 +0000 Message-Id: <69b1a338.47872.72a1d082@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c0e0c77036a83b2d1b6993224370b686446d6a commit b9c0e0c77036a83b2d1b6993224370b686446d6a Author: Siva Mahadevan AuthorDate: 2026-03-03 19:09:35 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-11 16:45:36 +0000 LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() The BUILD_BUG_ON_ZERO() macro returns an (int)0 if it does not fail at build time. LinuxKPI sort() has it as a guard for an unsupported argument but ignores the return value. This leads to gcc complaining: /usr/src/sys/compat/linuxkpi/common/include/linux/build_bug.h:60:33: error: statement with no effect [-Werror=unused-value] 60 | #define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) != 0); })) | ^ /usr/src/sys/compat/linuxkpi/common/include/linux/sort.h:37:9: note: in expansion of macro 'BUILD_BUG_ON_ZERO' 37 | BUILD_BUG_ON_ZERO(swap); \ | ^~~~~~~~~~~~~~~~~ /usr/src/sys/contrib/dev/rtw89/core.c:2575:9: note: in expansion of macro 'sort' 2575 | sort(drift, RTW89_BCN_TRACK_STAT_NR, sizeof(*drift), cmp_u16, NULL); Change to BUILD_BUG_ON() for the statement version. Reported by: CI Co-authored-by: bz Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55634 (cherry picked from commit f26cb4757eb74ceace39144933ae198ebf1b4f28) --- sys/compat/linuxkpi/common/include/linux/sort.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sort.h b/sys/compat/linuxkpi/common/include/linux/sort.h index e6196d1f41c7..361b37c587c8 100644 --- a/sys/compat/linuxkpi/common/include/linux/sort.h +++ b/sys/compat/linuxkpi/common/include/linux/sort.h @@ -34,7 +34,7 @@ #include #define sort(base, num, size, cmp, swap) do { \ - BUILD_BUG_ON_ZERO(swap); \ + BUILD_BUG_ON(swap); \ qsort(base, num, size, cmp); \ } while (0) From nobody Wed Mar 11 17:37:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWHxS4jC7z6VV1x for ; Wed, 11 Mar 2026 17:37: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWHxS2416z3dxD for ; Wed, 11 Mar 2026 17:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773250620; 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=QIKFgkDZWHebYQrPjljsgYVc9YvqLKvQeHUxUjnKdG0=; b=HAf5qNlxg6UjSEpDNB61BkTfBEwvBIdN3NzWiYL37AAZ9Aej3oWV8fVKtYGy84u2wWBVe2 UJMNTlMsf01AH2yPbtllot+k/EY+f5VTi9uOAYPj+BNSvNHB93Vy+iOsuLoJdKv48rmUgE MOZHS9A96gCl84sNe0Hc4GSkRtEW1XSTakHPvDndDKBB2tzY1r7rwUDi6VXBeDVkzq/9FI Y6RIuxADhm69LGo5K7eJs+z+YoaabsnM2BCempIVVhUacivlL5b6WrTP+zpGOgdwaD3438 8m33t+Vb2AjDKEVj37L8i+TweymqYy4tGA8Gy2AOPee2l6mnvsvSCWlBy32X4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773250620; a=rsa-sha256; cv=none; b=kBVMjEoHQrwzudpQN4J0SeJs13Kcv1ihj7EXUtok0GVhdQS2M3lal6YWat+pKc2HIY4dOf TmDvAqVAPPReDfk2morva3HMJsHHnRYYmQvBkK8mYWirDMNjNL/0xrX/ILvAtcn8In9t6H LrYuOZJqsXWoTFxV4gW0uX5JgpUUW0XlBVjxtuLM9tGaZuPzUz4CHheLxrHXy2ZKCtaCQq +4ejnTkgG+Qyz9ygXlftYByOYWXQ1vjFWvBqVSiNTSzlza24kMgovFWf7JQ2FQDVfYLKKQ OpRCyHUNDWs33Rk1xd3U4wDDRaAYraDNpudyJ3SI4EkMqjbu3gHobJhbQtybzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773250620; 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=QIKFgkDZWHebYQrPjljsgYVc9YvqLKvQeHUxUjnKdG0=; b=UYzmpPnXE6jfZeyZKS0daMJ6ME8lIvtbHvzrpZA8XMc3Om1HSYvwEmR86qefk3w6qYagWu V3hqozCa8pRFikgiah3+5sl1DdvriSKYFt9JFCbHnF+z62UFADj84a42Tv/dTRjwQfBKbq mYHazJ9873Np9IQPUYGXeRzlElwYK858gKWal0j3HuOCQrzUuYmZ3mc2PKGtaEWt8SUNeP r0rgy5K+P8r8jRyI5ZlNHGGsFL+PWemio10G1YinHeNjz22Vb205QIggsIREiduP7mYZAf rk4mz38u5ZCW3PQJgP/Si2xfLDyIHHYV+3JkX+TBPWFhmKog+7lsY1NIeOnhDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWHxS1d5wz16v0 for ; Wed, 11 Mar 2026 17:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 198bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 17:37:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Cy Schubert Subject: git: b373cf4ff140 - stable/15 - krb5: Include on Linux so __GLIBC__ can be checked List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b373cf4ff1406dca10985362aff9d9f3a3fa351d Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 17:37:00 +0000 Message-Id: <69b1a83c.198bf.3dff65ff@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b373cf4ff1406dca10985362aff9d9f3a3fa351d commit b373cf4ff1406dca10985362aff9d9f3a3fa351d Author: Jessica Clarke AuthorDate: 2025-10-22 20:06:02 +0000 Commit: Cy Schubert CommitDate: 2026-03-11 17:36:36 +0000 krb5: Include on Linux so __GLIBC__ can be checked __GLIBC__ is not pre-defined by the toolchain, it comes from features.h, so we need to make sure that's included by this point. Fixes: 4dd2b869cd07 ("krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux") (cherry picked from commit 34e7a57673c9730ee5d1f7ebb07e152567bd8e0b) --- krb5/include/autoconf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index f1cf42d8f90f..760aca79176b 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -691,6 +691,9 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ +#ifdef __linux__ +#include +#endif #ifdef __GLIBC__ /* Bootstrapping on GNU/Linux */ #define STRERROR_R_CHAR_P 1 From nobody Wed Mar 11 17:36:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWHxX1zDYz6VV8Z for ; Wed, 11 Mar 2026 17:37: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWHxX1J4Nz3f23 for ; Wed, 11 Mar 2026 17:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773250624; 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=FtB6LUEOSP5eYU1954Sl8zYA9G4XnrWR/dSwXSWHS4w=; b=Q5q3YQtqHEZ4oMwwouzrUYPuGcrqRfPpOe/bGktFZJvtG9z9b3Vveg692nDT/gfCJkIKXx mZpcQvBcx9qxcqx2WtIXoVNpWv0029ivXZHIQlvbUstw1E4C6wzyPvFytdwLgfJU4F977j j8s6TWCAAZgcX384VqAtmp47nbKyvyaPkG0zedR4FnmtSJdYqIJI5rt3+Z2uW+vqXXCSlY cVT9oy7l+lVNzmgKAKxnaac0y5XDMY7a1lnc92glMfqgP+DjuoqC4CIqaR2p+mFSIzSreO 0rEaQbkB3o4QcN9+8rOS0fkIfRwJLvmhhE9tgqzdh4kA1t4U+BCoZevcmKxGIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773250624; a=rsa-sha256; cv=none; b=UmKR1cMN/IrugRpzRuxAm7XU+EFuK+1k7PHKkk8+yjs6n0s3WJHfvb29usiG4e7TWB485b 76QNsI/umbvUDZ6AkxjsAHPrC1Quo7fN4mgfd0y4EfMrhjgLQbAj8yS1IuJTShQw68air0 sAIlJwF28c1yVpskNDCvhDX6a329mkZAiFYoSzzhWr6CcHu23psIlRVHJkdjDjlGVGfASa gI/Ft1GIs+VeIqqKI9Ttmf6IHvkrVD/wWB2pEsEf+1Cif3EO+ilh/dM+MwzouiOqYbNwUg 95cRDGX1QJXKGfP6EJgZaGKvz3nFAR4/nwrGYY+qcYZXeiB0ISzkJHD6kQZzbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773250624; 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=FtB6LUEOSP5eYU1954Sl8zYA9G4XnrWR/dSwXSWHS4w=; b=LEd4K1geF1+WtAAdkdG5m7tyw/p2pP5ULtj9UMPvzqvn7PQjEsNn9nMW0rohtBDnEhgC6+ d/CEwqHHy8n0lyd+TY0VG0/iiObstHus3kHFbdMju3T4GGOdEHYVpCF5rXoK1m3GJXLcZg r1L8MBAP9wzX+HCPvJiycesXN3edAvHtC4DTsGPWd6c9OPPLH9Rmr5YXCQTbB2n8yvky7v sZ4CQCqy0Ekt+PYrlzfY9JgBrbtcoSY9gZ8vbNKMTdItLNf5+yfahqkae0I+OBdYR9ml23 +OFIw/BkypiAZ2kRfRlRtMYRQEqyIA0ZygS4TOCSrbpemPeOE3y1RGYXngGQJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWHxX0q9hz17tD for ; Wed, 11 Mar 2026 17:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 185f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 17:36:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Cy Schubert Subject: git: fdddd0058e34 - stable/15 - krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fdddd0058e3457e2cdce3e84f43e86bedaa66846 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 17:36:59 +0000 Message-Id: <69b1a83b.185f3.2a2f72a5@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fdddd0058e3457e2cdce3e84f43e86bedaa66846 commit fdddd0058e3457e2cdce3e84f43e86bedaa66846 Author: Jessica Clarke AuthorDate: 2025-10-22 19:50:50 +0000 Commit: Cy Schubert CommitDate: 2026-03-11 17:36:36 +0000 krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux This shows up in GitHub Actions as a warning, and some compilers can default to it being an error. (cherry picked from commit 4dd2b869cd078ed6f40c42d1ef429222da16a58f) --- krb5/include/autoconf.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index ed0bf8cacc14..f1cf42d8f90f 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -691,7 +691,12 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ +#ifdef __GLIBC__ +/* Bootstrapping on GNU/Linux */ +#define STRERROR_R_CHAR_P 1 +#else /* #undef STRERROR_R_CHAR_P */ +#endif /* Define if sys_errlist is defined in errno.h */ #define SYS_ERRLIST_DECLARED 1 From nobody Wed Mar 11 17:49:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWJCh73VHz6VVkp for ; Wed, 11 Mar 2026 17:49:20 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) (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 4fWJCg4gYNz3fyH for ; Wed, 11 Mar 2026 17:49:19 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="C7RiR/s9"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::52c as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-c73a5473bbdso24645a12.2 for ; Wed, 11 Mar 2026 10:49:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773251353; x=1773856153; darn=freebsd.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=NIFh8pPpiauCIhJE4+euzNA0YafSNsO2RPnZ5c/Aplc=; b=C7RiR/s9uqa6AqfQC2NkCq3G6qC+zEy73Xh4zdclN8s56etJualJ6J+xF9Re1n5o0/ FQCuy7ZgKT14PzkZ828V/BDI+2rRMxbapOcLuXoDOPxuJommCxNnWLgGi1Q84aQ9G0yV gvF91drf4+H751lpIlaGR0Y6diclNn4Hsp2uTqXhM0Ns5/F8bE8GvBDL2NCKmH7RazAZ rjOft+rR8jPIHXx7B4Y1x8qhVwXbr9yV7G+u6Dk9vFExBFDH0HQP3+PcZT/70Us+hsvH jZ92bEx7xht4dfjzUALb5ZLxOM/PfBeV/QeJsBjRXyINLoZF76Av3I88sex7K3/P1u0R WTAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773251353; x=1773856153; h=to:references:message-id:content-transfer-encoding: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=NIFh8pPpiauCIhJE4+euzNA0YafSNsO2RPnZ5c/Aplc=; b=EMptSOAvzPwD8dugiI6lrVys70qJUjH65p2/zyXeOPzYmytCjSykbNgI5piXqFHuQe bnQBvIRxf5d+dtovSJHLU+ZR8nQf6BrfcVh+mfttbVZ01cAyxbR5LZwaHs9oWfcJaAmd MqDrr5hDghj4frAKh4wNXHnEVHKzOxTcJeQFGS/6bHDGFycmSDn+X8+zia8uThKlggcm jeXDl+euacopF/9MmeLCJQcDGAS+ygvIjDAuO+kX19G2Qb6tq+QQE8xHnPLlAoFP46wL FfURM7dnH5z1+NrfjmJoo4+osrlMggf+D2mDDc0D38PLN0vF2O/U+hIXqmsRsSrurfau Xt0Q== X-Forwarded-Encrypted: i=1; AJvYcCVH//kGJBd+w+FZBEZm57v/tSh0M/frti1N0QctqHiAVFQ7cy6sZvghds1c3d6+2livXFaMkYasIbDwrC7FZyWQXRBo@freebsd.org X-Gm-Message-State: AOJu0YyXM7ddcmgLKqG9SP4DiOBajA/nfaNfgtdmvvUTj6nFKqJdbyIz XlTouaes+sxSfeMo+iYsg2Y3Avdv6dPsxrtbEBjh8SaKpZ+A6g8TbrKy X-Gm-Gg: ATEYQzxwP5N2nkHW3JUnJNxbVZZ9MvfeCHFsQ7mLeCglhqgdoqrTxOd3sPyoceT5xgx FDrWtBcz96pPituB9JGmxkuJ98rVyIXqjaxir6m0aIzP01TrGlLZ5PTqUAPImhXXOUYu2hrpl+k wZQA1l8hNLtq2EB+sp+Ba0i0iENFxWELwe9F8TiPHNdhCZ2axyDSFA7ANmHnM2kCu9nfu0o94iN H1GCM8ithCMXd7f+LxqQMjoNLV0XHRrtQNSYd4v9Eburx5Jcw4sYbnuJxdU7DAd78cpUjQKg1L6 uxkW07Q+CYGbQzhS7fllkpH6nWtdPZCIqbcPLH/Glzg6w43v+rFV6sVIADqtuCvokFE1tdQX5YB DhmJdtjzkYZj/QcyAw4Ge/yOuIgJnJnkQQ1A1uxK714dAqFupEOHk6I/W4JX/MfhjYNozE915ds WnSgoNvU6WtCOMZaZTguFvqn/7hOQnqycTNQP0fScYtMOXn+ESrx8N X-Received: by 2002:a05:6a20:72a5:b0:394:5d0d:9217 with SMTP id adf61e73a8af0-398c60ce53fmr3563997637.44.1773251353405; Wed, 11 Mar 2026 10:49:13 -0700 (PDT) Received: from smtpclient.apple ([185.153.179.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a07365b22sm246861b3a.45.2026.03.11.10.49.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2026 10:49:12 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: f26cb4757eb7 - main - LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() From: "Enji Cooper (yaneurabeya)" In-Reply-To: <69a735cf.1c359.19b4d8ff@gitrepo.freebsd.org> Date: Wed, 11 Mar 2026 10:49:02 -0700 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <016D1851-1087-4014-8A29-77C3C2D9C2A5@gmail.com> References: <69a735cf.1c359.19b4d8ff@gitrepo.freebsd.org> To: Siva Mahadevan X-Mailer: Apple Mail (2.3826.700.81.1.4) X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::52c:from] X-Rspamd-Queue-Id: 4fWJCg4gYNz3fyH X-Spamd-Bar: --- > On Mar 3, 2026, at 11:26=E2=80=AFAM, Siva Mahadevan = wrote: >=20 > The branch main has been updated by siva: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Df26cb4757eb74ceace39144933ae198e= bf1b4f28 >=20 > commit f26cb4757eb74ceace39144933ae198ebf1b4f28 > Author: Siva Mahadevan > AuthorDate: 2026-03-03 19:09:35 +0000 > Commit: Siva Mahadevan > CommitDate: 2026-03-03 19:19:32 +0000 >=20 > LinuxKPI: avoid -Werror=3Dunused-value in sort() from = BUILD_BUG_ON_ZERO() >=20 > The BUILD_BUG_ON_ZERO() macro returns an (int)0 if it does not fail > at build time. LinuxKPI sort() has it as a guard for an unsupported > argument but ignores the return value. >=20 > This leads to gcc complaining: >=20 > = /usr/src/sys/compat/linuxkpi/common/include/linux/build_bug.h:60:33: = error: statement with no effect [-Werror=3Dunused-value] > 60 | #define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { = int:-((x) !=3D 0); })) > | ^ > /usr/src/sys/compat/linuxkpi/common/include/linux/sort.h:37:9: = note: in expansion of macro 'BUILD_BUG_ON_ZERO' > 37 | BUILD_BUG_ON_ZERO(swap); \ > | ^~~~~~~~~~~~~~~~~ > /usr/src/sys/contrib/dev/rtw89/core.c:2575:9: note: in expansion of = macro 'sort' > 2575 | sort(drift, RTW89_BCN_TRACK_STAT_NR, = sizeof(*drift), cmp_u16, NULL); >=20 > Change to BUILD_BUG_ON() for the statement version. Thank you Siva! My mailbox and the gcc tinderbox build thanks you :).. -Enji= From nobody Wed Mar 11 18:37:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWKHb4Mspz6VYw9 for ; Wed, 11 Mar 2026 18:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWKHb3V88z3lYs for ; Wed, 11 Mar 2026 18:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773254267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vcq4EFUV+53KYnyVp20I9HeY2XiXCKX3+AUNNIwjmQA=; b=ivp+JYaFXbnd09hC53uXjMVa7wcD9LInlQTbiR3goffWugxbPgLa6Gv4KIvdhsYN6zeG0Y l+pccfmxHcQpyhbdWYkKfQsmtb8sstu6mGFdG9pVvcwGYk5Jq8GaOpaqrF0kQvssc6vPee E2+QRZijFCDIxGtQXBvMldHLwSYzUdkxDtb7gUq16LFtk7wNl0HICom8G2Qp3lwOjHrp+k ID4E1OPp1yzQc9olizQmj/k8bVXOoIQnrICb6PUdSN/ePeaHSI7chB3PIVoDvBTpBR+/r3 KMCHmDEcnRXuIAlWnhDaSIlMBR0prgBmpliGCVVpythHM69Z+Lj8g3DqEnVKdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773254267; a=rsa-sha256; cv=none; b=J8wZiB17F5r6c62z/3vJR+qiPUUrAHwm2mg3WFaVKRwpblBioG7X96oZ0BwMspA3XAc1lC 0tOrtchGqI88JLyJdWygabXCV3++K6SIHpGBOJsfMUlKOPl5l1HybLBC5uA3YTKD7SP20q 248r3+sQrvP36r6SfQl8/U/FfAKdNzXPov14k7QH/bSQHR7P3YIafcnERHNEJwdQTOfuqb YqiNd1jOmqkst+OH0cmggyvUbvRhtM+GPD3qxDVcRREP47Pb0co7SvI/cS+JnhmXuvkHh5 PqvhNwMh1bO9vbVs5ERYxhkCjLk7migeYrr7BfcbOQ3KKHbYI+WTdf+ZGpk72Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773254267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vcq4EFUV+53KYnyVp20I9HeY2XiXCKX3+AUNNIwjmQA=; b=vj52MpEy9jUuqG2cFk3D2haH4iP06kBsuNqMrj/BfRjrmZy8yzKneuOa0FioTcinbLvhtR 7iZiBPyhsP2lYkdtdUPQkp8AkHkdj865uvzwv7AeLhcKYmAjve9ZjpkQO+1WJ+Bh2Z3D/F rTW7xfJyqM9xPnxevuJm5fKWK4u+VqkhTTTCu0gp0IKzgdXpVH8IVugDzWUFIMR3VIA6Wp gr/gdr2qHOb+EbGt2FFeQXRoXApeb1wh+/1/Hae5yye7DYpywptd55uh055d9MC76b1Jef Km8iCpO+ND/jquNaRY8HNoL2PfwKSDg3/cMhd20shB9tqp7uCeCB3knWFmlK6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWKHb32SGz19Q3 for ; Wed, 11 Mar 2026 18:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fd47 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 18:37:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 7fe98ee4d49a - stable/15 - mt(1)/libmt: Add LTO-10 density codes and specs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7fe98ee4d49ad4a7c5e994a999567aec4b34f84e Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 18:37:42 +0000 Message-Id: <69b1b676.1fd47.4271f18f@gitrepo.freebsd.org> The branch stable/15 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=7fe98ee4d49ad4a7c5e994a999567aec4b34f84e commit 7fe98ee4d49ad4a7c5e994a999567aec4b34f84e Author: Kenneth D. Merry AuthorDate: 2026-03-02 19:13:47 +0000 Commit: Kenneth D. Merry CommitDate: 2026-03-11 18:33:17 +0000 mt(1)/libmt: Add LTO-10 density codes and specs. These were obtained from IBM specs and actual tapes/drives. Standard LTO-10 cartriges hold 30TB raw, 75TB with 2.5:1 compression. Premium LTO-10 cartridges hold 40TB raw, 100TB with 2.5:1 compression. LTO-10 tape drives are not backward compatible with previous generation LTO tapes. (This is a change from older generation drives.) Since the Premium tape is a new thing for LTO, we'll call this density code LTO-10P vs. the standard LTO-10. The barcode identifier for LTO-10 tapes is "LA"; the barcode identifier for LTO-10P tapes is "PA". LTO-10 cartridges contain 1035m of tape, while LTO-10 Premium cartridges contain 1337m of tape and have slightly higher density. (Obtained from MAM data on actual tape cartridges and the density report, obtained via 'mt getdensity'.) LTO-10 cartridges use a polyethylene naphthalate (PEN) film substrate. LTO-10 Premium cartridges use an Aramid (aromatic polyamide) substrate that is thinner and stronger, allowing a longer tape to fit in the same cartridge form factor. usr.bin/mt/mt.1: Add density codes and specs for LTO-10 and LTO-10P. lib/libmt/mtlib.c: Add density codes for LTO-10 and LTO-10P. Sponsored by: Spectra Logic (cherry picked from commit 930486f9be5c884d1d2f0aae9f81a3f5af1f2718) --- lib/libmt/mtlib.c | 2 ++ usr.bin/mt/mt.1 | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c index 6175f6b8888a..4cbee073de56 100644 --- a/lib/libmt/mtlib.c +++ b/lib/libmt/mtlib.c @@ -647,6 +647,8 @@ static struct densities { { 0x5D, 19107, 485318, "LTO-M8" }, { 0x5E, 20669, 524993, "LTO-8" }, { 0x60, 23031, 584987, "LTO-9" }, + { 0x62, 21657, 550088, "LTO-10" }, + { 0x63, 22441, 570001, "LTO-10P" }, { 0x71, 11800, 299720, "3592A1 (encrypted)" }, { 0x72, 11800, 299720, "3592A2 (encrypted)" }, { 0x73, 13452, 341681, "3592A3 (encrypted)" }, diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1 index 4cafdf4437c7..361c9ae65bda 100644 --- a/usr.bin/mt/mt.1 +++ b/usr.bin/mt/mt.1 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 31, 2023 +.Dd March 2, 2026 .Dt MT 1 .Os .Sh NAME @@ -524,6 +524,8 @@ Value Width Tracks Density Code Type Reference Note 0x5D 12.7 (0.5) 5376 19,107 (485,318) C LTO-M8 14 0x5E 12.7 (0.5) 6656 20,669 (524,993) C LTO-8 0x60 12.7 (0.5) 8960 23,031 (584,987) C LTO-9 +0x62 12.7 (0.5)15104 21,657 (550,088) C LTO-10 15 +0x63 12.7 (0.5)15104 22,441 (570,001) C LTO-10P 15 0x71 12.7 (0.5) 512 11,800 (299,720) C 3592A1 (encrypted) 0x72 12.7 (0.5) 896 11,800 (299,720) C 3592A2 (encrypted) 0x73 12.7 (0.5) 1152 13,452 (341,681) C 3592A3 (encrypted) @@ -572,6 +574,11 @@ NOTES LTO-7 cartridge initialized with a higher density format by an LTO-8 drive. It cannot be read by an LTO-7 drive. Uncompressed capacity is 9TB, compared to 6TB for LTO-7 and 12TB for LTO-8. +15. LTO-10 Premium cartridges hold 40TB uncompressed vs. 30TB + uncompressed for standard LTO-10 cartridges due to slightly higher + density and stronger, thinner, longer tape. LTO-10 tape drives + are not backward compatible with previous generation LTO tape + cartridges. .Ed .Bd -literal -offset 2n NOTE ON QIC STREAMERS From nobody Wed Mar 11 18:38:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWKHr2K2dz6VYt7 for ; Wed, 11 Mar 2026 18:38: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWKHr1hTPz3ls5 for ; Wed, 11 Mar 2026 18:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773254280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDHh9nyUJtGdqbr4y0auPBM9tNZWrlGD3BEFI1msBec=; b=YOeW8dz6Vngjb9ofr1+56Pfj5pVBTLd0Wr/9ctxZEHPqhAwMxfgQAOc4e89z7IPcaZYBf/ QlkCfbu7qSrsuGGpCMCQ8jhDRR5w4dvcKvyPJE67IGo3lXYQbJhy33nreyFEBk4sJKUcai NKdhJdeCGkvMixcDLaCapH8G7OLtHqLOVDDNQTN8Zh5Xr3bX+r7Wz0+bt9qxb10+G090I9 d3+YnBWuLnIaGeW+cd2UN+/f2Gl/B0gMmAERDOTbwWqxI6rLGDrvErKwuIUaSUXGaSXBjV u88PzZMm6VwVwfnUU/O5OxjYOzHKA+KpuO0acpB7S8DGjqwrYym0KhuT88MjBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773254280; a=rsa-sha256; cv=none; b=v4mgE3hkcAyZ4PEIbnguMPxBK1zhvOvPjOLsxjZNQTMYXw1vTNsZiN4zPD2QPznqzp2s4U RRRT7nBe9FQEAe6B1lHbv7aopYBA+ZZZDmVRHglinJVuaOTg7iKd+0I44jo/DW19r3IYKS CQMZspePyRhPYK8gAFDFGuLZ3lNiNMa9tBIzaVznKFonRbzQe+AveNS+xrqt3q6OPeh7VN BgpKi1beQf5rmaExq2qCRXu1PqNnGnntkrKgB1sNaJJ1/1IEeeOOhwhHB8pZuWGxXQEQ0X 7guWEhD38Rz+1Z8+UBXbGOppZ9PyH1QwIYAB4HxUDswq3Q8lCEsob1a0OkFf9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773254280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDHh9nyUJtGdqbr4y0auPBM9tNZWrlGD3BEFI1msBec=; b=fwH60aRKfIVaa8g07aKucYaBqaUnKTAPV3ZokjWuA/wNsjFGJFOrx8F4xJvw/4XNCYCADi gwrCF12WJ0i8+Vdh7gKecGbFlDOr8u2mAWXttxwsEpYlV6RrFwYK28k9mzxXZPE2xcWu3B P//RQXMORiFTCn06d399SI0Tl6aCu5mfEvB9Ei3OpLMV8A8DyKq5ICmlEXHVY/U/MZeTyG JWoLhOj6Gw3RVXcdzyTxQovgr14tY7dx1KCBhjenktjVmz9xKSfxIFrNqVGH1ZfqIj6nDk se5aQW+c5izEbQOs6kt74CKFqD6pzVj7Th0PQk9U4d10dAWx86oBukNv6a247A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWKHr0vthz198H for ; Wed, 11 Mar 2026 18:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21355 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 18:38:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 5f55c59cbab5 - stable/14 - mt(1)/libmt: Add LTO-10 density codes and specs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f55c59cbab5b06a2fcb272b345ce94c48c01c1c Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 18:38:00 +0000 Message-Id: <69b1b688.21355.77a2a155@gitrepo.freebsd.org> The branch stable/14 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=5f55c59cbab5b06a2fcb272b345ce94c48c01c1c commit 5f55c59cbab5b06a2fcb272b345ce94c48c01c1c Author: Kenneth D. Merry AuthorDate: 2026-03-02 19:13:47 +0000 Commit: Kenneth D. Merry CommitDate: 2026-03-11 18:36:26 +0000 mt(1)/libmt: Add LTO-10 density codes and specs. These were obtained from IBM specs and actual tapes/drives. Standard LTO-10 cartriges hold 30TB raw, 75TB with 2.5:1 compression. Premium LTO-10 cartridges hold 40TB raw, 100TB with 2.5:1 compression. LTO-10 tape drives are not backward compatible with previous generation LTO tapes. (This is a change from older generation drives.) Since the Premium tape is a new thing for LTO, we'll call this density code LTO-10P vs. the standard LTO-10. The barcode identifier for LTO-10 tapes is "LA"; the barcode identifier for LTO-10P tapes is "PA". LTO-10 cartridges contain 1035m of tape, while LTO-10 Premium cartridges contain 1337m of tape and have slightly higher density. (Obtained from MAM data on actual tape cartridges and the density report, obtained via 'mt getdensity'.) LTO-10 cartridges use a polyethylene naphthalate (PEN) film substrate. LTO-10 Premium cartridges use an Aramid (aromatic polyamide) substrate that is thinner and stronger, allowing a longer tape to fit in the same cartridge form factor. usr.bin/mt/mt.1: Add density codes and specs for LTO-10 and LTO-10P. lib/libmt/mtlib.c: Add density codes for LTO-10 and LTO-10P. Sponsored by: Spectra Logic (cherry picked from commit 930486f9be5c884d1d2f0aae9f81a3f5af1f2718) --- lib/libmt/mtlib.c | 2 ++ usr.bin/mt/mt.1 | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c index 43f9c95bb797..7c3cdfa072dd 100644 --- a/lib/libmt/mtlib.c +++ b/lib/libmt/mtlib.c @@ -648,6 +648,8 @@ static struct densities { { 0x5D, 19107, 485318, "LTO-M8" }, { 0x5E, 20669, 524993, "LTO-8" }, { 0x60, 23031, 584987, "LTO-9" }, + { 0x62, 21657, 550088, "LTO-10" }, + { 0x63, 22441, 570001, "LTO-10P" }, { 0x71, 11800, 299720, "3592A1 (encrypted)" }, { 0x72, 11800, 299720, "3592A2 (encrypted)" }, { 0x73, 13452, 341681, "3592A3 (encrypted)" }, diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1 index fe5506107c99..bb9e0fedf7b7 100644 --- a/usr.bin/mt/mt.1 +++ b/usr.bin/mt/mt.1 @@ -28,7 +28,7 @@ .\" .\" @(#)mt.1 8.1 (Berkeley) 6/6/93 .\" -.Dd October 31, 2023 +.Dd March 2, 2026 .Dt MT 1 .Os .Sh NAME @@ -526,6 +526,8 @@ Value Width Tracks Density Code Type Reference Note 0x5D 12.7 (0.5) 5376 19,107 (485,318) C LTO-M8 14 0x5E 12.7 (0.5) 6656 20,669 (524,993) C LTO-8 0x60 12.7 (0.5) 8960 23,031 (584,987) C LTO-9 +0x62 12.7 (0.5)15104 21,657 (550,088) C LTO-10 15 +0x63 12.7 (0.5)15104 22,441 (570,001) C LTO-10P 15 0x71 12.7 (0.5) 512 11,800 (299,720) C 3592A1 (encrypted) 0x72 12.7 (0.5) 896 11,800 (299,720) C 3592A2 (encrypted) 0x73 12.7 (0.5) 1152 13,452 (341,681) C 3592A3 (encrypted) @@ -574,6 +576,11 @@ NOTES LTO-7 cartridge initialized with a higher density format by an LTO-8 drive. It cannot be read by an LTO-7 drive. Uncompressed capacity is 9TB, compared to 6TB for LTO-7 and 12TB for LTO-8. +15. LTO-10 Premium cartridges hold 40TB uncompressed vs. 30TB + uncompressed for standard LTO-10 cartridges due to slightly higher + density and stronger, thinner, longer tape. LTO-10 tape drives + are not backward compatible with previous generation LTO tape + cartridges. .Ed .Bd -literal -offset 2n NOTE ON QIC STREAMERS From nobody Wed Mar 11 20:07:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWMHG2WK2z6Vfx6; Wed, 11 Mar 2026 20:07:38 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWMHG1zgdz3yf8; Wed, 11 Mar 2026 20:07:38 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773259658; 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=XubDP68q1RbKPJY2/1rcS3spT3pxZ2vD4Qq3M1O62Eo=; b=i81m2dgGriJqKY62HWBmoVfGRApR1oq6/RuTrhb//Piwkfmg/PGxIhskJQTdHq3w14DW/C yiauwnFmVGlQ7FYR5uKGkjOiRrOV//ySwRkK9hGjWaEC345a2zJK8f8VIaFBbScDTJNV+z aCaWDc4IUX20hjZp8qQre17382a/fAygZwB4fq5tdc2UyqDUaxPT2ZDjXj9QrfiokjNlma Hg68y0ieu8wdTQ25WduTTVqeKkbOCuLA50te4xenB59dlvqyNn5DsLR0ZQxVhIaUxkMAqk Iu/b4/Vzt9U8MgaI2xWW0plPPsfBBrnHWJSA5F37dqXoQc3hgnnrNX4R2ndjzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773259658; a=rsa-sha256; cv=none; b=nbbGLuANojGf+y+usTPIYjljZFBqZbIwsbwlppP8fqAx1YzIYEzlTcRYkGkshofS0B5qjq QFCpvJQbr6v21HGP14wN18piXqXSe9lyF9w1lm++P++/3ZSYbW7HT6lXbpDzijTSRhABIh AtldG5SgHei41a5YIJCDEstnVyRaCwHEa5bKtjZtRHyBJgXmRaWrhJy+2uoLvVW/WipEZR XXzfmbgKrtZJNl9QyA+W2baTkCnbZCiGUxSDGcK6bRkQfGo1g6uIsxOxcbC1QT0PVHGFy3 KwuqsyAYOQ8kI65quk7XCwAsrCFfAD08C/J4Rs9P2y+pJmQckz738C64Ah5zkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773259658; 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=XubDP68q1RbKPJY2/1rcS3spT3pxZ2vD4Qq3M1O62Eo=; b=QI9qDSCLjKuJRlbKbgajhoaZLuRb1h4v9dFHIcz+PbEDVbmIT9UHAoIfc3xJfupnXSSjAK IJzWU0chLNXMZAwaxYGMJDlswXqcC3LOI1wxN/z8TgfYxARlILHLuPiE2M4Oh0MOAVbHSw r4MIyazBjVy8s7GCLsIxtc10yFyrB3wVAIvSvHlzo1X+zftyiR23mbKUNvHoFfRqaoeZrx Lmlb/T+N3hTToJFTJvxgNwQuOczpcKYYT45IVCOeOT2DJmz12FhXw10E687q+CV6n3XqeU F6kKPp8X7gUm2YmBHjVtsX4BtAl+rHA2vExdC2oaulzfmvc4OLL8+NQi8tqt3g== 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 4fWMHG0WwnzqPW; Wed, 11 Mar 2026 20:07:38 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 16DE84810C; Wed, 11 Mar 2026 21:07:36 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Bjoern A. Zeeb Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: a1fd73b3faed - stable/15 - brcm80211: add LinuxKPI files and module Makefiles In-Reply-To: <69a101b2.20f4a.3331ae88@gitrepo.freebsd.org> (Bjoern A. Zeeb's message of "Fri, 27 Feb 2026 02:30:10 +0000") References: <69a101b2.20f4a.3331ae88@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 11 Mar 2026 21:07:35 +0100 Message-ID: <86fr663zaw.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Bjoern A. Zeeb writes: > The branch stable/15 has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Da1fd73b3faed190457a072ad71= 27a1a860b3e925 > > commit a1fd73b3faed190457a072ad7127a1a860b3e925 > Author: Bjoern A. Zeeb > AuthorDate: 2026-02-10 21:33:09 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2026-02-26 23:07:18 +0000 > > brcm80211: add LinuxKPI files and module Makefiles >=20=20=20=20=20 > sys/compat/linuxkpi/common/include/linux/platform_data/brcmfmac.h > is based on > git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). >=20=20=20=20=20 > Currently only PCIe is made to compile. > It does load firmware (if needed, e.g., on arm64 with an alignment > issue fixed), and starts to come up. >=20=20=20=20=20 > To make it work there is a cfg80211 layer and netdevice integration > to do, so do not hold your breath just yet. >=20=20=20=20=20 > (cherry picked from commit 902136e0fe112383ec64d2ef43a446063b5e6417) > --- This broke the gcc build (I assume it's also broken in main, but that's currently hidden by another failure in usr.sbin/bhyve): x86_64-unknown-freebsd14.3-gcc14: error: unrecognized command-line option '= -ferror-limit=3D0' DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Mar 11 22:30:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWQRn2m7bz6V75Q for ; Wed, 11 Mar 2026 22:30: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWQRn0rXXz3GdG for ; Wed, 11 Mar 2026 22:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773268213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SKK64v7pan6TbwJHnojN1hwZqrosbdr8QkVxdd17nAY=; b=sMwbxnHGe6viGL77fWQSg7VvL8cZvPF/xNc2+bMy/zcbwC2RKp49Z8Fn0IKjnEuTAP+zGc v7Al8LHITzMxIhefWgBs9QLLRkd7N3vaNCdNK56YDTQT2uDoq/fAhJVFmG8FkiW7ExTowT KeQWqvOXfNuiUNqw+G/oH+MJblBLkh35JPnLJz0CC7bZoOvrnKqJmM6p3+Nfe6jBm6Uh1w aDV3EMCPGb8D22Zzq8LyeJYkeM00eqFofAfFKHKnYIKD4XG7jiaYwg4NkeMg0uYPSvBOq7 ROIBX2biqpIODBT8o7Dz2Slvt23/R+Dm5L8Qi5H19wXo20hqjwOzsr6l81YRpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773268213; a=rsa-sha256; cv=none; b=KRw8N+xLD7T6mO6XPWqKu3axfubzvrZcEO83RhK7OyHQCJlg9akrgrToT0gCTOO7bJ1ESp GgQ6BZh3TPISz/eD1YHnog1qS9HvGdRc0N6d3VsrryOa5C31xeVGCM8elL+3snqE6X6gxw ejJm9poOoJgJXTQTpHSyW6uRtc3dUWporYfo0T+/8x2zYx0bestQUJOzr+OZDmCgFuW3Nu wY4Qe+Hv4aOtKOiwztppA40KgohZJyyaf4pZOq39O7fXwORL9tVE3h8Kzzlprs1uwyxI97 rStvGUP5hEIffjVe/BHbDoCQX+OkF3+5ylABrK6HCOaSa6Ej8XyB81A7qLdGpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773268213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SKK64v7pan6TbwJHnojN1hwZqrosbdr8QkVxdd17nAY=; b=L/8hXhkd1cchU87ldEHfKOvnzlsRhG/JEk6j6B+DeUCh8ZvaBdTlp34V4oeFynAbesTZnG npopCM/yjKvtZS1nOqgLaJ9N14cXP+Pzb/XwLPBdYII4v0vuJWEAh6n1HMqmfzNyGo7SX8 QZcz0whN4Y717tMCGld6SqKMOqhPJkr2QMCt/korjHNtz8wprjkXOHP/n7SdAWIGIpJjw1 JpVWDAb2ESkPFyqsb14tWkf7HRX8fGhk5uHGGTe0fpb6zcW/FDypR3CuLLmGmpEd3dwf1a UtG2WfDxftuSlqc+oIGiHwgCvJwb3wv88GGTZatU3uVPZzWWLh0wKR8dZaVR/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 4fWQRn0Fq8z2gG for ; Wed, 11 Mar 2026 22:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19352 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 22:30:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a8b15315b250 - main - cam: Add comment about routine List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8b15315b250b067f16d629664caf6358d468bff Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 22:30:07 +0000 Message-Id: <69b1ecef.19352.14bef906@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8b15315b250b067f16d629664caf6358d468bff commit a8b15315b250b067f16d629664caf6358d468bff Author: Warner Losh AuthorDate: 2026-03-11 22:29:17 +0000 Commit: Warner Losh CommitDate: 2026-03-11 22:29:49 +0000 cam: Add comment about routine Explain why we bump ref counts here. Sponsored by: Netflix --- sys/cam/cam_xpt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 8b42fb2ca6c5..f43dde8de401 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -1027,6 +1027,10 @@ xpt_add_periph(struct cam_periph *periph) return (status); } +/* + * Remove this peripheral from the list of peripherals the devices maintains. + * Bump generation numbers to note topology changes. + */ void xpt_remove_periph(struct cam_periph *periph) { From nobody Wed Mar 11 23:56:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWSMn429qz6VDwx; Wed, 11 Mar 2026 23:56:53 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx-01.divo.sbone.de (legacy1.sbone.de [80.151.10.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E7" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWSMn1Z0fz3Q1s; Wed, 11 Mar 2026 23:56:53 +0000 (UTC) (envelope-from bz@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id BEDCAA64805; Wed, 11 Mar 2026 23:56:25 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 6386E2D029E7; Wed, 11 Mar 2026 23:56:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 9TvkFEDftOLM; Wed, 11 Mar 2026 23:56:44 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 130CB2D029D8; Wed, 11 Mar 2026 23:56:44 +0000 (UTC) Date: Wed, 11 Mar 2026 23:56:43 +0000 (UTC) From: "Bjoern A. Zeeb" To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: a1fd73b3faed - stable/15 - brcm80211: add LinuxKPI files and module Makefiles In-Reply-To: <86fr663zaw.fsf@ltc.des.dev> Message-ID: <75r13n85-o23n-6250-o939-qqq1898pqr59@SerrOFQ.bet> References: <69a101b2.20f4a.3331ae88@gitrepo.freebsd.org> <86fr663zaw.fsf@ltc.des.dev> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-1535374699-1773273404=:11296" 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:3320, ipnet:80.144.0.0/13, country:DE] X-Rspamd-Queue-Id: 4fWSMn1Z0fz3Q1s X-Spamd-Bar: ---- This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-1535374699-1773273404=:11296 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Wed, 11 Mar 2026, Dag-Erling Smørgrav wrote: > Bjoern A. Zeeb writes: >> The branch stable/15 has been updated by bz: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=a1fd73b3faed190457a072ad7127a1a860b3e925 >> >> commit a1fd73b3faed190457a072ad7127a1a860b3e925 >> Author: Bjoern A. Zeeb >> AuthorDate: 2026-02-10 21:33:09 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2026-02-26 23:07:18 +0000 >> >> brcm80211: add LinuxKPI files and module Makefiles >> >> sys/compat/linuxkpi/common/include/linux/platform_data/brcmfmac.h >> is based on >> git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git >> e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). >> >> Currently only PCIe is made to compile. >> It does load firmware (if needed, e.g., on arm64 with an alignment >> issue fixed), and starts to come up. >> >> To make it work there is a cfg80211 layer and netdevice integration >> to do, so do not hold your breath just yet. >> >> (cherry picked from commit 902136e0fe112383ec64d2ef43a446063b5e6417) >> --- > > This broke the gcc build (I assume it's also broken in main, but that's > currently hidden by another failure in usr.sbin/bhyve): > > x86_64-unknown-freebsd14.3-gcc14: error: unrecognized command-line option '-ferror-limit=0' This is not even hooked up to the build; how can it break anything? -- Bjoern A. Zeeb r15:7 --0-1535374699-1773273404=:11296-- From nobody Thu Mar 12 01:38:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdT2YhVz6VMPy for ; Thu, 12 Mar 2026 01: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWVdT1tywz3Yr3 for ; Thu, 12 Mar 2026 01: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=1773279533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XA+/r427joDZ4n76cS239UQn8yhSoP9KEK0Kn6P5xs=; b=yk56C5xLuVbEJUUjPt8Li0IWxHvMbwiE0iXtqg40IqcIrMiYwUrRvxmLk35uR7EbbSsLsU 2jmaFmFxduu3Qbfy7XHsMJNJq7jdYZf82gYhPMgj0JkJ/jD3WEI5D6kFy552wiI5r+/kD0 RFqdiiBBCEJyFkCM1mQggaAKRjxYyQSKWSeghnMuxCp1VtwUrhpt613GFv4jppc1KCj2aH PcFAC3q2Dzd6wlw5xNRNL66KKnaMzoVWnS7nOraExTX9M/kvO7FMdN3RpznyZ7O6lBGH79 KlMKZGY5MBB1tBpXPZ7uI3t2YjbO2Q7sCDCOH9Adv9meONT2lYPY3DSHgsi+pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773279533; a=rsa-sha256; cv=none; b=q8mMMNDcSbilXVRh7aK/1C7PbPGQUANWs+e+avFkVFwy+HVvRJIgOSeRiLdgdmgEv7/eX9 HKjF8EejGujKC+3RWwwzlRYbqvKDBDiEigZK+kqW34gCl62QEM+aghCNaCpQ9JRGg89ehA 3OaX1hfdg7D2dDgqEUtxY0MGgCx5TfxjQe7DR6OXdctM72g39Yql+zkyh2A796KJd9kSai bNWHy5W5jybPZD62Nwf5gLURYrU/aI9j7yxXELyo92gsxgdpuX0f5tS0qGcTr+ixFsMzVo pNHNTGD+CiByca2hif20RpmiqTiUySXnG7Gbp5nrcIVQKiWjVmLsmzruIS7A/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=1773279533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XA+/r427joDZ4n76cS239UQn8yhSoP9KEK0Kn6P5xs=; b=o+2QPBdPhrjfKgmRDitF0CZVqfHr6jSKA01cwICbWAx1xq3aAa2t4bDyARR4M0w3EidNmo HoqlOdzU5fi3fGFEX8m2+364fsBJomuRgnaLiuD7SJYvR+J48VD5Elw+VSGvIgQrgzeyNS 8xYWA5rs25WVwN4ZYl40u3R6U4bqWv1s67M6osZ+sVfOV3L3gSscbcjHtq2GI6afnDWGkB IUxqcM5vCf537H8MU5fqAEY82zX9QAe2VrJMLKruOutP2Rzzrlp3Ni89eOFpdtLco8etNf bSsGf4tDnceVzcj/qWJ5gXe9yf1ed8c8BHJ48ZaUNm2kqRIzCO0M4iU8xoUO2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdT1H1dz8Cm for ; Thu, 12 Mar 2026 01:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 01:38:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 2a3d650552fc - stable/15 - packages: Don't create empty packages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2a3d650552fc1a48c89e3d6d8e77f64ad53372ed Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 01:38:53 +0000 Message-Id: <69b2192d.35f06.575528de@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2a3d650552fc1a48c89e3d6d8e77f64ad53372ed commit 2a3d650552fc1a48c89e3d6d8e77f64ad53372ed Author: Lexi Winter AuthorDate: 2026-02-21 20:19:42 +0000 Commit: Lexi Winter CommitDate: 2026-03-12 01:38:01 +0000 packages: Don't create empty packages If a package plist only contains directories, but no files, do not create the package. This fixes an issue where setting "package=foo" in mtree causes the "foo" package to always be created, even if nothing else installs in that package, because the mtree entry is always added to the plist. This most often happens: * With architecture-specific directories, because mtree can't install a directory conditionally based on architecture, and * With packages that are completely empty when a particular src.conf knob is disabled, because mtree will still create the directories. Although it's theoretically possible that we might want to create a package that only contains directories, there are no such packages today. MFC after: 2 weeks (stable/15 only) Reviewed by: manu, des Differential Revision: https://reviews.freebsd.org/D55412 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit 7965c93e4d4103ba6ed7ac1e5f1599c93cbcdbf7) --- Makefile.inc1 | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0af5c38f0489..30d37e6bd2f5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2277,17 +2277,24 @@ create-world-packages-jobs: create-world-package-${pkgname} create-world-package-${pkgname}: .PHONY @sh ${SRCDIR}/release/packages/generate-ucl.sh -o ${pkgname} \ -s ${SRCDIR} -u ${WSTAGEDIR}/${pkgname}.ucl - @awk -F\" ' \ - /^name/ { printf("===> Creating %s-", $$2); next } \ - /^version/ { print $$2; next } \ - ' ${WSTAGEDIR}/${pkgname}.ucl - ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ - -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ - -M ${WSTAGEDIR}/${pkgname}.ucl \ - -p ${WSTAGEDIR}/${pkgname}.plist \ - -r ${WSTAGEDIR} \ - -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} + @if [ "$$(grep -vc '^@dir' ${WSTAGEDIR}/${pkgname}.plist)" -gt 0 ]; then \ + awk -F\" ' \ + /^name/ { printf("===> Creating %s-", $$2); next } \ + /^version/ { print $$2; next } \ + ' ${WSTAGEDIR}/${pkgname}.ucl && \ + ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ + -M ${WSTAGEDIR}/${pkgname}.ucl \ + -p ${WSTAGEDIR}/${pkgname}.plist \ + -r ${WSTAGEDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}; \ + else \ + awk -F\" ' \ + /^name/ { printf("===> Skipping %s-", $$2); next } \ + /^version/ { print $$2; next } \ + ' ${WSTAGEDIR}/${pkgname}.ucl; \ + fi .endfor create-sets-packages-jobs: .PHONY create-sets-packages From nobody Thu Mar 12 01:38:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdY5tYyz6VMp2 for ; Thu, 12 Mar 2026 01:38: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWVdY3kpHz3ZH7 for ; Thu, 12 Mar 2026 01:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773279537; 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=2uzEif/6mhM1Wzz8t4trXDUjymapqZMKBrX7HFnhS3g=; b=RIrd9mkb8mZrGaZTZHpf67W/QMSpLuZtD4XWuHtKuNVxboBKDc62TmAapuZYFoGWKQnCmx HFR6XpGTgiAfMGqDQ+NPNjy4HAKR1q/WS4hGFIXVQflZ3ZdObBsYIWtrHToZD7jqYeXcgb QesiU0Ip7Qabp8P84bADUF2GvoUEvjmsAWwhF3HrswDnb31m+Dz5p+QKWQhIYtjvus6dTh Upkxe/ldVU6erR/ilXPJyDi6dG27OeLaeess2ngsh9/+DfbPaqdaQ06iTi8tHmEwwWqzWR vTvLUWLctGD/m0gugt8LZ2jN6473MTdnPdEWS4DHNFYbwikxf1qN+uRgb770yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773279537; a=rsa-sha256; cv=none; b=cfHcIt49aHr1jlJ1rHt89vO6AKsErqW8EEojTcub8/J379wlspqT3EXc0TGWdJsrNtU7qb 0tnemAhzmX6oFPq7xJ5NT3FE7JwmfAnXI1Pyn+FfmQAijOmAsNJ7iIXaC0yuzqypLH2Qu8 H+i2egebRFT0+qe8TEOUEatJu2KamgD6Z19wuhs+PIVJjHpqaOwhA8emboZhxY7g7MqOEn zcNK/TIWAbCFKl+FTPM1H/HnJWYUJrQMatWa4MKiXGg9LKwR1/T3m/7xlz5BRCwZOsSmU5 LBxN3+94qbW280NP6aaTDfndf4wcNxetio6P1pD/j1SCCFt9oRG5c4r/nxL6Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773279537; 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=2uzEif/6mhM1Wzz8t4trXDUjymapqZMKBrX7HFnhS3g=; b=v5xe762RfKO5o23jfvFVe+UazzzP6+ICvNmAPTPon8Z2wTnOIhsd507B0wMsILJE9ufYr3 7YLOvlOQ1Lt26Wj1z2J1FWhJBA2Hyv4UZdrrQGcpmH29qWOHwfPTV7PmCbAHwDBkiUndke ngqEtyrb/kydHCQhtYX+9ojpUUForpjoOL5bW5FeS2Hmnp5GuypeA0dD+T6RV8WWveHULU vpD3B1uXruMCWkVn6E/er3vMAs0QtcaPd/Iv8QGVwXj6dhrC0wKyZXGoTn9VGvmDA06VaV JnWROze2FWdnD+RJjz6qmR3PxnouLekgMNgDruH8o4pLKHVAnGrcYl4V3fPFxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdY26HQz8Rr for ; Thu, 12 Mar 2026 01:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36094 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 01:38:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Lexi Winter Subject: git: 1346ffb457d5 - stable/15 - Makefile.inc1: Remove svn support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1346ffb457d512323940d3d9dd18776539bf0087 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 01:38:52 +0000 Message-Id: <69b2192c.36094.4099b240@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1346ffb457d512323940d3d9dd18776539bf0087 commit 1346ffb457d512323940d3d9dd18776539bf0087 Author: Warner Losh AuthorDate: 2025-10-05 14:25:06 +0000 Commit: Lexi Winter CommitDate: 2026-03-12 01:37:38 +0000 Makefile.inc1: Remove svn support We don't need this, and we don't use this. It's left over from the svn days. We stopped supporting svn as a project entirely when 12.x went EOL. And VCS_REVSION isn't in any current ucl file or anywhere else in the tree. Sponsored by: Netflix Reviewed by : kevans, brd Differential Revision: https://reviews.freebsd.org/D52912 (cherry picked from commit 28b858f5059c8b25fa08be494699997000fce58c) Makefile.inc1: Add back missing if The .if defined(_MKSHOWCONFIG) covered an unusually large area, so it should have not been removed in the last commit. I must have tested in the wrong tree before pushing... FixeS: 28b858f5059c Sponsored by: Netflix (cherry picked from commit 106951f09fe39dc693fd7130ab4bc751e1438631) --- Makefile.inc1 | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e65021c356c5..0af5c38f0489 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -523,25 +523,6 @@ BUILDENV_SHELL?=/bin/sh .endif .if !defined(_MKSHOWCONFIG) -.if !defined(VCS_REVISION) || empty(VCS_REVISION) -.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD) -. for _D in ${PATH:S,:, ,g} -. if exists(${_D}/svnversion) -SVNVERSION_CMD?=${_D}/svnversion -. endif -. if exists(${_D}/svnliteversion) -SVNVERSION_CMD?=${_D}/svnliteversion -. endif -. endfor -.endif -.if defined(SVNVERSION_CMD) && !empty(SVNVERSION_CMD) -_VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR}) -. if !empty(_VCS_REVISION) -VCS_REVISION= $$(echo r${_VCS_REVISION}) -.export VCS_REVISION -. endif -.endif -.endif .if !defined(GIT_CMD) || empty(GIT_CMD) . for _P in /usr/bin /usr/local/bin @@ -603,6 +584,7 @@ EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .if !defined(PKG_VERSION) PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif + .endif # !defined(_MKSHOWCONFIG) PKG_NAME_PREFIX?= FreeBSD @@ -2299,9 +2281,6 @@ create-world-package-${pkgname}: .PHONY /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${WSTAGEDIR}/${pkgname}.ucl - @if [ "${pkgname}" == "runtime" ]; then \ - sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ - fi ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ From nobody Thu Mar 12 04:25:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWZL844M4z6VZbG for ; Thu, 12 Mar 2026 04:25: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWZL83N7Yz3pJx for ; Thu, 12 Mar 2026 04:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773289552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOZNLCP8F2CXNefyTq3zxfiauAMJi0RED1+WkKnRVvM=; b=qk6D5TDnwxgg0U0rIqnDaYD0w3+Bpg4vNQte+FQWK37yhpL7WGN7ZnN2TCixKXzHqjNlrh +2GGflUVuEtLaNpEx0GjAGFSZwoqXmIqdqRJjHCjBd5HYHiCIetmwcvOnfSRcJtJwdtDej jJIapL6kYUjKWlHOQMk4ThPG8sEA6LT9SCNsseXK6FGUE2EQ4dYofDBKRfG3kMDJ6vse1z BdOasiwHXaYApkMAxEpmU/sZyNgA9gYSp/5l87erJmc+6USB4xAHJnVdEFzLC/EMRKLCuO ZNpMw2ZbXajVh5wD0zBLWKXjm05zt/zuYYu+kae90Nh4RZPZSJ6o4oPfDi/JCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773289552; a=rsa-sha256; cv=none; b=TjA4MkBPEUSrTKjl0zneciaHu4la2N8MVXdGMQ3cSxTwsH4LP9JhsO9W34/WZQmbMOpOvR nctgbbeW9rq7OmHr1Rr+cDdcXenam4sGRVgnt83vZIvPtUDPGBYjVvzfXc2hAmUwQxj9Gm u2+MGelsbwY2QKrl+QPDw64orlFr2kRMbkORYoq+5n7cS1ANBHDnYQtYq6ilq7AI/+YiTk Yn1XI+rgfIrf7u0+989+1BRo15R1nJrDgj8Q13j63HULKFKvWekAc0XSoN1SM7HoYI+Eao YpiV9JdXXENFw0/OaKphdj0SC77ieLHt7EOvMwA4utsF3kYZMdail+DlLbag1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773289552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOZNLCP8F2CXNefyTq3zxfiauAMJi0RED1+WkKnRVvM=; b=CFYDnJA4on0tayABV2fuUAJgPH7I+1FsEmD47XLnvfDz7Fiesg+GHzoyAuhgVr8hB3Hxz9 lAhlXgKUZ6g/Y4uFp5Ba7uvWkcULNBpEC2HxXDEdYk5vKdnCerpPneJAnh3uiPSoFytGWL 3bBU8rp2Dcp9WXMXswShcCwIZ2ZUTIyaOIzDWngb/QvgIt0Pf4yS8r65i7QjjgjnTn8o0n WLUSdNbXXlL8Rr/pnUVl6wSd1u4HONCxxUhZ5OUJvOPFjm15BGESZjuydIHkscJBEoPnes IA997bYoxpJDw3G1b6ToX5m9Of73BCLaeO6pm0/NVbzIt9HYlmd3Gp0Ga4GGYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWZL82y4jzD2g for ; Thu, 12 Mar 2026 04:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 465a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 04:25:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 5f0ab9d9e965 - main - amd64: Make start_all_aps() static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f0ab9d9e965225c4af0c6ed481e01eee0ffab8f Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 04:25:47 +0000 Message-Id: <69b2404b.465a4.420e75c6@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5f0ab9d9e965225c4af0c6ed481e01eee0ffab8f commit 5f0ab9d9e965225c4af0c6ed481e01eee0ffab8f Author: Zhenlei Huang AuthorDate: 2026-03-12 04:24:59 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-12 04:24:59 +0000 amd64: Make start_all_aps() static It is not used elsewhere since the change [1]. [1] ac3ede5371af x86/xen: remove PVHv1 code MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55668 --- sys/amd64/amd64/mp_machdep.c | 3 ++- sys/amd64/include/smp.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 05e4109e73bb..3b16845e2d87 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -110,6 +110,7 @@ smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown = */ static int start_ap(int apic_id, vm_paddr_t boot_address); +static int start_all_aps(void); /* * Initialize the IPI handlers and start up the AP's. @@ -330,7 +331,7 @@ amd64_mp_alloc_pcpu(void) /* * start each AP in our list */ -int +static int start_all_aps(void) { vm_page_t m_boottramp, m_pml4, m_pdp, m_pd[4]; diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index 28c372a2e556..55ad236a4617 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -35,7 +35,6 @@ inthand_t IDTVEC(rendezvous_pti); void invlop_handler(void); -int start_all_aps(void); #endif /* !LOCORE */ From nobody Thu Mar 12 13:44:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWpkX2mc6z6VM6C for ; Thu, 12 Mar 2026 13:44: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWpkX0NHKz3ksp for ; Thu, 12 Mar 2026 13:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773323060; 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=PI4PB3H9mpI6K1Itg0PmFKq6autbkQRVJgKClbNjez8=; b=uY0nni4SRklZWJ19UYHCz4GLifNv/hDC0YS1c7P05qgwL6q77M1rT86NQMVY7vxVgrU3GU I0pc4iFQOkMERlandiRdmiNaW//+Qzo0BjXdyBCLDt1+WWBoPElQ3S6jn6VDdouz+x7mpn 1sGU+Xv7StSfFSauXVkhcNBAybGEaVb11nFEzJ37pjuxJJwGHA/6DueSVJ0LQ6Vjua3BWJ LEGPSpDAGwR5mIlN5Uk2ff2S9FD3qfruMfuBLsmFUyHz92hOEgZXdVzlAhnohpWY/BLyiK NHUQWjk2C4TkVJ9c1pYJyPN+PG5hPfZrBlaxdMzn2vXPomx9M2fBsweKD/K8WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773323060; a=rsa-sha256; cv=none; b=jecQwHnRvSd3oEQPiDPyjJrBECPEgmd2R4XhOmB1+/oPHUijhKphajyEB+kQ5bKS80SRUo SFXW401gkexKGftJHKtmuOsLtZdAYECZOKWfjEVpa/QKF1+HvMmZe+CGRopOp0tAbKWZNX HqNXnhAb5444MkorhBm6Vlyxbg8YKne75H2kXW27THkfb5rRgWnSJzpj8YAji3Pkw2jcXD S+3csHHaRwVqlx+YGd9RPFMwse6QG96tRYna55HPjIQWp2MahC+ENPJSrWmfZ8mJS9jgve Nmg+4ypRvt0JFfYeX/kaqg3sygr2ojkA7nkYreHU0Gcfeq0+JGiXbbe1U56Zjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773323060; 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=PI4PB3H9mpI6K1Itg0PmFKq6autbkQRVJgKClbNjez8=; b=U6COkOT6GAfeaojkDgvPYksVlvSd0poHhToHSQelJIKgql3snVOxRaxEXO9qDx0S6ru5zE PfTeMTeR+btbpMxxCu0zkMPUVkui7laJE7YaGY0x3f5sI7ei3Y3oAHstDTlHjmNzgzZplZ jejjk1XAvU2x3/9Rr7cHC2eTOqGOegVEmDqeVLFMTraXJQXZD2GgGXrOBhEU+YDsrzKscf Y2sj8ZKRfDJaRqbJuhIqHZqsNsI2IyNs+pPZpAvi0Jw4TK8kz0aJfWFce06/Z3J5Ebv4Hy fJ/uZ4WWwnyO/ZtuMF7NoTDO8kiHYHC8TZDZOoTsW9zVldh0PTZNPhXVjxbtog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWpkW6XRqznRB for ; Thu, 12 Mar 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3208e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 13:44:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: d74dfe03ba98 - stable/15 - camcontrol: Add SPDX-License-Identifier tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d74dfe03ba98d9cbb1607f94c3992b4355987fa0 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 13:44:19 +0000 Message-Id: <69b2c333.3208e.9ce9f@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d74dfe03ba98d9cbb1607f94c3992b4355987fa0 commit d74dfe03ba98d9cbb1607f94c3992b4355987fa0 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:12:25 +0000 Commit: Ed Maste CommitDate: 2026-03-12 13:43:57 +0000 camcontrol: Add SPDX-License-Identifier tag Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55269 (cherry picked from commit 25ed5ee654a8cd7d9f694307c62bb84ff4d16866) --- sbin/camcontrol/camcontrol.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 1b27ad3723dd..7ad177c3e4b6 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1997-2007 Kenneth D. Merry * All rights reserved. * From nobody Thu Mar 12 13:44:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWpkc2fC8z6VM5P for ; Thu, 12 Mar 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWpkc0mfQz3l37 for ; Thu, 12 Mar 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773323064; 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=fyZUV8MSaEUGxFgf9s6Xl7Vr+5DE2WUze3yfpdonJw4=; b=wpmQCakM8Ieok4XOqRtW8AqVGnUxuLNs8tYQ5OTlMqEes9SJjIg813lEWrDss2YuXTKHDL +JyyGVbkg8YQDOE583qSurOhyBylhe9nwXIoSWQR46ZepicISTBk2OkWcJtB/Jsd1c6H5h mQNq31a1aqL+NGH46VG19YwnU+pwIWi6Wkh7wRF2IobE8woYq1bjRsFcQOtgAyYSwpoe4E CyYMRSE5JvODwBmfYigR0yNL68YGsRAMUU/2rVVSUckr7Kem8WTH5g/IKNprCJPY5Wmfyt OCGjxU4yV6viPqXJawlj4US6GvjkRxiu4op41/bIRwcN+WR/k0rMpfymb0uiPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773323064; a=rsa-sha256; cv=none; b=sBTgX/v3hljZmW5J8gV9+qbvPusHImwwOSup0v+voa2vY1GCCwrf/RayztAjin6QwlxyCg oP/0hkewjXF8fAn7xdMd1hwJ/EfPJEpF4L4Xyyq8EXFXLr7tZtHutQ+OGxNPpKYhRRUDPQ fRr0ySQlhjAWtycWBxCi7xd7c4UZhqmmoCSyIA5LBYOLWKGE+ZvbGGYbLjnuoNw+tRRZG/ 7AC58myrFGh4GaOg6v+myKNlHmEGKQmNXxgxjJ42jI14/yr4rrPrvZfNQ1lkPNLKQiYRCl XhOH2saBU8C9i3CWxgq0djWfLr1X4RDo636JZBpv+87EwEh/SxOrPvdV2pr99Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773323064; 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=fyZUV8MSaEUGxFgf9s6Xl7Vr+5DE2WUze3yfpdonJw4=; b=gY2hDnkQxX2+BnREUt1F6smYRhG2TTB1Da7K9lYvmwTVvRCdScUx6WnXn0lxaGLJvtPGKj NN6NVtyMn1BiIn2kitgQPzl6HMeJ+EHJ6U2gs052EAyWy7UrNZdzW44EWp2CR72nQHLrtV wOByOz/DSx+S7y3qLNjX3DF8gLmrzBLtwx6ky5ZHlsDbS5DWtFLLnPIimWGm/jGsdgIgwa eopG9YJ5rz+Z3S5v0kFnmuO4MUTUH2gmOX8rDnRcMKMfgm4q1OCLVu0KRRXg/2caj7V+q4 5S90z7GWtdqxdY8l2SfJKZNhmr/jQoAlZB/2PlPuLWmpJByIm+WOjD68xMGF9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWpkc03vYznv7 for ; Thu, 12 Mar 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32df8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 13:44:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dmitry Lukhtionov From: Ed Maste Subject: git: b1d4b8379f92 - stable/15 - camcontrol: Print 'transport revision' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b1d4b8379f928259b50b3db13972a9a47a345892 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 13:44:18 +0000 Message-Id: <69b2c332.32df8.203ea0c4@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d4b8379f928259b50b3db13972a9a47a345892 commit b1d4b8379f928259b50b3db13972a9a47a345892 Author: Dmitry Lukhtionov AuthorDate: 2026-02-23 14:42:59 +0000 Commit: Ed Maste CommitDate: 2026-03-12 13:43:38 +0000 camcontrol: Print 'transport revision' As described in Serial ATA Revision 3.5a Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/2044 (cherry picked from commit f4f9054dc47b430872d38c7a75fea753c6fe796f) --- sbin/camcontrol/camcontrol.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 15a5d42a2ba5..1b27ad3723dd 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -1672,6 +1672,35 @@ atacapprint(struct ata_params *parm) } printf("\n"); + printf("transport revision "); + if (parm->transport_major == 0 || parm->transport_major == 0xffff) { + printf("Unknown"); + } else { + if (parm->transport_major & 0x0400) + printf("SATA Rev 3.5"); + else if (parm->transport_major & 0x0200) + printf("SATA Rev 3.4"); + else if (parm->transport_major & 0x0100) + printf("SATA Rev 3.3"); + else if (parm->transport_major & 0x0080) + printf("SATA Rev 3.2"); + else if (parm->transport_major & 0x0040) + printf("SATA Rev 3.1"); + else if (parm->transport_major & 0x0020) + printf("SATA Rev 3.0"); + else if (parm->transport_major & 0x0010) + printf("SATA Rev 2.6"); + else if (parm->transport_major & 0x0008) + printf("SATA Rev 2.5"); + else if (parm->transport_major & 0x0004) + printf("SATA II: Extensions"); + else if (parm->transport_major & 0x0002) + printf("SATA 1.0a"); + else if (parm->transport_major & 0x0001) + printf("ATA8-AST"); + } + printf("\n"); + if (parm->media_rotation_rate == 1) { printf("media RPM non-rotating\n"); } else if (parm->media_rotation_rate >= 0x0401 && From nobody Thu Mar 12 14:48:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWr8y3ttJz6VSN3 for ; Thu, 12 Mar 2026 14:48: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWr8y28rPz3tDD for ; Thu, 12 Mar 2026 14:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773326930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZErd9AL4mn1/zLA52gF4HBP6XbY160zb/kiXNUoQ9gs=; b=unon59FBosdDerYathqP/XfSlHYGDIGyBd+rxnFzd5W56qiiV/XuW8uRalU/XH7cdlrcXb xmGl31wip9KsRjQKfFhvR3nn6kqCd9O87ITspoL7CdvQa7TCQAQPRsZ7+DSNfOBs1rORj3 IkgWZmRNbVxbm8XkPViEtqIK5RuKvmiPQsOaf63qo07uiv0LL5A2kHDK0h0vJg2r4p43vh BpZecs9NOihAcC6/Fk5qxLyvzG7+88wi8ZROtWYC2j7DHWplObiIKyY6twlELkjEmI3sCs 6DPPp/OrQ13DibUYkaJhE3sISZjoO3/A2w9CvIY7Gegf0A6z0lS6MonTcCZDNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773326930; a=rsa-sha256; cv=none; b=Dot/WlfgZaiKoRr8uLunM+VKopthq996spxSrrQ28KAlhKyhOQJ4FaUFwaAjh9I3g1kksc S/lJOSEmHyWCvg1Vs5Lh7sJSjalW+96cbJagxYBR05N+9I3ziM7/ZYZ+9/gU4AmwJ3Xaqh g5EU+bWTNGGlhuBfAVji87ce3hSsnYdGPJRNzFtJKZS3AANfmgQ2LGdGuF/EiJHZk+Qmhr iC4f/0cgHVuW4CLHQwwJfMakXvDJNaZGnLu/BQsMDvB0B48fPBoKhToIXdx7N5q9179k0b xUazz1e9wA7Q3lkR7/G8G4p6xOsicPUjSFPGakGRWaTXva0U54BGBhAtPVH8mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773326930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZErd9AL4mn1/zLA52gF4HBP6XbY160zb/kiXNUoQ9gs=; b=lGUWBFi0skTNWIq074eovxuD0qqulAmVS2DWlMLleqoO/wkyrfzmB2mLBoN+koUghG7B3E 1odRpE94+iosOhHtbt+RC4JxbG00r2PuSMxu4IUpMDfYZl4j+TC4NqP9vjfUXD2XECvR1P qz08W0MG8Fywf6G9JpsoPY2bzrSxdtZsOzEGeLr2YWm8EVU00QtRsBa+XjYVJWCMIOYfuy nqTqVGKDFFI84sdTnqiIVr4NM09pCTLB+E4lWspX47xA8Kip5r+bMpkkzXmASnaf34k9iy g31M+4a3sLrQaHeP6TwN5a1TaOZnBtk0IzfCp7SaQ49OAlRcK36Hw5ky/MVlEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWr8y1ggtzqS6 for ; Thu, 12 Mar 2026 14:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 14:48:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: a2b2ce2c15bb - main - DEFINE_IFUNC.9: update NOTES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2b2ce2c15bb73d9f87d5072cf65f1f027e066fb Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 14:48:50 +0000 Message-Id: <69b2d252.38e13.8446a44@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b2ce2c15bb73d9f87d5072cf65f1f027e066fb commit a2b2ce2c15bb73d9f87d5072cf65f1f027e066fb Author: Mitchell Horne AuthorDate: 2026-03-12 14:44:46 +0000 Commit: Mitchell Horne CommitDate: 2026-03-12 14:44:46 +0000 DEFINE_IFUNC.9: update NOTES ifuncs are now implemented for all architectures, so drop the caveat statement. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55815 --- share/man/man9/DEFINE_IFUNC.9 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/share/man/man9/DEFINE_IFUNC.9 b/share/man/man9/DEFINE_IFUNC.9 index 0bb75d1fd4da..8cb216af04d7 100644 --- a/share/man/man9/DEFINE_IFUNC.9 +++ b/share/man/man9/DEFINE_IFUNC.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 18, 2019 +.Dd March 10, 2026 .Dt DEFINE_IFUNC 9 .Os .Sh NAME @@ -134,8 +134,7 @@ function with an optimized implementation for CPUs that advertise support. .Sh SEE ALSO .Xr elf 5 .Sh NOTES -ifuncs are not supported on all architectures. -They require both toolchain support, to emit function symbols of type +ifuncs require both toolchain support, to emit function symbols of type .Dv STT_GNU_IFUNC , -and kernel linker support to invoke ifunc resolvers during boot or +and kernel linker support, to invoke ifunc resolvers during boot or during module load. From nobody Thu Mar 12 15:17:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWrpB5b98z6VVnt for ; Thu, 12 Mar 2026 15:17: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWrpB3lxsz4FZV for ; Thu, 12 Mar 2026 15:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773328658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xCEX2owLJq6zbWgxRO3gVS5wkjEbM8kxDrUHobyFPI=; b=wUyfRR/W55PuMjtYYfH5+UeokTs4Ukoj0t83HU0gWM5w/J4oEA/ihHs9ZR933CQrZmd1P6 0ScACkl0yhsJew/BtpUYWQfBVvSH8/x8n3QdpxN7kRX3jioPWav1ujuXkimd8kDGHwDcws ThtiCvUUcBXF1l7QEKelThe8Y4mxt1ImU2zlqhkCytmzl+X4F21qLHtfv3D5gTW7dUdQYE xAZzLKNO7iwMkI1YliIGXyRAqJ9Gp3kj08bd2hx2N6GCntmb3dIe2J2lVyQAkgLtE66Zhf gbQgIkqyzdkcqWsK3cYdDQvDu4DZ8Nz1pkyV1mVQW1c5/35GdHU/G9Qadob5aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773328658; a=rsa-sha256; cv=none; b=fk2yIjVLAaKSUzZLfIjNt/nxuPPE7+ZEdo2k+BEeQN0qSsz05X97jZGYTUc5eh9DM/t+8R 7VgA36YDtnKQiWSviXHaII/2mNGnvI8bhxAbbZl+wk7W6xVZmNG1j6+IS+KItcwrvUwcfC R4Ds+uK2WN07bYUnri7M1HVfxjmvyLkWSkN/Uw/cfzjIjJG8WGWMgcB6ZQ+jp6WdIAVWCW kNmzWrQwLlnUpSqrdTWWCwyH7RNmC1Wj8QoShJcJukseSXzGb3hfNaN8mip6g5E6jDwRnL rVvmA85jBASlGR0QTNEfRDrhrB+i3c+7BdKABYO4SrZcFbyAUnOKgLcTiFm0Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773328658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xCEX2owLJq6zbWgxRO3gVS5wkjEbM8kxDrUHobyFPI=; b=uriB75jQdyhLON5w8GGJrhXQQbKZlhHiop+Ies1vlWUXFNodzh8MgACogBIFYDkkSF1xI8 3eazPueESuMWa+oykUxczjg68oh4calhRVNu9Q+VIpYMEzunvwozE5byNuMiyoDj4c+fcp 0EXJU1UUihO1Y+p11pkimQZL2ATW9RI4cWDz4cV+QaTTwxYsNICsUxC25G+dKrnXSJRN5E t6wF0wROJ2TnEPvPmLXmlHJMA4sCgwaSw7cLMaa1XZt1ttPcB2Qt0rmiZ39Xg9Vq9j3umf ThQGpSad6oicga+dmWB+q/5yDTo+WnVYK+n2/D4nCgAsqmBhS2q+XhxGNtj5KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWrpB34SyzrWg for ; Thu, 12 Mar 2026 15:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bfab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 15:17:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 25cc459286a0 - main - shm: Zero struct kinfo_file in sysctl handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25cc459286a02b646751541ccde5a33319471c73 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 15:17:33 +0000 Message-Id: <69b2d90d.3bfab.693adee2@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=25cc459286a02b646751541ccde5a33319471c73 commit 25cc459286a02b646751541ccde5a33319471c73 Author: Ed Maste AuthorDate: 2026-03-11 01:59:07 +0000 Commit: Ed Maste CommitDate: 2026-03-12 15:17:14 +0000 shm: Zero struct kinfo_file in sysctl handler Reported by: Calif.io in collaboration with Claude and Anthropic Research Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55806 --- sys/kern/uipc_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index fe3feab4149f..0ad5be2e8d71 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2149,7 +2149,7 @@ sysctl_posix_shm_list(SYSCTL_HANDLER_ARGS) { struct shm_mapping *shmm; struct sbuf sb; - struct kinfo_file kif; + struct kinfo_file kif = {}; u_long i; int error, error2; From nobody Thu Mar 12 15:29:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWs3b5MHfz6VWML for ; Thu, 12 Mar 2026 15:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWs3b1nn7z4Gf2 for ; Thu, 12 Mar 2026 15:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773329355; 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=L38Wy93RcfBsBd58RVYg8ObO2kKhED6wrhJoxDQkMqk=; b=ctSTVod9Z/hSbQezvnLzKsKcZhW11deVlUNjal1hvkH72OucCc3JT6VOREVk+wgZ1JNi87 t8bgVZ5cAIzCLHTZYt74XJt18vuJimjqLQXQ9CAOQej+ZOehrhXomX1yAWCBWjItmGN/TT kW7bFcWW2CiY5VZB6W7esExWIC37rCBLP3vdElmP/rypgU8wFznYP8W6YhxApiT5N94o0x 5C1ta+N3SVWT2XVTePuyDAsxAItzwEXJjV7T5ydBIK1A+D+HIi5Zt1OT65sbQhfp6CpcPE DlXnyEsATpSD9tGO0RtE42mzdVq1IUSZLpuPB7EOqEf2juQ5B5JJGnYXck3B8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773329355; a=rsa-sha256; cv=none; b=QzTN2MWFWCwUvnEXw7vZyBPc4MKrgE7Htl6Q0dSbNHBZE8xGk7G5pjzbEpc30rQg+NVIca lSd5U9itm0DNQ3IfsfQPy7UmX1x1k1m+AFbZfW4ewuKq3c8762YISAM0l771GcG1U085qc EdGF5hVqgUtBBsePe+rX/Cvvuvbel7a0jFWfHqZHce/Dxbzz93gcomQm6aE6WZJKWmUsxs GPWvP20GHw0cC7i3v4SPA4vk4e3hbRNMiwO/gy2gRUWg6XsYyLMsw8FRoTQZQYnBoG2F2E U1dzXIKJSuUJ99JYaPjy3UEtXR0Yu3du7X8girdJfHSemW43D4nKw+07g1fyJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773329355; 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=L38Wy93RcfBsBd58RVYg8ObO2kKhED6wrhJoxDQkMqk=; b=gsT12Z6sCem0XzZM+YDPhe9fnG6KHSoJI+HcRCLdIsubuGQ8sxEgrkNxURRnxeNKDVm4X8 pXc0d/5LbGAORgdD4cRKzriTbU4fW5TQ2LjuijFz3s2cfjU8znUkpqVTHig+Ku5FIEYNoY c/4ZO2LLbkKeGC4syXR00C+VcpfQs99XOPtzEHlt2GVWknRGts7tGQ9RWoLEQfPIBM/wIl ts79tECLFvsX8khZZ6w0cQeyv1uWlo2kUpr1mOLYpfg8IOaAxJ3MES9YE0IwzjQIr1HUPl qAqbUw1sixl/KnNqmioNMbCJ5BDJEwaweCQaBjKgavjUO4dXPYcVvfjW5oePIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWs3b0ntbzrPW for ; Thu, 12 Mar 2026 15:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 15:29:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Paulo Fragoso From: Mitchell Horne Subject: git: ce9aff829e02 - main - hwpmc_amd: fix amd_get_msr() MSR offset for newer counter bases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce9aff829e02c9a21c04eae77a45f2193d1ed5a1 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 15:29:09 +0000 Message-Id: <69b2dbc5.3cf06.4ef36fc5@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ce9aff829e02c9a21c04eae77a45f2193d1ed5a1 commit ce9aff829e02c9a21c04eae77a45f2193d1ed5a1 Author: Paulo Fragoso AuthorDate: 2026-03-12 15:21:33 +0000 Commit: Mitchell Horne CommitDate: 2026-03-12 15:29:04 +0000 hwpmc_amd: fix amd_get_msr() MSR offset for newer counter bases The previous code subtracted AMD_PMC_PERFCTR_0 (0xC0010004) from all perfctr MSR addresses to compute a relative offset. This is incorrect for counters using AMD_PMC_CORE_BASE (0xC0010200), AMD_PMC_L3_BASE (0xC0010230), and AMD_PMC_DF_BASE (0xC0010240), producing wrong offsets. Fix by promoting amd_core_npmcs, amd_l3_npmcs, and amd_df_npmcs to static module-level variables and computing the correct flat RDPMC index per AMD BKDG 24594 page 440: ECX 0-5: Core counters 0-5 ECX 6-9: DF counters 0-3 ECX 10-15: L3 Cache counters 0-5 ECX 16-27: DF counters 4-15 ECX > 27: Reserved, returns EINVAL Reviewed by: Ali Mashtizadeh , mhorne Sponsored by: NLINK (https://nlink.com.br), Recife, Brazil Fixes: 37bba2ad92d8 ("hwpmc_amd: Add support for additional counters") Differential Revision: https://reviews.freebsd.org/D55607 --- sys/dev/hwpmc/hwpmc_amd.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index cf44f9362a72..c27d93995d59 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -60,8 +60,8 @@ struct amd_descr { }; static int amd_npmcs; +static int amd_core_npmcs, amd_l3_npmcs, amd_df_npmcs; static struct amd_descr amd_pmcdesc[AMD_NPMCS_MAX]; - struct amd_event_code_map { enum pmc_event pe_ev; /* enum value */ uint16_t pe_code; /* encoded event mask */ @@ -664,10 +664,41 @@ amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) static int amd_get_msr(int ri, uint32_t *msr) { + int df_idx; + 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; + /* + * Map counter row index to RDPMC ECX value. + * + * AMD BKDG 24594 rev 3.37, page 440, + * "RDPMC Read Performance-Monitoring Counter": + * ECX 0-5: Core counters 0-5 + * ECX 6-9: DF/Northbridge counters 0-3 + * ECX 10-15: L3 Cache counters 0-5 + * ECX 16-27: DF/Northbridge counters 4-15 + * + * AMD PPR 57930-A0 section 2.1.9, + * "Register Sharing" for DF counter details. + */ + if (ri < amd_core_npmcs) { + /* ECX 0-5: Core counters */ + *msr = ri; + } else if (ri < amd_core_npmcs + amd_l3_npmcs) { + /* ECX 10-15: L3 Cache counters */ + *msr = 10 + (ri - amd_core_npmcs); + } else { + /* ECX 6-9: DF counters 0-3 + * ECX 16-27: DF counters 4-15 */ + df_idx = ri - amd_core_npmcs - amd_l3_npmcs; + if (df_idx < 4) + *msr = 6 + df_idx; + else if (df_idx < 16) + *msr = 16 + (df_idx - 4); + else + return (EINVAL); + } return (0); } @@ -767,7 +798,6 @@ pmc_amd_initialize(void) enum pmc_cputype cputype; int error, i, ncpus, nclasses; int family, model, stepping; - int amd_core_npmcs, amd_l3_npmcs, amd_df_npmcs; struct amd_descr *d; /* From nobody Thu Mar 12 16:11:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWt0w3YMRz6VZK1 for ; Thu, 12 Mar 2026 16:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWt0w3MmRz4PRy for ; Thu, 12 Mar 2026 16:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773331920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u11E3tMYZBifVltQiVcFMkyLuRHHIOsAVD0OYcRe70c=; b=Fec+zVoPnKtNbGhNsES0yH4iyuCb8pGokJzOMVkSDxS3e56ypYNWwKbNt3Qgq8p4J9SLr3 sxiHWGBnzvp9xZDnbb/I/f19CJRey3luCIkX/hzf0VrKyIPCnA0ayWsekcmHHOsnM7a9Mb VJ38DyZdI7H2UG/xC1/N0oCx0mD5Far/PwXKfOFA7HBaWofINnHE6cPdqMCqos3pA05PFL Gy54PXqQmUjfhaI2OCg+BVlPE1coXnxhbr7cBQvQTyzIzkCea61WRFzj6mz6dOqjD16RRr UK2fcwnJLro0wFmOPHscIWPCsSFLjZGri9QjDg8xEDSdnAnNcefpqTUknD5YJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773331920; a=rsa-sha256; cv=none; b=wjTagZ1t8U/0y85ByJuQdm+WlAXUcQJfeGKga01Zm0MZ6RTXbAmSxAzMXdsma4y8PcuFDY WGImW+3kKcFPBbi18vOsh0sH0/m9r9NAZiz28sOLNvle34cBgSwyDK9hd/KP/HMDPYlA6E aRXEJQLv9Jr4ckaGC8Yxt79Q5idKFjYlMSYMzkqt96uqR9OitcxgWTedcvljE5stbIc6dd +AVf7dIpuWfWmyckBlFjNGdXuuPGaCI3uWmZcxoX4v6GAdkCELSNlLKFzQD4n3OUviUAw4 GHyxikYxwc5r5zNqC+YYCpCd8+J1m5fBr+x0lrcnNitw1ubZ4JQqwCNzzczzOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773331920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u11E3tMYZBifVltQiVcFMkyLuRHHIOsAVD0OYcRe70c=; b=o74O3fjwX8zC6khdH4bS4N1731A/KgZlw2uDN0NufpMFjoTOsPWhX3W2z9MSOopOFXXBC8 7K6QoBdDuckaWFw2EtXSuOr93Vd3uHbWmKZa88D3E0emowc6P9ZGyxbPpuOS+QPHI3myBf vGPGWVxAdxjbw9yp/igW2d3PMNlK6xqg8/Lq3WctSz2oNJKRRuSV/yWuCIbshVgAoCVn4Q S2l1zytXLpc5lZMBWdYZROdlanjDWpeSu5Ng1C9iZ7eQWduRhFjfrrSSZTxnv6ieuq0AHb bo38jsaXfJtNT/bYEBTtFVJY+kYTlTuur/Wqv+YH5AzqGoNZmI/FwPiGRcbLGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWt0w1f9Gzt55 for ; Thu, 12 Mar 2026 16:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41328 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 16:11:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 7e68af7ce2c1 - main - fusefs: redo vnode attribute locking List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e68af7ce2c1b892954df415774fe59fd2f1b62f Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 16:11:55 +0000 Message-Id: <69b2e5cb.41328.db0b562@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7e68af7ce2c1b892954df415774fe59fd2f1b62f commit 7e68af7ce2c1b892954df415774fe59fd2f1b62f Author: Alan Somers AuthorDate: 2026-01-23 21:23:51 +0000 Commit: Alan Somers CommitDate: 2026-03-12 16:11:25 +0000 fusefs: redo vnode attribute locking Previously most fields in fuse_vnode_data were protected by the vnode lock. But because DEBUG_VFS_LOCKS was never enabled by default until stable/15 the assertions were never checked, and many were wrong. Others were missing. This led to panics in stable/15 and 16.0-CURRENT, when a vnode was expected to be exclusively locked but wasn't, for fuse file systems that mount with "-o async". In some places it isn't possible to exclusively lock the vnode when accessing these fields. So protect them with a new mutex instead. This fixes panics and unprotected field accesses in VOP_READ, VOP_COPY_FILE_RANGE, VOP_GETATTR, VOP_BMAP, and FUSE_NOTIFY_INVAL_ENTRY. Add assertions everywhere the protected fields are accessed. Lock the vnode exclusively when handling FUSE_NOTIFY_INVAL_INODE. During fuse_vnode_setsize, if the vnode isn't already exclusively locked, use the vn_delayed_setsize mechanism. This fixes panics during VOP_READ or VOP_GETATTR. Also, ensure that fuse_vnop_rename locks the "from" vnode. Finally, reorder elements in struct fuse_vnode_data to reduce the structure size. Fixes: 283391 Reported by: kargl, markj, vishwin, Abdelkader Boudih, groenveld@acm.org MFC after: 2 weeks Sponsored by: ConnectWise Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55230 --- sys/fs/fuse/fuse_file.c | 8 +- sys/fs/fuse/fuse_internal.c | 42 +++++---- sys/fs/fuse/fuse_io.c | 21 ++++- sys/fs/fuse/fuse_node.c | 89 ++++++++++++++++---- sys/fs/fuse/fuse_node.h | 91 +++++++++++++++++--- sys/fs/fuse/fuse_vfsops.c | 2 + sys/fs/fuse/fuse_vnops.c | 81 ++++++++++++++++-- tests/sys/fs/fusefs/bmap.cc | 34 +++++--- tests/sys/fs/fusefs/notify.cc | 38 ++++++--- tests/sys/fs/fusefs/read.cc | 192 ++++++++++++++++++++++++++++++++++++++++++ tests/sys/fs/fusefs/rename.cc | 90 ++++++++++++++++++++ 11 files changed, 609 insertions(+), 79 deletions(-) diff --git a/sys/fs/fuse/fuse_file.c b/sys/fs/fuse/fuse_file.c index 5f5819c2ccae..2cb8ef84e511 100644 --- a/sys/fs/fuse/fuse_file.c +++ b/sys/fs/fuse/fuse_file.c @@ -194,6 +194,8 @@ fuse_filehandle_close(struct vnode *vp, struct fuse_filehandle *fufh, int err = 0; int op = FUSE_RELEASE; + ASSERT_VOP_ELOCKED(vp, __func__); + if (fuse_isdeadfs(vp)) { goto out; } @@ -381,7 +383,11 @@ fuse_filehandle_init(struct vnode *vp, fufh_type_t fufh_type, } else { if ((foo->open_flags & FOPEN_KEEP_CACHE) == 0) fuse_io_invalbuf(vp, td); - VTOFUD(vp)->flag &= ~FN_DIRECTIO; + /* + * XXX Update the flag without the lock for now. See + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293088 + */ + VTOFUD(vp)->flag &= ~FN_DIRECTIO; } } diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index a3590060f44a..914deb416c08 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -262,7 +262,7 @@ fuse_internal_cache_attrs(struct vnode *vp, struct fuse_attr *attr, fvdat = VTOFUD(vp); data = fuse_get_mpdata(mp); - ASSERT_VOP_ELOCKED(vp, "fuse_internal_cache_attrs"); + ASSERT_CACHED_ATTRS_LOCKED(vp); fuse_validity_2_bintime(attr_valid, attr_valid_nsec, &fvdat->attr_cache_timeout); @@ -478,7 +478,9 @@ fuse_internal_invalidate_entry(struct mount *mp, struct uio *uio) cn.cn_namelen = fnieo.namelen; err = cache_lookup(dvp, &vp, &cn, NULL, NULL); MPASS(err == 0); + CACHED_ATTR_LOCK(dvp); fuse_vnode_clear_attr_cache(dvp); + CACHED_ATTR_UNLOCK(dvp); vput(dvp); return (0); } @@ -498,8 +500,8 @@ fuse_internal_invalidate_inode(struct mount *mp, struct uio *uio) if (fniio.ino == FUSE_ROOT_ID) err = VFS_ROOT(mp, LK_EXCLUSIVE, &vp); else - err = fuse_internal_get_cached_vnode(mp, fniio.ino, LK_SHARED, - &vp); + err = fuse_internal_get_cached_vnode(mp, fniio.ino, + LK_EXCLUSIVE, &vp); SDT_PROBE2(fusefs, , internal, invalidate_inode, vp, &fniio); if (err != 0 || vp == NULL) return (err); @@ -694,6 +696,8 @@ fuse_internal_remove(struct vnode *dvp, nlink_t nlink; int err = 0; + ASSERT_CACHED_ATTRS_LOCKED(vp); + fdisp_init(&fdi, cnp->cn_namelen + 1); fdisp_make_vp(&fdi, op, dvp, curthread, cnp->cn_cred); @@ -891,15 +895,9 @@ fuse_internal_do_getattr(struct vnode *vp, struct vattr *vap, struct fuse_vnode_data *fvdat = VTOFUD(vp); struct fuse_getattr_in *fgai; struct fuse_attr_out *fao; - off_t old_filesize = fvdat->cached_attrs.va_size; - struct timespec old_atime = fvdat->cached_attrs.va_atime; - struct timespec old_ctime = fvdat->cached_attrs.va_ctime; - struct timespec old_mtime = fvdat->cached_attrs.va_mtime; __enum_uint8(vtype) vtyp; int err; - ASSERT_VOP_LOCKED(vp, __func__); - fdisp_init(&fdi, sizeof(*fgai)); fdisp_make_vp(&fdi, FUSE_GETATTR, vp, td, cred); fgai = fdi.indata; @@ -917,22 +915,27 @@ fuse_internal_do_getattr(struct vnode *vp, struct vattr *vap, fao = (struct fuse_attr_out *)fdi.answ; vtyp = IFTOVT(fao->attr.mode); + + CACHED_ATTR_LOCK(vp); if (fvdat->flag & FN_SIZECHANGE) - fao->attr.size = old_filesize; + fao->attr.size = fvdat->cached_attrs.va_size; if (fvdat->flag & FN_ATIMECHANGE) { - fao->attr.atime = old_atime.tv_sec; - fao->attr.atimensec = old_atime.tv_nsec; + fao->attr.atime = fvdat->cached_attrs.va_atime.tv_sec; + fao->attr.atimensec = fvdat->cached_attrs.va_atime.tv_nsec; } if (fvdat->flag & FN_CTIMECHANGE) { - fao->attr.ctime = old_ctime.tv_sec; - fao->attr.ctimensec = old_ctime.tv_nsec; + fao->attr.ctime = fvdat->cached_attrs.va_ctime.tv_sec; + fao->attr.ctimensec = fvdat->cached_attrs.va_ctime.tv_nsec; } if (fvdat->flag & FN_MTIMECHANGE) { - fao->attr.mtime = old_mtime.tv_sec; - fao->attr.mtimensec = old_mtime.tv_nsec; + fao->attr.mtime = fvdat->cached_attrs.va_mtime.tv_sec; + fao->attr.mtimensec = fvdat->cached_attrs.va_mtime.tv_nsec; } + fuse_internal_cache_attrs(vp, &fao->attr, fao->attr_valid, fao->attr_valid_nsec, vap, true); + + CACHED_ATTR_UNLOCK(vp); if (vtyp != vnode_vtype(vp)) { fuse_internal_vnode_disappear(vp); err = ENOENT; @@ -950,10 +953,13 @@ fuse_internal_getattr(struct vnode *vp, struct vattr *vap, struct ucred *cred, { struct vattr *attrs; + CACHED_ATTR_LOCK(vp); if ((attrs = VTOVA(vp)) != NULL) { *vap = *attrs; /* struct copy */ + CACHED_ATTR_UNLOCK(vp); return 0; - } + } else + CACHED_ATTR_UNLOCK(vp); return fuse_internal_do_getattr(vp, vap, cred, td); } @@ -1140,7 +1146,7 @@ int fuse_internal_setattr(struct vnode *vp, struct vattr *vap, int err = 0; __enum_uint8(vtype) vtyp; - ASSERT_VOP_ELOCKED(vp, __func__); + ASSERT_CACHED_ATTRS_LOCKED(vp); mp = vnode_mount(vp); fvdat = VTOFUD(vp); diff --git a/sys/fs/fuse/fuse_io.c b/sys/fs/fuse/fuse_io.c index 0760d7641c7d..9f864e48effc 100644 --- a/sys/fs/fuse/fuse_io.c +++ b/sys/fs/fuse/fuse_io.c @@ -401,6 +401,7 @@ retry: fuse_warn(data, FSESS_WARN_WROTE_LONG, "wrote more data than we provided it."); /* This is bonkers. Clear attr cache. */ + ASSERT_CACHED_ATTRS_LOCKED(vp); fvdat->flag &= ~FN_SIZECHANGE; fuse_vnode_clear_attr_cache(vp); err = EINVAL; @@ -416,8 +417,10 @@ retry: fuse_vnode_setsize(vp, as_written_offset, false); getnanouptime(&fvdat->last_local_modify); } - if (as_written_offset - diff >= filesize) + if (as_written_offset - diff >= filesize) { + ASSERT_CACHED_ATTRS_LOCKED(vp); fvdat->flag &= ~FN_SIZECHANGE; + } if (diff > 0) { /* Short write */ @@ -454,8 +457,11 @@ retry: fdisp_destroy(&fdi); - if (wrote_anything) + if (wrote_anything) { + CACHED_ATTR_LOCK(vp); fuse_vnode_undirty_cached_timestamps(vp, false); + CACHED_ATTR_UNLOCK(vp); + } vn_rlimit_fsizex_res(uio, r); return (err); @@ -556,6 +562,7 @@ again: err = fuse_vnode_setsize(vp, uio->uio_offset + n, false); filesize = uio->uio_offset + n; getnanouptime(&fvdat->last_local_modify); + ASSERT_CACHED_ATTRS_LOCKED(vp); fvdat->flag |= FN_SIZECHANGE; if (err) { brelse(bp); @@ -806,6 +813,7 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp) left = uiop->uio_resid; bzero((char *)bp->b_data + nread, left); + CACHED_ATTR_LOCK(vp); if ((fvdat->flag & FN_SIZECHANGE) == 0) { /* * A short read with no error, when not using @@ -838,6 +846,7 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp) "Short read of a dirty file"); uiop->uio_resid = 0; } + CACHED_ATTR_UNLOCK(vp); } if (error) { bp->b_ioflags |= BIO_ERROR; @@ -855,10 +864,18 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp) * anything about it. In particular, we can't invalidate any * part of the file's buffers because VOP_STRATEGY is called * with them already locked. + * + * Normally the vnode should be exclusively locked at this + * point. However, if clustered reads are in use, then in a + * mixed read-write workload getblkx may need to flush a + * partially written buffer to disk during a read. In such a + * case, the vnode may only have a shared lock at this point. */ + CACHED_ATTR_LOCK(vp); filesize = fvdat->cached_attrs.va_size; /* filesize must've been cached by fuse_vnop_open. */ KASSERT(filesize != VNOVAL, ("filesize should've been cached")); + CACHED_ATTR_UNLOCK(vp); if ((off_t)bp->b_lblkno * biosize + bp->b_dirtyend > filesize) bp->b_dirtyend = filesize - diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index 742dc66bcafc..f4fb993a7ca1 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -157,6 +157,8 @@ fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, fvdat->nid = nodeid; LIST_INIT(&fvdat->handles); + mtx_init(&fvdat->cached_attr_mtx, "fuse attr cache mutex", NULL, + MTX_DEF); vattr_null(&fvdat->cached_attrs); fvdat->cached_attrs.va_birthtime.tv_sec = -1; fvdat->cached_attrs.va_birthtime.tv_nsec = 0; @@ -181,6 +183,7 @@ fuse_vnode_destroy(struct vnode *vp) struct fuse_vnode_data *fvdat = vp->v_data; vp->v_data = NULL; + mtx_destroy(&fvdat->cached_attr_mtx); KASSERT(LIST_EMPTY(&fvdat->handles), ("Destroying fuse vnode with open files!")); free(fvdat, M_FUSEVN); @@ -386,7 +389,8 @@ fuse_vnode_savesize(struct vnode *vp, struct ucred *cred, pid_t pid) struct fuse_setattr_in *fsai; int err = 0; - ASSERT_VOP_ELOCKED(vp, "fuse_io_extend"); + ASSERT_VOP_ELOCKED(vp, __func__); /* For flag and last_local_modify */ + ASSERT_CACHED_ATTRS_LOCKED(vp); if (fuse_isdeadfs(vp)) { return EBADF; @@ -439,10 +443,10 @@ fuse_vnode_setsize(struct vnode *vp, off_t newsize, bool from_server) struct vattr *attrs; off_t oldsize; size_t iosize; - struct buf *bp = NULL; int err = 0; - ASSERT_VOP_ELOCKED(vp, "fuse_vnode_setsize"); + ASSERT_VOP_LOCKED(vp, __func__); + ASSERT_CACHED_ATTRS_LOCKED(vp); iosize = fuse_iosize(vp); oldsize = fvdat->cached_attrs.va_size; @@ -450,7 +454,45 @@ fuse_vnode_setsize(struct vnode *vp, off_t newsize, bool from_server) if ((attrs = VTOVA(vp)) != NULL) attrs->va_size = newsize; - if (newsize < oldsize) { + if (from_server && newsize > oldsize && oldsize != VNOVAL) { + /* + * The FUSE server changed the file size behind our back. We + * should invalidate the entire cache. + */ + daddr_t end_lbn; + + end_lbn = howmany(newsize, iosize); + v_inval_buf_range(vp, 0, end_lbn, iosize); + } + + if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) { + err = fuse_vnode_setsize_immediate(vp, newsize < oldsize); + } else { + /* Without an exclusive vnode lock, we must defer the operation */ + fvdat->flag |= FN_DELAYED_TRUNCATE; + vn_delayed_setsize(vp); + } + + return err; +} + +/* Immediately set the vnode's size in the pager */ +int +fuse_vnode_setsize_immediate(struct vnode *vp, bool shrink) +{ + struct fuse_vnode_data *fvdat = VTOFUD(vp); + struct buf *bp = NULL; + size_t iosize; + off_t newsize; + int err = 0; + + MPASS(fvdat); + ASSERT_VOP_ELOCKED(vp, __func__); + + iosize = fuse_iosize(vp); + newsize = fvdat->cached_attrs.va_size; + + if (shrink) { daddr_t lbn; err = vtruncbuf(vp, newsize, fuse_iosize(vp)); @@ -474,21 +516,13 @@ fuse_vnode_setsize(struct vnode *vp, off_t newsize, bool from_server) MPASS(bp->b_flags & B_VMIO); vfs_bio_clrbuf(bp); bp->b_dirtyend = MIN(bp->b_dirtyend, newsize - lbn * iosize); - } else if (from_server && newsize > oldsize && oldsize != VNOVAL) { - /* - * The FUSE server changed the file size behind our back. We - * should invalidate the entire cache. - */ - daddr_t end_lbn; - - end_lbn = howmany(newsize, iosize); - v_inval_buf_range(vp, 0, end_lbn, iosize); } out: if (bp) brelse(bp); vnode_pager_setsize(vp, newsize); - return err; + + return (err); } /* Get the current, possibly dirty, size of the file */ @@ -497,15 +531,28 @@ fuse_vnode_size(struct vnode *vp, off_t *filesize, struct ucred *cred, struct thread *td) { struct fuse_vnode_data *fvdat = VTOFUD(vp); + struct vattr va; int error = 0; + ASSERT_VOP_LOCKED(vp, __func__); + + CACHED_ATTR_LOCK(vp); if (!(fvdat->flag & FN_SIZECHANGE) && (!fuse_vnode_attr_cache_valid(vp) || - fvdat->cached_attrs.va_size == VNOVAL)) - error = fuse_internal_do_getattr(vp, NULL, cred, td); - - if (!error) + fvdat->cached_attrs.va_size == VNOVAL)) { + CACHED_ATTR_UNLOCK(vp); + /* + * It incurs a large struct copy, but we supply &va so we don't + * have to acquire the lock a second time after + * fuse_internal_do_getattr returns. + */ + error = fuse_internal_do_getattr(vp, &va, cred, td); + if (!error) + *filesize = va.va_size; + } else { *filesize = fvdat->cached_attrs.va_size; + CACHED_ATTR_UNLOCK(vp); + } return error; } @@ -515,6 +562,8 @@ fuse_vnode_undirty_cached_timestamps(struct vnode *vp, bool atime) { struct fuse_vnode_data *fvdat = VTOFUD(vp); + ASSERT_CACHED_ATTRS_LOCKED(vp); + fvdat->flag &= ~(FN_MTIMECHANGE | FN_CTIMECHANGE); if (atime) fvdat->flag &= ~FN_ATIMECHANGE; @@ -537,6 +586,8 @@ fuse_vnode_update(struct vnode *vp, int flags) if (mp->mnt_flag & MNT_NOATIME) flags &= ~FN_ATIMECHANGE; + CACHED_ATTR_LOCK(vp); + if (flags & FN_ATIMECHANGE) fvdat->cached_attrs.va_atime = ts; if (flags & FN_MTIMECHANGE) @@ -545,6 +596,8 @@ fuse_vnode_update(struct vnode *vp, int flags) fvdat->cached_attrs.va_ctime = ts; fvdat->flag |= flags; + + CACHED_ATTR_UNLOCK(vp); } void diff --git a/sys/fs/fuse/fuse_node.h b/sys/fs/fuse/fuse_node.h index 97774de9eeb5..b6e388d01702 100644 --- a/sys/fs/fuse/fuse_node.h +++ b/sys/fs/fuse/fuse_node.h @@ -79,6 +79,11 @@ * cache_attrs.va_size field does not time out. */ #define FN_SIZECHANGE 0x00000100 +/* + * Whether I/O to this vnode should bypass the cache. + * XXX BUG: this should be part of the file handle, not the vnode data. + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293088 + */ #define FN_DIRECTIO 0x00000200 /* Indicates that parent_nid is valid */ #define FN_PARENT_NID 0x00000400 @@ -92,38 +97,81 @@ #define FN_CTIMECHANGE 0x00001000 #define FN_ATIMECHANGE 0x00002000 +/* vop_delayed_setsize should truncate the file */ +#define FN_DELAYED_TRUNCATE 0x00004000 + +#define CACHED_ATTR_LOCK(vp) \ +do { \ + ASSERT_VOP_LOCKED(vp, __func__); \ + if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) \ + mtx_lock(&VTOFUD(vp)->cached_attr_mtx); \ +} while(0) + +#define CACHED_ATTR_UNLOCK(vp) \ +do { \ + ASSERT_VOP_LOCKED(vp, __func__); \ + if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) \ + mtx_unlock(&VTOFUD(vp)->cached_attr_mtx); \ +} while(0) + struct fuse_vnode_data { - /** self **/ + /* self's node id, similar to an inode number. Immutable. */ uint64_t nid; + /* + * Generation number. Distinguishes files with same nid but that don't + * overlap in time. Immutable. + */ uint64_t generation; - /** parent **/ + /* parent's node id. Protected by the vnode lock. */ uint64_t parent_nid; /** I/O **/ - /* List of file handles for all of the vnode's open file descriptors */ + /* + * List of file handles for all of the vnode's open file descriptors. + * Protected by the vnode lock. + */ LIST_HEAD(, fuse_filehandle) handles; - /** flags **/ - uint32_t flag; + /* Protects flag, attr_cache_timeout and cached_attrs */ + struct mtx cached_attr_mtx; - /** meta **/ - /* The monotonic time after which the attr cache is invalid */ + /* + * The monotonic time after which the attr cache is invalid + * Protected by an exclusive vnode lock or the cached_attr_mtx + */ struct bintime attr_cache_timeout; - /* + + /* * Monotonic time after which the entry is invalid. Used for lookups - * by nodeid instead of pathname. + * by nodeid instead of pathname. Protected by the vnode lock. */ struct bintime entry_cache_timeout; + /* * Monotonic time of the last FUSE operation that modified the file * size. Used to avoid races between mutator ops like VOP_SETATTR and - * unlocked accessor ops like VOP_LOOKUP. + * unlocked accessor ops like VOP_LOOKUP. Protected by the vnode lock. */ struct timespec last_local_modify; + + /* Protected by an exclusive vnode lock or the cached_attr_mtx */ struct vattr cached_attrs; + + /* Number of FUSE_LOOKUPs minus FUSE_FORGETs. Protected by vnode lock */ uint64_t nlookup; + + /* + * Misc flags. Protected by an exclusive vnode lock or the + * cached_attr_mtx, because some of the flags reflect the contents of + * cached_attrs. + */ + uint32_t flag; + + /* Vnode type. Immutable */ __enum_uint8(vtype) vtype; + + /* State for clustered writes. Protected by vnode lock */ struct vn_clusterw clusterw; }; @@ -141,18 +189,32 @@ struct fuse_fid { #define VTOFUD(vp) \ ((struct fuse_vnode_data *)((vp)->v_data)) #define VTOI(vp) (VTOFUD(vp)->nid) + +#define ASSERT_CACHED_ATTRS_LOCKED(vp) \ +do { \ + ASSERT_VOP_LOCKED(vp, __func__); \ + VNASSERT(VOP_ISLOCKED(vp) == LK_EXCLUSIVE || \ + mtx_owned(&VTOFUD(vp)->cached_attr_mtx), vp, \ + ("cached attrs not locked")); \ +} while(0) + static inline bool fuse_vnode_attr_cache_valid(struct vnode *vp) { + struct fuse_vnode_data *fvdat = VTOFUD(vp); struct bintime now; + ASSERT_CACHED_ATTRS_LOCKED(vp); + getbinuptime(&now); - return (bintime_cmp(&(VTOFUD(vp)->attr_cache_timeout), &now, >)); + return (bintime_cmp(&fvdat->attr_cache_timeout, &now, >)); } static inline struct vattr* VTOVA(struct vnode *vp) { + ASSERT_CACHED_ATTRS_LOCKED(vp); + if (fuse_vnode_attr_cache_valid(vp)) return &(VTOFUD(vp)->cached_attrs); else @@ -162,6 +224,8 @@ VTOVA(struct vnode *vp) static inline void fuse_vnode_clear_attr_cache(struct vnode *vp) { + ASSERT_CACHED_ATTRS_LOCKED(vp); + bintime_clear(&VTOFUD(vp)->attr_cache_timeout); } @@ -184,10 +248,14 @@ static inline void fuse_vnode_setparent(struct vnode *vp, struct vnode *dvp) { if (dvp != NULL && vp->v_type == VDIR) { + ASSERT_VOP_ELOCKED(vp, __func__); /* for parent_nid */ + MPASS(dvp->v_type == VDIR); VTOFUD(vp)->parent_nid = VTOI(dvp); VTOFUD(vp)->flag |= FN_PARENT_NID; } else { + ASSERT_CACHED_ATTRS_LOCKED(vp); + VTOFUD(vp)->flag &= ~FN_PARENT_NID; } } @@ -207,6 +275,7 @@ void fuse_vnode_open(struct vnode *vp, int32_t fuse_open_flags, int fuse_vnode_savesize(struct vnode *vp, struct ucred *cred, pid_t pid); int fuse_vnode_setsize(struct vnode *vp, off_t newsize, bool from_server); +int fuse_vnode_setsize_immediate(struct vnode *vp, bool shrink); void fuse_vnode_undirty_cached_timestamps(struct vnode *vp, bool atime); diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index a5118aa7675f..7b6ad86e4b2b 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -601,6 +601,8 @@ fuse_vfsop_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) error = fuse_vnode_get(mp, feo, nodeid, NULL, vpp, NULL, vtyp); if (error) goto out; + /* for last_local_modify and fuse_internal_cache_attrs */ + ASSERT_VOP_ELOCKED(*vpp, __func__); fvdat = VTOFUD(*vpp); if (timespeccmp(&now, &fvdat->last_local_modify, >)) { diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index c66d3bcf01e0..ad7a2dcf84ef 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -134,6 +134,7 @@ static vop_close_t fuse_vnop_close; static vop_copy_file_range_t fuse_vnop_copy_file_range; static vop_create_t fuse_vnop_create; static vop_deallocate_t fuse_vnop_deallocate; +static vop_delayed_setsize_t fuse_vnop_delayed_setsize; static vop_deleteextattr_t fuse_vnop_deleteextattr; static vop_fdatasync_t fuse_vnop_fdatasync; static vop_fsync_t fuse_vnop_fsync; @@ -191,6 +192,7 @@ struct vop_vector fuse_vnops = { .vop_copy_file_range = fuse_vnop_copy_file_range, .vop_create = fuse_vnop_create, .vop_deallocate = fuse_vnop_deallocate, + .vop_delayed_setsize = fuse_vnop_delayed_setsize, .vop_deleteextattr = fuse_vnop_deleteextattr, .vop_fsync = fuse_vnop_fsync, .vop_fdatasync = fuse_vnop_fdatasync, @@ -707,6 +709,8 @@ fuse_vnop_allocate(struct vop_allocate_args *ap) return (EXTERROR(EOPNOTSUPP, "This server does not implement " "FUSE_FALLOCATE")); + ASSERT_CACHED_ATTRS_LOCKED(vp); + io.uio_offset = *offset; io.uio_resid = *len; err = vn_rlimit_fsize(vp, &io, curthread); @@ -779,7 +783,7 @@ fuse_vnop_bmap(struct vop_bmap_args *ap) struct fuse_data *data; struct fuse_vnode_data *fvdat = VTOFUD(vp); uint64_t biosize; - off_t fsize; + off_t fsize = VNOVAL; daddr_t lbn = ap->a_bn; daddr_t *pbn = ap->a_bnp; int *runp = ap->a_runp; @@ -822,9 +826,10 @@ fuse_vnop_bmap(struct vop_bmap_args *ap) * and the risk of getting it wrong is not worth the cost of * another upcall. */ - if (fvdat->cached_attrs.va_size != VNOVAL) - fsize = fvdat->cached_attrs.va_size; - else + CACHED_ATTR_LOCK(vp); + fsize = fvdat->cached_attrs.va_size; + CACHED_ATTR_UNLOCK(vp); + if (fsize == VNOVAL) error = fuse_vnode_size(vp, &fsize, td->td_ucred, td); if (error == 0) *runp = MIN(MAX(0, fsize / (off_t)biosize - lbn - 1), @@ -894,6 +899,7 @@ fuse_vnop_close(struct vop_close_args *ap) cred = td->td_ucred; err = fuse_flush(vp, cred, pid, fflag); + ASSERT_CACHED_ATTRS_LOCKED(vp); /* For fvdat->flag */ if (err == 0 && (fvdat->flag & FN_ATIMECHANGE) && !vfs_isrdonly(mp)) { struct vattr vap; struct fuse_data *data; @@ -911,6 +917,7 @@ fuse_vnop_close(struct vop_close_args *ap) } if (access_e == 0) { VATTR_NULL(&vap); + ASSERT_CACHED_ATTRS_LOCKED(vp); vap.va_atime = fvdat->cached_attrs.va_atime; /* * Ignore errors setting when setting atime. That @@ -1035,6 +1042,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) *ap->a_inoffp += fwo->size; *ap->a_outoffp += fwo->size; fuse_internal_clear_suid_on_write(outvp, outcred, td); + ASSERT_CACHED_ATTRS_LOCKED(outvp); if (*ap->a_outoffp > outfvdat->cached_attrs.va_size) { fuse_vnode_setsize(outvp, *ap->a_outoffp, false); getnanouptime(&outfvdat->last_local_modify); @@ -1337,6 +1345,7 @@ fuse_vnop_inactive(struct vop_inactive_args *ap) int need_flush = 1; + ASSERT_CACHED_ATTRS_LOCKED(vp); /* For fvdat->flag */ LIST_FOREACH_SAFE(fufh, &fvdat->handles, next, fufh_tmp) { if (need_flush && vp->v_type == VREG) { if ((VTOFUD(vp)->flag & FN_SIZECHANGE) != 0) { @@ -1557,6 +1566,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) else if ((err = fuse_internal_access(dvp, VEXEC, td, cred))) return err; + ASSERT_CACHED_ATTRS_LOCKED(dvp); /* For flag */ is_dot = cnp->cn_namelen == 1 && *(cnp->cn_nameptr) == '.'; if (isdotdot && !(data->dataflags & FSESS_EXPORT_SUPPORT)) { if (!(VTOFUD(dvp)->flag & FN_PARENT_NID)) { @@ -1960,6 +1970,10 @@ fuse_vnop_read(struct vop_read_args *ap) "to be closed")); } + /* + * XXX Check this flag without the lock. See + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293088 + */ if (VTOFUD(vp)->flag & FN_DIRECTIO) { ioflag |= IO_DIRECT; } @@ -2220,6 +2234,8 @@ fuse_vnop_remove(struct vop_remove_args *ap) return err; } +SDT_PROBE_DEFINE4(fusefs, , vnops, erelookup, "struct vnode*", + "struct vnode*", "struct vnode*", "struct vnode*"); /* struct vnop_rename_args { struct vnode *a_fdvp; @@ -2242,6 +2258,7 @@ fuse_vnop_rename(struct vop_rename_args *ap) struct fuse_data *data; bool newparent = fdvp != tdvp; bool isdir = fvp->v_type == VDIR; + int locktype; int err = 0; if (fuse_isdeadfs(fdvp)) { @@ -2270,11 +2287,32 @@ fuse_vnop_rename(struct vop_rename_args *ap) * have write permission to it, so ".." can be modified. */ data = fuse_get_mpdata(vnode_mount(tdvp)); + + if (tdvp != fdvp) + locktype = LK_EXCLUSIVE; /* for fuse_vnode_setparent */ + else + locktype = LK_SHARED; + + /* + * Must use LK_NOWAIT to prevent LORs between fvp and tdvp or + * tvp + */ + if (vn_lock(fvp, locktype | LK_NOWAIT) != 0) { + /* + * Can't release tdvp or tvp to try avoiding the LOR. + * Must return instead. + */ + SDT_PROBE4(fusefs, , vnops, erelookup, fdvp, fvp, tdvp, + tvp); + err = ERELOOKUP; + goto out; + } + if (data->dataflags & FSESS_DEFAULT_PERMISSIONS && isdir && newparent) { err = fuse_internal_access(fvp, VWRITE, curthread, tcnp->cn_cred); if (err) - goto out; + goto unlock; } err = fuse_internal_rename(fdvp, fcnp, tdvp, tcnp); if (err == 0) { @@ -2293,6 +2331,8 @@ fuse_vnop_rename(struct vop_rename_args *ap) } cache_purge(fdvp); } +unlock: + VOP_UNLOCK(fvp); out: if (tdvp == tvp) { vrele(tdvp); @@ -2568,6 +2608,7 @@ static int fuse_vnop_write(struct vop_write_args *ap) { struct vnode *vp = ap->a_vp; + struct fuse_vnode_data *fvdat = VTOFUD(vp); struct uio *uio = ap->a_uio; int ioflag = ap->a_ioflag; struct ucred *cred = ap->a_cred; @@ -2583,9 +2624,12 @@ fuse_vnop_write(struct vop_write_args *ap) "to be closed")); } - if (VTOFUD(vp)->flag & FN_DIRECTIO) { + /* + * XXX Check this flag without the lock. See + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=293088 + */ + if (fvdat->flag & FN_DIRECTIO) ioflag |= IO_DIRECT; - } err = fuse_filehandle_getrw(vp, FWRITE, &fufh, cred, pid); if (err == EBADF && vnode_mount(vp)->mnt_flag & MNT_EXPORTED) { @@ -3219,6 +3263,29 @@ fallback: return (vop_stddeallocate(ap)); } +/* + struct vop_delayed_setsize_args { + struct vop_generic_args a_gen; + struct vnode *a_vp; + }; + */ +static int +fuse_vnop_delayed_setsize(struct vop_delayed_setsize_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct fuse_vnode_data *fvdat = VTOFUD(ap->a_vp); + bool shrink = (fvdat->flag & FN_DELAYED_TRUNCATE) != 0; + int err; + + if (!fvdat) + return (0); + + err = fuse_vnode_setsize_immediate(vp, shrink); + fvdat->flag &= ~FN_DELAYED_TRUNCATE; + + return (err); +} + /* struct vop_deleteextattr_args { struct vop_generic_args a_gen; diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc index e61dadb6d79e..622a3c3debcc 100644 --- a/tests/sys/fs/fusefs/bmap.cc +++ b/tests/sys/fs/fusefs/bmap.cc @@ -44,10 +44,13 @@ using namespace testing; const static char FULLPATH[] = "mountpoint/foo"; const static char RELPATH[] = "foo"; -class Bmap: public FuseTest { +class Bmap: public FuseTest, + public WithParamInterface> +{ public: virtual void SetUp() { m_maxreadahead = UINT32_MAX; + m_init_flags |= get<0>(GetParam()); FuseTest::SetUp(); } void expect_bmap(uint64_t ino, uint64_t lbn, uint32_t blocksize, uint64_t pbn) @@ -73,12 +76,12 @@ void expect_lookup(const char *relpath, uint64_t ino, off_t size) } }; -class BmapEof: public Bmap, public WithParamInterface {}; +class BmapEof: public Bmap {}; /* * Test FUSE_BMAP */ -TEST_F(Bmap, bmap) +TEST_P(Bmap, bmap) { struct fiobmap2_arg arg; /* @@ -124,7 +127,7 @@ TEST_F(Bmap, bmap) * If the daemon does not implement VOP_BMAP, fusefs should return sensible * defaults. */ -TEST_F(Bmap, default_) +TEST_P(Bmap, default_) { struct fiobmap2_arg arg; const off_t filesize = 1 << 30; @@ -181,7 +184,7 @@ TEST_F(Bmap, default_) * The server returns an error for some reason for FUSE_BMAP. fusefs should * faithfully report that error up to the caller. */ -TEST_F(Bmap, einval) +TEST_P(Bmap, einval) { struct fiobmap2_arg arg; const off_t filesize = 1 << 30; @@ -217,7 +220,7 @@ TEST_F(Bmap, einval) * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264196 . The bug did not * lie in fusefs, but this is a convenient place for a regression test. */ -TEST_F(Bmap, spurious_einval) +TEST_P(Bmap, spurious_einval) { const off_t filesize = 4ull << 30; const ino_t ino = 42; @@ -288,7 +291,7 @@ TEST_P(BmapEof, eof) int fd; int ngetattrs; - ngetattrs = GetParam(); + ngetattrs = get<1>(GetParam()); FuseTest::expect_lookup(RELPATH, ino, mode, filesize, 1, 0); expect_open(ino, 0, 1); // Depending on ngetattrs, FUSE_READ could be called with either @@ -348,6 +351,17 @@ TEST_P(BmapEof, eof) leak(fd); } -INSTANTIATE_TEST_SUITE_P(BE, BmapEof, - Values(1, 2, 3) -); +/* + * Try with and without async reads, because it affects the type of vnode lock + * on entry to fuse_vnop_bmap. + */ +INSTANTIATE_TEST_SUITE_P(B, Bmap, Values( + tuple(0, 0), + tuple(FUSE_ASYNC_READ, 0) +)); + +INSTANTIATE_TEST_SUITE_P(BE, BmapEof, Values( + tuple(0, 1), + tuple(0, 2), + tuple(0, 3) +)); diff --git a/tests/sys/fs/fusefs/notify.cc b/tests/sys/fs/fusefs/notify.cc index d370a1e6e706..69742fb2a54b 100644 --- a/tests/sys/fs/fusefs/notify.cc +++ b/tests/sys/fs/fusefs/notify.cc @@ -47,8 +47,15 @@ using namespace testing; * invalidation. This file tests our client's handling of those messages. */ -class Notify: public FuseTest { +class Notify: public FuseTest, + public WithParamInterface +{ public: +virtual void SetUp() { + m_init_flags |= GetParam(); + FuseTest::SetUp(); +} + /* Ignore an optional FUSE_FSYNC */ void maybe_expect_fsync(uint64_t ino) { @@ -154,7 +161,7 @@ static void* store(void* arg) { } /* Invalidate a nonexistent entry */ -TEST_F(Notify, inval_entry_nonexistent) +TEST_P(Notify, inval_entry_nonexistent) { const static char *name = "foo"; struct inval_entry_args iea; @@ -173,7 +180,7 @@ TEST_F(Notify, inval_entry_nonexistent) } /* Invalidate a cached entry */ -TEST_F(Notify, inval_entry) +TEST_P(Notify, inval_entry) { const static char FULLPATH[] = "mountpoint/foo"; *** 404 LINES SKIPPED *** From nobody Thu Mar 12 16:37:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWtZY2qZPz6Vc2V for ; Thu, 12 Mar 2026 16:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWtZY2S8xz3DWp for ; Thu, 12 Mar 2026 16: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=1773333461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bB5D2LwHyzRruaZmY+VaO/FXlVch2GdgL7zFq0UQ6pg=; b=Yr6cx0kh9FzBBMYlWH6kXbyy/rVoq+TKRrJ0ROkR088hqEnNGRAmdBo+g6qxp1B1aU5xzY /8W+gqFUILF/kv47/E11S/Vum1L8Y4VCwXv/8ZH/NIsKccgJZxuFPaX3SXGL+B1NJzo6qq nP+1Nq26BUARChD/ycdlgjfKTkOkwIZpUHhRib0D9ukyh0VhDsrKYYlp0wIMTVZVtzjv44 ZNP5QneppckKxMTGGWlARsVYjjdcVyZKWdAdL1V4K3KUz0UcMUZZ9lh84X5jGgEzZkond6 IChDzAlEU9zIo/aHytDpAz32CqFlmtz0UGgaCPgh+Fl8HDzNmt3h6uMJfPyuvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773333461; a=rsa-sha256; cv=none; b=G99IEZTguVzr/Un8UXaQgvdp8f51fxFAN1jRqmOx4cvknz12F5uk4385huCzlrr1YIMHOJ Ir7J/8CXhU8pPCiIQdi7EaCBglR2+cMMCJeVIInnkev+rvvqDRKd13gihZXvezPMKb94r3 TVO6Fxuz8QAQTQrDaCXnGdaTcvXoTgFzYfUauH7WTBUOYrTRjlHaOocdq1QJbZgTOxVS/k nM+f4c8Icio1CxW26VZtjFUwfvPOXFskgVAcjrdfD7IeVPnV5wRWyqioOEjMyT0GG7EN0O nAuIFGNrH5G2M7LT4E2aFdApTpisDpdReXnsuVIYLLnXTJfjZXJcyC/rrP4vXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bB5D2LwHyzRruaZmY+VaO/FXlVch2GdgL7zFq0UQ6pg=; b=H9jQLNrQmqV2kWfuWb/xFhOxmgz/aIr60+Drrakri+YzfvLsgn7Dx9IEYPlm8dD0/fKTAR OEHyeZbNLY2v4PyzWmIu58glFaZOmFQX4V7p61WZ4KT/2FB0DOAIJedRr98i5lGCDgL6JM vSlxGkNnhouGBpDqTMmtg7hDLREtWkzILCSGJ/GN3Mpya7twdwiARTrGg1ag1gfn/cnHeB 9TZ+vpww0s1p0le58KjPVA6b149GUsw10WcK85PxWuosITxKozxb8AqW23E/J/f5TTnIyY Qv1pMF185A2xaa2oY6qnngToiUIJodD2Ax88HVzMPhuLgX2AO9ZeBm1nvoZT/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 4fWtZY21fXztHH for ; Thu, 12 Mar 2026 16:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43f2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 16:37:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 72472e52e310 - main - carp: retire ioctl(2) API List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72472e52e310ec348949a3a67d3fa17e33fb8e50 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 16:37:36 +0000 Message-Id: <69b2ebd0.43f2d.56e7eb20@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=72472e52e310ec348949a3a67d3fa17e33fb8e50 commit 72472e52e310ec348949a3a67d3fa17e33fb8e50 Author: Gleb Smirnoff AuthorDate: 2026-03-12 16:30:46 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 16:37:26 +0000 carp: retire ioctl(2) API All supported stable branches use netlink(4) API to configure carp(4). The deleted code also has kernel stack leak vulnerability, that requires extra effort to fix. Reviewed by: pouria, kp Differential Revision: https://reviews.freebsd.org/D55804 --- sbin/ifconfig/carp.c | 9 +- share/man/man4/carp.4 | 12 +- sys/net/if.c | 10 -- sys/netinet/ip_carp.c | 437 ++++++++++++++------------------------------------ sys/netinet/ip_carp.h | 15 -- sys/sys/param.h | 2 +- 6 files changed, 133 insertions(+), 352 deletions(-) diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c index 7c7398f92d48..f9737a9cb97c 100644 --- a/sbin/ifconfig/carp.c +++ b/sbin/ifconfig/carp.c @@ -156,8 +156,13 @@ setcarp_callback(if_ctx *ctx, void *arg __unused) if (carpr_vrrp_adv_inter != 0) carpr.carpr_vrrp_adv_inter = carpr_vrrp_adv_inter; - if (ifconfig_carp_set_info(lifh, ctx->ifname, &carpr)) - err(1, "SIOCSVH"); + if (ifconfig_carp_set_info(lifh, ctx->ifname, &carpr)) { + if (ifconfig_err_errtype(lifh) == OTHER) + err(1, "%s: %s", __func__, + strerror(ifconfig_err_errno(lifh))); + else + err(1, "%s: %d", __func__, ifconfig_err_errtype(lifh)); + } } static void diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4 index c972e0288791..4b0ece3b551f 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 12, 2024 +.Dd March 11, 2026 .Dt CARP 4 .Os .Sh NAME @@ -71,10 +71,7 @@ and .Cm advskew are put inside CARP advertisements. These values can be configured using -.Xr ifconfig 8 , -or through the -.Dv SIOCSVH -.Xr ioctl 2 . +.Xr ifconfig 8 . .Pp CARP defaults to using multicast messages, but can be configured to unicast announcements to peers using the @@ -88,10 +85,7 @@ and Note that TTL verification is disabled if the peer address is not a multicast address. These values can be configured using -.Xr ifconfig 8 , -or through the -.Dv SIOCSPEER -.Xr ioctl 2 . +.Xr ifconfig 8 . .Pp .Xr carp 4 can be configured to use either the non-standard CARP protocol, or VRRPv3 (RFC 5798). diff --git a/sys/net/if.c b/sys/net/if.c index 5c4b1e17f77d..96da4da8c6c1 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -248,7 +248,6 @@ int (*carp_master_p)(struct ifaddr *); int (*carp_forus_p)(struct ifnet *ifp, u_char *dhost); int (*carp_output_p)(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *sa); -int (*carp_ioctl_p)(struct ifreq *, u_long, struct thread *); int (*carp_attach_p)(struct ifaddr *, int); void (*carp_detach_p)(struct ifaddr *, bool); #endif @@ -2923,15 +2922,6 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td) error = if_getgroupmembers(req); goto out_noref; } -#if defined(INET) || defined(INET6) - case SIOCSVH: - case SIOCGVH: - if (carp_ioctl_p == NULL) - error = EPROTONOSUPPORT; - else - error = (*carp_ioctl_p)(ifr, cmd, td); - goto out_noref; -#endif } ifp = ifunit_ref(ifr->ifr_name); diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 3fedbda6b57f..32823c6c4a87 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -160,23 +160,6 @@ struct carp_if { #define CIF_PROMISC 0x00000001 }; -/* Kernel equivalent of struct carpreq, but with more fields for new features. - * */ -struct carpkreq { - int carpr_count; - int carpr_vhid; - int carpr_state; - int carpr_advskew; - int carpr_advbase; - unsigned char carpr_key[CARP_KEY_LEN]; - /* Everything above this is identical to carpreq */ - struct in_addr carpr_addr; - struct in6_addr carpr_addr6; - carp_version_t carpr_version; - uint8_t carpr_vrrp_priority; - uint16_t carpr_vrrp_adv_inter; -}; - /* * Brief design of carp(4). * @@ -2256,216 +2239,6 @@ carp_free_if(struct carp_if *cif) free(cif, M_CARP); } -static bool -carp_carprcp(void *arg, struct carp_softc *sc, int priv) -{ - struct carpreq *carpr = arg; - - CARP_LOCK(sc); - carpr->carpr_state = sc->sc_state; - carpr->carpr_vhid = sc->sc_vhid; - switch (sc->sc_version) { - case CARP_VERSION_CARP: - carpr->carpr_advbase = sc->sc_advbase; - carpr->carpr_advskew = sc->sc_advskew; - if (priv) - bcopy(sc->sc_key, carpr->carpr_key, - sizeof(carpr->carpr_key)); - else - bzero(carpr->carpr_key, sizeof(carpr->carpr_key)); - break; - case CARP_VERSION_VRRPv3: - break; - } - CARP_UNLOCK(sc); - - return (true); -} - -static int -carp_ioctl_set(if_t ifp, struct carpkreq *carpr) -{ - struct epoch_tracker et; - struct carp_softc *sc = NULL; - int error = 0; - - if (carpr->carpr_vhid <= 0 || carpr->carpr_vhid > CARP_MAXVHID) - return (EINVAL); - - switch (carpr->carpr_version) { - case CARP_VERSION_CARP: - if (carpr->carpr_advbase != 0 && (carpr->carpr_advbase > 255 || - carpr->carpr_advbase < CARP_DFLTINTV)) - return (EINVAL); - if (carpr->carpr_advskew < 0 || carpr->carpr_advskew >= 255) - return (EINVAL); - break; - case CARP_VERSION_VRRPv3: - /* XXXGL: shouldn't we check anything? */ - break; - default: - return (EINVAL); - } - - if (ifp->if_carp) { - IFNET_FOREACH_CARP(ifp, sc) - if (sc->sc_vhid == carpr->carpr_vhid) - break; - } - - if (sc == NULL) - sc = carp_alloc(ifp, carpr->carpr_version, carpr->carpr_vhid); - else if (sc->sc_version != carpr->carpr_version) - return (EINVAL); - - CARP_LOCK(sc); - switch (sc->sc_version) { - case CARP_VERSION_CARP: - if (carpr->carpr_advbase != 0) - sc->sc_advbase = carpr->carpr_advbase; - sc->sc_advskew = carpr->carpr_advskew; - if (carpr->carpr_addr.s_addr != INADDR_ANY) - sc->sc_carpaddr = carpr->carpr_addr; - if (!IN6_IS_ADDR_UNSPECIFIED(&carpr->carpr_addr6)) { - memcpy(&sc->sc_carpaddr6, &carpr->carpr_addr6, - sizeof(sc->sc_carpaddr6)); - } - if (carpr->carpr_key[0] != '\0') { - bcopy(carpr->carpr_key, sc->sc_key, sizeof(sc->sc_key)); - carp_hmac_prepare(sc); - } - break; - case CARP_VERSION_VRRPv3: - if (carpr->carpr_vrrp_priority != 0) - sc->sc_vrrp_prio = carpr->carpr_vrrp_priority; - if (carpr->carpr_vrrp_adv_inter) - sc->sc_vrrp_adv_inter = carpr->carpr_vrrp_adv_inter; - break; - } - - if (sc->sc_state != INIT && - carpr->carpr_state != sc->sc_state) { - switch (carpr->carpr_state) { - case BACKUP: - callout_stop(&sc->sc_ad_tmo); - carp_set_state(sc, BACKUP, - "user requested via ifconfig"); - carp_setrun(sc, 0); - carp_delroute(sc); - break; - case MASTER: - NET_EPOCH_ENTER(et); - carp_master_down_locked(sc, - "user requested via ifconfig"); - NET_EPOCH_EXIT(et); - break; - default: - break; - } - } - CARP_UNLOCK(sc); - - return (error); -} - -static int -carp_ioctl_get(if_t ifp, struct ucred *cred, struct carpreq *carpr, - bool (*outfn)(void *, struct carp_softc *, int), void *arg) -{ - int priveleged; - struct carp_softc *sc; - - if (carpr->carpr_vhid < 0 || carpr->carpr_vhid > CARP_MAXVHID) - return (EINVAL); - if (carpr->carpr_count < 1) - return (EMSGSIZE); - if (ifp->if_carp == NULL) - return (ENOENT); - - priveleged = (priv_check_cred(cred, PRIV_NETINET_CARP) == 0); - if (carpr->carpr_vhid != 0) { - IFNET_FOREACH_CARP(ifp, sc) - if (sc->sc_vhid == carpr->carpr_vhid) - break; - if (sc == NULL) - return (ENOENT); - - if (! outfn(arg, sc, priveleged)) - return (ENOMEM); - carpr->carpr_count = 1; - } else { - int count; - - count = 0; - IFNET_FOREACH_CARP(ifp, sc) - count++; - - if (count > carpr->carpr_count) - return (EMSGSIZE); - - IFNET_FOREACH_CARP(ifp, sc) { - if (! outfn(arg, sc, priveleged)) - return (ENOMEM); - carpr->carpr_count = count; - } - } - - return (0); -} - -int -carp_ioctl(struct ifreq *ifr, u_long cmd, struct thread *td) -{ - struct carpreq carpr; - struct carpkreq carprk = { - .carpr_version = CARP_VERSION_CARP, - }; - struct ifnet *ifp; - int error = 0; - - if ((error = copyin(ifr_data_get_ptr(ifr), &carpr, sizeof carpr))) - return (error); - - ifp = ifunit_ref(ifr->ifr_name); - if ((error = carp_is_supported_if(ifp)) != 0) - goto out; - - if ((ifp->if_flags & IFF_MULTICAST) == 0) { - error = EADDRNOTAVAIL; - goto out; - } - - sx_xlock(&carp_sx); - switch (cmd) { - case SIOCSVH: - if ((error = priv_check(td, PRIV_NETINET_CARP))) - break; - - memcpy(&carprk, &carpr, sizeof(carpr)); - error = carp_ioctl_set(ifp, &carprk); - break; - - case SIOCGVH: - error = carp_ioctl_get(ifp, td->td_ucred, &carpr, - carp_carprcp, &carpr); - if (error == 0) { - error = copyout(&carpr, - (char *)ifr_data_get_ptr(ifr), - carpr.carpr_count * sizeof(carpr)); - } - break; - default: - error = EINVAL; - } - sx_xunlock(&carp_sx); - -out: - if (ifp != NULL) - if_rele(ifp); - - return (error); -} - static int carp_get_vhid(struct ifaddr *ifa) { @@ -2757,67 +2530,6 @@ nlattr_get_carp_key(struct nlattr *nla, struct nl_pstate *npt, const void *arg, return (0); } -struct carp_nl_send_args { - struct nlmsghdr *hdr; - struct nl_pstate *npt; -}; - -static bool -carp_nl_send(void *arg, struct carp_softc *sc, int priv) -{ - struct carp_nl_send_args *nlsa = arg; - struct nlmsghdr *hdr = nlsa->hdr; - struct nl_pstate *npt = nlsa->npt; - struct nl_writer *nw = npt->nw; - struct genlmsghdr *ghdr_new; - - if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) { - nlmsg_abort(nw); - return (false); - } - - ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); - if (ghdr_new == NULL) { - nlmsg_abort(nw); - return (false); - } - - ghdr_new->cmd = CARP_NL_CMD_GET; - ghdr_new->version = 0; - ghdr_new->reserved = 0; - - CARP_LOCK(sc); - - nlattr_add_u32(nw, CARP_NL_VHID, sc->sc_vhid); - nlattr_add_u32(nw, CARP_NL_STATE, sc->sc_state); - nlattr_add_u8(nw, CARP_NL_VERSION, sc->sc_version); - switch (sc->sc_version) { - case CARP_VERSION_CARP: - nlattr_add_s32(nw, CARP_NL_ADVBASE, sc->sc_advbase); - nlattr_add_s32(nw, CARP_NL_ADVSKEW, sc->sc_advskew); - nlattr_add_in_addr(nw, CARP_NL_ADDR, &sc->sc_carpaddr); - nlattr_add_in6_addr(nw, CARP_NL_ADDR6, &sc->sc_carpaddr6); - if (priv) - nlattr_add(nw, CARP_NL_KEY, sizeof(sc->sc_key), - sc->sc_key); - break; - case CARP_VERSION_VRRPv3: - nlattr_add_u8(nw, CARP_NL_VRRP_PRIORITY, sc->sc_vrrp_prio); - nlattr_add_u16(nw, CARP_NL_VRRP_ADV_INTER, - sc->sc_vrrp_adv_inter); - break; - } - - CARP_UNLOCK(sc); - - if (! nlmsg_end(nw)) { - nlmsg_abort(nw); - return (false); - } - - return (true); -} - struct nl_carp_parsed { unsigned int ifindex; char *ifname; @@ -2856,16 +2568,20 @@ static int carp_nl_get(struct nlmsghdr *hdr, struct nl_pstate *npt) { struct nl_carp_parsed attrs = { }; - struct carp_nl_send_args args; - struct carpreq carpr = { }; struct epoch_tracker et; + struct nl_writer *nw = npt->nw; + struct carp_softc *sc; if_t ifp = NULL; int error; + bool privileged; error = nl_parse_nlmsg(hdr, &carp_parser, npt, &attrs); if (error != 0) return (error); + if (attrs.vhid < 0 || attrs.vhid > CARP_MAXVHID) + return (EINVAL); + NET_EPOCH_ENTER(et); if (attrs.ifname != NULL) ifp = ifunit_ref(attrs.ifname); @@ -2876,19 +2592,72 @@ carp_nl_get(struct nlmsghdr *hdr, struct nl_pstate *npt) if ((error = carp_is_supported_if(ifp)) != 0) goto out; - hdr->nlmsg_flags |= NLM_F_MULTI; - args.hdr = hdr; - args.npt = npt; + if (ifp->if_carp == NULL) { + error = ENOENT; + goto out; + } - carpr.carpr_vhid = attrs.vhid; - carpr.carpr_count = CARP_MAXVHID; + hdr->nlmsg_flags |= NLM_F_MULTI; + privileged = (priv_check_cred(nlp_get_cred(npt->nlp), + PRIV_NETINET_CARP) == 0); sx_xlock(&carp_sx); - error = carp_ioctl_get(ifp, nlp_get_cred(npt->nlp), &carpr, - carp_nl_send, &args); + IFNET_FOREACH_CARP(ifp, sc) { + struct genlmsghdr *ghdr_new; + + if (attrs.vhid != 0 && attrs.vhid != sc->sc_vhid) + continue; + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) { + nlmsg_abort(nw); + error = ENOMEM; + break; + } + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + if (ghdr_new == NULL) { + nlmsg_abort(nw); + error = ENOMEM; + break; + } + + ghdr_new->cmd = CARP_NL_CMD_GET; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + CARP_LOCK(sc); + nlattr_add_u32(nw, CARP_NL_VHID, sc->sc_vhid); + nlattr_add_u32(nw, CARP_NL_STATE, sc->sc_state); + nlattr_add_u8(nw, CARP_NL_VERSION, sc->sc_version); + switch (sc->sc_version) { + case CARP_VERSION_CARP: + nlattr_add_s32(nw, CARP_NL_ADVBASE, sc->sc_advbase); + nlattr_add_s32(nw, CARP_NL_ADVSKEW, sc->sc_advskew); + nlattr_add_in_addr(nw, CARP_NL_ADDR, &sc->sc_carpaddr); + nlattr_add_in6_addr(nw, CARP_NL_ADDR6, + &sc->sc_carpaddr6); + if (privileged) + nlattr_add(nw, CARP_NL_KEY, sizeof(sc->sc_key), + sc->sc_key); + break; + case CARP_VERSION_VRRPv3: + nlattr_add_u8(nw, CARP_NL_VRRP_PRIORITY, + sc->sc_vrrp_prio); + nlattr_add_u16(nw, CARP_NL_VRRP_ADV_INTER, + sc->sc_vrrp_adv_inter); + break; + } + CARP_UNLOCK(sc); + + if (! nlmsg_end(nw)) { + nlmsg_abort(nw); + error = ENOMEM; + break; + } + } sx_xunlock(&carp_sx); - if (! nlmsg_end_dump(npt->nw, error, hdr)) + if (! nlmsg_end_dump(nw, error, hdr)) error = ENOMEM; out: @@ -2902,8 +2671,8 @@ static int carp_nl_set(struct nlmsghdr *hdr, struct nl_pstate *npt) { struct nl_carp_parsed attrs = { }; - struct carpkreq carpr; struct epoch_tracker et; + struct carp_softc *sc; if_t ifp = NULL; int error; @@ -2949,26 +2718,66 @@ carp_nl_set(struct nlmsghdr *hdr, struct nl_pstate *npt) goto out; } - carpr.carpr_count = 1; - carpr.carpr_vhid = attrs.vhid; - carpr.carpr_state = attrs.state; - carpr.carpr_version = attrs.version; - switch (attrs.version) { + sx_xlock(&carp_sx); + if (ifp->if_carp) { + IFNET_FOREACH_CARP(ifp, sc) + if (sc->sc_vhid == attrs.vhid) + break; + } else + sc = NULL; + if (sc == NULL) + sc = carp_alloc(ifp, attrs.version, attrs.vhid); + else if (sc->sc_version != attrs.version) { + sx_xunlock(&carp_sx); + error = EINVAL; + goto out; + } + + CARP_LOCK(sc); + switch (sc->sc_version) { case CARP_VERSION_CARP: - carpr.carpr_advbase = attrs.advbase; - carpr.carpr_advskew = attrs.advskew; - carpr.carpr_addr = attrs.addr; - carpr.carpr_addr6 = attrs.addr6; - memcpy(&carpr.carpr_key, &attrs.key, sizeof(attrs.key)); + if (attrs.advbase != 0) + sc->sc_advbase = attrs.advbase; + sc->sc_advskew = attrs.advskew; + if (attrs.addr.s_addr != INADDR_ANY) + sc->sc_carpaddr = attrs.addr; + if (!IN6_IS_ADDR_UNSPECIFIED(&attrs.addr6)) { + memcpy(&sc->sc_carpaddr6, &attrs.addr6, + sizeof(sc->sc_carpaddr6)); + } + if (attrs.key[0] != '\0') { + bcopy(attrs.key, sc->sc_key, sizeof(sc->sc_key)); + carp_hmac_prepare(sc); + } break; case CARP_VERSION_VRRPv3: - carpr.carpr_vrrp_priority = attrs.vrrp_prio; - carpr.carpr_vrrp_adv_inter = attrs.vrrp_adv_inter; + if (attrs.vrrp_prio != 0) + sc->sc_vrrp_prio = attrs.vrrp_prio; + if (attrs.vrrp_adv_inter) + sc->sc_vrrp_adv_inter = attrs.vrrp_adv_inter; break; } - sx_xlock(&carp_sx); - error = carp_ioctl_set(ifp, &carpr); + if (sc->sc_state != INIT && sc->sc_state != attrs.state) { + switch (attrs.state) { + case BACKUP: + callout_stop(&sc->sc_ad_tmo); + carp_set_state(sc, BACKUP, + "user requested via ifconfig"); + carp_setrun(sc, 0); + carp_delroute(sc); + break; + case MASTER: + NET_EPOCH_ENTER(et); + carp_master_down_locked(sc, + "user requested via ifconfig"); + NET_EPOCH_EXIT(et); + break; + default: + break; + } + } + CARP_UNLOCK(sc); sx_xunlock(&carp_sx); out: @@ -3035,7 +2844,6 @@ carp_mod_cleanup(void) carp_iamatch6_p = NULL; carp_macmatch6_p = NULL; #endif - carp_ioctl_p = NULL; carp_attach_p = NULL; carp_detach_p = NULL; carp_get_vhid_p = NULL; @@ -3070,7 +2878,6 @@ carp_mod_load(void) carp_forus_p = carp_forus; carp_output_p = carp_output; carp_linkstate_p = carp_linkstate; - carp_ioctl_p = carp_ioctl; carp_attach_p = carp_attach; carp_detach_p = carp_detach; carp_demote_adj_p = carp_demote_adj; diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h index dc3d9a68b43b..8d82286feb7d 100644 --- a/sys/netinet/ip_carp.h +++ b/sys/netinet/ip_carp.h @@ -160,23 +160,10 @@ struct carpstats { uint64_t carps_preempt; /* if enabled, preemptions */ }; -/* - * Configuration structure for SIOCSVH SIOCGVH - */ -struct carpreq { - int carpr_count; - int carpr_vhid; #define CARP_MAXVHID 255 - int carpr_state; #define CARP_STATES "INIT", "BACKUP", "MASTER" #define CARP_MAXSTATE 2 - int carpr_advskew; #define CARP_MAXSKEW 240 - int carpr_advbase; - unsigned char carpr_key[CARP_KEY_LEN]; -}; -#define SIOCSVH _IOWR('i', 245, struct ifreq) -#define SIOCGVH _IOWR('i', 246, struct ifreq) typedef enum carp_version { CARP_VERSION_CARP = 2, @@ -184,7 +171,6 @@ typedef enum carp_version { } carp_version_t; #ifdef _KERNEL -int carp_ioctl(struct ifreq *, u_long, struct thread *); int carp_attach(struct ifaddr *, int); void carp_detach(struct ifaddr *, bool); void carp_carpdev_state(struct ifnet *); @@ -198,7 +184,6 @@ int carp_forus(struct ifnet *, u_char *); /* These are external networking stack hooks for CARP */ /* net/if.c */ -extern int (*carp_ioctl_p)(struct ifreq *, u_long, struct thread *); extern int (*carp_attach_p)(struct ifaddr *, int); extern void (*carp_detach_p)(struct ifaddr *, bool); extern void (*carp_linkstate_p)(struct ifnet *); diff --git a/sys/sys/param.h b/sys/sys/param.h index 99c1af5e55bf..7547409a16c7 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1600012 +#define __FreeBSD_version 1600013 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Thu Mar 12 16:40:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfF28hsz6VcSp for ; Thu, 12 Mar 2026 16:40: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWtfF0Wj8z3FjJ for ; Thu, 12 Mar 2026 16:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g5d5QPRpT8kNAZllBd9RrKamBJX6FrPknR+lqwVesNE=; b=UGaTYFP97CKxnPubd9ZrTaMnH3IOEnJbjxMDQD2BlmM31+OzumQkzFn7POlIMgKBQpB5IW VJps45X5WxqN+98RfWkbqiXpeuOXuaZk2ixiX3NVjVBHWsVqXHwO/QkV7GNFy+J+TQe9+a MAsFJrOcPkZ6/U0EivJNktsOBk1J0EKMa+k9wKmZHeYuMzT7GP2gPf+/7FRI0anL3LdQZU ncdmdrX9fCKMw1xDOqxgnN6MH6da1GZq053uaI2w6AZmtMiObnOHMd1vS3e43H8ALHNDyg OSxnzfwsziyvfZB7yhKOw5YWVYJnR7HkTVwOng11oylQunV32hAFMCpshT7WqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773333653; a=rsa-sha256; cv=none; b=FClr3CKD7GqUi8AgJ72wCJLjXJzf8v7KqGBVEV/cDcQeFBe7H7qWFSXZb/oaTWaMXTRCNb M4bwtDbpyVQYpW00ZY7yIapMPHhq4dPDGjFTlQ1945hEYybYnPqFrr4ZmefKaN3rZN3F4s FqSwtJeGNj8wqkm07Qi+b553EawHcZl5fKAWwbNcfdb1FENNzGZr6NC1cwPQt0v6vNKvB5 S+dS3x41uMwGxxUukmGlHydq0dkm92b+VEcVZa9dOoUYETQnGCBMbGykBiC5xUXo+5PPKb KqEiZvfKT4TlR/95P5eXc9wFa6AGaMiTHQgbhLbeSQZR9xiSweoJqy90YU2zxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g5d5QPRpT8kNAZllBd9RrKamBJX6FrPknR+lqwVesNE=; b=M0n1oZmRIMhKOhbsML8KnhWXPIYIbiakJufhOMHyUtrmPCPdsLHFGfZ0nEwnoPtsEVODad N+Yc5/4MM/6JGJePvW//5AhIpc+BzWw0KcfYoxB2tw6ponGvtoM94lvM3HMwEERbLqHbWr tKbFbmxMxq/Zvjs1vosiiUYmz0+KenATTswjdeydaBOIW1ahjhCwMBxd7cyECLC8Ed4SNX jTo4W85QO4QlRckCFi7ThbCC+8xen0sst+QHSod4NHPIE6BvFVcNeqAbYTnKk/Kep9ReWi 42zKhNJpvjvVXLnfvtoZwBbk1TUvK7lUj4ZsPnZRJV3eXFTt+xg1GMBQCpQqzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfD6x6jztb2 for ; Thu, 12 Mar 2026 16:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 439bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 16:40:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a68e3a8ae840 - main - systm.h: don't declare socket and inpcb globally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a68e3a8ae8401fe3ba6c0a85bbd3de87bd2e36f2 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 16:40:52 +0000 Message-Id: <69b2ec94.439bc.6f08e25c@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a68e3a8ae8401fe3ba6c0a85bbd3de87bd2e36f2 commit a68e3a8ae8401fe3ba6c0a85bbd3de87bd2e36f2 Author: Gleb Smirnoff AuthorDate: 2026-03-11 18:17:57 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 16:37:52 +0000 systm.h: don't declare socket and inpcb globally --- sys/net/pfvar.h | 1 + sys/sys/systm.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 21302b70552b..87ed701f66a7 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2853,6 +2853,7 @@ extern void pf_addrcpy(struct pf_addr *, const struct pf_addr *, sa_family_t); void pf_free_rule(struct pf_krule *); +struct inpcb; int pf_test_eth(int, int, struct ifnet *, struct mbuf **, struct inpcb *); int pf_scan_sctp(struct pf_pdesc *); #if defined(INET) || defined(INET6) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 1c96d99ff98f..7f655b48ba08 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -127,12 +127,10 @@ extern int unmapped_buf_allowed; * General function declarations. */ -struct inpcb; struct lock_object; struct malloc_type; struct mtx; struct proc; -struct socket; struct thread; struct tty; struct ucred; From nobody Thu Mar 12 16:40:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfG3jcDz6VcSq for ; Thu, 12 Mar 2026 16:40: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWtfG1F8rz3FQ4 for ; Thu, 12 Mar 2026 16:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iW1p/7d9MuTvFraRXdbhBLcS/+s7I/XwSjh4hu4SW5s=; b=yhk0903gqU4UqKDqQCdGjg8/vKxvPrKKPApEHBQ9mbqmFE+B2pgtbXYn6BxTGa3LSR6UjE P4yBzQtB9yhP+S7La1bod/FqvdjzCusyHyK+2qK/IlUCEJ50ucr3rV+tZ6PpBLZJF9qFId A00FJBRD3VrKHA6hzNn8Zl4aq1F/I5T6RX8k7RglwiVGZgjFYZbfBFWPWkkbigzAu4Au3c nUTGZ0M4bRvHY2UkMLUhqSAGyAwPeKC2SBMeSa0RJJ/kPnaH8L9j8PdPxFdsERvsD8b4Dw 7wVJqcxRQ3N9OptIzaCzpognlkt0uOEDRoFhQmvjBQWSmM13FzsopUuwfD1ETw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773333654; a=rsa-sha256; cv=none; b=ujxEjdEeaw0na/gi6pWZmWG7RDbjot2J5PAcMYNHJXQVwaRLqL6cvYOqLOPXVkvSJFv2FA nJ9LlQw6LMse3Ub4EIDarSPmr06HNZ1wn93qSfL0KGmtDFao6d4favzirDrgL6fWYi45wP PLqpuiFwfVEZLrGPkbQgnJhlZK1ef+U3oKw7+fKL0FM1s7lmYWHrtgP5lb/2RUJoY+3TcM fxulB7rBGM38aoLFnok0/Ufejrv+7cEMQo2VMvcjmrzkS64TpXWe00BLK6UDs+PENmdiFe rzetmtAdzWM1W15jocjxihzRpgZy2Z6l7X7p9adUOfX68h1KvJUE7NGaLHtH3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iW1p/7d9MuTvFraRXdbhBLcS/+s7I/XwSjh4hu4SW5s=; b=RCk7NRgSTZi123UoE3hkPuLH0U+fn7mI5ILdcgbbLhqj+rd/X4GpdGPO3634Q9ByHa9Jrg tN4H0eH2BJSfLWj1LugSNMnaTl44VaXgmDz2nesx5txoFq/jUWFx9CFMQJtVQUZyvRErmD LWfaP2TicucG9A3q+vmY2dpfWfakpe+MlPriJWvzwNxJCa4/QHDMYkNKAhimKiblefAhuI jmEYyV4kRVw0lIr52qQ13bT7kghcRIlmtUpcGt4imleIc7wfpHcdNX+9lTNr5Jp0AFfv8l sEN2pX5liMpdha3puUv8QoFLcca/Vg23CRygg3RUf3rTNTTwJvcbNoBD6lXmYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfG0dr9ztb4 for ; Thu, 12 Mar 2026 16:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45105 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 16:40:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c0462c2deafd - main - tcp: make sack_filter.c compilable without _WANT_TCPCB List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0462c2deafdcfe885e8d6f91b529d8cbddc6014 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 16:40:54 +0000 Message-Id: <69b2ec96.45105.2ab3de3c@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c0462c2deafdcfe885e8d6f91b529d8cbddc6014 commit c0462c2deafdcfe885e8d6f91b529d8cbddc6014 Author: Gleb Smirnoff AuthorDate: 2026-03-12 04:44:25 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 16:37:53 +0000 tcp: make sack_filter.c compilable without _WANT_TCPCB This file can be compiled as a standalone program for debugging purposes. Achieve that without exposing hack from tcp_var.h that is destined for removal. --- sys/netinet/tcp_stacks/sack_filter.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/netinet/tcp_stacks/sack_filter.c b/sys/netinet/tcp_stacks/sack_filter.c index 2b70548f3cc6..71875c58989d 100644 --- a/sys/netinet/tcp_stacks/sack_filter.c +++ b/sys/netinet/tcp_stacks/sack_filter.c @@ -24,28 +24,19 @@ * */ #include -#ifndef _KERNEL -#define _WANT_TCPCB 1 -#endif #include #include #include +#include +#include +#include + #ifdef _KERNEL #include #include -#endif -#include -#ifdef _KERNEL #include -#else -struct inpcb { - uint32_t stuff; -}; -#endif -#include #include -#include -#ifndef _KERNEL +#else /* ! _KERNEL */ #include #include #include @@ -53,7 +44,17 @@ struct inpcb { #include #include #include +struct sackblk { + tcp_seq start; /* start seq no. of sack block */ + tcp_seq end; /* end seq no. */ +}; +struct tcpcb { + tcp_seq snd_una; + tcp_seq snd_max; + uint32_t t_maxseg; +}; #endif + #include "sack_filter.h" /* From nobody Thu Mar 12 16:40:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfH4dgkz6Vckh for ; Thu, 12 Mar 2026 16:40: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWtfH1Xvkz3Fls for ; Thu, 12 Mar 2026 16:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGVts4BzPYlqMrMI7YB8nGNLp1ZT8GGSRXkd0x+9eHA=; b=IEZ8zcAaZUlyJV+7Ih5IKD9TKfqks0sQyjk37HkNVIkngYL6KNtZRVlq8FC+LpuV932gJJ AtuYIjBP6y0ilpMSEC5aMgdrxr8B55uqCMLWtnFhOXI5gTcs1yMo3eEr3mRyOiQas+Jna3 VCxZ2xt+ZHrKGrgeqgBLSBzPccGETurKPBWFpkEFwLO/EWWtmaq4K1k2zXUmkkDM2wU3Cj F/6fuuUF4IcVqXKDhZ1Jz6ojNjZbqiY8LVx6Tq0bOLN0SlknmStceRJ4a670nyLP15b8h/ 0qOetGId8LtJBwrDoT+8gSmIDIQxmXUggU8+ec4moYNGSgC/gIkSYX9hSO4p1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773333655; a=rsa-sha256; cv=none; b=XFaGihPgNB9EzbGtpn6RXwSxOKGtFRGq50ICqk/F6n08zJCQqR886YrSyKd7IhgVC1Dyoz oPIKzS8o04bvO89jzwJ5jv2+SxTR6xGooYG27N0X7IfsrZanwQt0i7po9RmpN5khWT5Cpz oevxrTzPn62gQQaz1yj0nRCbxrlTa2VvJkmX4zY7nb38J7SyH377otjxVoP/iANZkBrqDb gkZg/O/5/B0lZGELVOaM47eyT0pg132UhcA80es7Jj5GraUvcrURbL3yoTKsnCAOcKo5qN fDAT/mkY0iI1n9znl96n6t+GymVXRQjFfvRjPHuz9Ln8TdF9gbXDZXKPrVDA0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGVts4BzPYlqMrMI7YB8nGNLp1ZT8GGSRXkd0x+9eHA=; b=A+WVc2YqlhjwzvDxvERnU0NB9qkAianIBwHAN5+0UQmFmOeqQJ9sefkX4WhfdvLO0OhWRn 52pHRcW2KlczwIgIhWgFgZivHncirGWQpgiCuHim0cekxN5foMrP8B9dh1yiSxHzs6Wn80 wQrjCHM7z838ghig9ZlBTR+77UWnsI9JrmjfPot6QRZl7VuQl7Uv59SRHhN5XdAfARMZJH 22GOVDEzxmZIYi8kqfModRB34KV2X7V7lm+lUIEmeQBW7spEY5j7ZRweJtuEoL8SzXksQn moX8/S05SCcNuoifhoUh3ODzr74h76QajVeR4nHF901OpMojax/soYQPXP+Rpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfH16d7ztXg for ; Thu, 12 Mar 2026 16:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45065 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 16:40:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 815ef05284d1 - main - netinet: remove _WANT_INPCB and _WANT_TCPCB List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 815ef05284d184d83613adcf60def403607be6a0 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 16:40:55 +0000 Message-Id: <69b2ec97.45065.2a0d689@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=815ef05284d184d83613adcf60def403607be6a0 commit 815ef05284d184d83613adcf60def403607be6a0 Author: Gleb Smirnoff AuthorDate: 2026-03-12 04:48:06 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 16:37:53 +0000 netinet: remove _WANT_INPCB and _WANT_TCPCB These were hacks since FreeBSD 12 that provided some transition period for utilities to migrate from reading kernel memory via kvm(3) to sysctl(3) based APIs. The transition period is over. --- sys/netinet/cc/cc.h | 8 ++++---- sys/netinet/in_pcb.h | 2 +- sys/netinet/tcp_var.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet/cc/cc.h b/sys/netinet/cc/cc.h index 890bea69a14b..fa175166c9ee 100644 --- a/sys/netinet/cc/cc.h +++ b/sys/netinet/cc/cc.h @@ -86,7 +86,7 @@ int cc_register_algo(struct cc_algo *add_cc); int cc_deregister_algo(struct cc_algo *remove_cc); #endif /* _KERNEL */ -#if defined(_KERNEL) || defined(_WANT_TCPCB) +#if defined(_KERNEL) struct cc_var { void *cc_data; /* Per-connection private CC algorithm data. */ int bytes_this_ack; /* # bytes acked by the current ACK. */ @@ -112,15 +112,15 @@ struct cc_var { #define CCF_HYSTART_CAN_SH_CWND 0x0800 /* Can hystart when going CSS -> CA slam the cwnd */ #define CCF_HYSTART_CONS_SSTH 0x1000 /* Should hystart use the more conservative ssthresh */ -#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ +#endif /* defined(_KERNEL) */ typedef enum { -#if defined(_KERNEL) || defined(_WANT_TCPCB) +#if defined(_KERNEL) /* ACK types passed to the ack_received() hook. */ CC_ACK = 0x0001, /* Regular in sequence ACK. */ CC_DUPACK = 0x0002, /* Duplicate ACK. */ CC_PARTIALACK = 0x0004, /* Not yet. */ CC_SACK = 0x0008, /* Not yet. */ -#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ +#endif /* defined(_KERNEL) */ /* Congestion signal types passed to the cong_signal() hook. */ CC_ECN = 0x0100, /* ECN marked packet received. */ CC_RTO = 0x0200, /* RTO fired. */ diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 975b8129c70d..cd7a7303865f 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -128,7 +128,7 @@ struct in_conninfo { #define inc6_laddr inc_ie.ie6_laddr #define inc6_zoneid inc_ie.ie6_zoneid -#if defined(_KERNEL) || defined(_WANT_INPCB) +#if defined(_KERNEL) /* * struct inpcb captures the network layer state for TCP, UDP, and raw IPv4 and * IPv6 sockets. In the case of TCP and UDP, further per-connection state is diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 7f836f5a1df4..8dff330cb46b 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -85,7 +85,7 @@ #define TCP_EI_BITS_RST_IN_FR 0x200 /* a front state reset */ #define TCP_EI_BITS_2MS_TIMER 0x400 /* 2 MSL timer expired */ -#if defined(_KERNEL) || defined(_WANT_TCPCB) +#if defined(_KERNEL) #include #include @@ -500,7 +500,7 @@ struct tcpcb { uint64_t tcp_proc_time[TCP_NUM_CNT_COUNTERS]; #endif }; -#endif /* _KERNEL || _WANT_TCPCB */ +#endif /* _KERNEL */ #ifdef _KERNEL struct tcptemp { From nobody Thu Mar 12 16:40:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfK3FJVz6VchN for ; Thu, 12 Mar 2026 16:40: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWtfK1WgJz3Fh3 for ; Thu, 12 Mar 2026 16:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YosNvTPzps/GCgSsnP3UIna+PRZbZz0sE/cwHaANOZI=; b=kZLzjOs7aYcoe1qTlRNR7qRB6jb38rFBU22KJ2jydfIRe7J4Pgcs7OL757FR1/uO3LDguR CHoCsfxpvpVGEqpT3e3k5/qFOmIp6d1zJ7YnZrH32k0cducU9NsRsOGqXZMqhlbQmhADdV gZlOr7oD9wYxv3AXckmPTQ6CaTGxNp7xvog3dQu9cTF5LAo5A+v3nnh0Vsw6kvfvzoNoXw gI11pcCJSlMglkjGU54cDh1VTGG5YqWZdh5rgbzCwypXjzjzmJZSzgE9Nshtl6Vsy/UigA owVBhbeiYoPFqXyJMboVCQsqE4D5N4P+yPw/OV/QTfRWZftEX5vCs7RsxC6lCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773333657; a=rsa-sha256; cv=none; b=sjuz7y0pQsHgVvb/Y41a5XtHrt3CiXPXaZNcqPg5GJCxRGq7jFZ1nj5ronboSVahtV1p0x dfAe8XUmlagipooOgn5QrAQvkkMV8x+FRQxPUz/j7UrWihVFmsZbPU+hvBp17C9KULMG+m Zt5WAj5R4bQgzEbmn++O6+sqfifj9+aZGO2OxUbHQ4mCwoMlNOjdymxy/CM66We54bXQW8 SSSd6c7j3ID4oJi3yBn3o3J68v+CZUiZr0UAL5IzXltIyhQmsYLDC8Q2hTPfPpH1vE5koO CIto3hu3Peh38NVTcyniqp/4sOVfRJr3rFSlLcJvN1OO5QJiD1AJsYcnPIl6uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YosNvTPzps/GCgSsnP3UIna+PRZbZz0sE/cwHaANOZI=; b=d/4vl83QuLSywYWaXQNkZ3wgVPaNGnoMCRpWvdW1/kfMpmejjqfEDar4UFfS1daFZp2crZ UkfeiPW97nrk+Vu5DpfbcUdUi9MuRqYDxF2Mk4c/6+SWKKQHkvaSOr6wKepvxHTaSA7hdW DjuZOPkFaXUPMTzTNPYDPK7SNYdQuNsPW31CemFZo2Dx3a7ti43t1WTmP3l+8dZ9hVJze1 8StbGF+oZEe4D1ZjXHe4y8oOYyaO6anoZML8ixCF0KctNb3DtZI4SwjMAzIjzfWvYD7axZ HOfA/it3gLTBFMgDEml6C0tv3trUxw5Mse1vuIWAJLLNQUatQLUdNyeAiWb+wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfK0GjJztXh for ; Thu, 12 Mar 2026 16:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 16:40:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 985ac741384e - main - systat: remove kvm(3) support for -netstat mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 985ac741384ec65463669edee5e1d90dee4c895a Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 16:40:51 +0000 Message-Id: <69b2ec93.44d2a.2c71c859@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=985ac741384ec65463669edee5e1d90dee4c895a commit 985ac741384ec65463669edee5e1d90dee4c895a Author: Gleb Smirnoff AuthorDate: 2026-03-12 04:16:44 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 16:37:52 +0000 systat: remove kvm(3) support for -netstat mode The kvm(3) mode was actually non-functional since FreeBSD 8 for kernels with VIMAGE, since FreeBSD 12 for the GENERIC kernel and since FreeBSD 14 for all kernels. The reason for that is that systat(1) tried to lookup symbol "tcb" to check if kvm(3) is working. The symbol no longer exist in the kernel. A side effect was that systat(1) lost true kvm(3) support for all other modes, e.g. -swap or -pigs. The tool was still working, but libkvm was just a shim to sysctl(3) API. So, contrary to what the header line says, this change actually restores the kvm(3) support for other modes. Now we read the "allproc" symbol. This was the last tool that abused _WANT_INPCB. --- usr.bin/systat/extern.h | 2 - usr.bin/systat/main.c | 5 +- usr.bin/systat/netstat.c | 132 ++++------------------------------------------- usr.bin/systat/systat.h | 11 ---- 4 files changed, 14 insertions(+), 136 deletions(-) diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h index 8d19aec024b4..4d9f686dcc65 100644 --- a/usr.bin/systat/extern.h +++ b/usr.bin/systat/extern.h @@ -69,8 +69,6 @@ extern int num_selected; extern int num_selections; extern long select_generation; -extern struct nlist namelist[]; - int checkhost(struct in_conninfo *); int checkport(struct in_conninfo *); void closeicmp(WINDOW *); diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index dbb82ebbb1c0..3582447281b6 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -64,7 +64,6 @@ char *namp; char hostname[MAXHOSTNAMELEN]; WINDOW *wnd; int CMDLINE; -int use_kvm = 1; static WINDOW *wload; /* one line window for load average */ @@ -166,6 +165,9 @@ main(int argc, char **argv) } kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf); if (kd != NULL) { + struct nlist namelist[] = { { .n_name = "allproc" }, + { .n_name = NULL } }; + /* * Try to actually read something, we may be in a jail, and * have /dev/null opened as /dev/mem. @@ -182,7 +184,6 @@ main(int argc, char **argv) * Maybe we are lacking permissions? Retry, this time with bogus * devices. We can now use sysctl only. */ - use_kvm = 0; kd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, _PATH_DEVNULL, O_RDONLY, errbuf); if (kd == NULL) { diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index d9a0266aaea4..31838fc207d8 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -38,7 +38,6 @@ #include #include #include -#define _WANT_SOCKET #include #include @@ -50,7 +49,6 @@ #ifdef INET6 #include #endif -#define _WANT_INPCB #include #include #include @@ -60,7 +58,6 @@ #include #define TCPSTATES #include -#define _WANT_TCPCB #include #include #include @@ -74,11 +71,7 @@ #include "systat.h" #include "extern.h" -static struct netinfo *enter(struct in_conninfo *, uint8_t, int, const char *); -static void enter_kvm(struct inpcb *, struct socket *, int, const char *); -static void enter_sysctl(struct xinpcb *, struct xsocket *, int, const char *); -static void fetchnetstat_kvm(void); -static void fetchnetstat_sysctl(void); +static void enter(struct xinpcb *, struct xsocket *so, int, const char *); static char *inetname(struct sockaddr *); static void inetprint(struct sockaddr *, const char *); @@ -138,16 +131,6 @@ static const char *miblist[] = { "net.inet.udp.pcblist" }; -static char tcb[] = "tcb", udb[] = "udb"; - -struct nlist namelist[] = { -#define X_TCB 0 - { .n_name = tcb }, -#define X_UDB 1 - { .n_name = udb }, - { .n_name = NULL }, -}; - int initnetstat(void) { @@ -157,77 +140,6 @@ initnetstat(void) void fetchnetstat(void) -{ - if (use_kvm) - fetchnetstat_kvm(); - else - fetchnetstat_sysctl(); -} - -static void -fetchnetstat_kvm(void) -{ - struct netinfo *p; - struct inpcbhead head; - struct socket sockb; - struct tcpcb tcpcb; - struct inpcb *inpcb; - void *off; - int istcp; - - if (namelist[X_TCB].n_value == 0) - return; - TAILQ_FOREACH(p, &netcb, chain) - p->ni_seen = 0; - if (protos&TCP) { - off = NPTR(X_TCB); - istcp = 1; - } - else if (protos&UDP) { - off = NPTR(X_UDB); - istcp = 0; - } - else { - error("No protocols to display"); - return; - } -again: - KREAD(off, &head, sizeof (struct inpcbhead)); - LIST_FOREACH(inpcb, &head, inp_list) { - KREAD(inpcb, &tcpcb, istcp ? sizeof(tcpcb) : sizeof(inpcb)); - inpcb = (struct inpcb *)&tcpcb; - if (!aflag) { - if (inpcb->inp_vflag & INP_IPV4) { - if (inpcb->inp_laddr.s_addr == INADDR_ANY) - continue; - } -#ifdef INET6 - else if (inpcb->inp_vflag & INP_IPV6) { - if (memcmp(&inpcb->in6p_laddr, - &in6addr_any, sizeof(in6addr_any)) == 0) - continue; - } -#endif - } - if (nhosts && !checkhost(&inpcb->inp_inc)) - continue; - if (nports && !checkport(&inpcb->inp_inc)) - continue; - if (istcp) { - KREAD(inpcb->inp_socket, &sockb, sizeof (sockb)); - enter_kvm(inpcb, &sockb, tcpcb.t_state, "tcp"); - } else - enter_kvm(inpcb, &sockb, 0, "udp"); - } - if (istcp && (protos&UDP)) { - istcp = 0; - off = NPTR(X_UDB); - goto again; - } -} - -static void -fetchnetstat_sysctl(void) { struct netinfo *p; int idx; @@ -303,41 +215,20 @@ fetchnetstat_sysctl(void) if (nports && !checkport(&xip->inp_inc)) continue; if (idx == 0) - enter_sysctl(xip, &xip->xi_socket, - xtp->t_state, "tcp"); + enter(xip, &xip->xi_socket, xtp->t_state, + "tcp"); else - enter_sysctl(xip, &xip->xi_socket, 0, "udp"); + enter(xip, &xip->xi_socket, 0, "udp"); } free(inpg); } } static void -enter_kvm(struct inpcb *inp, struct socket *so, int state, const char *proto) -{ - struct netinfo *p; - - if ((p = enter(&inp->inp_inc, inp->inp_vflag, state, proto)) != NULL) { - p->ni_rcvcc = so->so_rcv.sb_ccc; - p->ni_sndcc = so->so_snd.sb_ccc; - } -} - -static void -enter_sysctl(struct xinpcb *xip, struct xsocket *so, int state, - const char *proto) -{ - struct netinfo *p; - - if ((p = enter(&xip->inp_inc, xip->inp_vflag, state, proto)) != NULL) { - p->ni_rcvcc = so->so_rcv.sb_cc; - p->ni_sndcc = so->so_snd.sb_cc; - } -} - -static struct netinfo * -enter(struct in_conninfo *inc, uint8_t vflag, int state, const char *proto) +enter(struct xinpcb *xip, struct xsocket *so, int state, const char *proto) { + struct in_conninfo *inc = &xip->inp_inc; + uint8_t vflag = xip->inp_vflag; struct netinfo *p; struct sockaddr_storage lsa, fsa; struct sockaddr_in *sa4; @@ -378,7 +269,7 @@ enter(struct in_conninfo *inc, uint8_t vflag, int state, const char *proto) } #endif else - return NULL; + return; /* * Only take exact matches, any sockets with @@ -400,7 +291,7 @@ enter(struct in_conninfo *inc, uint8_t vflag, int state, const char *proto) if (p == NULL) { if ((p = malloc(sizeof(*p))) == NULL) { error("Out of memory"); - return NULL; + return; } TAILQ_INSERT_HEAD(&netcb, p, chain); p->ni_line = -1; @@ -411,7 +302,8 @@ enter(struct in_conninfo *inc, uint8_t vflag, int state, const char *proto) } p->ni_state = state; p->ni_seen = 1; - return p; + p->ni_rcvcc = so->so_rcv.sb_cc; + p->ni_sndcc = so->so_snd.sb_cc; } /* column locations */ @@ -425,8 +317,6 @@ enter(struct in_conninfo *inc, uint8_t vflag, int state, const char *proto) void labelnetstat(void) { - if (use_kvm && namelist[X_TCB].n_type == 0) - return; wmove(wnd, 0, 0); wclrtobot(wnd); mvwaddstr(wnd, 0, LADDR, "Local Address"); mvwaddstr(wnd, 0, FADDR, "Foreign Address"); diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h index 55a21a04998a..371fdf57f6fc 100644 --- a/usr.bin/systat/systat.h +++ b/usr.bin/systat/systat.h @@ -45,13 +45,6 @@ struct cmdtab { char c_flags; /* see below */ }; -/* - * If we are started with privileges, use a kmem interface for netstat handling, - * otherwise use sysctl. - * In case of many open sockets, the sysctl handling might become slow. - */ -extern int use_kvm; - #define CF_INIT 0x1 /* been initialized */ #define CF_LOADAV 0x2 /* display w/ load average */ #define CF_ZFSARC 0x4 /* display w/ ZFS cache usage */ @@ -62,10 +55,6 @@ extern int use_kvm; #define MAINWIN_ROW 3 /* top row for the main/lower window */ #define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var)) -#define KREAD(addr, buf, len) kvm_ckread((addr), (buf), (len)) -#define NVAL(indx) namelist[(indx)].n_value -#define NPTR(indx) (void *)NVAL((indx)) -#define NREAD(indx, buf, len) kvm_ckread(NPTR((indx)), (buf), (len)) extern void putint(int, int, int, int); extern void putfloat(double, int, int, int, int, int); From nobody Thu Mar 12 17:10:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWvK33NyRz6VfX3; Thu, 12 Mar 2026 17:11:03 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWvK30fwYz3K6g; Thu, 12 Mar 2026 17:11:03 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 62CHAsIR039228 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 12 Mar 2026 18:10:55 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 62CHAsZN039227; Thu, 12 Mar 2026 18:10:54 +0100 (CET) (envelope-from fuz) Date: Thu, 12 Mar 2026 18:10:54 +0100 From: Robert Clausecker To: Mitchell Horne Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a2b2ce2c15bb - main - DEFINE_IFUNC.9: update NOTES Message-ID: References: <69b2d252.38e13.8446a44@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69b2d252.38e13.8446a44@gitrepo.freebsd.org> 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:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Queue-Id: 4fWvK30fwYz3K6g X-Spamd-Bar: ---- Hi Mitchell, Does that apply to armv7, too? I thought they weren't supported on armv7. Yours, Robert Clausecker Am Thu, Mar 12, 2026 at 02:48:50PM +0000 schrieb Mitchell Horne: > The branch main has been updated by mhorne: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a2b2ce2c15bb73d9f87d5072cf65f1f027e066fb > > commit a2b2ce2c15bb73d9f87d5072cf65f1f027e066fb > Author: Mitchell Horne > AuthorDate: 2026-03-12 14:44:46 +0000 > Commit: Mitchell Horne > CommitDate: 2026-03-12 14:44:46 +0000 > > DEFINE_IFUNC.9: update NOTES > > ifuncs are now implemented for all architectures, so drop the caveat > statement. > > Reviewed by: kib > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D55815 > --- > share/man/man9/DEFINE_IFUNC.9 | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/share/man/man9/DEFINE_IFUNC.9 b/share/man/man9/DEFINE_IFUNC.9 > index 0bb75d1fd4da..8cb216af04d7 100644 > --- a/share/man/man9/DEFINE_IFUNC.9 > +++ b/share/man/man9/DEFINE_IFUNC.9 > @@ -24,7 +24,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > -.Dd May 18, 2019 > +.Dd March 10, 2026 > .Dt DEFINE_IFUNC 9 > .Os > .Sh NAME > @@ -134,8 +134,7 @@ function with an optimized implementation for CPUs that advertise support. > .Sh SEE ALSO > .Xr elf 5 > .Sh NOTES > -ifuncs are not supported on all architectures. > -They require both toolchain support, to emit function symbols of type > +ifuncs require both toolchain support, to emit function symbols of type > .Dv STT_GNU_IFUNC , > -and kernel linker support to invoke ifunc resolvers during boot or > +and kernel linker support, to invoke ifunc resolvers during boot or > during module load. > -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Thu Mar 12 17:40:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWvzR3ySvz6Vj4d for ; Thu, 12 Mar 2026 17:40:51 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450: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 4fWvzQ5kpvz3Pdg for ; Thu, 12 Mar 2026 17:40:50 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=gopLh864; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of meloun.michal@gmail.com designates 2a00:1450:4864:20::42d as permitted sender) smtp.mailfrom=meloun.michal@gmail.com Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-439b6d9c981so957923f8f.1 for ; Thu, 12 Mar 2026 10:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773337248; x=1773942048; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:reply-to:user-agent:mime-version:date :message-id:sender:from:to:cc:subject:date:message-id:reply-to; bh=V2/lM5KaQc+GRHJTpYMNHA1+BBFQEGfjv2ZZHGY1tvc=; b=gopLh864ikPWFl0FYS5DwILgSnOmJ6cek0uX+OgblJmJ1gBAkvvmNA6Oeem8LYL3Ah V7spOYuZvTcR55vP7J8uwzV2jiXFHjO068j3ACPZM8hbjrZO+OitzjAC1gkTq7RUM2zW aaBM+8kf2yIKEpxzK8W07swHkXK21eMQxlU53gnJSrbRTMw1Wtt0ZsZ0SEqw3AwuRXNr z9q6ac+ALzKBap+G9eic4b6vadmqJgannwWAroQj39pX9LF6NogvxfImQ85V4vQu79Bq JU/xhSn5hwLaq1kvg/LRXt/zkXBsKybUy7U7puP1Mwos2A0b6e5KV1sS33w06BI4mLAw Eg2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773337248; x=1773942048; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:reply-to:user-agent:mime-version:date :message-id:sender:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=V2/lM5KaQc+GRHJTpYMNHA1+BBFQEGfjv2ZZHGY1tvc=; b=Up1zVO7goYOksTzOP0qVNkXnLWAzjk+Owh9m0EXnJMDqRaSlJ97NWMRt6KyLm9L8OY V3wSD82SFvhIYocBCj64vhQe1fxUPA+WUR3KJPK9rB7pf7vEenSRTT3RbC1yd7q8TU8R YEhJgwEQ3Z5UeedUZlHPGveIY8uF5ohtL98d5qKEvMwScEpiPOyRV3j9zrPoUVIDE/IE +mq3TBmUuUiv+REnmXsl18TtyrVvIgted8JFwdv1/qxlXPdTbC/JfDmLpzCFMG3zISW9 ewkPVFN6xM6pSkdjrj6iGrvJJhPedMFFT2JO1hCKM6uzC5lqnc74wMuh9ZbK77WKMni5 PtXQ== X-Gm-Message-State: AOJu0YwUd8urvu9pP39JuUI7uysOzfFlnhRCk2cVWwqmcus6pLDwIpHi kpaq/X6tqQNwXN34gGAQtJmLUwvNDs+txethBCJ4qr8qFPJ4SRBN/Et7wBePkA== X-Gm-Gg: ATEYQzzTp46M0C0S1+FJ30Ou+4RcNTo1SI9R5SGt4zE13+AIdTtOYyG1Kh4uzLPWVKc Nc5hBdXZmwCxUkYk8Zqa9i9BorLErNdBARbkp93BiSY5AjTfZOK+2NIYD/OYDJDyWrEkbagK0ry rfKguWITLbCvkQDoOqZXcquMrEFcasRWEujzXm/Q6Kh2JUwl65AxeFqF0DtXXKuEttSN7IepHBR P3/NqnNl5oq/lNBLkG7t2Kwh+SiSE1KIywy7ieqmpj+w8I6u7L7KndmnTUqsukLINKd9gW9qZJG EkWUyYlkxib2yhw7r/NlHwfUQk9c8+b670gNWEaaA4+1cFZVTlMhxgPb056HfluXA72vR1QykV4 A+WXvRzBgrvGxqNrOUoTCa2qgn3K428O2nuwXrYo7maGAv2kZX8kljlQSoNI0BbnewNU9UMjLrZ NE07Dx4WHm7Rson0Tmeg1bbQWNRoEpKXKkACAhagr/eneW/wxRG4PkvuYdgdvNo9uYtTyuvf2AR qgI9gQUQeKrBggoEkQAaQ== X-Received: by 2002:a05:6000:2403:b0:439:c1b2:e99d with SMTP id ffacd0b85a97d-439fdf4246emr8322281f8f.8.1773337248359; Thu, 12 Mar 2026 10:40:48 -0700 (PDT) Received: from ?IPV6:2001:67c:14a0:5fe0:f994:5494:ea84:38ea? ([2001:67c:14a0:5fe0:f994:5494:ea84:38ea]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe20bb90sm10596385f8f.19.2026.03.12.10.40.47 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Mar 2026 10:40:47 -0700 (PDT) Message-ID: Date: Thu, 12 Mar 2026 18:40:47 +0100 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: meloun.michal@gmail.com Subject: Re: git: a2b2ce2c15bb - main - DEFINE_IFUNC.9: update NOTES To: dev-commits-src-all@freebsd.org References: <69b2d252.38e13.8446a44@gitrepo.freebsd.org> Content-Language: cs, en-US From: Michal Meloun In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_LONG(-1.00)[-0.998]; NEURAL_HAM_SHORT(-0.99)[-0.995]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::42d:from]; RCVD_TLS_LAST(0.00)[]; TAGGED_FROM(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[gmail.com:+]; FROM_HAS_DN(0.00)[]; HAS_REPLYTO(0.00)[meloun.michal@gmail.com]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_NONE(0.00)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; REPLYTO_DOM_NEQ_TO_DOM(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FREEMAIL_REPLYTO(0.00)[gmail.com] X-Rspamd-Queue-Id: 4fWvzQ5kpvz3Pdg X-Spamd-Bar: --- Please seehttps://cgit.freebsd.org/src/commit/?id=d78cbf483fe73c987573967042f57f15bf590629 Michal On 12.03.2026 18:10, Robert Clausecker wrote: > Hi Mitchell, > > Does that apply to armv7, too? I thought they weren't supported > on armv7. > > Yours, > Robert Clausecker > > Am Thu, Mar 12, 2026 at 02:48:50PM +0000 schrieb Mitchell Horne: >> The branch main has been updated by mhorne: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=a2b2ce2c15bb73d9f87d5072cf65f1f027e066fb >> >> commit a2b2ce2c15bb73d9f87d5072cf65f1f027e066fb >> Author: Mitchell Horne >> AuthorDate: 2026-03-12 14:44:46 +0000 >> Commit: Mitchell Horne >> CommitDate: 2026-03-12 14:44:46 +0000 >> >> DEFINE_IFUNC.9: update NOTES >> >> ifuncs are now implemented for all architectures, so drop the caveat >> statement. >> >> Reviewed by: kib >> Sponsored by: The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D55815 >> --- >> share/man/man9/DEFINE_IFUNC.9 | 7 +++---- >> 1 file changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/share/man/man9/DEFINE_IFUNC.9 b/share/man/man9/DEFINE_IFUNC.9 >> index 0bb75d1fd4da..8cb216af04d7 100644 >> --- a/share/man/man9/DEFINE_IFUNC.9 >> +++ b/share/man/man9/DEFINE_IFUNC.9 >> @@ -24,7 +24,7 @@ >> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >> .\" SUCH DAMAGE. >> .\" >> -.Dd May 18, 2019 >> +.Dd March 10, 2026 >> .Dt DEFINE_IFUNC 9 >> .Os >> .Sh NAME >> @@ -134,8 +134,7 @@ function with an optimized implementation for CPUs that advertise support. >> .Sh SEE ALSO >> .Xr elf 5 >> .Sh NOTES >> -ifuncs are not supported on all architectures. >> -They require both toolchain support, to emit function symbols of type >> +ifuncs require both toolchain support, to emit function symbols of type >> .Dv STT_GNU_IFUNC , >> -and kernel linker support to invoke ifunc resolvers during boot or >> +and kernel linker support, to invoke ifunc resolvers during boot or >> during module load. >> > From nobody Thu Mar 12 18:22:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWww43y3qz6VlSQ for ; Thu, 12 Mar 2026 18:23: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWwvz32Mqz3VW9 for ; Thu, 12 Mar 2026 18:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773339775; 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=uDavcAnpISW/e3cvxd/BdMhflyp3uwb4F0TlRwwoR/Q=; b=ae17dKe2ert6bZrjW1FZjewrbJHdo0pGtUf3a1zLtZpYEd41jCIVl4JVd5jmUFZD/HOUOd 5+S4khcI0f34N6xiNCBSPxoELhCFPfFNq0yysM9PORYR+WCJYKRBjBeJIA6RDqO89dS1mx U7laMDmOUsbIlKM9aD4+QT4szUJN4UP0b4wKBP5qf2U3SiAkzWxvEu3VnL+i9qA41cEkqA Ju7qYMbsGovOSFw3QPG852PEQu25fFY5d7czqEsaXvSuemWWVOXvF4ZgfeEwhWCoUy1oX1 x/F0+eTbAr59Q5/E6X7/6NnBPp3Aoh6WKZlFD6CLIF2uU//kq6+TjKWFvGRm0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773339775; a=rsa-sha256; cv=none; b=Rl+OzN+ozR4k3fpOCqzkdxfxeeektfXKHGsGHiyfm9hixpMXmQGq7tjrcO/nkYtQ7kYP9j m046ZyUwUK6f2aQxSpP5DIW7jrXLHs/An/4YF1+aF2x2pq2kdbWJ/e3zO4I9Dl31XrRPYx ZAKLbID4KdqmNpOsK0jxAfWo4Kyz+j2JPZgM3hIzd15HJkWu9/wgagmybZHIMLdBabgioO EG+0Qqwi9rZ7ZUosty0L9B0J0aGuTbvdF+Iww548VUiL4PoNbm7eGL1BNKHQL4a6CtKlck EZlYHAVZUMVgXFlzrE4uq5eX1M14dSHfYxN3NYljxFkTUQpaRAFm04VZrA+TVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773339775; 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=uDavcAnpISW/e3cvxd/BdMhflyp3uwb4F0TlRwwoR/Q=; b=gVmIcKjf+97Xz/a6aUR9nWMuJQchrkFn5sfVjsIItQTC0pcMB+NUnXvdYUBoVBJW4nHwf1 qwfRFt65yQEM8nw5c3p0ccTfpxEILx63cbAy9uccegPNDxy5+8zAgPS38KiLTrdzyaSdxB TIxMRJOtYabZkpMCItnb4Ewwy2MlnE0v6cN+HdO6ePdVL93iLNncTMsbSODvu+2wacNnE2 nlbmccnFboZnzI6XuBbdiDUJUhYCeN29H9EbCz8Ucn5fmlBLf21kqwatJSH1HxHtxvFoa7 q/Wcu+10vC9mue1VZ3uYbjRhMC3Wtc4sKeUpGBAdAQfZ7FLaPmBYdGl+eeJJFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWwvz2Tp0zxJF for ; Thu, 12 Mar 2026 18:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fd0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 18:22:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sean Farley From: Christos Margiolis Subject: git: ac5ff2813027 - main - sound: enforce MASTER volume mute during playback List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac5ff2813027c385f9037b47b2b164d4c1bebd09 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 18:22:55 +0000 Message-Id: <69b3047f.1fd0e.58f3ac16@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ac5ff2813027c385f9037b47b2b164d4c1bebd09 commit ac5ff2813027c385f9037b47b2b164d4c1bebd09 Author: Sean Farley AuthorDate: 2026-03-12 18:22:02 +0000 Commit: Christos Margiolis CommitDate: 2026-03-12 18:22:02 +0000 sound: enforce MASTER volume mute during playback MASTER mute (vol.mute) works while audio is playing. However, if a stream is stopped and restarted (PCMTRIG_STOP -> PCMTRIG_START), the audio will resume even though the mixer shows the MASTER volume as muted. Other streams that are already playing remain silent. New streams may also start playing audio regardless of the MASTER mute state. The volume feeder now considers the MASTER mute when determining whether a channel should be muted. This ensures MASTER mute is consistently enforced for all streams and removes the dependency on trigger-driven state propagation. Tested with Creative Labs CA0132 card. MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D55605 --- sys/dev/sound/pcm/feeder_volume.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index fc4ed1bbb0a5..e43b2594c7e0 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -242,11 +242,14 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, { int temp_vol[SND_CHN_T_VOL_MAX]; struct feed_volume_info *info; + struct snd_mixer *m; + struct snddev_info *d; uint32_t j, align; int i, *matrix; uint8_t *dst; const int16_t *vol; const int8_t *muted; + bool master_muted = false; /* * Fetch filter data operation. @@ -278,8 +281,14 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (FEEDER_FEED(f->source, c, b, count, source)); /* Check if any controls are muted. */ + d = (c != NULL) ? c->parentsnddev : NULL; + m = (d != NULL && d->mixer_dev != NULL) ? d->mixer_dev->si_drv1 : NULL; + + if (m != NULL) + master_muted = (mix_getmutedevs(m) & (1 << SND_VOL_C_MASTER)); + for (j = 0; j != SND_CHN_T_VOL_MAX; j++) - temp_vol[j] = muted[j] ? 0 : vol[j]; + temp_vol[j] = (muted[j] || master_muted) ? 0 : vol[j]; dst = b; align = info->bps * info->channels; From nobody Thu Mar 12 18:32:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWx7B4MH4z6VmWs for ; Thu, 12 Mar 2026 18:32: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWx7B3SSJz3WV0 for ; Thu, 12 Mar 2026 18:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773340358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O3cIVQWNPiK/gTKiTx0BVOhoK2KNY7qlTWpQUKRhcAw=; b=RTKSkC0TXBEFG6RmX0Au9jUKtPnquMUNbh2AM+/vP+8mt46KZu5OpOWTq9jNogtdFoDPv7 vhgqoKsOyZB6dFzmKOSc5zaJBQvyoHMSoqyRDUAkp+Xp/7CEAu6v7xVIb+mJnD9ucfLh1v Y7/QfxongLWRI46AsOOxGrtWI25SxVytn2dXIaT0uUckw0b2ouQfajsiqRvfkAoCUup8e5 xF1jrSJhNmd9rhAEHNf5Xh5968n5PPyo2EhYzkKIa0W7V3qjtoPqWfj84IcwdWa79R6cqV D1TdWeWKlhhcCtqs78JbDgll/9AxV/IuwTd43wORMTSopbzfd6eKd6fcXKVSjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773340358; a=rsa-sha256; cv=none; b=tBhJsHUjk3S2V4lwxIqJm9uouTq7wX9pGDy/ZFJTsRcHp4cTODRMxqZ0ZKqLvj1Witp8i6 JSw3F8b4sk+QxOUtMlRH4Ie23yHBYDVxfbs5+GD1G6AVKZ19C1ZtMCJsfrKwGCvrKWQgMS 6tDVHyFKG+yX2SKA9CvRq5mbDkc6cBJVIOo3ftixd0rtngO07jqzrTE8RaLkc9VUXU8gBi Lfe86TrhycfVzxO2fgkxlBvM/UuJAkqJ8wBQT0x+QKq4y3XSdpI15fT6A8Sdlp0+FxSfs6 sc0/kbZKx4QT9Zm7acI24sgfrQRDYmGRR4ZrxGL9shPzbDLf8gkHGftwZFjhkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773340358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O3cIVQWNPiK/gTKiTx0BVOhoK2KNY7qlTWpQUKRhcAw=; b=pR7bnNAL/6W2tgdfTTxxvTb97WNS/92PrhYCrkrtdmjAdYgU9500R9n2QhrGDDap4DTjz+ 8Klri5hXnk7v++eiMR03qe73SI/pnr2SS4GLfviM41AhEZezotC2WiLK4IRQVC4LqH9Kd1 9D4JLt68yCUIeBe6t0n/GAzOZlVrNnFtRz4jnSq9AKWTnTuTJbK+kE6dSdG0qvv7G++cOo 7MyqzJVftnMTz/Uaph747lROskql4Wj0w+ZTUd5VySL1h1YdY+Fd4uZPHf33+iMrXSiPk4 L2TWcDxyHI61EuihxnA+BXYycHmZbibMPfKOWg5qnT9HsXKGP4YvjBtcKLtuTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWx7B2vdjzxPc for ; Thu, 12 Mar 2026 18:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2142c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 18:32:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0f1aa4543fbb - main - debugnet: don't include udp_var.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f1aa4543fbb7a49c077b69fbb60945ce0c14367 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 18:32:38 +0000 Message-Id: <69b306c6.2142c.4250e2a2@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0f1aa4543fbb7a49c077b69fbb60945ce0c14367 commit 0f1aa4543fbb7a49c077b69fbb60945ce0c14367 Author: Gleb Smirnoff AuthorDate: 2026-03-12 18:01:01 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 18:32:29 +0000 debugnet: don't include udp_var.h The module constructs UDP packets, but doesn't use the UDP stack. --- sys/net/debugnet_inet.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/debugnet_inet.c b/sys/net/debugnet_inet.c index 1ca35e1faf73..eb228e326f99 100644 --- a/sys/net/debugnet_inet.c +++ b/sys/net/debugnet_inet.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include From nobody Thu Mar 12 18:32:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWx7D21wgz6VmRG for ; Thu, 12 Mar 2026 18:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWx7C40dqz3WXS for ; Thu, 12 Mar 2026 18:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773340359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eTkmCR43vPC3upYlbWMsH8RnL49spYU1Q0JJfpOvShA=; b=efkONe2ChQ3VFp8ieH9Xxrrm3vmpfNHKkm9yhQIBMUVfZD6qXVBoOTXbFIC76vrDui9QWc iqWZPsjfsZsWGPcrDrrRKCCw812dXP7gq8KbDhdDIWlAIV7VRLD3l6dPBLHwwi62r70M3O K8jStysaDRenNyYgXKKVtlSfuN0UdBtgR443M4BJXFIxpObmaLontD5yVs0pAFQjSV4c7C PWMdgT6IR1jnp35opT80tByzn2lsZFHoSdaW3CCs5V/NhczA0BX06r47oE34xqmkEGkCYp HTXysgG5T2207peM+Rer7EkwVM6tjn5Lj2mW/RUOmUohOlzE99EoxOkHvzHFJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773340359; a=rsa-sha256; cv=none; b=QosgRqkojka19oRPuWP2LEbFV4AG/aT3urDG5nI4A0E7rAy9ITXctIYsTAur/a1W/EmL2M 4qyDvZgHRV6CNajeQi4QFaeQD9q34RBnQs+8kl1wo593Bcs6VXbCu5SC2XABAinEQhECI1 fn6Ow4Y3Hk+1CN6PRjNVEEgElzTOmCm/YcUGTyw0BhyoPfVKES5eh0ba/x21ZHdj/KHdYj LVJ6eTYr9tiS8dv/FE2GjoXUzO7yNwJYibwASRbvBiWpG70ZsAGa69tbhUDzgXremhbDZk cwNATThBFTZnVkUW904Vnd1UCPdJn/20dnftMp4vq7uLqjlUYplGnn4a530acQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773340359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eTkmCR43vPC3upYlbWMsH8RnL49spYU1Q0JJfpOvShA=; b=F/qM5YLntovS4DwE+dwZi5cyD10B5DKJ+R43VIHZSzd068p0FClmLirJShaGrxQYDCsqC4 /VYsITS54qRFzqiUHqAWLJHcjE09YYwQbj/6BjTpbyar23RpEqjc9X+6RGQApRlq/UKQer MXKQeE5irt3VunvitGh4hrhXEGv80U1RMt0KwsaRd76kmg90Z5n2hz98fPsjOxYoaSqurF T29DhmkKHct3sBD4zLhFFAO+7geO6uO0507b6LP6EUB7M9CVDYuYC60VgdeowYlGeOPKaY ICbLmzi+YCkXhi0XkvBoCMLcNbPqx3wlPVT3hEZiYiW2LwEY9Qu5VyM6wui72Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWx7C3WfhzxYr for ; Thu, 12 Mar 2026 18:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2139a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 18:32:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 041e9eb1ae09 - main - inpcb: overhaul in_pcb.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 041e9eb1ae094a81e55fbcaba37eb2ac194658cc Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 18:32:39 +0000 Message-Id: <69b306c7.2139a.4051b728@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=041e9eb1ae094a81e55fbcaba37eb2ac194658cc commit 041e9eb1ae094a81e55fbcaba37eb2ac194658cc Author: Gleb Smirnoff AuthorDate: 2026-03-12 18:02:27 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 18:32:30 +0000 inpcb: overhaul in_pcb.h Pull up all user-visible stuff to the top of the file and isolate the rest under _KERNEL. The user visible parts are: - struct in_conninfo - struct xinpcb - defines for inp_flags bits, that are shared between xinpcb and inpcb PR: 293493 --- sys/netinet/in_pcb.h | 477 +++++++++++++++++++++++++-------------------------- 1 file changed, 231 insertions(+), 246 deletions(-) diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index cd7a7303865f..bdf8ff9fb74c 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -37,36 +37,6 @@ #ifndef _NETINET_IN_PCB_H_ #define _NETINET_IN_PCB_H_ -#include -#include -#include -#include -#include -#include -#include - -#ifdef _KERNEL -#include -#include -#include -#include -#include -#include -#endif -#include - -/* - * struct inpcb is the common protocol control block structure used in most - * IP transport protocols. - * - * Pointers to local and foreign host table entries, local and foreign socket - * numbers, and pointers up (to a socket structure) and down (to a - * protocol-specific control block) are stored here. - */ -CK_LIST_HEAD(inpcbhead, inpcb); -CK_LIST_HEAD(inpcblbgrouphead, inpcblbgroup); -typedef uint64_t inp_gen_t; - /* * PCB with AF_INET6 null bind'ed laddr can receive AF_INET input packet. * So, AF_INET6 null laddr is also used as AF_INET null laddr, by utilizing @@ -74,8 +44,8 @@ typedef uint64_t inp_gen_t; * which is done right after inpcb allocation and stays through its lifetime. */ struct in_addr_4in6 { - u_int32_t ia46_pad32[3]; - struct in_addr ia46_addr4; + uint32_t ia46_pad32[3]; + struct in_addr ia46_addr4; }; union in_dependaddr { @@ -90,8 +60,8 @@ union in_dependaddr { * lport, faddr to generate hash, so these fields shouldn't be moved. */ struct in_endpoints { - u_int16_t ie_fport; /* foreign port */ - u_int16_t ie_lport; /* local port */ + uint16_t ie_fport; /* foreign port */ + uint16_t ie_lport; /* local port */ /* protocol dependent part, local and foreign addr */ union in_dependaddr ie_dependfaddr; /* foreign host table entry */ union in_dependaddr ie_dependladdr; /* local host table entry */ @@ -99,7 +69,7 @@ struct in_endpoints { #define ie_laddr ie_dependladdr.id46_addr.ia46_addr4 #define ie6_faddr ie_dependfaddr.id6_addr #define ie6_laddr ie_dependladdr.id6_addr - u_int32_t ie6_zoneid; /* scope zone id */ + uint32_t ie6_zoneid; /* scope zone id */ }; /* @@ -107,11 +77,11 @@ struct in_endpoints { * references. */ struct in_conninfo { - u_int8_t inc_flags; - u_int8_t inc_len; - u_int16_t inc_fibnum; /* XXX was pad, 16 bits is plenty */ + uint8_t inc_flags; + uint8_t inc_len; + uint16_t inc_fibnum; /* XXX was pad, 16 bits is plenty */ /* protocol dependent part */ - struct in_endpoints inc_ie; + struct in_endpoints inc_ie; }; /* @@ -128,7 +98,222 @@ struct in_conninfo { #define inc6_laddr inc_ie.ie6_laddr #define inc6_zoneid inc_ie.ie6_zoneid -#if defined(_KERNEL) +#define inp_fport inp_inc.inc_fport +#define inp_lport inp_inc.inc_lport +#define inp_faddr inp_inc.inc_faddr +#define inp_laddr inp_inc.inc_laddr + +#define in6p_faddr inp_inc.inc6_faddr +#define in6p_laddr inp_inc.inc6_laddr +#define in6p_zoneid inp_inc.inc6_zoneid + +#ifdef _SYS_SOCKETVAR_H_ /* XXX: requires xsocket to be known */ +/* + * Interface exported to userland by various protocols which use inpcbs. Hack + * alert -- only define if struct xsocket is in scope. + * Fields prefixed with "xi_" are unique to this structure, and the rest + * match fields in the struct inpcb, to ease coding and porting. + * + * Legend: + * (s) - used by userland utilities in src + * (p) - used by utilities in ports + * (3) - is known to be used by third party software not in ports + * (n) - no known usage + */ +typedef uint64_t inp_gen_t; /* compat */ +struct xinpcb { + ksize_t xi_len; /* length of this structure */ + struct xsocket xi_socket; /* (s,p) */ + struct in_conninfo inp_inc; /* (s,p) */ + uint64_t inp_gencnt; /* (s,p) */ + int64_t inp_spare64[5]; + uint32_t inp_flow; /* (s) */ + uint32_t inp_flowid; /* (s) */ + uint32_t inp_flowtype; /* (s) */ + int32_t inp_flags; /* (s,p) */ + int32_t inp_flags2; /* (s) */ + uint32_t inp_unused; + int32_t in6p_cksum; /* (n) */ + int32_t inp_spare32[4]; + uint16_t in6p_hops; /* (n) */ + uint8_t inp_ip_tos; /* (n) */ + int8_t pad8; + uint8_t inp_vflag; /* (s,p) */ + uint8_t inp_ip_ttl; /* (n) */ + uint8_t inp_ip_p; /* (n) */ + uint8_t inp_ip_minttl; /* (n) */ + int8_t inp_spare8[4]; +} __aligned(8); + +struct xinpgen { + ksize_t xig_len; /* length of this structure */ + u_int xig_count; /* number of PCBs at this time */ + uint32_t _xig_spare32; + uint64_t xig_gen; /* generation count at this time */ + so_gen_t xig_sogen; /* socket generation count this time */ + uint64_t _xig_spare64[4]; +} __aligned(8); +#endif /* _SYS_SOCKETVAR_H_ */ + +/* + * Flags for inp_vflags -- historically version flags only + */ +#define INP_IPV4 0x1 +#define INP_IPV6 0x2 +#define INP_IPV6PROTO 0x4 /* opened under IPv6 protocol */ + +/* inp_vflags description for use with printf(9) %b identifier. */ +#define INP_VFLAGS_BITS "\20\1INP_IPV4\2INP_IPV6\3INP_IPV6PROTO" + +/* + * Flags for inp_flags. + */ +#define INP_RECVOPTS 0x00000001 /* receive incoming IP options */ +#define INP_RECVRETOPTS 0x00000002 /* receive IP options for reply */ +#define INP_RECVDSTADDR 0x00000004 /* receive IP dst address */ +#define INP_HDRINCL 0x00000008 /* user supplies entire IP header */ +#define INP_HIGHPORT 0x00000010 /* user wants "high" port binding */ +#define INP_LOWPORT 0x00000020 /* user wants "low" port binding */ +#define INP_ANONPORT 0x00000040 /* read by netstat(1) */ +#define INP_RECVIF 0x00000080 /* receive incoming interface */ +#define INP_MTUDISC 0x00000100 /* user can do MTU discovery */ +/* INP_FREED 0x00000200 private to in_pcb.c */ +#define INP_RECVTTL 0x00000400 /* receive incoming IP TTL */ +#define INP_DONTFRAG 0x00000800 /* don't fragment packet */ +#define INP_BINDANY 0x00001000 /* allow bind to any address */ +#define INP_INHASHLIST 0x00002000 /* in_pcbinshash() has been called */ +#define INP_RECVTOS 0x00004000 /* receive incoming IP TOS */ +#define IN6P_IPV6_V6ONLY 0x00008000 /* restrict AF_INET6 socket for v6 */ +#define IN6P_PKTINFO 0x00010000 /* receive IP6 dst and I/F */ +#define IN6P_HOPLIMIT 0x00020000 /* receive hoplimit */ +#define IN6P_HOPOPTS 0x00040000 /* receive hop-by-hop options */ +#define IN6P_DSTOPTS 0x00080000 /* receive dst options after rthdr */ +#define IN6P_RTHDR 0x00100000 /* receive routing header */ +#define IN6P_RTHDRDSTOPTS 0x00200000 /* receive dstoptions before rthdr */ +#define IN6P_TCLASS 0x00400000 /* receive traffic class value */ +#define IN6P_AUTOFLOWLABEL 0x00800000 /* attach flowlabel automatically */ +/* INP_INLBGROUP 0x01000000 private to in_pcb.c */ +#define INP_ONESBCAST 0x02000000 /* send all-ones broadcast */ +#define INP_DROPPED 0x04000000 /* protocol drop flag */ +#define INP_SOCKREF 0x08000000 /* strong socket reference */ +#define INP_RESERVED_0 0x10000000 /* reserved field */ +#define INP_BOUNDFIB 0x20000000 /* Bound to a specific FIB. */ +#define IN6P_RFC2292 0x40000000 /* used RFC2292 API on the socket */ +#define IN6P_MTU 0x80000000 /* receive path MTU */ + +#define INP_CONTROLOPTS (INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\ + INP_RECVIF|INP_RECVTTL|INP_RECVTOS|\ + IN6P_PKTINFO|IN6P_HOPLIMIT|IN6P_HOPOPTS|\ + IN6P_DSTOPTS|IN6P_RTHDR|IN6P_RTHDRDSTOPTS|\ + IN6P_TCLASS|IN6P_AUTOFLOWLABEL|IN6P_RFC2292|\ + IN6P_MTU) + +/* inp_flags description for use with printf(9) %b identifier. */ +#define INP_FLAGS_BITS "\20" \ + "\1INP_RECVOPTS\2INP_RECVRETOPTS\3INP_RECVDSTADDR\4INP_HDRINCL" \ + "\5INP_HIGHPORT\6INP_LOWPORT\7INP_ANONPORT\10INP_RECVIF" \ + "\11INP_MTUDISC\12INP_FREED\13INP_RECVTTL\14INP_DONTFRAG" \ + "\15INP_BINDANY\16INP_INHASHLIST\17INP_RECVTOS\20IN6P_IPV6_V6ONLY" \ + "\21IN6P_PKTINFO\22IN6P_HOPLIMIT\23IN6P_HOPOPTS\24IN6P_DSTOPTS" \ + "\25IN6P_RTHDR\26IN6P_RTHDRDSTOPTS\27IN6P_TCLASS\30IN6P_AUTOFLOWLABEL" \ + "\31INP_INLBGROUP\32INP_ONESBCAST\33INP_DROPPED\34INP_SOCKREF" \ + "\35INP_RESERVED_0\36INP_BOUNDFIB\37IN6P_RFC2292\40IN6P_MTU" + +/* + * Flags for inp_flags2. + */ +/* 0x00000001 */ +/* 0x00000002 */ +/* 0x00000004 */ +/* 0x00000008 */ +/* 0x00000010 */ +/* 0x00000020 */ +/* 0x00000040 */ +/* 0x00000080 */ +#define INP_RECVFLOWID 0x00000100 /* populate recv datagram with flow info */ +#define INP_RECVRSSBUCKETID 0x00000200 /* populate recv datagram with bucket id */ +#define INP_RATE_LIMIT_CHANGED 0x00000400 /* rate limit needs attention */ +#define INP_ORIGDSTADDR 0x00000800 /* receive IP dst address/port */ +/* 0x00001000 */ +/* 0x00002000 */ +/* 0x00004000 */ +/* 0x00008000 */ +/* 0x00010000 */ +#define INP_2PCP_SET 0x00020000 /* If the Eth PCP should be set explicitly */ +#define INP_2PCP_BIT0 0x00040000 /* Eth PCP Bit 0 */ +#define INP_2PCP_BIT1 0x00080000 /* Eth PCP Bit 1 */ +#define INP_2PCP_BIT2 0x00100000 /* Eth PCP Bit 2 */ +#define INP_2PCP_BASE INP_2PCP_BIT0 +#define INP_2PCP_MASK (INP_2PCP_BIT0 | INP_2PCP_BIT1 | INP_2PCP_BIT2) +#define INP_2PCP_SHIFT 18 /* shift PCP field in/out of inp_flags2 */ + +/* inp_flags2 description for use with printf(9) %b identifier. */ +#define INP_FLAGS2_BITS "\20" \ + "\11INP_RECVFLOWID\12INP_RECVRSSBUCKETID" \ + "\13INP_RATE_LIMIT_CHANGED\14INP_ORIGDSTADDR" \ + "\22INP_2PCP_SET\23INP_2PCP_BIT0\24INP_2PCP_BIT1" \ + "\25INP_2PCP_BIT2" + +struct sockopt_parameters { + struct in_conninfo sop_inc; + uint64_t sop_id; + int sop_level; + int sop_optname; + char sop_optval[]; +}; + +#ifdef _SYS_KTLS_H_ +struct xktls_session { + uint32_t tsz; /* total sz of elm, next elm is at this+tsz */ + uint32_t fsz; /* size of the struct up to keys */ + uint64_t inp_gencnt; + kvaddr_t so_pcb; + struct in_conninfo coninf; + u_short rx_vlan_id; + struct xktls_session_onedir rcv; + struct xktls_session_onedir snd; +/* + * Next are + * - keydata for rcv, first cipher of length rcv.cipher_key_len, then + * authentication of length rcv.auth_key_len; + * - driver data (string) of length rcv.drv_st_len, if the rcv session is + * offloaded to ifnet rcv.ifnet; + * - keydata for snd, first cipher of length snd.cipher_key_len, then + * authentication of length snd.auth_key_len; + * - driver data (string) of length snd.drv_st_len, if the snd session is + * offloaded to ifnet snd.ifnet; + */ +}; +#endif /* _SYS_KTLS_H_ */ + +#ifdef _KERNEL +/* + * No user visible declarations below. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * struct inpcb is the common protocol control block structure used in most + * IP transport protocols. + * + * Pointers to local and foreign host table entries, local and foreign socket + * numbers, and pointers up (to a socket structure) and down (to a + * protocol-specific control block) are stored here. + */ +CK_LIST_HEAD(inpcbhead, inpcb); +CK_LIST_HEAD(inpcblbgrouphead, inpcblbgroup); + /* * struct inpcb captures the network layer state for TCP, UDP, and raw IPv4 and * IPv6 sockets. In the case of TCP and UDP, further per-connection state is @@ -220,7 +405,7 @@ struct inpcb { short in6p_hops; }; CK_LIST_ENTRY(inpcb) inp_portlist; /* (r:e/w:h) port list */ - inp_gen_t inp_gencnt; /* (c) generation count */ + uint64_t inp_gencnt; /* (c) generation count */ void *spare_ptr; /* Spare pointer. */ rt_gen_t inp_rt_cookie; /* generation for route entry */ union { /* cached L3 information */ @@ -229,112 +414,9 @@ struct inpcb { }; CK_LIST_ENTRY(inpcb) inp_list; /* (r:e/w:p) all PCBs for proto */ }; -#endif /* _KERNEL */ - -#define inp_fport inp_inc.inc_fport -#define inp_lport inp_inc.inc_lport -#define inp_faddr inp_inc.inc_faddr -#define inp_laddr inp_inc.inc_laddr - -#define in6p_faddr inp_inc.inc6_faddr -#define in6p_laddr inp_inc.inc6_laddr -#define in6p_zoneid inp_inc.inc6_zoneid #define inp_vnet inp_pcbinfo->ipi_vnet -/* - * The range of the generation count, as used in this implementation, is 9e19. - * We would have to create 300 billion connections per second for this number - * to roll over in a year. This seems sufficiently unlikely that we simply - * don't concern ourselves with that possibility. - */ - -/* - * Interface exported to userland by various protocols which use inpcbs. Hack - * alert -- only define if struct xsocket is in scope. - * Fields prefixed with "xi_" are unique to this structure, and the rest - * match fields in the struct inpcb, to ease coding and porting. - * - * Legend: - * (s) - used by userland utilities in src - * (p) - used by utilities in ports - * (3) - is known to be used by third party software not in ports - * (n) - no known usage - */ -#ifdef _SYS_SOCKETVAR_H_ -struct xinpcb { - ksize_t xi_len; /* length of this structure */ - struct xsocket xi_socket; /* (s,p) */ - struct in_conninfo inp_inc; /* (s,p) */ - uint64_t inp_gencnt; /* (s,p) */ - int64_t inp_spare64[5]; - uint32_t inp_flow; /* (s) */ - uint32_t inp_flowid; /* (s) */ - uint32_t inp_flowtype; /* (s) */ - int32_t inp_flags; /* (s,p) */ - int32_t inp_flags2; /* (s) */ - uint32_t inp_unused; - int32_t in6p_cksum; /* (n) */ - int32_t inp_spare32[4]; - uint16_t in6p_hops; /* (n) */ - uint8_t inp_ip_tos; /* (n) */ - int8_t pad8; - uint8_t inp_vflag; /* (s,p) */ - uint8_t inp_ip_ttl; /* (n) */ - uint8_t inp_ip_p; /* (n) */ - uint8_t inp_ip_minttl; /* (n) */ - int8_t inp_spare8[4]; -} __aligned(8); - -struct xinpgen { - ksize_t xig_len; /* length of this structure */ - u_int xig_count; /* number of PCBs at this time */ - uint32_t _xig_spare32; - inp_gen_t xig_gen; /* generation count at this time */ - so_gen_t xig_sogen; /* socket generation count this time */ - uint64_t _xig_spare64[4]; -} __aligned(8); - -struct sockopt_parameters { - struct in_conninfo sop_inc; - uint64_t sop_id; - int sop_level; - int sop_optname; - char sop_optval[]; -}; - -#ifdef _SYS_KTLS_H_ -struct xktls_session { - uint32_t tsz; /* total sz of elm, next elm is at this+tsz */ - uint32_t fsz; /* size of the struct up to keys */ - uint64_t inp_gencnt; - kvaddr_t so_pcb; - struct in_conninfo coninf; - u_short rx_vlan_id; - struct xktls_session_onedir rcv; - struct xktls_session_onedir snd; -/* - * Next are - * - keydata for rcv, first cipher of length rcv.cipher_key_len, then - * authentication of length rcv.auth_key_len; - * - driver data (string) of length rcv.drv_st_len, if the rcv session is - * offloaded to ifnet rcv.ifnet; - * - keydata for snd, first cipher of length snd.cipher_key_len, then - * authentication of length snd.auth_key_len; - * - driver data (string) of length snd.drv_st_len, if the snd session is - * offloaded to ifnet snd.ifnet; - */ -}; -#endif /* _SYS_KTLS_H_ */ - -#ifdef _KERNEL -int sysctl_setsockopt(SYSCTL_HANDLER_ARGS, struct inpcbinfo *pcbinfo, - int (*ctloutput_set)(struct inpcb *, struct sockopt *)); -void in_pcbtoxinpcb(const struct inpcb *, struct xinpcb *); -#endif -#endif /* _SYS_SOCKETVAR_H_ */ - -#ifdef _KERNEL /* * Per-VNET pcb database for each high-level protocol (UDP, TCP, ...) in both * IPv4 and IPv6. @@ -483,8 +565,6 @@ struct socket * void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, uint32_t *faddr, uint16_t *fp); -#endif /* _KERNEL */ - #define INP_INFO_WLOCK(ipi) mtx_lock(&(ipi)->ipi_lock) #define INP_INFO_WLOCKED(ipi) mtx_owned(&(ipi)->ipi_lock) #define INP_INFO_WUNLOCK(ipi) mtx_unlock(&(ipi)->ipi_lock) @@ -532,105 +612,6 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, #define INP_PCBPORTHASH(lport, mask) (ntohs((lport)) & (mask)) -/* - * Flags for inp_vflags -- historically version flags only - */ -#define INP_IPV4 0x1 -#define INP_IPV6 0x2 -#define INP_IPV6PROTO 0x4 /* opened under IPv6 protocol */ - -/* inp_vflags description for use with printf(9) %b identifier. */ -#define INP_VFLAGS_BITS "\20\1INP_IPV4\2INP_IPV6\3INP_IPV6PROTO" - -/* - * Flags for inp_flags. - */ -#define INP_RECVOPTS 0x00000001 /* receive incoming IP options */ -#define INP_RECVRETOPTS 0x00000002 /* receive IP options for reply */ -#define INP_RECVDSTADDR 0x00000004 /* receive IP dst address */ -#define INP_HDRINCL 0x00000008 /* user supplies entire IP header */ -#define INP_HIGHPORT 0x00000010 /* user wants "high" port binding */ -#define INP_LOWPORT 0x00000020 /* user wants "low" port binding */ -#define INP_ANONPORT 0x00000040 /* read by netstat(1) */ -#define INP_RECVIF 0x00000080 /* receive incoming interface */ -#define INP_MTUDISC 0x00000100 /* user can do MTU discovery */ -/* INP_FREED 0x00000200 private to in_pcb.c */ -#define INP_RECVTTL 0x00000400 /* receive incoming IP TTL */ -#define INP_DONTFRAG 0x00000800 /* don't fragment packet */ -#define INP_BINDANY 0x00001000 /* allow bind to any address */ -#define INP_INHASHLIST 0x00002000 /* in_pcbinshash() has been called */ -#define INP_RECVTOS 0x00004000 /* receive incoming IP TOS */ -#define IN6P_IPV6_V6ONLY 0x00008000 /* restrict AF_INET6 socket for v6 */ -#define IN6P_PKTINFO 0x00010000 /* receive IP6 dst and I/F */ -#define IN6P_HOPLIMIT 0x00020000 /* receive hoplimit */ -#define IN6P_HOPOPTS 0x00040000 /* receive hop-by-hop options */ -#define IN6P_DSTOPTS 0x00080000 /* receive dst options after rthdr */ -#define IN6P_RTHDR 0x00100000 /* receive routing header */ -#define IN6P_RTHDRDSTOPTS 0x00200000 /* receive dstoptions before rthdr */ -#define IN6P_TCLASS 0x00400000 /* receive traffic class value */ -#define IN6P_AUTOFLOWLABEL 0x00800000 /* attach flowlabel automatically */ -/* INP_INLBGROUP 0x01000000 private to in_pcb.c */ -#define INP_ONESBCAST 0x02000000 /* send all-ones broadcast */ -#define INP_DROPPED 0x04000000 /* protocol drop flag */ -#define INP_SOCKREF 0x08000000 /* strong socket reference */ -#define INP_RESERVED_0 0x10000000 /* reserved field */ -#define INP_BOUNDFIB 0x20000000 /* Bound to a specific FIB. */ -#define IN6P_RFC2292 0x40000000 /* used RFC2292 API on the socket */ -#define IN6P_MTU 0x80000000 /* receive path MTU */ - -#define INP_CONTROLOPTS (INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\ - INP_RECVIF|INP_RECVTTL|INP_RECVTOS|\ - IN6P_PKTINFO|IN6P_HOPLIMIT|IN6P_HOPOPTS|\ - IN6P_DSTOPTS|IN6P_RTHDR|IN6P_RTHDRDSTOPTS|\ - IN6P_TCLASS|IN6P_AUTOFLOWLABEL|IN6P_RFC2292|\ - IN6P_MTU) - -/* inp_flags description for use with printf(9) %b identifier. */ -#define INP_FLAGS_BITS "\20" \ - "\1INP_RECVOPTS\2INP_RECVRETOPTS\3INP_RECVDSTADDR\4INP_HDRINCL" \ - "\5INP_HIGHPORT\6INP_LOWPORT\7INP_ANONPORT\10INP_RECVIF" \ - "\11INP_MTUDISC\12INP_FREED\13INP_RECVTTL\14INP_DONTFRAG" \ - "\15INP_BINDANY\16INP_INHASHLIST\17INP_RECVTOS\20IN6P_IPV6_V6ONLY" \ - "\21IN6P_PKTINFO\22IN6P_HOPLIMIT\23IN6P_HOPOPTS\24IN6P_DSTOPTS" \ - "\25IN6P_RTHDR\26IN6P_RTHDRDSTOPTS\27IN6P_TCLASS\30IN6P_AUTOFLOWLABEL" \ - "\31INP_INLBGROUP\32INP_ONESBCAST\33INP_DROPPED\34INP_SOCKREF" \ - "\35INP_RESERVED_0\36INP_BOUNDFIB\37IN6P_RFC2292\40IN6P_MTU" - -/* - * Flags for inp_flags2. - */ -/* 0x00000001 */ -/* 0x00000002 */ -/* 0x00000004 */ -/* 0x00000008 */ -/* 0x00000010 */ -/* 0x00000020 */ -/* 0x00000040 */ -/* 0x00000080 */ -#define INP_RECVFLOWID 0x00000100 /* populate recv datagram with flow info */ -#define INP_RECVRSSBUCKETID 0x00000200 /* populate recv datagram with bucket id */ -#define INP_RATE_LIMIT_CHANGED 0x00000400 /* rate limit needs attention */ -#define INP_ORIGDSTADDR 0x00000800 /* receive IP dst address/port */ -/* 0x00001000 */ -/* 0x00002000 */ -/* 0x00004000 */ -/* 0x00008000 */ -/* 0x00010000 */ -#define INP_2PCP_SET 0x00020000 /* If the Eth PCP should be set explicitly */ -#define INP_2PCP_BIT0 0x00040000 /* Eth PCP Bit 0 */ -#define INP_2PCP_BIT1 0x00080000 /* Eth PCP Bit 1 */ -#define INP_2PCP_BIT2 0x00100000 /* Eth PCP Bit 2 */ -#define INP_2PCP_BASE INP_2PCP_BIT0 -#define INP_2PCP_MASK (INP_2PCP_BIT0 | INP_2PCP_BIT1 | INP_2PCP_BIT2) -#define INP_2PCP_SHIFT 18 /* shift PCP field in/out of inp_flags2 */ - -/* inp_flags2 description for use with printf(9) %b identifier. */ -#define INP_FLAGS2_BITS "\20" \ - "\11INP_RECVFLOWID\12INP_RECVRSSBUCKETID" \ - "\13INP_RATE_LIMIT_CHANGED\14INP_ORIGDSTADDR" \ - "\22INP_2PCP_SET\23INP_2PCP_BIT0\24INP_2PCP_BIT1" \ - "\25INP_2PCP_BIT2" - /* * Flags passed to in_pcblookup*(), inp_smr_lock() and inp_next(). */ @@ -651,7 +632,6 @@ typedef enum { #define INP_CHECK_SOCKAF(so, af) (INP_SOCKAF(so) == af) -#ifdef _KERNEL VNET_DECLARE(int, ipport_reservedhigh); VNET_DECLARE(int, ipport_reservedlow); VNET_DECLARE(int, ipport_lowfirstauto); @@ -703,6 +683,11 @@ bool in_pcbrele(struct inpcb *, inp_lookup_t); bool in_pcbrele_rlocked(struct inpcb *); bool in_pcbrele_wlocked(struct inpcb *); bool in_pcbrele_rlock(struct inpcb *inp); +#ifdef _SYS_SOCKETVAR_H_ +void in_pcbtoxinpcb(const struct inpcb *, struct xinpcb *); +int sysctl_setsockopt(SYSCTL_HANDLER_ARGS, struct inpcbinfo *pcbinfo, + int (*ctloutput_set)(struct inpcb *, struct sockopt *)); +#endif typedef bool inp_match_t(const struct inpcb *, void *); struct inpcb_iterator { From nobody Thu Mar 12 18:50:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWxWc1KNsz6Vnjr; Thu, 12 Mar 2026 18:50:20 +0000 (UTC) (envelope-from scf@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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWxWc0hH4z3Z6P; Thu, 12 Mar 2026 18:50:20 +0000 (UTC) (envelope-from scf@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773341420; 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=LlliOJahPKLwGXvVPNQpVVVY/4upn7qzSf87fjxp1D4=; b=FnXlJQr6qC7INdtTz/NptUMMXOYVJ0+7TZnjpmxTD70BzKbF5K7QL99wnvq7a+RKivEAOR VhwdlVMCzoAk+uT/VW9wPNFFqG6iPpAdqlAQOgyLccdTPBzKTpguhWYnMU+4LTFSvQ/O8m Xt+bi/INAxadLAErhOqmp0hWWR77nBZtyhUSlBH2+qKXF2m4f69Zk+cvdHgRrUMlafyY5D HC4P123yYRgTxpuJoNSyQkZVXvO2ENIlGVnxmY86IKcRgEzTYV9CQCpnnC3ZSEtcDF79FD I0x79AUTmYdd8qjgsdncbAyPazoy80q8r8MdHKJX7epry0Vw3HrfVxWEafoleA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773341420; a=rsa-sha256; cv=none; b=csAIS1goZQ11NyMP0kvNezcyrnw8Cpr0Z30GqzREWFqDjKOBRYu082ABidUilubrfb87XE vvUuZNDmNAeX3W54sMwjz1jtrC8tXgrEZJsTsHydWawJV3F9RpzlUd54iGSllbyNfZA2RG tYrzxrDVGMKyo8UsjdRbAdN06/SXYZ4S9HBqOK8GrL9VpJUzinR3YEU2amNRM9gLhS9Sb0 MF6FNX/R8ug/Zcm4I1Bg4IREWkW9BUjzYRlUl9lMBn592BFTW0TDbMNHcegxQLr6cTHyIE K9Fg1u7uz+XlvRB0fCwu2pJh5+vxCd/EuH/i3VKW9d8x1JvJyJiE8z9Yj2cAsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773341420; 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=LlliOJahPKLwGXvVPNQpVVVY/4upn7qzSf87fjxp1D4=; b=HDQ0h2NUU/9h9zfy83Gz52nYdl+bKbJKyMHxpdilS6hMjhT9e7jj6ds/tKyeazpTbPDbbS 2bmh8gcmpDcC5CPnaQSBs3rdnEGmIvuN3C6Ij9UrEqbuRr7HGdWsb0DtmLw/ZlBSYkuOze z/C1Nbtql4zHr/BUdJ/FMnYuc3cD5swGtFeXnTcuFfbTz8nkOGoE23IUzOrh2dFGp+RE3B HTMcyWKBtGVmhNSPCPYiHWsuqNWXPJrwrKfhH0b/4SFISRlz6enHMiuV3i+w3ATCQ1n5rR Fjws38qpAckRHi3aMM8BUbgV2hAJX+BtVILKhcbWKEErSC+tttySh1Pbt+0CTA== Received: from farley.org (farley.org [104.129.130.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mail.farley.org", Issuer "Farley.org Intermediate CA" (not verified)) (Authenticated sender: scf/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fWxWb5jKvz6Kl; Thu, 12 Mar 2026 18:50:19 +0000 (UTC) (envelope-from scf@FreeBSD.org) Received: from thor.farley.org (thor.farley.org [192.168.1.5]) by farley.org (8.18.2/8.18.2) with ESMTPS id 62CIoFmr077535 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 12 Mar 2026 14:50:15 -0400 (EDT) (envelope-from scf@FreeBSD.org) Date: Thu, 12 Mar 2026 14:50:15 -0400 (EDT) From: "Sean C. Farley" To: Christos Margiolis cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ac5ff2813027 - main - sound: enforce MASTER volume mute during playback In-Reply-To: <69b3047f.1fd0e.58f3ac16@gitrepo.freebsd.org> Message-ID: <84dd75fa-4716-4ca9-700c-558e999baff3@FreeBSD.org> References: <69b3047f.1fd0e.58f3ac16@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spam-Status: No, score=-1.0 required=4.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on mail.farley.org On Thu, 12 Mar 2026, Christos Margiolis wrote: > The branch main has been updated by christos: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ac5ff2813027c385f9037b47b2b164d4c1bebd09 > > commit ac5ff2813027c385f9037b47b2b164d4c1bebd09 > Author: Sean Farley > AuthorDate: 2026-03-12 18:22:02 +0000 > Commit: Christos Margiolis > CommitDate: 2026-03-12 18:22:02 +0000 > > sound: enforce MASTER volume mute during playback > > MASTER mute (vol.mute) works while audio is playing. However, if a > stream is stopped and restarted (PCMTRIG_STOP -> PCMTRIG_START), the > audio will resume even though the mixer shows the MASTER volume as > muted. Other streams that are already playing remain silent. New streams > may also start playing audio regardless of the MASTER mute state. > > The volume feeder now considers the MASTER mute when determining whether > a channel should be muted. This ensures MASTER mute is consistently > enforced for all streams and removes the dependency on trigger-driven > state propagation. > > Tested with Creative Labs CA0132 card. > > MFC after: 1 week > Reviewed by: christos > Differential Revision: https://reviews.freebsd.org/D55605 Thank you! Sean -- scf@FreeBSD.org From nobody Thu Mar 12 19:39:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWybt0VPTz6Vs5Y; Thu, 12 Mar 2026 19:39:06 +0000 (UTC) (envelope-from mhorne@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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWybs6r5Zz3fZx; Thu, 12 Mar 2026 19:39:05 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773344346; 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=9CXORDW2Eu/gxEbxVt3xvB7sEcfEgeTx5ZPbi5G1T4c=; b=EosD5vyAV6QU99H98QHk2YzKBr3dXUwHvn9gpp6/NkC5/JI5iurH/yYMTYmsSiYGiMpfDR v3PpamCuBg6XZPqJgBw4u5sYSQCvXgS28vlipUFNkKHfL9NDdhKtJNBwKwzdjFE/elMx7g TAU5WVhQ67s0hPGJCEefut3dmo6rCw/JWeNpuSVFpZjSkCW9VCxxA6LpijghGCvjOkawgK hO/KWY0NceNMMQi5PGVXNiNhDuZPUF6YSscJAX4xLdmE9QhO8l7hvGp+OswS+zz/S4UoJZ szp41zWiZaIcnU9OgKC4lUEMdDK2SvPix20tSNZWN1U8CLYVrgt1Cg5olGY5uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773344346; a=rsa-sha256; cv=none; b=VWnYKLhqlvsber0g0wnyQuqItJHpfPVLYyBhldV3i/3vJ5eU3Jc5UG4UkI0gceFYtkIwg/ guX0nOHeQmoD6+vuxv/LrWinpL9wRBP7zxxZmgLSuRntLC9lgBJOJVY1gCQCHYJtFcMHFy g/mvglQBdDImIVFysZHr6uCgKrfwdAdeeD5R+4shBLgkLgYsK1g6LOJjBiF8eFL+2WJId0 pu8lOjM5DQYjtddZNYfIc3nfQdH+/s1YkGuPfhq4kzH4FGenMVh6GK+ixNyL3ALNgdgOxp PwHdjmKJTAciJ4E1Ub/6wEC4gc/Q6oAB1k7j0xoQdUwVgeNH73gLcllnl5Mygg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773344346; 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=9CXORDW2Eu/gxEbxVt3xvB7sEcfEgeTx5ZPbi5G1T4c=; b=xa62AiCxKOdnb1wjJdJWsXMFiIuzxXLIVmUu11YaUeDoNDj7Vhz5nIah1ZqXXzEI5E3Yau H1MbH8CEu+Ted8owONQzF4emFPhyATYHaPbNJkipCTJCGZovyXo+WfYuetlCOJEaLQxnzd KJcrTfaLorIxO5c98dV6/z8Ov9qW09AV0y/nqbK7oADJY+QhRetsGVoQrU105uidQGS/RB 2oCw4YdiXhmzuYQOEeZD5hIP4Z+oNGwLwRaqXEDmenguG/QaDhl45E6HLmBPUiOIMF8V3f WLYXg9nHDqcR+1tGAaNSLJm1GQ0y1avttAiBH8YeiwUpzjCq/QY0FdNjKEfV/g== Received: from [192.168.2.224] (chtwpe0124w-47-54-102-213.pppoe-dynamic.high-speed.pei.bellaliant.net [47.54.102.213]) (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: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fWybs5Llkz7Gc; Thu, 12 Mar 2026 19:39:05 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <90b570b8-a093-4d6b-9028-f229edfdf118@freebsd.org> Date: Thu, 12 Mar 2026 16:39:05 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: a2b2ce2c15bb - main - DEFINE_IFUNC.9: update NOTES To: Robert Clausecker Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <69b2d252.38e13.8446a44@gitrepo.freebsd.org> Content-Language: en-CA From: Mitchell Horne In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 3/12/26 14:10, Robert Clausecker wrote: > Hi Mitchell, > > Does that apply to armv7, too? I thought they weren't supported > on armv7. > > Yours, > Robert Clausecker > Yes, armv7 too. mmel@ added the support recently, in d78cbf483fe7. Userspace ifuncs remain unimplemented on that arch. Mitchell From nobody Thu Mar 12 19:46:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWym3662Lz6Vsg0; Thu, 12 Mar 2026 19:46:11 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx-01.divo.sbone.de (legacy1.sbone.de [80.151.10.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E7" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWym26KHxz3gLs; Thu, 12 Mar 2026 19:46:10 +0000 (UTC) (envelope-from bz@FreeBSD.org) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=freebsd.org (policy=none); spf=softfail (mx1.freebsd.org: 80.151.10.34 is neither permitted nor denied by domain of bz@FreeBSD.org) smtp.mailfrom=bz@FreeBSD.org Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id EA3F7A64805; Thu, 12 Mar 2026 19:45:48 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 9BF8B2D029E7; Thu, 12 Mar 2026 19:46:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id r84VpIAfXQmF; Thu, 12 Mar 2026 19:46:07 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id A2CFC2D029D8; Thu, 12 Mar 2026 19:46:07 +0000 (UTC) Date: Thu, 12 Mar 2026 19:46:05 +0000 (UTC) From: "Bjoern A. Zeeb" To: John Baldwin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 14b8a27883c1 - main - pciconf: Add a tree mode In-Reply-To: <69b04ca7.43a7d.58a4e367@gitrepo.freebsd.org> Message-ID: References: <69b04ca7.43a7d.58a4e367@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spamd-Result: default: False [-2.33 / 15.00]; NEURAL_HAM_LONG(-1.00)[-0.998]; NEURAL_HAM_SHORT(-0.92)[-0.916]; NEURAL_HAM_MEDIUM(-0.42)[-0.420]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : No valid SPF, No valid DKIM,none]; ASN(0.00)[asn:3320, ipnet:80.144.0.0/13, country:DE]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[bz]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; FROM_EQ_ENVFROM(0.00)[]; MISSING_XM_UA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4fWym26KHxz3gLs X-Spamd-Bar: -- On Tue, 10 Mar 2026, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=14b8a27883c15d3add3114f855eff7c6bda1b015 > > commit 14b8a27883c15d3add3114f855eff7c6bda1b015 > Author: John Baldwin > AuthorDate: 2026-03-10 16:51:00 +0000 > Commit: John Baldwin > CommitDate: 2026-03-10 16:51:00 +0000 > > pciconf: Add a tree mode > > This lists PCI devices in a hierarchy showing the parent/child > relationship of PCI devices and bridges. While this is inspired by > lspci -t output, the format is closer to ps -d and also prefers using > new-bus device names when possible. If a device does not have a > driver, the PCI selector is output in place of the device name. > > When the -v flag is given, the vendor and device ID strings are output > after the device name. If a string for an ID isn't found, the hex ID > values are output instead. If this is what I enquired about in Dec 2023 then a HUGE THANK YOU for this. Can't wait to try this the next days on my 64 mPCIe arm64 machine. /bz -- Bjoern A. Zeeb r15:7 From nobody Thu Mar 12 21:51:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fX1Xq5XHVz6W33F; Thu, 12 Mar 2026 21:51:39 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fX1Xq2gtQz3vyg; Thu, 12 Mar 2026 21:51:39 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 62CLpR85041019 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 12 Mar 2026 22:51:27 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 62CLpRbY041018; Thu, 12 Mar 2026 22:51:27 +0100 (CET) (envelope-from fuz) Date: Thu, 12 Mar 2026 22:51:27 +0100 From: Robert Clausecker To: Mitchell Horne Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a2b2ce2c15bb - main - DEFINE_IFUNC.9: update NOTES Message-ID: References: <69b2d252.38e13.8446a44@gitrepo.freebsd.org> <90b570b8-a093-4d6b-9028-f229edfdf118@freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <90b570b8-a093-4d6b-9028-f229edfdf118@freebsd.org> 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:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Queue-Id: 4fX1Xq2gtQz3vyg X-Spamd-Bar: ---- Hi Mitchell, Thank you for the update! Yours, Robert Clausecker Am Thu, Mar 12, 2026 at 04:39:05PM -0300 schrieb Mitchell Horne: > On 3/12/26 14:10, Robert Clausecker wrote: > > Hi Mitchell, > > > > Does that apply to armv7, too? I thought they weren't supported > > on armv7. > > > > Yours, > > Robert Clausecker > > > > Yes, armv7 too. mmel@ added the support recently, in d78cbf483fe7. > Userspace ifuncs remain unimplemented on that arch. > > Mitchell > > -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Thu Mar 12 23:03:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fX37x1Wc0z6W87Y for ; Thu, 12 Mar 2026 23:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fX37x0lg1z44Jv for ; Thu, 12 Mar 2026 23:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773356621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UvqBjCBXdQRkNYDF9KqRR+O9zmRuvDc60F8mVfCUVew=; b=WoOnYDJnyv7In1LhMw6l1elXfCrX0ztX7GDTSmzbUphkfOz6htk+o/CjMxY6aa4kMv4IJU Rg0I57HIXqC+xpbgEw/r3q/Fyb3xaGix5Vi4AWlj93a0hfKq3LWOIyd102RJDWBGQen6a+ fSBJvhs05SKI+3CpdeM2lvCUMoVL7p5iSD8I+SCxUxG+LfbK/nBTzYmbQ1cXHgdk5fdiRF oD0EfMrO/Vft6x67FTx/oiloXPS+YMkzknqiHViFVUYfVnlJjJVkB29L8VcApy200h1o4s BJveHGG8GMSCqGNq2nusMegi0w4Wc5gb2YF4t/3K44cUHjqi9sYHx+y7m1WCrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773356621; a=rsa-sha256; cv=none; b=n5GXKai+FMDk22P0SsHA0SCYyZhyBWFv+dJHsGlVnPwJRD6FFOAzYRT0/H9e9osSti+LSV avbIHDqzsUdY1/QmCIbOM2Fx2EZU+DfQQ16UZaWKbEtCxd3K5kKEwQ5gaqiTI7v7p2rsAc f8Zs71E4D2F2lK6FTS/ARfV+u7I21gNiqYa63w1iI80MEylfbXI7/E+6bWQmVswEYdw3Ff ae1v3E4COXUOTn2CzRBFdgMkFlqNiUxwiPpdeDrgz/ZoycO1v5FpcxBwXBKbNHkKLp3XAe KDHGEmCm/OqDJBURpssow50S+/x/i7fIMmM/d4WVGzqXXMKQX1mNxNX2elAWYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773356621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UvqBjCBXdQRkNYDF9KqRR+O9zmRuvDc60F8mVfCUVew=; b=XI7ehhxFANBTJutB2D5YOjmOogqaesN/dDFIPhHE6CDnrDqDY6femhaJcdsexvGCZyv7ju OWBKfwR1jbjnQ4l9O8nIBS9fWA4Wls2cavxHRTxi+aOlGN/51F1F+hAlh8BL9Zg5hapn8t TvUykoBf52XlrSDF8+r8P88pUr+VQdBxTqh93h4z8HbakYgvXUdUfitA9CGzPohJXVddWN 7ybKdQz4lpymxgHaNEL5nq6MXK0uyRNv00KDZ/da327udrhpmWM5MuyHTogMMYuHKBK4tl 4o88gz3gqYiAs1vRmeH3yrbyiEJNddUSl4Yjf/6LJIoQHTFEsMy+S71X0fjAMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fX37x0Km6z156f for ; Thu, 12 Mar 2026 23:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 23:03:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pierre Pronchery Subject: git: 4c72e5cde017 - main - calendar.freebsd: add myself (khorben@) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khorben X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c72e5cde0177f19fd10f8bbd6005882075a7830 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 23:03:35 +0000 Message-Id: <69b34647.1be72.1eed1047@gitrepo.freebsd.org> The branch main has been updated by khorben: URL: https://cgit.FreeBSD.org/src/commit/?id=4c72e5cde0177f19fd10f8bbd6005882075a7830 commit 4c72e5cde0177f19fd10f8bbd6005882075a7830 Author: Pierre Pronchery AuthorDate: 2025-11-25 09:51:57 +0000 Commit: Pierre Pronchery CommitDate: 2026-03-12 22:53:32 +0000 calendar.freebsd: add myself (khorben@) This adds my date and place of birth to FreeBSD's calendar file, so I can let the system(tm) remind me when that counter increments. Confirmed to be working with the following command: ``` $ calendar -f usr.bin/calendar/calendars/calendar.freebsd -t 18.08 Aug 18 Pierre Pronchery born in Nantes, France, 1982 [...] ``` Reviewed by: philip (mentor) Approved by: philip (mentor) Differential Revision: https://reviews.freebsd.org/D55825 --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 37dad2d237a7..9084ed0589ec 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -337,6 +337,7 @@ 08/14 Stefan Esser born in Cologne, Nordrhein-Westfalen, Germany, 1961 08/16 Andrey Chernov died in Moscow, Russian Federation, 2017 08/17 Olivier Houchard born in Nancy, France, 1980 +08/18 Pierre Pronchery born in Nantes, France, 1982 08/19 Chin-San Huang born in Yi-Lan, Taiwan, Republic of China, 1979 08/19 Pav Lucistnik born in Kutna Hora, Czech Republic, 1980 08/20 Michael Heffner born in Cleona, Pennsylvania, United States, 1981 From nobody Fri Mar 13 00:30:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fX54G5L7fz6V244 for ; Fri, 13 Mar 2026 00:30: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fX54G3TBqz3DSt for ; Fri, 13 Mar 2026 00:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773361838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1MD8lqDZG0j6KDuDoYdX+T4EZc4a4/RJVBnQsamJbXo=; b=ehNsyoZ7ZsAe2woACnQKS0RlHNGmFq9GnP7aPlC1eskQXKheORjAZCBl/4K7zW5v8vMreD bpr+XwMPo919uY5jjJuGeAIIX0s4IGIFrY76MXpQuf7SnAv6umEOuPDBiXvYzG7Hg9JTdb JGSBEgHrsy6EMXompqv57ORO36KcQvylQ4MeGcSw97QLUfqAujKqcViziSno0rA+r+fsdh tS55FRy6DU+Jgsee2UxRpovSgaCQkSS7h0RfyzD4YtZzdXqFhbv7ITC0jR1AXkie5UuMpu qV8Pq0bwwMOrf4oKbDkaf99h/vkn1yATlO973pbkS8Ly3u2UDecFluJCq5IlXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773361838; a=rsa-sha256; cv=none; b=o2BHCqs/7MQuyb4nbG/DK7VMNYbjxH9pZd2aIHGahRFysRGrZGQr4Vy1Hc6qzAkyTKQiyz RPgYD1NWGf6GeS8VvPdeouBeQnEl6VF7q6BTL04Unanvu5ZUdngesNg6SKnaAtfA7gdbLX WXvnGWU3tRHZ2TTUMSZh2YdIOvSPX5zL6TRIfQVlHq1+uMl9y5fdHilg07LVVYDmPx8Tbw LbVougegAy2WFLX6VDbVYhK5I4XCLUSn0PXKiGVQ7PDQAq8RSV0HqB7OfXfAMCWj6+NdZP IMtdlSkXmssndchPdS0rNPZo45FJ5IIjekVwlA3+MWzLaeT2kxXuvhhyAX4QEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773361838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1MD8lqDZG0j6KDuDoYdX+T4EZc4a4/RJVBnQsamJbXo=; b=fKOygY6YVTa/7Mjh5J6VRlnEVNVXNREJoMi2nLPnYqIYJ2oEbkTLbv9VNpPI57651l69cT C0my3ksvmG2qEz38bsBYl0xBcwCJd1Eb+L5uRyc4THqaKPa4y6Ng8IBjPEGRfC3MJabJ8C 6Kw7ie6J1bhcO4CBiTO5jKE/ohsCv06W83fmz/n6UVVPmgkldqcD3EAio1WArN64Wfy9f4 H1HRQX4YEoVMwyHZghvDf0Ath1WLRA1PpmUYpVB7/rqNdKUu7cvMxAduo84MEB6/tN7WKd 1RIhp6W74vrPaj7xnmDv5In4piZwvvuCBJr1fxUIs+64H3Vj2oYUQS8da+rX0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fX54G31x9z17Sw for ; Fri, 13 Mar 2026 00:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27420 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 00:30:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9a9f93bcf1aa - main - compat/linux: Avoid waitid() kernel stack disclosure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a9f93bcf1aa0059d759b2f3ea6faeb2760a11bd Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 00:30:38 +0000 Message-Id: <69b35aae.27420.5f3155ff@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9a9f93bcf1aa0059d759b2f3ea6faeb2760a11bd commit 9a9f93bcf1aa0059d759b2f3ea6faeb2760a11bd Author: Ed Maste AuthorDate: 2026-03-10 13:53:46 +0000 Commit: Ed Maste CommitDate: 2026-03-13 00:30:17 +0000 compat/linux: Avoid waitid() kernel stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55812 --- sys/compat/linux/linux_misc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 69fb9935a9ae..937b010c8435 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -750,6 +750,7 @@ linux_common_wait(struct thread *td, idtype_t idtype, int id, int *statusp, error = linux_copyout_rusage(&wru.wru_self, rup); if (error == 0 && infop != NULL && td->td_retval[0] != 0) { sig = bsd_to_linux_signal(siginfo.si_signo); + memset(&lsi, 0, sizeof(lsi)); siginfo_to_lsiginfo(&siginfo, &lsi, sig); error = copyout(&lsi, infop, sizeof(lsi)); } From nobody Fri Mar 13 00:30:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fX54L58gnz6V2KJ for ; Fri, 13 Mar 2026 00:30: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fX54L41Yqz3DpN for ; Fri, 13 Mar 2026 00:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773361842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/JxNUEg4h9xJXNpGywK+JIirk3+2ZTp5qSVKFMMzOk=; b=eokczJppcpckBM5DJlz7/m49GoktbMPYlBASHVEG0inChj8ojWHh42GJhxiU0q9W5lPJpR GXtfS8Zb4TS4ygBEKSCZWQKnPzTm/Syr1Y9tjZjvOxIokMMpIftnzT+/mUjLF4bubOY54q cH+QC+KhP5HBRW35SHcvGJECJG0S/eaPCRT2LHCmqXIoDwFC9rb3SXVrlmnOy+CwLljsGF y/OdVGB5vLWsgVUX3CcjBqD8/yd/vR4U7pXCB/i5psgDBNaYsRB4nozh04JxtAeOpbuxKN XKYIDW8kIXw4BeWvzCJoNBfJSZ+qf9tI+jWA4dHp7eC7/6wyO3dRoRL+9Ag5sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773361842; a=rsa-sha256; cv=none; b=UTOAtxbS/+exQX8he3c9jgpOyaSjIUvXUXEhYjvlXqc+R67J2CvfxhafQo3kHQ+gcpvdIG vGrFau/UnJU+GatiK/mtetwjQLN6jtc1YCyu8CrRYw3EWZh+PXJKtNosGPrl1seoisKahw gtCqb05gfi+0MCyw0N0srivik0Itat10xrk1ZXFBv8MQbAkdJj0iJ62kuYgMPX3hVhkCOd GY9B6xP74n4P0zvBBwrMheVTGPKy/jCWf9wQnuVzpeJ1tIjp7KWpMORXw9W2O7bGOBOOb9 82XSe5cfSs1/3b15CLFIU4fYE2B/pj+wwoJX0Se1dYnKAieoqH08yKtNy2bvdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773361842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/JxNUEg4h9xJXNpGywK+JIirk3+2ZTp5qSVKFMMzOk=; b=Y0eVqMuUUPYQZU4rcNbbWpqP/pF+3SmOtY5gh9KZf200JxQvNSYrn98UnXQSGHJHwKKmJD 4AKSJR+2EO8Rx6TfbNvfCuMw9pcZ1G+QC0xCIsPVP4KhpjUs0AyNhG4A7tTHgRq+TQn28r aE55wIZe/AXxwjpHwK5RlnQk1lvyEg21nZdAeAnNd6DxYtfN5kLXW75VccFWueRBlujWGC 9kNYKwXLGprVJoy+BZXxLjepmY6d0wF7xUexyX5VQa5l+c16jTRv1CXXcQPcd7JHZwssSq eiAdfs4IhFEAO3xte9I/e0z7fujrD3pYT40ToNnWFdqGdQm02/p5JmarjgT8kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fX54L3WNnz17nH for ; Fri, 13 Mar 2026 00:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 00:30:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 097cb4e9f043 - main - compat32: Zero struct to avoid stack disclosure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 097cb4e9f0432c543c704cec712ce1cd3302335c Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 00:30:37 +0000 Message-Id: <69b35aad.264f1.24dffcb9@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=097cb4e9f0432c543c704cec712ce1cd3302335c commit 097cb4e9f0432c543c704cec712ce1cd3302335c Author: Ed Maste AuthorDate: 2026-03-11 15:02:18 +0000 Commit: Ed Maste CommitDate: 2026-03-13 00:30:06 +0000 compat32: Zero struct to avoid stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55811 --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 1064987c3abf..4ec6dd452b32 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -757,7 +757,7 @@ static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; - struct kevent32 ks32[KQ_NEVENTS]; + struct kevent32 ks32[KQ_NEVENTS] = {}; int i, error; KASSERT(count <= KQ_NEVENTS, ("count (%d) > KQ_NEVENTS", count)); From nobody Fri Mar 13 06:02:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXDR228pMz6VTt2 for ; Fri, 13 Mar 2026 06:02: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXDR21c7qz3gsY for ; Fri, 13 Mar 2026 06: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=1773381742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JywSht04snH3mSyw8WGIDQqHJEyHK2pfggdZvvQ+sJc=; b=Y8YaUxyCaIYUyUDRUCSgr0bkpg9tL649vO3JwWJRouIepDxoNIYDvNlwb1YYt8sNQt/iql RH0vrEvsZu6qUTfFo5IiUi0ZHX4VPMiXwC9u3p1TpijlZjkA5kjQk3dtWwyQDLtTGN8N5y mqnXEwo2q07bx2eA31hqRnOhT4M8DFZ7i0VPsAG9HPRkL370mK5K771uFyNIFzRDODYGcg /lEnGg14KQ6suCCzvT2l+9BafMbBP6b9Wm9CExmBGrvW29E95kiD9fkFviKNnKvsDC6Rpn PkvrFDWjuZY5nhsc2SfUUgIiWxbZNYAzZtcZnLrRGfssRrIFhYWn8pSYNyU1CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773381742; a=rsa-sha256; cv=none; b=HTE+NGBPb30ujLJK4UuEtkstFE09ZjWH5lnwdkNk3bY/NfAotXOzMomeBy5zTyH2ncvLDi /3sK724b1kj0gy4jAbTFikCHNsWf38ap2N+tngSFhjxB6d+Z1oKU8YdGD6VqpqDy07etav yAxFZ0d05XH9EgkOBGITw6olWb9iXZEF9qcrtPFfmFpLN+H9OQ0GOHjOp8/0weUM7zlenl m3wzEc11Hs9//2YDU1KenEoBWWXGKRRRWwHJWAoZ1HrT0HLV+lsRunzTKZcdgTNwzo0blv vijSF9cIxQ0PzMjNbKVzT+8ckagDBEeCxKDnEjZ2ifQVEciZBUtNkFhQaCht7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773381742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JywSht04snH3mSyw8WGIDQqHJEyHK2pfggdZvvQ+sJc=; b=A7oK5hF1+xNK2bCoIKQcnuDWUwKezginV3mozrgx9d9P2cN7GXzkMF71T4dKJBG5jvaJzI TjC2UTiQNufKYugt0/c+aAWma2ZQ3ElY29CxJ6rjiYBB7ylOCu1deHGn29FBn2KiUAhnfX 6PueaOu+ousm1JD9JZfquNQly2MLyKz9Br3OEcY4uQ8BHwCWojU2uNQiJ6v7xQQVAzXms0 vf/0Hf4KpK8U+oehKyQB+/MyVKTTyWCim8E8qPxj9TZURiIvIfGhz1C02jU3XUczQSV3c1 Lju7SOJr2RdioFwsOpM3Oy74VyaI/9lhBCZApckdGknn/X22On4/I/6aYd/AFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXDR210Pyz42y for ; Fri, 13 Mar 2026 06:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22752 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 06:02:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Kevin Bowling Subject: git: 190a94098571 - internal/admin - Release kgalazka from mentorship List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 190a94098571c3733a0f3eebbb913ceddd21dbb9 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 06:02:22 +0000 Message-Id: <69b3a86e.22752.1eb87bcf@gitrepo.freebsd.org> The branch internal/admin has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=190a94098571c3733a0f3eebbb913ceddd21dbb9 commit 190a94098571c3733a0f3eebbb913ceddd21dbb9 Author: Kevin Bowling AuthorDate: 2026-03-13 06:00:56 +0000 Commit: Kevin Bowling CommitDate: 2026-03-13 06:01:39 +0000 Release kgalazka from mentorship Approved by: erj (co-mentor), srcmgr (implicit) --- mentors | 1 - 1 file changed, 1 deletion(-) diff --git a/mentors b/mentors index bc048e0b90ff..d929cdc57c1f 100644 --- a/mentors +++ b/mentors @@ -18,7 +18,6 @@ def oshogbo jaeyoon imp jrhall imp js asomers -kgalazka erj Co-mentor: kbowling khorben philip oh manu osamaabb cperciva Co-mentor: akiyano From nobody Fri Mar 13 09:14:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXJhW6jR9z6VlrL for ; Fri, 13 Mar 2026 09:14: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXJhW4D5Wz43Jy for ; Fri, 13 Mar 2026 09:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773393259; 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=zo0vajsmId85Mrux7jTYSe4CD/8+GSDiwNrNq7j8Gy4=; b=d2SpCyu7BJ5Miwf/whShQIn0kxPJeUHClC/JIJGpvYFkhhmYvdeb9wZhWe/GxqFyyCJ8Aa s0Yxvbj0kPfofjxSa3WXKG6h61bkF3BA3xf8VoRPzdfWBI43ivLYpen1gyL/fsMsoNUGf9 jFU7UhmHdGj7/sX0fjQwI1LqLKdCM5HZZAaE9M6kQqY4yPkXERZcbOLZEHqSglTZyBszBR HSR76RIeimTnNE6aMqabr2v28UkUwKo04z8chHGsbdJ/TqIEgsEhFY3PDWsj9Bl+PQjRDa /eMdkyLs9Zl2R4fG4IPjzpxXLjse6ETzaegaoD8OsXn0P3TFH67Q7ov3ZS//oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773393259; a=rsa-sha256; cv=none; b=SQsrCnElsorJTCxZNFrbwRPotNlDm5JQEsKED/2Mf/QQyvOz/g01NIWhOWbVCw7kXZIE1C jqK2kc7yCEpAwMoY7zMtwujWBcyPPEfnLMrHsG8mNIaoBclvQ8u+SQDzzUtzRKeUqW4f/o LjLXOa3Dafs3ztKSlMlkjVXMcOrnqqkGz0xmTXuO8ltYYiU3IK/XcTxMVIcHFX0pvpTiQs VLipoAT/SoNj03fV+wKs+621Ir2UVXxeL2bY3HP/MX0otUef3vZvBM/a/GaSz/BJyGoiI3 E6zywSoeYaRF7AOBnF73uuwTGx0JbjSeYMUjV7A4La9YLEy3yZfoboS5AdOClw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773393259; 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=zo0vajsmId85Mrux7jTYSe4CD/8+GSDiwNrNq7j8Gy4=; b=e72UWlExB7rJVzuOhgiahC4a/4ZXQQF9hF/fgTalm8ZH1db4bWPm1CSx56A+/Ld3DSbTJ5 lkJaHT1L8iXx9ry+HULTwWzuO9tIGuRbvvgbxjGhk8n39zG+8BeCJ9uHimiE744DlFTzUb SpMFhQMdmLX/qQzVWMajbQVHTXjk7cDwzfIfmLL8WIp/pDeaXJwKzHBZJt4OvVAbC35lRx 49khJ9Bm6+NZUGmUNXw93E9XBpZ1BcY3mceZMvesoOqGf9Bc3ISPynDexpyM3ob7RQAMiW A3TdZkZYVZX4CbcL0eM+Tkwi4roYxDz/oBwoWRXcBDaxGXqPjxsbxGRP6HHegg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXJhW3G8kz9js for ; Fri, 13 Mar 2026 09:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e47a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 09:14:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Juhyung Park From: Brooks Davis Subject: git: 3abef030d31a - stable/15 - Set errno to ENOMEM on rallocx() OOM failures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3abef030d31a9837ac7ba45bd8ee17340fabd120 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 09:14:19 +0000 Message-Id: <69b3d56b.3e47a.5e9a8fcf@gitrepo.freebsd.org> The branch stable/15 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3abef030d31a9837ac7ba45bd8ee17340fabd120 commit 3abef030d31a9837ac7ba45bd8ee17340fabd120 Author: Juhyung Park AuthorDate: 2026-03-03 09:59:33 +0000 Commit: Brooks Davis CommitDate: 2026-03-13 09:13:08 +0000 Set errno to ENOMEM on rallocx() OOM failures realloc() and rallocx() shares path, and realloc() should set errno to ENOMEM upon OOM failures. PR: 291677 Obtained from: jemalloc (commit 38056fea64c34ca4fef0a16212776eaa4de80b78) Fixes: c43cad871720 ("jemalloc: Merge from jemalloc 5.3.0 vendor branch") MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2059 (cherry picked from commit 5583b64f230fe0ea4e3d4bf4566205b521190fbb) --- contrib/jemalloc/src/jemalloc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/jemalloc/src/jemalloc.c b/contrib/jemalloc/src/jemalloc.c index e4b183d1a24d..352c18870e0b 100644 --- a/contrib/jemalloc/src/jemalloc.c +++ b/contrib/jemalloc/src/jemalloc.c @@ -3561,6 +3561,7 @@ do_rallocx(void *ptr, size_t size, int flags, bool is_realloc) { return p; label_oom: + set_errno(ENOMEM); if (config_xmalloc && unlikely(opt_xmalloc)) { malloc_write(": Error in rallocx(): out of memory\n"); abort(); From nobody Fri Mar 13 09:14:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXJhX5qggz6VltZ for ; Fri, 13 Mar 2026 09:14: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXJhX4mjjz42v8 for ; Fri, 13 Mar 2026 09:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773393260; 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=YuTBFQZshrXZwV9xx5nNVNJQf8WE7HSwOFcvGFowDo4=; b=vFkEZVOCafaAaDq/2f65L3PPgfRo2AOZSZjhNf3xi0ODtwvDKX7ptGMyTt3ay4hb9/BETU EDGX2kEH7YXYRGtAPMkyMmmfivKKS5UQgCb/CxQk+NLwcd7tRVxs/QNOVS1epPg7dDYxlN Qmaamep3QEXnzRZkZ2Re5mnGPfPnU3lHJVA6eMqE96K5kOj0efqKz8BRNerY2DLaSdewfv ODThRqlENI4IiGI1GBNVxKhtmMtbb39k8juhFGirmvhxhtuMveT6q8f8XebogRSKSqp0Ik uwq21MAsjIdvl5jcxCXxDF7bUe6P4sxVok8n2w80QI5FJpCH4bOMlortTUTVTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773393260; a=rsa-sha256; cv=none; b=KTSxk+nZgoRusD76UVwh82kI1YmbYd+QOs/x8i0H5dz25QaTUjpiZigyh6jj40EnqDL+T+ LK0DtQUlOQ4Nd0lZyVgBTl0r6v5CWK1mOz7rPvf7ZX+ZIXGlXLi+PBFy7HLPddZ5jNvAqN UvsmH3BpqfTIkaOS1C0AZxxfGuZEIcmINHBjdgFaSFiEQhrKus2BzgkDN4mQhFaoHXbHMy IDc1fHTtne5zWe8l2PzjWwcRWDkP6Ug2gvgCw1ytLrU8fnc84mQNRDGtwEOtyfsf4xtU4g cNdBek52aATx8/yRKZs9ciVPkNzUSzOr/sIlkTYgiTDoMCOSE9UV+kQsNi1t7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773393260; 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=YuTBFQZshrXZwV9xx5nNVNJQf8WE7HSwOFcvGFowDo4=; b=AAEenDIO5DpaWz6FLG90xwHAe6qjQfzmCvOK8DY6cvRPzFcidX2BKH8/YCYeM+cYnGgg6I GISKuuzsX+E92VdkRfr3f6Arakb5svMSrH6Jq39WIY+xlU6CEck53G1+hc+TBMsyUMUdFi 1iVyGaPqF+058VVt6phzMO9shcFNeLmaUJbzWM8bkICCAr34w3W55VOr2HJNczncESlX+T //+c8aSdEJtPOJzNvtR92oOJ/j3sMaw5o5d3EIeBmGhPYPemR9VL3DZ4+oZJDIEQ0j337v 3EucqVGSJLU+iP+fu7bs94BkqIipKWb8fNTtZV4Goljtu+k23YgAQFWDMrnQRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXJhX42ydz9jx for ; Fri, 13 Mar 2026 09:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d5bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 09:14:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Qi Wang From: Brooks Davis Subject: git: b4d8d9bde083 - stable/15 - rallocx path: only set errno on the realloc case. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b4d8d9bde083b466bc0728c6400cf5e6439f44e3 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 09:14:20 +0000 Message-Id: <69b3d56c.3d5bd.33fda24b@gitrepo.freebsd.org> The branch stable/15 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b4d8d9bde083b466bc0728c6400cf5e6439f44e3 commit b4d8d9bde083b466bc0728c6400cf5e6439f44e3 Author: Qi Wang AuthorDate: 2026-03-03 11:55:23 +0000 Commit: Brooks Davis CommitDate: 2026-03-13 09:13:16 +0000 rallocx path: only set errno on the realloc case. PR: 291677 Obtained from: jemalloc (commit 83b075789b4239035931c1ee212576d00153bbf0) Fixes: c43cad871720 ("jemalloc: Merge from jemalloc 5.3.0 vendor branch") MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2059 (cherry picked from commit 2c5cd07828ad76c332e3bedc29fc641809e85396) --- contrib/jemalloc/src/jemalloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/jemalloc/src/jemalloc.c b/contrib/jemalloc/src/jemalloc.c index 352c18870e0b..edf23b9801b4 100644 --- a/contrib/jemalloc/src/jemalloc.c +++ b/contrib/jemalloc/src/jemalloc.c @@ -3561,7 +3561,9 @@ do_rallocx(void *ptr, size_t size, int flags, bool is_realloc) { return p; label_oom: - set_errno(ENOMEM); + if (is_realloc) { + set_errno(ENOMEM); + } if (config_xmalloc && unlikely(opt_xmalloc)) { malloc_write(": Error in rallocx(): out of memory\n"); abort(); From nobody Fri Mar 13 11:06:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXMBY1wPGz6VvDN for ; Fri, 13 Mar 2026 11:07: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXMBY0f8Tz3GpV for ; Fri, 13 Mar 2026 11:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773400021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGR6QbEjAlbL0FuaNHik46r/6STai2uNVlhptde+ejU=; b=ttiV+ukQwspER/JpVoHsCqwwarAQdsodk/58gyrGP0Gs3e2T3zrKc/ES+9xrOQehBO4EH3 7I02gYDMRBFUDmZItfo52ssetE8KI+JFMoMSccBS/YIoYWfxibJseMDpexIVBBuCC/XdDh 2AomQPpYrG/1GWhHXCMOtcSrGDul5497+3WzoG1lkuf++0DVcKN5uSCsNK+VOj8m+b8wBl XnG8sfJF6QmPB6BVse9c6SHTqxWxQPTi5pR6bNXkB9arid6jIyN0A27xKAV/gVnZj31RF8 By0RzJOw+oOEpL32ncpL3aQLinTJlBQsHxrxnpceup8Us2JEd+KbbDBRMfKPMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773400021; a=rsa-sha256; cv=none; b=Nq0JugjCp7PRxGhRq7V6qbmq+1vJ0RfxTA/0uM6wAflcowYc1m7hMbkhH9bd7r7lnTcQ6V dJ/lNgTzwjj/EtJvRaZEzwKms+VUbioq4hA1rUK/Ml1OwzoPpEf1krWZC5Tp8AT5b1FRFe fj/WMwvxRjvlSLrOil9VXT9IliNJJR+i65tlyUvh5eEzhUKgDffGtiYoRrN3NKn8lQZW+P An7iOxFWqvxsAazNyQghCVfetIISbkX7JVqz1aiHTZ1k2L8bPEsLqLiZqDiAutT9kSJpZA 4zMKp9QrkF0eahLDnC8b3V4jbTR55OHKakf44tic/383sV1LpwRRNZ5rXcbWtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773400021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGR6QbEjAlbL0FuaNHik46r/6STai2uNVlhptde+ejU=; b=sKxM6SAeLweFIe5BeZJmNkL/rGcM3eYkDSVowZI9HhHV2vdCbBmpZmm3ihqtkwRJrADMQz 7AuERdjRkOP/PjWxpNHonryXwe5i/o9Yzjync6+l9HG7bF+pCFReE/gm994juaHZEDCAVM WSypuhePwFJiIn/5DGci7Hi+FT3bOHswfbUMDpDCWbWmOl98wsxN/eHOX3Zl4VswHaEI37 FToQy7JUk8gUya8kHgkGqaEvMxcj7gF3PhjFkPfqEn+zkbEU5BO67FLzqz5gKCowjEakPR dISETJWgpAW22dKq07ZDoNr+lXSfHGWA1VDdq+ImGBVfeCD36cEXncWWj2lbmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXMBX6xjqzTH1 for ; Fri, 13 Mar 2026 11:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1920a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 11:06:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Koshy Subject: git: b5f564fc5cdb - main - sys/elf_common.h: Add the gABI spelling for a dynamic tag value. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkoshy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5f564fc5cdb56d6a24e31ca077c5f1f088a597d Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 11:06:55 +0000 Message-Id: <69b3efcf.1920a.4116ad58@gitrepo.freebsd.org> The branch main has been updated by jkoshy: URL: https://cgit.FreeBSD.org/src/commit/?id=b5f564fc5cdb56d6a24e31ca077c5f1f088a597d commit b5f564fc5cdb56d6a24e31ca077c5f1f088a597d Author: Joseph Koshy AuthorDate: 2026-03-13 10:56:17 +0000 Commit: Joseph Koshy CommitDate: 2026-03-13 11:06:03 +0000 sys/elf_common.h: Add the gABI spelling for a dynamic tag value. --- sys/sys/elf_common.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index b1ddbaaf39ab..8c21d886c6a5 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -640,7 +640,10 @@ typedef struct { pre-initialization functions. */ #define DT_PREINIT_ARRAYSZ 33 /* Size in bytes of the array of pre-initialization functions. */ -#define DT_MAXPOSTAGS 34 /* number of positive tags */ +#define DT_SYMTAB_SHNDX 34 /* Address of the SHT_SYMTAB_SHNDX section + associated with the symbol table referenced + by the DT_SYMTAB element. */ +#define DT_MAXPOSTAGS 34 /* (obsolete) number of positive tags */ #define DT_RELRSZ 35 /* Total size of ElfNN_Relr relocations. */ #define DT_RELR 36 /* Address of ElfNN_Relr relocations. */ #define DT_RELRENT 37 /* Size of each ElfNN_Relr relocation. */ From nobody Fri Mar 13 11:41:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXMyS35nMz6VxgY for ; Fri, 13 Mar 2026 11:41: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXMyS2Q3vz3LP9 for ; Fri, 13 Mar 2026 11:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773402096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T3zu2Rq2Obb7FOXh7ZJuphDKbbPrJlw2esxqU0zjCYo=; b=F4vpDkFftKCUm6yESyK/WLiqozdX3/mvsfTTDZoqCtRiGAQsBr+6e+YJQPhbHX1p+g5dJq JqhhmZMiLyGDONpBhvJMkPus1/7bzytpPnQ7UctgHK+5VfPdsKTRRHj5z04TCBYoQTJxXU hbUs1M9vVtB1DxQF99O8R3bGrzeohOcotJYqRB8HtV/YBYaEm+fTDShNrPO+W75eK1YoEb +kv9FPXW2RlmsoOLXehN7mgji3tDYN3+xr5ufwuRs7EgA3uRltCxZbFcutCAXIHuMlHWXP KeNIE5ZT/jcMKuGDEgeRXQxsrtUaPtwVSi+bLZ1/+r54reAlmt5wjKJooXRpkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773402096; a=rsa-sha256; cv=none; b=WrLmJcBUg2KvOhY1yaJXdX3iBdDCenbaCsmhb0EAB8rYsHBMvo2mV5AMOlheahX5cweYVD lZXXEa0KE90MHvuWHQs9Gx1Ez8WImPG3Sm+dKEyYfzN6iBmvmHRvBIaT7VW5Wef61HCqKx qLul6jussmxmDnOHlfNVYm6vt0++v9kbEhFBwJeN3eAdI+wl8Q6zJgDwFzgWefUgTVSo+y IGB8xi1+AiO4cGBEpiJJipGOltnaTI9FS6/Z5SvZgiFD7KIqKAl7VTulNo9ylx4hRiYqNU iJKJMd5VeyhmEtdjn7rbMQ0zW7A10coU7YPr7eh8pV/OPc6bcxS5dcjdzWN/Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773402096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T3zu2Rq2Obb7FOXh7ZJuphDKbbPrJlw2esxqU0zjCYo=; b=gSHlIYetyHSjdluPAkGAdohleRyH12xEnrwRvaNT2dkx8tlhcBLCKuLU+DbaAK9bMlIwKg ndQVwcLXYgMTnXTn+5XHBmRNeJsyXHLZTpsZLNQc3f9OAhBEqOTqPdfWs2ymHY9eeybXP1 nhO4n8eM0/MsvzWFaR4ftNkK3nDPvAa6UEjUvSglqpEBo+2GYwkOP6Lzv4cTs4kzLgG157 Y8xrpFRk+8OKqN8FDU7+llQjQK3w5XE4MisoQfwtTxwC1CanC2PP+7zt00ErmJIU4IoW1C Eqy7AS0nxvfDR0LnrRRcAazcVT0lX7DLHrdWVOkJG6LrpOVePWMveiSLEaHgAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXMyS1yLHzVTW for ; Fri, 13 Mar 2026 11:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e0a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 11:41:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 75f1665f3346 - main - ndp: Fix free after use and exclude delayed proxy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 75f1665f33463e9ee0aaa63af0a875e6c46f8755 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 11:41:31 +0000 Message-Id: <69b3f7eb.1e0a8.4bd61a06@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=75f1665f33463e9ee0aaa63af0a875e6c46f8755 commit 75f1665f33463e9ee0aaa63af0a875e6c46f8755 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-13 11:36:04 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-13 11:36:04 +0000 ndp: Fix free after use and exclude delayed proxy PR: 293777 Fixes: f37fbe30f559 ("ndp: implement delayed ...") --- sys/netinet6/nd6_nbr.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 0a34e0e3628e..25786ebc0ea1 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -361,7 +361,7 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len) * be delayed by a random time between 0 and MAX_ANYCAST_DELAY_TIME * to reduce the probability of network congestion. */ - if (anycast == 0 && proxy == 0) + if (anycast == 0) nd6_na_output_fib(ifp, &saddr6, &taddr6, rflag, tlladdr, proxy ? (struct sockaddr *)&proxydl : NULL, M_GETFIB(m)); else @@ -1652,16 +1652,16 @@ static void nd6_queue_rel(void *arg) { struct nd_queue *ndq = arg; - struct ifnet *ifp = ndq->ndq_ifa->ifa_ifp; - - IF_ADDR_WLOCK_ASSERT(ifp); + struct ifaddr *ifa = ndq->ndq_ifa; - /* Remove ndq from the nd_queue and release its reference */ - TAILQ_REMOVE(&ifp->if_inet6->nd_queue, ndq, ndq_list); - IF_ADDR_WUNLOCK(ifp); + IF_ADDR_WLOCK_ASSERT(ifa->ifa_ifp); - ifa_free(ndq->ndq_ifa); + /* Remove ndq from the nd_queue and free it */ + TAILQ_REMOVE(&ifa->ifa_ifp->if_inet6->nd_queue, ndq, ndq_list); free(ndq, M_IP6NDP); + IF_ADDR_WUNLOCK(ifa->ifa_ifp); + + ifa_free(ifa); } static void @@ -1671,6 +1671,7 @@ nd6_queue_timer(void *arg) struct ifaddr *ifa = ndq->ndq_ifa; struct ifnet *ifp = ifa->ifa_ifp; struct in6_ifextra *ext = ifp->if_inet6; + struct in6_addr daddr; struct epoch_tracker et; int delay, tlladdr; u_long flags; @@ -1680,6 +1681,7 @@ nd6_queue_timer(void *arg) CURVNET_SET(ifp->if_vnet); NET_EPOCH_ENTER(et); + daddr = ndq->ndq_daddr; tlladdr = ND6_NA_OPT_LLA; flags = (V_ip6_forwarding) ? ND_NA_FLAG_ROUTER : 0; if ((ext->nd_flags & ND6_IFF_ACCEPT_RTADV) != 0 && V_ip6_norbit_raif) @@ -1713,8 +1715,8 @@ nd6_queue_timer(void *arg) callout_reset(&ndq->ndq_callout, delay, nd6_queue_rel, ndq); IF_ADDR_WUNLOCK(ifp); - if (__predict_true(in6_setscope(&ndq->ndq_daddr, ifp, NULL) == 0)) - nd6_na_output_fib(ifp, &ndq->ndq_daddr, IFA_IN6(ifa), flags, tlladdr, + if (__predict_true(in6_setscope(&daddr, ifp, NULL) == 0)) + nd6_na_output_fib(ifp, &daddr, IFA_IN6(ifa), flags, tlladdr, NULL, ifp->if_fib); NET_EPOCH_EXIT(et); From nobody Fri Mar 13 11:49:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXN7h2QLWz6Vy5C for ; Fri, 13 Mar 2026 11:49: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXN7h1RFBz3M1b for ; Fri, 13 Mar 2026 11:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773402576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mbs0a5nq1cw/NJ+vQInAyAfRZaCVK9JYgysT6t+x+Lk=; b=o1QYLpgcg9lDyUduu/2hmVsw6x/O9hxp86eICwyiB/fzI+JJ2mP7SI7frwT4RbgW4JmJYC 1a2j42P/ZRPE/qdUyAPoAyHJAi+yqhbxo6Qg7JWbxHhCYf17DzDUwGgA8ejmk5uMnKto2A ULeOcw0WXTDxr9qvAjSqV4kQRBP94Gvb1diHD6+ZtSZ75PjhxMGg92Jh6O9ra6M7ZMq07e 0OqKijcltbKvTf7A4ItVSs1QjtSgBVJMHZBJ8r+5lMmSen6O2Tvi86KaCDdlZupsW+4ltg /+2INU81anBorE1LCH3GDPL52voiABE9LGRLcTm76u12Yh/7ybCiFfTdWvzSVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773402576; a=rsa-sha256; cv=none; b=aGYKIPuZ1qPh5zfIbJkDQiLNQDxI4qZHp8iZsY3SrhVKj0zlbHdT3tvP6u/05JbRSlD1rt 7OJqOlZlHb1lW/vRbCtwiTybYKRJr2GCnN44ZxKxvIbVKzrwPynUtpf6YxdKQI7KqYb/YH BLa6KneVqHpUWlTP5QCD5m/PEGMOCgRoMTQzCI/FiXGdXo3KMrbd8za9gZgX2Z4uDdwvY/ pumUDDh7FStl3ZGyVwvPczh/9nt4JtJLDJpa/LMiUy9cqzxjG9FXmAIS8kL+fNzWm9nlhr TW2TW33T8Sg/Dl7+2oorqoIjtb35N30KmQN1YFsDbWCJ7OtFmzSf86eIZuAGQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773402576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mbs0a5nq1cw/NJ+vQInAyAfRZaCVK9JYgysT6t+x+Lk=; b=A2naP1+2og0QnfDGry3zTIV5rXGGbaPtgNXBY6iX7MS2suJBtnr2Y7FHWAZLJ0zkHNrNNP ruYvfwzFcTIJaYZ62ombgNq9Nh4kAhW0mtNgQLtP+7M/gPDFgj0mtE1zF0ilW+l41YXBz7 JFfxPOIGrj9fgNy2auoSuphE3Bnb9Hhf/DAOlQlhzvG68Q3LJNmSyC5lG1HYnscXVMq/LY bm2UJhT2+0PHUtFTAnXeUrb5hxcx1uUtnHUSfyeghCKECIrrBIpndSlzew/x0cxdrWXcfL cY7jHrN1IAng6I0PQGdspvwPRKCIDQBjMqjlQn4grpF7/is1FIM8Qf4q1uhUWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXN7h0yRszVp5 for ; Fri, 13 Mar 2026 11:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e560 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 11:49:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 63888350d583 - stable/15 - rc: virtual_oss: Silence potential hw.snd.default_unit error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 63888350d583e370814abb5c078244cd8ddf8eeb Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 11:49:30 +0000 Message-Id: <69b3f9ca.1e560.52f56552@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=63888350d583e370814abb5c078244cd8ddf8eeb commit 63888350d583e370814abb5c078244cd8ddf8eeb Author: Christos Margiolis AuthorDate: 2026-03-06 12:27:03 +0000 Commit: Christos Margiolis CommitDate: 2026-03-13 11:49:23 +0000 rc: virtual_oss: Silence potential hw.snd.default_unit error PR: 293582 Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit e85f221def717660c9daf4c0616dfb9cdfb75827) --- libexec/rc/rc.d/virtual_oss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/virtual_oss b/libexec/rc/rc.d/virtual_oss index 42353a6c1520..d55b51463442 100644 --- a/libexec/rc/rc.d/virtual_oss +++ b/libexec/rc/rc.d/virtual_oss @@ -24,7 +24,7 @@ required_modules="cuse" configs= pidpath="/var/run/${name}" -default_unit=$(sysctl -n hw.snd.default_unit) +default_unit=$(sysctl -n hw.snd.default_unit 2> /dev/null) virtual_oss_default_args="\ -S \ -C 2 \ From nobody Fri Mar 13 11:53:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXNDY5S5bz6V0FR for ; Fri, 13 Mar 2026 11:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXNDY4jz3z3Mnh for ; Fri, 13 Mar 2026 11:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773402829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCcPUciSeyPAojrO0a5Bf4JEfhki/tGCiBqreGEXK5Y=; b=sj5zSEOsGFvCVzTRj7gIYZTBLbwTRpbLOmAgtBi052oQbg/bXr+XkYDTIr+MJacwVjSg6l qJBnbYfvDXmZ3vjGXHh/lXaQFQbeM2YU2fs7XIxBjCi9vXxLLoAHeV7zDEzut23jCgc2Ru b9ioQYRsScTXx/eq2d0l/567J8+UrxXa5sPHp2Z/COr3qXGlF8KmWSQOVNnKWunB7yABld Cs5tEsF6vdmWvfMwENlBsN+98zwbz13bDY3U8vCduFZwfQlNFtymZJpMnnjKviQRwKfBhX au/U6fUFpTix5bwxzmuE5KLSv220kt4j17dENYnxDM2b2f/WlUmsaDkECmd7Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773402829; a=rsa-sha256; cv=none; b=trFdonSek6TWR+xN7/j/uJWAqXTNLMhbu1Sdij+TUsJdy3n5G1F5//PIQ4CpWStViPx6sv 2V1WqBu9uFA2ESEk95k1RU8/QBFnDfRpj26z0O6/mkOcKSLdvbCR5XlUgNVOKtB13dMzdu CP8yGha5nll+8AJYikIp1wL5w9g3xEa0ewKKEBCZTY6olUzO2pVqnCBetCYTgMyQQefyRH a8qdPNBdf7qD2Ca+9U27WKmEfr7yYzwXTtTgf07gwYsZ56n4hYn4ezOUuNWr6feJpulzYx iUUs1UMFeJ/pHP2D4aO2WHzJ7SJ1AN87sHkHALU9bVugGGJ4y/qr68koSPPGhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773402829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCcPUciSeyPAojrO0a5Bf4JEfhki/tGCiBqreGEXK5Y=; b=QuR7MzZLK4DCNvxnZub6eCNjVJ5vGtNY/vCAKxmJzuMYgTrtJ7q1J+Ic1gw2l3imU87jqA 3fSUmR4KI0l7UQDSmSjm1vFrniBzdtPGOV1Ge4hyde+Dh83M7bJddbgcJ3CQ4pefgotULD V6iFmVrZmX4irbqvV1+SCpmVPE+k5E6xTevRddxt27X/jhvuCvPFUKApLIb/vhlxDvbPHC vI1LanX8BIFSFICb1rsxG3leiq4xXCp05Hf+u3MeTmynIqynhqvuEF02DEn8o+lMg+UPae rFSuHxfa5P6EOExhtwMfAhqjfWpVAsi3P9nGpyROzomKv+ky0nfbCpn8cIAguw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXNDY4JYGzVdM for ; Fri, 13 Mar 2026 11:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f291 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 11:53:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 13ee84c591f8 - main - ix(4): Add EEE support for E610 adapters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13ee84c591f8df7553fc8e3dac7e92409046f4d2 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 11:53:44 +0000 Message-Id: <69b3fac8.1f291.2ef771c0@gitrepo.freebsd.org> The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=13ee84c591f8df7553fc8e3dac7e92409046f4d2 commit 13ee84c591f8df7553fc8e3dac7e92409046f4d2 Author: Krzysztof Galazka AuthorDate: 2026-03-13 11:48:12 +0000 Commit: Krzysztof Galazka CommitDate: 2026-03-13 11:48:29 +0000 ix(4): Add EEE support for E610 adapters The ix driver now supports Energy Efficient Ethernet (EEE) on Intel E610 devices. EEE allows the network interface to enter low-power states during periods of low link utilization, reducing power consumption while maintaining full performance when needed. E610 adapters provide EEE support through BASE-T PHY functionality. Due to this PHY-based implementation, EEE is supported only on 2.5Gb speeds and above. Signed-off-by: Yogesh Bhosale Signed-off-by: Krzysztof Galazka Authored-by: Yogesh Bhosale Approved by: kbowling (mentor) Tested by: Mateusz Moga MFC after: 2 weeks Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D55304 --- sys/dev/ixgbe/if_ix.c | 34 ++++++++++++++++++++++++ sys/dev/ixgbe/ixgbe_e610.c | 48 ++++++++++++++++++++++++---------- sys/dev/ixgbe/ixgbe_type_e610.h | 57 +++++++++++++++++++++++++++++++---------- 3 files changed, 112 insertions(+), 27 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 1d36fd11f368..88cbeb418ec6 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1066,6 +1066,10 @@ ixgbe_if_attach_pre(if_ctx_t ctx) /* Ensure SW/FW semaphore is free */ ixgbe_init_swfw_semaphore(hw); + /* Enable EEE power saving */ + if (sc->feat_en & IXGBE_FEATURE_EEE) + hw->mac.ops.setup_eee(hw, true); + /* Set an initial default flow control value */ hw->fc.requested_mode = ixgbe_flow_control; @@ -4589,6 +4593,20 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) "Link is up %s Full Duplex\n", ixgbe_link_speed_to_str(sc->link_speed)); sc->link_active = true; + + /* If link speed is <= 1Gbps and EEE is enabled, + * log info. + */ + if (sc->hw.mac.type == ixgbe_mac_E610 && + (sc->feat_en & IXGBE_FEATURE_EEE) && + sc->link_speed <= IXGBE_LINK_SPEED_1GB_FULL) { + device_printf(sc->dev, + "Energy Efficient Ethernet (EEE) feature " + "is not supported on link speeds equal to " + "or below 1Gbps. EEE is supported on " + "speeds above 1Gbps.\n"); + } + /* Update any Flow Control changes */ ixgbe_fc_enable(&sc->hw); /* Update DMA coalescing config */ @@ -5582,6 +5600,17 @@ ixgbe_sysctl_eee_state(SYSCTL_HANDLER_ARGS) if ((new_eee < 0) || (new_eee > 1)) return (EINVAL); + /* If link speed is <= 1Gbps and EEE is being enabled, log info */ + if (sc->hw.mac.type == ixgbe_mac_E610 && + new_eee && + sc->link_speed <= IXGBE_LINK_SPEED_1GB_FULL) { + device_printf(dev, + "Energy Efficient Ethernet (EEE) feature is not " + "supported on link speeds equal to or below 1Gbps. " + "EEE is supported on speeds above 1Gbps.\n"); + return (EINVAL); + } + retval = ixgbe_setup_eee(&sc->hw, new_eee); if (retval) { device_printf(dev, "Error in EEE setup: 0x%08X\n", retval); @@ -5645,6 +5674,8 @@ ixgbe_sysctl_tso_tcp_flags_mask(SYSCTL_HANDLER_ARGS) static void ixgbe_init_device_features(struct ixgbe_softc *sc) { + s32 error; + sc->feat_cap = IXGBE_FEATURE_NETMAP | IXGBE_FEATURE_RSS | IXGBE_FEATURE_MSI | @@ -5700,6 +5731,9 @@ ixgbe_init_device_features(struct ixgbe_softc *sc) case ixgbe_mac_E610: sc->feat_cap |= IXGBE_FEATURE_RECOVERY_MODE; sc->feat_cap |= IXGBE_FEATURE_DBG_DUMP; + error = ixgbe_get_caps(&sc->hw); + if (error == 0 && sc->hw.func_caps.common_cap.eee_support != 0) + sc->feat_cap |= IXGBE_FEATURE_EEE; break; default: break; diff --git a/sys/dev/ixgbe/ixgbe_e610.c b/sys/dev/ixgbe/ixgbe_e610.c index 18c4612446e0..b76d96814933 100644 --- a/sys/dev/ixgbe/ixgbe_e610.c +++ b/sys/dev/ixgbe/ixgbe_e610.c @@ -776,6 +776,10 @@ ixgbe_parse_common_caps(struct ixgbe_hw *hw, struct ixgbe_hw_common_caps *caps, DEBUGOUT2("%s: next_cluster_id_support = %d\n", prefix, caps->next_cluster_id_support); break; + case IXGBE_ACI_CAPS_EEE: + caps->eee_support = (u8)number; + DEBUGOUT2("%s: eee_support = %x\n", prefix, caps->eee_support); + break; default: /* Not one of the recognized common capabilities */ found = false; @@ -1332,6 +1336,7 @@ void ixgbe_copy_phy_caps_to_cfg(struct ixgbe_aci_cmd_get_phy_caps_data *caps, cfg->link_fec_opt = caps->link_fec_options; cfg->module_compliance_enforcement = caps->module_compliance_enforcement; + cfg->eee_entry_delay = caps->eee_entry_delay; } /** @@ -1351,10 +1356,12 @@ s32 ixgbe_aci_set_phy_cfg(struct ixgbe_hw *hw, struct ixgbe_aci_cmd_set_phy_cfg_data *cfg) { struct ixgbe_aci_desc desc; + bool use_1p40_buff; s32 status; if (!cfg) return IXGBE_ERR_PARAM; + use_1p40_buff = hw->func_caps.common_cap.eee_support != 0; /* Ensure that only valid bits of cfg->caps can be turned on. */ if (cfg->caps & ~IXGBE_ACI_PHY_ENA_VALID_MASK) { @@ -1364,8 +1371,18 @@ s32 ixgbe_aci_set_phy_cfg(struct ixgbe_hw *hw, ixgbe_fill_dflt_direct_cmd_desc(&desc, ixgbe_aci_opc_set_phy_cfg); desc.flags |= IXGBE_CPU_TO_LE16(IXGBE_ACI_FLAG_RD); - status = ixgbe_aci_send_cmd(hw, &desc, cfg, sizeof(*cfg)); + if (use_1p40_buff) { + status = ixgbe_aci_send_cmd(hw, &desc, cfg, sizeof(*cfg)); + } else { + struct ixgbe_aci_cmd_set_phy_cfg_data_pre_1_40 cfg_obsolete; + + memcpy(&cfg_obsolete, cfg, sizeof(cfg_obsolete)); + + status = ixgbe_aci_send_cmd(hw, &desc, &cfg_obsolete, + sizeof(cfg_obsolete)); + } + /* even if the old buffer is used no need to worry about conversion */ if (!status) hw->phy.curr_user_phy_cfg = *cfg; @@ -1599,6 +1616,7 @@ s32 ixgbe_aci_get_link_info(struct ixgbe_hw *hw, bool ena_lse, li->topo_media_conflict = link_data.topo_media_conflict; li->pacing = link_data.cfg & (IXGBE_ACI_CFG_PACING_M | IXGBE_ACI_CFG_PACING_TYPE_M); + li->eee_status = link_data.eee_status; /* update fc info */ tx_pause = !!(link_data.an_info & IXGBE_ACI_LINK_PAUSE_TX); @@ -3883,9 +3901,14 @@ s32 ixgbe_init_ops_E610(struct ixgbe_hw *hw) /* PHY */ phy->ops.init = ixgbe_init_phy_ops_E610; phy->ops.identify = ixgbe_identify_phy_E610; - phy->eee_speeds_supported = IXGBE_LINK_SPEED_10_FULL | - IXGBE_LINK_SPEED_100_FULL | - IXGBE_LINK_SPEED_1GB_FULL; + + if (hw->device_id == IXGBE_DEV_ID_E610_2_5G_T) + phy->eee_speeds_supported = IXGBE_LINK_SPEED_2_5GB_FULL; + else + phy->eee_speeds_supported = IXGBE_LINK_SPEED_2_5GB_FULL | + IXGBE_LINK_SPEED_5GB_FULL | + IXGBE_LINK_SPEED_10GB_FULL; + phy->eee_speeds_advertised = phy->eee_speeds_supported; /* Additional ops overrides for e610 to go here */ @@ -4513,19 +4536,18 @@ s32 ixgbe_setup_eee_E610(struct ixgbe_hw *hw, bool enable_eee) phy_cfg.caps |= IXGBE_ACI_PHY_ENA_LINK; phy_cfg.caps |= IXGBE_ACI_PHY_ENA_AUTO_LINK_UPDT; + /* setup only speeds which are defined for [0x0601/0x0600].eee_cap */ if (enable_eee) { - if (phy_caps.phy_type_low & IXGBE_PHY_TYPE_LOW_100BASE_TX) + if (hw->phy.eee_speeds_advertised & IXGBE_LINK_SPEED_100_FULL) eee_cap |= IXGBE_ACI_PHY_EEE_EN_100BASE_TX; - if (phy_caps.phy_type_low & IXGBE_PHY_TYPE_LOW_1000BASE_T) + if (hw->phy.eee_speeds_advertised & IXGBE_LINK_SPEED_1GB_FULL) eee_cap |= IXGBE_ACI_PHY_EEE_EN_1000BASE_T; - if (phy_caps.phy_type_low & IXGBE_PHY_TYPE_LOW_1000BASE_KX) - eee_cap |= IXGBE_ACI_PHY_EEE_EN_1000BASE_KX; - if (phy_caps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_T) + if (hw->phy.eee_speeds_advertised & IXGBE_LINK_SPEED_2_5GB_FULL) + eee_cap |= IXGBE_ACI_PHY_EEE_EN_2_5GBASE_T; + if (hw->phy.eee_speeds_advertised & IXGBE_LINK_SPEED_5GB_FULL) + eee_cap |= IXGBE_ACI_PHY_EEE_EN_5GBASE_T; + if (hw->phy.eee_speeds_advertised & IXGBE_LINK_SPEED_10GB_FULL) eee_cap |= IXGBE_ACI_PHY_EEE_EN_10GBASE_T; - if (phy_caps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_KR_CR1) - eee_cap |= IXGBE_ACI_PHY_EEE_EN_10GBASE_KR; - if (phy_caps.phy_type_high & IXGBE_PHY_TYPE_HIGH_10BASE_T) - eee_cap |= IXGBE_ACI_PHY_EEE_EN_10BASE_T; } /* Set EEE capability for particular PHY types */ diff --git a/sys/dev/ixgbe/ixgbe_type_e610.h b/sys/dev/ixgbe/ixgbe_type_e610.h index e300030c3ba4..da46e503f660 100644 --- a/sys/dev/ixgbe/ixgbe_type_e610.h +++ b/sys/dev/ixgbe/ixgbe_type_e610.h @@ -721,6 +721,7 @@ struct ixgbe_aci_cmd_list_caps_elem { #define IXGBE_ACI_CAPS_EXT_TOPO_DEV_IMG3 0x0084 #define IXGBE_ACI_CAPS_OROM_RECOVERY_UPDATE 0x0090 #define IXGBE_ACI_CAPS_NEXT_CLUSTER_ID 0x0096 +#define IXGBE_ACI_CAPS_EEE 0x009B u8 major_ver; u8 minor_ver; /* Number of resources described by this capability */ @@ -836,10 +837,8 @@ struct ixgbe_aci_cmd_get_phy_caps_data { #define IXGBE_ACI_PHY_EEE_EN_100BASE_TX BIT(0) #define IXGBE_ACI_PHY_EEE_EN_1000BASE_T BIT(1) #define IXGBE_ACI_PHY_EEE_EN_10GBASE_T BIT(2) -#define IXGBE_ACI_PHY_EEE_EN_1000BASE_KX BIT(3) -#define IXGBE_ACI_PHY_EEE_EN_10GBASE_KR BIT(4) -#define IXGBE_ACI_PHY_EEE_EN_25GBASE_KR BIT(5) -#define IXGBE_ACI_PHY_EEE_EN_10BASE_T BIT(11) +#define IXGBE_ACI_PHY_EEE_EN_5GBASE_T BIT(11) +#define IXGBE_ACI_PHY_EEE_EN_2_5GBASE_T BIT(12) __le16 eeer_value; u8 phy_id_oui[4]; /* PHY/Module ID connected on the port */ u8 phy_fw_ver[8]; @@ -869,7 +868,9 @@ struct ixgbe_aci_cmd_get_phy_caps_data { #define IXGBE_ACI_MOD_TYPE_BYTE2_SFP_PLUS 0xA0 #define IXGBE_ACI_MOD_TYPE_BYTE2_QSFP_PLUS 0x86 u8 qualified_module_count; - u8 rsvd2[7]; /* Bytes 47:41 reserved */ + u8 rsvd2; + __le16 eee_entry_delay; + u8 rsvd3[4]; #define IXGBE_ACI_QUAL_MOD_COUNT_MAX 16 struct { u8 v_oui[3]; @@ -893,11 +894,38 @@ struct ixgbe_aci_cmd_set_phy_cfg { IXGBE_CHECK_PARAM_LEN(ixgbe_aci_cmd_set_phy_cfg); +/* Set PHY config obsolete command data structure (; Fri, 13 Mar 2026 12:16: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXNkr63jBz3QYJ for ; Fri, 13 Mar 2026 12:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773404196; 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=ybN67JFE+On0eQFVo2oPxgMaGsB4Z8MJAFLVkXb9j+c=; b=HBGX/0zFE4iIPFezjVqF8+2po25QdCANIPgEZp4VLd1shALwslNZxFj1O4IYHZLerDtD+T PBgaKpAqu6im6V+x8TxlsWw4ZMwWyqjPtVUg7srwbe37ueU6INr11nRRIEOO9VMlO2kM6B zOG/MAnf5YlFVndNEvQcH88nGm/KnVjt8YmPRRAMPzX7Vk8yyTQN2M8NxtsSydurkJCYjY iuT5rtEmUJF2ta9h0IcHF0zPTREwvifEo4xnm/20uhpofMu6o9OxYshKqNBQreYamNHjXc k5FUVIOAP6be9if9/z633lfMgat5p2Q9uOO2DNnJauAt0S+JwZy5kFe4JhbAGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773404196; a=rsa-sha256; cv=none; b=B3aJeDVd3Q2sRGjDiBGlY60mUkjoyDiIX+jemVEvhPpQpag15WxwFSIAyhrFu0JVax09N2 yAr9ra6RVdANBlQh63evfwHbd51092AXFIkZtSv167VhNI89FIypV485W+/IfkKvJVAJdv KQyoD9YU7J4Bffp0zdco/FtUdeAJx5PP9Y/brYGCaCLwp4jrVtjuoro+PeuE0LHKUq4vig X18Bbmikrhzym+1/V+XIGt9RdI6FdbZdCEmGX+4Pj2WFFmyiWkP/KTKMchXC7iG++7NUoi P7UxgjjWIgJqLphIOaDNS75TKu1vdabpWjT5gghC4q9KLSrRbgjajW6bIUoahg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773404196; 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=ybN67JFE+On0eQFVo2oPxgMaGsB4Z8MJAFLVkXb9j+c=; b=c5had4ihL4RYdcHyNtGy6sgnBA5i+YSZcpeaXRgJLDtpEc18QhuBaN/eOSUiXX5aTOEaM9 KXMOjHbXkMsGh6YoxrftPBHeOdYY9qzg87Ni53RwRVXTL2XCj9t/NLVtHvMN1o95FGi7nm M1WDhzdiC6GTJeNnNbZrjWRYJFLLKH5rXuukKVWyzvVM7Pfln0/eTjZkR0iaxKKNYFtNZI +IVbJO8OvYrCe0FiF7b4IL0rk2Q980JnpNQhb2jlCxItZSABO8l07y2oiSMsmXNejIRWeM lr7PmA6hepGHCVGYSST2MHEgiGHUlvfkbptPnCW0n0UOOCKawDuleqBH3JXl1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXNkr5KWXzX1c for ; Fri, 13 Mar 2026 12:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 203eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 12:16:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Bartosz Sobczak From: Krzysztof Galazka Subject: git: 5b7aa6c7bc9d - main - irdma(4): update irdma to version 1.3.56-k List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b7aa6c7bc9db19e8bd34a5b7892fb5df2a3068b Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 12:16:31 +0000 Message-Id: <69b4001f.203eb.12b478aa@gitrepo.freebsd.org> The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=5b7aa6c7bc9db19e8bd34a5b7892fb5df2a3068b commit 5b7aa6c7bc9db19e8bd34a5b7892fb5df2a3068b Author: Bartosz Sobczak AuthorDate: 2026-03-13 11:56:25 +0000 Commit: Krzysztof Galazka CommitDate: 2026-03-13 12:00:55 +0000 irdma(4): update irdma to version 1.3.56-k Update Intel irdma driver to version 1.3.56-k Notable changes: - adding E830 support - adding E835 support Signed-off-by: Sobczak, Bartosz Reviewed by: Andrew Zhu Tested by: Mateusz Moga MFC after: 2 weeks Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D55479 --- contrib/ofed/libirdma/ice_devids.h | 26 +- contrib/ofed/libirdma/irdma.h | 3 +- contrib/ofed/libirdma/irdma_defs.h | 100 +++---- contrib/ofed/libirdma/irdma_uk.c | 252 ++++++++++-------- contrib/ofed/libirdma/irdma_umain.c | 18 +- contrib/ofed/libirdma/irdma_user.h | 20 +- contrib/ofed/libirdma/irdma_uverbs.c | 110 ++++---- sys/dev/irdma/fbsd_kcompat.c | 160 +++++++++++- sys/dev/irdma/fbsd_kcompat.h | 19 +- sys/dev/irdma/ice_devids.h | 26 +- sys/dev/irdma/icrdma.c | 32 ++- sys/dev/irdma/icrdma_hw.c | 59 +++-- sys/dev/irdma/icrdma_hw.h | 17 +- sys/dev/irdma/irdma.h | 4 +- sys/dev/irdma/irdma_cm.c | 493 +++++++++++++++++++++++++---------- sys/dev/irdma/irdma_cm.h | 3 +- sys/dev/irdma/irdma_ctrl.c | 273 +++++++++---------- sys/dev/irdma/irdma_defs.h | 136 +++++----- sys/dev/irdma/irdma_hmc.c | 12 +- sys/dev/irdma/irdma_hw.c | 151 ++++++----- sys/dev/irdma/irdma_kcompat.c | 301 ++++++++++++++++----- sys/dev/irdma/irdma_main.h | 41 ++- sys/dev/irdma/irdma_pble.c | 10 +- sys/dev/irdma/irdma_protos.h | 7 +- sys/dev/irdma/irdma_puda.c | 25 +- sys/dev/irdma/irdma_puda.h | 14 +- sys/dev/irdma/irdma_type.h | 51 ++-- sys/dev/irdma/irdma_uda.h | 2 + sys/dev/irdma/irdma_uda_d.h | 4 +- sys/dev/irdma/irdma_uk.c | 250 ++++++++++-------- sys/dev/irdma/irdma_user.h | 26 +- sys/dev/irdma/irdma_utils.c | 376 +++++++++++++++++--------- sys/dev/irdma/irdma_verbs.c | 245 +++++++++-------- sys/dev/irdma/irdma_verbs.h | 25 +- sys/dev/irdma/irdma_ws.c | 157 ++++++----- sys/dev/irdma/osdep.h | 9 +- sys/modules/irdma/Makefile | 2 +- 37 files changed, 2225 insertions(+), 1234 deletions(-) diff --git a/contrib/ofed/libirdma/ice_devids.h b/contrib/ofed/libirdma/ice_devids.h index 57a7f2f7c2af..0cf7aa6aee22 100644 --- a/contrib/ofed/libirdma/ice_devids.h +++ b/contrib/ofed/libirdma/ice_devids.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2019 - 2020 Intel Corporation + * Copyright (c) 2019 - 2026 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -88,4 +88,28 @@ #define ICE_DEV_ID_E822L_10G_BASE_T 0x1899 /* Intel(R) Ethernet Connection E822-L 1GbE */ #define ICE_DEV_ID_E822L_SGMII 0x189A +/* Intel(R) Ethernet Controller E830-CC for backplane */ +#define ICE_DEV_ID_E830_BACKPLANE 0x12D1 +/* Intel(R) Ethernet Controller E830-CC for QSFP */ +#define ICE_DEV_ID_E830_QSFP56 0x12D2 +/* Intel(R) Ethernet Controller E830-CC for SFP */ +#define ICE_DEV_ID_E830_SFP 0x12D3 +/* Intel(R) Ethernet Controller E830-CC for SFP-DD */ +#define ICE_DEV_ID_E830_SFP_DD 0x12D4 +/* Intel(R) Ethernet Controller E830-C for backplane */ +#define ICE_DEV_ID_E830C_BACKPLANE 0x12D5 +/* Intel(R) Ethernet Controller E830-XXV for backplane */ +#define ICE_DEV_ID_E830_XXV_BACKPLANE 0x12DC +/* Intel(R) Ethernet Controller E830-C for QSFP */ +#define ICE_DEV_ID_E830C_QSFP 0x12D8 +/* Intel(R) Ethernet Controller E830-XXV for QSFP */ +#define ICE_DEV_ID_E830_XXV_QSFP 0x12DD +/* Intel(R) Ethernet Controller E830-C for SFP */ +#define ICE_DEV_ID_E830C_SFP 0x12DA +/* Intel(R) Ethernet Controller E830-XXV for SFP */ +#define ICE_DEV_ID_E830_XXV_SFP 0x12DE +/* Intel(R) Ethernet Controller E835-XXV for SFP */ +#define ICE_DEV_ID_E835_XXV_SFP 0x124A +/* Intel(R) Ethernet Controller E835-CC for QSFP */ +#define ICE_DEV_ID_E835_QSFP 0x1249 #endif /* ICE_DEVIDS_H */ diff --git a/contrib/ofed/libirdma/irdma.h b/contrib/ofed/libirdma/irdma.h index f4a5a4796f82..6b85ff1a7105 100644 --- a/contrib/ofed/libirdma/irdma.h +++ b/contrib/ofed/libirdma/irdma.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2017 - 2022 Intel Corporation + * Copyright (c) 2017 - 2026 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -57,6 +57,7 @@ struct irdma_uk_attrs { u32 max_hw_wq_quanta; u32 min_hw_cq_size; u32 max_hw_cq_size; + u16 max_hw_push_len; u16 max_hw_sq_chunk; u16 min_hw_wq_size; u8 hw_rev; diff --git a/contrib/ofed/libirdma/irdma_defs.h b/contrib/ofed/libirdma/irdma_defs.h index 39d4e7772c31..7deaf762c204 100644 --- a/contrib/ofed/libirdma/irdma_defs.h +++ b/contrib/ofed/libirdma/irdma_defs.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2015 - 2023 Intel Corporation + * Copyright (c) 2015 - 2026 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -63,6 +63,27 @@ #define IRDMA_BYTE_200 200 #define IRDMA_BYTE_208 208 #define IRDMA_BYTE_216 216 +#define IRDMA_BYTE_224 224 +#define IRDMA_BYTE_232 232 +#define IRDMA_BYTE_240 240 +#define IRDMA_BYTE_248 248 +#define IRDMA_BYTE_256 256 +#define IRDMA_BYTE_264 264 +#define IRDMA_BYTE_272 272 +#define IRDMA_BYTE_280 280 +#define IRDMA_BYTE_288 288 +#define IRDMA_BYTE_296 296 +#define IRDMA_BYTE_304 304 +#define IRDMA_BYTE_312 312 +#define IRDMA_BYTE_320 320 +#define IRDMA_BYTE_328 328 +#define IRDMA_BYTE_336 336 +#define IRDMA_BYTE_344 344 +#define IRDMA_BYTE_352 352 +#define IRDMA_BYTE_360 360 +#define IRDMA_BYTE_368 368 +#define IRDMA_BYTE_376 376 +#define IRDMA_BYTE_384 384 #define IRDMA_QP_TYPE_IWARP 1 #define IRDMA_QP_TYPE_UDA 2 @@ -81,6 +102,8 @@ #define IRDMA_MAX_RQ_WQE_SHIFT_GEN1 2 #define IRDMA_MAX_RQ_WQE_SHIFT_GEN2 3 +#define IRDMA_DEFAULT_MAX_PUSH_LEN 8192 + #define IRDMA_SQ_RSVD 258 #define IRDMA_RQ_RSVD 1 @@ -241,7 +264,7 @@ #define IRDMAQPSQ_DESTQPN_S 32 #define IRDMAQPSQ_DESTQPN GENMASK_ULL(55, 32) #define IRDMAQPSQ_AHID_S 0 -#define IRDMAQPSQ_AHID GENMASK_ULL(16, 0) +#define IRDMAQPSQ_AHID GENMASK_ULL(24, 0) #define IRDMAQPSQ_INLINEDATAFLAG_S 57 #define IRDMAQPSQ_INLINEDATAFLAG BIT_ULL(57) @@ -338,9 +361,9 @@ #define IRDMA_RING_MOVE_HEAD(_ring, _retcode) \ { \ u32 size; \ - size = (_ring).size; \ + size = IRDMA_RING_SIZE(_ring); \ if (!IRDMA_RING_FULL_ERR(_ring)) { \ - (_ring).head = ((_ring).head + 1) % size; \ + IRDMA_RING_CURRENT_HEAD(_ring) = (IRDMA_RING_CURRENT_HEAD(_ring) + 1) % size; \ (_retcode) = 0; \ } else { \ (_retcode) = ENOSPC; \ @@ -349,79 +372,40 @@ #define IRDMA_RING_MOVE_HEAD_BY_COUNT(_ring, _count, _retcode) \ { \ u32 size; \ - size = (_ring).size; \ + size = IRDMA_RING_SIZE(_ring); \ if ((IRDMA_RING_USED_QUANTA(_ring) + (_count)) < size) { \ - (_ring).head = ((_ring).head + (_count)) % size; \ - (_retcode) = 0; \ - } else { \ - (_retcode) = ENOSPC; \ - } \ - } -#define IRDMA_SQ_RING_MOVE_HEAD(_ring, _retcode) \ - { \ - u32 size; \ - size = (_ring).size; \ - if (!IRDMA_SQ_RING_FULL_ERR(_ring)) { \ - (_ring).head = ((_ring).head + 1) % size; \ - (_retcode) = 0; \ - } else { \ - (_retcode) = ENOSPC; \ - } \ - } -#define IRDMA_SQ_RING_MOVE_HEAD_BY_COUNT(_ring, _count, _retcode) \ - { \ - u32 size; \ - size = (_ring).size; \ - if ((IRDMA_RING_USED_QUANTA(_ring) + (_count)) < (size - 256)) { \ - (_ring).head = ((_ring).head + (_count)) % size; \ + IRDMA_RING_CURRENT_HEAD(_ring) = (IRDMA_RING_CURRENT_HEAD(_ring) + (_count)) % size; \ (_retcode) = 0; \ } else { \ (_retcode) = ENOSPC; \ } \ } -#define IRDMA_RING_MOVE_HEAD_BY_COUNT_NOCHECK(_ring, _count) \ - (_ring).head = ((_ring).head + (_count)) % (_ring).size -#define IRDMA_RING_MOVE_TAIL(_ring) \ - (_ring).tail = ((_ring).tail + 1) % (_ring).size +#define IRDMA_RING_MOVE_HEAD_BY_COUNT_NOCHECK(_ring, _count) \ + (IRDMA_RING_CURRENT_HEAD(_ring) = (IRDMA_RING_CURRENT_HEAD(_ring) + (_count)) % IRDMA_RING_SIZE(_ring)) #define IRDMA_RING_MOVE_HEAD_NOCHECK(_ring) \ - (_ring).head = ((_ring).head + 1) % (_ring).size + IRDMA_RING_MOVE_HEAD_BY_COUNT_NOCHECK(_ring, 1) #define IRDMA_RING_MOVE_TAIL_BY_COUNT(_ring, _count) \ - (_ring).tail = ((_ring).tail + (_count)) % (_ring).size + IRDMA_RING_CURRENT_TAIL(_ring) = (IRDMA_RING_CURRENT_TAIL(_ring) + (_count)) % IRDMA_RING_SIZE(_ring) + +#define IRDMA_RING_MOVE_TAIL(_ring) \ + IRDMA_RING_MOVE_TAIL_BY_COUNT(_ring, 1) #define IRDMA_RING_SET_TAIL(_ring, _pos) \ - (_ring).tail = (_pos) % (_ring).size + IRDMA_RING_CURRENT_TAIL(_ring) = (_pos) % IRDMA_RING_SIZE(_ring) #define IRDMA_RING_FULL_ERR(_ring) \ ( \ - (IRDMA_RING_USED_QUANTA(_ring) == ((_ring).size - 1)) \ - ) - -#define IRDMA_ERR_RING_FULL2(_ring) \ - ( \ - (IRDMA_RING_USED_QUANTA(_ring) == ((_ring).size - 2)) \ - ) - -#define IRDMA_ERR_RING_FULL3(_ring) \ - ( \ - (IRDMA_RING_USED_QUANTA(_ring) == ((_ring).size - 3)) \ + (IRDMA_RING_USED_QUANTA(_ring) == (IRDMA_RING_SIZE(_ring) - 1)) \ ) #define IRDMA_SQ_RING_FULL_ERR(_ring) \ ( \ - (IRDMA_RING_USED_QUANTA(_ring) == ((_ring).size - 257)) \ + (IRDMA_RING_USED_QUANTA(_ring) == (IRDMA_RING_SIZE(_ring) - 257)) \ ) -#define IRDMA_ERR_SQ_RING_FULL2(_ring) \ - ( \ - (IRDMA_RING_USED_QUANTA(_ring) == ((_ring).size - 258)) \ - ) -#define IRDMA_ERR_SQ_RING_FULL3(_ring) \ - ( \ - (IRDMA_RING_USED_QUANTA(_ring) == ((_ring).size - 259)) \ - ) #define IRDMA_RING_MORE_WORK(_ring) \ ( \ (IRDMA_RING_USED_QUANTA(_ring) != 0) \ @@ -429,17 +413,17 @@ #define IRDMA_RING_USED_QUANTA(_ring) \ ( \ - (((_ring).head + (_ring).size - (_ring).tail) % (_ring).size) \ + ((IRDMA_RING_CURRENT_HEAD(_ring) + IRDMA_RING_SIZE(_ring) - IRDMA_RING_CURRENT_TAIL(_ring)) % IRDMA_RING_SIZE(_ring)) \ ) #define IRDMA_RING_FREE_QUANTA(_ring) \ ( \ - ((_ring).size - IRDMA_RING_USED_QUANTA(_ring) - 1) \ + (IRDMA_RING_SIZE(_ring) - IRDMA_RING_USED_QUANTA(_ring) - 1) \ ) #define IRDMA_SQ_RING_FREE_QUANTA(_ring) \ ( \ - ((_ring).size - IRDMA_RING_USED_QUANTA(_ring) - 257) \ + (IRDMA_RING_SIZE(_ring) - IRDMA_RING_USED_QUANTA(_ring) - 257) \ ) #define IRDMA_ATOMIC_RING_MOVE_HEAD(_ring, index, _retcode) \ diff --git a/contrib/ofed/libirdma/irdma_uk.c b/contrib/ofed/libirdma/irdma_uk.c index 115c5f0a27f0..c42d0f3e9673 100644 --- a/contrib/ofed/libirdma/irdma_uk.c +++ b/contrib/ofed/libirdma/irdma_uk.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2015 - 2023 Intel Corporation + * Copyright (c) 2015 - 2026 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -133,16 +133,18 @@ irdma_nop_1(struct irdma_qp_uk *qp) void irdma_clr_wqes(struct irdma_qp_uk *qp, u32 qp_wqe_idx) { - __le64 *wqe; + struct irdma_qp_quanta *sq; u32 wqe_idx; if (!(qp_wqe_idx & 0x7F)) { wqe_idx = (qp_wqe_idx + 128) % qp->sq_ring.size; - wqe = qp->sq_base[wqe_idx].elem; + sq = qp->sq_base + wqe_idx; if (wqe_idx) - memset(wqe, qp->swqe_polarity ? 0 : 0xFF, 0x1000); + memset(sq, qp->swqe_polarity ? 0 : 0xFF, + 128 * sizeof(*sq)); else - memset(wqe, qp->swqe_polarity ? 0xFF : 0, 0x1000); + memset(sq, qp->swqe_polarity ? 0xFF : 0, + 128 * sizeof(*sq)); } } @@ -200,22 +202,65 @@ irdma_qp_ring_push_db(struct irdma_qp_uk *qp, u32 wqe_idx) qp->push_dropped = false; } +/** + * irdma_qp_push_wqe - setup push wqe and ring db + * @qp: hw qp ptr + * @wqe: wqe ptr + * @quanta: numbers of quanta in wqe + * @wqe_idx: wqe index + * @push_wqe: if to use push for the wqe + */ void irdma_qp_push_wqe(struct irdma_qp_uk *qp, __le64 * wqe, u16 quanta, - u32 wqe_idx, bool post_sq) + u32 wqe_idx, bool push_wqe) { __le64 *push; - if (IRDMA_RING_CURRENT_HEAD(qp->initial_ring) != - IRDMA_RING_CURRENT_TAIL(qp->sq_ring) && - !qp->push_mode) { - irdma_uk_qp_post_wr(qp); - } else { + if (push_wqe) { push = (__le64 *) ((uintptr_t)qp->push_wqe + (wqe_idx & 0x7) * 0x20); irdma_memcpy(push, wqe, quanta * IRDMA_QP_WQE_MIN_SIZE); irdma_qp_ring_push_db(qp, wqe_idx); + qp->last_push_db = true; + } else if (qp->last_push_db) { + qp->last_push_db = false; + db_wr32(qp->qp_id, qp->wqe_alloc_db); + } else { + irdma_uk_qp_post_wr(qp); + } +} + +/** + * irdma_push_ring_free - check if sq ring free to pust push wqe + * @qp: hw qp ptr + */ +static inline bool +irdma_push_ring_free(struct irdma_qp_uk *qp) +{ + u32 head, tail; + + head = IRDMA_RING_CURRENT_HEAD(qp->initial_ring); + tail = IRDMA_RING_CURRENT_TAIL(qp->sq_ring); + + if (head == tail || head == (tail + 1)) + return true; + + return false; +} + +/** + * irdma_enable_push_wqe - depending on sq ring and total size + * @qp: hw qp ptr + * @total_size: total data size + */ +static inline bool +irdma_enable_push_wqe(struct irdma_qp_uk *qp, u32 total_size) +{ + if (irdma_push_ring_free(qp) && + total_size <= qp->uk_attrs->max_hw_push_len) { + return true; } + return false; } /** @@ -234,7 +279,8 @@ irdma_qp_get_next_send_wqe(struct irdma_qp_uk *qp, u32 *wqe_idx, __le64 *wqe; __le64 *wqe_0 = NULL; u32 nop_wqe_idx; - u16 avail_quanta, wqe_quanta = *quanta; + u16 wqe_quanta = *quanta; + u16 avail_quanta; u16 i; avail_quanta = qp->uk_attrs->max_hw_sq_chunk - @@ -330,7 +376,7 @@ irdma_uk_rdma_write(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, bool read_fence = false; u16 quanta; - info->push_wqe = qp->push_db ? true : false; + info->push_wqe = false; op_info = &info->op.rdma_write; if (op_info->num_lo_sges > qp->max_sq_frag_cnt) @@ -350,11 +396,13 @@ irdma_uk_rdma_write(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, if (ret_code) return ret_code; + if (qp->push_db) + info->push_wqe = irdma_enable_push_wqe(qp, total_size); + wqe = irdma_qp_get_next_send_wqe(qp, &wqe_idx, &quanta, total_size, info); if (!wqe) return ENOSPC; - qp->sq_wrtrk_array[wqe_idx].signaled = info->signaled; set_64bit_val(wqe, IRDMA_BYTE_16, FIELD_PREP(IRDMAQPSQ_FRAG_TO, op_info->rem_addr.addr)); @@ -399,8 +447,8 @@ irdma_uk_rdma_write(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, udma_to_device_barrier(); /* make sure WQE is populated before valid bit is set */ set_64bit_val(wqe, IRDMA_BYTE_24, hdr); - if (info->push_wqe) - irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, post_sq); + if (qp->push_db) + irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, info->push_wqe); else if (post_sq) irdma_uk_qp_post_wr(qp); @@ -429,7 +477,7 @@ irdma_uk_rdma_read(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, u16 quanta; u64 hdr; - info->push_wqe = qp->push_db ? true : false; + info->push_wqe &= qp->push_db ? true : false; op_info = &info->op.rdma_read; if (qp->max_sq_frag_cnt < op_info->num_lo_sges) @@ -451,7 +499,6 @@ irdma_uk_rdma_read(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, qp->ord_cnt = 0; } - qp->sq_wrtrk_array[wqe_idx].signaled = info->signaled; addl_frag_cnt = op_info->num_lo_sges > 1 ? (op_info->num_lo_sges - 1) : 0; local_fence |= info->local_fence; @@ -490,8 +537,8 @@ irdma_uk_rdma_read(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, udma_to_device_barrier(); /* make sure WQE is populated before valid bit is set */ set_64bit_val(wqe, IRDMA_BYTE_24, hdr); - if (info->push_wqe) - irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, post_sq); + if (qp->push_db) + irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, info->push_wqe); else if (post_sq) irdma_uk_qp_post_wr(qp); @@ -517,7 +564,7 @@ irdma_uk_send(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, bool read_fence = false; u16 quanta; - info->push_wqe = qp->push_db ? true : false; + info->push_wqe = false; op_info = &info->op.send; if (qp->max_sq_frag_cnt < op_info->num_sges) @@ -534,6 +581,9 @@ irdma_uk_send(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, if (ret_code) return ret_code; + if (qp->push_db) + info->push_wqe = irdma_enable_push_wqe(qp, total_size); + wqe = irdma_qp_get_next_send_wqe(qp, &wqe_idx, &quanta, total_size, info); if (!wqe) return ENOSPC; @@ -587,8 +637,8 @@ irdma_uk_send(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, udma_to_device_barrier(); /* make sure WQE is populated before valid bit is set */ set_64bit_val(wqe, IRDMA_BYTE_24, hdr); - if (info->push_wqe) - irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, post_sq); + if (qp->push_db) + irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, info->push_wqe); else if (post_sq) irdma_uk_qp_post_wr(qp); @@ -780,11 +830,11 @@ irdma_uk_inline_rdma_write(struct irdma_qp_uk *qp, return EINVAL; quanta = qp->wqe_ops.iw_inline_data_size_to_quanta(total_size); + wqe = irdma_qp_get_next_send_wqe(qp, &wqe_idx, &quanta, total_size, info); if (!wqe) return ENOSPC; - qp->sq_wrtrk_array[wqe_idx].signaled = info->signaled; read_fence |= info->read_fence; set_64bit_val(wqe, IRDMA_BYTE_16, FIELD_PREP(IRDMAQPSQ_FRAG_TO, op_info->rem_addr.addr)); @@ -812,8 +862,8 @@ irdma_uk_inline_rdma_write(struct irdma_qp_uk *qp, set_64bit_val(wqe, IRDMA_BYTE_24, hdr); - if (info->push_wqe) - irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, post_sq); + if (qp->push_db) + irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, info->push_wqe); else if (post_sq) irdma_uk_qp_post_wr(qp); @@ -886,8 +936,8 @@ irdma_uk_inline_send(struct irdma_qp_uk *qp, set_64bit_val(wqe, IRDMA_BYTE_24, hdr); - if (info->push_wqe) - irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, post_sq); + if (qp->push_db) + irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, info->push_wqe); else if (post_sq) irdma_uk_qp_post_wr(qp); @@ -937,8 +987,8 @@ irdma_uk_stag_local_invalidate(struct irdma_qp_uk *qp, set_64bit_val(wqe, IRDMA_BYTE_24, hdr); - if (info->push_wqe) - irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, post_sq); + if (qp->push_db) + irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, info->push_wqe); else if (post_sq) irdma_uk_qp_post_wr(qp); @@ -989,8 +1039,8 @@ irdma_uk_mw_bind(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, set_64bit_val(wqe, IRDMA_BYTE_24, hdr); - if (info->push_wqe) - irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, post_sq); + if (qp->push_db) + irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, info->push_wqe); else if (post_sq) irdma_uk_qp_post_wr(qp); @@ -1226,26 +1276,25 @@ irdma_check_rq_cqe(struct irdma_qp_uk *qp, u32 *array_idx) } /** - * irdma_skip_duplicate_flush_cmpl - check last cmpl and update wqe if needed - * - * @ring: sq/rq ring - * @flush_seen: information if flush for specific ring was already seen - * @comp_status: completion status - * @wqe_idx: new value of WQE index returned if there is more work on ring + * irdma_uk_cq_empty - Check if CQ is empty + * @cq: hw cq */ -static inline int -irdma_skip_duplicate_flush_cmpl(struct irdma_ring ring, u8 flush_seen, - enum irdma_cmpl_status comp_status, - u32 *wqe_idx) +bool +irdma_uk_cq_empty(struct irdma_cq_uk *cq) { - if (flush_seen) { - if (IRDMA_RING_MORE_WORK(ring)) - *wqe_idx = ring.tail; - else - return ENOENT; - } + __le64 *cqe; + u8 polarity; + u64 qword3; - return 0; + if (cq->avoid_mem_cflct) + cqe = IRDMA_GET_CURRENT_EXTENDED_CQ_ELEM(cq); + else + cqe = IRDMA_GET_CURRENT_CQ_ELEM(cq); + + get_64bit_val(cqe, 24, &qword3); + polarity = (u8)FIELD_GET(IRDMA_CQ_VALID, qword3); + + return polarity != cq->polarity; } /** @@ -1338,6 +1387,10 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, info->ipv4 = (bool)FIELD_GET(IRDMACQ_IPV4, qword3); get_64bit_val(cqe, IRDMA_BYTE_8, &comp_ctx); qp = (struct irdma_qp_uk *)(irdma_uintptr) comp_ctx; + if (!qp || qp->destroy_pending) { + ret_code = EFAULT; + goto exit; + } if (info->error) { info->major_err = FIELD_GET(IRDMA_CQ_MAJERR, qword3); info->minor_err = FIELD_GET(IRDMA_CQ_MINERR, qword3); @@ -1367,10 +1420,6 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, info->ud_src_qpn = (u32)FIELD_GET(IRDMACQ_UDSRCQPN, qword2); info->solicited_event = (bool)FIELD_GET(IRDMACQ_SOEVENT, qword3); - if (!qp || qp->destroy_pending) { - ret_code = EFAULT; - goto exit; - } wqe_idx = (u32)FIELD_GET(IRDMA_CQ_WQEIDX, qword3); info->qp_handle = (irdma_qp_handle) (irdma_uintptr) qp; info->op_type = (u8)FIELD_GET(IRDMACQ_OP, qword3); @@ -1378,51 +1427,44 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, if (info->q_type == IRDMA_CQE_QTYPE_RQ) { u32 array_idx; - ret_code = irdma_skip_duplicate_flush_cmpl(qp->rq_ring, - qp->rq_flush_seen, - info->comp_status, - &wqe_idx); - if (ret_code != 0) - goto exit; - array_idx = wqe_idx / qp->rq_wqe_size_multiplier; + info->bytes_xfered = (u32)FIELD_GET(IRDMACQ_PAYLDLEN, qword0); + info->signaled = 1; + + if (qword3 & IRDMACQ_STAG) { + info->stag_invalid_set = true; + info->inv_stag = (u32)FIELD_GET(IRDMACQ_INVSTAG, qword2); + } else { + info->stag_invalid_set = false; + } if (info->comp_status == IRDMA_COMPL_STATUS_FLUSHED || info->comp_status == IRDMA_COMPL_STATUS_UNKNOWN) { + ret_code = pthread_spin_lock(qp->lock); + if (ret_code) + return ret_code; if (!IRDMA_RING_MORE_WORK(qp->rq_ring)) { ret_code = ENOENT; + pthread_spin_unlock(qp->lock); goto exit; } info->wr_id = qp->rq_wrid_array[qp->rq_ring.tail]; - info->signaled = 1; - array_idx = qp->rq_ring.tail; + IRDMA_RING_SET_TAIL(qp->rq_ring, qp->rq_ring.tail + 1); + if (!IRDMA_RING_MORE_WORK(qp->rq_ring)) + qp->rq_flush_complete = true; + else + move_cq_head = false; + pthread_spin_unlock(qp->lock); } else { info->wr_id = qp->rq_wrid_array[array_idx]; - info->signaled = 1; if (irdma_check_rq_cqe(qp, &array_idx)) { info->wr_id = qp->rq_wrid_array[array_idx]; info->comp_status = IRDMA_COMPL_STATUS_UNKNOWN; IRDMA_RING_SET_TAIL(qp->rq_ring, array_idx + 1); return 0; } - } - - info->bytes_xfered = (u32)FIELD_GET(IRDMACQ_PAYLDLEN, qword0); - - if (qword3 & IRDMACQ_STAG) { - info->stag_invalid_set = true; - info->inv_stag = (u32)FIELD_GET(IRDMACQ_INVSTAG, qword2); - } else { - info->stag_invalid_set = false; - } - IRDMA_RING_SET_TAIL(qp->rq_ring, array_idx + 1); - if (info->comp_status == IRDMA_COMPL_STATUS_FLUSHED) { - qp->rq_flush_seen = true; - if (!IRDMA_RING_MORE_WORK(qp->rq_ring)) - qp->rq_flush_complete = true; - else - move_cq_head = false; + IRDMA_RING_SET_TAIL(qp->rq_ring, array_idx + 1); } pring = &qp->rq_ring; } else { /* q_type is IRDMA_CQE_QTYPE_SQ */ @@ -1444,12 +1486,6 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, qp->push_mode = false; qp->push_dropped = true; } - ret_code = irdma_skip_duplicate_flush_cmpl(qp->sq_ring, - qp->sq_flush_seen, - info->comp_status, - &wqe_idx); - if (ret_code != 0) - goto exit; if (info->comp_status != IRDMA_COMPL_STATUS_FLUSHED) { info->wr_id = qp->sq_wrtrk_array[wqe_idx].wrid; info->signaled = qp->sq_wrtrk_array[wqe_idx].signaled; @@ -1459,10 +1495,9 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, IRDMA_RING_SET_TAIL(qp->sq_ring, wqe_idx + qp->sq_wrtrk_array[wqe_idx].quanta); } else { - if (pthread_spin_lock(qp->lock)) { - ret_code = ENOENT; - goto exit; - } + ret_code = pthread_spin_lock(qp->lock); + if (ret_code) + return ret_code; if (!IRDMA_RING_MORE_WORK(qp->sq_ring)) { pthread_spin_unlock(qp->lock); ret_code = ENOENT; @@ -1493,7 +1528,6 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, if (info->op_type == IRDMA_OP_TYPE_BIND_MW && info->minor_err == FLUSH_PROT_ERR) info->minor_err = FLUSH_MW_BIND_ERR; - qp->sq_flush_seen = true; if (!IRDMA_RING_MORE_WORK(qp->sq_ring)) qp->sq_flush_complete = true; pthread_spin_unlock(qp->lock); @@ -1508,6 +1542,7 @@ exit: if (pring && IRDMA_RING_MORE_WORK(*pring)) move_cq_head = false; } + if (move_cq_head) { IRDMA_RING_MOVE_HEAD_NOCHECK(cq->cq_ring); if (!IRDMA_RING_CURRENT_HEAD(cq->cq_ring)) @@ -1522,8 +1557,9 @@ exit: IRDMA_RING_MOVE_TAIL(cq->cq_ring); if (!cq->avoid_mem_cflct && ext_valid) IRDMA_RING_MOVE_TAIL(cq->cq_ring); - set_64bit_val(cq->shadow_area, IRDMA_BYTE_0, - IRDMA_RING_CURRENT_HEAD(cq->cq_ring)); + if (IRDMA_RING_CURRENT_HEAD(cq->cq_ring) & 0x3F || irdma_uk_cq_empty(cq)) + set_64bit_val(cq->shadow_area, IRDMA_BYTE_0, + IRDMA_RING_CURRENT_HEAD(cq->cq_ring)); } else { qword3 &= ~IRDMA_CQ_WQEIDX; qword3 |= FIELD_PREP(IRDMA_CQ_WQEIDX, pring->tail); @@ -1537,9 +1573,7 @@ exit: * irdma_round_up_wq - return round up qp wq depth * @wqdepth: wq depth in quanta to round up */ -static int -irdma_round_up_wq(u32 wqdepth) -{ +static u64 irdma_round_up_wq(u64 wqdepth) { int scount = 1; for (wqdepth--; scount <= 16; scount *= 2) @@ -1588,15 +1622,16 @@ irdma_get_wqe_shift(struct irdma_uk_attrs *uk_attrs, u32 sge, int irdma_get_sqdepth(struct irdma_uk_attrs *uk_attrs, u32 sq_size, u8 shift, u32 *sqdepth) { - u32 min_size = (u32)uk_attrs->min_hw_wq_size << shift; + u32 min_hw_quanta = (u32)uk_attrs->min_hw_wq_size << shift; + u64 hw_quanta = + irdma_round_up_wq(((u64)sq_size << shift) + IRDMA_SQ_RSVD); - *sqdepth = irdma_round_up_wq((sq_size << shift) + IRDMA_SQ_RSVD); - - if (*sqdepth < min_size) - *sqdepth = min_size; - else if (*sqdepth > uk_attrs->max_hw_wq_quanta) + if (hw_quanta < min_hw_quanta) + hw_quanta = min_hw_quanta; + else if (hw_quanta > uk_attrs->max_hw_wq_quanta) return EINVAL; + *sqdepth = hw_quanta; return 0; } @@ -1607,15 +1642,16 @@ irdma_get_sqdepth(struct irdma_uk_attrs *uk_attrs, u32 sq_size, u8 shift, u32 *s int irdma_get_rqdepth(struct irdma_uk_attrs *uk_attrs, u32 rq_size, u8 shift, u32 *rqdepth) { - u32 min_size = (u32)uk_attrs->min_hw_wq_size << shift; - - *rqdepth = irdma_round_up_wq((rq_size << shift) + IRDMA_RQ_RSVD); + u32 min_hw_quanta = (u32)uk_attrs->min_hw_wq_size << shift; + u64 hw_quanta = + irdma_round_up_wq(((u64)rq_size << shift) + IRDMA_RQ_RSVD); - if (*rqdepth < min_size) - *rqdepth = min_size; - else if (*rqdepth > uk_attrs->max_hw_rq_quanta) + if (hw_quanta < min_hw_quanta) + hw_quanta = min_hw_quanta; + else if (hw_quanta > uk_attrs->max_hw_rq_quanta) return EINVAL; + *rqdepth = hw_quanta; return 0; } diff --git a/contrib/ofed/libirdma/irdma_umain.c b/contrib/ofed/libirdma/irdma_umain.c index e8d27c31a0dc..63b082a5aa2b 100644 --- a/contrib/ofed/libirdma/irdma_umain.c +++ b/contrib/ofed/libirdma/irdma_umain.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2021 - 2022 Intel Corporation + * Copyright (c) 2021 - 2026 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -48,7 +48,7 @@ /** * Driver version */ -char libirdma_version[] = "1.2.36-k"; +char libirdma_version[] = "1.3.56-k"; unsigned int irdma_dbg; @@ -87,6 +87,18 @@ static const struct hca_info hca_table[] = { INTEL_HCA(ICE_DEV_ID_E822L_SFP), INTEL_HCA(ICE_DEV_ID_E822L_10G_BASE_T), INTEL_HCA(ICE_DEV_ID_E822L_SGMII), + INTEL_HCA(ICE_DEV_ID_E830_BACKPLANE), + INTEL_HCA(ICE_DEV_ID_E830_QSFP56), + INTEL_HCA(ICE_DEV_ID_E830_SFP), + INTEL_HCA(ICE_DEV_ID_E830_SFP_DD), + INTEL_HCA(ICE_DEV_ID_E830C_BACKPLANE), + INTEL_HCA(ICE_DEV_ID_E830_XXV_BACKPLANE), + INTEL_HCA(ICE_DEV_ID_E830C_QSFP), + INTEL_HCA(ICE_DEV_ID_E830_XXV_QSFP), + INTEL_HCA(ICE_DEV_ID_E830C_SFP), + INTEL_HCA(ICE_DEV_ID_E830_XXV_SFP), + INTEL_HCA(ICE_DEV_ID_E835_XXV_SFP), + INTEL_HCA(ICE_DEV_ID_E835_QSFP), }; static struct ibv_context_ops irdma_ctx_ops = { @@ -239,7 +251,7 @@ irdma_driver_init(const char *uverbs_sys_path, hca_size = sizeof(hca_table) / sizeof(struct hca_info); while (i < hca_size && !device_found) { - if (device_id != hca_table[i].device) + if (device_id == hca_table[i].device) device_found = 1; ++i; } diff --git a/contrib/ofed/libirdma/irdma_user.h b/contrib/ofed/libirdma/irdma_user.h index aeb6aa9feebd..c9f707380c59 100644 --- a/contrib/ofed/libirdma/irdma_user.h +++ b/contrib/ofed/libirdma/irdma_user.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2015 - 2023 Intel Corporation + * Copyright (c) 2015 - 2026 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -94,12 +94,10 @@ enum irdma_device_caps_const { IRDMA_MIN_IW_QP_ID = 0, IRDMA_QUERY_FPM_BUF_SIZE = 176, IRDMA_COMMIT_FPM_BUF_SIZE = 176, - IRDMA_MAX_IW_QP_ID = 262143, IRDMA_MIN_CEQID = 0, IRDMA_MAX_CEQID = 1023, IRDMA_CEQ_MAX_COUNT = IRDMA_MAX_CEQID + 1, IRDMA_MIN_CQID = 0, - IRDMA_MAX_CQID = 524287, IRDMA_MIN_AEQ_ENTRIES = 1, IRDMA_MAX_AEQ_ENTRIES = 524287, IRDMA_MIN_CEQ_ENTRIES = 1, @@ -188,7 +186,7 @@ struct irdma_cq_uk_init_info; struct irdma_ring { volatile u32 head; - volatile u32 tail; /* effective tail */ + volatile u32 tail; u32 size; }; @@ -327,6 +325,7 @@ struct irdma_wqe_uk_ops { struct irdma_bind_window *op_info); }; +bool irdma_uk_cq_empty(struct irdma_cq_uk *cq); int irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, struct irdma_cq_poll_info *info); void irdma_uk_cq_request_notification(struct irdma_cq_uk *cq, @@ -364,6 +363,8 @@ struct irdma_qp_uk { __le64 *shadow_area; __le32 *push_db; __le64 *push_wqe; + void *push_db_map; + void *push_wqe_map; struct irdma_ring sq_ring; struct irdma_ring sq_sig_ring; struct irdma_ring rq_ring; @@ -393,12 +394,11 @@ struct irdma_qp_uk { bool sq_flush_complete:1; /* Indicates flush was seen and SQ was empty after the flush */ bool rq_flush_complete:1; /* Indicates flush was seen and RQ was empty after the flush */ bool destroy_pending:1; /* Indicates the QP is being destroyed */ + bool last_push_db:1; /* Indicates last DB was push DB */ void *back_qp; pthread_spinlock_t *lock; u8 dbg_rq_flushed; u16 ord_cnt; - u8 sq_flush_seen; - u8 rq_flush_seen; u8 rd_fence_rate; }; @@ -462,9 +462,11 @@ int irdma_fragcnt_to_quanta_sq(u32 frag_cnt, u16 *quanta); int irdma_fragcnt_to_wqesize_rq(u32 frag_cnt, u16 *wqe_size); void irdma_get_wqe_shift(struct irdma_uk_attrs *uk_attrs, u32 sge, u32 inline_data, u8 *shift); -int irdma_get_sqdepth(struct irdma_uk_attrs *uk_attrs, u32 sq_size, u8 shift, u32 *sqdepth); -int irdma_get_rqdepth(struct irdma_uk_attrs *uk_attrs, u32 rq_size, u8 shift, u32 *rqdepth); +int irdma_get_sqdepth(struct irdma_uk_attrs *uk_attrs, u32 sq_size, + u8 shift, u32 *sqdepth); +int irdma_get_rqdepth(struct irdma_uk_attrs *uk_attrs, u32 rq_size, + u8 shift, u32 *rqdepth); void irdma_qp_push_wqe(struct irdma_qp_uk *qp, __le64 *wqe, u16 quanta, - u32 wqe_idx, bool post_sq); + u32 wqe_idx, bool push_wqe); void irdma_clr_wqes(struct irdma_qp_uk *qp, u32 qp_wqe_idx); #endif /* IRDMA_USER_H */ diff --git a/contrib/ofed/libirdma/irdma_uverbs.c b/contrib/ofed/libirdma/irdma_uverbs.c index e52ce1cfa229..aee904a087bf 100644 --- a/contrib/ofed/libirdma/irdma_uverbs.c +++ b/contrib/ofed/libirdma/irdma_uverbs.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (C) 2019 - 2023 Intel Corporation + * Copyright (C) 2019 - 2026 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -221,7 +221,7 @@ irdma_urereg_mr(struct verbs_mr *vmr, int flags, struct ibv_pd *pd, void *addr, size_t length, int access) { struct irdma_urereg_mr cmd = {}; - struct ibv_rereg_mr_resp resp; + struct ibv_rereg_mr_resp resp = {}; cmd.reg_type = IRDMA_MEMREG_TYPE_MEM; return ibv_cmd_rereg_mr(&vmr->ibv_mr, flags, addr, length, (uintptr_t)addr, @@ -258,7 +258,7 @@ irdma_ualloc_mw(struct ibv_pd *pd, enum ibv_mw_type type) { struct ibv_mw *mw; struct ibv_alloc_mw cmd; *** 6932 LINES SKIPPED *** From nobody Fri Mar 13 13:10:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXPxL5BQ4z6V5lB for ; Fri, 13 Mar 2026 13:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXPxL4k4Lz3YXt for ; Fri, 13 Mar 2026 13:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773407446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjmysL32HZmImTaKa2HFPmNCMRDl5Zqg2Xxr4140l8o=; b=ntV7mxmnZVo1B8bP//tnkbhA51NNDo8IkdLzQJu/PoA0zAnI7dT3jHBoWx3LWU4o2Y5yTN 59S5DkxMe8bx70TeR1MjWT/9dlWLw+4ptfBCRm2j/mj4uMf31HQ3AcbZpAEBGm1x7ilvwz vEpr3lPy7pDGisvP2FiArON3Y4wc8j1BCb5C+BKMrEzx22dUdCoOyf6I6Y7SeHXONkJF8b x+dDgVfmipeekkqobIIaqifN2NRaFbJ0FO/FvpNd3OC9XLOCj60veDh0/rmH0cfB/58Woa OPBXe5xi1h1S6UeQFG73pprkfQCCpT7kWCwe8NYdBbNn+jX1O9FdpUg/lmICkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773407446; a=rsa-sha256; cv=none; b=UhxBy8hjFgQqVDPzQb1MoFKh2ghJQ4+rtpvUo11uiSvLIYIoO5pzhSVt9mfB2m98RS4Qka QF0GI9kELZD36lfLUookjuAcYlU0JLdKSEK5zzkg3sp//rm0iqJxfti/GukqF89enm6gIj DARC4AwwQbkNw+8F7RtdlRDPmZ51fmjsIeemj91QEAu3gi53DDMhVFt5ruKlOksg3xsSKB qedXwhA4qU7kju5V2Nt04ax/nRfVyLzu0Q2JJVlpFjg4RRzIoPqno0PmuKcEwXnPSHigOc oaEVmfm8QCbUZaDn52YOSfTci/ggu8nsTq9rfE4Bqskr+KvQbCI5HRxNhoaMbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773407446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjmysL32HZmImTaKa2HFPmNCMRDl5Zqg2Xxr4140l8o=; b=bDT4CWS2LvS5Kmv5BWukpWxSa/3dQ8iPaZ9YTNwO4yTEHLf/ADF03NeSxHslrHVqmW8ue9 VPihmGi3jZ0uICrQINzEbZ55Dzoh1y83W3IB2wCFFfTQJE8ZMRMxKl1X21qUh1Jk6241W9 joGy4tBbdhfByoYaajoGyWmKG2A6dtDbLA53Dg9Ohd8BEmukQZCn8oqXxZluYCTdIExZAC cHgNNKixbn7lIEf9j16xrI3bztOVPCGtRBSaq7sW2uVvcAICT5/7cFbeqpyfrdVazU+sPz nqJvkWqIhBbtim1ryDBw0+flA6/yQqIveuV4Oi9UXdeen18MjmI9fPoUaCVXGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXPxL4GnZzZRr for ; Fri, 13 Mar 2026 13:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27eba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 13:10:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 4da237aee328 - main - alloca.3: Add entry about defining VLAs in same block as alloca() to BUGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 4da237aee328f368cd85b659854c4556a39f15ef Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 13:10:41 +0000 Message-Id: <69b40cd1.27eba.de1cc3f@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=4da237aee328f368cd85b659854c4556a39f15ef commit 4da237aee328f368cd85b659854c4556a39f15ef Author: Aymeric Wibo AuthorDate: 2026-02-19 14:47:06 +0000 Commit: Aymeric Wibo CommitDate: 2026-03-13 13:08:31 +0000 alloca.3: Add entry about defining VLAs in same block as alloca() to BUGS Refer to alloca() as a (builtin) function or macro, as it could be defined as either depending on the compiler. Paragraph about bug comes from Darwin's libc, and example added to illustrate it. Reviewed by: bnovkov Approved by: bnovkov MFC after: 3 days Obtained from: https://github.com/apple-oss-distributions/libc (partially) Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55370 --- share/man/man3/alloca.3 | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/share/man/man3/alloca.3 b/share/man/man3/alloca.3 index fd88014dbb33..9e905d4487f3 100644 --- a/share/man/man3/alloca.3 +++ b/share/man/man3/alloca.3 @@ -1,5 +1,6 @@ .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. +.\" Copyright (c) 2026 Aymeric Wibo .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -25,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 29, 2025 +.Dd February 19, 2026 .Dt ALLOCA 3 .Os .Sh NAME @@ -38,16 +39,14 @@ .Sh DESCRIPTION The .Fn alloca -function -allocates +function or macro allocates .Fa size bytes of space in the stack frame of the caller. This temporary space is automatically freed on return. .Sh RETURN VALUES -The .Fn alloca -function returns a pointer to the beginning of the allocated space. +returns a pointer to the beginning of the allocated space. .Sh SEE ALSO .Xr brk 2 , .Xr calloc 3 , @@ -55,24 +54,20 @@ function returns a pointer to the beginning of the allocated space. .Xr malloc 3 , .Xr realloc 3 .Sh HISTORY -The .Fn alloca -function appeared in +appeared in .At 32v . .\" .Bx ?? . .\" The function appeared in 32v, pwb and pwb.2 and in 3bsd 4bsd .\" The first man page (or link to a man page that I can find at the .\" moment is 4.3... .Sh BUGS -The .Fn alloca -function is machine and compiler dependent; its use is discouraged. .Pp -The .Fn alloca -function is slightly unsafe because it cannot ensure that the pointer +is slightly unsafe because it cannot ensure that the pointer returned points to a valid and usable block of memory. The allocation made may exceed the bounds of the stack, or even go further into other objects in memory, and @@ -81,3 +76,26 @@ cannot determine such an error. Avoid .Fn alloca with large unbounded allocations. +.Pp +The use of C99 variable-length arrays and +.Fn alloca +in the same function will cause the lifetime of +.Fn alloca Ns 's +storage to be limited to the block containing the +.Fn alloca . +For example, in the following snippet, +.Va p Ns 's +lifetime does not extend outside of the block, whereas it would've if +.Va vla +hadn't been defined or had been defined as a fixed-length array: +.Bd -literal -offset indent +char *p; +{ + const int n = 100; + int vla[n]; + p = alloca(32); + strcpy(p, "Hello, world!"); + printf("Inside: %s\\n", p); /* Valid. */ +} +printf("Outside: %s\\n", p); /* Undefined. */ +.Ed From nobody Fri Mar 13 13:13:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXQ0Z0PYkz6V699; Fri, 13 Mar 2026 13:13:34 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXQ0Y4TXmz3ZVh; Fri, 13 Mar 2026 13:13:33 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 62DDDQCv047524 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 13 Mar 2026 14:13:27 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 62DDDQ10047523; Fri, 13 Mar 2026 14:13:26 +0100 (CET) (envelope-from fuz) Date: Fri, 13 Mar 2026 14:13:26 +0100 From: Robert Clausecker To: Aymeric Wibo Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 4da237aee328 - main - alloca.3: Add entry about defining VLAs in same block as alloca() to BUGS Message-ID: References: <69b40cd1.27eba.de1cc3f@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69b40cd1.27eba.de1cc3f@gitrepo.freebsd.org> 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:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Queue-Id: 4fXQ0Y4TXmz3ZVh X-Spamd-Bar: ---- Hi Aymeric, Am Fri, Mar 13, 2026 at 01:10:41PM +0000 schrieb Aymeric Wibo: > Avoid > .Fn alloca > with large unbounded allocations. > +.Pp > +The use of C99 variable-length arrays and > +.Fn alloca > +in the same function will cause the lifetime of > +.Fn alloca Ns 's > +storage to be limited to the block containing the > +.Fn alloca . > +For example, in the following snippet, > +.Va p Ns 's > +lifetime does not extend outside of the block, whereas it would've if > +.Va vla > +hadn't been defined or had been defined as a fixed-length array: > +.Bd -literal -offset indent > +char *p; > +{ > + const int n = 100; > + int vla[n]; > + p = alloca(32); > + strcpy(p, "Hello, world!"); > + printf("Inside: %s\\n", p); /* Valid. */ > +} > +printf("Outside: %s\\n", p); /* Undefined. */ > +.Ed I am unsure if we should document the behaviour of mixing VLAs and alloca() in the same function as being defined, as that binds us to support it in the future. I would be a lot more comfortable just documenting that behaviour is undefined if the two are combined in one function. Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Fri Mar 13 13:58:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXQzv6Vgwz6V9SX; Fri, 13 Mar 2026 13:58:03 +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 4fXQzv46v9z3fBN; Fri, 13 Mar 2026 13:58:03 +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 0x4cwEmVjPzKy131ew7F4T; Fri, 13 Mar 2026 13:58:02 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id 131dwAoBBX0jp131dwSasX; Fri, 13 Mar 2026 13:58:02 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=FMIWBuos c=1 sm=1 tr=0 ts=69b417ea a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=Yq5XynenixoA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=rxLMDWAdaBGlTZdBPdgA: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 AF98C289; Fri, 13 Mar 2026 06:58:00 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 7355B1A5; Fri, 13 Mar 2026 06:58:00 -0700 (PDT) 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: Robert Clausecker cc: Aymeric Wibo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 4da237aee328 - main - alloca.3: Add entry about defining VLAs in same block as alloca() to BUGS In-reply-to: References: <69b40cd1.27eba.de1cc3f@gitrepo.freebsd.org> Comments: In-reply-to Robert Clausecker message dated "Fri, 13 Mar 2026 14:13:26 +0100." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 13 Mar 2026 06:58:00 -0700 Message-Id: <20260313135800.7355B1A5@slippy.cwsent.com> X-CMAE-Envelope: MS4xfPQ+XnEbppU9NTBMzEwoVAhL7QnCJA6y7+jPSTPo3RXC0HLV1dRevuLhHQWXWwL8io324Pq5dTPmQweOhAWrcV57AZkRDva+tqDkCZQQjA8R/a3VPonm PAhxraolIiJ0QIA4RsG5CIrbIsfpqSbKDVbKQE40wawEBjkArGBvE1owbHDaUfgT6Ep743KH2C7C2rsHtJlOpSknPCc5U3/Nyi7nqSYTbM+AeWGwn/Lm8fp5 rD2RR5zUXkqni2dLJn51TbTNT70+VPFGR2IxxyF98styGdXZ0N6xOphCIeN4ygFMB/PYuafSSVArcCX03MbXNpeX8wm2HXgoH7XEHs35XqweU34we1ZpzL9L X9DYggXA 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: 4fXQzv46v9z3fBN X-Spamd-Bar: ---- In message , Robert Clausecker writes: > Hi Aymeric, > > Am Fri, Mar 13, 2026 at 01:10:41PM +0000 schrieb Aymeric Wibo: > > Avoid > > .Fn alloca > > with large unbounded allocations. > > +.Pp > > +The use of C99 variable-length arrays and > > +.Fn alloca > > +in the same function will cause the lifetime of > > +.Fn alloca Ns 's > > +storage to be limited to the block containing the > > +.Fn alloca . > > +For example, in the following snippet, > > +.Va p Ns 's > > +lifetime does not extend outside of the block, whereas it would've if > > +.Va vla > > +hadn't been defined or had been defined as a fixed-length array: > > +.Bd -literal -offset indent > > +char *p; > > +{ > > + const int n = 100; > > + int vla[n]; > > + p = alloca(32); > > + strcpy(p, "Hello, world!"); > > + printf("Inside: %s\\n", p); /* Valid. */ > > +} > > +printf("Outside: %s\\n", p); /* Undefined. */ > > +.Ed > > I am unsure if we should document the behaviour of mixing VLAs and > alloca() in the same function as being defined, as that binds us to > support it in the future. I would be a lot more comfortable just > documenting that behaviour is undefined if the two are combined in > one function. Agreed. > > Yours, > Robert Clausecker > > -- > () ascii ribbon campaign - for an encoding-agnostic world > /\ - against html email - against proprietary attachments > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Fri Mar 13 14:07:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXRBS0Y7vz6V9gy; Fri, 13 Mar 2026 14:07:12 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXRBR75Q8z3g0f; Fri, 13 Mar 2026 14:07:11 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773410832; 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=XBH34siSZi2bUazc75q6vXcoUR8x9afRJDpx5Ptodjg=; b=h3XXSKFOmE7DewafyAMJY5OhErPnZSRPm4fByINKNtNFYz0qOLfHkbx9vv+VKRRMxuBA3Z tUJYIp3Hyr+GHnIjt67eXJzHZ1q6fQYLUlLHNqOvfgBZyUMSCsh4Q0BqbRwRXefN5ANBjZ w0nC237utqu6nx5oY7/gTG8M+j3erpuxq1YxVzWVwOLyY9UoWVC3Obz7+QQWZCWMnlSU2c S/lDK4a1vfvU+8LocG5lB35ivnHKEV3pDcwfMZeuEfvXCaLctbZJRuVXpMfv0jumHHgN8C UVFOuia99Ls0jfGWEzYAS2/3q9nBL1nFpNlVDp3VnVu4PspQtl12Y6S9ZueCzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773410832; a=rsa-sha256; cv=none; b=NvGf0GsCprmKMM+Cn/nMHhYbNX0G48PF27lzSuPDjoHV+ia0DvLP1L9LEYjuXTkOiYwUZQ 3we5qIiQeKxEnnENXE6Id5RudloAJ6OhNMFGw/96QB2OrBxgg011NC11zE4Mzhmnp47E4J 6j7cnbdPlsZb7xkTu+lAtuUGmp92XgMAJIQjEzOBdgNgVRcQ9h9JO+YV/nAMMSC80Ib5lM KCB+ZbQd3T09LMEdJNHv9OvbKhlS467jf3Egm219GxTUvvc8tf2wFOF/M4HDtCOizIqRaj +JbQIOovtRlmW1b6kF3ZkTngokEYzTHVXXIqRL48qe87bwtrbyJfUtbisAHa4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773410832; 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=XBH34siSZi2bUazc75q6vXcoUR8x9afRJDpx5Ptodjg=; b=fGbfY0X9F/6/bnB1/CJ9+tCI6w9B8uts7ESUhY+B/E4Ekw2iJto+Mm+kLidX/eezWzVR22 EVK995l0fG9wgrO8AKwqdRFvFdTXlcG5iasFs4eK+DW/pUs1MH6F4vvxiek6dHfOnPVgGe N29RgT/ZVU4JYYIEoaSJWvOsevNCpxuO+jnoXcSQBlWBYIJ/ZqoOsEGR1mZGl9JcTQ8fX4 7AGkW+NT+aG05xbhId2NPIxJoO1P7afUpriiW7aTdzdkGGuBkjHtJIxlOnbCW7neIFkm2X U6Wsi5z82y/KWJW3Q7d0gEAnwTaSqMsDO7a8Z0gaI6qGcT7LPgAHwOMGLkzFIQ== 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 4fXRBR2B3BznHt; Fri, 13 Mar 2026 14:07:11 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Pouria Mousavizadeh Tehrani Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f87ba4522ec9 - main - acpi_system76: Add support for battary charge thresholds Date: Fri, 13 Mar 2026 15:07:03 +0100 Message-ID: <11782617.X2hNYcAVgp@ravel> In-Reply-To: <69ae912d.3d042.77be2a85@gitrepo.freebsd.org> References: <69ae912d.3d042.77be2a85@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart11191702.1nsi24zuCt"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart11191702.1nsi24zuCt Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: Pouria Mousavizadeh Tehrani Date: Fri, 13 Mar 2026 15:07:03 +0100 Message-ID: <11782617.X2hNYcAVgp@ravel> In-Reply-To: <69ae912d.3d042.77be2a85@gitrepo.freebsd.org> References: <69ae912d.3d042.77be2a85@gitrepo.freebsd.org> MIME-Version: 1.0 Hi Pouria, > The branch main has been updated by pouria: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f87ba4522ec9e7b2227b8f20f3a4d7c6a129da1c > > commit f87ba4522ec9e7b2227b8f20f3a4d7c6a129da1c > Author: Pouria Mousavizadeh Tehrani > AuthorDate: 2026-03-07 18:33:43 +0000 > Commit: Pouria Mousavizadeh Tehrani > CommitDate: 2026-03-09 09:11:56 +0000 > > acpi_system76: Add support for battary charge thresholds > > Reviewed by: wulf > Differential Revision: https://reviews.freebsd.org/D55710 Could you change all occurrences of mis-spelled "battary" by "battery"? Thanks and regards. -- Olivier Certner --nextPart11191702.1nsi24zuCt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmm0GgcACgkQjKEwQJce Jif5eg/9Ex34OSWNJcrEnCnouXq5VuNbefa1S+Hi80nL39rZJK/Wy49nGC9/AUFg iCixY0UMJHSsXL6Uz9YZAMLLHXrF/hLb8RdKxgWvc3hrgALgM4wvoJIGklOlaYih KDXEENuyj5uQmrYBx8E6sUKZtdO1+OaZOcI1UpM+6WzF3hWF+0rxyCat7c7FF/Sp VExf/40nnIpQPJPGUsdkykq/cN5cBC4DuTIf/tKSjzkaI7mn/iumW1ngtZTxQibC jBJ+J0CalF/CSfa9Dn3SFGu62//nTOH46Wu0uebaA+3ps0lCHToAtn67OT4WGSph +Bkk4v/ov01QmUomD/Rzr+Z7iKEpp2hr5L2YVtzlF37fQBvCqGC6AnJN3/I0UWoj fd7fsb+m9VUwcEfGyLUJAKGW57f4YEbixBa2m+bbzccF/DPmizNYNGNhxNhp3CIL 2O0/5PkopePbexAc+kwqeLjb2JJE91Mj51WBukJNpX/7s/qpIUpeJAWKbjaGAaat 8Zv76ltg4DfaGqfDjKQI4TYWD+IDX3k/3oJ3HW0FWMqGoDcLMKtMG6OGu8sblKJF bX3bZ1QIA1Pdnuq/J1ZRz0rnG69Axw1GD2K5LcW9TlNqBIW7BEYNtTbY05A+yL7d fy9rUXl/ERUVVBwOv5KEI9snTD/cJp34eLguSmfc/cZfpiUIECY= =NWZA -----END PGP SIGNATURE----- --nextPart11191702.1nsi24zuCt-- From nobody Fri Mar 13 14:52:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXSC46Pv5z6VFGw for ; Fri, 13 Mar 2026 14:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXSC45L9wz3rdH for ; Fri, 13 Mar 2026 14:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773413568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGTTv4AkYDgoi3Y9zg3h8wyHRXjMQ1rArzMRJDi3WF4=; b=DDEN+eQVNjt//MNYiP0clxqQlhkzUJ2JwNDavSqAnxJOdSiYBK67j0E8NrBqQzHf037sPb aAKc5sh2PR90xcqPUrdLAc8FE+H6HSaDdfCbZQvJ6xNd/sXxrLqCAN7jem13fw3houhfe0 8WXNa+IAYCATmcpTrIz9yIwSWmgEAhQCP4vvVmYl4LQBzYSHcHRet9mo4mIxEFTLQZ8dJT EW4RwHnwzZpuH+ZaQABL97fLFn/D3Hm4kWOrPOYQl8tFD9fmRfgLVtyFaGvCrdijUgGvwL ui4b+r0nu+v9HpkzY7XruX15mgc5gDAJ8EcBYT9BnJKZJtkgO9WEzlDM/8E4bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773413568; a=rsa-sha256; cv=none; b=A4igqLJHnweN1akF9b5Jf/tNwTQp/s0NlTZRAYcaJRvJkUGTKbsP5x/oOjW42RL68ZnT3/ fXqupJ81jc92veNVe2YC0H3L1Z3E73BeI71/IhxaaN/SVQUiJzZUJARzCcIvO+aYnx3sR2 e6Ia0Qu2QoiRtDG2B+ZFJXKDU3GvohmhT9ZM6fIrgL7UYxw3lD7sJ83+ujS6iKVECdy4b0 Eqfzze6/xpufFZxqL7VBVTbxD16U78ji+ddANobuoVaq7wQQqYMHcnOark8LBbRZLgysdH gp3cl+fFrlMNv3z7qk5X70MLwtN6QwwumcR9ktq2pHlc5QPpQerpMsHFHnrlGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773413568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGTTv4AkYDgoi3Y9zg3h8wyHRXjMQ1rArzMRJDi3WF4=; b=d6fnzA2tONEe6mdzP4pn7x5sAE2YJlSWJcZOG/Vu+DFVeogsylVGHTDaBKzHgSfbB461Wm +JWPVWkmUGSYOuE2/uci6h+pwqpWT2CPzjiP++4ye91uQ9XClkqLZJ63MUGrlnUZPd0TY2 DT5qhnG5NStSLvq7w4yL6v6guTJMB+RB1i1I0WW9OuDRBbb2f0cDV+qAk7gGqQ10rhb4g6 Go2EwWgMCwTjvBFt7l4Xhqm5IGeZxTPGK6km+dtbhu8fIMI3mLiSmN5gbWxS5FK8bJXnBs c8s4ga1alEMD9pxXt3di3iSm7fW5SPSfYNDCFglltumLtOz/ldO9sIclFyogrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXSC44x04zclB for ; Fri, 13 Mar 2026 14:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a40e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 14:52:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Koshy Subject: git: e9f3af5b2844 - main - readelf: Use the gABI name for a dynamic tag value. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkoshy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9f3af5b28446ffcf55d8a8f7d59eb89ac3a3b4b Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 14:52:48 +0000 Message-Id: <69b424c0.3a40e.7898b23a@gitrepo.freebsd.org> The branch main has been updated by jkoshy: URL: https://cgit.FreeBSD.org/src/commit/?id=e9f3af5b28446ffcf55d8a8f7d59eb89ac3a3b4b commit e9f3af5b28446ffcf55d8a8f7d59eb89ac3a3b4b Author: Joseph Koshy AuthorDate: 2026-03-13 14:34:56 +0000 Commit: Joseph Koshy CommitDate: 2026-03-13 14:34:56 +0000 readelf: Use the gABI name for a dynamic tag value. --- contrib/elftoolchain/readelf/readelf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index daaa7bf62dff..43585459d82e 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -864,12 +864,12 @@ dt_type(unsigned int mach, unsigned int dtype) case DT_FLAGS: return "FLAGS"; case DT_PREINIT_ARRAY: return "PREINIT_ARRAY"; case DT_PREINIT_ARRAYSZ: return "PREINIT_ARRAYSZ"; - case DT_MAXPOSTAGS: return "MAXPOSTAGS"; case DT_SUNW_AUXILIARY: return "SUNW_AUXILIARY"; case DT_SUNW_RTLDINF: return "SUNW_RTLDINF"; case DT_SUNW_FILTER: return "SUNW_FILTER"; case DT_SUNW_CAP: return "SUNW_CAP"; case DT_SUNW_ASLR: return "SUNW_ASLR"; + case DT_SYMTAB_SHNDX: return "SYMTAB_SHNDX"; case DT_CHECKSUM: return "CHECKSUM"; case DT_PLTPADSZ: return "PLTPADSZ"; case DT_MOVEENT: return "MOVEENT"; From nobody Fri Mar 13 17:30:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXWj50Frtz6VSgV for ; Fri, 13 Mar 2026 17:30:33 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 4fXWj307Hpz3GMf for ; Fri, 13 Mar 2026 17:30:31 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4838c15e3cbso22261525e9.3 for ; Fri, 13 Mar 2026 10:30:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773423029; x=1774027829; h=to:references:message-id:content-transfer-encoding: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=IEy/wpXsHQHIKY5qJsPau/Zcd9aG07kYSCtr9mLE3x0=; b=DIDCqg8BRdx1xDQqlHgJKnSFstQJFs8ucQm5Wp0vXwv64PrUUX83wZGU6vFT7k7EAM 5FHOPEj9uMm7GcS4n7wD5eTe4nHVeU3bf527EX9LsF0FK9EGJ758iTQHdmk05yTWvckD AlyMNkLxcG7wgfav/rmAVXZapA8eyclz1n73X9jxPKndcLQnRapZUVfLwOqM0Bz8ZJPm qqirSsBCZK6OxTBS4X3yrRxVzDhJ6kqbvuArra5PbVaLAy/ouZs5jSx8nPa+djnlcvFS tdKb5FMGxqGFnWIgwoEzW4NGdfsxWnG6tBZvLcLe7J+JQ8cUVVK3qtYUDSJaL2bU1Zxa /zlA== X-Forwarded-Encrypted: i=1; AJvYcCVYWBir42pwNviG+mNJvBnNIvZjh0OXd3RmiL98Cl7d/H37rwrhRYSvUxe+hVtPkRZqz7Py20HCveOqX2JC672H+GXz@freebsd.org X-Gm-Message-State: AOJu0Ywv1mhFFaFIevllXxYcNKvmMa4yOb3L+PoYP0qnWzyoD+BYcF75 slfn5m95LOQ46ZyY1UA0vseAGQItvMoW/9zeZfSnXcTHC6oNjOLARgtiu7FMgLA4ppE= X-Gm-Gg: ATEYQzwN4dNr2HsWpSxCDpJ37VdR0DxG7iq3r5wdraW5NRcFb9M5fztxO9soTLYCu+z jSVnC7C81h3LI1sXvY/mHsgPuhhExhm4IgM4CphF3CWIppHum1Pk2PqI/rtDBweu666g8T5SAP+ xd9rwL6eZgUyN7lMAnSrwikotZ76es5lsd5oDTKbHaVZ//bHApZq2vUg3mMZdHtCp8TNXZid/3Z BhT9A+clozGgzMmjBbw1ZgexqBaza1TLC6TuGGpNCuPnRMAi8d+rs7qtPWNBV6pkVefRo55cqli Qu5Vv6pMej9s1PtJ0nefG6hrsnZzc0O6EUNidfjVGyej39HvIKWKM8BmXpWEGVD5Z0uqQv9QYI1 69ebWz1RrgIUCJkx6o6KsoRSG7mWkIMwjevpHswrqxcI6M2k5OuSpkoRsoAtKMH9+qT7TpRjdIV rjiWl4DAIUCZSnMB4sN4IBShr30vWNqw3b/M6j4Aa5EK2pIHNW/9AuCvTwRiMkyY6b X-Received: by 2002:a05:600c:1395:b0:485:2fc5:3a5 with SMTP id 5b1f17b1804b1-48556709d85mr66610805e9.26.1773423029029; Fri, 13 Mar 2026 10:30:29 -0700 (PDT) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48557c66583sm25823855e9.21.2026.03.13.10.30.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2026 10:30:28 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.400.21\)) Subject: Re: git: 858f53dd43ec - main - Makefile.inc1: Don't force LLVM_BINUTILS off for cross-tools From: Jessica Clarke In-Reply-To: Date: Fri, 13 Mar 2026 17:30:17 +0000 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ahmad Khalifa Content-Transfer-Encoding: quoted-printable Message-Id: <3C05C40C-2A62-474B-915B-8EB5511A869B@freebsd.org> References: <69a88413.1be02.24089406@gitrepo.freebsd.org> To: Ed Maste X-Mailer: Apple Mail (2.3864.400.21) X-Spamd-Result: default: False [-2.64 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.98)[-0.984]; NEURAL_HAM_LONG(-0.76)[-0.757]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEFALL_USER(0.00)[jrtc27]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_CC(0.00)[freebsd.org,gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.47:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.47:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4fXWj307Hpz3GMf X-Spamd-Bar: -- On 8 Mar 2026, at 21:56, Ahmad Khalifa = wrote: > On Wed Mar 4, 2026 at 9:12 PM +0200, Ed Maste wrote: >> The branch main has been updated by emaste: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D858f53dd43ecb84cf2597229e9dbda2f= 242d9dd6 >>=20 >> commit 858f53dd43ecb84cf2597229e9dbda2f242d9dd6 >> Author: Ed Maste >> AuthorDate: 2026-03-04 15:06:26 +0000 >> Commit: Ed Maste >> CommitDate: 2026-03-04 19:10:48 +0000 >>=20 >> Makefile.inc1: Don't force LLVM_BINUTILS off for cross-tools >>=20 >> Because of this setting we were still using ELF Tool Chain tools = for >> buildworld. The sets of binary utilities are largely equivalent = and >> this went unnoticed after commit 1cae7121c667 ("Enable = LLVM_BINUTILS >> by default"). >>=20 >> This was discovered recently because ELF Tool Chain objcopy = produces >> standalone debug files without phdrs and this caused an issue with = a >> 3rd party ELF parser [1]. Remove the forced setting so that we = use >> LLVM's binutils to build the system. >=20 > llvm-objcopy doesn't get built during cross-tools, which results in > cross builds not having objcopy. Not sure if just specifying > llvm-objcopy under cross-tools would fix it, haven't had the time to > check. >=20 > See https://github.com/freebsd/freebsd-src/actions/runs/22685122750 >=20 > Thanks. Ed, GitHub CI has been broken for over a week now and I=E2=80=99ve just hit = this locally. Can we please revert this commit unless you have a fix imminent? Jessica From nobody Fri Mar 13 17:51:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXX8x1f09z6VV2G for ; Fri, 13 Mar 2026 17:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXX8w37byz3L1r for ; Fri, 13 Mar 2026 17:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773424272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n8fkNdIPqncARcFj0N1ZSSiqd94UszARv7cp/ugEs+s=; b=wbnhPsfpZybwRfHTaocQWSEVB8gCUj9nKzgCkyjVKJ3s5RuXepWEj8/Q94H6UgWNHq/doo V5AMC4D/YfiioblGWGNNZsnr5vZbWWYAVaSMVnXVGjJRMAVvP4AV8q8H8FZHPMuG9NM/gt e7WnYCS8MUL48CHtL+o99j4tgp/Zpe9NghdNWLJpp6JHCxK/7BiaFB7mg/QU3sUCnOclId Tc9InzMqAyRSy7YKkABybf/B0hmvUduTZWQ8lX3xS2Y2Xgm+qrdE6LNUu44ztd39JtSlDT 1OKWm1/hvk/P+DHRNgp3YCmzlHULcjkT2JU41jV8gy4iB+mMysrNkt69aAAZrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773424272; a=rsa-sha256; cv=none; b=LRtIu6hYT0VsIw2N9ZhlL6aqBO0EFQ0aKpBXhkwQiGnrKLGVoVegnTdrp4GEzw+gxO4c5W HmXaxKhJavMS+PmL3qp5PdrsJHBJySRNEB+AkEqunU/pGChojuBC37qoTV1IV6lnQEPGO1 WCVCXVXGapaDRxqAFFiLRZ61is+RuCjN/FT1UvRKqJxWCWLHhEFjXmyrk1Be9yErz+ymcq vUL7rhDYQo/3penaT3MQpIEAJdm8e0Z+Z7eWyeoDbnVjOYyNC05xdq4YvQO44fjO4VdmO3 lebR+SQWWGIX3XUID7uHqNygugEEV5be0zmNS/gt7PdUnPLALxGADuf8lAYqUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773424272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n8fkNdIPqncARcFj0N1ZSSiqd94UszARv7cp/ugEs+s=; b=oIvPxV42ua9mKY1MhB/Jm+IqEverjbZ0AP7WmemzYMl5YPnfYX7SthUOKU99TCETFbF6IL fdvo7VBqZMXIj/pAWxTF+8pFBXWWHhTfbNPLSpUVwGkDeZLUHFVjj1TAcaX6II+IjXqxRm /NfnwjgtL65UWLXLdSf4CgYFPUl5jkTiR2YLJvLsTO8npcIknViJfqL351xXh5N+UArQI/ wsCY0/70fI30P0zLS5qwIPxoz2+mgE+rQxG7Urkua0WOgK43JnN02NMWuabwa02TgvPSFv gh9jNjIV+cnHZpcjsHZdxliX4HbjR+2qT631qHjpiYHA6MnhAUBAOH7zOChvEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXX8w2S6Zzj2g for ; Fri, 13 Mar 2026 17:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25925 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 17:51:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: a1fa1478f665 - main - ndp: fix late KASSERT in nd6_queue_timer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a1fa1478f665ceb85e4b58e4ed8234edef833d97 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 17:51:12 +0000 Message-Id: <69b44e90.25925.732bc5ff@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=a1fa1478f665ceb85e4b58e4ed8234edef833d97 commit a1fa1478f665ceb85e4b58e4ed8234edef833d97 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-13 12:41:04 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-13 17:47:37 +0000 ndp: fix late KASSERT in nd6_queue_timer Reviewed by: glebius Fixes: 7f3b46fe54f1 ("ndp: Add support for Gratuitous...") Differential Revision: https://reviews.freebsd.org/D55844 --- sys/netinet6/nd6_nbr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 25786ebc0ea1..5cc0553fe7c6 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1669,8 +1669,8 @@ nd6_queue_timer(void *arg) { struct nd_queue *ndq = arg; struct ifaddr *ifa = ndq->ndq_ifa; - struct ifnet *ifp = ifa->ifa_ifp; - struct in6_ifextra *ext = ifp->if_inet6; + struct ifnet *ifp; + struct in6_ifextra *ext; struct in6_addr daddr; struct epoch_tracker et; int delay, tlladdr; @@ -1678,6 +1678,8 @@ nd6_queue_timer(void *arg) KASSERT(ifa != NULL, ("ND6 queue entry %p with no address", ndq)); + ifp = ifa->ifa_ifp; + ext = ifp->if_inet6; CURVNET_SET(ifp->if_vnet); NET_EPOCH_ENTER(et); From nobody Fri Mar 13 18:12:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXXd61rhtz6VWSb for ; Fri, 13 Mar 2026 18:12: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXXd570F0z3Mxw for ; Fri, 13 Mar 2026 18:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773425530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iQ+pZJsi0c2rQtd2J4g4MMJiVt8UQ2WfoMnSkR9pg1s=; b=KLXG2wKiSKhiYhoE3y34Gxh5zR3xY/Zvii3bzduW4tuOcS6/cCLH/lSKOZtHB59qpPO0hT pERHOH+w4wZRLb0GEJdqMttvQCCL5QrBVMyLFJvVjrEgnBAacRW6vOyI6rjV0vQwbBvgoM a1w9Li3kgOU6CntKTaXOdKLpwLD0Dq/PfQVXRRNtsmQ4i6gfRbatjFxb7Dh+q+saH8mZgD /ljiQoPwJTQZFXp/M8kBE+ql0gWR2s+SfR11AO2D5K4FbvIeuBylTjjTLTUJbdc/Ux+mrh 5GyV4E1cOeMUChFgT89YsVXdjo4XfCLpy/VsTvjpELMOcme+BOhQJFHydDupiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773425530; a=rsa-sha256; cv=none; b=m3fUH1ZhmhOWfVvVVD30NBVRjFRBI+MhXnX/1R988KPRCVY4aSZBFtEdNTy4ASmhPOMiSw 5B09cujOo289dd6N3aJThLtD+vW7vj+QkSqAsSQcvv1v4Vxa4XXLY+ooKVpcbPBtTCpNEn NOz6Vp+mahHoweLqri9r/3KNRvuH6ssCAQZShpNxTULv7V2yaaV4MWgZv/hZgsfrPuG10P r3HDSzF6ko5wm8la3hTp70T7BFgRmKJrWqhXwmslX1LWu4Q/lotH/4fO/jRFEqB77xompQ rW2ichdLxJqOHSvEZPcBgC9V4/ryM4MXlaerAXVcwmYaDkoO0sgV/RJ9h6qMYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773425530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iQ+pZJsi0c2rQtd2J4g4MMJiVt8UQ2WfoMnSkR9pg1s=; b=G4RGDA1zP08/pySSvHATIz4vMxvihalwahLO9q5Plm17LTIasAJ3ndH4aMhwUDhSgm77o2 lLRqY+ag9zb0YHNppragN75bgBMBFHikrZk1ExXE/wwTDzlxg5D92W+iYr1s1ghLoYbbpw F00ihMw7DJbqlugHxQ7pIaL8en4uRqR+ERfTzFZEGYRSeZT6yxYQ+SeKJjtu7hDfnVn7d6 6EWGSgVa7RCMMW7gWYy7YBgLdxTDlx4824iadsnm0OFhM7zuzwmATDVr85V2A6gN9SgtCc 9Ep5cAp15CS+8kABqdDIWeVm7QpObFMowQSRlM7BzukOJ1l5nUiYlTYktcHAlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXXd56Q85zjhn for ; Fri, 13 Mar 2026 18:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 18:12:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kousuke Kannagi Subject: git: fa341366b1de - main - committers-ports.dot: Add new committer (mce) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa341366b1de86ed97e909bfd10241d590212fe2 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 18:12:04 +0000 Message-Id: <69b45374.264e5.2860e7b8@gitrepo.freebsd.org> The branch main has been updated by mce: URL: https://cgit.FreeBSD.org/src/commit/?id=fa341366b1de86ed97e909bfd10241d590212fe2 commit fa341366b1de86ed97e909bfd10241d590212fe2 Author: Kousuke Kannagi AuthorDate: 2026-03-13 18:04:12 +0000 Commit: Kousuke Kannagi CommitDate: 2026-03-13 18:04:12 +0000 committers-ports.dot: Add new committer (mce) Update Mentor and Mentee Information. Reviewed by: osa, fluffy (mentors) Approved by: fluffy (mentor) Differential Revision: https://reviews.freebsd.org/D55839 --- share/misc/committers-ports.dot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 84a9395fb216..416695aac3b6 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -244,6 +244,7 @@ marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] martymac [label="Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"] mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] matthew [label="Matthew Seaman\nmatthew@FreeBSD.org\n2012/02/07"] +mce [label="Kousuke Kannagi\nmce@FreeBSD.org\n2026/02/18"] meta [label="Koichiro Iwao\nmeta@FreeBSD.org\n2018/03/19"] mfechner [label="Matthias Fechner\nmfechner@FreeBSD.org\n2018/03/01"] michaelo [label="Michael Osipov\nmichaelo@FreeBSD.org\n2023/10/16"] @@ -493,6 +494,7 @@ flo -> jbeich flo -> grembo flo -> tiga +fluffy -> mce fluffy -> vishwin flz -> garga @@ -701,6 +703,7 @@ obrien -> gerald olivier -> pizzamig +osa -> mce osa -> nxjoseph osa -> otis osa -> vg From nobody Fri Mar 13 18:54:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXYZ31J0jz6VZvT for ; Fri, 13 Mar 2026 18:54: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXYZ26PKwz3Snf for ; Fri, 13 Mar 2026 18:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773428074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yhc/L/1NbBfMwvYrhJ4PQUiRNckRP9VaWGTAPYhc5h0=; b=hqHXLmk6MQ8m+vDZc2JK+PqNnrylibRtbDcA1i4ZrVXU+iyx5xdICf9nN/49r0fcvLY0RG 65G4L7FrHxF5urw914eTi72w/A9OhHDwchbfg5Ig2M9B85T2VCk/BxU/Z9+zn0+eNifGIl qD80ah3XrUGWTDVpq7PyDSVoSkAUoiit+/jfGLD6zY2a7vx6IoMBOoiBZKt/tBZAV8u7o0 OuV1Hmpr0RVD9ue2XlAFX5WVdyQpM2T+2fVqZq2RFwmVWhHZyCiDzkdXsrJ9z3CMAgVYqS tWHpPjjBOHHPVQ9hqqJoH11we7YjKTI+v2+70jzH0ucdduNcivYDfB1hrgdvNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773428074; a=rsa-sha256; cv=none; b=a2BbubnLFqExFyzO4sCCDjaKyAPp524sJsYv0peaAsB7NKyTIai4ADtIayUNWgu9hWsd+M vv26H4THC+VI9j9kBsvm5HdrvA2kfIHAzw0+EqJgX+pUkBadA/zp36ONbQ8Q0I2kiX5qAM Gt2wkG7A4yZl7ekZkMKZCDmB0H0PErcyUUhb29VSicsCJn1mptOGkqAkNhQE0+4qjU+JY/ g3mJrR9Hk2T21ucCxNVwhytSa0szHYGv+53hqmuD3x5BCCnc/JEoP/nR8qtwI9HY0eL3T4 TdvYSdcOBAmo+0WEGYrcj3orl/ttG6ogEXNviQqawuefYHrVDI/ZHifEf/zoIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773428074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yhc/L/1NbBfMwvYrhJ4PQUiRNckRP9VaWGTAPYhc5h0=; b=DIMJC41XqBvvzxTcn2wkKd2HVyzCQ8/ANXmVNIzW/1XI2cTG9CrWmVLjQfuJ6+fHruOeP+ bWNaeA0O2EpqXih4zIujSxoUtccYVrN9/fDk01dPFiS06ay5q2vFSGINrW3iQhy9VfewOL nqB3FNLFshurP+JD8CXl4+b3nTRJ5XqFcSSJu4UJyD8G0YqWX/U7+dGXRe03vGgTTu+iew YaxmeTymY3seQczNetm/RKbY01MALEJwvBdY2FFamAx+BQrbfvOrRLKZRILUMHakgvcySi S8+OiX5vHmB5a3D94nH8W8esxyieMDJ7VkSJrQzwAYTZIw9NklVd211J+DIdvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXYZ25MLrzlP4 for ; Fri, 13 Mar 2026 18:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 323fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 18:54:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 703901bce15b - main - i6300esbwd: Set error appropriately on event List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 703901bce15bdd746cb20ab3fc88f5859924cf76 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 18:54:34 +0000 Message-Id: <69b45d6a.323fe.315f786c@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=703901bce15bdd746cb20ab3fc88f5859924cf76 commit 703901bce15bdd746cb20ab3fc88f5859924cf76 Author: Justin Hibbits AuthorDate: 2026-03-13 18:49:17 +0000 Commit: Justin Hibbits CommitDate: 2026-03-13 18:49:17 +0000 i6300esbwd: Set error appropriately on event Per the watchdog driver contract, if the driver successfully arms the watchdog it must set error to 0, and if it's unable to arm the watchdog it must leave error alone. Sponsored by: Hewlett Packard Enterprise --- sys/dev/ichwd/i6300esbwd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ichwd/i6300esbwd.c b/sys/dev/ichwd/i6300esbwd.c index 03d504a350aa..e810dcd888c4 100644 --- a/sys/dev/ichwd/i6300esbwd.c +++ b/sys/dev/ichwd/i6300esbwd.c @@ -112,7 +112,6 @@ i6300esbwd_event(void *arg, unsigned int cmd, int *error) cmd &= WD_INTERVAL; if (cmd != 0 && (cmd < WD_TO_1MS || (cmd - WD_TO_1MS) >= WDT_PRELOAD_BIT)) { - *error = EINVAL; return; } timeout = 1 << (cmd - WD_TO_1MS); @@ -148,6 +147,8 @@ i6300esbwd_event(void *arg, unsigned int cmd, int *error) regval = i6300esbwd_lock_read(sc); sc->locked = regval & WDT_LOCK; } + /* Set error to 0 to indicate we did something. */ + *error = 0; } static int From nobody Fri Mar 13 19:25:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXZFQ2fPsz6VclX for ; Fri, 13 Mar 2026 19:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXZFQ0ZkNz3WM7 for ; Fri, 13 Mar 2026 19:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773429914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZbGnob4vPepAHJ8tw82/6ESOpufHdeKwvHefNVmL6WU=; b=SeEAoIsyeBeGHlN4A8SQy4wr/zrYHuETjb/heQEq+NGaFp85PbONZo9vA4jdnn9XQ4bELx yXk2ICJ7osAEKPhBahQf1wG3cZRF32gFYaSbyZfJsa0vZSeooEd+7ADCIHia3pvJ/PUeI5 83ev6+lXm79SDm3Um0Doq0BOfeKZhLj3qeuWmC50PFu9NSCoFu3No2pRMrmJjr5M6fLJ3I 2RahjwcXU5hPBSLb595Rhowfv/oT1ouAuea6mTu+DaNP9uMH0rs1rWugdetd9073+TWJ34 nXparih+3qYTbxzBUfCFqy9U+KBYbdDxieazz5d9JDdkX8DHVSb/fWky0KjU8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773429914; a=rsa-sha256; cv=none; b=qIZv5kMLRTCnLV2mdMqIyfgTSR5ADqvbwY6qCaLheXKq+HPCnbmsFkCstF1XDEcD6Is3bd JwT9+RWQ/0z8H+KokkKb8/6CiN5r9nUBHtO8HjkSX/R7HoEoF0tHeUr2p1RSKmEiVo3uiw AsrL0PF/ra2V87ybwLuV/tWFRc73ZsuoFE8Pibect4mhJYeiiDFlQp5KyKVhqxA6WpWm5W rghOA6TDcaQGA9vK1Tv6RPdcz2U0BKhHT/pjopq7ttDuX4eCLvka3IQEu1FaZAQYuyE7fw ExfCB7KUV1BDF6CKlUQV6fqbJL/K+rE0Z1vL04YGXWYsv5PljMUVeXFMiX+x0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773429914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZbGnob4vPepAHJ8tw82/6ESOpufHdeKwvHefNVmL6WU=; b=uZuRt317ArOKF/moEd3Ssfd3CkEdDGGfax+470DjRMiP+vD3RyXap8j0M//tAalYSaxgM1 FEizCwebVTBF1PeqNn+tOblGD72gy+qPRNxbRX30FOWTHCvlwsnsH+CKIr7C9WXJijLJ51 JycHMxHTBlAHdHkHKbwafv6Vz3UZj5CXSO8E0A/KeSNom7C79jSxfr29wbvU0fcjTTdQ/H TZNQniIZNl4F0c5TYzojoz05xYTL8u8T5NYV19SMwG+mJwPYI6o5CFzIIeANiGBhwGhcKn Mb0YtX0xK1KSr7KzvACp/NupjpYLAJFVMRfFS5CmwMMI/UMjcjMzr2C3g1ZkqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXZFP725Qzm3L for ; Fri, 13 Mar 2026 19:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37979 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 19:25:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c70f382a8b39 - main - rtld-elf: Remove stray _exit prototype for aarch64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c70f382a8b3907069589954433fe091687f15373 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 19:25:08 +0000 Message-Id: <69b46494.37979.66d145f1@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c70f382a8b3907069589954433fe091687f15373 commit c70f382a8b3907069589954433fe091687f15373 Author: Jessica Clarke AuthorDate: 2026-03-13 19:25:04 +0000 Commit: Jessica Clarke CommitDate: 2026-03-13 19:25:04 +0000 rtld-elf: Remove stray _exit prototype for aarch64 It's not clear why this is here. It's existed since the very first version of rtld-elf for aarch64 but has never been used, and anything actually using exit or _exit should be using rtld_libc.h's #define that aliases them to __sys_exit. Fixes: 047c6e3ae6ab ("Add the arm64 code to the runtime linker. It's not able to be built as we still need libc_pic for a few things, but this is expected to be ready soon.") --- libexec/rtld-elf/aarch64/reloc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index 85f7c1b4022a..96ee13048d81 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -44,8 +44,6 @@ void *_rtld_tlsdesc_static(void *); void *_rtld_tlsdesc_undef(void *); void *_rtld_tlsdesc_dynamic(void *); -void _exit(int); - bool arch_digest_dynamic(struct Struct_Obj_Entry *obj, const Elf_Dyn *dynp) { From nobody Fri Mar 13 20:27:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXbdq2K8lz6VjDy for ; Fri, 13 Mar 2026 20:27: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXbdq01fhz3fRh for ; Fri, 13 Mar 2026 20:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773433679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUp3+wbUp2R2kHurZkROVD8LzblGrxyHaoSpahKH9rY=; b=ybo8wvaD6TbW4FtDA3u2lgnYDu9JB03P5M64TMSy+R7EVGvw4WQ5fKQmPAg6hLj7aD/QkX 4bDvA2tW8DvXSqmBpnqfp5IsGVuNdkk7SF1l+pW5SFIB74lZ2mV7/G025hwLUQha8ILjwb v2Cbjwu4toPRzqmDiNlSJ95DKURgz9ZBCJi4iEWKjk4wyED4QTfiM2iBdoxVhIfYfmCMN5 ExAdKvLUjXxOuiheoYGYJwcbndjicAFOQc5v8IJTx2aQmGJKRDztkolR2yzE3U7A3ID7eY EmpxfqklN0MBcoR352Z/SPVDgMg0lAPdHgy3tE3yiMzSpzij52LjJw0VWDV4bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773433679; a=rsa-sha256; cv=none; b=a/S0rC7p6HVcrW6UsdpfJLwHBUwQ6uOD2Gp1o7Do1q+sKN5oUGAp6fbMHTTgto4ZY5ND2q 2mFFIHwfwf14fTs/WfEDVcc/NEKDqQ6HycWw2uEj3SPU/ij40L2SsTVvM+0aIprekr0KGs gRqatB0Q5N5ouGp5BXB8icgjSY8OdKM/KF+xitgGC6sU/lZQRjfsCkQmSSGuewX/m4BmAt DzuZFw1ixZDJnvaGavp+ItWJ1Zv0Sdph86zdvoQfgEyFZBJ8g398txzBZV6NXe390MIFVl QVBI0phPerAO16jUJNNgM29NbAHT78tm6SMqEvOyaJ+TAeoaVZY3ZocA9W57Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773433679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUp3+wbUp2R2kHurZkROVD8LzblGrxyHaoSpahKH9rY=; b=YVmbFnXgBgNCdxUps64JYi0mxf8RI/H6X5L8meu+AmtkSExdwZhC6J1uj36EqwdAF9qRqA BPtHbn/EbhHUSjVMxUd4wYvKY8YlwtDVwad0g25TGI9Ow+m4gpVl/70TQmWAYldDPN8DR6 2h7icugMiD0LrBc/70C1eXGbpY5E9legwBcIs6UyU+3t88ROWLJGz3kzt9xHz11cR5yKhT M9CKbgl0QH1kjqDDUi6InusHLLbj5onkufeEuWpUxhCkR8lispIFKJHuERNlVFD0Ud947T OfP348i6+bONvAraO5J9LhVmPZzM8+uOy48aVmEpbgWXNIxfUY9HdI1VKc1LvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXbdp6SJCzndR for ; Fri, 13 Mar 2026 20:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c754 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 20:27:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 78c4f821f43d - main - jail: fix crash with startup commands on a jail without name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78c4f821f43d530ba1f2a6308a64a8483208ebe3 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 20:27:53 +0000 Message-Id: <69b47349.3c754.4f134b49@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=78c4f821f43d530ba1f2a6308a64a8483208ebe3 commit 78c4f821f43d530ba1f2a6308a64a8483208ebe3 Author: Gleb Smirnoff AuthorDate: 2026-03-13 20:21:26 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-13 20:27:39 +0000 jail: fix crash with startup commands on a jail without name Jail name is optional, thus don't try setenv(NULL). Fixes: d8f021add40c321c4578da55dae52fb93c7ccb5f --- usr.sbin/jail/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c index 9da4fe51673a..8a1d281eff4f 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -814,8 +814,8 @@ run_command(struct cfjail *j) if (!injail) { if (string_param(j->intparams[KP_JID])) setenv("JID", string_param(j->intparams[KP_JID]), 1); - setenv("JNAME", string_param(j->intparams[KP_NAME]), 1); - + if (string_param(j->intparams[KP_NAME])) + setenv("JNAME", string_param(j->intparams[KP_NAME]), 1); path = string_param(j->intparams[KP_PATH]); setenv("JPATH", path ? path : "", 1); } From nobody Fri Mar 13 20:30:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXbhR6CT6z6VjSd for ; Fri, 13 Mar 2026 20:30: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXbhR3yTwz3fck for ; Fri, 13 Mar 2026 20:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773433815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzPuyPuT/fM3Y2JVUtMn3aVAYWdEoisIjHcB52d0wsI=; b=rUy+03F0NyK7GWihLVovfbawodtqZv+KqImLyR1hhsfHCD39enjCcxl14A0fRFApewTmkR kdozSsYFdTKlJR75WmxoUXKJBdOIzoDEBexK+6ODV6ixwXcnNx6DR9lOi6W31pr0Zk7AN7 KHH4XdoV9AFE7Dp0NR8ZR3r8VYNC+rST88L7ubnvEBAlfOp0IUScWBzZJXif9FAvTztdL3 /SzvzgCXx8gTr2j5HO63vhChG2yFvKBwR4FVvc8eqv+26KuaPHhmzBUnL4vSCP8H2a9znP xz72ZnwXL0LjRAT/mH/oe3LfG9yyDlv3yuyKG55vpBfUjCF8hHmI2WSHpdz3rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773433815; a=rsa-sha256; cv=none; b=m8lnJH0cjvVCPsBHbLr1ZXBw0T+zJye6D4tc7Chyjhnwk8jP/aLqU+dGhn+h1OFr7023/0 CIDg3TzfwkU78IfmGkxuc1bGi17UGWGs2BwSYkjGxwDjQvx4xZZR816RNnFUa3liEGPpvT zbr2Y/jOtOqlEwPAuesfWTT/T/xV8A6dePGGCFXhO/rKHeDGtNRGx2t+ev9TfiEfUK5oqr QfttbmHT41fIPPQBynaZPhKmabGkM5w57D6qmxZ3VbAZGjkg/AJgXg7r+FTD7lZz8LX0jx IXilS0rpaHfnn5ylUnJ9oAiHc7Nz5so/TpZfexleLl8WqwQ1wAqV7rG6EE2HMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773433815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzPuyPuT/fM3Y2JVUtMn3aVAYWdEoisIjHcB52d0wsI=; b=Lz0sn0mQbuvW7GHWDtR7Rl/BcrfZ875bes4nGIh7Z1+fzJpwQ3gNvCV2W/GVkumTDrZWqd hzRG8jAfwaYpK9Qlp9Q+VhkeOyqgnSRaVT+V/WCnD22ebJI4w+NT2VYwZSnif1rDnMoUMo r+twinXdgfkR7wEUhpVPo4rkVTb2JVwoqZeWUMe7CbfMkqn5TcLRftI91zITjn4mwCOAwp zLF3QeU5HDQr+FBfVjb/Yds0nbLdWAV/w+Yt9PGUhjhXMKVfAHZVeEwFcQr/TLhiULHyya 7WHVn/KrOEKnxi+LFaeE5PKdxF66SoCamii+g1178ug7siPdveXIGI9NWpT5TQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXbhR2PpGznfv for ; Fri, 13 Mar 2026 20:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e529 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 20:30:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 77e0c9c3414c - main - inpcb: in in_pcbbind() use bool for anonport List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77e0c9c3414cbe30eb7f376bf9c8531ca0f097ff Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 20:30:15 +0000 Message-Id: <69b473d7.3e529.708ed5c3@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=77e0c9c3414cbe30eb7f376bf9c8531ca0f097ff commit 77e0c9c3414cbe30eb7f376bf9c8531ca0f097ff Author: Gleb Smirnoff AuthorDate: 2026-03-05 20:47:51 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-13 20:29:50 +0000 inpcb: in in_pcbbind() use bool for anonport --- sys/netinet/in_pcb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 96c8d3c73b0e..e375f0edcc7e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -715,7 +715,8 @@ int in_pcbbind(struct inpcb *inp, struct sockaddr_in *sin, int flags, struct ucred *cred) { - int anonport, error; + int error; + bool anonport; KASSERT(sin == NULL || sin->sin_family == AF_INET, ("%s: invalid address family for %p", __func__, sin)); From nobody Fri Mar 13 20:30:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXbhS4c1Zz6VjLP for ; Fri, 13 Mar 2026 20:30: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXbhS2nngz3fYh for ; Fri, 13 Mar 2026 20:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773433816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9+FJtnpwRj/q2uiOdLP+MURj1+RpAbkrS75OYNILwI=; b=lLfamz9aKVGHuEz2uN1lPs+4QkTmL17bJTb4BCIjSwL0hXSaE6loWThl0BvS87xsgyYGNO 8euyir6LZuyAIWaW+bzvBj0t87XnVD8tn52QibuEBgKU8LOn4ww1qChS20YRlWZupHDWH3 5KafHwODXT6E1KyfOMfySKHFGCr9COReODRSRuDGW9AyFGMftG6tMO2UZYEa9LuOOGcfMz wAXPgu4pm13FBZ4mCDZuZBP2QUSdm+Dy8O+ERcMpAfK4co6hIjdDRp2uCAdzKDCOykbE4A 8Fb9anvVLu6iX+8Rwsgy+IEKnbckStfP6CYNF0vx+nM7AnYijAbdyKJmJXB25A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773433816; a=rsa-sha256; cv=none; b=i5TLwBuKD+2nlqqRFnGkt0PuwJBYqV+1mG6zyVB8+of7hgHFaMc9Zfp0yB0Au83LMIlZMa SuulBNRzXcMCwc9wlKN+AMNcZ1lsurz5mOdrVfw2vOPe7RJ4wArwz/oNiScmD6liqYY0aS rlhSFx+8J44IcQEfex6yVrsq6kX5eBVVxH4POx/ZcqhUse37d9utMOJcQcSsoMZte1jolq sUO/oDQSjpqBWIRJd+wDljtSwB1RlGRzrWlWkWKqxB3Ct3TYLWig7N95ypHiHsXc9xK+zv Rz/0GTofsoBnFAsKWFDAqjZgAP81M/fbVwBh/wFZxEEb6TPx36bIiT4EEz0z2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773433816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c9+FJtnpwRj/q2uiOdLP+MURj1+RpAbkrS75OYNILwI=; b=qYYlgCoMK5APoX/asP2n+ITvEmODm3qznydfVrKkDHRv1nIxVxV5G2bAbimyuSV/+JP2Uq rS85r6pfuUzhWOC79GzT1/PRo8G/KQtq/G/SQJSrAgnIi+Uo3WAo0/uovaoS7Vcv6ikBx1 9gAIg8OX+UFwYigjjfyi9UAbHNhjL0qrimPJfxWONsSxnoNAnWO7Z+r8Ckdx8yoiZm3Qnq vkIGmeX1sZF1ShqE+yk70GAjDLNc+3utPMql9DnHGLAH7JGedgS/4ud31bCaODZUjZRGMM oJyLi1MH/MRiUILIj8M/M5C8raJx873Z77MgWh2ynq6zYbdTushTrRj7HrrCew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXbhS29gpznVc for ; Fri, 13 Mar 2026 20:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e903 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 20:30:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 512e189a9641 - main - inpcb: remove a completely outdated comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 512e189a96415c3471399581239c243d1032e07a Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 20:30:16 +0000 Message-Id: <69b473d8.3e903.dc6bed8@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=512e189a96415c3471399581239c243d1032e07a commit 512e189a96415c3471399581239c243d1032e07a Author: Gleb Smirnoff AuthorDate: 2026-03-11 03:09:22 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-13 20:30:05 +0000 inpcb: remove a completely outdated comment --- sys/netinet6/in6_pcb.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index d503165979c8..6bea94160eb2 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -357,17 +357,6 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, int flags, return (0); } -/* - * Transform old in6_pcbconnect() into an inner subroutine for new - * in6_pcbconnect(): Do some validity-checking on the remote - * address (in mbuf 'nam') and then determine local host address - * (i.e., which interface) to use to access that remote host. - * - * This preserves definition of in6_pcbconnect(), while supporting a - * slightly different version for T/TCP. (This is more than - * a bit of a kludge, but cleaning up the internal interfaces would - * have forced minor changes in every protocol). - */ static int in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, struct in6_addr *plocal_addr6, bool sas_required) From nobody Fri Mar 13 20:48:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXc5Y2bd7z6Vknv for ; Fri, 13 Mar 2026 20:48: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXc5Y1mtGz3hsg for ; Fri, 13 Mar 2026 20:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773434913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ZMMtF3TQV5u1KxNoechbOC01uKEcxy2o74gjyZSf8I=; b=G6TMc55ety14spGMiasmzjY8CoOcRokiqVmqsUY8DFEPHVXzIay1K8u2QpTnLnCYMbJv6r keUZgaURMdpkZO44DozYjHZv2+inY1e2YZA/q7aZGFqfwbciVWBj8M4iyOKbfFTxvbkcES aE2P7/bEHIzurhuw1Gtv8eUOKRzdhWyWMj9sTjL7uniR9Kp2eUFVXHBHyWcHkWbnE6mZmE 4mOPd6KBGE7bs6GmR+ocC16u0ReuQbzRASoP+EELBUQPhJ7sDhzp6pD0It0DDJuh3RzTEw fq8IP8Jy5sLNOzbFF2w4RYhPncWr9mYJcbVLzjPStHdNguodfXjirT4BHpE/Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773434913; a=rsa-sha256; cv=none; b=HPqXxe6o6W8QntmWwTIexoUjrjdmRfWQHGCW8H3/EUIjPD52DMVuKs0Xj34D5HudybtYB6 8IDOF1+fAx3BhWSuYlLUyq8JBQbofcppnsGZMYGPjUeHbczO5GmtpvSxQPWRUiTRMqJfDV 0bQdKus4Wml/qtvLAHQxIoT1b1g0SHRB2lWUlUfk4tr1ienyhYoUBxuz1CXTDRKsYHbdyU Qe8jNISuX4wvxtBKdHQ7AMO3812UZKJ8n8WVHE+CJgp34a8TLd3iQHSdQrSLK1MikP86Le cSKPFqsLulueUojJ1DnWnrdJ7/DdNM5odkk/siTPqmVGddExEECQ7QFJxKkhVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773434913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ZMMtF3TQV5u1KxNoechbOC01uKEcxy2o74gjyZSf8I=; b=fea+fTbBsEuHJKztZGjBnwlZ+OxZchuwbTn/5TP1QH7iShTniej6xCq7g0d77hH1FsfmGI qgvp/ZSXT79Y9haWSl30+4HV8WRY7uifHxU+pOQ+KfHCEK6cGyidTvGdMh3rgaTRs6jg6S EG6EhuYbbQSPeDQf+LRQjFRWdk+053TT9nyNgfpqpQ0GF6VBwjhvxqF+am50NhNo3WDbju vyfDBrPVY6ggf5fLZKYG0PUc9N1NHCgYQoZOwHlngJBGjD8QJpxQF1UWcq1tzBTQ1sA3FZ K/MLSiyhNL3GAUGEzf0rlYTGTX6Xk+uwcDZCdrzJIq6ci1ycgJLPw1bqneFMDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXc5Y1JHszpCX for ; Fri, 13 Mar 2026 20:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e92e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 20:48:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4a8055914d6a - main - Revert "Makefile.inc1: Don't force LLVM_BINUTILS off for cross-tools" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a8055914d6a60714f27379cbff8b2e9198157f6 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 20:48:28 +0000 Message-Id: <69b4781c.3e92e.665bf041@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4a8055914d6a60714f27379cbff8b2e9198157f6 commit 4a8055914d6a60714f27379cbff8b2e9198157f6 Author: Ed Maste AuthorDate: 2026-03-13 20:45:30 +0000 Commit: Ed Maste CommitDate: 2026-03-13 20:47:33 +0000 Revert "Makefile.inc1: Don't force LLVM_BINUTILS off for cross-tools" This reverts commit 858f53dd43ecb84cf2597229e9dbda2f242d9dd6. It is not clear to me why building from Linux or MacOS fails to build the toolchain, so reintroduce the long-standing slightly-broken toolchain until that can be determined. Reported by: vexeduxr, jrtc27 --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 8a1958902db5..c4696abae8cd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -808,6 +808,7 @@ XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ MK_CLANG=${MK_CLANG_BOOTSTRAP} \ MK_LLDB=no \ + MK_LLVM_BINUTILS=no \ MK_TESTS=no # kernel-tools stage From nobody Fri Mar 13 21:25:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXcwh2Tfzz6VnVn for ; Fri, 13 Mar 2026 21:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXcwh0YQvz3mv7 for ; Fri, 13 Mar 2026 21:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773437156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmvfsQrlAL7LMSZTN3+FcAPMd+t4mf6tStMRILDWr0w=; b=HOyYX9gRhrelm0hgxW5f5VGMAE1Qr+Ki7jBqvYB3xDAstk9LjLCxdcEEzecxavn/8r79+5 rUy4skNaOzz70KixzRCtAREISiRjhBKRI5nAIGv8BpjuvizqVKw2cqSlgHxeTj+5W67iQo OlfKWweBQX+yfknfHn/ynI5yYooab2lcmWGfTEwWa8M+lzqLS5kiRkJPXx9qRxqMpsIZdW OtsFi8u5M5K5FBzrY80l66b1/rwX2bkCkrrItkSj3gSVnqX0iIPln+Rylj9MqV5/ESca61 voQst4gSHip/tYM1TqGY/BhWnz/TiVp6031miPBe7ZK/G69KOXl5niwIyPriZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773437156; a=rsa-sha256; cv=none; b=hvM6tv11ew/3bCATlJtTcykEugj+DeXoxiveCUytzocM2YmF/BnOQrxlqLehB7wLBTZrAX G8b/VHs92H+mmB2HeP+qI9Gutz7KfC8bTu/unAbKquqzhwUDiZyvk8X/YFozEfr48EWkjg u/km6RsqiAUc1+pRlw4CeAPl5ZieQTeDphdk92wzAo2isWq3VV/XTJgoC15G7ttGsGip9k Y6ttIiosJ/x7jWBfSn0fWW67+c9ioyMJqZj9YeEm6efl8gJ7VWNmxdbVQd0ygiTV9RQMl/ wi34tmRJVkdHvbi+HjmS8blHSaJXCvVfBsEZASAhJ1RUFMENGKeVlVCRlAwSdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773437156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmvfsQrlAL7LMSZTN3+FcAPMd+t4mf6tStMRILDWr0w=; b=QkRdRelNok+AjToSX/gOUC6MRdGUXHcYxoaxn6P+m41jfAY0rtGUBjLsaZdSc3uspPpSQ3 +Mf75NpfsYXw2anJbloo6CA6kiwZyNi3mx0CqBmLyHzWxj6w4oGPfecIoAMqfp/4ONikyG BYlQsGAWnn4+9+S+wyILXQu0AM/k7s8V77jrkNAbumyAezWtYx4wHQR9usKKVp64d2geQS OJraNG2EBbMEq3O3GL1z1qeuBiYifjMsNjzUgq33G9ObL2DkN1uiu+ebejkPFXlXr4TtLT StjdvDTag38RzbpcFOjVCx9CrBTPLoGzlH2Yc8YYJCrtJu8hfmAr2ck9wnzt2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXcwg6xkXzq1n for ; Fri, 13 Mar 2026 21:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43b82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 21:25:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 277830b4d3ae - main - EC2: Don't use unicode in boot loader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 277830b4d3ae9999c80bf915b5491850e91c6516 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 21:25:50 +0000 Message-Id: <69b480de.43b82.e1c0e5d@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=277830b4d3ae9999c80bf915b5491850e91c6516 commit 277830b4d3ae9999c80bf915b5491850e91c6516 Author: Colin Percival AuthorDate: 2026-03-13 20:45:05 +0000 Commit: Colin Percival CommitDate: 2026-03-13 21:25:46 +0000 EC2: Don't use unicode in boot loader The boot loader menu is disabled by default in EC2, but if it is ever turned on, the default (unicode) output breaks EC2's web interface to the serial console. Set loader_menu_frame="ascii" instead. MFC after: 3 days Sponsored by: Amazon --- release/tools/ec2.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 744ac24a3f0f..62d7d1957aaf 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -41,9 +41,11 @@ ec2_common() { metalog_add_data ./boot.config # Booting quickly is more important than giving users a chance to - # access the boot loader via the serial port. + # access the boot loader via the serial port; but if users turn the + # boot loader back on, avoid ASCII since it breaks the EC2 web console. echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf + echo 'loader_menu_frame="ascii"' >> ${DESTDIR}/boot/loader.conf # The EFI RNG on Graviton 2 is particularly slow if we ask for the # default 2048 bytes of entropy; ask for 64 bytes instead. From nobody Fri Mar 13 22:11:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXdwx37glz6Vs1b; Fri, 13 Mar 2026 22:11:13 +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 4fXdwx0sxbz3qWb; Fri, 13 Mar 2026 22:11:13 +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 14pIwFDP4PzKy1AiuwMiW1; Fri, 13 Mar 2026 22:11:12 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id 1AiswVPdDX0jp1AitwTYDc; Fri, 13 Mar 2026 22:11:12 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=FMIWBuos c=1 sm=1 tr=0 ts=69b48b80 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=Yq5XynenixoA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=BFhekqoS7RXcri7vg8MA: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 75CE212C; Fri, 13 Mar 2026 15:11:10 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 3A2E7305; Fri, 13 Mar 2026 15:11:10 -0700 (PDT) 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: Ed Maste cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 4a8055914d6a - main - Revert "Makefile.inc1: Don't force LLVM_BINUTILS off for cross-tools" In-reply-to: <69b4781c.3e92e.665bf041@gitrepo.freebsd.org> References: <69b4781c.3e92e.665bf041@gitrepo.freebsd.org> Comments: In-reply-to Ed Maste message dated "Fri, 13 Mar 2026 20:48:28 -0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 13 Mar 2026 15:11:10 -0700 Message-Id: <20260313221110.3A2E7305@slippy.cwsent.com> X-CMAE-Envelope: MS4xfIpQ+aKXpkW7axw6V4iTqQCGhjJSE+SI1ZLpOzY7us38EnWtRLI9BX1YZKCMz3imSDQ1NKX2mVD6MJhvxwxUIMg09CdmRibZOfRQl4Ue0MEemk6cm5lh KpnqsFRLRrnVDsdXTB9ZvS/9hbZggduS1I7QAoV2qIz3MxxADEw9jWsm3L/wdZsNDIdYhHQdL6RfjF2QeCdZxeqYcC1c7qw2NZ/w2qpvP+rHn9tBmcxpoFiG xrOkUvOaI1WkTCfaRdG2qhbWw/f9tJFxog9jZtdl18P3tf38h3NFxfMULKDbYoYuJmBk00QPFpPJuZ6ZqZEhNhiqnkyqmttK2V1U2+YzQg8= 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: 4fXdwx0sxbz3qWb X-Spamd-Bar: ---- In message <69b4781c.3e92e.665bf041@gitrepo.freebsd.org>, Ed Maste writes: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4a8055914d6a60714f27379cbff8b2e9 > 198157f6 > > commit 4a8055914d6a60714f27379cbff8b2e9198157f6 > Author: Ed Maste > AuthorDate: 2026-03-13 20:45:30 +0000 > Commit: Ed Maste > CommitDate: 2026-03-13 20:47:33 +0000 > > Revert "Makefile.inc1: Don't force LLVM_BINUTILS off for cross-tools" > > This reverts commit 858f53dd43ecb84cf2597229e9dbda2f242d9dd6. > > It is not clear to me why building from Linux or MacOS fails to build > the toolchain, so reintroduce the long-standing slightly-broken > toolchain until that can be determined. > > Reported by: vexeduxr, jrtc27 Thank you. I ran into this problem too this week. > --- > Makefile.inc1 | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Makefile.inc1 b/Makefile.inc1 > index 8a1958902db5..c4696abae8cd 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -808,6 +808,7 @@ XMAKE= ${BMAKE} \ > TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ > MK_CLANG=${MK_CLANG_BOOTSTRAP} \ > MK_LLDB=no \ > + MK_LLVM_BINUTILS=no \ > MK_TESTS=no > > # kernel-tools stage > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Fri Mar 13 22:51:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXfq023G1z6VvRb for ; Fri, 13 Mar 2026 22:51: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXfq00J9Mz3vGk for ; Fri, 13 Mar 2026 22:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773442268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akf6LJRtIZwaPPcSP2wR0sBUr3ZTtTQU6S6kWZxy9XM=; b=yC3ZPL+W/DpmhxY2287uN4ZG9YIPQn0754yi9Ycj9DiUMg2Z9axc0KNbb1Pb7XJoyOI/el kPEvZKgv01fB54anPT96YVcTmoeqeSXbL2YSK+b4GtX7/WcoG2NN8RZ/5mzvujZYkyPFm1 ys3fPh1SQXNnn05iy4S34KxZH7mLY9Ljoy4xetnaxjloGu1FXnJdCyo178pkCR+zuCAGY/ Kupk1m4Vp8e5sNA5tFGusAZ5HC0a8Sn0hukLP/M2VnViiq7OuLZFO7WJWDqTrS1YSBLxoO WwcXM7mjJlnZfcg/FWAOY0df1p3P+U9poSQ+qW4yEt/ki4695wsI1s/Lh7gFxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773442268; a=rsa-sha256; cv=none; b=aV1xDOUQ5Uu1D0nKoF99Rhe7CkHvRLXbACovFOj7kBmIPO/OPhCfKsi+fiDARv8WvDfAv+ aDvkGinFyhBHDV+R+mI04RC2wiScKYTVCnvD8291dsHg6PMT7h7LdD0IlFyXb1gECnG2pW xnvyoHisVsARiJfSY76B4RIG7b8KKrk+8BiPMSaCSplMDSWipDwX6jfDt9PrByNW9k0Upi ITVGA54c3B4BdNx4HKjhEhqCzwmZBs0P+OiWoOWrNnSH8k3G0pZcW2KPFvFWihnrjro/sH /rVL3jU2zmexPp5OxdVeuYawmZ2vuPJIl4YX+w1rC5a0hV1h5thIq12kaVkGqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773442268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akf6LJRtIZwaPPcSP2wR0sBUr3ZTtTQU6S6kWZxy9XM=; b=jq7fbKHgqvEGmPU4phEm3kk/0x+OC7vgxtwVYGO8qVNeHwkv5UL8tfGYPB1ThQstE7XanM osJ12fVr3lPtALWyHEiIGze648APLztjzpRzLRVdIiCDWda5tQnk5btXIIcxVBhAyKU14T ZO7bPkzZ92XSjECqrO3U43D726RVtwY3w8phI5hWbs3dCiH/BK+lm/dJ50bhutj/5tIPfC 7grhnPJ0TbZaR9aHEaPtLfZGPu5zq+jA8RvwfPxu033iWL3Z9CjUoW8x8lw31+fuFSAEyn 88MF6aGW55FAPpYbxgjNhPg5D2fprWku139mH0ho2I3T5O+jB00DudjZvrjfUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXfpz70wmzs51 for ; Fri, 13 Mar 2026 22:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d642 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 22:51:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d92ebde76430 - main - amd64: move code to clear PSL_T on debug exception into a helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d92ebde76430e99f78156fb1d865a18916380aed Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 22:51:07 +0000 Message-Id: <69b494db.1d642.4dc35392@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d92ebde76430e99f78156fb1d865a18916380aed commit d92ebde76430e99f78156fb1d865a18916380aed Author: Konstantin Belousov AuthorDate: 2026-03-12 09:40:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-13 22:47:13 +0000 amd64: move code to clear PSL_T on debug exception into a helper Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55827 --- sys/amd64/amd64/trap.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index a4676f156431..4bf56226d076 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -242,6 +242,17 @@ trap_check_efirt(struct thread *td, struct trapframe *frame) return (false); } +static void +trap_clear_step(struct thread *td, struct trapframe *frame) +{ + PROC_LOCK(td->td_proc); + if ((td->td_dbgflags & TDB_STEP) != 0) { + td->td_frame->tf_rflags &= ~PSL_T; + td->td_dbgflags &= ~TDB_STEP; + } + PROC_UNLOCK(td->td_proc); +} + /* * Table of handlers for various segment load faults. */ @@ -388,14 +399,8 @@ trap(struct trapframe *frame) signo = SIGTRAP; ucode = TRAP_TRACE; dr6 = rdr6(); - if ((dr6 & DBREG_DR6_BS) != 0) { - PROC_LOCK(td->td_proc); - if ((td->td_dbgflags & TDB_STEP) != 0) { - td->td_frame->tf_rflags &= ~PSL_T; - td->td_dbgflags &= ~TDB_STEP; - } - PROC_UNLOCK(td->td_proc); - } + if ((dr6 & DBREG_DR6_BS) != 0) + trap_clear_step(td, frame); break; case T_ARITHTRAP: /* arithmetic trap */ From nobody Fri Mar 13 22:51:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXfq52dWDz6VvX0 for ; Fri, 13 Mar 2026 22:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXfq41kFDz3vcW for ; Fri, 13 Mar 2026 22:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773442272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+QH/KambtZy54AYBuWj0WGMUpypWEi6nwXo4VoHFQeM=; b=NcZsHdKLsQid9zU466dep1cFaegFTdjIqkP3pvurqexb5XW59RoEoH/9FYxF3jZomaCjun j96bgEFU1HolEgYayT1D8QoR1EapRcWXO7e5Zp/Ik/HUih+OQv4anTla5+Dpd4H5eOvGTh 9IoN1Si1KiAZvWfl2kWhiRYCD9SF0XEhUdRYuL1km2MwtnCsTkdniOfxX5C+kFinFEivVr V4AU9DqByZknfKAvT5jrPkN/Gb/pibbySShRR4U1yiTKtRK+ZDMLOVulADwSLLH/jwrJEK CbjUotT+6tLe5x9VvsVWKiqh+lkJa1RFS26IBjB662I/9N2PRj+pU/vlDyLdBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773442272; a=rsa-sha256; cv=none; b=SqD91pR7s9t7uYoAF8gxcF2URkmSzXpbXXpI9bPXn8cPNwvaM3nRpwtYubmjg9hKYCaBjc MBIz6i6FITRAtNajK9fpLYwofsLY4XV73LLS5XpGS1VlKWIkzKqByIsGBj2uDTqJRa1skU hedWymx85sRjccwSBbzl431Gc4/Xvlgzt1tw7dH0tQWOdrtnDgDIhtJKVsf8znVUUfIV1A 0Jm72OKqSdxRA9HOWdPQdmmLaevaDpFuxFQH5ClRmwAxpvuv4+oGAvIE7XxMENK+L7SyRE 9OSJSULoiKjnsuc2iYDQU/M2y8np/Qj8Zc3ToRT5P72zLaM4icaGaXn1N0HGhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773442272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+QH/KambtZy54AYBuWj0WGMUpypWEi6nwXo4VoHFQeM=; b=ICI3kGepswE9aLgU1B9LSCLbibjgOI/0ovFU/UUPJQnVG5gfAE2UWzavekJs6xTKrs/1pa UtlNxt+wzQTLqf/oNoudXKvfA9epdhfdMBnCvUyAa4NuFy9jQEf7XizEYBo+U36RoBvTXh C1RWZNxQNcMNddoVHS30YO/Qj5+E0Bnsf3N1pjnDM8WkTQUk+IMtwBlxseJrKeTyy9+vYf s6HUzWm9lcWPhEajbSS2aMKkS6ut8nvFUW+4uTLKahVND8qbhUAl/sprFCF4sXktod0fRs RTjYBZ94U+zScH5gPl9MCNoOH7qE2TWdENTLcLEQMxDTUt4bQuiBUsfEaYvEkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXfq41BZmzs7Q for ; Fri, 13 Mar 2026 22:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 22:51:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 914a53570750 - main - amd64: move efirt trap checks into the helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 914a53570750ce5a104a5870403d7669656fddc3 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 22:51:06 +0000 Message-Id: <69b494da.1d7bf.7cef39b3@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=914a53570750ce5a104a5870403d7669656fddc3 commit 914a53570750ce5a104a5870403d7669656fddc3 Author: Konstantin Belousov AuthorDate: 2026-03-11 11:53:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-13 22:47:13 +0000 amd64: move efirt trap checks into the helper Reviewed by: imp, jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55808 --- sys/amd64/amd64/trap.c | 55 ++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index d173f57e2e4f..a4676f156431 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -218,6 +218,30 @@ trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, fubyte((void *)(frame->tf_rip + 7))); } +static bool +trap_check_efirt(struct thread *td, struct trapframe *frame) +{ + /* + * Most likely, EFI RT faulted. This check prevents + * kdb from handling breakpoints set on the BIOS text, + * if such option is ever needed. + */ + if ((td->td_pflags & TDP_EFIRT) != 0 && + curpcb->pcb_onfault != NULL) { + u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); + + if ((print_efirt_faults == 1 && cnt == 0) || + print_efirt_faults == 2) { + printf("EFI RT fault %s\n", + traptype_to_msg(frame->tf_trapno)); + trap_diag(frame, 0); + } + frame->tf_rip = (long)curpcb->pcb_onfault; + return (true); + } + return (false); +} + /* * Table of handlers for various segment load faults. */ @@ -465,24 +489,8 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); - /* - * Most likely, EFI RT faulted. This check prevents - * kdb from handling breakpoints set on the BIOS text, - * if such option is ever needed. - */ - if ((td->td_pflags & TDP_EFIRT) != 0 && - curpcb->pcb_onfault != NULL && type != T_PAGEFLT) { - u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); - - if ((print_efirt_faults == 1 && cnt == 0) || - print_efirt_faults == 2) { - printf("EFI RT fault %s\n", - traptype_to_msg(type)); - trap_diag(frame, 0); - } - frame->tf_rip = (long)curpcb->pcb_onfault; + if (type != T_PAGEFLT && trap_check_efirt(td, frame)) return; - } switch (type) { case T_PAGEFLT: /* page fault */ @@ -891,19 +899,8 @@ trap_pfault(struct trapframe *frame, bool usermode, int *signo, int *ucode) return (1); after_vmfault: if (td->td_intr_nesting_level == 0 && - curpcb->pcb_onfault != NULL) { - if ((td->td_pflags & TDP_EFIRT) != 0) { - u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); - - if ((print_efirt_faults == 1 && cnt == 0) || - print_efirt_faults == 2) { - printf("EFI RT page fault\n"); - trap_diag(frame, eva); - } - } - frame->tf_rip = (long)curpcb->pcb_onfault; + trap_check_efirt(td, frame)) return (0); - } trap_fatal(frame, eva); return (-1); } From nobody Fri Mar 13 23:31:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXgjm0ddGz6VyVc for ; Fri, 13 Mar 2026 23:31: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXgjl5Z3Zz40Sx for ; Fri, 13 Mar 2026 23:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773444699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZAUWn0BMBCNuHlR6MP/YGkhfIkFiao8otA69PzIR29c=; b=vjfEFMZv1UZ62v3grbDwu+t77lpwXLC9HsMzoMD49Rjs32N7mhFC+3zhaA5u1kMEmA4CGS fB31CzhdHcBoaY1l+Vr1zLaOFtl7f8ynJ8cfcfQQN7a0AItYFEWhrsnL2hu53a3boYeagK +aiAomJk+1Bj0SGGnHi/uqX1xyGKS54E5jykwwAizpGo354Ld4bCs/WquGRPaNANiVwFME Y/PSBlxZOSv4INHSCIlldhS6s/OxCs4H5VqI6RnuzuOFCDzxec8cz3X7mqydKshV8vCG1X kK173+QKJ5mo8c5nTs5ypzRcmQQExPHBGLYgLio/EGCr8YEJZiBkCRBkMCgjlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773444699; a=rsa-sha256; cv=none; b=DBHeg7u+sEcoT2KHz4lUu2VjnuwTWN+ZJTq1c1Muc3iaHDO6b3/XeP7fCDV0CD0G3H0aDI x+V9SiQOIgTqWpwSWyyIdpAnv25GEuLQ+qNNcQo4S1i60nfA/kmgGr+q72LGS1nZZNreaB xYlQi64JZLxmCTIGExF+PKEfKluE9cCeGASkbY/Nhg6ZNwsy0REkF9llRj4ymGNi5ufnu/ a6Lz/amM+QS36yOKG22Mi7SYJ2Lu/gztGlWDmk1EdFSb3BcLfdrP5YcvX6yGvR8Ho/yAFz 2jCWm2FeioL3WfsZ1oM4P9j3Giwd9tNayArB6kZ4rm9Q0xgQVE8uTegh1WI9aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773444699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZAUWn0BMBCNuHlR6MP/YGkhfIkFiao8otA69PzIR29c=; b=GpyOAVWqfxWOFvlOiOhZavX0zDL7N91AnuL4JKjjfqLvahVJXeaqulTcwwJ4eYXS+J2ttv 7GAEbMuxNK7GUyrQxQZCwTCuaFyPaSSeVYpDBOY1xLtAG/8WsH5i4CIWPmQENL2nAVxQXU ZBM5OfyYis/Cl+/QDACvFgEm+8RSMCE9dXwz2oCeNmjf0cR2wNpyWPC1D2PkhQr0jk9OyS +chizn2ZaknnSl4/PmgqH46UQn6rd3ZiM07hWpJQOxXeck2iLpcMyb7ud9Le9tedU1jfdm UHWnu7SMn37TXTkpxa/WxEAlkxzr6IJb5wNFLPXHy+SmcELEUg4utWKlYCUfrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXgjl4sDQztM0 for ; Fri, 13 Mar 2026 23:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2116f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 23:31:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: eb0a78f6cef0 - main - x86 FRED: add CPUID, MSR, and CR4 bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb0a78f6cef0c2924b565d7c297cb08bb4de7cb0 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 23:31:34 +0000 Message-Id: <69b49e56.2116f.1c52bb7c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eb0a78f6cef0c2924b565d7c297cb08bb4de7cb0 commit eb0a78f6cef0c2924b565d7c297cb08bb4de7cb0 Author: Konstantin Belousov AuthorDate: 2026-02-07 10:22:22 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-13 23:30:27 +0000 x86 FRED: add CPUID, MSR, and CR4 bits Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55810 --- sys/x86/include/specialreg.h | 23 +++++++++++++++++++++++ sys/x86/x86/identcpu.c | 11 +++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 3e5f598cd82a..4eb4f2c398b2 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -91,6 +91,7 @@ #define CR4_LASS 0x08000000 /* Linear Address Space Separation */ #define CR4_LAM_SUP 0x10000000 /* Linear-Address Masking for Supervisor */ +#define CR4_FRED 0x100000000ull /* FRED */ /* * Bits in AMD64 special registers. EFER is 64 bits wide. @@ -549,6 +550,10 @@ * CPUID instruction 7 Structured Extended Features, leaf 1 eax info */ #define CPUID_STDEXT4_LASS 0x00000040 +#define CPUID_STDEXT4_FRED 0x00020000 +#define CPUID_STDEXT4_LKGS 0x00040000 +#define CPUID_STDEXT4_WRMSRNS 0x00080000 +#define CPUID_STDEXT4_NMISRC 0x00100000 #define CPUID_STDEXT4_LAM 0x04000000 /* CPUID_HYBRID_ID leaf 0x1a */ @@ -644,6 +649,15 @@ #define MSR_IA32_ENERGY_PERF_BIAS 0x1b0 #define MSR_IA32_PKG_THERM_STATUS 0x1b1 #define MSR_IA32_PKG_THERM_INTERRUPT 0x1b2 +#define MSR_FRED_RSP0 0x1cc +#define MSR_FRED_RSP1 0x1cd +#define MSR_FRED_RSP2 0x1ce +#define MSR_FRED_RSP3 0x1cf +#define MSR_FRED_STKLVLS 0x1d0 +#define MSR_FRED_SSP1 0x1d1 +#define MSR_FRED_SSP2 0x1d2 +#define MSR_FRED_SSP3 0x1d3 +#define MSR_FRED_CONFIG 0x1d4 #define MSR_DEBUGCTLMSR 0x1d9 #define MSR_LASTBRANCHFROMIP 0x1db #define MSR_LASTBRANCHTOIP 0x1dc @@ -925,6 +939,15 @@ /* MSR IA32_PKG_THERM_INTERRUPT */ #define IA32_PKG_THERM_INTERRUPT_HFI_ENABLE (0x1ULL << 25) +/* MSR IA32_FRED_CONFIG */ +#define IA32_FRED_CONFIG_CSL_MASK 0x00000003 +#define IA32_FRED_CONFIG_DECR_SSP 0x00000008 +#define IA32_FRED_CONFIG_REDZONESZ_MASK 0x000000e0 +#define IA32_FRED_CONFIG_REDZONESZ_SHIFT 6 +#define IA32_FRED_CONFIG_REDZONESZ_MULT 64 +#define IA32_FRED_CONFIG_EXTINT_SLC_MASK 0x00000600 +#define IA32_FRED_CONFIG_EXTINT_SLC_SHIFT 9 + /* * PAT modes. */ diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 7661c82f4394..7e0ccc72f7bb 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1046,16 +1046,19 @@ printcpuinfo(void) "\040SSBD" ); } -#define STDEXT4_MASK (CPUID_STDEXT4_LASS | CPUID_STDEXT4_LAM) - if ((cpu_stdext_feature4 & STDEXT4_MASK) != 0) { + + if (cpu_stdext_feature4 != 0) { printf("\n Structured Extended Features4=0x%b", - cpu_stdext_feature4 & STDEXT4_MASK, + cpu_stdext_feature4, "\020" "\007LASS" + "\022FRED" + "\023LKGS" + "\024WRMSRNS" + "\025NMISRC" "\033LAM" ); } -#undef STDEXT4_MASK if ((cpu_feature2 & CPUID2_XSAVE) != 0) { cpuid_count(0xd, 0x1, regs); From nobody Fri Mar 13 23:49:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXh5v2sYdz6W0Jq for ; Fri, 13 Mar 2026 23:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXh5v1cMmz41Pg for ; Fri, 13 Mar 2026 23:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773445747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AKC70ElJWfZsx+BLzy06Ot5vJTFKrOsPPWkwryIUuKk=; b=IAFnItO555lN8e7wIHOkGjhwVkJu8q/oNSFO8obcsuypICnMAIUG6FfXQI/BpjR2G1UpTh EwNY1Up+Idr8amXn2l11hfyB90lClJp1UKv3mos0mGMDtnDJADoDa/ELFi7TgqMuG5Oh5a 6+tRwuLRRtK7Xf2HRXWj/gRh8sk4v6+QEcGILfsCkmcbCx1rt4x9LBfZbxtMtpppuiqCCI 4lVdZTs6v3cmZuSgRWkZUlzBmnHcEI92ZLcschKsN4zlisSnMCWZVxya3q5mMEm7uyFPQt gXq/ZZXXZGhorA+F+rrJUzXtibv3JZPQpxbUsOjurncPNyqhioTAhDGTslVz+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773445747; a=rsa-sha256; cv=none; b=WZBTefxrK+nDjaUQQcTDzdzbNPybN41/LOdP6VDuig1iQx12G9HE0KErTot+/+1w7ar9Wv YS7z6z5/jVdHyBkM18M18EbTHzlx8eaDIiDauYWlVSiWBiZepNsFS+5UuVMtVGlHINujNX 0NnwQYhymGQfG2uPXwz4+CGDm7VqemxbsANgoW4hOGHD1IJbrH5062gIJVGcsyFsyiIwH9 72Dabdl/oC+OoA5LBTgXZIvTWDI01DbAKmxD+neLYLM/2TTjKdjIii/LqP+1jEWFtlLaoc ztW+14eGH2AUw/gOLCjjHNK423B2TqcoGYIfvQ/TU4+FAClOzHM7mdOvW5o6ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773445747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AKC70ElJWfZsx+BLzy06Ot5vJTFKrOsPPWkwryIUuKk=; b=O0gxG4Lz98qqlAqnFcDzsC1u50MghsAkR5gKpHCD+Pw8wzFsdYdD8bUxKJLIjyi2ZPX/sk uTyg495vFGcidAyRq2Gv9cmpSNzoAX7wOhdEWb3gp5R+tIpEi/Dr4TMgX7baJiaD3rRb+2 6Vo174evaigaSJcYo8N0qYQ9C1wThl1g644wH/v0ZRR2po/l76A12sPc+uhaiXlSaVkQtS qBla3eWOefW+5htNwhoTfGR5GlBoKrRzn7Yjlr6BEDU0eiCDdnO5ltSIJqVPneCKWyPRqP lAr8/nK3tJm3qDvFM9AuoZQ49w/oQ3pNkvsjI/Sw9VQK7L8lGuZEQT69qd9E4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXh5v0cJ9ztfK for ; Fri, 13 Mar 2026 23:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22dc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 23:49:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 8098980ab5db - Create tag vendor/zlib/1.3.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/tags/vendor/zlib/1.3.2 X-Git-Reftype: annotated tag X-Git-Commit: 8098980ab5dbfeb995f57d9c0c6d0ba9588c6636 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 23:49:07 +0000 Message-Id: <69b4a273.22dc0.2adf5c08@gitrepo.freebsd.org> The annotated tag vendor/zlib/1.3.2 has been created by delphij: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/zlib/1.3.2 tag vendor/zlib/1.3.2 Tagger: Xin LI TaggerDate: 2026-03-13 23:48:50 +0000 Tag zlib 1.3.2. commit 280d433d4c13f3b31722d446ec868053887caf06 Author: Xin LI AuthorDate: 2026-03-13 23:48:36 +0000 Commit: Xin LI CommitDate: 2026-03-13 23:48:36 +0000 Vendor import of zlib 1.3.2. From nobody Fri Mar 13 23:49:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXh602QTFz6W055 for ; Fri, 13 Mar 2026 23:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXh601hvLz41kh for ; Fri, 13 Mar 2026 23:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773445752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rMQqjFV1FrZ8ihfqoOuRDTavo6ccA/imhTJWR/fkExw=; b=knMXGSRpL2GoP7BjU0Rq+nkteM3VuqXS4jEXBBQhy6J0ShaBPWMP8Ve8LEBxwrjpg6keLl WIZfUhSKaR6k464qdexIeSfDoOPLw3t6Wl6FI2271OvqUUk7bO/ImIEd2h9s8sP/R6UL2a a69R0zYWUGPquT0LlrRJoSc9c5EMeMcrHXiGEjw6dC45F5rAHjMEOqbkoNYNTbQH3NDjP5 Xvbt4SEeg97tmBLrWDVR6+23d8359C3rZvq4XC3H9EuYzJRIcSGVwG8vQk76v2OudSuzg4 WRwGDE38HFoG08Kdpwc1r8KhlB7cx9IT+DVtPYy2i7b5y/+po44uRl55CpsgTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773445752; a=rsa-sha256; cv=none; b=CRkSe/h1quiRDVjHT7YFjLF+OWzKC5sUS1sEkgmz1ZrUQpWT+MBtvW64PrKHT5pmAWhIAv kDtfDgGREPEz+WBAnFp1yIrCEmz2F2ozk16LtmSnGjAnryDKlGT3YdFzQgG0reZRuEhNjx Gw9vv6N7Nb1O0sTRZvQFVG5nkjOmDM1wfIEJ0kA7Z9MOt/jZFfHReUdwclYItAvWnP6ApS 7JHgs+R1Lc/VRYALbpQkk+g5r9oluqBc2F4jvAJnsTZA/+wTeyYCXCGFkPAXOpOj2bY+of 0pUlx4xmhkNbZmXx5RZP+ajUg7BjRdmimQD0X8Kmm9ra6OFdu+9aqmBwe3C84Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773445752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rMQqjFV1FrZ8ihfqoOuRDTavo6ccA/imhTJWR/fkExw=; b=WKeP6HtjFD2MZ0XgT225eEIJJZ2PR16S6BH6/w9Mui+FyFURc+v7ISJHycXxwaA5VfoDeN yY3sGTqeSN8Xq0onsZFUpOqeLonhPIx3PV40Yn+wWovii03dlweJwzEDuI1jtNiknUBKuj 6RuCfoflj6A7p/AKL1piaBCmv4Nu+O/iBBtG4xBBJ74lpYACxZGwWtR5bMRP4rdg4op1SQ 1gx0Kk7EUhObyfvbfNie/JfN6oK25QpdAriqB/pSiigi34RKp6r4D2IcvtyUMBtHrAkra7 tEcPJU/73/N9p9NnepJcUk0T/ZInZiTMIcxpe+6UomTtB3rQJ/M6xYl5kFu9cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXh600hWLzttQ for ; Fri, 13 Mar 2026 23:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23041 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 23:49:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: f4695a30267c..280d433d4c13 - vendor/zlib - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/vendor/zlib X-Git-Reftype: branch X-Git-Commit: 280d433d4c13f3b31722d446ec868053887caf06 X-Git-Oldrev: f4695a30267c5d31987c7bc3eda906f55a8761be X-Git-Newrev: 280d433d4c13f3b31722d446ec868053887caf06 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 23:49:06 +0000 Message-Id: <69b4a272.23041.23911558@gitrepo.freebsd.org> The branch vendor/zlib has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=f4695a30267c..280d433d4c13 280d433d4c13 Vendor import of zlib 1.3.2. From nobody Fri Mar 13 23:50:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXh7Y1lDRz6W0VC for ; Fri, 13 Mar 2026 23:50: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXh7Y1Ky0z41k2 for ; Fri, 13 Mar 2026 23:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773445833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZbfSE/ZyEaP+0vkX93bLRXyjEKpjUSoCaovcj7AgV4=; b=YqZt9hPe8UYC8YRcl3xTKYVE7EYF6wsDOJHfO6Up8rKWp6ZutHmdGeBsMYDr7icho4GWgB y7QkghkDSBSlE1dmHl7QteOMred+KC0VleEFFGJ52OQNIIH9382+wGsaWZlPNNa+v7/FQq FqapIyEYSA+P6MwXE6ex6ivkIPdl/8/tI2sBy+CGJOpB4d7h7MkE9rx1BfpXxYO6X5LM61 tDLRolVl9L4j6SWTHyIWJG6/9k2+pnowIbaZi/eRi+D2r1gvQFiu6JTWxFpPCAfQnWARBE RK0Jjc3wc18Rtsal2vkaWx53jMxv+lb2Xk0tWaLx6HdECu3f5ZZmdCEPhfOxoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773445833; a=rsa-sha256; cv=none; b=tvdcRxmhQ9fsjyAzLdnn2BFBb6VZcdJ90wO2+Z5ps2aZrGLP5LZ0KjMUhhnaN0ftogEmk6 9PJxm6IbdsxBVlZVvZ/poeDdedTjnTTFcBKenQ/2EDRavLtguYC8wGKA8t2KNpUYTROAHr 5IgBumh2X6lOn0yL8OY8OYbHIqXwZ+IJi8+kjEj02jT6xdTU2mNIBpRhcQGEb+7op9R04n V3m4rmvsqm/TL22GmZc2t5dlQWK6t7PFVYbVqP+1pb7oyO5zTbFjo5MctOxJTiiN/bXwl7 /MtWnCDvS8xd3UN5D/1EFf5BBYl9cfxoIvjZaFG0Jpu9WYDIty9OGu3I7vQ8gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773445833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZbfSE/ZyEaP+0vkX93bLRXyjEKpjUSoCaovcj7AgV4=; b=NCSPrmdMlnsJ7dJzeadd9XqNOjr2tO0I0v+Y1xyBXK0LH3GZ3tSsULY8aV1qVKmS3wghXK Rh4GS7rYgogmtRbdnymsaZh/ehcmIIbwq24+15omPbYRQqdJQUAlK00AStvIuX5UJ94JVy gkoUbEYkVXptTK5endptQfaiep2jNx1agCJe9ksraXaey73DebQatI6wYnS3kDkORhGEMg 8kc5kMvAMzLqncypMgWO6Nyvz6AXHvy1HR2h9dQtsDRPrszxSGq1YzKJYcdNwcdu8pxg8X IoIowtBZmPQkBX8G8o/dKeCWH21TvoDC3zUWgkJOpZtys+QebggtLdcwj5pSpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXh7Y0n69ztfM for ; Fri, 13 Mar 2026 23:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23dd9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 23:50:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 7aa1dba6b00c - main - MFV: zlib 1.3.2. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7aa1dba6b00ccfb7d66627badc8a7aaa06b02946 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 23:50:32 +0000 Message-Id: <69b4a2c8.23dd9.9e7d214@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=7aa1dba6b00ccfb7d66627badc8a7aaa06b02946 commit 7aa1dba6b00ccfb7d66627badc8a7aaa06b02946 Merge: eb0a78f6cef0 280d433d4c13 Author: Xin LI AuthorDate: 2026-03-13 23:49:53 +0000 Commit: Xin LI CommitDate: 2026-03-13 23:49:53 +0000 MFV: zlib 1.3.2. Relnotes: yes MFC after: 2 weeks lib/libz/Symbol.map | 13 + lib/libz/Versions.def | 6 + sys/contrib/zlib/ChangeLog | 51 +++ sys/contrib/zlib/FAQ | 46 +- sys/contrib/zlib/LICENSE | 2 +- sys/contrib/zlib/README | 28 +- sys/contrib/zlib/compress.c | 44 +- sys/contrib/zlib/contrib/README.contrib | 57 --- sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S | 574 ------------------------- sys/contrib/zlib/crc32.c | 164 +++---- sys/contrib/zlib/deflate.c | 176 +++++--- sys/contrib/zlib/deflate.h | 8 +- sys/contrib/zlib/doc/algorithm.txt | 2 +- sys/contrib/zlib/gzguts.h | 64 +-- sys/contrib/zlib/gzlib.c | 103 +++-- sys/contrib/zlib/gzread.c | 296 ++++++++----- sys/contrib/zlib/gzwrite.c | 267 +++++++----- sys/contrib/zlib/infback.c | 87 +--- sys/contrib/zlib/inffast.c | 13 +- sys/contrib/zlib/inffixed.h | 182 ++++---- sys/contrib/zlib/inflate.c | 189 ++------ sys/contrib/zlib/inflate.h | 2 +- sys/contrib/zlib/inftrees.c | 143 +++++- sys/contrib/zlib/inftrees.h | 4 +- sys/contrib/zlib/test/example.c | 14 +- sys/contrib/zlib/test/infcover.c | 10 +- sys/contrib/zlib/test/minigzip.c | 89 ++-- sys/contrib/zlib/trees.c | 28 +- sys/contrib/zlib/uncompr.c | 62 ++- sys/contrib/zlib/zconf.h | 54 ++- sys/contrib/zlib/zconf.h.in | 46 +- sys/contrib/zlib/zlib.3 | 22 +- sys/contrib/zlib/zlib.h | 309 +++++++++---- sys/contrib/zlib/zlib.map | 16 + sys/contrib/zlib/zlib.pc.in | 1 + sys/contrib/zlib/zutil.c | 84 ++-- sys/contrib/zlib/zutil.h | 99 ++++- 37 files changed, 1613 insertions(+), 1742 deletions(-) diff --cc lib/libz/Symbol.map index 7bfe7cceda77,000000000000..5df1d5253f91 mode 100644,000000..100644 --- a/lib/libz/Symbol.map +++ b/lib/libz/Symbol.map @@@ -1,114 -1,0 +1,127 @@@ +/* + */ + +ZLIB_1.2.12 { + crc32_combine_gen; + crc32_combine_gen64; + crc32_combine_op; +}; + ++ZLIB_1.3.1.2 { ++ deflateUsed; ++}; ++ ++ZLIB_1.3.2 { ++ compressBound_z; ++ compress_z; ++ compress2_z; ++ deflateBound_z; ++ uncompress_z; ++ uncompress2_z; ++}; ++ +ZLIB_1.2.9 { + inflateCodesUsed; + inflateValidate; + uncompress2; + gzfread; + gzfwrite; + deflateGetDictionary; + adler32_z; + crc32_z; +}; + +ZLIB_1.2.7.1 { + inflateGetDictionary; + gzvprintf; +}; + +ZLIB_1.2.7.0 { + deflatePending; + deflateResetKeep; + gzgetc_; + inflateResetKeep; +}; + +ZLIB_1.2.4.0 { + adler32; + adler32_combine; + adler32_combine64; + compress; + compress2; + compressBound; + crc32; + crc32_combine; + crc32_combine64; + deflate; + deflateBound; + deflateCopy; + deflateEnd; + deflateInit2_; + deflateInit_; + deflateParams; + deflatePrime; + deflateReset; + deflateSetDictionary; + deflateSetHeader; + deflateTune; + get_crc_table; + gzbuffer; + gzclearerr; + gzclose; + gzclose_r; + gzclose_w; + gzdirect; + gzdopen; + gzeof; + gzerror; + gzflush; + gzgetc; + gzgets; + gzoffset; + gzoffset64; + gzopen; + gzopen64; + gzprintf; + gzputc; + gzputs; + gzread; + gzrewind; + gzseek; + gzseek64; + gzsetparams; + gztell; + gztell64; + gzungetc; + gzwrite; + inflate; + inflateBack; + inflateBackEnd; + inflateBackInit_; + inflateCopy; + inflateEnd; + inflateGetHeader; + inflateInit2_; + inflateInit_; + inflateMark; + inflatePrime; + inflateReset; + inflateReset2; + inflateSetDictionary; + inflateSync; + inflateSyncPoint; + inflateUndermine; + uncompress; + zError; + zlibCompileFlags; + zlibVersion; +}; + +FBSD_1.2 { + zopen; +}; + +FBSD_1.6 { + zdopen; +}; + diff --cc lib/libz/Versions.def index 2ee0106b5bfe,000000000000..73b197240a4c mode 100644,000000..100644 --- a/lib/libz/Versions.def +++ b/lib/libz/Versions.def @@@ -1,22 -1,0 +1,28 @@@ + +ZLIB_1.2.4.0 { +}; + +ZLIB_1.2.7.0 { +} ZLIB_1.2.4.0; + +ZLIB_1.2.7.1 { +} ZLIB_1.2.7.0; + +ZLIB_1.2.9 { +} ZLIB_1.2.7.1; + +ZLIB_1.2.12 { +} ZLIB_1.2.9; + ++ZLIB_1.3.1.2 { ++} ZLIB_1.2.12; ++ ++ZLIB_1.3.2 { ++} ZLIB_1.3.1.2; ++ +FBSD_1.2 { +} ZLIB_1.2.4.0; + +FBSD_1.6 { +} FBSD_1.2; + diff --cc sys/contrib/zlib/deflate.c index 97b184a82868,000000000000..e782ad519721 mode 100644,000000..100644 --- a/sys/contrib/zlib/deflate.c +++ b/sys/contrib/zlib/deflate.c @@@ -1,2141 -1,0 +1,2187 @@@ +/* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler ++ * Copyright (C) 1995-2026 Jean-loup Gailly and Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process depends on being able to identify portions + * of the input text which are identical to earlier input (within a + * sliding window trailing behind the input currently being processed). + * + * The most straightforward technique turns out to be the fastest for + * most input files: try all possible matches and select the longest. + * The key feature of this algorithm is that insertions into the string + * dictionary are very simple and thus fast, and deletions are avoided + * completely. Insertions are performed at each input character, whereas + * string matches are performed only when the previous match ends. So it + * is preferable to spend more time in matches to allow very fast string + * insertions and avoid deletions. The matching algorithm for small + * strings is inspired from that of Rabin & Karp. A brute force approach + * is used to find longer strings when a small match has been found. + * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze + * (by Leonid Broukhis). + * A previous version of this file used a more sophisticated algorithm + * (by Fiala and Greene) which is guaranteed to run in linear amortized + * time, but has a larger average cost, uses more memory and is patented. + * However the F&G algorithm may be faster for some highly redundant + * files if the parameter max_chain_length (described below) is too large. + * + * ACKNOWLEDGEMENTS + * + * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and + * I found it in 'freeze' written by Leonid Broukhis. + * Thanks to many people for bug reports and testing. + * + * REFERENCES + * + * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". - * Available in http://tools.ietf.org/html/rfc1951 ++ * Available at https://datatracker.ietf.org/doc/html/rfc1951 + * + * A description of the Rabin and Karp algorithm is given in the book + * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. + * + * Fiala,E.R., and Greene,D.H. + * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 + * + */ + +/* @(#) $Id$ */ + +#include "deflate.h" + +const char deflate_copyright[] = - " deflate 1.3.1 Copyright 1995-2024 Jean-loup Gailly and Mark Adler "; ++ " deflate 1.3.2 Copyright 1995-2026 Jean-loup Gailly and Mark Adler "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + +typedef enum { + need_more, /* block not completed, need more input or more output */ + block_done, /* block flush performed */ + finish_started, /* finish started, need only more output at next deflate */ + finish_done /* finish done, accept no more input or output */ +} block_state; + +typedef block_state (*compress_func)(deflate_state *s, int flush); +/* Compression function. Returns the block state after the call. */ + +local block_state deflate_stored(deflate_state *s, int flush); +local block_state deflate_fast(deflate_state *s, int flush); +#ifndef FASTEST +local block_state deflate_slow(deflate_state *s, int flush); +#endif +local block_state deflate_rle(deflate_state *s, int flush); +local block_state deflate_huff(deflate_state *s, int flush); + +/* =========================================================================== + * Local data + */ + +#define NIL 0 +/* Tail of hash chains */ + +#ifndef TOO_FAR +# define TOO_FAR 4096 +#endif +/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + +/* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to + * exclude worst case performance for pathological files. Better values may be + * found for specific files. + */ +typedef struct config_s { + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; + compress_func func; +} config; + +#ifdef FASTEST +local const config configuration_table[2] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ +#else +local const config configuration_table[10] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ +/* 2 */ {4, 5, 16, 8, deflate_fast}, +/* 3 */ {4, 6, 32, 32, deflate_fast}, + +/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ +/* 5 */ {8, 16, 32, 32, deflate_slow}, +/* 6 */ {8, 16, 128, 128, deflate_slow}, +/* 7 */ {8, 32, 128, 256, deflate_slow}, +/* 8 */ {32, 128, 258, 1024, deflate_slow}, +/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ +#endif + +/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 + * For deflate_fast() (levels <= 3) good is ignored and lazy has a different + * meaning. + */ + +/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ +#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0)) + +/* =========================================================================== + * Update a hash value with the given input byte + * IN assertion: all calls to UPDATE_HASH are made with consecutive input + * characters, so that a running hash key can be computed from the previous + * key instead of complete recalculation each time. + */ +#define UPDATE_HASH(s,h,c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask) + + +/* =========================================================================== + * Insert string str in the dictionary and set match_head to the previous head + * of the hash chain (the most recent string with same hash key). Return + * the previous length of the hash chain. + * If this file is compiled with -DFASTEST, the compression level is forced + * to 1, and no hash chains are maintained. + * IN assertion: all calls to INSERT_STRING are made with consecutive input + * characters and the first MIN_MATCH bytes of str are valid (except for + * the last MIN_MATCH-1 bytes of the input file). + */ +#ifdef FASTEST +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#else +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#endif + +/* =========================================================================== + * Initialize the hash table (avoiding 64K overflow for 16 bit systems). + * prev[] will be initialized on the fly. + */ +#define CLEAR_HASH(s) \ + do { \ + s->head[s->hash_size - 1] = NIL; \ - zmemzero((Bytef *)s->head, \ - (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \ ++ zmemzero(s->head, (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \ ++ s->slid = 0; \ + } while (0) + +/* =========================================================================== + * Slide the hash table when sliding the window down (could be avoided with 32 + * bit values at the expense of memory usage). We slide even when level == 0 to + * keep the hash table consistent if we switch back to level > 0 later. + */ +#if defined(__has_feature) +# if __has_feature(memory_sanitizer) + __attribute__((no_sanitize("memory"))) +# endif +#endif +local void slide_hash(deflate_state *s) { + unsigned n, m; + Posf *p; + uInt wsize = s->w_size; + + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + } while (--n); - n = wsize; +#ifndef FASTEST ++ n = wsize; + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif ++ s->slid = 1; +} + +/* =========================================================================== + * Read a new buffer from the current input stream, update the adler32 + * and total number of bytes read. All deflate() input goes through + * this function so some applications may wish to modify it to avoid + * allocating a large strm->next_in buffer and copying from it. + * (See also flush_pending()). + */ +local unsigned read_buf(z_streamp strm, Bytef *buf, unsigned size) { + unsigned len = strm->avail_in; + + if (len > size) len = size; + if (len == 0) return 0; + + strm->avail_in -= len; + + zmemcpy(buf, strm->next_in, len); + if (strm->state->wrap == 1) { + strm->adler = adler32(strm->adler, buf, len); + } +#ifdef GZIP + else if (strm->state->wrap == 2) { + strm->adler = crc32(strm->adler, buf, len); + } +#endif + strm->next_in += len; + strm->total_in += len; + + return len; +} + +/* =========================================================================== + * Fill the window when the lookahead becomes insufficient. + * Updates strstart and lookahead. + * + * IN assertion: lookahead < MIN_LOOKAHEAD + * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD + * At least one byte has been read, or avail_in == 0; reads are + * performed for at least two bytes (required for the zip translate_eol + * option -- not supported here). + */ +local void fill_window(deflate_state *s) { + unsigned n; + unsigned more; /* Amount of free space at the end of the window. */ + uInt wsize = s->w_size; + + Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); + + do { + more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); + + /* Deal with !@#$% 64K limit: */ ++#ifdef _MSC_VER ++#pragma warning(push) ++#pragma warning(disable: 4127) ++#endif + if (sizeof(int) <= 2) { ++#ifdef _MSC_VER ++#pragma warning(pop) ++#endif + if (more == 0 && s->strstart == 0 && s->lookahead == 0) { + more = wsize; + + } else if (more == (unsigned)(-1)) { + /* Very unlikely, but possible on 16 bit machine if + * strstart == 0 && lookahead == 1 (input done a byte at time) + */ + more--; + } + } + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (s->strstart >= wsize + MAX_DIST(s)) { + + zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more); + s->match_start -= wsize; + s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ + s->block_start -= (long) wsize; + if (s->insert > s->strstart) + s->insert = s->strstart; + slide_hash(s); + more += wsize; + } + if (s->strm->avail_in == 0) break; + + /* If there was no sliding: + * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && + * more == window_size - lookahead - strstart + * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) + * => more >= window_size - 2*WSIZE + 2 + * In the BIG_MEM or MMAP case (not yet supported), + * window_size == input_size + MIN_LOOKAHEAD && + * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. + * Otherwise, window_size == 2*WSIZE so more >= 2. + * If there was sliding, more >= WSIZE. So in all cases, more >= 2. + */ + Assert(more >= 2, "more < 2"); + + n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); + s->lookahead += n; + + /* Initialize the hash value now that we have some input: */ + if (s->lookahead + s->insert >= MIN_MATCH) { + uInt str = s->strstart - s->insert; + s->ins_h = s->window[str]; + UPDATE_HASH(s, s->ins_h, s->window[str + 1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + while (s->insert) { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + s->insert--; + if (s->lookahead + s->insert < MIN_MATCH) + break; + } + } + /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, + * but this is not important since only literal bytes will be emitted. + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); + + /* If the WIN_INIT bytes after the end of the current data have never been + * written, then zero those bytes in order to avoid memory check reports of + * the use of uninitialized (or uninitialised as Julian writes) bytes by + * the longest match routines. Update the high water mark for the next + * time through here. WIN_INIT is set to MAX_MATCH since the longest match + * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. + */ + if (s->high_water < s->window_size) { + ulg curr = s->strstart + (ulg)(s->lookahead); + ulg init; + + if (s->high_water < curr) { + /* Previous high water mark below current data -- zero WIN_INIT + * bytes or up to end of window, whichever is less. + */ + init = s->window_size - curr; + if (init > WIN_INIT) + init = WIN_INIT; + zmemzero(s->window + curr, (unsigned)init); + s->high_water = curr + init; + } + else if (s->high_water < (ulg)curr + WIN_INIT) { + /* High water mark at or above current data, but below current data + * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up + * to end of window, whichever is less. + */ + init = (ulg)curr + WIN_INIT - s->high_water; + if (init > s->window_size - s->high_water) + init = s->window_size - s->high_water; + zmemzero(s->window + s->high_water, (unsigned)init); + s->high_water += init; + } + } + + Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, + "not enough room for search"); +} + +/* ========================================================================= */ +int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version, + int stream_size) { + return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, + Z_DEFAULT_STRATEGY, version, stream_size); + /* To do: ignore strm->next_in if we use it as window */ +} + +/* ========================================================================= */ +int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, + int windowBits, int memLevel, int strategy, + const char *version, int stream_size) { + deflate_state *s; + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; + } + if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; + if (strm->zalloc == (alloc_func)0) { +#if defined(Z_SOLO) && !defined(_KERNEL) + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#if defined(Z_SOLO) && !defined(_KERNEL) + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + + if (windowBits < 0) { /* suppress zlib wrapper */ + wrap = 0; + if (windowBits < -15) + return Z_STREAM_ERROR; + windowBits = -windowBits; + } +#ifdef GZIP + else if (windowBits > 15) { + wrap = 2; /* write gzip wrapper instead */ + windowBits -= 16; + } +#endif + if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || + windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) { + return Z_STREAM_ERROR; + } + if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ + s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); + if (s == Z_NULL) return Z_MEM_ERROR; ++ zmemzero(s, sizeof(deflate_state)); + strm->state = (struct internal_state FAR *)s; + s->strm = strm; + s->status = INIT_STATE; /* to pass state test in deflateReset() */ + + s->wrap = wrap; + s->gzhead = Z_NULL; + s->w_bits = (uInt)windowBits; + s->w_size = 1 << s->w_bits; + s->w_mask = s->w_size - 1; + + s->hash_bits = (uInt)memLevel + 7; + s->hash_size = 1 << s->hash_bits; + s->hash_mask = s->hash_size - 1; + s->hash_shift = ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH); + + s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + + s->high_water = 0; /* nothing written to s->window yet */ + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + /* We overlay pending_buf and sym_buf. This works since the average size + * for length/distance pairs over any compressed block is assured to be 31 + * bits or less. + * + * Analysis: The longest fixed codes are a length code of 8 bits plus 5 + * extra bits, for lengths 131 to 257. The longest fixed distance codes are + * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest + * possible fixed-codes length/distance pair is then 31 bits total. + * + * sym_buf starts one-fourth of the way into pending_buf. So there are + * three bytes in sym_buf for every four bytes in pending_buf. Each symbol + * in sym_buf is three bytes -- two for the distance and one for the + * literal/length. As each symbol is consumed, the pointer to the next + * sym_buf value to read moves forward three bytes. From that symbol, up to + * 31 bits are written to pending_buf. The closest the written pending_buf + * bits gets to the next sym_buf symbol to read is just before the last + * code is written. At that time, 31*(n - 2) bits have been written, just + * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at + * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1 + * symbols are written.) The closest the writing gets to what is unread is + * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and + * can range from 128 to 32768. + * + * Therefore, at a minimum, there are 142 bits of space between what is + * written and what is read in the overlain buffers, so the symbols cannot + * be overwritten by the compressed data. That space is actually 139 bits, + * due to the three-bit fixed-code block header. + * + * That covers the case where either Z_FIXED is specified, forcing fixed + * codes, or when the use of fixed codes is chosen, because that choice + * results in a smaller compressed block than dynamic codes. That latter + * condition then assures that the above analysis also covers all dynamic + * blocks. A dynamic-code block will only be chosen to be emitted if it has + * fewer bits than a fixed-code block would for the same set of symbols. + * Therefore its average symbol length is assured to be less than 31. So + * the compressed data for a dynamic block also cannot overwrite the + * symbols from which it is being constructed. + */ + + s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, LIT_BUFS); + s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { + s->status = FINISH_STATE; + strm->msg = ERR_MSG(Z_MEM_ERROR); + deflateEnd (strm); + return Z_MEM_ERROR; + } +#ifdef LIT_MEM + s->d_buf = (ushf *)(s->pending_buf + (s->lit_bufsize << 1)); + s->l_buf = s->pending_buf + (s->lit_bufsize << 2); + s->sym_end = s->lit_bufsize - 1; +#else + s->sym_buf = s->pending_buf + s->lit_bufsize; + s->sym_end = (s->lit_bufsize - 1) * 3; +#endif + /* We avoid equality with lit_bufsize*3 because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ + + s->level = level; + s->strategy = strategy; + s->method = (Byte)method; + + return deflateReset(strm); +} + +/* ========================================================================= + * Check for a valid deflate stream state. Return 0 if ok, 1 if not. + */ +local int deflateStateCheck(z_streamp strm) { + deflate_state *s; + if (strm == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) + return 1; + s = strm->state; + if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE && +#ifdef GZIP + s->status != GZIP_STATE && +#endif + s->status != EXTRA_STATE && + s->status != NAME_STATE && + s->status != COMMENT_STATE && + s->status != HCRC_STATE && + s->status != BUSY_STATE && + s->status != FINISH_STATE)) + return 1; + return 0; +} + +/* ========================================================================= */ +int ZEXPORT deflateSetDictionary(z_streamp strm, const Bytef *dictionary, + uInt dictLength) { + deflate_state *s; + uInt str, n; + int wrap; + unsigned avail; + z_const unsigned char *next; + + if (deflateStateCheck(strm) || dictionary == Z_NULL) + return Z_STREAM_ERROR; + s = strm->state; + wrap = s->wrap; + if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) + return Z_STREAM_ERROR; + + /* when using zlib wrappers, compute Adler-32 for provided dictionary */ + if (wrap == 1) + strm->adler = adler32(strm->adler, dictionary, dictLength); + s->wrap = 0; /* avoid computing Adler-32 in read_buf */ + + /* if dictionary would fill window, just replace the history */ + if (dictLength >= s->w_size) { + if (wrap == 0) { /* already empty otherwise */ + CLEAR_HASH(s); + s->strstart = 0; + s->block_start = 0L; + s->insert = 0; + } + dictionary += dictLength - s->w_size; /* use the tail */ + dictLength = s->w_size; + } + + /* insert dictionary into window and hash */ + avail = strm->avail_in; + next = strm->next_in; + strm->avail_in = dictLength; + strm->next_in = (z_const Bytef *)dictionary; + fill_window(s); + while (s->lookahead >= MIN_MATCH) { + str = s->strstart; + n = s->lookahead - (MIN_MATCH-1); + do { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + } while (--n); + s->strstart = str; + s->lookahead = MIN_MATCH-1; + fill_window(s); + } + s->strstart += s->lookahead; + s->block_start = (long)s->strstart; + s->insert = s->lookahead; + s->lookahead = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + strm->next_in = next; + strm->avail_in = avail; + s->wrap = wrap; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateGetDictionary(z_streamp strm, Bytef *dictionary, + uInt *dictLength) { + deflate_state *s; + uInt len; + + if (deflateStateCheck(strm)) + return Z_STREAM_ERROR; + s = strm->state; + len = s->strstart + s->lookahead; + if (len > s->w_size) + len = s->w_size; + if (dictionary != Z_NULL && len) + zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len); + if (dictLength != Z_NULL) + *dictLength = len; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateResetKeep(z_streamp strm) { + deflate_state *s; + + if (deflateStateCheck(strm)) { + return Z_STREAM_ERROR; + } + + strm->total_in = strm->total_out = 0; + strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ + strm->data_type = Z_UNKNOWN; + + s = (deflate_state *)strm->state; + s->pending = 0; + s->pending_out = s->pending_buf; + + if (s->wrap < 0) { + s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ + } + s->status = +#ifdef GZIP + s->wrap == 2 ? GZIP_STATE : +#endif + INIT_STATE; + strm->adler = +#ifdef GZIP + s->wrap == 2 ? crc32(0L, Z_NULL, 0) : +#endif + adler32(0L, Z_NULL, 0); + s->last_flush = -2; + + _tr_init(s); + + return Z_OK; +} + +/* =========================================================================== + * Initialize the "longest match" routines for a new zlib stream + */ +local void lm_init(deflate_state *s) { + s->window_size = (ulg)2L*s->w_size; + + CLEAR_HASH(s); + + /* Set the default configuration parameters: + */ + s->max_lazy_match = configuration_table[s->level].max_lazy; + s->good_match = configuration_table[s->level].good_length; + s->nice_match = configuration_table[s->level].nice_length; + s->max_chain_length = configuration_table[s->level].max_chain; + + s->strstart = 0; + s->block_start = 0L; + s->lookahead = 0; + s->insert = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + s->ins_h = 0; +} + +/* ========================================================================= */ +int ZEXPORT deflateReset(z_streamp strm) { + int ret; + + ret = deflateResetKeep(strm); + if (ret == Z_OK) + lm_init(strm->state); + return ret; +} + +/* ========================================================================= */ +int ZEXPORT deflateSetHeader(z_streamp strm, gz_headerp head) { + if (deflateStateCheck(strm) || strm->state->wrap != 2) + return Z_STREAM_ERROR; + strm->state->gzhead = head; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePending(z_streamp strm, unsigned *pending, int *bits) { + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; - if (pending != Z_NULL) - *pending = strm->state->pending; + if (bits != Z_NULL) + *bits = strm->state->bi_valid; ++ if (pending != Z_NULL) { ++ *pending = (unsigned)strm->state->pending; ++ if (*pending != strm->state->pending) { ++ *pending = (unsigned)-1; ++ return Z_BUF_ERROR; ++ } ++ } ++ return Z_OK; ++} ++ ++/* ========================================================================= */ ++int ZEXPORT deflateUsed(z_streamp strm, int *bits) { ++ if (deflateStateCheck(strm)) return Z_STREAM_ERROR; ++ if (bits != Z_NULL) ++ *bits = strm->state->bi_used; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePrime(z_streamp strm, int bits, int value) { + deflate_state *s; + int put; + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +#ifdef LIT_MEM *** 6398 LINES SKIPPED *** From nobody Sat Mar 14 00:56:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXjbW074Hz6W4dy for ; Sat, 14 Mar 2026 00:56:23 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (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 4fXjbT05vMz48l6 for ; Sat, 14 Mar 2026 00:56:21 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=DdG8060v; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::102a as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-35a09e0dd63so2856709a91.3 for ; Fri, 13 Mar 2026 17:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773449775; x=1774054575; 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=L+KhFTXCTM5qaCPB7gIqkmBGHTjFgHSyp37+3WEZPBA=; b=DdG8060ve+VOMB53nFkPHj+Z2FDOwHrUjwb1bzGJAmMx5lg31oKp2jnkqrWBGJE621 gdfA2ubJ4hMcgx65tqh+bgPtfADoxXKswXzG/U1+MG+2s8gBkmR6ScWGFgnPg6K1Kc7q 8dJgEVb+GXMAfET81AbRxb6X4/tKpJVDAIRjC9YjHOfsoJ9lCA3x85yX1qR0IlNFpqiu NwsisxZ2k7v574acyP7yQfSpbDhDGWbjHvihJNclFa9YDEg1UoGmpGm1Cu3RpBYo6Wgo fiGgyCE3ribUWtFhT2mZauQtU3zEjuNB4rTglHACMf2gTCslYwyrd3JOzb5LSODbqyiC t1+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773449775; x=1774054575; 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=L+KhFTXCTM5qaCPB7gIqkmBGHTjFgHSyp37+3WEZPBA=; b=dHFuCpuRMviDQ8NnAP/C0grkzb/pTaDyOIiUJfRlm/1Ce4JVBDT38Ydbh/jp7jOy/u d1G5R3dRcfVPBXUSWJr6EsahqXlSx6Tidscs8j0bF46cPLV8JeIEzDYctyxTdxgSh/UW mfDcq6iIegtiJ4SXmaOqGNkSDkcQwfyunt79sFkYthS90AgHVV6NQtQHSHjtTWF7zpJF /SFruxqC9qYyg15VHmOCmAmWz7fnjgJyOUCGKAoomfKdAfvrdEIs8LvT4uznbOzq5V6G o9D1jpyK5h7RHjqSk2rfJCrN4PQMjAFOWRa/RgjwjudS9mI71T2cxhhlvY2utCYnM73d WcRw== X-Forwarded-Encrypted: i=1; AJvYcCWE6ecBjnWB8cHuGJlntQHk5l/ntz/sYp5QmXlOrPV9TlotRtzlMCKPCiTm6wa7HhmC7OFGwc1hfVWU0gQQYKwAqkGe@freebsd.org X-Gm-Message-State: AOJu0YwWoob3waZAVeE/b87Bb81kjFFfcM0laLnIjxZAxAxRBGovKd5I 15eX9FlQZGoIt2TshYgNFGFJpMuSTAtezo4WTlFF4TvQAp2qFEJNlw28 X-Gm-Gg: ATEYQzyCGs5L1xkjxYJv609Qy05Tka3p7K0valCZlMXj0s4j5l1RqKWnU0fJjL4oSdH wWM8Vnp9GRl/+YrXAWwecb4dj0idzSpMLOzl8pRGxvuOv4hqjZpXJfs505D4L/TZoCYDnpHPG1i qgdNQyhmaC4KG3hMd7osCgjINfHHbRjaokxQS7iGZGNigmvhTa6WCJmK+ClMUZ4qwVw0u1V81S2 YmGHHIykdoutMB3+3C5p0NnBxtKZQyY6ZzKd5HlKAJUaSdxi/Jsc0FI3brhTy1RYFWnmyN3cHPF yWzpxcuou5JZ6MtgN53PVq6s3pbMXKPdOiBctCefhaKM7rqt8LtU5ClqM58DQOl7HNPCNnuX/Gy nyTgJEqeF2tFJcSkCE5NSGgk3tdqCNGMcMWfCvcq+juIns7ghvVuH+I7cP5BGJmOiu/lPCaONNi fzIt1f9edPiVq9tRsBHzqe/QsnWfsLha87D5DVHYFHQL+NvoNh2YKW X-Received: by 2002:a17:902:d48a:b0:2ae:d3fa:6b3d with SMTP id d9443c01a7336-2aed3fa6c0dmr31203785ad.17.1773449774668; Fri, 13 Mar 2026 17:56:14 -0700 (PDT) Received: from smtpclient.apple ([185.153.179.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece81ac11sm33011575ad.67.2026.03.13.17.56.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2026 17:56:13 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_39271C46-3531-4A29-851A-CB700DC010EC"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: 14b8a27883c1 - main - pciconf: Add a tree mode From: "Enji Cooper (yaneurabeya)" In-Reply-To: Date: Fri, 13 Mar 2026 17:56:01 -0700 Cc: John Baldwin , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <69b04ca7.43a7d.58a4e367@gitrepo.freebsd.org> To: "Bjoern A. Zeeb" X-Mailer: Apple Mail (2.3826.700.81.1.4) X-Spamd-Result: default: False [-5.55 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_HAM_SHORT(-0.95)[-0.952]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; HAS_ATTACHMENT(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::102a:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4fXjbT05vMz48l6 X-Spamd-Bar: ----- --Apple-Mail=_39271C46-3531-4A29-851A-CB700DC010EC Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 12, 2026, at 12:46=E2=80=AFPM, Bjoern A. Zeeb = wrote: >=20 > On Tue, 10 Mar 2026, John Baldwin wrote: >=20 >> The branch main has been updated by jhb: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D14b8a27883c15d3add3114f855eff7c6= bda1b015 >>=20 >> commit 14b8a27883c15d3add3114f855eff7c6bda1b015 >> Author: John Baldwin >> AuthorDate: 2026-03-10 16:51:00 +0000 >> Commit: John Baldwin >> CommitDate: 2026-03-10 16:51:00 +0000 >>=20 >> pciconf: Add a tree mode >>=20 >> This lists PCI devices in a hierarchy showing the parent/child >> relationship of PCI devices and bridges. While this is inspired by >> lspci -t output, the format is closer to ps -d and also prefers = using >> new-bus device names when possible. If a device does not have a >> driver, the PCI selector is output in place of the device name. >>=20 >> When the -v flag is given, the vendor and device ID strings are = output >> after the device name. If a string for an ID isn't found, the hex = ID >> values are output instead. >=20 > If this is what I enquired about in Dec 2023 then a HUGE THANK YOU for = this. >=20 > Can't wait to try this the next days on my 64 mPCIe arm64 machine. +1!!! Thank you jhb@ for doing this! -Enji= --Apple-Mail=_39271C46-3531-4A29-851A-CB700DC010EC 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----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmm0siIACgkQGpE5DjPs NJjFzg/8D1jhH+xiuu4uem/KDZjCCUEzWc1spSRlLAutr4NX6cYaXkiK52V9Zp32 FxhQoVe38hHcxHS2q+Iz2jvmtxWTttsvugiCBxbjGqz1ptqRP0xZn1lj8/71aPd7 WaTNfwKR55Ygs+FHYf3WQ0fZDroIhoKe5eE5IhDj5KDUmgAld4jMl+iK9FaEq1QF a+yrZNNdo7LLRDDkibCr647l/swUT271LlNtHlI27e0pJgIc7bur2Ic3oKgof8SX 377CbEBPK6wuK4Q0SjXzodi5Kz/gz5TAtHmalDEZT8k7jwAFDp6mIa6G8HLyEMIS ma30rkyVoivKgqC8Ekte9o2TaYBJh/Rkkrmo91v6kW9X9Fi6rmx+A2vOEfrX8+Gw fgbaZquPw5SUi3VwdyYZoS3h6mG4dwTzN7Gl6/jKXMux4uKSDiHIZoP/C/iA4iON 76kZ3SlKWLplrjdy3U/nVJWTh0RU58lCv3vpK+PD1JvMxo9X04WoplPDhiLARAzh 22JBekTISyC3ZfeK9kiEXY3OCTrqYDxowtrvNpUfYwsyWBfkg1HAWZPrwpzM4N+Y /TmTTgdm4LDKwhi16C6wJ0ca0SXfiXmVd8oq//tezKKrpsoIu8U+FJ80Xf2GZCU5 ERJfM3h5u0HFok6WlAbNDZAtU3F24IN5GIfGvdhblNyb0I8+6Tg= =HfSe -----END PGP SIGNATURE----- --Apple-Mail=_39271C46-3531-4A29-851A-CB700DC010EC-- From nobody Sat Mar 14 04:05:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXnp50CXfz6V5wx for ; Sat, 14 Mar 2026 04:05: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXnp46lFzz3Djh for ; Sat, 14 Mar 2026 04:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773461149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0HODh0QADlUuJ4rvoMQO6annd0XfwXp2Uov7vKOeLc=; b=BbhtNv5NFBq8c5Vhso+i6nT0LWUreNdjKLbqiN08gIPcTrXmouaBWdSTriJQc/K1zX9B8A UFMfB1XO6gJY4ixNM2MTBQMqs0LNZkuZ5XpWa33aqJCFBDHD/09pCtJLpnfBthwuWFBbgp e5kERGs6nAs2vKKIimLMIfK9UyMy+11W6wJ2JSDhcJ4wvBJmGnn0dNigINZnPgm2WKEKR7 GpIjpj2x3OmPWmOPvaoKu6ulX8+vNhnl2iv8nUmH8gg/XEEG7jSkqtR0oGvrqRa/VpRZfk jNIlzAEJ06CvOnzy1vhAe6IVc4KkJfsj4HWpOPK7ZHzcusOpphASr/anQyH6Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773461148; a=rsa-sha256; cv=none; b=Y3jyWdol/cUKAsnLU7VCEHf1AJalrur2IpH+ZHmXz5l+EGGBWRHE4idh8+8XmkboETp0o5 P46oLyV4tA45FA4BkX+pSphajUa1CvnJeXs5/3+hnU5hRoLN59V+M9AxboIy7+TC32C9/P AkRwLmBtqnC3prLlopNIIVKDsj+x8T+95DrbfzQL16XOvU36zObnRTSz97hw+Hy7AEnjaa nBtg0Q1INDQQR1BYVaxs/RRlInhV+98D+WaQd5BP8v3XCTZMjYdEs2hQhLorQ+ZPpqnp3u BUpQB3x4N7HOs75OHoo/ozmNUiH0l6vGz1QxQhrdRf4v1ce9WLXprfepkBdBxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773461148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0HODh0QADlUuJ4rvoMQO6annd0XfwXp2Uov7vKOeLc=; b=yjc43hMQOzSX0/hgSQ9fkPzuqjXaazq7WjIVLkFzctIEpso0Jg++vrAzJ9fb/vUFmkuGN4 yyEm8l9tbuxhz4ALPf/XriDVICFNYrc0HM6Mp2eMNWmiBJWRAIT/g2EwYxbdwUPLCMOu9h z19M3c/CIdihNtWswTNWdRauvjkmoql5w6znZ9XxZrf+/AGDKeCoH2kSXtcc5PonAt9Vxw 2yngLJlmO5PT4hTr3KVOVHa7ixXAqYshDhfiVpo8VnB5frOJVW0NI2QV40Jyh4TrgFMA3i BiJ+KPFlF8RbxzlWN1nr6859PbPf4kvoedC2TD+Ke0HEFjjUGcbceegAbVVpMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXnp4695zz12dG for ; Sat, 14 Mar 2026 04:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45318 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 04:05:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 4f59a7eb878f - main - tcp: fix up !VIMAGE builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f59a7eb878f8f084e86baa58e882bc55f460a40 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 04:05:48 +0000 Message-Id: <69b4de9c.45318.5c2c2d77@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4f59a7eb878f8f084e86baa58e882bc55f460a40 commit 4f59a7eb878f8f084e86baa58e882bc55f460a40 Author: Gleb Smirnoff AuthorDate: 2026-03-14 04:04:14 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-14 04:04:14 +0000 tcp: fix up !VIMAGE builds The tcp_seq.h uses getmicrouptime() in an inline function, but it doesn't include . This was usually masked by having tcp_var.h always before tcp_seq.h, so restore that. Fixes: c0462c2deafdcfe885e8d6f91b529d8cbddc6014 --- sys/netinet/tcp_stacks/sack_filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/sack_filter.c b/sys/netinet/tcp_stacks/sack_filter.c index 71875c58989d..445f3368f992 100644 --- a/sys/netinet/tcp_stacks/sack_filter.c +++ b/sys/netinet/tcp_stacks/sack_filter.c @@ -29,14 +29,15 @@ #include #include #include -#include #ifdef _KERNEL #include #include #include #include +#include #else /* ! _KERNEL */ +#include #include #include #include From nobody Sat Mar 14 04:05:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXnp91wsVz6V6FK for ; Sat, 14 Mar 2026 04:05: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXnp914Tsz3FF2 for ; Sat, 14 Mar 2026 04:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773461153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XIiYdRAVt6EaskVHkhXFv14HAT6RRpEFXRiMFc7idiw=; b=lWw7KBi7iXMalYuTS1QFGzhtzo786n1YVnn/4+5xVwMWaNE6A3rSpDH+lrcHSxJa00O1sC WpEA/uDEkxfKEk7g1c5zLQdQ94bWDgAfvQWP5CsBsZXH/1W41CZZw2LWkfEw266P1FU5ZX 3X13IemoFPhDP9vSgs2dsj47jO2JSV8yAUWXmXziWpTfDI9DWIZ4Hf+FnQAD56A/SD6enW aCDC1aAohyMohWGg+f6z2vRshMVxh8ODiNmtCHLLFYQ7eo40Z0kszSR2hBbeE0wJM5tj0j HpaC4o/0hGEdxjv/vNcdJNGHbGJjJJuhpjaHd35sDHorqv5y4M8WU612Cvnwfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773461153; a=rsa-sha256; cv=none; b=cDNI8pvcXoiNXTNWUzR47d5M8ZOeGl5qoz6rGgM2aAYiYA84j54fOGhX0sYrPgAR6bR/ke Cizc3C7ul8Ha3fbhcx+oFT6NSsxSa7aiMG8dD59AjWd3m6lp11w9W3pyvq+ne5N1wsoEBe QZaZU1Y1Pjonh4Tr4LiBctxzBH6SzyngtOsyHIpaKLq7VAgW/JIowmi8WqoRdjorAqtWZq ZTmImmlEaB/MxDffDpBjtSIFam8pEgbH9DuXZK/0DTDqIJoy5iAW6jybn2ixN9LvvcCj2g saPzrz36QkcBWAvUlX8b94WyOl4sp4Z1qIXMbGJZGOKMcFsKVveouw2RERsyGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773461153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XIiYdRAVt6EaskVHkhXFv14HAT6RRpEFXRiMFc7idiw=; b=turlDHu9ZjT204aT3ECz9HqDZLP3E2Q85BYAF0U9KBE7yJLMD2GDQ5fl9BPCRgCbhlkcS7 Pst17NHO4CpxpeqKN8WhsPIT27uIuCCYzdNtcKzSE0rC61Ixn2+oMQiRIiQdyVo8VtU/TJ Bmn8OX/XDaNVijHLGz4FKgxss28cJBBgyvoSnNYKPNcy3EqNVykLaWWUfJddjZEL1gF2dD TZ9FqiTEITco+g6ppWVGPcHniWukOv/DIy8RUB/eoM6rLkvKqjT4DCmMQ/Ihl5R0nXI82z yuV+pDFLNuHvzpC/KOMPW0QiDlcchxfoPoELukYspnz7wgpCxfBgZ+D94yvbSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXnp90QZBz12Nl for ; Sat, 14 Mar 2026 04:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43cf6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 04:05:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a47c870930a7 - main - inpcb: fix up !VIMAGE builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a47c870930a728b5d890e8243cc363c788ebddc7 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 04:05:47 +0000 Message-Id: <69b4de9b.43cf6.575e45dc@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a47c870930a728b5d890e8243cc363c788ebddc7 commit a47c870930a728b5d890e8243cc363c788ebddc7 Author: Gleb Smirnoff AuthorDate: 2026-03-14 03:59:51 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-14 03:59:51 +0000 inpcb: fix up !VIMAGE builds There are some files that don't include mutex.h and rwlock.h, but use inpcb locking macros. With VIMAGE the net/vnet.h pulls half of the possible kernel includes, masking the problem. The in_pcb.h also used to mask the problem, so restore that. Fixes: 041e9eb1ae094a81e55fbcaba37eb2ac194658cc --- sys/netinet/in_pcb.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index bdf8ff9fb74c..6f842f64775e 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -292,9 +292,9 @@ struct xktls_session { */ #include #include -#include -#include -#include +#include +#include +#include #include #include #include From nobody Sat Mar 14 04:31:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXpMq2skPz6V8Sx for ; Sat, 14 Mar 2026 04:31: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXpMq0pzmz3Jgn for ; Sat, 14 Mar 2026 04:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773462695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hdNl87kGxudFLTRxJeowYB22M+sy23hfyVMJ+Dthv8=; b=LuajZsnmsMLLA+qtMPFW5BtlOWujJREuBfsRNBnRrR0DF7WelSfTaH1C85BEcwl5THnvL2 oB/nYIIgPFo4YvwBejHbU/j7Ins8MlPBMEetVum5NG5m7b/+3oVJZjBUSeaHaRa0k6WzyJ TDSWagQ10eOsPsHo9cmEB/PIU8saAQLlP8yWz8NMV/4hfiimQCmhnk21FonkdYdulYdHxR 2EyxbZYuZKd1pOPFJUf8zXEtvXK4MAkv2xVfLmedbBLpZ3ypjkbrOF3cAxYG4BCEh5r4/Y lTY+oRz5pRN+wt66HSxcCR57IJI57T8rH5CbMHroIHhsAs8jKkiv668DhSFccw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773462695; a=rsa-sha256; cv=none; b=ePgrn5/gtvtbtPq13BDuEbM13v3THpgTwN9XElm99pn/spefAzQvG0FOOZNQoU5ZMWRB3l rPwnaq54+xE+TNViwL7fTo3sW7eeSiQcA1WJDzU0Rz6RP4PEz/+b8s1jFkrFdi66hgLekA HeSt92D+vgHC2klOoZcZlgKpYsH4VZ5GXueRsueLOgTlTBmUTgf3NlIrNFnXrf8HAlWTnK bf4ti3Ep//JWH8Kuva1ClGPujyylF4L+05jWp5zV29j4etYgDMyW9cEtdLS/UQW1NBi0oB mJFg6A4AkZ73vAwvUcdfOFQ7djrawGZey1zZkFxm/S3c6uxbkR4Fiaqqz8BGJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773462695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hdNl87kGxudFLTRxJeowYB22M+sy23hfyVMJ+Dthv8=; b=O/u2Xyw1zd6IKKNyANYRocYAjDZGTl66Zpl0h0gULRjggArRktOHi3kBtY+j5fOMy4BH1N 399qK/hfnEZviljKeu1sVW23vOPBA03pnJuaLow+ddOy6a15WKnTs4Kev9j14L1r4gM5SM VOpSBEx/7jID2gibapHDrF/Sel1SgGPhltN6i78xgPCjIXRUV3T8x125VkPQWGrlQIeuK2 7SUlYiantFKeFplrSGUdGooObASY6G/MMWCCledcJl55QNUyljLPW2vknjunzrcOJLUjZd cYa86koQdP9F/8e76njH//nf0H7ruvr72DCrxo7lDk888vStzzW2+PEuQPJ3tA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXpMq0QyYz130X for ; Sat, 14 Mar 2026 04:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1860f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 04:31:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 9d26b82826d9 - main - libc: Fix dtor order in __cxa_thread_atexit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d26b82826d9962d5085bc5d9df7f8a762c57602 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 04:31:35 +0000 Message-Id: <69b4e4a7.1860f.4c5fa8be@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=9d26b82826d9962d5085bc5d9df7f8a762c57602 commit 9d26b82826d9962d5085bc5d9df7f8a762c57602 Author: ShengYi Hung AuthorDate: 2026-03-12 13:40:34 +0000 Commit: ShengYi Hung CommitDate: 2026-03-14 04:30:25 +0000 libc: Fix dtor order in __cxa_thread_atexit The thread_local variable may creates another thread_local variable inside its dtor. This new object is immediately be registered in __cxa_thread_atexit() and need to be freed before processing another variable. This fixes the libcxx test thread_local_destruction_order.pass.cpp. Reported by: kib Approved by: lwhsu (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55826 --- lib/libc/stdlib/cxa_thread_atexit_impl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdlib/cxa_thread_atexit_impl.c b/lib/libc/stdlib/cxa_thread_atexit_impl.c index 3123bd12dca8..3d742d90fb44 100644 --- a/lib/libc/stdlib/cxa_thread_atexit_impl.c +++ b/lib/libc/stdlib/cxa_thread_atexit_impl.c @@ -119,9 +119,9 @@ walk_cb_nocall(struct cxa_thread_dtor *dtor __unused) static void cxa_thread_walk(void (*cb)(struct cxa_thread_dtor *)) { - struct cxa_thread_dtor *dtor, *tdtor; + struct cxa_thread_dtor *dtor; - LIST_FOREACH_SAFE(dtor, &dtors, entry, tdtor) { + while ((dtor = LIST_FIRST(&dtors)) != NULL) { LIST_REMOVE(dtor, entry); cb(dtor); free(dtor); From nobody Sat Mar 14 04:31:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXpMv46YZz6V7yJ for ; Sat, 14 Mar 2026 04:31: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXpMv2lYJz3JYd for ; Sat, 14 Mar 2026 04:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773462699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XcZHqHXSiqKjCPlTjT40zyLDM/1YSiPtJ2aVFlUxYwk=; b=Coxs/igyiZ1dG4os6nBF34v1E4Wv2qXkQd2xtUh3P7Ht7eaa0y/wCRaCHpQGZ/6xEhoBGk 6b/epOWPEezCDzRHVWDebqpWZzUOgBoqnVkO2sArrUFlUjXJXceFgGCelSVD+pEI8mkWzs UYeNmeSgQTfUVbJad51UTUtxxhzCzah878pTFbv5/wrTgzsxDUhtlJ4nelQRp6fpHzbaSD JIJqvoBlMGVoswoQ9nnK2LVXH1/dYH3YJvjBNn4Vzg9PvUEESVypXMHL0zF0s6V2gw6EkU IRLwlTOeHLLUiBrwkpajuCqQYtAaZSH8VBcX4oMRWXzwivsGuKrHTMV22XkiUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773462699; a=rsa-sha256; cv=none; b=UsO98gG6AJuw29MVYYbWiW/rJW9McMc6V3DE+QvxwprEI93a5rRDlPUWT6V/RFjY4/brrg GpE63Xv3pbmwp/RbBV0SRxRPlRdnsZ4o3mdquKbI1fpxunat1/V3TWKuyTAnisenv7RsnU W/M8zjzIZXVSxDOhfapY8kpmrWFI37NAAJBIQhEMCNlvQkKiNE3EIKxib8JjTtc//+mQJb bnnNKtmqb3H0dvepvvXC6Yxmr7p5J+P+/qkQYs8Gfn1Nkr+1Bjf7K8RBjVk9YDShj88jtt fowdGrxY6KGGdR8qnbyH3CmzwAVZEXG6bN/8fNflugwNG3kD4qzHoOI6t68fCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773462699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XcZHqHXSiqKjCPlTjT40zyLDM/1YSiPtJ2aVFlUxYwk=; b=YTxFHH52rvAvBwuPUmt8fJbYWERXROZS2Oo8SYtODkeEMHE0qIZbfV7FxPmK/X0OPiEVVc bCik0fcZBuxKKfOLMyv3L+ytcZ64tnffbpWb4rXxtbqJIkz2gS8tRWOBfZAfWhRCzqdKU5 gYBZf30vVwI7qfFxo7iFeHjTR+2ZrI/Kr20YXv5A3Lq22XPp8CxToDYlSLQinQsvzVmfmf inbV0EbSfCK3OEjhJ16G1XITOSpbEjDbul+VD6gsrLijjobNZNrU8wnN8ZHtONQxyqprG/ YDfhTFc57kgbKv5k3SiZtStAbW7ysXu1qsHIb64mCUsJRZh/xbUHFYd+L2jP6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXpMv2DQMz13MS for ; Sat, 14 Mar 2026 04:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4794e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 04:31:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 728ae49a6b81 - main - kern_time: Honor the precise option when counting diff List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 728ae49a6b81edb3eec5ab70a63bb83db8f5dce5 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 04:31:33 +0000 Message-Id: <69b4e4a5.4794e.2cbae09b@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=728ae49a6b81edb3eec5ab70a63bb83db8f5dce5 commit 728ae49a6b81edb3eec5ab70a63bb83db8f5dce5 Author: ShengYi Hung AuthorDate: 2026-03-12 09:16:24 +0000 Commit: ShengYi Hung CommitDate: 2026-03-14 04:21:26 +0000 kern_time: Honor the precise option when counting diff When preecise option is used, the true elapsed time should also use the precise timer. This fixes the test case sleep_for.signals.pass.cpp in libcxx. Reviewed by: kib, imp Approved by: lwhsu (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55824 --- sys/kern/kern_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 0c16045ca610..82c2f7367ab2 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -601,7 +601,9 @@ kern_clock_nanosleep(struct thread *td, clockid_t clock_id, int flags, } while (error == 0 && is_abs_real && td->td_rtcgen == 0); td->td_rtcgen = 0; if (error != EWOULDBLOCK) { - if (TIMESEL(&sbtt, tmp)) + if (precise) + sbtt = sbinuptime(); + else if (TIMESEL(&sbtt, tmp)) sbtt += tc_tick_sbt; if (sbtt >= sbt) return (0); From nobody Sat Mar 14 09:13:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXwd05tRpz6VXYD; Sat, 14 Mar 2026 09:13:24 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fhigh-a7-smtp.messagingengine.com (fhigh-a7-smtp.messagingengine.com [103.168.172.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXwd03vvrz3l0T; Sat, 14 Mar 2026 09:13:24 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id 82064140002C; Sat, 14 Mar 2026 05:13:23 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sat, 14 Mar 2026 05:13:23 -0400 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=fm1; t=1773479603; x=1773566003; bh=BSE60WL11I A2hN0tyr4SXiX8z0IYPFN7vZRbElNHxmg=; b=ApfyLH9KUvzG2hQ/Z49iP/WVWk HvF+jfGIleLGS2EvdoyXq2ulC04lSC6ioF96ovPf5hi5kyTFpCVwRR1jpSvsYMnG U24Umt7LurmJMvKLThy2k2pLqh5HpCNlSRLptCGdSR7k7C3SUZ8VR4/fcuBs/tSa IfBGn16D5yue8odSaeNOGB5hFdzHtq1Ej5M6LkN2DjrbYctW6QAD94s918rkEu0n 2EmdE+fTq+8K7lQWCrOskf8uLSPkMxVMkxzJ+QuBGBpL+NLgh9+LpRuUnC75v3iC S3HG8YdsjdkaJFodeoNoYWxiegOgOd6j7Qjrn+kfXG1UMTTWV5STbDDJIPqA== 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=fm1; t= 1773479603; x=1773566003; bh=BSE60WL11IA2hN0tyr4SXiX8z0IYPFN7vZR bElNHxmg=; b=MDgx5cdQSFiEgbH2r8I7a8r28ppx9Y+79OBwVe3XTOfyepu/W+X dsyEYpJ3/x1ie7ZL5n1i3PIwQuT1jdEAZQrLBs2IxRELOTOlrqXpSpfJJHiMDJub AIPWcVZNFhrq8jvP3673bEPcrr0ApaLouguPrL3U97b8fPUcHtUW5TVF2Y09ExVt OztfrhELuv4eYLi+5D8q6tvq+BTkvjuQfmuR0ezIDU4W9itf0DfpohpShzuDlHqp yzob2F7bTuYRJIDlrGsp1Db3zP1A793E287Ayv8g4QUq0BePXJxtUI8L1waKhPfF tiCCDFm684dvxHDKmFbZPlSIUlG+RF5BT9g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddvledvudekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpeffkffhvfevufgjfhgfgggtsehttdertd dtredvnecuhfhrohhmpedfjfgvrhgsvghrthculfdrucfukhhuhhhrrgdfuceohhgvrhgs vghrthesghhojhhirhgrrdgrtheqnecuggftrfgrthhtvghrnhepfefhheffgedvheeutd eugfekfeeiffeijefhgeegkeegveejgeefffeggeelhfdtnecuffhomhgrihhnpehfrhgv vggsshgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhephhgvrhgsvghrthesghhojhhirhgrrdgrthdpnhgspghrtghpthhtohepgedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepkhhisgesfhhrvggvsghsugdrohhrgh dprhgtphhtthhopehsrhgtqdgtohhmmhhithhtvghrshesfhhrvggvsghsugdrohhrghdp rhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurd horhhgpdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqmhgrihhnsehfrhgv vggsshgurdhorhhg X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Mar 2026 05:13:22 -0400 (EDT) Date: Sat, 14 Mar 2026 10:13:15 +0100 Message-ID: <87a4wasris.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Konstantin Belousov Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 914a53570750 - main - amd64: move efirt trap checks into the helper In-Reply-To: <69b494da.1d7bf.7cef39b3@gitrepo.freebsd.org> References: <69b494da.1d7bf.7cef39b3@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 (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: 4fXwd03vvrz3l0T X-Spamd-Bar: ---- On Fri, 13 Mar 2026 23:51:06 +0100, Konstantin Belousov wrote: > > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=914a53570750ce5a104a5870403d7669656fddc3 > > commit 914a53570750ce5a104a5870403d7669656fddc3 > Author: Konstantin Belousov > AuthorDate: 2026-03-11 11:53:52 +0000 > Commit: Konstantin Belousov > CommitDate: 2026-03-13 22:47:13 +0000 > > amd64: move efirt trap checks into the helper > > Reviewed by: imp, jhb > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D55808 > --- > sys/amd64/amd64/trap.c | 55 ++++++++++++++++++++++++-------------------------- > 1 file changed, 26 insertions(+), 29 deletions(-) This is causing a kernel panic here. From nobody Sat Mar 14 09:30:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXx0j5RZjz6VYbM for ; Sat, 14 Mar 2026 09:30: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXx0j4RJgz3mnn for ; Sat, 14 Mar 2026 09:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773480629; 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=hITu+Uye22cJjVCfliO9FPWwkraM6t+rQcfWFmiyryk=; b=vsnwiMWEBiPpzJ5+QW7x1EXbja6lAgIo9M8m8E2e7zbPM9tknddQZo9gAm4y1FkUxXzWgI W8LZwhmDqgmQAticxXK9X2Y7h69gIkKJwVYHCWwD7PxyToQZy7YUHFjU6AXgHc/5T/QeHP MUAccBgHB+UZ8UAMziftFr2OAREzRoibB4Dms2djCtTYctdBaaC62ZK+KfJvuPz3CnNUci UUKkmeLXlHx9GQr+FpkUakrnHGT9PIe1AcZHBV30POeG3kPhD6sWIAw9F4OHsCm78aXCcf oXde1Dv7yUiPJJLNI0GMNpLMBgIGKXct0fx1NGVqKKMhRAuOMNX99YRApujxlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773480629; a=rsa-sha256; cv=none; b=RJ7dcSxJc0aVk/npK+WdW1Ym+mZ3GTYOQvaN2OtfHF1QeMNrd6wXb2DPFveXmUOAj7H9VT tc2qOvMBwJBQJun+A4/reiPlLNMtvaIMd40PMj5S1w8TIkdX0+wWk92zSU9iUm62Soypq/ IF7b+na0RVy0n4IjPKS+TzLCbgckdULLsyRyIE7Q98vf7YU4qoqJJ0KKIpNihDfvQAMlgw SN5kdE34+PME4TRknyt4/KbHe3xvyM0qI+tiPxphY6r1692xZJj5jDw6KbpqW8CXz1xHQc 62wmZLHO3wFWgmI16SXAJ9ys++luNKE8YNs2sioD/rrC0z8xNtF9e7n/OWzpiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773480629; 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=hITu+Uye22cJjVCfliO9FPWwkraM6t+rQcfWFmiyryk=; b=jVbnux8f25FEGPmx29unVZAb9AfZH2uTCH8CN804NPxYktoapqHOVqrg4LnSlj+vOm/asv KfABjnZlm7j6A/aQS59mPI9WqJ4PAZZga6wqt+ROvVcUDqYldvsdmelNBQDRKC7Dwp39hl f7tBxQX0brgu6hDenH/BkFyB1SgN4WNq3uAkwS04wWZA717QqKIgF97U0kKh6AjhEh+uOZ cmoLWhDAgxBiCNxWAI6zmoZyosyvIHNohIgVS1eZjsJkj7+FJ88mvncDyl9QCuKueCyipu ugHQrLFEAIm+cHGCR0cS8bnLYjnd2ZyUSS2Ffg485+45IKVZGesptNvt/yAXuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXx0j2vSPz1Bqs for ; Sat, 14 Mar 2026 09:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f7c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 09:30:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Strahinja =?utf-8?Q?Stani=C5=A1?==?utf-8?Q?i=C4=87?= From: Robert Clausecker Subject: git: 0536513edabc - stable/15 - libc/riscv64: temporarily disable strnlen() implementation until a fix is developed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0536513edabc9ce3447738e986b0c9fff3907e64 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 09:30:29 +0000 Message-Id: <69b52ab5.3f7c8.611f0eec@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=0536513edabc9ce3447738e986b0c9fff3907e64 commit 0536513edabc9ce3447738e986b0c9fff3907e64 Author: Strahinja Stanišić AuthorDate: 2026-03-07 21:59:25 +0000 Commit: Robert Clausecker CommitDate: 2026-03-14 09:29:21 +0000 libc/riscv64: temporarily disable strnlen() implementation until a fix is developed strnlen() doesn't seem to cope well with a length argument such that string pointer plus length overflows past the end of the address space. Reviewed by: fuz MFC after: 1 week PR: 293353, 293296 Differential Revision: https://reviews.freebsd.org/D55714 (cherry picked from commit 2a4e3112c811b9892e14e15cfd23538e7e47329c) --- lib/libc/riscv/string/Makefile.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index 6dae6b2cb62d..ce965833cb27 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -5,6 +5,5 @@ MDSRCS+= \ memcpy.S \ memset.S \ strlen.S \ - strnlen.S \ strchrnul.S \ strrchr.S From nobody Sat Mar 14 09:30:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXx0k5mzqz6VYYB for ; Sat, 14 Mar 2026 09:30: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXx0k49hnz3mgH for ; Sat, 14 Mar 2026 09:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773480630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gz4Nh6R4ShxKGBQ5LYud8XId9f3RyI3MLSkEGMWXfTI=; b=H+sCW1XcJV1izlSEYFKRYm9YmS/sHjJWa/1AQ/xXvaP+LhP5qcYAuO2uTwLT44g1mo3g1m I0EzUwt45msiogL0M657pOwgI68POoWL8pHwcFfM6LmvhQRcd6hRR5wwZrLt23KflkR5Ob IM08gxGHnhPk9EtQoLgwFGIyIDMOYzewDAd6LSV+ygZJJn/xfawKbz3zPnGanNK71/tWi0 4ne1zUEGTTlrS0XVQ2vAuGjbVsfaCvjGj4dj1c56bZ+7H0AtIlWIzca3DMS+VOdDOwM/zo FYtvr1920T6d3r5bJus/mkDdb7o8UkN9PilCne6fEQaOZE5GyKVXrQCLFoBWUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773480630; a=rsa-sha256; cv=none; b=O0vSJcFl+EW+N5bayJReFwJEezXiZ9vJRK0hUqLrgPgn2qePfeQOxvDT9S9s5Se0dDcJrC Y0IyGCcbFn7OtE8N14z46I17Z4tRoJmHuID4EEmfjsTmZ1rSVdirKrsaIsl2AB2wEsjDPx gOElQ9Z/W6jL8/u02IuYliHVx5WqU+dDIdWuMS1Y2l6j87XqwqUcUipLmQvWUEg6/uhofa xjb219Q4eVndo9nKWmEb2anUu/kMjD62y3aoniTyv6CdnOhjAqbpqiMx9zVC6aOaGEaMMT vQlCuluFBYN7d23mb2a56eW0YUF/A9+xif/pl6/wEbLOtvU7DzyxvXGTy1b37A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773480630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gz4Nh6R4ShxKGBQ5LYud8XId9f3RyI3MLSkEGMWXfTI=; b=xQQJZZ+T2kpboeziC0L1YbOMINuTwISFFnTS6FLba4eXW9bvTzDYgGTCq0gZN9+oeZJBhp gic5HrRzVC2F9Qbedb/NLVlMG/ytL8G9fR3ZlkfCPL6wlwgOxt5uJaMwbTq4exL4h9rUjK 6xAo09Ts0Cnxl5NwMRDpkrAsKUgw05Jj8+tjDA4MiQZTBz/9xBHsM1k0iVN8xRzSqKydzO bCPgmOntbuHrAJSEN4YnU14dmXLsXQAFJrzkzw2mLN57AdrtBlBXWUswo7zTyJQmofgPv2 E0tvKy0ghxlUJUyFV0cfkiPkcAOM/pHdTDbJvxhO8WJvDhLEy06ArQhTLu1yIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXx0k3hffz1Bml for ; Sat, 14 Mar 2026 09:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18881 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 09:30:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 521519f72d59 - stable/15 - depend-cleanup.sh: rebuild strnlen.o on riscv64 if it came from strnlen.S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 521519f72d599622a79ed79f93c4f4b208089174 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 09:30:30 +0000 Message-Id: <69b52ab6.18881.6772147c@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=521519f72d599622a79ed79f93c4f4b208089174 commit 521519f72d599622a79ed79f93c4f4b208089174 Author: Robert Clausecker AuthorDate: 2026-03-07 23:14:25 +0000 Commit: Robert Clausecker CommitDate: 2026-03-14 09:29:22 +0000 depend-cleanup.sh: rebuild strnlen.o on riscv64 if it came from strnlen.S We have to switch back to the previous rule once the temporary build fix has been replaced with a permanent fix. MFC after: 1 week See also: 2a4e3112c811b9892e14e15cfd23538e7e47329c PR: 293353, 293296 (cherry picked from commit b5514e1c6d9e7ec09b299a983d1ce32852e0d9dc) --- tools/build/depend-cleanup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 8e4b552edb0c..c36046385fae 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -546,7 +546,7 @@ if [ ${MACHINE} = riscv ]; then clean_dep lib/libc memcpy c # 20251031 5a52f0704435 libc: scalar strnlen() in RISC-V assembly - clean_dep lib/libc strnlen c + #clean_dep lib/libc strnlen c # 20251031 08af0bbc9c7d libc: scalar strchrnul() in RISC-V assembly clean_dep lib/libc strchrnul c @@ -554,6 +554,9 @@ if [ ${MACHINE} = riscv ]; then # 20251031 b5dbf3de5611 libc/riscv64: implement bcopy() and bzero() through memcpy() and memset() clean_dep lib/libc bcopy c "libc.string.bcopy.c" clean_dep lib/libc bzero c "libc.string.bzero.c" + + # 20260307 2a4e3112c811 libc/riscv64: temporarily disable strnlen() implementation until a fix is developed + clean_dep lib/libc strnlen S fi if [ ${MACHINE_ARCH} = "aarch64" ]; then From nobody Sat Mar 14 09:38:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXx9s3kJkz6VZLn for ; Sat, 14 Mar 2026 09:38: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXx9s30WYz3pTK for ; Sat, 14 Mar 2026 09:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773481105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pE4jEWJXqD8Oc8YwBBW5+KQxAmfX66+jXTMZkSxIBwc=; b=tjnoDRyKGW0/LoerYD3GP1ILzWKSkwLxLL10PA8v2Znwx7iE1l8NUOre3aFRvc8ZI6HCEu tB7tEI4vvpDbGoy/NYI053+0cO6diWYLzcSnP6QBbHboIpKFTdRafmZc7hTcW3SfV8Y6E1 GeYsHZNsrBARHF4I+H9tHGjyA697auhuOrO1qa+rLeM6YRhCVGgBRnOZW9+r78F66y561J OFnDBl+p4cHN/nqfhfeajcRFZ3Rb0Of3mkWnRkGCJgSMpBjk8BIOukz3EudRIVWsQi0ex8 xdlVA0vnqI3NpHLQCSHJbXO6/lpws3vk5/Y7YwauricqR0D7lEJ8IL4CJN3mdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773481105; a=rsa-sha256; cv=none; b=jdX3DxDSkAvJ9R2N1fnrZ8yAsSKJ2VvWfpDJu6XCNgO7RehsL1crniHB4VZxG7mXZ2d1E0 Looj7HEZ/SSZKucSoAGfTCQ+Buhv9ipf42oJmH968tXxx0o0Mxq5fSV8RMElwAZEeBJwTU ywxWEb4iuLlq65vS4R6mhBw/uZj00Vx5vzYbgWJoNB86lJHWoUtEUZSoizVwzQ98ArToC4 o8iNVAfJvKkCkjGtSBAvqGnNG2K9gJHCMQ+Ng8lVAYXKJ5BlJk1CMKx/eb3YeeZTXCjM3s oOuds4MCgDi4e2WK5kU0Byxb5rdKdQR0QGjjnPOBL3f2n268byTVsgpvKPBZ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773481105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pE4jEWJXqD8Oc8YwBBW5+KQxAmfX66+jXTMZkSxIBwc=; b=rW5Q7wBMcYicH1P9ynDQgZ8oM57o/kPl/+0idWUkCeVhWsYWySXxIELpmPmrCeq3gJApET MKJ5+ZHWnumXVHhhcZnmbIrpZPfX5nXizrkuiHa+Rnef/df2hI1T6six1tkWNobc1taqk5 ZFZqDcNo96304fVesX/69QVepI7/roZDUkOxnWNfkF+YPjqJQxX3ocaRtQ1Zz6u1StCNCL GO+MJmyil4t9TouqJvJhuSfBEbWFLAzdO3V4BZlBixVsSEJ03djzoYytO9QwDe2BQi8HSJ BeQk3lNh/LUkOBL1cBv0VoIPJR0H/AtsjRFPsiUzWgjz4p/kdqZa933ZN9mLyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXx9s2WMqz1C5T for ; Sat, 14 Mar 2026 09:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18eab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 09:38:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: f91464171d61 - main - acpi_system76: Improve sysctl names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f91464171d615b7e7720ac9ed67e2e86392d1b41 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 09:38:25 +0000 Message-Id: <69b52c91.18eab.42be8b26@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=f91464171d615b7e7720ac9ed67e2e86392d1b41 commit f91464171d615b7e7720ac9ed67e2e86392d1b41 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-13 19:23:03 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-14 09:33:10 +0000 acpi_system76: Improve sysctl names * Improve sysctl descriptions. * Rename battery charging-threshold sysctl for clarity. * Fix mis-spelled words. * Style: sort headers. Reported by: olce, jhb Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D55848 --- sys/dev/acpi_support/acpi_system76.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/dev/acpi_support/acpi_system76.c b/sys/dev/acpi_support/acpi_system76.c index a4ac848a0fec..1ba287ccb85d 100644 --- a/sys/dev/acpi_support/acpi_system76.c +++ b/sys/dev/acpi_support/acpi_system76.c @@ -27,18 +27,19 @@ */ #include "opt_acpi.h" + #include -#include #include +#include #include +#include #include #include #include -#include - #include + #include "backlight_if.h" #define _COMPONENT ACPI_OEM @@ -91,8 +92,8 @@ static int acpi_system76_backlight_get_info(device_t dev, enum { S76_CTRL_KBB = 1, /* Keyboard Brightness */ S76_CTRL_KBC = 2, /* Keyboard Color */ - S76_CTRL_BCTL = 3, /* Battary Charging Start Thresholds */ - S76_CTRL_BCTH = 4, /* Battary Charging End Thresholds */ + S76_CTRL_BCTL = 3, /* Battery Charging Start Thresholds */ + S76_CTRL_BCTH = 4, /* Battery Charging End Thresholds */ }; #define S76_CTRL_MAX 5 @@ -125,16 +126,16 @@ static const struct s76_ctrl_table s76_sysctl_table[] = { .desc = "Keyboard Color", }, [S76_CTRL_BCTL] = { - .name = "battary_thresholds_low", + .name = "battery_charge_min", .get_method = S76_CTRL_GBCT, .set_method = S76_CTRL_SBCT, - .desc = "Battary charging start thresholds", + .desc = "Start charging the battery when this threshold is reached (percentage)", }, [S76_CTRL_BCTH] = { - .name = "battary_thresholds_high", + .name = "battery_charge_max", .get_method = S76_CTRL_GBCT, .set_method = S76_CTRL_SBCT, - .desc = "Battary charging end thresholds", + .desc = "Stop charging the battery when this threshold is reached (percentage)", }, }; @@ -376,7 +377,7 @@ acpi_system76_sysctl_handler(SYSCTL_HANDLER_ARGS) if (req->newptr == NULL) { /* - * ACPI will not notify us if battary thresholds changes + * ACPI will not notify us if battery thresholds changes * outside this module. Therefore, always fetch those values. */ if (method != S76_CTRL_BCTL && method != S76_CTRL_BCTH) From nobody Sat Mar 14 11:15:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXzLf57CXz6VjJm; Sat, 14 Mar 2026 11:16:10 +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 4fXzLf2slcz3wb5; Sat, 14 Mar 2026 11:16:10 +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 77FC52402F3; Sat, 14 Mar 2026 12:16:03 +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 975122403A0; Sat, 14 Mar 2026 12:16:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1773486961; 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=3ktil7JAdtZOi4Jscrm0lfi3JKI//8S8dCgOOfIup3o=; b=GQ+mOtPAWytj4GduQzbplSuPUsQ3ay3T3NgFF7wVbxM+qNI6JVB6SZfgDCJJX6x+f2pg06 Qh0J3em6+sP6Y7OsXDFVUIARqPBo6fn7XZd7lAiOGfQkfsbvw6oaxIzW9JOcEkw/u9u7LN W2JJ8njcKWEwwkGXQxRukjlDNCGVWajWdwlIw1fwNiofmNdl6Wm57evmbNqYoFusQLknQt oQQ5o7w19oqRhbGPKJcLH+vdTQ++zZ4iqtYEkQo5XFfVGpBH3m1rHU65PHpPm96gRhsc5Y oiZuWDqQWU4rcwU9RpFdqe0ofTR09QmEDzFnPsMOBVjLYyT7D6tqASuqL/lNyA== Received: from thor.sb211.local (dynamic-2a02-3100-28cd-8502-d48f-5603-9dc5-4ef7.310.pool.telefonica.de [IPv6:2a02:3100:28cd:8502:d48f:5603:9dc5:4ef7]) (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 33AE0240214; Sat, 14 Mar 2026 12:16:01 +0100 (CET) Date: Sat, 14 Mar 2026 12:15:33 +0100 From: A FreeBSD User To: "Herbert J. Skuhra" Cc: Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 914a53570750 - main - amd64: move efirt trap checks into the helper Message-ID: <20260314120921.314e1677@thor.sb211.local> In-Reply-To: <87a4wasris.wl-herbert@gojira.at> References: <69b494da.1d7bf.7cef39b3@gitrepo.freebsd.org> <87a4wasris.wl-herbert@gojira.at> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd16.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/VvxFV1koNGL2BsRb.a1cwQY"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: c6c5c9 X-Rspamd-UID: a28118 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: 4fXzLf2slcz3wb5 X-Spamd-Bar: ---- --Sig_/VvxFV1koNGL2BsRb.a1cwQY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Tage des Herren Sat, 14 Mar 2026 10:13:15 +0100 "Herbert J. Skuhra" schrieb: > On Fri, 13 Mar 2026 23:51:06 +0100, Konstantin Belousov wrote: > >=20 > > The branch main has been updated by kib: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D914a53570750ce5a104a5870= 403d7669656fddc3 > >=20 > > commit 914a53570750ce5a104a5870403d7669656fddc3 > > Author: Konstantin Belousov > > AuthorDate: 2026-03-11 11:53:52 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2026-03-13 22:47:13 +0000 > >=20 > > amd64: move efirt trap checks into the helper > > =20 > > Reviewed by: imp, jhb > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D55808 > > --- > > sys/amd64/amd64/trap.c | 55 ++++++++++++++++++++++++------------------= -------- > > 1 file changed, 26 insertions(+), 29 deletions(-) =20 >=20 > This is causing a kernel panic here. >=20 me too. --=20 A FreeBSD user --Sig_/VvxFV1koNGL2BsRb.a1cwQY Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCabVDcAAKCRCxzvs8Oqok rxYVAP0fkuHnJnZ04PNLN5ubTUj6BVs10zyGQ7xjoFYpg7jkMAD6Ag7QbLq29g/Y 4D47POdKxb8xuX/8P/QHN8sBj8zrXQg= =CqZm -----END PGP SIGNATURE----- --Sig_/VvxFV1koNGL2BsRb.a1cwQY-- From nobody Sat Mar 14 11:46:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY01K2Kjmz6Vl2M; Sat, 14 Mar 2026 11:46:13 +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 4fY01J5PR0z41lP; Sat, 14 Mar 2026 11:46:12 +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 62EBk06p002844; Sat, 14 Mar 2026 13:46:03 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 62EBk06p002844 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 62EBk0ke002843; Sat, 14 Mar 2026 13:46:00 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 14 Mar 2026 13:46:00 +0200 From: Konstantin Belousov To: A FreeBSD User Cc: "Herbert J. Skuhra" , Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 914a53570750 - main - amd64: move efirt trap checks into the helper Message-ID: References: <69b494da.1d7bf.7cef39b3@gitrepo.freebsd.org> <87a4wasris.wl-herbert@gojira.at> <20260314120921.314e1677@thor.sb211.local> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260314120921.314e1677@thor.sb211.local> 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: 4fY01J5PR0z41lP X-Spamd-Bar: ---- On Sat, Mar 14, 2026 at 12:15:33PM +0100, A FreeBSD User wrote: > Am Tage des Herren Sat, 14 Mar 2026 10:13:15 +0100 > "Herbert J. Skuhra" schrieb: > > > On Fri, 13 Mar 2026 23:51:06 +0100, Konstantin Belousov wrote: > > > > > > The branch main has been updated by kib: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=914a53570750ce5a104a5870403d7669656fddc3 > > > > > > commit 914a53570750ce5a104a5870403d7669656fddc3 > > > Author: Konstantin Belousov > > > AuthorDate: 2026-03-11 11:53:52 +0000 > > > Commit: Konstantin Belousov > > > CommitDate: 2026-03-13 22:47:13 +0000 > > > > > > amd64: move efirt trap checks into the helper > > > > > > Reviewed by: imp, jhb > > > Sponsored by: The FreeBSD Foundation > > > MFC after: 1 week > > > Differential revision: https://reviews.freebsd.org/D55808 > > > --- > > > sys/amd64/amd64/trap.c | 55 ++++++++++++++++++++++++-------------------------- > > > 1 file changed, 26 insertions(+), 29 deletions(-) > > > > This is causing a kernel panic here. > > > > me too. My polite answer is that the messages do not provide useful information. I got a useful trace from Peter Holm, and I think I know what is going on there. My current patch is below, I will commit it after Peter' confirmation. If you have a different issue, you should report it in a way that allows to diagnose the problem. >From 7097dd1ec28472594a6fbb2f5bd8b6f88459f0e9 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Sat, 14 Mar 2026 13:40:07 +0200 Subject: [PATCH] amd64: do reset %rip after page fault if pcb_onfault is set for any kernel page fault, and not only for EFIRT case. Reported by: pho Fixes: 914a53570750ce5a104a5870403d7669656fddc3 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/trap.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 4bf56226d076..3a9323936d2d 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -219,15 +219,19 @@ trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, } static bool -trap_check_efirt(struct thread *td, struct trapframe *frame) +trap_check_pcb_onfault(struct thread *td, struct trapframe *frame) { - /* - * Most likely, EFI RT faulted. This check prevents - * kdb from handling breakpoints set on the BIOS text, - * if such option is ever needed. - */ - if ((td->td_pflags & TDP_EFIRT) != 0 && - curpcb->pcb_onfault != NULL) { + bool res = false; + + if (curpcb->pcb_onfault == NULL) + return (res); + + if (__predict_false((td->td_pflags & TDP_EFIRT) != 0)) { + /* + * Most likely, EFI RT faulted. This check prevents + * kdb from handling breakpoints set on the BIOS text, + * if such option is ever needed. + */ u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); if ((print_efirt_faults == 1 && cnt == 0) || @@ -236,10 +240,13 @@ trap_check_efirt(struct thread *td, struct trapframe *frame) traptype_to_msg(frame->tf_trapno)); trap_diag(frame, 0); } - frame->tf_rip = (long)curpcb->pcb_onfault; - return (true); + res = true; + } else if (frame->tf_trapno == T_PAGEFLT) { + res = true; } - return (false); + if (res) + frame->tf_rip = (register_t)curpcb->pcb_onfault; + return (res); } static void @@ -494,7 +501,7 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); - if (type != T_PAGEFLT && trap_check_efirt(td, frame)) + if (type != T_PAGEFLT && trap_check_pcb_onfault(td, frame)) return; switch (type) { @@ -904,7 +911,7 @@ trap_pfault(struct trapframe *frame, bool usermode, int *signo, int *ucode) return (1); after_vmfault: if (td->td_intr_nesting_level == 0 && - trap_check_efirt(td, frame)) + trap_check_pcb_onfault(td, frame)) return (0); trap_fatal(frame, eva); return (-1); -- 2.53.0 From nobody Sat Mar 14 12:03:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY0Nv126xz6VmqP for ; Sat, 14 Mar 2026 12:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY0Nv0Dr2z43PH for ; Sat, 14 Mar 2026 12:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773489791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T2XaKbPYA0p/GzCWTED/cZRU29j4O1Ekr7sZuSALtOI=; b=JKoe8ft/fCGe3KHYi9n76mf+q6rxJAN6il+eMzFqv4eLcZF+pbwLk4ZKPEdeufwhNvuUhE wo/uBQNddIHaJ+fHq/6eiLUhjr9jQ1jFq+MVbndb3ukipwoplHYZ4obIPugJrGlGnOrFgk eJqHD32Xcfzwna542JrC9F7pjmg8Clu+yfwMOvxilucD1tqARh73QiuFmNll8v5nevaEN/ 0aIpr49zfz1uLbG5k0o19omKSQCegNQqdUkOp8v7/uI8U8Ta8QUzw114616KotXH7ybvSi eGYFITzJ0mWJNiEsCHv0ywpn2Y4dZEhT5rWb9OI66rqp1i7WeifJXXGz/5CICw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773489791; a=rsa-sha256; cv=none; b=eXB/6RLat2uzcDQZ7eqjRTrV5P6epr19jNN0vxTca6v936gIz2YVyNW/UEGeFbZgkru6IL 8lfFso55GPGUnod9mQtvexLntIY9j9XJp4eZTtwv04n0jGuyMXiE6nZvUaZSh6eU5wSe65 AZppKHzWOmPq/Ee+iwaaE5Wh6a/48DL9pAwqUm9zh/ZV1Q352SVkdFp1LZh99IuC14qCHp /3n2/V16rerEEaTrHWLZ6IAPX8WWh9lj6/KhFxcPSuaXHCBxynK87Ff8KwSwe3fnNoh8pT XEt7/Z6dQn7EjXOmp/JAXfUYi0q1vEMEFPoHZOhBMOvCVdZPMpT3Z3j/AD/MiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773489791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T2XaKbPYA0p/GzCWTED/cZRU29j4O1Ekr7sZuSALtOI=; b=EQXDwKdpqGuRgSrh70o3I7gxCbkESkiayyKgVGhMkLp2BYpo4hs6xT6f1GzkziGFwNZFD8 ggLaqP/okPWF2e9v/3JnGiO08vGuHh/O0GSqR+KJc9mBL5refFjpbPHHYCMIOz5dx/D+0k q+K8qNgN3cV5YMmf7fmnm1lQZsycMkoUaHpSR2nkhU3brL4miOg6b7yCdGfaBb/kDQ9ecb pjU8GknlQRXXvEZJ+DSLND7+ew9ft/2/VcRTEvyYINYB1oxSzANUPRm7fTWBNqIArVwh+Y pXim2jXekxQojOZaQxT/I9C1CTKemBIoDM05nrSs7OP0zgze0bu0C786vnzIGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY0Nt6Wv1z1Gh0 for ; Sat, 14 Mar 2026 12:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31471 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 12:03:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 756689232e6a - stable/15 - sigreturn.2: refresh the man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 756689232e6a9e227c26b56f91624d69a08fdcce Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 12:03:05 +0000 Message-Id: <69b54e79.31471.6b04b1d8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=756689232e6a9e227c26b56f91624d69a08fdcce commit 756689232e6a9e227c26b56f91624d69a08fdcce Author: Konstantin Belousov AuthorDate: 2026-03-08 20:08:42 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-14 12:02:34 +0000 sigreturn.2: refresh the man page (cherry picked from commit 9da4a804f0916b24519b8baa7ed460a7ba23d8c8) --- lib/libsys/sigreturn.2 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/libsys/sigreturn.2 b/lib/libsys/sigreturn.2 index 4effeaa5abc7..0e7bca507fc7 100644 --- a/lib/libsys/sigreturn.2 +++ b/lib/libsys/sigreturn.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 6, 2013 +.Dd March 11, 2026 .Dt SIGRETURN 2 .Os .Sh NAME @@ -47,17 +47,25 @@ The thread's signal mask and stack status are restored from the context structure pointed to by .Fa scp . The system call does not return; -the users stack pointer, frame pointer, argument pointer, -and processor status longword are restored from the context. -Execution resumes at the specified pc. -This system call is used by the trampoline code and -.Xr longjmp 3 +the whole userspace context as specified by +.Fa scp , +including the userspace stack pointer, all general-purpose registers, +coprocessor state, process status register, and program counter +are restored from the context. +Execution resumes at the program counter from the specified context. +.Pp +This system call is used by the kernel-provided signal trampoline code, +located in the virtual DSO (VDSO) on some architectures or as raw code +in the shared page if VDSO is not provided, when returning from a signal to the previously executing program. .Sh RETURN VALUES If successful, the system call does not return. -Otherwise, a value of -1 is returned and +Otherwise, a value of -1 may be returned, with .Va errno -is set to indicate the error. +set to indicate the error. +Some conditions detected by hardware result in the delivery of +a synchronous trap signal to the thread, in addition to or instead of +setting the system call error code. .Sh ERRORS The .Fn sigreturn From nobody Sat Mar 14 13:26:23 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY2F16dTMz6VtPx for ; Sat, 14 Mar 2026 13:26: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY2F140gyz3Cq5 for ; Sat, 14 Mar 2026 13:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773494789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lNaZB/eMnbTxs47r3s8VkJ2G2fTTlK7T42dnJ5qYo5E=; b=SlGOgDtzIk4W4GtolaBJzrsI/nDzyPFga/HmGEv8Ctxbu0ghwba+XakXi4dkTLT2hd/DZC clJBPlkGJ9kN2k3HrHauIZuRiSOKlvwqNyyokbDyq4nYigQEMorExIof76qqltpMKHDq7K naWQW0jutZGCAFb/V3H94CbYekWR8MgS9nJbOjkKm2olOPbsZouq6kpRdyQo73sTR/dJ7r 1RDkln7I0ccVwGyq3EE6TmkFRSzAAktmF+o+6ODSKn5yUCSZDycTOwBAvaVlPcbkul3kNd DOJ/W2fgruoFExsR40lmBlEJ3yWHPj0WaSqaJlRBx8qsqyH+mRgXUmOCqF0WDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773494789; a=rsa-sha256; cv=none; b=PXH7GKpyIOZzigvKmldt+p+73rQdPe2y03amKKrT1X1fT5z2zX8LIb9ZXPeoS8h4lhv3su GynIjCjs9oVjGTlCZnA8M6hUehazO9xd7/ZHC4fZS0EPE/Yk5C76/3Cmkm691C4dJbEhH3 YasV6BHs6TPm+TXVtPhelJxXoBNioOzwegYHVLPh5I59vu/I4WKrPcz6iTDIrb5nLbkn65 ZDfxYiMrYMz9a4pWkSMiC46EGc+EO0TKV6GmEn6RC++DfbQYsMYShNpW3SiDunNWxhmsTE 7bL4EfezqZfEEGPYAyhkrr5I5mHYtc9y9ZPeYrCA6+j/m0ZtknSfhkbYjm4B0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773494789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lNaZB/eMnbTxs47r3s8VkJ2G2fTTlK7T42dnJ5qYo5E=; b=Yv8aO0e4Q4lwbAeHRDNN2NZpTWu5OvpQOj1Y2JtBHlMjf24emTymVyXhumQx6OU25sRa36 tiCIIQn3dChxQaZpzSl1MTM71ttHNU/i1YMYGTVkxM8XeBd//8nSjY8SPVVhQYSCjxKeW5 H+VYWU0p/JDf1z4TSXTBcuMGNgE3LhKStxoHjcEbij3QtlMQxMnsAW0IbiBwTphXV0hrrD jYCoGjex7Z66D6TJna5Zyqd8ABF2d5kFmfD8wGwhWAf1LL4Ul8Isf5FMYO88x6AN1PrpyJ TomTPheUPG0ZIYGCUaxdvyi3aKoMsQIbMcs97TCxDlG6KNvZukFu3UTjJtb8yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY2F13Y4kz1Jtf for ; Sat, 14 Mar 2026 13:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ea9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 13:26:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 8a62a2a5659d - main - zfs: merge openzfs/zfs@f8e5af53e List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a62a2a5659d1839d8799b4274c04469d7f17c78 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 13:26:23 +0000 Message-Id: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=8a62a2a5659d1839d8799b4274c04469d7f17c78 commit 8a62a2a5659d1839d8799b4274c04469d7f17c78 Merge: f91464171d61 f8e5af53e92f Author: Martin Matuska AuthorDate: 2026-03-14 12:14:56 +0000 Commit: Martin Matuska CommitDate: 2026-03-14 12:14:56 +0000 zfs: merge openzfs/zfs@f8e5af53e Notable upstream pull request merges: #17358 4975430cf Add vdev property to disable vdev scheduler #18031 c77f17b75 Add snapshots_changed_nsecs dataset property #18080 dbb3f247e cmd/zfs: clone: accept `-u` to not mount newly created datasets #18089 -multiple Zstd: Update bundled library to version 1.5.7 #18091 2301755df Fix zfs_open() to skip zil_async_to_sync() for the snapshot #18093 -multiple L2ARC: Rework write throttling with DWPD rate limiting and parallel writes #18095 2dbd6af5e Rename several printf attributes declarations to __printf__ #18096 8605bdfdd FreeBSD: unbreak compilation on i386 #18105 794f1587d When receiving a stream with the large block flag, activate feature #18115 765929cb4 DDT: Add locking for table ZAP destruction #18118 09e4e01e9 Fix history logging for `zpool create -t` #18119 2f1f25217 icp: emit .note.GNU-stack section for all ELF targets #18131 3fffe4e70 Fix --enable-invariants on FreeBSD #18133 d2f5cb3a5 Move range_tree, btree, highbit64 to common code #18136 54b141fab FreeBSD: Remove references to DEBUG_VFS_LOCKS #18138 cdf89f413 Flush RRD only when TXGs contain data #18139 a157ef62a Make sure we can still write data to txg #18140 cd895f0e5 remove thread unsafe debug code causing FreeBSD double free panic #18144 4f180e095 Fix activating large_microzap on receive #18146 35b2d3970 Lock db_mtx around arc_release() in couple places #18154 b36472052 nvpair: chase FreeBSD xdrproc_t definition #18160 21bbe7cb6 Improve caching for dbuf prefetches #18177 -multiple Multihost Improvements #18179 2646bd558 Allow rewrite skip cloned and snapshotted blocks #18180 aa29455dd Restrict cloning with different properties #18184 040ba7a7c libzfs: improve error message for zpool create with ENXIO #18188 1412bdc6c zfs_vnops_os.c: Move a vput() to after zfs_setattr_dir() #18198 cc184fe98 Fix `send:raw` permission for send `-w -I` #18208 ba970eb20 Cleanup allocation class selection #18212 0f9564e85 Simplify dnode_level_is_l2cacheable() #18214 370570890 Remove parent ZIO from dbuf_prefetch() #18218 bfb276e55 freebsd: Fix TIMESPEC_OVERFLOW for PowerPC #18222 d06a1d9ac Fix available space accounting for special/dedup #18225 d48967728 ICP: AES-GCM VAES-AVX2: fix typos and document source files #18226 c8a72a27e ICP: AES-GCM assembly: remove unused Gmul functions #18230 -multiple Fix zdb --key crash for unencrypted datasets, and teach tests to understand this better #18233 -multiple icp: add SHA-512 implementation using Intel SHA512 extension #18245 991fc56fa Introduce dedupused/dedupsaved pool properties #18251 6a717f31e Improve misleading error messages for ZPOOL_STATUS_CORRUPT_POOL #18254 7744f0496 SIMD: libspl: test the correct CPUID bit for AVX512VL #18255 6495dafd5 range_tree: use zfs_panic_recover() for partial-overlap remov #18256 3408332d7 zhack: Fix importing large allocation profiles on small pools #18258 f8457fbdc Fix deadlock on dmu_tx_assign() from vdev_rebuild() #18263 f8e5af53e Fix redundant declaration of dsl_pool_t Obtained from: OpenZFS OpenZFS commit: f8e5af53e92fa7c03393fbd4922cb9c1d0c15920 cddl/lib/libzfs/Makefile | 36 +- cddl/lib/libzpool/Makefile | 7 +- stand/libsa/zfs/Makefile.inc | 6 +- stand/libsa/zfs/xxhash.c | 24 + sys/conf/files | 7 +- .../.github/workflows/scripts/qemu-1-setup.sh | 110 +- .../.github/workflows/scripts/qemu-2-start.sh | 53 +- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 50 +- .../.github/workflows/scripts/qemu-5-setup.sh | 22 +- .../workflows/scripts/qemu-6-lustre-tests-vm.sh | 51 + .../.github/workflows/scripts/qemu-6-tests.sh | 132 +- .../.github/workflows/scripts/qemu-8-summary.sh | 32 + .../.github/workflows/scripts/qemu-test-repo-vm.sh | 27 +- .../.github/workflows/zfs-qemu-packages.yml | 15 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 16 +- sys/contrib/openzfs/.mailmap | 10 + sys/contrib/openzfs/AUTHORS | 14 + sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/Makefile.am | 2 + sys/contrib/openzfs/autogen.sh | 1 + sys/contrib/openzfs/cmd/Makefile.am | 5 +- sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + sys/contrib/openzfs/cmd/zdb/Makefile.am | 5 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 53 +- sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + .../zed/zed.d/history_event-zfs-list-cacher.sh.in | 1 + sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + sys/contrib/openzfs/cmd/zfs/zfs_main.c | 89 +- sys/contrib/openzfs/cmd/zhack.c | 166 +- sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool/zpool_main.c | 16 +- sys/contrib/openzfs/cmd/zpool/zpool_util.c | 26 - sys/contrib/openzfs/cmd/zpool/zpool_util.h | 2 - sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + sys/contrib/openzfs/cmd/ztest.c | 7 +- sys/contrib/openzfs/config/CppCheck.am | 1 + sys/contrib/openzfs/config/Rules.am | 1 + sys/contrib/openzfs/config/Shellcheck.am | 1 + sys/contrib/openzfs/config/Substfiles.am | 1 + sys/contrib/openzfs/config/always-arch.m4 | 1 + .../openzfs/config/always-compiler-options.m4 | 1 + sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + sys/contrib/openzfs/config/always-parallel.m4 | 1 + sys/contrib/openzfs/config/always-python.m4 | 1 + sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + sys/contrib/openzfs/config/always-sed.m4 | 1 + sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + sys/contrib/openzfs/config/always-system.m4 | 1 + sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + sys/contrib/openzfs/config/deb.am | 1 + sys/contrib/openzfs/config/find_system_library.m4 | 1 + sys/contrib/openzfs/config/gettext.m4 | 1 + sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + sys/contrib/openzfs/config/iconv.m4 | 1 + .../openzfs/config/kernel-access-ok-type.m4 | 1 + sys/contrib/openzfs/config/kernel-acl.m4 | 32 + sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + sys/contrib/openzfs/config/kernel-automount.m4 | 1 + sys/contrib/openzfs/config/kernel-bio.m4 | 1 + sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + .../config/kernel-block-device-operations.m4 | 1 + .../openzfs/config/kernel-commit-metadata.m4 | 1 + .../openzfs/config/kernel-config-defined.m4 | 1 + .../config/kernel-copy-from-user-inatomic.m4 | 1 + .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + .../openzfs/config/kernel-declare-event-class.m4 | 1 + .../openzfs/config/kernel-dentry-operations.m4 | 1 + .../openzfs/config/kernel-discard-granularity.m4 | 1 + sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-file.m4 | 1 + sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + .../openzfs/config/kernel-follow-down-one.m4 | 1 + sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-fs-context.m4 | 33 + sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + .../openzfs/config/kernel-generic_fadvise.m4 | 1 + .../openzfs/config/kernel-generic_fillattr.m4 | 1 + .../openzfs/config/kernel-generic_io_acct.m4 | 1 + sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + .../openzfs/config/kernel-inode-permission.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-state.m4 | 24 + sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + .../openzfs/config/kernel-kmap-local-page.m4 | 1 + sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + .../openzfs/config/kernel-make-request-fn.m4 | 1 + sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 28 + sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + .../config/kernel-pagemap-readahead-page.m4 | 1 + sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + .../openzfs/config/kernel-pin-user-pages.m4 | 1 + .../openzfs/config/kernel-proc-operations.m4 | 1 + sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + sys/contrib/openzfs/config/kernel-rename.m4 | 1 + .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + sys/contrib/openzfs/config/kernel-sched.m4 | 1 + .../openzfs/config/kernel-security-inode-init.m4 | 1 + sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + .../openzfs/config/kernel-setattr-prepare.m4 | 1 + sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + sys/contrib/openzfs/config/kernel-timer.m4 | 1 + sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + .../openzfs/config/kernel-truncate-setsize.m4 | 1 + sys/contrib/openzfs/config/kernel-types.m4 | 1 + sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + .../openzfs/config/kernel-vfs-file_range.m4 | 1 + .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + sys/contrib/openzfs/config/kernel.m4 | 9 +- sys/contrib/openzfs/config/lib-ld.m4 | 1 + sys/contrib/openzfs/config/lib-link.m4 | 1 + sys/contrib/openzfs/config/lib-prefix.m4 | 1 + sys/contrib/openzfs/config/mount-helper.m4 | 1 + sys/contrib/openzfs/config/nls.m4 | 1 + sys/contrib/openzfs/config/pkg.m4 | 1 + sys/contrib/openzfs/config/po.m4 | 1 + sys/contrib/openzfs/config/progtest.m4 | 1 + sys/contrib/openzfs/config/rpm.am | 1 + sys/contrib/openzfs/config/tgz.am | 1 + sys/contrib/openzfs/config/toolchain-simd.m4 | 23 + sys/contrib/openzfs/config/user-aio.h.m4 | 1 + sys/contrib/openzfs/config/user-backtrace.m4 | 1 + sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + sys/contrib/openzfs/config/user-dracut.m4 | 1 + sys/contrib/openzfs/config/user-gettext.m4 | 1 + sys/contrib/openzfs/config/user-largefile.m4 | 1 + sys/contrib/openzfs/config/user-libaio.m4 | 1 + sys/contrib/openzfs/config/user-libatomic.m4 | 1 + sys/contrib/openzfs/config/user-libblkid.m4 | 1 + sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + sys/contrib/openzfs/config/user-libexec.m4 | 1 + sys/contrib/openzfs/config/user-libfetch.m4 | 1 + sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + sys/contrib/openzfs/config/user-libudev.m4 | 1 + sys/contrib/openzfs/config/user-libunwind.m4 | 1 + sys/contrib/openzfs/config/user-libuuid.m4 | 1 + sys/contrib/openzfs/config/user-makedev.m4 | 1 + sys/contrib/openzfs/config/user-pam.m4 | 1 + sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + sys/contrib/openzfs/config/user-statx.m4 | 1 + sys/contrib/openzfs/config/user-systemd.m4 | 1 + sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + sys/contrib/openzfs/config/user-udev.m4 | 1 + sys/contrib/openzfs/config/user-zlib.m4 | 1 + sys/contrib/openzfs/config/user.m4 | 1 + sys/contrib/openzfs/config/zfs-build.m4 | 3 +- sys/contrib/openzfs/config/zfs-meta.m4 | 1 + sys/contrib/openzfs/contrib/Makefile.am | 1 + .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + .../contrib/debian/openzfs-libpam-zfs.install | 1 + .../openzfs/contrib/dracut/90zfs/mount-zfs.sh.in | 2 +- sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c | 278 +- sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + .../openzfs/contrib/pyzfs/docs/source/index.rst | 3 +- .../openzfs/contrib/pyzfs/libzfs_core/__init__.py | 10 - .../pyzfs/libzfs_core/_error_translation.py | 58 - .../contrib/pyzfs/libzfs_core/_libzfs_core.py | 350 +- .../pyzfs/libzfs_core/bindings/libzfs_core.py | 4 - .../pyzfs/libzfs_core/test/test_libzfs_core.py | 337 - sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + sys/contrib/openzfs/copy-builtin | 5 +- sys/contrib/openzfs/etc/Makefile.am | 1 + sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/libzfs.h | 10 +- sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + .../include/os/linux/kernel/linux/dcache_compat.h | 19 +- .../include/os/linux/kernel/linux/simd_x86.h | 14 + .../include/os/linux/kernel/linux/vfs_compat.h | 8 + .../include/os/linux/kernel/linux/xattr_compat.h | 17 + .../openzfs/include/os/linux/spl/sys/kmem.h | 5 +- sys/contrib/openzfs/include/sys/arc.h | 2 - sys/contrib/openzfs/include/sys/arc_impl.h | 38 + sys/contrib/openzfs/include/sys/btree.h | 9 +- sys/contrib/openzfs/include/sys/ddt.h | 5 + sys/contrib/openzfs/include/sys/dmu.h | 1 + sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + sys/contrib/openzfs/include/sys/fs/zfs.h | 24 +- sys/contrib/openzfs/include/sys/metaslab.h | 4 +- sys/contrib/openzfs/include/sys/metaslab_impl.h | 8 +- sys/contrib/openzfs/include/sys/mmp.h | 5 + sys/contrib/openzfs/include/sys/spa.h | 1 + sys/contrib/openzfs/include/sys/spa_impl.h | 4 + sys/contrib/openzfs/include/sys/uberblock_impl.h | 22 +- sys/contrib/openzfs/include/sys/vdev.h | 2 + sys/contrib/openzfs/include/sys/vdev_impl.h | 2 + sys/contrib/openzfs/include/sys/vdev_rebuild.h | 2 +- sys/contrib/openzfs/lib/Makefile.am | 31 +- sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + sys/contrib/openzfs/lib/libbtree/Makefile.am | 6 + sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + sys/contrib/openzfs/lib/librange_tree/Makefile.am | 9 + sys/contrib/openzfs/lib/libshare/Makefile.am | 27 - sys/contrib/openzfs/lib/libshare/libshare_impl.h | 48 - sys/contrib/openzfs/lib/libshare/nfs.h | 38 - sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 2 +- sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 18 +- .../openzfs/lib/libspl/include/sys/sysmacros.h | 29 +- sys/contrib/openzfs/lib/libunicode/Makefile.am | 6 - sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/Makefile.am | 18 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 450 +- sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 13 + sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 7 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 16 +- .../{libshare/libshare.c => libzfs/libzfs_share.c} | 3 +- .../include/libshare.h => libzfs/libzfs_share.h} | 80 +- .../{libshare/nfs.c => libzfs/libzfs_share_nfs.c} | 5 +- .../nfs.c => libzfs/os/freebsd/libzfs_share_nfs.c} | 5 +- .../smb.c => libzfs/os/freebsd/libzfs_share_smb.c} | 4 +- .../nfs.c => libzfs/os/linux/libzfs_share_nfs.c} | 4 +- .../smb.c => libzfs/os/linux/libzfs_share_smb.c} | 24 +- sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + .../openzfs/lib/libzfs_core/libzfs_core.abi | 11 +- sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + sys/contrib/openzfs/lib/libzpool/Makefile.am | 14 +- .../openzfs/lib/libzpool/include/Makefile.am | 1 + sys/contrib/openzfs/lib/libzpool/kernel.c | 28 - sys/contrib/openzfs/lib/libzstd/Makefile.am | 7 + sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + sys/contrib/openzfs/man/Makefile.am | 2 + sys/contrib/openzfs/man/man4/zfs.4 | 36 +- sys/contrib/openzfs/man/man7/vdevprops.7 | 17 + sys/contrib/openzfs/man/man7/zfsprops.7 | 9 + sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 14 + sys/contrib/openzfs/man/man7/zpoolprops.7 | 15 + sys/contrib/openzfs/man/man8/pam_zfs_key.8 | 221 + sys/contrib/openzfs/man/man8/zfs-clone.8 | 4 +- sys/contrib/openzfs/man/man8/zfs-create.8 | 2 +- sys/contrib/openzfs/man/man8/zfs-load-key.8 | 4 + sys/contrib/openzfs/man/man8/zfs-mount.8 | 6 + sys/contrib/openzfs/man/man8/zfs-rename.8 | 2 +- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 19 +- sys/contrib/openzfs/man/man8/zfs.8 | 1 + sys/contrib/openzfs/module/Kbuild.in | 26 +- sys/contrib/openzfs/module/Makefile.bsd | 13 +- sys/contrib/openzfs/module/Makefile.in | 5 +- sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 1 + .../openzfs/module/icp/algs/sha2/sha512_impl.c | 18 + .../icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S | 44 +- .../module/icp/asm-x86_64/modes/ghash-x86_64.S | 64 - .../module/icp/asm-x86_64/sha2/sha512-x86_64.S | 321 +- .../icp/include/modes/gcm_asm_rename_funcs.h} | 30 +- sys/contrib/openzfs/module/nvpair/nvpair.c | 4 +- .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 19 + .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 3 + .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 25 +- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 13 - .../openzfs/module/os/linux/spl/spl-atomic.c | 36 - .../openzfs/module/os/linux/spl/spl-generic.c | 258 - .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 8 +- sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 4 +- .../openzfs/module/os/linux/spl/spl-kstat.c | 3 - .../openzfs/module/os/linux/spl/spl-math-compat.c | 275 + .../openzfs/module/os/linux/spl/spl-trace.c | 2 - sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 16 + .../openzfs/module/os/linux/zfs/vdev_disk.c | 7 + .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 21 +- .../openzfs/module/os/linux/zfs/zpl_export.c | 87 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 4 + .../openzfs/module/os/linux/zfs/zpl_inode.c | 26 + .../openzfs/module/os/linux/zfs/zpl_super.c | 63 + sys/contrib/openzfs/module/zcommon/simd_stat.c | 2 + sys/contrib/openzfs/module/zcommon/zfs_prop.c | 10 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 17 + sys/contrib/openzfs/module/zfs/arc.c | 1347 ++-- sys/contrib/openzfs/module/zfs/btree.c | 17 +- sys/contrib/openzfs/module/zfs/dataset_kstats.c | 2 +- sys/contrib/openzfs/module/zfs/dbuf.c | 26 +- sys/contrib/openzfs/module/zfs/ddt.c | 95 +- sys/contrib/openzfs/module/zfs/ddt_log.c | 4 +- sys/contrib/openzfs/module/zfs/ddt_stats.c | 15 + sys/contrib/openzfs/module/zfs/dmu.c | 4 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 19 + sys/contrib/openzfs/module/zfs/dmu_recv.c | 46 +- sys/contrib/openzfs/module/zfs/dmu_tx.c | 7 +- sys/contrib/openzfs/module/zfs/dsl_dataset.c | 8 +- sys/contrib/openzfs/module/zfs/metaslab.c | 72 +- sys/contrib/openzfs/module/zfs/mmp.c | 158 +- sys/contrib/openzfs/module/zfs/range_tree.c | 22 +- sys/contrib/openzfs/module/zfs/sa.c | 15 +- sys/contrib/openzfs/module/zfs/spa.c | 791 ++- sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 5 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 75 +- .../openzfs/module/{unicode => zfs}/u8_textprep.c | 0 sys/contrib/openzfs/module/zfs/vdev.c | 18 +- sys/contrib/openzfs/module/zfs/vdev_file.c | 3 + sys/contrib/openzfs/module/zfs/vdev_label.c | 10 +- sys/contrib/openzfs/module/zfs/vdev_queue.c | 40 + sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 20 +- sys/contrib/openzfs/module/zfs/zcp_get.c | 8 + sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 16 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 83 +- sys/contrib/openzfs/module/zfs/zio_compress.c | 2 +- sys/contrib/openzfs/module/zstd/README.md | 44 +- .../module/zstd/include/zstd_compat_wrapper.h | 271 +- .../openzfs/module/zstd/lib/common/allocations.h | 56 + sys/contrib/openzfs/module/zstd/lib/common/bits.h | 206 + .../openzfs/module/zstd/lib/common/bitstream.h | 210 +- .../openzfs/module/zstd/lib/common/compiler.h | 372 +- sys/contrib/openzfs/module/zstd/lib/common/cpu.h | 40 +- sys/contrib/openzfs/module/zstd/lib/common/debug.h | 57 +- .../module/zstd/lib/common/entropy_common.c | 220 +- .../openzfs/module/zstd/lib/common/error_private.c | 13 +- .../openzfs/module/zstd/lib/common/error_private.h | 104 +- sys/contrib/openzfs/module/zstd/lib/common/fse.h | 143 +- .../module/zstd/lib/common/fse_decompress.c | 206 +- sys/contrib/openzfs/module/zstd/lib/common/huf.h | 287 +- sys/contrib/openzfs/module/zstd/lib/common/mem.h | 284 +- sys/contrib/openzfs/module/zstd/lib/common/pool.c | 81 +- sys/contrib/openzfs/module/zstd/lib/common/pool.h | 25 +- .../module/zstd/lib/common/portability_macros.h | 172 + .../openzfs/module/zstd/lib/common/xxhash.c | 865 --- .../openzfs/module/zstd/lib/common/xxhash.h | 7199 +++++++++++++++++++- .../openzfs/module/zstd/lib/common/zstd_common.c | 44 +- .../openzfs/module/zstd/lib/common/zstd_deps.h | 124 + .../openzfs/module/zstd/lib/common/zstd_internal.h | 345 +- .../openzfs/module/zstd/lib/common/zstd_trace.h | 157 + .../openzfs/module/zstd/lib/compress/clevels.h | 135 + .../module/zstd/lib/compress/fse_compress.c | 249 +- .../openzfs/module/zstd/lib/compress/hist.c | 66 +- .../openzfs/module/zstd/lib/compress/hist.h | 11 +- .../module/zstd/lib/compress/huf_compress.c | 1240 +++- .../module/zstd/lib/compress/zstd_compress.c | 5917 ++++++++++++---- .../zstd/lib/compress/zstd_compress_internal.h | 1017 ++- .../zstd/lib/compress/zstd_compress_literals.c | 163 +- .../zstd/lib/compress/zstd_compress_literals.h | 22 +- .../zstd/lib/compress/zstd_compress_sequences.c | 75 +- .../zstd/lib/compress/zstd_compress_sequences.h | 15 +- .../zstd/lib/compress/zstd_compress_superblock.c | 693 +- .../zstd/lib/compress/zstd_compress_superblock.h | 2 +- .../openzfs/module/zstd/lib/compress/zstd_cwksp.h | 484 +- .../module/zstd/lib/compress/zstd_double_fast.c | 611 +- .../module/zstd/lib/compress/zstd_double_fast.h | 32 +- .../openzfs/module/zstd/lib/compress/zstd_fast.c | 1039 ++- .../openzfs/module/zstd/lib/compress/zstd_fast.h | 21 +- .../openzfs/module/zstd/lib/compress/zstd_lazy.c | 1665 ++++- .../openzfs/module/zstd/lib/compress/zstd_lazy.h | 184 +- .../openzfs/module/zstd/lib/compress/zstd_ldm.c | 608 +- .../openzfs/module/zstd/lib/compress/zstd_ldm.h | 27 +- .../module/zstd/lib/compress/zstd_ldm_geartab.h | 107 + .../openzfs/module/zstd/lib/compress/zstd_opt.c | 1004 ++- .../openzfs/module/zstd/lib/compress/zstd_opt.h | 58 +- .../module/zstd/lib/compress/zstd_preSplit.c | 239 + .../module/zstd/lib/compress/zstd_preSplit.h | 34 + .../module/zstd/lib/decompress/huf_decompress.c | 1858 +++-- .../zstd/lib/decompress/huf_decompress_amd64.S | 603 ++ .../module/zstd/lib/decompress/zstd_ddict.c | 24 +- .../module/zstd/lib/decompress/zstd_ddict.h | 4 +- .../module/zstd/lib/decompress/zstd_decompress.c | 897 ++- .../zstd/lib/decompress/zstd_decompress_block.c | 1565 +++-- .../zstd/lib/decompress/zstd_decompress_block.h | 24 +- .../zstd/lib/decompress/zstd_decompress_internal.h | 79 +- sys/contrib/openzfs/module/zstd/lib/zstd.h | 1848 ++++- .../module/zstd/lib/{common => }/zstd_errors.h | 45 +- sys/contrib/openzfs/module/zstd/zfs_zstd.c | 35 +- sys/contrib/openzfs/module/zstd/zstd-in.c | 93 +- sys/contrib/openzfs/rpm/Makefile.am | 1 + sys/contrib/openzfs/scripts/Makefile.am | 1 + sys/contrib/openzfs/scripts/objtool-wrapper.in | 4 +- sys/contrib/openzfs/scripts/spdxcheck.pl | 25 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- sys/contrib/openzfs/tests/Makefile.am | 1 + sys/contrib/openzfs/tests/runfiles/common.run | 15 +- sys/contrib/openzfs/tests/runfiles/linux.run | 8 +- sys/contrib/openzfs/tests/runfiles/sanity.run | 3 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 4 - sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + .../tests/zfs-tests/callbacks/zfs_dbgmsg.ksh | 2 +- .../openzfs/tests/zfs-tests/callbacks/zfs_mmp.ksh | 2 +- sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 5 +- .../tests/zfs-tests/cmd/checksum/sha2_test.c | 39 +- .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 2 +- sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 + .../openzfs/tests/zfs-tests/include/commands.cfg | 5 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 54 +- .../openzfs/tests/zfs-tests/include/tunables.cfg | 4 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 18 + .../bclone/bclone_crossfs_corner_cases.ksh | 9 + .../bclone/bclone_crossfs_corner_cases_limited.ksh | 9 + .../functional/bclone/bclone_crossfs_data.ksh | 7 + .../functional/bclone/bclone_crossfs_embedded.ksh | 7 + .../functional/bclone/bclone_diffprops_all.ksh | 28 +- .../bclone/bclone_diffprops_checksum.ksh | 18 +- .../bclone/bclone_diffprops_compress.ksh | 16 +- .../functional/bclone/bclone_diffprops_copies.ksh | 18 +- .../bclone/bclone_diffprops_recordsize.ksh | 18 +- .../tests/functional/bclone/bclone_prop_sync.ksh | 12 +- .../bclone/bclone_samefs_corner_cases.ksh | 7 + .../bclone/bclone_samefs_corner_cases_limited.ksh | 7 + .../tests/functional/bclone/bclone_samefs_data.ksh | 6 + .../functional/bclone/bclone_samefs_embedded.ksh | 6 + .../functional/block_cloning/block_cloning.kshlib | 24 - .../block_cloning_after_device_removal.ksh | 61 + .../tests/functional/cache/cache_012_pos.ksh | 5 + .../cli_root/zfs_clone/zfs_clone_nomount.ksh | 66 + .../zfs_rewrite/zfs_rewrite_skip_clone.ksh | 83 + .../zfs_rewrite/zfs_rewrite_skip_snapshot.ksh | 74 + .../zpool_create/zpool_create_tempname.ksh | 2 + .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + .../functional/cli_root/zpool_get/zpool_get.cfg | 2 + .../cli_root/zpool_get/zpool_get_parsable.cfg | 4 +- .../cli_root/zpool_set/vdev_set_scheduler.ksh | 93 + .../zfs_send_delegation_user/zfs_send_usertest.ksh | 11 +- .../functional/events/zed_synchronous_zedlet.ksh | 6 +- .../zfs-tests/tests/functional/l2arc/l2arc.cfg | 3 +- .../functional/l2arc/l2arc_dwpd_ratelimit_pos.ksh | 138 + .../functional/l2arc/l2arc_dwpd_reimport_pos.ksh | 169 + .../l2arc/l2arc_multidev_scaling_pos.ksh | 162 + .../l2arc/l2arc_multidev_throughput_pos.ksh | 133 + .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + .../tests/functional/lease/lease_setlease.ksh | 44 + .../zfs-tests/tests/functional/lease/setup.ksh | 27 + .../tests/zfs-tests/tests/functional/mmp/mmp.cfg | 6 +- .../zfs-tests/tests/functional/mmp/mmp.kshlib | 47 +- .../tests/functional/mmp/mmp_active_import.ksh | 42 +- .../tests/functional/mmp/mmp_concurrent_import.ksh | 133 + .../tests/functional/mmp/mmp_exported_import.ksh | 16 +- .../zfs-tests/tests/functional/mmp/mmp_hostid.ksh | 8 +- .../tests/functional/mmp/mmp_inactive_import.ksh | 20 +- .../zfs-tests/tests/functional/mmp/mmp_on_off.ksh | 4 +- .../tests/functional/mmp/mmp_on_thread.ksh | 4 +- .../tests/functional/mmp/mmp_on_uberblocks.ksh | 14 +- .../zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh | 3 +- .../tests/functional/mmp/mmp_reset_interval.ksh | 8 +- .../functional/mmp/mmp_write_distribution.ksh | 2 +- .../tests/functional/mmp/mmp_write_uberblocks.ksh | 4 +- .../tests/functional/mmp/multihost_history.ksh | 2 + .../tests/functional/mount/mount_loopback.ksh | 3 +- .../zfs-tests/tests/functional/pam/pam_basic.ksh | 58 + .../tests/functional/pam/pam_change_unmounted.ksh | 13 +- .../tests/functional/pam/pam_nounmount.ksh | 14 +- .../tests/zfs-tests/tests/functional/pam/setup.ksh | 11 + .../tests/functional/pam/utilities.kshlib.in | 6 + .../rsend/send_large_blocks_incremental.ksh | 83 + .../functional/rsend/send_large_blocks_initial.ksh | 86 + .../rsend/send_large_microzap_incremental.ksh | 91 + .../rsend/send_large_microzap_transitive.ksh | 100 + .../tests/functional/snapshot/snapshot_018_pos.ksh | 52 +- .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 5 +- sys/contrib/openzfs/udev/Makefile.am | 1 + sys/modules/dtrace/fasttrap/Makefile | 2 +- sys/modules/zfs/Makefile | 8 +- sys/modules/zfs/zfs_config.h | 24 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 513 files changed, 34137 insertions(+), 10963 deletions(-) diff --cc cddl/lib/libzfs/Makefile index a034118a6f5b,000000000000..8f364d2c2bb1 mode 100644,000000..100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@@ -1,109 -1,0 +1,105 @@@ +.PATH: ${ZFSTOP}/module/icp +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/lib/libzfs +.PATH: ${ZFSTOP}/lib/libzfs/os/freebsd - .PATH: ${ZFSTOP}/lib/libshare +.PATH: ${ZFSTOP}/include +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib + +PACKAGE= zfs +LIB_PACKAGE= + +LIB= zfs +LIBADD= \ + avl \ + bsdxml \ + crypto \ + geom \ + m \ + md \ + nvpair \ + pthread \ + rt \ + umem \ + util \ + z \ + zfs_core \ + zutil + +INCS= libzfs.h +USER_C = \ - libzfs_changelist.c \ - libzfs_config.c \ - libzfs_crypto.c \ - libzfs_dataset.c \ - libzfs_diff.c \ - libzfs_import.c \ - libzfs_iter.c \ - libzfs_mount.c \ - libzfs_pool.c \ - libzfs_sendrecv.c \ - libzfs_status.c \ - libzfs_util.c ++ libzfs_changelist.c \ ++ libzfs_config.c \ ++ libzfs_crypto.c \ ++ libzfs_dataset.c \ ++ libzfs_diff.c \ ++ libzfs_import.c \ ++ libzfs_iter.c \ ++ libzfs_mount.c \ ++ libzfs_pool.c \ ++ libzfs_sendrecv.c \ ++ libzfs_share.c \ ++ libzfs_share_nfs.c \ ++ libzfs_status.c \ ++ libzfs_util.c \ ++ os/freebsd/libzfs_share_nfs.c \ ++ os/freebsd/libzfs_share_smb.c + +# FreeBSD +USER_C += \ + libzfs_compat.c \ + libzfs_zmount.c + - # libshare - USER_C += \ - libshare.c \ - nfs.c \ - os/freebsd/nfs.c \ - os/freebsd/smb.c - +KERNEL_C = \ + cityhash.c \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zfs_valstr.c \ + zpool_prop.c \ + zprop_common.c + +ARCH_C = +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ARCH_C += zfs_fletcher_intel.c \ + zfs_fletcher_sse.c +CFLAGS += -DHAVE_SSE2 +.endif +.if ${MACHINE_ARCH} == "amd64" +ARCH_C += zfs_fletcher_avx512.c +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F +.endif +.if ${MACHINE_CPUARCH} == "aarch64" +ARCH_C += zfs_fletcher_aarch64_neon.c +.endif + +SRCS= $(USER_C) $(KERNEL_C) $(ARCH_C) + +WARNS?= 2 +SHLIB_MAJOR= 4 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${ZFSTOP}/include +CFLAGS+= -I${ZFSTOP}/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libspl/include +CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS+= -I${ZFSTOP}/lib/libshare +CFLAGS+= -I${ZFSTOP}/lib/libzpool/include +CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${ZFSTOP}/module/icp/include +CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_EXECVPE +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +CFLAGS+= -DSYSCONFDIR=\"/etc\" +CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" +CFLAGS+= -DZFSEXECDIR=\"${LIBEXECDIR}/zfs\" + +.include diff --cc cddl/lib/libzpool/Makefile index ade864790f1c,000000000000..74a5f6ccb438 mode 100644,000000..100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@@ -1,343 -1,0 +1,342 @@@ +.PATH: ${ZFSTOP}/lib/libzpool + +# ZFS_COMMON_SRCS +.PATH: ${ZFSTOP}/module/zfs +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/module/unicode +# LUA_SRCS +.PATH: ${ZFSTOP}/module/lua +# ZSTD_SRCS +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib/common +.PATH: ${ZFSTOP}/module/zstd/lib/compress +.PATH: ${ZFSTOP}/module/zstd/lib/decompress + +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +ATOMIC_SRCS= opensolaris_atomic.S +ACFLAGS+= -Wa,--noexecstack +.else +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern +ATOMIC_SRCS= opensolaris_atomic.c +.endif + +.if ${MACHINE_ARCH} == "powerpc" +# Don't waste GOT entries on small data. +PICFLAG= -fPIC +.endif + +PACKAGE= zfs +LIB_PACKAGE= + +LIB= zpool + +USER_C = \ + arc_os.c \ + kernel.c \ + util.c \ + zfs_debug.c + +.PATH: ${ZFSTOP}/module/os/linux/zfs + +KERNEL_C = \ + simd_stat.c \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zfs_zstd.c \ + zpool_prop.c \ + zprop_common.c \ + abd.c \ + abd_os.c \ + aggsum.c \ + arc.c \ + blake3_zfs.c \ + blkptr.c \ + bplist.c \ + bpobj.c \ + bptree.c \ + bqueue.c \ + btree.c \ + brt.c \ + cityhash.c \ + dbuf.c \ + dbuf_stats.c \ + ddt.c \ + ddt_log.c \ + ddt_stats.c \ + ddt_zap.c \ + dmu.c \ + dmu_diff.c \ + dmu_direct.c \ + dmu_object.c \ + dmu_objset.c \ + dmu_recv.c \ + dmu_redact.c \ + dmu_send.c \ + dmu_traverse.c \ + dmu_tx.c \ + dmu_zfetch.c \ + dnode.c \ + dnode_sync.c \ + dsl_bookmark.c \ + dsl_dataset.c \ + dsl_deadlist.c \ + dsl_deleg.c \ + dsl_dir.c \ + dsl_crypt.c \ + dsl_pool.c \ + dsl_prop.c \ + dsl_scan.c \ + dsl_synctask.c \ + dsl_destroy.c \ + dsl_userhold.c \ + edonr_zfs.c \ + entropy_common.c \ + error_private.c \ + fm.c \ + fse_compress.c \ + fse_decompress.c \ + gzip.c \ + hist.c \ + hkdf.c \ + huf_compress.c \ + huf_decompress.c \ + lzjb.c \ + lz4.c \ + lz4_zfs.c \ + metaslab.c \ + mmp.c \ + multilist.c \ + objlist.c \ + pathname.c \ + pool.c \ + range_tree.c \ + refcount.c \ + rrwlock.c \ + sa.c \ + sha2_zfs.c \ + skein_zfs.c \ + spa.c \ + spa_checkpoint.c \ + spa_config.c \ + spa_errlog.c \ + spa_history.c \ + spa_log_spacemap.c \ + spa_misc.c \ + spa_stats.c \ + space_map.c \ + space_reftree.c \ + txg.c \ ++ u8_textprep.c \ + trace.c \ + uberblock.c \ + unique.c \ + vdev.c \ + vdev_draid.c \ + vdev_draid_rand.c \ + vdev_file.c \ + vdev_indirect_births.c \ + vdev_indirect.c \ + vdev_indirect_mapping.c \ + vdev_initialize.c \ + vdev_label.c \ + vdev_label_os.c \ + vdev_mirror.c \ + vdev_missing.c \ + vdev_queue.c \ + vdev_raidz.c \ + vdev_raidz_math_aarch64_neon.c \ + vdev_raidz_math_aarch64_neonx2.c \ + vdev_raidz_math_avx2.c \ + vdev_raidz_math_avx512bw.c \ + vdev_raidz_math_avx512f.c \ + vdev_raidz_math.c \ + vdev_raidz_math_scalar.c \ + vdev_rebuild.c \ + vdev_removal.c \ + vdev_root.c \ + vdev_trim.c \ - xxhash.c \ + zap.c \ + zap_leaf.c \ + zap_micro.c \ + zcp.c \ + zcp_get.c \ + zcp_global.c \ + zcp_iter.c \ + zcp_set.c \ + zcp_synctask.c \ + zfeature.c \ + zfs_byteswap.c \ + zfs_chksum.c \ + zfs_crrd.c \ + zfs_debug_common.c \ + zfs_fm.c \ + zfs_fuid.c \ + zfs_impl.c \ + zfs_sa.c \ + zfs_znode.c \ + zfs_racct.c \ + zfs_ratelimit.c \ + zfs_rlock.c \ + zil.c \ + zio.c \ + zio_checksum.c \ + zio_compress.c \ + zio_crypt.c \ + zio_inject.c \ + zle.c \ + zrlock.c \ + zstd_common.c \ + zstd_compress.c \ + zstd_compress_literals.c \ + zstd_compress_sequences.c \ + zstd_compress_superblock.c \ + zstd_ddict.c \ + zstd_decompress.c \ + zstd_decompress_block.c \ + zstd_double_fast.c \ + zstd_fast.c \ + zstd_lazy.c \ + zstd_ldm.c \ + zstd_opt.c \ ++ zstd_preSplit.c \ + zthr.c + +ARCH_C = +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ARCH_C += vdev_raidz_math_sse2.c \ + vdev_raidz_math_ssse3.c \ + zfs_fletcher_intel.c \ + zfs_fletcher_sse.c +CFLAGS += -DHAVE_SSE2 -DHAVE_SSE3 +.endif +.if ${MACHINE_ARCH} == "amd64" +ARCH_C += zfs_fletcher_avx512.c +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ + -DHAVE_AVX512BW +.endif +.if ${MACHINE_CPUARCH} == "aarch64" +ARCH_C += zfs_fletcher_aarch64_neon.c +.endif + +LUA_C = \ + lapi.c \ + lauxlib.c \ + lbaselib.c \ + lcode.c \ + lcompat.c \ + lcorolib.c \ + lctype.c \ + ldebug.c \ + ldo.c \ + lfunc.c \ + lgc.c \ + llex.c \ + lmem.c \ + lobject.c \ + lopcodes.c \ + lparser.c \ + lstate.c \ + lstring.c \ + lstrlib.c \ + ltable.c \ + ltablib.c \ + ltm.c \ + lvm.c \ + lzio.c + - UNICODE_C = u8_textprep.c - - SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} ++SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${ARCH_C} + *** 15577 LINES SKIPPED *** From nobody Sat Mar 14 14:03:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY3430FDMz6Vwk9 for ; Sat, 14 Mar 2026 14:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY3426nSCz3JJP for ; Sat, 14 Mar 2026 14:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHWNqRgco4y/4NObMpLoc0yIkvGbq8cD3GoQPqLsUiE=; b=e4BafjXgNlSAjlMaoVc4kkYbuMPMG6Ni1LAHN/ikA4mvXjCkgxQiDa48puMmJI7K7gnjkF JVyCNxcky5TwR67BEOJhIxDChDbWJe3AxV82rhBSaPKx4Vb7re3yISkkusr55Qo2lEaLpg XsY5JjEU+vrF/+YyheKbBFhg6tHJsi8MqkCnMIifJPqkoTGEzH46Qd1vyvO1lAIiieT+yi kkZvdQUA5wFNtj4QUcOVJWd0FuFv/t05BsCwCuayxVz5e//zFtaRlpP7tE5m8Fd4baj/q/ ojupTwZeHhlnbhcETHZftwVtRJKEB4dIbSYNCIRj6fkUQQaSXUHwOdwRyTzd0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773497027; a=rsa-sha256; cv=none; b=YtkVBFMcnRyKZTh4rZvjh5I/J4wnJ4dkHhinhanr9zOPjxGjqqHiJZlh387SUg/dT99qyi kWvsYFJIpAfzUyogBHgZv1D7t7o8f83cM+dpsAFI+cdRjXYQSqN3TrHSwszXXtEPbE1dMz 4v0wD2xtYPzEIi6GPvAsgYrLD2J3+h1yhAFk7hFb17bRpTSEQRpQm9G63RzbaBUSryviYp OxsLXmfcuulhKb1kqZB23g+afkKn+pII+xlZJ4viRlnK/yh6nyrPaHYR1WrGxKUVrWvnbI RsQdIfG+ed2ENy4pEZm5hlx0LJ+v7Inp9wH6DnemSq4qONeMGbAegVmOxHGk3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHWNqRgco4y/4NObMpLoc0yIkvGbq8cD3GoQPqLsUiE=; b=kBcIeSSctxnvGQAHFTSh+0g5rUi4Amq5NoOzwg4ovoWYYVyADW+THIa13HrxVR7sHOImFH D/R2tZt32MN35dK7CNmm+Vv+M+yVBlI9BvgLCVJx1XpOgdN+ygFQFC2QQoPHIr4sGSWzIs VfvcSAbHTpR9hwwQwZsOi1++AMUIl/IoTWaoIR0QqgT5lU5sZ7u6bYsrtti+mSRsGrNDzt kf0CEWEDGsBAKsKHjhapQHCp/b3mfTh0GlxbyXvFEkgO0xz/N/JYTeiK3V7G/d4WyP0Lko RstwUEg9C/G0b3YrRFksGinAsL+9erbX99HBRISNpZjJ47lXPwxfRfxsmnvOaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY3426M14z1KVX for ; Sat, 14 Mar 2026 14:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3db11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 14:03:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9c49c393a81b - stable/15 - virtual_oss: Use virtual_oss_timestamp() to avoid duplication List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c49c393a81bd47304ba76f26892faf4fc172d1c Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 14:03:46 +0000 Message-Id: <69b56ac2.3db11.7d95377c@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9c49c393a81bd47304ba76f26892faf4fc172d1c commit 9c49c393a81bd47304ba76f26892faf4fc172d1c Author: Christos Margiolis AuthorDate: 2026-03-07 23:46:28 +0000 Commit: Christos Margiolis CommitDate: 2026-03-14 14:03:30 +0000 virtual_oss: Use virtual_oss_timestamp() to avoid duplication Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit e75c8faf277dded0a80d469cb8182583716a2211) --- usr.sbin/virtual_oss/virtual_oss/virtual_oss.c | 29 ++++++++++++-------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c index fc7892df892c..18af38d8e7aa 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c @@ -39,6 +39,18 @@ #include "backend.h" #include "int.h" +uint64_t +virtual_oss_timestamp(void) +{ + struct timespec ts; + uint64_t nsec; + + clock_gettime(CLOCK_MONOTONIC, &ts); + + nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; + return (nsec); +} + uint64_t virtual_oss_delay_ns(void) { @@ -54,31 +66,16 @@ virtual_oss_delay_ns(void) void virtual_oss_wait(void) { - struct timespec ts; uint64_t delay; uint64_t nsec; - clock_gettime(CLOCK_MONOTONIC, &ts); - - nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; + nsec = virtual_oss_timestamp(); delay = virtual_oss_delay_ns(); usleep((delay - (nsec % delay)) / 1000); } -uint64_t -virtual_oss_timestamp(void) -{ - struct timespec ts; - uint64_t nsec; - - clock_gettime(CLOCK_MONOTONIC, &ts); - - nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; - return (nsec); -} - static size_t vclient_read_linear(struct virtual_client *pvc, struct virtual_ring *pvr, int64_t *dst, size_t total) __requires_exclusive(atomic_mtx) From nobody Sat Mar 14 14:03:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY3470rkCz6VwcG for ; Sat, 14 Mar 2026 14:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY3466MSNz3JW2 for ; Sat, 14 Mar 2026 14:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mLIoHopMDUIyHbPBGPB/XkEt2s2zdKB1ZWyyY0lRIKU=; b=ODyoPkt1aLDGt9NWlkkRZGszXnuIFL5NmD566QC9xu2bVcOasK466QISjsto4+RSYimRjV dWMLvTA+7mpeB5mZgLDnuKLhMLWUxUYayAy3+eD65szlk80VWITGjhZ/Y/EkJyM++7vBM8 3vVePIZ4AILY8cF580Jy+6ns/Nqj+5r9i/G2SgkrXBKrTIZvbrylRL/A6SAvLtUd47wF58 1ODgSYgC7Q08wRH7YhMIXqvCQWWJjCeWKvSQi7riIQ9gSZybqiaZPkGrm/c6kOkWena58p qS/LPAkmM7ClaYeaQVwTJ0chEYojvibhwWWeYQpc0AeR4tTgRkrej+dnNvbuqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773497030; a=rsa-sha256; cv=none; b=YkFtWn52KH+I+WHNn0wJQZsIODCyyIWFTWBjcTaHV8NvTK4mVkBkFWCSJzKgwRym7OznKa XU0PlEf5tnXrTsMwY61DNFzeikjN4r+yHec/PMaF6kAdFS69iyG2xsaI9W7TlIkSUgkE0i qEYCz46WZqQCEvUIaeOhq1xP/GCVxPICjNU6tcllrppO3qo9AQlIjd35RdpVBaO/n6u09B qzcSc2kB8EMOqh5M8hmXYtyWkQnaeJlL/VBpq58f7aABKf7wX+SaXgmzmAPapKIQa5KgmR 6CnHs/Tws97kdNQ7Ac4dPHdTwF268KAV9npPKWkR0/+BtDN/UGjHSgTavP/PnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mLIoHopMDUIyHbPBGPB/XkEt2s2zdKB1ZWyyY0lRIKU=; b=ZUJ85m5bjZdk79ygP0Lrs9X5CuR77TKV6w+aqWfbIAaMOfj/gdLD/plJz9bEBMIrzUIn8e CL0p3V3NMZLoWEMnswufS5B35405ItiK4/BkMFQHfC5HlpM0Eq6VjbdD0KfZdLYNLcVOs2 QSXXcE/QFkby799RKfX7S03ExuWZoLOA6MkKfsC9lJiH2gNxjZ3ZnteuWgeu860pFu6fn/ gBlZAdP+bfSRuZWkUHHTGQSeTO0Pqps1SEDu52D4fk/2Zrs80Cxlsa4X2R2NtxFL1mW5Xx 4NXemeK2IsfA2WNwfCHMcOKnHJz99CqSzldajBByGjsgkjEdq0+pjRFfVrzBJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY3465lx9z1L01 for ; Sat, 14 Mar 2026 14:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d897 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 14:03:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c4e303fbdca7 - stable/15 - virtual_oss: Use virtual_oss_delay_ns() to avoid duplication List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c4e303fbdca7cdf9a2a98e56fc906ec3f9d54337 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 14:03:45 +0000 Message-Id: <69b56ac1.3d897.59bd0142@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e303fbdca7cdf9a2a98e56fc906ec3f9d54337 commit c4e303fbdca7cdf9a2a98e56fc906ec3f9d54337 Author: Christos Margiolis AuthorDate: 2026-03-07 23:46:25 +0000 Commit: Christos Margiolis CommitDate: 2026-03-14 14:03:30 +0000 virtual_oss: Use virtual_oss_delay_ns() to avoid duplication Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 3a410851bf02c247e71bcd06fdeec2706c6b6070) --- usr.sbin/virtual_oss/virtual_oss/virtual_oss.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c index 891653494f06..fc7892df892c 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c @@ -62,10 +62,7 @@ virtual_oss_wait(void) nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; - /* TODO use virtual_oss_delay_ns() */ - delay = voss_dsp_samples; - delay *= 1000000000ULL; - delay /= voss_dsp_sample_rate; + delay = virtual_oss_delay_ns(); usleep((delay - (nsec % delay)) / 1000); } From nobody Sat Mar 14 15:28:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY4yF1xH7z6T5Gl for ; Sat, 14 Mar 2026 15:28: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY4yF1QYrz3RhL for ; Sat, 14 Mar 2026 15:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773502133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXHxFtB4FyF6744SWrNNUCU+7FCJ4VV2u74les608g0=; b=qQbtTZ6IDUZqnYH/US9tfXl0CTqeSwCDn8XxRdt//u1oYVyxy29oERnR5GMu4fBmvw7Wnm cgyZN7ev8dz1UwbRad8CPOGHL/i2A7ElrA+X6rJtsqHlOvELCe9UtofhXyIRCl2e45UMHS DO/TyA/ofmI1E+UrX15SAJMQXg4IM9giG6hCYVsyFuXjxKQjOarlLXXimL3niVQ/CPCkIe KwOuJ9d9EiGoClZKGhK/fDt2YqlPdk1tX/GfuMxw974DyYcl1trdxZV2ygjnU2cTN9OOn/ x7Ox7Tdi9rv13uVE6E036ykZqq+GsWbJ+0yoSRbP1eSZAZBwMvjGGK3+EbFLHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773502133; a=rsa-sha256; cv=none; b=UYqhLL9+SmkPgKeY6U1nhocn1hRj5SnbYe7MkMlqSDNWI6LN0eKf/g4lIQjY6ZBw0uDEqK Wx/IPgn7oHyn4RZZU89b+PQ2WD679x7wpklgHLHSYTUluHCOo07nlCrXIXT+7dXqPZRT6/ ZFK0sOxzoBljjy5/byF6TQiCTO/9RiVC/Y+d6k/NgMm8Omi6Ef5nvrOnNhOTNMdYPCXMLQ uwlI8RLLfzf6jesJRK6ZqVuM4peR7AuUga89aH2TOhBY1GT5cGAJTBsuZot3M4IkH4PWk3 7Lo4ijrNdSsljf+PcBsPFD0fyCloh4p6bQrImyAlfUGqNvQDGJ9Uau+EI11F6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773502133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXHxFtB4FyF6744SWrNNUCU+7FCJ4VV2u74les608g0=; b=sKAgCW8dxCgn2/MBNE2O/hm00A7KMRhJK/nMvLXexFkZcIFPlEp0WzTG4CJDjj7ENdsX4c BJSUeT0TDxO525rYkONQ5ECR53gSbtzkIk6q42jyfHvviwULWax25zgLX9L+hsUNV6A+Ds PWnXl/4tvSdqZx6aTNMUwvCxXRo5SlX+pFQwyJ4+u4EHET2jRNUZLnJOpZeFpJrD43RM7c knSXjY0vmL3nqAUbfcEwkK6aei+xPZxJNm5ewbsmmzLY9C7/qgkysS6agjxq4zWoHqkX3z FH3ZZhkLdTodXiawuaoYysH1K35uuvlbgD61pGzjfBEoaz0skkOvLXKXaB+N7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY4yF11ypz1MRy for ; Sat, 14 Mar 2026 15:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 15:28:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Laurent Chardon Subject: git: 4efe7fa072d5 - main - committers-ports.dot: Add new committer (laurent) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: laurent X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4efe7fa072d5ec47b673a3c82393c7db9a3568c0 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 15:28:48 +0000 Message-Id: <69b57eb0.45b20.2797f164@gitrepo.freebsd.org> The branch main has been updated by laurent: URL: https://cgit.FreeBSD.org/src/commit/?id=4efe7fa072d5ec47b673a3c82393c7db9a3568c0 commit 4efe7fa072d5ec47b673a3c82393c7db9a3568c0 Author: Laurent Chardon AuthorDate: 2026-03-14 09:09:08 +0000 Commit: Laurent Chardon CommitDate: 2026-03-14 15:26:34 +0000 committers-ports.dot: Add new committer (laurent) Update Mentor (thierry) and Mentee (laurent) Information. Reviewed by: thierry (mentor) Approved by: thierry (mentor) Differential Revision: https://reviews.freebsd.org/D55856 --- share/misc/committers-ports.dot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 416695aac3b6..447e1263e9f6 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -228,6 +228,7 @@ kevans [label="Kyle Evans\nkevans@FreeBSD.org\n2020/02/14"] knu [label="Akinori Musha\nknu@FreeBSD.org\n2000/03/22"] krion [label="Kirill Ponomarew\nkrion@FreeBSD.org\n2003/07/20"] kwm [label="Koop Mast\nkwm@FreeBSD.org\n2004/09/14"] +laurent [label="Laurent Chardon\nlaurent@FreeBSD.org\n2026/03/03"] lawrance [label="Sam Lawrance\nlawrance@FreeBSD.org\n2005/04/11\n2007/02/21"] lbartoletti [label="Loïc Bartoletti\nlbartoletti@FreeBSD.org\n2020/01/02"] lcook [label="Lewis Cook\nlcook@FreeBSD.org\n2021/01/21"] @@ -839,8 +840,9 @@ tcberner -> yuri tcberner -> zirias thierry -> jadawin -thierry -> riggs +thierry -> laurent thierry -> pfg +thierry -> riggs timur -> kbowling From nobody Sat Mar 14 15:37:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY57p10qGz6T5cw for ; Sat, 14 Mar 2026 15:37: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY57n5h0Mz3TLY for ; Sat, 14 Mar 2026 15:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773502629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsaJjLSwZKqQvSiNkHBi2jxL7/J1mkUfVX1QdLYc5Uo=; b=FF78jq2KHm5f6LrcVjguawpHc1p4XHuMPHUAicnKUD6VdcMVj43gGBU+FKPf7mBoq/rUen LBULnB+vnhhoQ4r1pRq8hpplhL8WTPQnXfJl3shsh9lPn8/48yFEySM3CLZK4wEQ1WDS0p 25haRVOf0qIUU4GNtjStUox/Ur44EsdO+LJqC/GQzdAtpReehtfwy+MN73k1L8zcCAMQLE 2zffkKPxgzp2ztgJ9tTNTxDxTvFwk6uWlgpocw0oKsVLUtnyxA0ytuGe0ykR8ju5ytwitn FVGp9KXD798MI/GJLXdyzpVY/Yn4M4I/gcjFJFglkhO0vChcxhoSsGVOOt5yig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773502629; a=rsa-sha256; cv=none; b=Kb4SR3AIIwxNGHr8+bOBkOpujF/IZmxBNqvDdCydUGotkAOVGau0Z5AbXtqX/p+j9LXE8S T98/UbH//3U/Idghe99iQSAK7ItEgdL78pDk+U06BbJJc4b9hsNA3P/8wXJfxzRWD7Rcb5 Zh/Jw3nILyfreuYpbUL3xaViawjtLxvnCYlGKSAMqnDSe9actQ4uiDQw+X2nXTQNCn7RAG /2EUBWzTLaCu9TJftATJFeKKH5ag9LzGQV10x9CvguPQnCuN91EKgWo74w03Gz6NYwD/Lh XpcOR047lt3ttek3ZLPgsjzV8fcalIiQs+auTwW+addRa1XLznCO1ZRR6crpOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773502629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsaJjLSwZKqQvSiNkHBi2jxL7/J1mkUfVX1QdLYc5Uo=; b=MqTcFlESbaoHq4ypZS654yXr3fveoi3GfYBaYfe72dd463Lw4XEoTHDfhMhsi4LfS7GGlU AyB8CIpK8NHfer2c0eklyplNz71l/74F/zCwPqXVxmS3b4nsP6RWyDmbUu8C1tuXb6K0B1 fK5BBlvVtttCP/m8aiQ1lGRkV8e9J+4/QvjI1WOo5+XAwnThtJ11mDcR3Xc2HEUwe+XW8W yRZ7dfgwgfj1gNc2SEZ1DQ9vHbaKpRq7nIhA+1GvrwrFUlpmXwuWQHBBp2hTSRzoXp6PzN 38+fq7sdSVAGQnEZ4meIfgYZmD67GOxPvc+r5EW89pYAIo5b8SLuOWh1FH0Ejw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY57n4Wrcz1N87 for ; Sat, 14 Mar 2026 15:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4755c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 15:37:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 922d73540d2d - main - tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 922d73540d2d9897e5e8160c445cefa13581564e Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 15:37:09 +0000 Message-Id: <69b580a5.4755c.5160ead3@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=922d73540d2d9897e5e8160c445cefa13581564e commit 922d73540d2d9897e5e8160c445cefa13581564e Author: Siva Mahadevan AuthorDate: 2026-03-14 03:54:46 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-14 15:34:03 +0000 tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset() ZSTD_resetDStream() is deprecated since 1.5.4: https://github.com/facebook/zstd/commit/5d8cfa6b96a6442ab1251f9de3b47a0eb12561a0 This change is needed to MFV zstd 1.5.7. Approved by: emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55835 --- sys/fs/tarfs/tarfs_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index e250c5cbce5a..0eff12c21d3f 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -355,7 +355,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) if (reset) { zio->ipos = zio->idx[zio->curidx].i; zio->opos = zio->idx[zio->curidx].o; - ZSTD_resetDStream(zstd->zds); + ZSTD_DCtx_reset(zstd->zds, ZSTD_reset_session_only); TARFS_DPF(ZIDX, "%s: skipping to index %u = i %zu o %zu\n", __func__, zio->curidx, (size_t)zio->ipos, (size_t)zio->opos); } else { @@ -511,7 +511,7 @@ fail_unlocked: zio->curidx = 0; zio->ipos = zio->idx[0].i; zio->opos = zio->idx[0].o; - ZSTD_resetDStream(zstd->zds); + ZSTD_DCtx_reset(zstd->zds, ZSTD_reset_session_only); } return (error); } From nobody Sat Mar 14 15:37:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY57t1y5Hz6T5gW for ; Sat, 14 Mar 2026 15:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY57s69RPz3Tcv for ; Sat, 14 Mar 2026 15:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773502633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=thIC6H/JOLKEHX94yRpUAP6oN7C49JgGOHPf4yfqL90=; b=Irg10WmWIdnQuUalWhU9a/I3r3YOoEUDwNtIKi940tyQckJ7+xJ9tgwb54DlsmqMXevlnB z/4AzE4gdIlVHCpTjdRQonAGzi3BIopxs+vFFcddhEWQhglH5hBJeGSCKYYyBlcXGsta9b fcBMpe3V523COC9g0jlMgSPlSc9iNzn17r0DEQXXARG5cRjRDywzXJVdYjW9klZbGynb+p P0zS+7OpgBrLTbLWpjQ1520yGxP2jeFofGMtSWsZUk51qGhaoasd1I8EA7zB20jr0f+c96 ozF9vkpWqZj9kg3El8MGRtrNUM7lIPg1NXOJM/U9DA/jDH/l1ST1AQ3dV/Yhww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773502633; a=rsa-sha256; cv=none; b=hl9jAFP4RXZPLOK+luJJfE9YwTCnuwBsrEW5VySV30ZH6lSR5H8YZFLoc3FsZkU0PevTAp 3UAGAyTFQjwvPNWIIHiKG+vrY5SacwoYnwxyjoC1dMUiYMtaucJiECE5tlESxPZfN/z2J2 /rmkPtW1meKJuQs36ozJSkCut68TBeBc0QOe53cpvIQmcPURByNbF4GlcSRiny5F7YC2OP 6OXpQwnW8nP3sjiFnTd7lywhHZmUR4rCRaaybG8UtbdMEjFrWXvetChZCNVkOGjBshI6PZ lxcaNlqRzXRjiHtF3gjEAs3nVqpwzd/wSgZMMUO9iOwKy2otIwN99lTd9pXkmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773502633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=thIC6H/JOLKEHX94yRpUAP6oN7C49JgGOHPf4yfqL90=; b=jjgTxW2yH+G+74tkykM64XLFFVHbUwgQO/d3vDuKbGVWhiJ02IKikaB13fQXAHTFqdDeAa zV7nTeaUQV+GzdjZOyLjaS9sBY1FA0pV/NnvTmE2SlkPxiHECpfJLz9+rao5D2pRe8Qvtf 8Uug0J/RdEiVgbpiQMni3phxfsVBa90Pl2/jjyaCL2iusaHpeZHSj8YMS53ylyw2TGmH+C 8v1QobkVQ52neJfHxncBHnFmNLlOpuu99+oImFHRt4o2I1dsocxV/t5i8YZFIHv42MiLsU eMfd0U4KUwsJXDScCzBcg56ixUJ+s/r/L+wuDX+ZquaeODIQAuFrnG0crfSrZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY57s5frQz1NFT for ; Sat, 14 Mar 2026 15:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b43 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 15:37:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 736d8852e190 - main - tests/fusefs: fix sign-compare warning on armv7 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 736d8852e190f69dc93206ed3fb2d1f712dc3ad1 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 15:37:08 +0000 Message-Id: <69b580a4.45b43.712f8ac1@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=736d8852e190f69dc93206ed3fb2d1f712dc3ad1 commit 736d8852e190f69dc93206ed3fb2d1f712dc3ad1 Author: Siva Mahadevan AuthorDate: 2026-03-14 03:48:31 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-14 15:32:16 +0000 tests/fusefs: fix sign-compare warning on armv7 Fixes: 7e68af7ce2c1b892954df415774fe59fd2f1b62f Reviewed by: asomers Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D55846 --- tests/sys/fs/fusefs/read.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc index 52dad3bc829e..c71b84241c71 100644 --- a/tests/sys/fs/fusefs/read.cc +++ b/tests/sys/fs/fusefs/read.cc @@ -461,10 +461,10 @@ TEST_F(AsyncReadNoAttrCache, read_sizechange) uint64_t ino = 42; mode_t mode = S_IFREG | 0644; int fd; - ssize_t bufsize = strlen(CONTENTS); + size_t bufsize = strlen(CONTENTS); uint8_t buf[bufsize]; - ssize_t size1 = bufsize - 1; - ssize_t size2 = bufsize; + size_t size1 = bufsize - 1; + size_t size2 = bufsize; Sequence seq; expect_lookup(RELPATH, ino); @@ -532,12 +532,12 @@ TEST_F(AsyncReadNoAttrCache, read_sizechange) fd = open(FULLPATH, O_RDONLY); ASSERT_LE(0, fd) << strerror(errno); - ASSERT_EQ(size1, read(fd, buf, bufsize)) << strerror(errno); + ASSERT_EQ(static_cast(size1), read(fd, buf, bufsize)) << strerror(errno); ASSERT_EQ(0, memcmp(buf, CONTENTS, size1)); /* Read again, but this time the server has changed the file's size */ bzero(buf, size2); - ASSERT_EQ(size2, pread(fd, buf, bufsize, 0)) << strerror(errno); + ASSERT_EQ(static_cast(size2), pread(fd, buf, bufsize, 0)) << strerror(errno); ASSERT_EQ(0, memcmp(buf, CONTENTS, size2)); leak(fd); From nobody Sat Mar 14 16:33:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY6P26ZY9z6TBHs for ; Sat, 14 Mar 2026 16:33: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY6P24wxzz3bxs for ; Sat, 14 Mar 2026 16:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773506022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GktTkbi+D5CPIenREaHGbrGtx15zzFlZQMfn/oyjxt8=; b=FiMeqrgJTLMjWPwPpwNvepHOEUeTlUSWse31HZ4mMwlL7MHz1cMGAuMT3OXk76mSnxsQ1Y H8o+Z2Np/rbFs7DzwNmLsK83Y1Kea0ZbhmBIm8wHMyM/KZIcQYfz+xkbppkmEW9jJzngNO uhb3/Y7IflOA5ISNsh7PRlVbq++5e257Cl2gP9/7e7Lg/TnfweRUIzs+ubWHYvK1VW+bAk 0de9Iw3L5cqLaLxKaBZkqlS4XSBCk5YN+dUhH+ACckidCAENujX8vaLAYzOyy/0CRDndGh 4lQTw3txxhaQ1eitNkR2Ep8TeV5bHhSzx+3M7D3zFNVdWlnE+UEry3EKBghSQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773506022; a=rsa-sha256; cv=none; b=CRO3cfyygixXnJK1hc50UGBwiILYu0EzMEyj4BQPEQwjpvZ58BtnPZK6pNx/50AutM2ZiT X09caWsRj24l97HJX+RxjwuAMC1JOmsL9DskkwxmcXNXE3LrOqw1QS2O8uonY/ybMQrba6 7YVQlrVNv37pI1NlCwBjbWmEz1bcfn5uw4VHrchmnQe5qTLu7DuaBAT8w6qlHneWscGBEY I5fLjJm6ST11EJdYYuFo4lH4GmuBr4d+oYRlPu3iWaTwKn9nqGi9hw8i6D2nqvMaf1sR/B tgVL8tF8UVXycUfC3Qe6GacWZ+L7NE94Kv9XeOsz53OFNdxXP8ZyKN1ZpBgZXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773506022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GktTkbi+D5CPIenREaHGbrGtx15zzFlZQMfn/oyjxt8=; b=rqZ33zya42vs+HAEpnu39yOFwdCEFFu+awwaeztRFUtuDdwWwVkMaJDqcQDyGcks3THDiK jXxQQ1Xeh5dwB+R326MbDJeyb9BNFnnKs9sSizh13MGJb+m9QJWp2UZ95Ad83xeMki83jb ku8N4H586gzMdfb0nycArIVN45IhoQUoNTs1BtqjxdnyCoFkvjeN72fxcxFSmmnrxCqlEi C/AKyI/m2/NQh44IOuO9J+7hhnLE5MnSosf5qfJ4cvYsnIUTLgawk9EUcMHiONycuGMBiO 5DzCN6xneWbARHW9U7v9xCUBlefRNHgWkow01QzsUh0oaQCNNSAr3xQ8I+/VHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY6Nx4KmTz1P4d for ; Sat, 14 Mar 2026 16:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d0b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 16:33:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 251907ca480e - main - EC2: Fix comment re avoiding unicode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 251907ca480eff7f6177f52959b71a6cfce45579 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 16:33:37 +0000 Message-Id: <69b58de1.1d0b4.308129e6@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=251907ca480eff7f6177f52959b71a6cfce45579 commit 251907ca480eff7f6177f52959b71a6cfce45579 Author: Colin Percival AuthorDate: 2026-03-14 16:30:13 +0000 Commit: Colin Percival CommitDate: 2026-03-14 16:33:32 +0000 EC2: Fix comment re avoiding unicode We're avoiding *unicode*, not avoiding *ascii*. Reported by: marck Fixes: 277830b4d3ae ("EC2: Don't use unicode in boot loader") MFC after: 3 days --- release/tools/ec2.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 62d7d1957aaf..4e1260903e06 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -42,7 +42,8 @@ ec2_common() { # Booting quickly is more important than giving users a chance to # access the boot loader via the serial port; but if users turn the - # boot loader back on, avoid ASCII since it breaks the EC2 web console. + # boot loader back on, avoid unicode since it breaks the EC2 web + # console. echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf echo 'loader_menu_frame="ascii"' >> ${DESTDIR}/boot/loader.conf From nobody Sat Mar 14 21:35:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYF5p2bVmz6VR6L for ; Sat, 14 Mar 2026 21:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYF5n5w9Nz3PVb for ; Sat, 14 Mar 2026 21:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773524157; 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=1X2LyRjoco6/kdpgPU2kV0/Xc7r/AK4dYcb6FYYVS/g=; b=diLiUFdtfQW93yfOxDj1idJW/4IyFCn7XsWeq5YTRcYceSqxYxgVJ+xpfKquGXQTdGK3KF b7cljmS/T9XaSSNww2rG57tWwWE3xsHGMjgPUdmfOZVUZMZqQpuIRw3G1slqvC6fQupovW /DGJjTV0PiIWDk3YIiBljZPWIXJnv8M8+rrOyVCZq2bU0CaxMmrqEmZ1Cug4ML5NPz2MEM FmABMfbfWZS6/l8fXBrQGCThINfL2FBnHOSPdwSJYdV1FZ9HSZELchG6bPlY3UnJFh7+5r MBbLRnSZcZ7E8AyUvJjJH6fs2k19K0Gd5nt14So9sKF/I80t49oLUrpMAiUaKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773524157; a=rsa-sha256; cv=none; b=eisKiakMyDMcU/Wwr9LCEaQ19cSGsmKhE4Bjrntpon8AymVQxbaxy+9GkSFsYmC+TBeC4i 08HLF7UCAdNdy3Tuk1dYJMsHMELuRhkRDDxgczvwbs4XaNXt9iFvU1KpKBNqS5J4WvG98M jKCbhSTakpmPClRg5KvDxWQe1pgT1hbVyt6STCxl/la/MApRS/5545ONg5WaRWxHphEA/T 5dbOV2l1OjTtLEJ9uOHM8pNVKqoRTGFvjDs8YsUgaShXVxibdtRJ6F9prVhb0xC2Ccv4y5 FbscXhyv4djsMCJ2k2aCImVDmWrUJOIdjXDnaqr46OttR8m6SfcJhOWVEb9CWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773524157; 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=1X2LyRjoco6/kdpgPU2kV0/Xc7r/AK4dYcb6FYYVS/g=; b=YTTSQiox84B3eSG3KD3uxuPpqFEAwXN2DmSpPGIgBrf53FYq+L5l6pjyQFlmz7L4wcIQiW 71XlWu7TusVR/+QVeF4rc//ZnnIoH5BTl/RYnm2K1GaJFdB9FYSs53onP6lvMvkeYRfr9I YPONWDplOPtX5KIDzatJbkzxfXHV2+LsfHfP15ZLcyCHw2C/dve0TecIbEv+3TKMPp8s8+ G+zGkQeTVjhfr1gCgABrepwSmHY5RsmFlLrY5euKWD35FL+DSQP9Ck6bvZSRhHOhBsGkjO U6w6CJ6jcAqQ9skqYyDht8RLeFrw332VDu0+D+2Jl6mb4F7lO+CS9e1982PGhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYF5n5HYXz502 for ; Sat, 14 Mar 2026 21:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44922 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 21:35:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christos Longros From: Adrian Chadd Subject: git: e6f4e4ab8a51 - main - re(4), rge(4): improve Realtek driver man pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6f4e4ab8a51f5bec178f5d937e541e227efb561 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 21:35:52 +0000 Message-Id: <69b5d4b8.44922.35c839d@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=e6f4e4ab8a51f5bec178f5d937e541e227efb561 commit e6f4e4ab8a51f5bec178f5d937e541e227efb561 Author: Christos Longros AuthorDate: 2026-03-14 21:35:20 +0000 Commit: Adrian Chadd CommitDate: 2026-03-14 21:35:20 +0000 re(4), rge(4): improve Realtek driver man pages Add D-Link DGE-530(T) and Killer E2600 to the re(4) HARDWARE list. Both are supported by the driver but were missing from the man page. Also add cross-references between re(4) and rge(4) in SEE ALSO, as both are Realtek NIC drivers. Signed-off-by: Christos Longros Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55745 --- share/man/man4/re.4 | 5 +++++ share/man/man4/rge.4 | 1 + 2 files changed, 6 insertions(+) diff --git a/share/man/man4/re.4 b/share/man/man4/re.4 index 980247af142d..1a255ccf0db6 100644 --- a/share/man/man4/re.4 +++ b/share/man/man4/re.4 @@ -155,6 +155,10 @@ Corega CG-LAPCIGT Gigabit Ethernet (8169S) .It D-Link DGE-528(T) Gigabit Ethernet (8169S) .It +D-Link DGE-530(T) Gigabit Ethernet (8169S) +.It +Killer E2600 Gigabit Ethernet (8168) +.It Gigabyte 7N400 Pro2 Integrated Gigabit Ethernet (8110S) .It LevelOne GNC-0105T (8169S) @@ -237,6 +241,7 @@ the network connection (cable). .Xr netintro 4 , .Xr ng_ether 4 , .Xr polling 4 , +.Xr rge 4 , .Xr rgephy 4 , .Xr vlan 4 , .Xr ifconfig 8 diff --git a/share/man/man4/rge.4 b/share/man/man4/rge.4 index 1ef8c1b34fc1..a8266c439b83 100644 --- a/share/man/man4/rge.4 +++ b/share/man/man4/rge.4 @@ -146,6 +146,7 @@ the network connection (cable). .Xr netintro 4 , .Xr ng_ether 4 , .Xr polling 4 , +.Xr re 4 , .Xr vlan 4 , .Xr ifconfig 8 .Rs From nobody Sat Mar 14 23:40:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYHsy1J80z6Vc6R; Sat, 14 Mar 2026 23:40:54 +0000 (UTC) (envelope-from me@svmhdvn.name) Received: from mx1.webnames.ca (mx1.webnames.ca [209.15.37.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.webnames.ca", Issuer "RapidSSL TLS RSA CA G1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYHsx4Np5z3Zsp; Sat, 14 Mar 2026 23:40:53 +0000 (UTC) (envelope-from me@svmhdvn.name) Authentication-Results: mx1.freebsd.org; none Received: from webnames.ca ([10.9.9.180]) by mx1.webnames.ca with ESMTPS id 62ENejA3023691-62ENejA5023691 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=CAFAIL); Sat, 14 Mar 2026 16:40:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=svmhdvn.name; s=mail-1768750869; bh=GBA/chMoD44QwOGQhPSskVA/JOWadxaJevJ8J3Ghv6g=; h=In-Reply-To:References:To:Cc:From:Subject:Message-Id:Date:Content-Type: Content-Transfer-Encoding:Mime-Version; b=ABYaLtSroZSsdE8GBY/qsr1vGVJMMt8VA5d pq1jOb+RqraoDj1DpSdP2zfgsYLCoOJ/KaSEAu4VO0dYfD7RTha4FWM+gUSHxLJ7j8/e866lQGGWy 75yt/JEdwmyOO7v1FEjw/zNjzxj96R23+jiN1BaVsfeQHzT9aknr+mBeo8wPIvLKDkliisuq1GOdF jWRqGebKV2psVi3BcaGuz9KGJBRT5UtqpdOPjelRKGyyj1Hk5iGKTDmcp6D9ZWUzpUkZIOjVQUq/R TqJawBOn5rCuhXcyZqpEJbKSQYv3cc6BYlcIklk4ek+j3RjfkTLImneqk+JqvOXf6ajdagf5ttbA= = Received: from [64.72.237.20] (account me@svmhdvn.name HELO localhost) by mail1.webnames.ca (CommuniGate SPEC SMTP 8.0.9) with ESMTPA id 229986475; Sat, 14 Mar 2026 16:40:44 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sat, 14 Mar 2026 19:40:44 -0400 Message-Id: Subject: Re: git: 8a62a2a5659d - main - zfs: merge openzfs/zfs@f8e5af53e From: "Siva Mahadevan" Cc: To: "Martin Matuska" , , , X-Mailer: aerc 0.21.0 References: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> In-Reply-To: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> X-FEAS-BEC-Info: WlpIGw0aAQkEARIJHAEHBlJSCRoLAAEeDUhZUEhYSFhIWUhZXkguLT4lWFpYWFhYWlhZW1hfSFldSAUNKBseBQAMHgZGBgkFDUhYSFlcSAUFKA4aDQ0KGwxGBxoPSFhIWkhZWkheXEZfWkZaW19GWlhIUEhYSFhIWUhYSFhIWEhbWUgMDR5FCwcFBQEcG0UbGgtFCQQEKA4aDQ0KGwxGBxoPSFg= X-FEAS-Client-IP: 10.9.9.180 X-FE-Last-Public-Client-IP: 64.72.237.20 X-FE-Policy-ID: 1:3:0:SYSTEM 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:13768, ipnet:209.15.37.0/24, country:CA] X-Rspamd-Queue-Id: 4fYHsx4Np5z3Zsp X-Spamd-Bar: ---- On Sat Mar 14, 2026 at 36:00 UTC, Martin Matuska wrote: > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D8a62a2a5659d1839d8799b4274= c04469d7f17c78 > > commit 8a62a2a5659d1839d8799b4274c04469d7f17c78 > Merge: f91464171d61 f8e5af53e92f > Author: Martin Matuska > AuthorDate: 2026-03-14 12:14:56 +0000 > Commit: Martin Matuska > CommitDate: 2026-03-14 12:14:56 +0000 > > zfs: merge openzfs/zfs@f8e5af53e > =20 > Notable upstream pull request merges: > #17358 4975430cf Add vdev property to disable vdev scheduler > #18031 c77f17b75 Add snapshots_changed_nsecs dataset property > #18080 dbb3f247e cmd/zfs: clone: accept `-u` to not mount newly crea= ted > datasets > #18089 -multiple Zstd: Update bundled library to version 1.5.7 > #18091 2301755df Fix zfs_open() to skip zil_async_to_sync() for the > snapshot > #18093 -multiple L2ARC: Rework write throttling with DWPD rate limit= ing > and parallel writes > #18095 2dbd6af5e Rename several printf attributes declarations to > __printf__ > #18096 8605bdfdd FreeBSD: unbreak compilation on i386 > #18105 794f1587d When receiving a stream with the large block flag, > activate feature > #18115 765929cb4 DDT: Add locking for table ZAP destruction > #18118 09e4e01e9 Fix history logging for `zpool create -t` > #18119 2f1f25217 icp: emit .note.GNU-stack section for all ELF targe= ts > #18131 3fffe4e70 Fix --enable-invariants on FreeBSD > #18133 d2f5cb3a5 Move range_tree, btree, highbit64 to common code > #18136 54b141fab FreeBSD: Remove references to DEBUG_VFS_LOCKS > #18138 cdf89f413 Flush RRD only when TXGs contain data > #18139 a157ef62a Make sure we can still write data to txg > #18140 cd895f0e5 remove thread unsafe debug code causing FreeBSD dou= ble > free panic > #18144 4f180e095 Fix activating large_microzap on receive > #18146 35b2d3970 Lock db_mtx around arc_release() in couple places > #18154 b36472052 nvpair: chase FreeBSD xdrproc_t definition > #18160 21bbe7cb6 Improve caching for dbuf prefetches > #18177 -multiple Multihost Improvements > #18179 2646bd558 Allow rewrite skip cloned and snapshotted blocks > #18180 aa29455dd Restrict cloning with different properties > #18184 040ba7a7c libzfs: improve error message for zpool create with > ENXIO > #18188 1412bdc6c zfs_vnops_os.c: Move a vput() to after > zfs_setattr_dir() > #18198 cc184fe98 Fix `send:raw` permission for send `-w -I` > #18208 ba970eb20 Cleanup allocation class selection > #18212 0f9564e85 Simplify dnode_level_is_l2cacheable() > #18214 370570890 Remove parent ZIO from dbuf_prefetch() > #18218 bfb276e55 freebsd: Fix TIMESPEC_OVERFLOW for PowerPC > #18222 d06a1d9ac Fix available space accounting for special/dedup > #18225 d48967728 ICP: AES-GCM VAES-AVX2: fix typos and document > source files > #18226 c8a72a27e ICP: AES-GCM assembly: remove unused Gmul functions > #18230 -multiple Fix zdb --key crash for unencrypted datasets, and > teach tests to understand this better > #18233 -multiple icp: add SHA-512 implementation using Intel SHA512 > extension > #18245 991fc56fa Introduce dedupused/dedupsaved pool properties > #18251 6a717f31e Improve misleading error messages for > ZPOOL_STATUS_CORRUPT_POOL > #18254 7744f0496 SIMD: libspl: test the correct CPUID bit for AVX512= VL > #18255 6495dafd5 range_tree: use zfs_panic_recover() for > partial-overlap remov > #18256 3408332d7 zhack: Fix importing large allocation profiles on > small pools > #18258 f8457fbdc Fix deadlock on dmu_tx_assign() from vdev_rebuild() > #18263 f8e5af53e Fix redundant declaration of dsl_pool_t > =20 > Obtained from: OpenZFS > OpenZFS commit: f8e5af53e92fa7c03393fbd4922cb9c1d0c15920 > > cddl/lib/libzfs/Makefile | 36 +- > cddl/lib/libzpool/Makefile | 7 +- > stand/libsa/zfs/Makefile.inc | 6 +- > stand/libsa/zfs/xxhash.c | 24 + > sys/conf/files | 7 +- > .../.github/workflows/scripts/qemu-1-setup.sh | 110 +- > .../.github/workflows/scripts/qemu-2-start.sh | 53 +- > .../.github/workflows/scripts/qemu-3-deps-vm.sh | 50 +- > .../.github/workflows/scripts/qemu-5-setup.sh | 22 +- > .../workflows/scripts/qemu-6-lustre-tests-vm.sh | 51 + > .../.github/workflows/scripts/qemu-6-tests.sh | 132 +- > .../.github/workflows/scripts/qemu-8-summary.sh | 32 + > .../.github/workflows/scripts/qemu-test-repo-vm.sh | 27 +- > .../.github/workflows/zfs-qemu-packages.yml | 15 +- > sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 16 +- > sys/contrib/openzfs/.mailmap | 10 + > sys/contrib/openzfs/AUTHORS | 14 + > sys/contrib/openzfs/META | 2 +- > sys/contrib/openzfs/Makefile.am | 2 + > sys/contrib/openzfs/autogen.sh | 1 + > sys/contrib/openzfs/cmd/Makefile.am | 5 +- > sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zdb/Makefile.am | 5 +- > sys/contrib/openzfs/cmd/zdb/zdb.c | 53 +- > sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + > .../zed/zed.d/history_event-zfs-list-cacher.sh.in | 1 + > sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zfs/zfs_main.c | 89 +- > sys/contrib/openzfs/cmd/zhack.c | 166 +- > sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 16 +- > sys/contrib/openzfs/cmd/zpool/zpool_util.c | 26 - > sys/contrib/openzfs/cmd/zpool/zpool_util.h | 2 - > sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + > sys/contrib/openzfs/cmd/ztest.c | 7 +- > sys/contrib/openzfs/config/CppCheck.am | 1 + > sys/contrib/openzfs/config/Rules.am | 1 + > sys/contrib/openzfs/config/Shellcheck.am | 1 + > sys/contrib/openzfs/config/Substfiles.am | 1 + > sys/contrib/openzfs/config/always-arch.m4 | 1 + > .../openzfs/config/always-compiler-options.m4 | 1 + > sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + > sys/contrib/openzfs/config/always-parallel.m4 | 1 + > sys/contrib/openzfs/config/always-python.m4 | 1 + > sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + > sys/contrib/openzfs/config/always-sed.m4 | 1 + > sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + > sys/contrib/openzfs/config/always-system.m4 | 1 + > sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + > sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + > sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + > sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + > sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + > sys/contrib/openzfs/config/deb.am | 1 + > sys/contrib/openzfs/config/find_system_library.m4 | 1 + > sys/contrib/openzfs/config/gettext.m4 | 1 + > sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + > sys/contrib/openzfs/config/iconv.m4 | 1 + > .../openzfs/config/kernel-access-ok-type.m4 | 1 + > sys/contrib/openzfs/config/kernel-acl.m4 | 32 + > sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + > sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + > sys/contrib/openzfs/config/kernel-automount.m4 | 1 + > sys/contrib/openzfs/config/kernel-bio.m4 | 1 + > sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + > sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + > sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + > .../config/kernel-block-device-operations.m4 | 1 + > .../openzfs/config/kernel-commit-metadata.m4 | 1 + > .../openzfs/config/kernel-config-defined.m4 | 1 + > .../config/kernel-copy-from-user-inatomic.m4 | 1 + > .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + > .../openzfs/config/kernel-declare-event-class.m4 | 1 + > .../openzfs/config/kernel-dentry-operations.m4 | 1 + > .../openzfs/config/kernel-discard-granularity.m4 | 1 + > sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + > sys/contrib/openzfs/config/kernel-file.m4 | 1 + > sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + > .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + > .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + > sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + > .../openzfs/config/kernel-follow-down-one.m4 | 1 + > sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + > sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + > sys/contrib/openzfs/config/kernel-fs-context.m4 | 33 + > sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - > sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + > .../openzfs/config/kernel-generic_fadvise.m4 | 1 + > .../openzfs/config/kernel-generic_fillattr.m4 | 1 + > .../openzfs/config/kernel-generic_io_acct.m4 | 1 + > sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + > sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + > sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + > sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + > .../openzfs/config/kernel-inode-permission.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-state.m4 | 24 + > sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + > .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + > .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + > sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + > .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + > .../openzfs/config/kernel-kmap-local-page.m4 | 1 + > sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + > sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + > sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + > sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + > .../openzfs/config/kernel-make-request-fn.m4 | 1 + > sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + > sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + > sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + > sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 28 + > sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + > sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + > sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + > .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + > .../config/kernel-pagemap-readahead-page.m4 | 1 + > sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + > sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + > .../openzfs/config/kernel-pin-user-pages.m4 | 1 + > .../openzfs/config/kernel-proc-operations.m4 | 1 + > sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + > .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + > sys/contrib/openzfs/config/kernel-rename.m4 | 1 + > .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + > sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + > sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + > sys/contrib/openzfs/config/kernel-sched.m4 | 1 + > .../openzfs/config/kernel-security-inode-init.m4 | 1 + > sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + > .../openzfs/config/kernel-setattr-prepare.m4 | 1 + > sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + > sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + > sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + > sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + > sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + > sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + > sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + > sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + > sys/contrib/openzfs/config/kernel-timer.m4 | 1 + > sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + > .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + > .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + > .../openzfs/config/kernel-truncate-setsize.m4 | 1 + > sys/contrib/openzfs/config/kernel-types.m4 | 1 + > sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + > .../openzfs/config/kernel-vfs-file_range.m4 | 1 + > .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + > sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + > sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + > .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + > .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + > .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + > sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + > .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + > sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + > sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + > sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + > sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + > sys/contrib/openzfs/config/kernel.m4 | 9 +- > sys/contrib/openzfs/config/lib-ld.m4 | 1 + > sys/contrib/openzfs/config/lib-link.m4 | 1 + > sys/contrib/openzfs/config/lib-prefix.m4 | 1 + > sys/contrib/openzfs/config/mount-helper.m4 | 1 + > sys/contrib/openzfs/config/nls.m4 | 1 + > sys/contrib/openzfs/config/pkg.m4 | 1 + > sys/contrib/openzfs/config/po.m4 | 1 + > sys/contrib/openzfs/config/progtest.m4 | 1 + > sys/contrib/openzfs/config/rpm.am | 1 + > sys/contrib/openzfs/config/tgz.am | 1 + > sys/contrib/openzfs/config/toolchain-simd.m4 | 23 + > sys/contrib/openzfs/config/user-aio.h.m4 | 1 + > sys/contrib/openzfs/config/user-backtrace.m4 | 1 + > sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + > sys/contrib/openzfs/config/user-dracut.m4 | 1 + > sys/contrib/openzfs/config/user-gettext.m4 | 1 + > sys/contrib/openzfs/config/user-largefile.m4 | 1 + > sys/contrib/openzfs/config/user-libaio.m4 | 1 + > sys/contrib/openzfs/config/user-libatomic.m4 | 1 + > sys/contrib/openzfs/config/user-libblkid.m4 | 1 + > sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + > sys/contrib/openzfs/config/user-libexec.m4 | 1 + > sys/contrib/openzfs/config/user-libfetch.m4 | 1 + > sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + > sys/contrib/openzfs/config/user-libudev.m4 | 1 + > sys/contrib/openzfs/config/user-libunwind.m4 | 1 + > sys/contrib/openzfs/config/user-libuuid.m4 | 1 + > sys/contrib/openzfs/config/user-makedev.m4 | 1 + > sys/contrib/openzfs/config/user-pam.m4 | 1 + > sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + > sys/contrib/openzfs/config/user-statx.m4 | 1 + > sys/contrib/openzfs/config/user-systemd.m4 | 1 + > sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + > sys/contrib/openzfs/config/user-udev.m4 | 1 + > sys/contrib/openzfs/config/user-zlib.m4 | 1 + > sys/contrib/openzfs/config/user.m4 | 1 + > sys/contrib/openzfs/config/zfs-build.m4 | 3 +- > sys/contrib/openzfs/config/zfs-meta.m4 | 1 + > sys/contrib/openzfs/contrib/Makefile.am | 1 + > .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + > sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + > sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + > .../contrib/debian/openzfs-libpam-zfs.install | 1 + > .../openzfs/contrib/dracut/90zfs/mount-zfs.sh.in | 2 +- > sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + > sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + > .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + > .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c | 278 +- > sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + > .../openzfs/contrib/pyzfs/docs/source/index.rst | 3 +- > .../openzfs/contrib/pyzfs/libzfs_core/__init__.py | 10 - > .../pyzfs/libzfs_core/_error_translation.py | 58 - > .../contrib/pyzfs/libzfs_core/_libzfs_core.py | 350 +- > .../pyzfs/libzfs_core/bindings/libzfs_core.py | 4 - > .../pyzfs/libzfs_core/test/test_libzfs_core.py | 337 - > sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + > sys/contrib/openzfs/copy-builtin | 5 +- > sys/contrib/openzfs/etc/Makefile.am | 1 + > sys/contrib/openzfs/include/Makefile.am | 1 + > sys/contrib/openzfs/include/libzfs.h | 10 +- > sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + > .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + > sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + > .../include/os/linux/kernel/linux/dcache_compat.h | 19 +- > .../include/os/linux/kernel/linux/simd_x86.h | 14 + > .../include/os/linux/kernel/linux/vfs_compat.h | 8 + > .../include/os/linux/kernel/linux/xattr_compat.h | 17 + > .../openzfs/include/os/linux/spl/sys/kmem.h | 5 +- > sys/contrib/openzfs/include/sys/arc.h | 2 - > sys/contrib/openzfs/include/sys/arc_impl.h | 38 + > sys/contrib/openzfs/include/sys/btree.h | 9 +- > sys/contrib/openzfs/include/sys/ddt.h | 5 + > sys/contrib/openzfs/include/sys/dmu.h | 1 + > sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + > sys/contrib/openzfs/include/sys/fs/zfs.h | 24 +- > sys/contrib/openzfs/include/sys/metaslab.h | 4 +- > sys/contrib/openzfs/include/sys/metaslab_impl.h | 8 +- > sys/contrib/openzfs/include/sys/mmp.h | 5 + > sys/contrib/openzfs/include/sys/spa.h | 1 + > sys/contrib/openzfs/include/sys/spa_impl.h | 4 + > sys/contrib/openzfs/include/sys/uberblock_impl.h | 22 +- > sys/contrib/openzfs/include/sys/vdev.h | 2 + > sys/contrib/openzfs/include/sys/vdev_impl.h | 2 + > sys/contrib/openzfs/include/sys/vdev_rebuild.h | 2 +- > sys/contrib/openzfs/lib/Makefile.am | 31 +- > sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + > sys/contrib/openzfs/lib/libbtree/Makefile.am | 6 + > sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + > sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + > sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + > sys/contrib/openzfs/lib/librange_tree/Makefile.am | 9 + > sys/contrib/openzfs/lib/libshare/Makefile.am | 27 - > sys/contrib/openzfs/lib/libshare/libshare_impl.h | 48 - > sys/contrib/openzfs/lib/libshare/nfs.h | 38 - > sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + > sys/contrib/openzfs/lib/libspl/include/Makefile.am | 2 +- > sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 18 +- > .../openzfs/lib/libspl/include/sys/sysmacros.h | 29 +- > sys/contrib/openzfs/lib/libunicode/Makefile.am | 6 - > sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + > sys/contrib/openzfs/lib/libzfs/Makefile.am | 18 +- > sys/contrib/openzfs/lib/libzfs/libzfs.abi | 450 +- > sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 13 + > sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 3 +- > sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 7 +- > sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 16 +- > .../{libshare/libshare.c =3D> libzfs/libzfs_share.c} | 3 +- > .../include/libshare.h =3D> libzfs/libzfs_share.h} | 80 +- > .../{libshare/nfs.c =3D> libzfs/libzfs_share_nfs.c} | 5 +- > .../nfs.c =3D> libzfs/os/freebsd/libzfs_share_nfs.c} | 5 +- > .../smb.c =3D> libzfs/os/freebsd/libzfs_share_smb.c} | 4 +- > .../nfs.c =3D> libzfs/os/linux/libzfs_share_nfs.c} | 4 +- > .../smb.c =3D> libzfs/os/linux/libzfs_share_smb.c} | 24 +- > sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + > .../openzfs/lib/libzfs_core/libzfs_core.abi | 11 +- > sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + > sys/contrib/openzfs/lib/libzpool/Makefile.am | 14 +- > .../openzfs/lib/libzpool/include/Makefile.am | 1 + > sys/contrib/openzfs/lib/libzpool/kernel.c | 28 - > sys/contrib/openzfs/lib/libzstd/Makefile.am | 7 + > sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + > sys/contrib/openzfs/man/Makefile.am | 2 + > sys/contrib/openzfs/man/man4/zfs.4 | 36 +- > sys/contrib/openzfs/man/man7/vdevprops.7 | 17 + > sys/contrib/openzfs/man/man7/zfsprops.7 | 9 + > sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 14 + > sys/contrib/openzfs/man/man7/zpoolprops.7 | 15 + > sys/contrib/openzfs/man/man8/pam_zfs_key.8 | 221 + > sys/contrib/openzfs/man/man8/zfs-clone.8 | 4 +- > sys/contrib/openzfs/man/man8/zfs-create.8 | 2 +- > sys/contrib/openzfs/man/man8/zfs-load-key.8 | 4 + > sys/contrib/openzfs/man/man8/zfs-mount.8 | 6 + > sys/contrib/openzfs/man/man8/zfs-rename.8 | 2 +- > sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 19 +- > sys/contrib/openzfs/man/man8/zfs.8 | 1 + > sys/contrib/openzfs/module/Kbuild.in | 26 +- > sys/contrib/openzfs/module/Makefile.bsd | 13 +- > sys/contrib/openzfs/module/Makefile.in | 5 +- > sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 1 + > .../openzfs/module/icp/algs/sha2/sha512_impl.c | 18 + > .../icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S | 44 +- > .../module/icp/asm-x86_64/modes/ghash-x86_64.S | 64 - > .../module/icp/asm-x86_64/sha2/sha512-x86_64.S | 321 +- > .../icp/include/modes/gcm_asm_rename_funcs.h} | 30 +- > sys/contrib/openzfs/module/nvpair/nvpair.c | 4 +- > .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 19 + > .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 3 + > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 25 +- > .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 13 - > .../openzfs/module/os/linux/spl/spl-atomic.c | 36 - > .../openzfs/module/os/linux/spl/spl-generic.c | 258 - > .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 8 +- > sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 4 +- > .../openzfs/module/os/linux/spl/spl-kstat.c | 3 - > .../openzfs/module/os/linux/spl/spl-math-compat.c | 275 + > .../openzfs/module/os/linux/spl/spl-trace.c | 2 - > sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 16 + > .../openzfs/module/os/linux/zfs/vdev_disk.c | 7 + > .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 21 +- > .../openzfs/module/os/linux/zfs/zpl_export.c | 87 +- > sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 4 + > .../openzfs/module/os/linux/zfs/zpl_inode.c | 26 + > .../openzfs/module/os/linux/zfs/zpl_super.c | 63 + > sys/contrib/openzfs/module/zcommon/simd_stat.c | 2 + > sys/contrib/openzfs/module/zcommon/zfs_prop.c | 10 +- > sys/contrib/openzfs/module/zcommon/zpool_prop.c | 17 + > sys/contrib/openzfs/module/zfs/arc.c | 1347 ++-- > sys/contrib/openzfs/module/zfs/btree.c | 17 +- > sys/contrib/openzfs/module/zfs/dataset_kstats.c | 2 +- > sys/contrib/openzfs/module/zfs/dbuf.c | 26 +- > sys/contrib/openzfs/module/zfs/ddt.c | 95 +- > sys/contrib/openzfs/module/zfs/ddt_log.c | 4 +- > sys/contrib/openzfs/module/zfs/ddt_stats.c | 15 + > sys/contrib/openzfs/module/zfs/dmu.c | 4 +- > sys/contrib/openzfs/module/zfs/dmu_objset.c | 19 + > sys/contrib/openzfs/module/zfs/dmu_recv.c | 46 +- > sys/contrib/openzfs/module/zfs/dmu_tx.c | 7 +- > sys/contrib/openzfs/module/zfs/dsl_dataset.c | 8 +- > sys/contrib/openzfs/module/zfs/metaslab.c | 72 +- > sys/contrib/openzfs/module/zfs/mmp.c | 158 +- > sys/contrib/openzfs/module/zfs/range_tree.c | 22 +- > sys/contrib/openzfs/module/zfs/sa.c | 15 +- > sys/contrib/openzfs/module/zfs/spa.c | 791 ++- > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 5 +- > sys/contrib/openzfs/module/zfs/spa_misc.c | 75 +- > .../openzfs/module/{unicode =3D> zfs}/u8_textprep.c | 0 > sys/contrib/openzfs/module/zfs/vdev.c | 18 +- > sys/contrib/openzfs/module/zfs/vdev_file.c | 3 + > sys/contrib/openzfs/module/zfs/vdev_label.c | 10 +- > sys/contrib/openzfs/module/zfs/vdev_queue.c | 40 + > sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 20 +- > sys/contrib/openzfs/module/zfs/zcp_get.c | 8 + > sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 16 +- > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 83 +- > sys/contrib/openzfs/module/zfs/zio_compress.c | 2 +- > sys/contrib/openzfs/module/zstd/README.md | 44 +- > .../module/zstd/include/zstd_compat_wrapper.h | 271 +- > .../openzfs/module/zstd/lib/common/allocations.h | 56 + > sys/contrib/openzfs/module/zstd/lib/common/bits.h | 206 + > .../openzfs/module/zstd/lib/common/bitstream.h | 210 +- > .../openzfs/module/zstd/lib/common/compiler.h | 372 +- > sys/contrib/openzfs/module/zstd/lib/common/cpu.h | 40 +- > sys/contrib/openzfs/module/zstd/lib/common/debug.h | 57 +- > .../module/zstd/lib/common/entropy_common.c | 220 +- > .../openzfs/module/zstd/lib/common/error_private.c | 13 +- > .../openzfs/module/zstd/lib/common/error_private.h | 104 +- > sys/contrib/openzfs/module/zstd/lib/common/fse.h | 143 +- > .../module/zstd/lib/common/fse_decompress.c | 206 +- > sys/contrib/openzfs/module/zstd/lib/common/huf.h | 287 +- > sys/contrib/openzfs/module/zstd/lib/common/mem.h | 284 +- > sys/contrib/openzfs/module/zstd/lib/common/pool.c | 81 +- > sys/contrib/openzfs/module/zstd/lib/common/pool.h | 25 +- > .../module/zstd/lib/common/portability_macros.h | 172 + > .../openzfs/module/zstd/lib/common/xxhash.c | 865 --- > .../openzfs/module/zstd/lib/common/xxhash.h | 7199 ++++++++++++++= +++++- > .../openzfs/module/zstd/lib/common/zstd_common.c | 44 +- > .../openzfs/module/zstd/lib/common/zstd_deps.h | 124 + > .../openzfs/module/zstd/lib/common/zstd_internal.h | 345 +- > .../openzfs/module/zstd/lib/common/zstd_trace.h | 157 + > .../openzfs/module/zstd/lib/compress/clevels.h | 135 + > .../module/zstd/lib/compress/fse_compress.c | 249 +- > .../openzfs/module/zstd/lib/compress/hist.c | 66 +- > .../openzfs/module/zstd/lib/compress/hist.h | 11 +- > .../module/zstd/lib/compress/huf_compress.c | 1240 +++- > .../module/zstd/lib/compress/zstd_compress.c | 5917 ++++++++++++--= -- > .../zstd/lib/compress/zstd_compress_internal.h | 1017 ++- > .../zstd/lib/compress/zstd_compress_literals.c | 163 +- > .../zstd/lib/compress/zstd_compress_literals.h | 22 +- > .../zstd/lib/compress/zstd_compress_sequences.c | 75 +- > .../zstd/lib/compress/zstd_compress_sequences.h | 15 +- > .../zstd/lib/compress/zstd_compress_superblock.c | 693 +- > .../zstd/lib/compress/zstd_compress_superblock.h | 2 +- > .../openzfs/module/zstd/lib/compress/zstd_cwksp.h | 484 +- > .../module/zstd/lib/compress/zstd_double_fast.c | 611 +- > .../module/zstd/lib/compress/zstd_double_fast.h | 32 +- > .../openzfs/module/zstd/lib/compress/zstd_fast.c | 1039 ++- > .../openzfs/module/zstd/lib/compress/zstd_fast.h | 21 +- > .../openzfs/module/zstd/lib/compress/zstd_lazy.c | 1665 ++++- > .../openzfs/module/zstd/lib/compress/zstd_lazy.h | 184 +- > .../openzfs/module/zstd/lib/compress/zstd_ldm.c | 608 +- > .../openzfs/module/zstd/lib/compress/zstd_ldm.h | 27 +- > .../module/zstd/lib/compress/zstd_ldm_geartab.h | 107 + > .../openzfs/module/zstd/lib/compress/zstd_opt.c | 1004 ++- > .../openzfs/module/zstd/lib/compress/zstd_opt.h | 58 +- > .../module/zstd/lib/compress/zstd_preSplit.c | 239 + > .../module/zstd/lib/compress/zstd_preSplit.h | 34 + > .../module/zstd/lib/decompress/huf_decompress.c | 1858 +++-- > .../zstd/lib/decompress/huf_decompress_amd64.S | 603 ++ > .../module/zstd/lib/decompress/zstd_ddict.c | 24 +- > .../module/zstd/lib/decompress/zstd_ddict.h | 4 +- > .../module/zstd/lib/decompress/zstd_decompress.c | 897 ++- > .../zstd/lib/decompress/zstd_decompress_block.c | 1565 +++-- > .../zstd/lib/decompress/zstd_decompress_block.h | 24 +- > .../zstd/lib/decompress/zstd_decompress_internal.h | 79 +- > sys/contrib/openzfs/module/zstd/lib/zstd.h | 1848 ++++- > .../module/zstd/lib/{common =3D> }/zstd_errors.h | 45 +- > sys/contrib/openzfs/module/zstd/zfs_zstd.c | 35 +- > sys/contrib/openzfs/module/zstd/zstd-in.c | 93 +- > sys/contrib/openzfs/rpm/Makefile.am | 1 + > sys/contrib/openzfs/scripts/Makefile.am | 1 + > sys/contrib/openzfs/scripts/objtool-wrapper.in | 4 +- > sys/contrib/openzfs/scripts/spdxcheck.pl | 25 +- > sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- > sys/contrib/openzfs/tests/Makefile.am | 1 + > sys/contrib/openzfs/tests/runfiles/common.run | 15 +- > sys/contrib/openzfs/tests/runfiles/linux.run | 8 +- > sys/contrib/openzfs/tests/runfiles/sanity.run | 3 +- > .../openzfs/tests/test-runner/bin/zts-report.py.in | 4 - > sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + > .../tests/zfs-tests/callbacks/zfs_dbgmsg.ksh | 2 +- > .../openzfs/tests/zfs-tests/callbacks/zfs_mmp.ksh | 2 +- > sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + > .../openzfs/tests/zfs-tests/cmd/Makefile.am | 5 +- > .../tests/zfs-tests/cmd/checksum/sha2_test.c | 39 +- > .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 2 +- > sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 + > .../openzfs/tests/zfs-tests/include/commands.cfg | 5 +- > .../openzfs/tests/zfs-tests/include/libtest.shlib | 54 +- > .../openzfs/tests/zfs-tests/include/tunables.cfg | 4 +- > .../openzfs/tests/zfs-tests/tests/Makefile.am | 18 + > .../bclone/bclone_crossfs_corner_cases.ksh | 9 + > .../bclone/bclone_crossfs_corner_cases_limited.ksh | 9 + > .../functional/bclone/bclone_crossfs_data.ksh | 7 + > .../functional/bclone/bclone_crossfs_embedded.ksh | 7 + > .../functional/bclone/bclone_diffprops_all.ksh | 28 +- > .../bclone/bclone_diffprops_checksum.ksh | 18 +- > .../bclone/bclone_diffprops_compress.ksh | 16 +- > .../functional/bclone/bclone_diffprops_copies.ksh | 18 +- > .../bclone/bclone_diffprops_recordsize.ksh | 18 +- > .../tests/functional/bclone/bclone_prop_sync.ksh | 12 +- > .../bclone/bclone_samefs_corner_cases.ksh | 7 + > .../bclone/bclone_samefs_corner_cases_limited.ksh | 7 + > .../tests/functional/bclone/bclone_samefs_data.ksh | 6 + > .../functional/bclone/bclone_samefs_embedded.ksh | 6 + > .../functional/block_cloning/block_cloning.kshlib | 24 - > .../block_cloning_after_device_removal.ksh | 61 + > .../tests/functional/cache/cache_012_pos.ksh | 5 + > .../cli_root/zfs_clone/zfs_clone_nomount.ksh | 66 + > .../zfs_rewrite/zfs_rewrite_skip_clone.ksh | 83 + > .../zfs_rewrite/zfs_rewrite_skip_snapshot.ksh | 74 + > .../zpool_create/zpool_create_tempname.ksh | 2 + > .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + > .../functional/cli_root/zpool_get/zpool_get.cfg | 2 + > .../cli_root/zpool_get/zpool_get_parsable.cfg | 4 +- > .../cli_root/zpool_set/vdev_set_scheduler.ksh | 93 + > .../zfs_send_delegation_user/zfs_send_usertest.ksh | 11 +- > .../functional/events/zed_synchronous_zedlet.ksh | 6 +- > .../zfs-tests/tests/functional/l2arc/l2arc.cfg | 3 +- > .../functional/l2arc/l2arc_dwpd_ratelimit_pos.ksh | 138 + > .../functional/l2arc/l2arc_dwpd_reimport_pos.ksh | 169 + > .../l2arc/l2arc_multidev_scaling_pos.ksh | 162 + > .../l2arc/l2arc_multidev_throughput_pos.ksh | 133 + > .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + > .../tests/functional/lease/lease_setlease.ksh | 44 + > .../zfs-tests/tests/functional/lease/setup.ksh | 27 + > .../tests/zfs-tests/tests/functional/mmp/mmp.cfg | 6 +- > .../zfs-tests/tests/functional/mmp/mmp.kshlib | 47 +- > .../tests/functional/mmp/mmp_active_import.ksh | 42 +- > .../tests/functional/mmp/mmp_concurrent_import.ksh | 133 + > .../tests/functional/mmp/mmp_exported_import.ksh | 16 +- > .../zfs-tests/tests/functional/mmp/mmp_hostid.ksh | 8 +- > .../tests/functional/mmp/mmp_inactive_import.ksh | 20 +- > .../zfs-tests/tests/functional/mmp/mmp_on_off.ksh | 4 +- > .../tests/functional/mmp/mmp_on_thread.ksh | 4 +- > .../tests/functional/mmp/mmp_on_uberblocks.ksh | 14 +- > .../zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh | 3 +- > .../tests/functional/mmp/mmp_reset_interval.ksh | 8 +- > .../functional/mmp/mmp_write_distribution.ksh | 2 +- > .../tests/functional/mmp/mmp_write_uberblocks.ksh | 4 +- > .../tests/functional/mmp/multihost_history.ksh | 2 + > .../tests/functional/mount/mount_loopback.ksh | 3 +- > .../zfs-tests/tests/functional/pam/pam_basic.ksh | 58 + > .../tests/functional/pam/pam_change_unmounted.ksh | 13 +- > .../tests/functional/pam/pam_nounmount.ksh | 14 +- > .../tests/zfs-tests/tests/functional/pam/setup.ksh | 11 + > .../tests/functional/pam/utilities.kshlib.in | 6 + > .../rsend/send_large_blocks_incremental.ksh | 83 + > .../functional/rsend/send_large_blocks_initial.ksh | 86 + > .../rsend/send_large_microzap_incremental.ksh | 91 + > .../rsend/send_large_microzap_transitive.ksh | 100 + > .../tests/functional/snapshot/snapshot_018_pos.ksh | 52 +- > .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 5 +- > sys/contrib/openzfs/udev/Makefile.am | 1 + > sys/modules/dtrace/fasttrap/Makefile | 2 +- > sys/modules/zfs/Makefile | 8 +- > sys/modules/zfs/zfs_config.h | 24 +- > sys/modules/zfs/zfs_gitrev.h | 2 +- > 513 files changed, 34137 insertions(+), 10963 deletions(-) > > diff --cc cddl/lib/libzfs/Makefile > index a034118a6f5b,000000000000..8f364d2c2bb1 > mode 100644,000000..100644 > --- a/cddl/lib/libzfs/Makefile > +++ b/cddl/lib/libzfs/Makefile > @@@ -1,109 -1,0 +1,105 @@@ > +.PATH: ${ZFSTOP}/module/icp > +.PATH: ${ZFSTOP}/module/zcommon > +.PATH: ${ZFSTOP}/lib/libzfs > +.PATH: ${ZFSTOP}/lib/libzfs/os/freebsd > - .PATH: ${ZFSTOP}/lib/libshare > +.PATH: ${ZFSTOP}/include > +.PATH: ${ZFSTOP}/module/zstd > +.PATH: ${ZFSTOP}/module/zstd/lib > + > +PACKAGE=3D zfs > +LIB_PACKAGE=3D > + > +LIB=3D zfs > +LIBADD=3D \ > + avl \ > + bsdxml \ > + crypto \ > + geom \ > + m \ > + md \ > + nvpair \ > + pthread \ > + rt \ > + umem \ > + util \ > + z \ > + zfs_core \ > + zutil > + > +INCS=3D libzfs.h > +USER_C =3D \ > - libzfs_changelist.c \ > - libzfs_config.c \ > - libzfs_crypto.c \ > - libzfs_dataset.c \ > - libzfs_diff.c \ > - libzfs_import.c \ > - libzfs_iter.c \ > - libzfs_mount.c \ > - libzfs_pool.c \ > - libzfs_sendrecv.c \ > - libzfs_status.c \ > - libzfs_util.c > ++ libzfs_changelist.c \ > ++ libzfs_config.c \ > ++ libzfs_crypto.c \ > ++ libzfs_dataset.c \ > ++ libzfs_diff.c \ > ++ libzfs_import.c \ > ++ libzfs_iter.c \ > ++ libzfs_mount.c \ > ++ libzfs_pool.c \ > ++ libzfs_sendrecv.c \ > ++ libzfs_share.c \ > ++ libzfs_share_nfs.c \ > ++ libzfs_status.c \ > ++ libzfs_util.c \ > ++ os/freebsd/libzfs_share_nfs.c \ > ++ os/freebsd/libzfs_share_smb.c > + > +# FreeBSD > +USER_C +=3D \ > + libzfs_compat.c \ > + libzfs_zmount.c > + > - # libshare > - USER_C +=3D \ > - libshare.c \ > - nfs.c \ > - os/freebsd/nfs.c \ > - os/freebsd/smb.c > -=20 > +KERNEL_C =3D \ > + cityhash.c \ > + zfeature_common.c \ > + zfs_comutil.c \ > + zfs_deleg.c \ > + zfs_fletcher.c \ > + zfs_fletcher_superscalar.c \ > + zfs_fletcher_superscalar4.c \ > + zfs_namecheck.c \ > + zfs_prop.c \ > + zfs_valstr.c \ > + zpool_prop.c \ > + zprop_common.c > + > +ARCH_C =3D > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386" > +ARCH_C +=3D zfs_fletcher_intel.c \ > + zfs_fletcher_sse.c=20 > +CFLAGS +=3D -DHAVE_SSE2 > +.endif > +.if ${MACHINE_ARCH} =3D=3D "amd64" > +ARCH_C +=3D zfs_fletcher_avx512.c > +CFLAGS+=3D -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F > +.endif > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > +ARCH_C +=3D zfs_fletcher_aarch64_neon.c > +.endif > + > +SRCS=3D $(USER_C) $(KERNEL_C) $(ARCH_C) > + > +WARNS?=3D 2 > +SHLIB_MAJOR=3D 4 > +CSTD=3D c99 > +CFLAGS+=3D -DIN_BASE > +CFLAGS+=3D -I${ZFSTOP}/include > +CFLAGS+=3D -I${ZFSTOP}/include/os/freebsd > +CFLAGS+=3D -I${ZFSTOP}/lib/libspl/include > +CFLAGS+=3D -I${ZFSTOP}/lib/libspl/include/os/freebsd > +CFLAGS+=3D -I${ZFSTOP}/lib/libshare > +CFLAGS+=3D -I${ZFSTOP}/lib/libzpool/include > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/ck/include > +CFLAGS+=3D -I${SRCTOP}/sys > +CFLAGS+=3D -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+=3D -I${ZFSTOP}/module/icp/include > +CFLAGS+=3D -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h > +CFLAGS+=3D -DHAVE_ISSETUGID > +CFLAGS+=3D -DHAVE_EXECVPE > +CFLAGS+=3D -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > +CFLAGS+=3D -DSYSCONFDIR=3D\"/etc\" > +CFLAGS+=3D -DPKGDATADIR=3D\"/usr/share/zfs\" > +CFLAGS+=3D -DZFSEXECDIR=3D\"${LIBEXECDIR}/zfs\" > + > +.include > diff --cc cddl/lib/libzpool/Makefile > index ade864790f1c,000000000000..74a5f6ccb438 > mode 100644,000000..100644 > --- a/cddl/lib/libzpool/Makefile > +++ b/cddl/lib/libzpool/Makefile > @@@ -1,343 -1,0 +1,342 @@@ > +.PATH: ${ZFSTOP}/lib/libzpool > + > +# ZFS_COMMON_SRCS > +.PATH: ${ZFSTOP}/module/zfs > +.PATH: ${ZFSTOP}/module/zcommon > +.PATH: ${ZFSTOP}/module/unicode > +# LUA_SRCS > +.PATH: ${ZFSTOP}/module/lua > +# ZSTD_SRCS > +.PATH: ${ZFSTOP}/module/zstd > +.PATH: ${ZFSTOP}/module/zstd/lib/common > +.PATH: ${ZFSTOP}/module/zstd/lib/compress > +.PATH: ${ZFSTOP}/module/zstd/lib/decompress > + > +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHI= NE_ARCH}/opensolaris_atomic.S) > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_A= RCH} > +ATOMIC_SRCS=3D opensolaris_atomic.S > +ACFLAGS+=3D -Wa,--noexecstack > +.else > +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern > +ATOMIC_SRCS=3D opensolaris_atomic.c > +.endif > + > +.if ${MACHINE_ARCH} =3D=3D "powerpc" > +# Don't waste GOT entries on small data. > +PICFLAG=3D -fPIC > +.endif > + > +PACKAGE=3D zfs > +LIB_PACKAGE=3D > + > +LIB=3D zpool > + > +USER_C =3D \ > + arc_os.c \ > + kernel.c \ > + util.c \ > + zfs_debug.c > + > +.PATH: ${ZFSTOP}/module/os/linux/zfs > + > +KERNEL_C =3D \ > + simd_stat.c \ > + zfeature_common.c \ > + zfs_comutil.c \ > + zfs_deleg.c \ > + zfs_fletcher.c \ > + zfs_fletcher_superscalar.c \ > + zfs_fletcher_superscalar4.c \ > + zfs_namecheck.c \ > + zfs_prop.c \ > + zfs_zstd.c \ > + zpool_prop.c \ > + zprop_common.c \ > + abd.c \ > + abd_os.c \ > + aggsum.c \ > + arc.c \ > + blake3_zfs.c \ > + blkptr.c \ > + bplist.c \ > + bpobj.c \ > + bptree.c \ > + bqueue.c \ > + btree.c \ > + brt.c \ > + cityhash.c \ > + dbuf.c \ > + dbuf_stats.c \ > + ddt.c \ > + ddt_log.c \ > + ddt_stats.c \ > + ddt_zap.c \ > + dmu.c \ > + dmu_diff.c \ > + dmu_direct.c \ > + dmu_object.c \ > + dmu_objset.c \ > + dmu_recv.c \ > + dmu_redact.c \ > + dmu_send.c \ > + dmu_traverse.c \ > + dmu_tx.c \ > + dmu_zfetch.c \ > + dnode.c \ > + dnode_sync.c \ > + dsl_bookmark.c \ > + dsl_dataset.c \ > + dsl_deadlist.c \ > + dsl_deleg.c \ > + dsl_dir.c \ > + dsl_crypt.c \ > + dsl_pool.c \ > + dsl_prop.c \ > + dsl_scan.c \ > + dsl_synctask.c \ > + dsl_destroy.c \ > + dsl_userhold.c \ > + edonr_zfs.c \ > + entropy_common.c \ > + error_private.c \ > + fm.c \ > + fse_compress.c \ > + fse_decompress.c \ > + gzip.c \ > + hist.c \ > + hkdf.c \ > + huf_compress.c \ > + huf_decompress.c \ > + lzjb.c \ > + lz4.c \ > + lz4_zfs.c \ > + metaslab.c \ > + mmp.c \ > + multilist.c \ > + objlist.c \ > + pathname.c \ > + pool.c \ > + range_tree.c \ > + refcount.c \ > + rrwlock.c \ > + sa.c \ > + sha2_zfs.c \ > + skein_zfs.c \ > + spa.c \ > + spa_checkpoint.c \ > + spa_config.c \ > + spa_errlog.c \ > + spa_history.c \ > + spa_log_spacemap.c \ > + spa_misc.c \ > + spa_stats.c \ > + space_map.c \ > + space_reftree.c \ > + txg.c \ > ++ u8_textprep.c \ > + trace.c \ > + uberblock.c \ > + unique.c \ > + vdev.c \ > + vdev_draid.c \ > + vdev_draid_rand.c \ > + vdev_file.c \ > + vdev_indirect_births.c \ > + vdev_indirect.c \ > + vdev_indirect_mapping.c \ > + vdev_initialize.c \ > + vdev_label.c \ > + vdev_label_os.c \ > + vdev_mirror.c \ > + vdev_missing.c \ > + vdev_queue.c \ > + vdev_raidz.c \ > + vdev_raidz_math_aarch64_neon.c \ > + vdev_raidz_math_aarch64_neonx2.c \ > + vdev_raidz_math_avx2.c \ > + vdev_raidz_math_avx512bw.c \ > + vdev_raidz_math_avx512f.c \ > + vdev_raidz_math.c \ > + vdev_raidz_math_scalar.c \ > + vdev_rebuild.c \ > + vdev_removal.c \ > + vdev_root.c \ > + vdev_trim.c \ > - xxhash.c \ > + zap.c \ > + zap_leaf.c \ > + zap_micro.c \ > + zcp.c \ > + zcp_get.c \ > + zcp_global.c \ > + zcp_iter.c \ > + zcp_set.c \ > + zcp_synctask.c \ > + zfeature.c \ > + zfs_byteswap.c \ > + zfs_chksum.c \ > + zfs_crrd.c \ > + zfs_debug_common.c \ > + zfs_fm.c \ > + zfs_fuid.c \ > + zfs_impl.c \ > + zfs_sa.c \ > + zfs_znode.c \ > + zfs_racct.c \ > + zfs_ratelimit.c \ > + zfs_rlock.c \ > + zil.c \ > + zio.c \ > + zio_checksum.c \ > + zio_compress.c \ > + zio_crypt.c \ > + zio_inject.c \ > + zle.c \ > + zrlock.c \ > + zstd_common.c \ > + zstd_compress.c \ > + zstd_compress_literals.c \ > + zstd_compress_sequences.c \ > + zstd_compress_superblock.c \ > + zstd_ddict.c \ > + zstd_decompress.c \ > + zstd_decompress_block.c \ > + zstd_double_fast.c \ > + zstd_fast.c \ > + zstd_lazy.c \ > + zstd_ldm.c \ > + zstd_opt.c \ > ++ zstd_preSplit.c \ > + zthr.c > + > +ARCH_C =3D > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386" > +ARCH_C +=3D vdev_raidz_math_sse2.c \ > + vdev_raidz_math_ssse3.c \ > + zfs_fletcher_intel.c \ > + zfs_fletcher_sse.c=20 > +CFLAGS +=3D -DHAVE_SSE2 -DHAVE_SSE3 > +.endif > +.if ${MACHINE_ARCH} =3D=3D "amd64" > +ARCH_C +=3D zfs_fletcher_avx512.c > +CFLAGS+=3D -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ > + -DHAVE_AVX512BW > +.endif > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > +ARCH_C +=3D zfs_fletcher_aarch64_neon.c > +.endif > + > +LUA_C =3D \ > + lapi.c \ > + lauxlib.c \ > + lbaselib.c \ > + lcode.c \ > + lcompat.c \ > + lcorolib.c \ > + lctype.c \ > + ldebug.c \ > + ldo.c \ > + lfunc.c \ > + lgc.c \ > + llex.c \ > + lmem.c \ > + lobject.c \ > + lopcodes.c \ > + lparser.c \ > + lstate.c \ > + lstring.c \ > + lstrlib.c \ > + ltable.c \ > + ltablib.c \ > + ltm.c \ > + lvm.c \ > + lzio.c > + > - UNICODE_C =3D u8_textprep.c > -=20 > - SRCS+=3D ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} > ++SRCS+=3D ${USER_C} ${KERNEL_C} ${LUA_C} ${ARCH_C} > + > *** 15577 LINES SKIPPED *** I think the removal of dev/acpi_support/acpi_system76.c from sys/conf/files is unintentional here, this broke amd64 LINT. Might have to look for other cases of unintended changes. From nobody Sat Mar 14 23:48:23 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYJ2m1bFDz6VcTR for ; Sat, 14 Mar 2026 23:48:32 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb12f.google.com (mail-yx1-xb12f.google.com [IPv6:2607:f8b0:4864:20::b12f]) (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 4fYJ2l2KnWz3cFr for ; Sat, 14 Mar 2026 23:48:31 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=V5vMCCMw; dmarc=pass (policy=none) header.from=gmail.com; arc=pass ("google.com:s=arc-20240605:i=1"); spf=pass (mx1.freebsd.org: domain of oliver.pntr@gmail.com designates 2607:f8b0:4864:20::b12f as permitted sender) smtp.mailfrom=oliver.pntr@gmail.com Received: by mail-yx1-xb12f.google.com with SMTP id 956f58d0204a3-64ad46a44easo3240141d50.0 for ; Sat, 14 Mar 2026 16:48:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1773532105; cv=none; d=google.com; s=arc-20240605; b=dVD0dt1ubcXsW9yFAJCLofhZvMKHmAZfq+3Q7wA+B7A7F2t3NVQgl97D0F8y22lu5h lG39i59046b5rSCEEEQ8XVEzNftp/D54k6C4TtOSEz2S5w+z4XRogHGgMDvOtvp/1B9N oJAMycEkk0fCvUWDKO1zb6XRaEKne1AY/DQ0Ov2Nd3ngf5DGwfPt6K+ozi05zKv7gH8q G8wkDXESbkes4ysWrLQtIko2hroLW15UjA3nTt92fi3ZGl25j85FgNbM00aYE4aqOXu1 D38N2a2qzRdoPH9IW3/7beg/PcXZYvqFcegKQZ499w+d6SEkFALVfGavGBRq1KNmH3az hmRA== 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:references:in-reply-to :mime-version:dkim-signature; bh=2jQKHg20Oz0gWPFgmpx8zqie3oof4nY+6Ym1hiACesc=; fh=I8mxRwiBw31MoF/d4qVUa+gaFaW/sG/1zLZfI8Yup9g=; b=NA+BoJ6EX7qsfNWQqa7ezEU8vh5mPXHif5oKqkm1ohZk6Guys6S+OJ/aYhDpm+zfA3 wJRWQqGxWCtcJnYLYVYfrnkLfprxTvqFsPHS8uuQpJlyXAYdlnOJWHh4k8nNg/rizm0v GNPyoOWMY8aDftr7uts/K3w9vzuJnsjH7PndvsISE42QLBH4ICqQWg5qqiqPciek7zIN KsQO5ypX4ROlJuM6kA9djf5AZVp/JKBm2lvS8+mgJFueayEsMCNlPLr2fNdi/GkpLt5i VU86Ow3oF3JfM/Lz41jcgUF3WYEtWmPnDO1SmdMaYtJvhBjy80Q0QhdxO29WmVt2Q8/v Vz7A==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773532105; x=1774136905; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=2jQKHg20Oz0gWPFgmpx8zqie3oof4nY+6Ym1hiACesc=; b=V5vMCCMwvZfIvFMNi9EE0DY2N8m8yOmJ2QkPHDkx7ghOGEmTUynAe9L0M+NH4pWtEb 4vHSNXKbxbDe9AV7Jf0XtbFUJTBGp9+ugpJxbO3dJ3js9Ayp8/SSwM0nToSiAyxRI9lK 2SPwbBNzbSMyOWhVVdLEtRu2KCv7k3U/Q4+0mWxTYq2l+qv583g4d6okyphYkyRaqCwC ZkCfSNKx5mzIQToEJ9JSP59nIEfqux66HTwvcdWJBe3ddt3gbrgxEL+SiZ6yCmFEzUvq DCVX7QC2lPDxOJpkyeFVY9vsE4grAdVl7/Lx3bxKrsGXSeHBKc8jDMARnVpyU1Y3u5Al Qapw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773532105; x=1774136905; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2jQKHg20Oz0gWPFgmpx8zqie3oof4nY+6Ym1hiACesc=; b=SrgNf8k4caLYAD/DXMDsA5RUEDuZKd/xsLTMXXSLVAypoW7eMbv3jFxXG6tnLRb4Nc cUQ9q/tPvnqErX17chY9lBaDkA3c89CDIGtBfMwdOLZHvc8jMQ/56KnaV9iXQ7VZ4asH rtNwlED29e8Zm45BxsoVXKvISnkHsN1gfGoprxUj4Q/fqCQbccN2WfDIf/EyOFmVF7iH 8lGPLOf3F5Ilezd83rDe6SI7Tv+2SdCsfWFFE2IynuAjonchPvodHtdLfQmMrWYyQMr0 kK7yOv3H86zKZOSeg98VTp9x3QCSD1YLH3Ij35q26K1unvN4eL0TL/+WXWH2nsCyJqTq D9ZA== X-Forwarded-Encrypted: i=1; AJvYcCXtA3xaDG58Spw36M8pLwnATmRmwchIETPfs2P+0S5padRacsKYJgAyczd3+Pwu1KzBV2C3n8HaFeAv/TjvmLzdYoOz@freebsd.org X-Gm-Message-State: AOJu0Yxv14qPYyIEAE4E3glAaeHlovL+npyePSrrJWFuNA97ZUebLh3v kh6d7Hj9d7Sq55/yJ2IikGA5Cic64zF/d4OjNF+lXF1s2VzFlde5lsZ0d36lHZPVM25yaeI/fxx 0O2ISD0qcerXDE1OGGlPZQMgSVpnIW1k= X-Gm-Gg: ATEYQzyp8+VBjgvQT+oJOSVRns99vC/Ov/7eIi3SiY5NVlj2lx8Q1ed087vmTkwjI2r 74uAVGxIYlH5AkWgXw8fNXvymdyUS4WFURX2YjY2hfdhQfVmVmffNIA6y9C0rsNQDFd23q4Cv6A 9XjiFAbZdXMxo5Ci1C3cSh07uNOqtsBd2vAzAF1wnswokvHYgzDGQO8GIgEKvA3ooerOrVTkuQt AZ0DSNDAJ+Pb7txFMUnYrWltee1OwBZhNAkKg/7scGdjNODqdPN2dnR0eZiAkNee1rLakJDKX/z 2enYEmYk3YXMlfIbSzoAy2xyWHOil4PB6aiTqFsgKA== X-Received: by 2002:a53:ecd7:0:b0:649:ef06:15f3 with SMTP id 956f58d0204a3-64e62f033d0mr6909714d50.10.1773532105219; Sat, 14 Mar 2026 16:48:25 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Received: by 2002:a05:7011:3113:b0:50c:2f00:153f with HTTP; Sat, 14 Mar 2026 16:48:23 -0700 (PDT) In-Reply-To: <69aedac4.33ef1.717b7bd3@gitrepo.freebsd.org> References: <69aedac4.33ef1.717b7bd3@gitrepo.freebsd.org> From: Oliver Pinter Date: Sun, 15 Mar 2026 00:48:23 +0100 X-Gm-Features: AaiRm53bPcPzcyaSIsXebaR0Jvwf2SqkEfp-JaW7P5g9suIpI3jFjcYmX-N3-K0 Message-ID: Subject: Re: git: b4daeded66b5 - main - usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mode switch) To: "Bjoern A. Zeeb" Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000212429064d049fcb" X-Spamd-Result: default: False [-4.89 / 15.00]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; NEURAL_HAM_SHORT(-0.90)[-0.898]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TAGGED_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b12f:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROMTLD(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4fYJ2l2KnWz3cFr X-Spamd-Bar: ---- --000000000000212429064d049fcb Content-Type: text/plain; charset="UTF-8" On Monday, March 9, 2026, Bjoern A. Zeeb wrote: > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id= > b4daeded66b5e950ed8e618d66915b863c2414b1 > > commit b4daeded66b5e950ed8e618d66915b863c2414b1 > Author: Bjoern A. Zeeb > AuthorDate: 2026-01-26 13:19:37 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2026-03-09 14:35:31 +0000 > > usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mode switch) > > Several Realtek (and lots other) USB dongles present themselves as > CDROM device first. Upon eject they do a mode switch and suddenly > are a different kind of device (sometimes even with different IDs), > e.g., a wireless dongle. > > In order to avoid the CDROM stage and rather than adding the quirk > handling to more drivers, add support to umass and if enabled > automatically eject the "CDROM" to make it the real device. > > Longer-term some other drivers could stop using their hand-rolled > support for this. It is unclear as-to how much we need the list of > (eject) quirks from u3g here, or if these are very specific to that > kind of devices. Hi! Wouldn't be better to initiate these kind of ejects from devd rather than from kernel? > > Sponsored by: The FreeBSD Foundation > Fixes: b3b6a959c85a, 9c0cce328363 > Reviewed by: imp > Differential Revision: https://reviews.freebsd.org/D54901 > --- > sys/dev/usb/quirk/usb_quirk.c | 2 +- > sys/dev/usb/storage/umass.c | 57 ++++++++++++++++++++++++++++++ > ++++++++++++- > 2 files changed, 57 insertions(+), 2 deletions(-) > > diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c > index 04441b2a344b..303f76f37fb0 100644 > --- a/sys/dev/usb/quirk/usb_quirk.c > +++ b/sys/dev/usb/quirk/usb_quirk.c > @@ -532,7 +532,7 @@ static struct usb_quirk_entry > usb_quirks[USB_DEV_QUIRKS_MAX] = { > UQ_MSC_NO_INQUIRY, UQ_CFG_INDEX_0), > USB_QUIRK(SMART2, G2MEMKEY, UQ_MSC_NO_INQUIRY), > USB_QUIRK_REV(RALINK, RT_STOR, 0x0001, 0x0001, UQ_MSC_IGNORE), > - USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_IGNORE), > + USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_EJECT_SCSIEJECT), > /* Non-standard USB MIDI devices */ > USB_QUIRK(ROLAND, UM1, UQ_AU_VENDOR_CLASS), > USB_QUIRK(ROLAND, SC8850, UQ_AU_VENDOR_CLASS), > diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c > index cacf4ddf8f16..0ee6ea992fa7 100644 > --- a/sys/dev/usb/storage/umass.c > +++ b/sys/dev/usb/storage/umass.c > @@ -115,6 +115,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -124,6 +125,7 @@ > #include "usbdevs.h" > > #include > +#include > > #include > #include > @@ -705,6 +707,59 @@ static const uint8_t fake_inq_data[SHORT_INQUIRY_LENGTH] > = { > #define UFI_COMMAND_LENGTH 12 /* UFI commands are always > 12 bytes */ > #define ATAPI_COMMAND_LENGTH 12 /* ATAPI commands are > always 12 bytes */ > > +static void > +umass_autoinst_eject_quirks(void *arg __unused, struct usb_device *udev, > + struct usb_attach_arg *uaa) > +{ > + struct usb_interface *iface; > + struct usb_interface_descriptor *id; > + > + if (uaa->dev_state != UAA_DEV_READY) > + return; > + > + iface = usbd_get_iface(udev, 0); > + if (iface == NULL) > + return; > + > + id = iface->idesc; > + if (id == NULL || id->bInterfaceClass != UICLASS_MASS) > + return; > + > + if (usb_test_quirk(uaa, UQ_MSC_EJECT_SCSIEJECT)) { > + int error; > + > + error = usb_msc_eject(uaa->device, 0, MSC_EJECT_STOPUNIT); > + if (error == 0) > + uaa->dev_state = UAA_DEV_EJECTING; > + else > + printf("UMASS failed to eject by SCSI eject > STOPUNIT " > + "command based on quirk: %d\n", error); > + } > +} > + > +static eventhandler_tag umass_drv_evh_tag; > + > +static int > +umass_driver_evh(struct module *mod, int what, void *arg) > +{ > + > + switch (what) { > + case MOD_LOAD: > + umass_drv_evh_tag = EVENTHANDLER_REGISTER(usb_dev_ > configured, > + umass_autoinst_eject_quirks, NULL, > EVENTHANDLER_PRI_ANY); > + break; > + case MOD_UNLOAD: > + if (umass_drv_evh_tag != NULL) > + EVENTHANDLER_DEREGISTER(usb_dev_configured, > + umass_drv_evh_tag); > + break; > + default: > + return (EOPNOTSUPP); > + } > + > + return (0); > +} > + > static device_method_t umass_methods[] = { > /* Device interface */ > DEVMETHOD(device_probe, umass_probe), > @@ -725,7 +780,7 @@ static const STRUCT_USB_HOST_ID __used umass_devs[] = { > {USB_IFACE_CLASS(UICLASS_MASS),}, > }; > > -DRIVER_MODULE(umass, uhub, umass_driver, NULL, NULL); > +DRIVER_MODULE(umass, uhub, umass_driver, umass_driver_evh, NULL); > MODULE_DEPEND(umass, usb, 1, 1, 1); > MODULE_DEPEND(umass, cam, 1, 1, 1); > MODULE_VERSION(umass, 1); > > --000000000000212429064d049fcb Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Monday, March 9, 2026, Bjoern A. Zeeb <bz@freebsd.org> wrote:
The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Db4daeded66b5e950ed8e618d66915b863c2414b1

commit b4daeded66b5e950ed8e618d66915b863c2414b1
Author:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2026-01-26 13:19:37 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-03-09 14:35:31 +0000

=C2=A0 =C2=A0 usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mod= e switch)

=C2=A0 =C2=A0 Several Realtek (and lots other) USB dongles present themselv= es as
=C2=A0 =C2=A0 CDROM device first.=C2=A0 Upon eject they do a mode switch an= d suddenly
=C2=A0 =C2=A0 are a different kind of device (sometimes even with different= IDs),
=C2=A0 =C2=A0 e.g., a wireless dongle.

=C2=A0 =C2=A0 In order to avoid the CDROM stage and rather than adding the = quirk
=C2=A0 =C2=A0 handling to more drivers, add support to umass and if enabled=
=C2=A0 =C2=A0 automatically eject the "CDROM" to make it the real= device.

=C2=A0 =C2=A0 Longer-term some other drivers could stop using their hand-ro= lled
=C2=A0 =C2=A0 support for this.=C2=A0 It is unclear as-to how much we need = the list of
=C2=A0 =C2=A0 (eject) quirks from u3g here, or if these are very specific t= o that
=C2=A0 =C2=A0 kind of devices.

Hi!

Wouldn't be better to initiate these kind of ejects fr= om devd rather than from kernel?
=C2=A0

=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation
=C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 b3b6a959c85a, 9c0cce= 328363
=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 imp
=C2=A0 =C2=A0 Differential Revision: https://reviews.freebsd.org/D54901
---
=C2=A0sys/dev/usb/quirk/usb_quirk.c |=C2=A0 2 +-
=C2=A0sys/dev/usb/storage/umass.c=C2=A0 =C2=A0| 57 ++++++++++++++++++++++++= ++++++++++++++++++-
=C2=A02 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_qui= rk.c
index 04441b2a344b..303f76f37fb0 100644
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@@ -532,7 +532,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS= _MAX] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 UQ_MSC_NO_INQUIRY, UQ_CFG_INDEX_0= ),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 USB_QUIRK(SMART2, G2MEMKEY, UQ_MSC_NO_INQUIRY),=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 USB_QUIRK_REV(RALINK, RT_STOR, 0x0001, 0x0001, = UQ_MSC_IGNORE),
-=C2=A0 =C2=A0 =C2=A0 =C2=A0USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_IGNORE)= ,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_EJECT_S= CSIEJECT),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Non-standard USB MIDI devices */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 USB_QUIRK(ROLAND, UM1, UQ_AU_VENDOR_CLASS),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 USB_QUIRK(ROLAND, SC8850, UQ_AU_VENDOR_CLASS),<= br> diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index cacf4ddf8f16..0ee6ea992fa7 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -115,6 +115,7 @@
=C2=A0#include <sys/sx.h>
=C2=A0#include <sys/unistd.h>
=C2=A0#include <sys/callout.h>
+#include <sys/eventhandler.h>
=C2=A0#include <sys/malloc.h>
=C2=A0#include <sys/priv.h>

@@ -124,6 +125,7 @@
=C2=A0#include "usbdevs.h"

=C2=A0#include <dev/usb/quirk/usb_quirk.h>
+#include <dev/usb/usb_msctest.h>

=C2=A0#include <cam/cam.h>
=C2=A0#include <cam/cam_ccb.h>
@@ -705,6 +707,59 @@ static const uint8_t fake_inq_data[SHORT_INQUIRY_= LENGTH] =3D {
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 UFI_COMMAND_LENGTH=C2=A0 =C2=A0 = =C2=A0 12=C2=A0 =C2=A0 =C2=A0 /* UFI commands are always 12 bytes */
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 ATAPI_COMMAND_LENGTH=C2=A0 =C2=A0 = 12=C2=A0 =C2=A0 =C2=A0 /* ATAPI commands are always 12 bytes */

+static void
+umass_autoinst_eject_quirks(void *arg __unused, struct usb_device *ud= ev,
+=C2=A0 =C2=A0 struct usb_attach_arg *uaa)
+{
+=C2=A0 =C2=A0 =C2=A0 =C2=A0struct usb_interface *iface;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0struct usb_interface_descriptor *id;
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (uaa->dev_state !=3D UAA_DEV_READY)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0iface =3D usbd_get_iface(udev, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (iface =3D=3D NULL)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0id =3D iface->idesc;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (id =3D=3D NULL || id->bInterfaceClass != =3D UICLASS_MASS)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (usb_test_quirk(uaa, UQ_MSC_EJECT_SCSIEJECT)= ) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int error;
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error =3D usb_msc_e= ject(uaa->device, 0, MSC_EJECT_STOPUNIT);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (error =3D=3D 0)=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0uaa->dev_state =3D UAA_DEV_EJECTING;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0else
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0printf("UMASS failed to eject by SCSI eject STOPUNIT "<= br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0"command based on quirk: %d\n", error); +=C2=A0 =C2=A0 =C2=A0 =C2=A0}
+}
+
+static eventhandler_tag umass_drv_evh_tag;
+
+static int
+umass_driver_evh(struct module *mod, int what, void *arg)
+{
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0switch (what) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0case MOD_LOAD:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0umass_drv_evh_tag = =3D EVENTHANDLER_REGISTER(usb_dev_configured,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0umass= _autoinst_eject_quirks, NULL, EVENTHANDLER_PRI_ANY);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0case MOD_UNLOAD:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (umass_drv_evh_t= ag !=3D NULL)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0EVENTHANDLER_DEREGISTER(usb_dev_configured,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0umass_drv_evh_tag);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0default:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return (EOPNOTSUPP)= ;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0}
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0return (0);
+}
+
=C2=A0static device_method_t umass_methods[] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Device interface */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 DEVMETHOD(device_probe, umass_probe),
@@ -725,7 +780,7 @@ static const STRUCT_USB_HOST_ID __used umass_devs[] =3D= {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 {USB_IFACE_CLASS(UICLASS_MASS),},
=C2=A0};

-DRIVER_MODULE(umass, uhub, umass_driver, NULL, NULL);
+DRIVER_MODULE(umass, uhub, umass_driver, umass_driver_evh, NULL);
=C2=A0MODULE_DEPEND(umass, usb, 1, 1, 1);
=C2=A0MODULE_DEPEND(umass, cam, 1, 1, 1);
=C2=A0MODULE_VERSION(umass, 1);

--000000000000212429064d049fcb-- From nobody Sun Mar 15 04:03:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYPhb4brHz6V0Lb for ; Sun, 15 Mar 2026 04:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYPhb4FLRz468N for ; Sun, 15 Mar 2026 04:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773547391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/BEH0W/8yJ5ZPd3OJ8ZQq+8hWy6Tz4PN0hg+4tNGlCg=; b=HHH86VzfdGYiJAQrP+bQ2SLXmerJ9otMQdpvYygshsSuvLV3Kj2kEiXDNZHaZPnF6FBXWD TwnGmlA+scW051d2JI7Uo4pIX7XqEMPliGzN6MygD2YKN0XF8MYLUDTXeA741bsBesmZ1w Z81BRioV5pSbCiuNjARvam2kkNC8OYTVOENvOLNNlwd1OYSXgTHlulyVTyyCEcq3Y42o4/ mS4rBzVHEv35O5AfR9DSiPGf1p8RfYfcPfyHk+lXGFAh/Vc+hhtu6w0V6SzcuOvz4iA0Ds GOMkg6guPbbCzlORnroqSQbfo5OTeUJXfqoxgnonP+KrpNcDvbwZ0ctENUzD2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773547391; a=rsa-sha256; cv=none; b=xokrI8QIOFQqpDbb75iEvCdNIiHQIWqdsrDi25R8JCw/WbcnaIRZQwlZrqan83dzH5jGbU dYnGNNzIIZ4bn5rf1YtVO8bJk813UTDYF01E5WROdDlDDvnsLdbvb02ku9OT8fsOx/cltH RrtDCTckRMJ6UHJxJ3dAO0X0bwT1FydgiOs981Da1dwU3g3UVvVIvqBRSAtemt2wez8e1Q tcDY3YXm+VJDyStBqRuIGLdut5BUzaV9th+8j5He05FK7s9zVumPQnLJa3ZjrhRoUM5rWa 9W+RfYXIrUwcge9FljAezfPlLjFqJGToRaUuhGnjS40q/+OzKLd3uw5+KjIDQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773547391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/BEH0W/8yJ5ZPd3OJ8ZQq+8hWy6Tz4PN0hg+4tNGlCg=; b=lD0nuMUhBZuC03SvQW+1FePT2fuWMqs8KofVaLPMI7Da0veXbJJOIA3WYoWAr+gwiVWHgE 3eVyYnmSBjGwM5YgvAhBcu7veEAzJyGZyr+NAQ/srJC1kvbpWF+rKAXAN/WZvIEEJRyTR8 VSoyvKJYmCy90mP1bfqYLAsaYmrc/eRCeyzvDOD27O9xqBUGkXmo9Jaay2Npr8dWUsKDTs FAyZ/3kVvPM67Ij5YBfO+6Mm8fzZ2fAHelDmkN8ta7wBcYGFoxKWE0gnMIkhvsyvPVLjhU iIVMn1HK7aUeVieSA5YRuUnJXo2ERYfD++3Di+vJxEJyDW4KXLtRm8ZTswN8Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYPhb3Z1JzYqR for ; Sun, 15 Mar 2026 04:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4495f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 04:03:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 16cef5f7a655 - main - libpcap: Update to 1.10.6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16cef5f7a65588def71db4fdfa961f959847e3b6 Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 04:03:03 +0000 Message-Id: <69b62f77.4495f.7d4ef563@gitrepo.freebsd.org> The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=16cef5f7a65588def71db4fdfa961f959847e3b6 commit 16cef5f7a65588def71db4fdfa961f959847e3b6 Merge: e6f4e4ab8a51 0a1fbf4c244d Author: Joseph Mingrone AuthorDate: 2026-03-15 01:42:55 +0000 Commit: Joseph Mingrone CommitDate: 2026-03-15 03:41:29 +0000 libpcap: Update to 1.10.6 Changes: https://raw.githubusercontent.com/the-tcpdump-group/libpcap/89e982c37c36ad0bf9f10b7ded421cb42422effa/CHANGES Reviewed by: bms, emaste Obtained from: https://www.tcpdump.org/release/libpcap-1.10.6.tar.gz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55545 Differential Revision: https://reviews.freebsd.org/D55858 contrib/libpcap/CHANGES | 107 ++ contrib/libpcap/CMakeLists.txt | 55 +- contrib/libpcap/CREDITS | 13 + contrib/libpcap/INSTALL.md | 4 + contrib/libpcap/Makefile.in | 12 +- contrib/libpcap/VERSION | 2 +- contrib/libpcap/aclocal.m4 | 11 +- contrib/libpcap/autogen.sh | 41 +- contrib/libpcap/cmake/Modules/FindPacket.cmake | 49 +- contrib/libpcap/cmakeconfig.h.in | 12 +- contrib/libpcap/config.h.in | 8 +- contrib/libpcap/configure | 1097 ++++++++++---------- contrib/libpcap/configure.ac | 37 +- contrib/libpcap/dlpisubs.c | 124 +++ contrib/libpcap/dlpisubs.h | 1 + contrib/libpcap/doc/README.haiku.md | 40 +- contrib/libpcap/doc/README.solaris.md | 24 +- contrib/libpcap/doc/README.windows.md | 175 +++- contrib/libpcap/fad-getad.c | 13 +- contrib/libpcap/fmtutils.c | 2 +- contrib/libpcap/gencode.c | 346 ++++-- contrib/libpcap/grammar.y.in | 13 - contrib/libpcap/ieee80211.h | 6 +- contrib/libpcap/instrument-functions.c | 250 +++++ contrib/libpcap/nametoaddr.c | 452 +++++++- contrib/libpcap/nametoaddr.h | 1 + contrib/libpcap/optimize.c | 2 +- contrib/libpcap/pcap-bpf.c | 40 +- contrib/libpcap/pcap-common.c | 92 +- contrib/libpcap/pcap-dag.c | 5 +- contrib/libpcap/pcap-dbus.c | 4 + contrib/libpcap/pcap-dlpi.c | 348 ++++--- contrib/libpcap/pcap-dpdk.c | 5 +- contrib/libpcap/pcap-haiku.c | 8 +- contrib/libpcap/pcap-int.h | 33 +- contrib/libpcap/pcap-libdlpi.c | 33 +- contrib/libpcap/pcap-linux.c | 636 ++++++++++-- contrib/libpcap/pcap-new.c | 54 +- contrib/libpcap/pcap-npf.c | 100 +- contrib/libpcap/pcap-rpcap.c | 2 +- contrib/libpcap/pcap-savefile.manfile.in | 29 +- contrib/libpcap/pcap-septel.c | 3 +- contrib/libpcap/pcap-snf.c | 5 +- contrib/libpcap/pcap.c | 73 +- contrib/libpcap/pcap/bpf.h | 2 - contrib/libpcap/pcap/dlt.h | 102 +- contrib/libpcap/pcap_close.3pcap | 14 +- contrib/libpcap/pcap_dump_close.3pcap | 11 +- contrib/libpcap/pcap_dump_flush.3pcap | 2 +- contrib/libpcap/pcap_file.3pcap | 2 +- contrib/libpcap/pcap_loop.3pcap | 2 +- contrib/libpcap/pcap_next_ex.3pcap | 2 +- contrib/libpcap/pcap_open_offline.3pcap.in | 8 +- contrib/libpcap/pflog.h | 4 + contrib/libpcap/rpcapd/CMakeLists.txt | 28 +- contrib/libpcap/rpcapd/rpcapd.c | 14 +- contrib/libpcap/scanner.l | 22 - contrib/libpcap/sf-pcap.c | 15 +- contrib/libpcap/testprogs/CMakeLists.txt | 9 +- contrib/libpcap/testprogs/Makefile.in | 5 + contrib/libpcap/testprogs/filtertest.c | 3 + contrib/libpcap/testprogs/fuzz/CMakeLists.txt | 43 - contrib/libpcap/testprogs/fuzz/fuzz_both.c | 101 -- contrib/libpcap/testprogs/fuzz/fuzz_both.options | 2 - contrib/libpcap/testprogs/fuzz/fuzz_filter.c | 43 - contrib/libpcap/testprogs/fuzz/fuzz_filter.options | 2 - contrib/libpcap/testprogs/fuzz/fuzz_pcap.c | 80 -- contrib/libpcap/testprogs/fuzz/fuzz_pcap.options | 2 - contrib/libpcap/testprogs/fuzz/onefile.c | 54 - contrib/libpcap/testprogs/versiontest.c | 29 + lib/libpcap/Makefile | 1 - lib/libpcap/config.h | 261 ++++- sys/net/dlt.h | 177 +++- 73 files changed, 3740 insertions(+), 1667 deletions(-) diff --cc contrib/libpcap/instrument-functions.c index 000000000000,ba0a56a5309f..ba0a56a5309f mode 000000,100644..100644 --- a/contrib/libpcap/instrument-functions.c +++ b/contrib/libpcap/instrument-functions.c diff --cc contrib/libpcap/testprogs/versiontest.c index 000000000000,a1177dcc0ed4..a1177dcc0ed4 mode 000000,100644..100644 --- a/contrib/libpcap/testprogs/versiontest.c +++ b/contrib/libpcap/testprogs/versiontest.c diff --cc lib/libpcap/Makefile index 7f8d8e65d79c,000000000000..87da7faccdd6 mode 100644,000000..100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@@ -1,201 -1,0 +1,200 @@@ +# Makefile for libpcap + +SHLIBDIR?= /lib + +.include + +LIB= pcap + +SRCS= bpf_dump.c \ + bpf_filter.c \ + bpf_image.c \ + etherent.c \ + fad-getad.c \ + fmtutils.c \ + gencode.c \ + grammar.y \ + nametoaddr.c \ + optimize.c \ + pcap-bpf.c \ + pcap-common.c \ + pcap-netmap.c \ + pcap-util.c \ + pcap.c \ + savefile.c \ + scanner.l \ + sf-pcap.c \ + sf-pcapng.c \ + tokdefs.h + +# Old compatibility headers +INCS= pcap-bpf.h \ + pcap-namedb.h \ + pcap-netmap.h \ + pcap.h + +PCAPINCS= \ + pcap/bluetooth.h \ + pcap/bpf.h \ + pcap/can_socketcan.h \ + pcap/compiler-tests.h \ + pcap/dlt.h \ + pcap/funcattrs.h \ + pcap/ipnet.h \ + pcap/namedb.h \ + pcap/nflog.h \ + pcap/pcap-inttypes.h \ + pcap/pcap.h \ + pcap/socket.h \ + pcap/sll.h \ + pcap/usb.h \ + pcap/vlan.h + +PCAPINCSDIR= ${INCLUDEDIR}/pcap +INCSGROUPS= INCS PCAPINCS + +MAN= pcap.3 \ + pcap_activate.3 \ + pcap_breakloop.3 \ + pcap_can_set_rfmon.3 \ + pcap_close.3 \ + pcap_compile.3 \ + pcap_create.3 \ + pcap_datalink.3 \ + pcap_datalink_name_to_val.3 \ + pcap_datalink_val_to_name.3 \ + pcap_dump.3 \ + pcap_dump_close.3 \ + pcap_dump_file.3 \ + pcap_dump_flush.3 \ + pcap_dump_ftell.3 \ + pcap_dump_open.3 \ + pcap_file.3 \ + pcap_fileno.3 \ + pcap_findalldevs.3 \ + pcap_freecode.3 \ + pcap_get_required_select_timeout.3 \ + pcap_get_selectable_fd.3 \ + pcap_get_tstamp_precision.3 \ + pcap_geterr.3 \ + pcap_init.3 \ + pcap_inject.3 \ + pcap_is_swapped.3 \ + pcap_lib_version.3 \ + pcap_list_datalinks.3 \ + pcap_list_tstamp_types.3 \ + pcap_lookupdev.3 \ + pcap_lookupnet.3 \ + pcap_loop.3 \ + pcap_major_version.3 \ + pcap_next_ex.3 \ + pcap_offline_filter.3 \ + pcap_open_dead.3 \ + pcap_open_live.3 \ + pcap_open_offline.3 \ + pcap_set_buffer_size.3 \ + pcap_set_datalink.3 \ + pcap_set_promisc.3 \ + pcap_set_rfmon.3 \ + pcap_set_snaplen.3 \ + pcap_set_timeout.3 \ + pcap_set_tstamp_precision.3 \ + pcap_set_tstamp_type.3 \ + pcap_setdirection.3 \ + pcap_setfilter.3 \ + pcap_setnonblock.3 \ + pcap_snapshot.3 \ + pcap_stats.3 \ + pcap_statustostr.3 \ + pcap_strerror.3 \ + pcap_tstamp_type_name_to_val.3 \ + pcap_tstamp_type_val_to_name.3 \ + pcap-savefile.5 + +MANNODEV= pcap-filter.7 \ + pcap-linktype.7 \ + pcap-tstamp.7 + +MLINKS= \ + pcap_datalink_val_to_name.3 pcap_datalink_val_to_description.3 \ + pcap_dump_open.3 pcap_dump_fopen.3 \ + pcap_findalldevs.3 pcap_freealldevs.3 \ + pcap_geterr.3 pcap_perror.3 \ + pcap_inject.3 pcap_sendpacket.3 \ + pcap_list_datalinks.3 pcap_free_datalinks.3 \ + pcap_list_tstamp_types.3 pcap_free_tstamp_types.3 \ + pcap_loop.3 pcap_dispatch.3 \ + pcap_major_version.3 pcap_minor_version.3 \ + pcap_next_ex.3 pcap_next.3 \ + pcap_open_offline.3 pcap_fopen_offline.3 \ + pcap_setnonblock.3 pcap_getnonblock.3 + +# Our man pages are a special copy from the distdir. See below. +CLEANFILES+=${MAN} ${MANNODEV} +CLEANFILES+=grammar.y scanner.h tokdefs.h + +YFLAGS+=-p pcap_ +LFLAGS+=-Ppcap_ --header-file=${.OBJDIR}/scanner.h --nounput +CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR} +CFLAGS+=-D_U_="__attribute__((unused))" - CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF +CFLAGS+=-DBUILDING_PCAP +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+=-DINET6 +.endif +.if ${MK_PF} != "no" +CFLAGS+=-DHAVE_NET_PFVAR_H +.endif + +CFLAGS+= -DPCAP_SUPPORT_NETMAP + +.if ${MK_OFED} != "no" +SRCS+= pcap-rdmasniff.c +LIBADD+= ibverbs +LIBADD+= bnxtre +LIBADD+= mlx5 +CFLAGS+= -DPCAP_SUPPORT_RDMASNIFF +.endif + +WARNS?= 0 + +SHLIB_MAJOR= 8 + +# +# Magic to grab sources out of src/contrib +# +PCAP_DISTDIR?=${SRCTOP}/contrib/libpcap +CFLAGS+=-I${PCAP_DISTDIR} +.PATH: ${PCAP_DISTDIR} +.PATH: ${PCAP_DISTDIR}/bpf/net + +grammar.y: grammar.y.in + sed -e 's/@REENTRANT_PARSER@/%pure-parser/' < ${.ALLSRC} > ${.TARGET} + +tokdefs.h: grammar.h .NOMETA + ln -sf ${.ALLSRC} ${.TARGET} + +# +# Magic to convert the man pages to something non Solarish +# +.for _page in ${MAN} ${MANNODEV} +${_page}: + if [ -f ${PCAP_DISTDIR}/${_page:S/3$/3pcap/} ]; then \ + F=${_page:S/3$/3pcap/}; \ + elif [ -f ${PCAP_DISTDIR}/${_page:S/3$/3pcap.in/} ]; then \ + F=${_page:S/3$/3pcap.in/}; \ + elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile.in/} ]; then \ + F=${_page:S/5$/manfile.in/}; \ + elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile/} ]; then \ + F=${_page:S/5$/manfile/}; \ + else \ + F=${_page:S/7$/manmisc.in/}; \ + fi; \ + sed \ + -e 's/3PCAP/3/g' \ + -e 's/@MAN_FILE_FORMATS@/5/g' \ + -e 's/@MAN_MISC_INFO@/7/g' \ + -e 's/@MAN_ADMIN_COMMANDS@/8/g' \ + ${PCAP_DISTDIR}/$$F > ${_page} +.endfor + +.include diff --cc lib/libpcap/config.h index cea0cc4fd7cb,000000000000..bcae25131613 mode 100644,000000..100644 --- a/lib/libpcap/config.h +++ b/lib/libpcap/config.h @@@ -1,222 -1,0 +1,377 @@@ +/* This is an edited copy of the config.h generated by configure. */ + +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + ++/* Define to 1 if arpa/inet.h declares `ether_hostton' */ ++/* #undef ARPA_INET_H_DECLARES_ETHER_HOSTTON */ ++ ++/* Enable optimizer debugging */ ++/* #undef BDEBUG */ ++ ++/* define if you want to build the instrument functions code */ ++/* #undef ENABLE_INSTRUMENT_FUNCTIONS */ ++ ++/* Define to 1 if remote packet capture is to be supported */ ++/* #undef ENABLE_REMOTE */ ++ ++/* define if we have the AIX getnetbyname_r() */ ++/* #undef HAVE_AIX_GETNETBYNAME_R */ ++ ++/* define if we have the AIX getprotobyname_r() */ ++/* #undef HAVE_AIX_GETPROTOBYNAME_R */ ++ +/* Define to 1 if you have the `asprintf' function. */ +#define HAVE_ASPRINTF 1 + ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_CONFIG_HAIKUCONFIG_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_DAGAPI_H */ ++ ++/* define if you have the DAG API */ ++/* #undef HAVE_DAG_API */ ++ ++/* define if you have dag_get_erf_types() */ ++/* #undef HAVE_DAG_GET_ERF_TYPES */ ++ ++/* define if you have dag_get_stream_erf_types() */ ++/* #undef HAVE_DAG_GET_STREAM_ERF_TYPES */ ++ ++/* define if you have large streams capable DAG API */ ++/* #undef HAVE_DAG_LARGE_STREAMS_API */ ++ ++/* define if you have vdag_set_device_info() */ ++/* #undef HAVE_DAG_VDAG */ ++ ++/* Define to 1 if you have the declaration of `ether_hostton' */ ++#define HAVE_DECL_ETHER_HOSTTON 1 ++ ++/* Define to 1 if `dl_module_id_1' is a member of `dl_hp_ppa_info_t'. */ ++/* #undef HAVE_DL_HP_PPA_INFO_T_DL_MODULE_ID_1 */ ++ ++/* Define to 1 if the system has the type `dl_passive_req_t'. */ ++/* #undef HAVE_DL_PASSIVE_REQ_T */ ++ +/* Define to 1 if you have the `ether_hostton' function. */ +#define HAVE_ETHER_HOSTTON 1 + +/* Define to 1 if you have the `ffs' function. */ +#define HAVE_FFS 1 + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + ++/* Define to 1 if you have the `getspnam' function. */ ++/* #undef HAVE_GETSPNAM */ ++ ++/* Define to 1 if you have a GNU-style `strerror_r' function. */ ++/* #undef HAVE_GNU_STRERROR_R */ ++ +/* on HP-UX 10.20 or later */ +/* #undef HAVE_HPUX10_20_OR_LATER */ + +/* on HP-UX 9.x */ +/* #undef HAVE_HPUX9 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + ++/* Define to 1 if you have the `bsd' library (-lbsd). */ ++/* #undef HAVE_LIBBSD */ ++ +/* if libdlpi exists */ +/* #undef HAVE_LIBDLPI */ + +/* if libnl exists */ +/* #undef HAVE_LIBNL */ + - /* if libnl exists and is version 2.x */ - /* #undef HAVE_LIBNL_2_x */ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LINUX_COMPILER_H */ + - /* if libnl exists and is version 3.x */ - /* #undef HAVE_LIBNL_3_x */ ++/* define if we have the Linux getnetbyname_r() */ ++/* #undef HAVE_LINUX_GETNETBYNAME_R */ + - /* libnl has NLE_FAILURE */ - /* #undef HAVE_LIBNL_NLE */ ++/* define if we have the Linux getprotobyname_r() */ ++/* #undef HAVE_LINUX_GETPROTOBYNAME_R */ + - /* libnl has new-style socket api */ - /* #undef HAVE_LIBNL_SOCKETS */ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LINUX_NET_TSTAMP_H */ + - /* Define to 1 if you have the header file. */ - #define HAVE_LIMITS_H 1 ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LINUX_SOCKET_H */ + - /* Define to 1 if you have the header file. */ - /* #undef HAVE_LINUX_COMPILER_H */ - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_LINUX_ETHTOOL_H */ - - /* Define to 1 if you have the header file. */ - #define HAVE_MEMORY_H 1 ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LINUX_USBDEVICE_FS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETPACKET_PACKET_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NET_BPF_H 1 + ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_NET_ENET_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_NET_IF_DL_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_NET_IF_H */ ++ +/* Define to 1 if you have the header file. */ +#define HAVE_NET_IF_MEDIA_H 1 + ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_NET_IF_TYPES_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_NET_NIT_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_NET_PFILT_H */ ++ +/* Define to 1 if you have the header file. */ +/* See Makefile */ +/* #undef HAVE_NET_PFVAR_H */ + - /* if there's an os_proto.h for this platform, to use additional prototypes */ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_NET_RAW_H */ ++ ++/* Use OpenSSL */ ++/* #undef HAVE_OPENSSL */ ++ ++/* if there's an os-proto.h for this platform, to use additional prototypes */ +/* #undef HAVE_OS_PROTO_H */ + - /* define if net/pfvar.h defines PF_NAT through PF_NORDR */ - #define HAVE_PF_NAT_THROUGH_PF_NORDR 1 ++/* Define to 1 if you have a POSIX-style `strerror_r' function. */ ++#define HAVE_POSIX_STRERROR_R /**/ + +/* define if you have the Septel API */ +/* #undef HAVE_SEPTEL_API */ + +/* define if you have the Myricom SNF API */ +/* #undef HAVE_SNF_API */ + - /* Define to 1 if you have the `snprintf' function. */ - #define HAVE_SNPRINTF 1 - +/* Define to 1 if the system has the type `socklen_t'. */ +#define HAVE_SOCKLEN_T 1 + ++/* On solaris */ ++/* #undef HAVE_SOLARIS */ ++ ++/* target host supports Solaris "any" device */ ++/* #undef HAVE_SOLARIS_ANY_DEVICE */ ++ ++/* define if we have the Solaris/IRIX getnetbyname_r() */ ++/* #undef HAVE_SOLARIS_IRIX_GETNETBYNAME_R */ ++ ++/* define if we have the Solaris/IRIX getprotobyname_r() */ ++/* #undef HAVE_SOLARIS_IRIX_GETPROTOBYNAME_R */ ++ +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDIO_H 1 ++ +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + - /* Define to 1 if you have the `strerror' function. */ - #define HAVE_STRERROR 1 - - /* Define to 1 if you have the `strerror_r' function. */ - #define HAVE_STRERROR_R 1 - - /* Define to 1 if you have the `strerror_s' function. */ - /* #undef HAVE_STRERROR_S */ - +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strtok_r' function. */ +#define HAVE_STRTOK_R 1 + +/* Define to 1 if the system has the type `struct BPF_TIMEVAL'. */ +/* #undef HAVE_STRUCT_BPF_TIMEVAL */ + +/* Define to 1 if the system has the type `struct ether_addr'. */ +/* #undef HAVE_STRUCT_ETHER_ADDR */ + ++/* Define to 1 if `msg_control' is a member of `struct msghdr'. */ ++/* #undef HAVE_STRUCT_MSGHDR_MSG_CONTROL */ ++ ++/* Define to 1 if `msg_flags' is a member of `struct msghdr'. */ ++/* #undef HAVE_STRUCT_MSGHDR_MSG_FLAGS */ ++ ++/* Define to 1 if the system has the type `struct rte_ether_addr'. */ ++/* #undef HAVE_STRUCT_RTE_ETHER_ADDR */ ++ ++/* Define to 1 if `hci_channel' is a member of `struct sockaddr_hci'. */ ++/* #undef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL */ ++ +/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */ +#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 + +/* Define to 1 if the system has the type `struct sockaddr_storage'. */ +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 + ++/* Define to 1 if `tp_vlan_tci' is a member of `struct tpacket_auxdata'. */ ++/* #undef HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI */ ++ ++/* Define to 1 if `bRequestType' is a member of `struct ++ usbdevfs_ctrltransfer'. */ ++/* #undef HAVE_STRUCT_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE */ ++ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BUFMOD_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_DLPI_EXT_H */ + ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_DLPI_H */ ++ +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCCOM_H 1 + - /* Define to 1 if you have the header file. */ - #define HAVE_SYS_SELECT_H 1 ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_NET_NIT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* define if you have the TurboCap API */ +/* #undef HAVE_TC_API */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + - /* Define to 1 if you have the `vsnprintf' function. */ - #define HAVE_VSNPRINTF 1 ++/* Define to 1 if you have the `vasprintf' function. */ ++#define HAVE_VASPRINTF 1 ++ ++/* Define to 1 if you have the `vsyslog' function. */ ++#define HAVE_VSYSLOG 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_ZONE_H */ ++ ++/* Define to 1 if you have the `_wcserror_s' function. */ ++/* #undef HAVE__WCSERROR_S */ ++ ++/* define if __atomic_load_n is supported by the compiler */ ++#define HAVE___ATOMIC_LOAD_N 1 ++ ++/* define if __atomic_store_n is supported by the compiler */ ++#define HAVE___ATOMIC_STORE_N 1 + +/* IPv6 */ +/* See Makefile */ +/* #undef INET6 */ + - /* if unaligned access fails */ - /* #undef LBL_ALIGN */ - - /* path for device for USB sniffing */ - /* #undef LINUX_USB_MON_DEV */ - +/* Define to 1 if netinet/ether.h declares `ether_hostton' */ +/* #undef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON */ + +/* Define to 1 if netinet/if_ether.h declares `ether_hostton' */ - #define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON /**/ ++/* #undef NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON */ ++ ++/* Define to 1 if net/ethernet.h declares `ether_hostton' */ ++#define NET_ETHERNET_H_DECLARES_ETHER_HOSTTON /**/ + +/* do not use protochain */ +/* #undef NO_PROTOCHAIN */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "pcap" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "pcap 1.10.5" ++#define PACKAGE_STRING "pcap 1.10.6" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "pcap" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "1.10.5" ++#define PACKAGE_VERSION "1.10.6" ++ ++/* target host supports Bluetooth sniffing */ ++/* #undef PCAP_SUPPORT_BT */ ++ ++/* target host supports Bluetooth Monitor */ ++/* #undef PCAP_SUPPORT_BT_MONITOR */ ++ ++/* support D-Bus sniffing */ ++/* #undef PCAP_SUPPORT_DBUS */ ++ ++/* target host supports DPDK */ ++/* #undef PCAP_SUPPORT_DPDK */ ++ ++/* target host supports Linux usbmon for USB sniffing */ ++/* #undef PCAP_SUPPORT_LINUX_USBMON */ ++ ++/* target host supports netfilter sniffing */ ++/* #undef PCAP_SUPPORT_NETFILTER */ + +/* target host supports netmap */ +#define PCAP_SUPPORT_NETMAP 1 + - /* use packet ring capture support on Linux if available */ - #define PCAP_SUPPORT_PACKET_RING 1 ++/* The size of 'time_t', as computed by sizeof. */ ++#ifdef __i386__ ++#define SIZEOF_TIME_T 4 ++#else ++#define SIZEOF_TIME_T 8 ++#endif ++ ++/* The size of `void *', as computed by sizeof. */ ++/* #undef SIZEOF_VOID_P */ + - /* Define to 1 if you have the ANSI C header files. */ ++/* Define to 1 if all of the C90 standard headers exist (not just the ones ++ required in a freestanding environment). This macro is provided for ++ backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Define to 1 if strings.h declares `ffs' */ +#define STRINGS_H_DECLARES_FFS /**/ + ++/* Define to 1 if sys/ethernet.h declares `ether_hostton' */ ++/* #undef SYS_ETHERNET_H_DECLARES_ETHER_HOSTTON */ ++ +/* Enable parser debugging */ +/* #undef YYDEBUG */ + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 + - /* Enable large inode numbers on Mac OS X 10.5. */ - #ifndef _DARWIN_USE_64_BIT_INODE - # define _DARWIN_USE_64_BIT_INODE 1 - #endif ++/* Number of bits in a file offset, on hosts where this is settable. */ ++/* #undef _FILE_OFFSET_BITS */ ++ ++/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ ++/* #undef _LARGEFILE_SOURCE */ ++ ++/* Define for large files, on AIX-style hosts. */ ++/* #undef _LARGE_FILES */ ++ ++/* define on AIX to get certain functions */ ++/* #undef _SUN */ ++ ++/* to handle Ultrix compilers that don't support const in prototypes */ ++/* #undef const */ + +/* Define as token for inline if inlining supported */ +#define inline inline ++ ++/* on sinix */ ++/* #undef sinix */ diff --cc sys/net/dlt.h index 769bf5fecacb,000000000000..4227ce79d3b7 mode 100644,000000..100644 --- a/sys/net/dlt.h +++ b/sys/net/dlt.h @@@ -1,1586 -1,0 +1,1691 @@@ +/*- + * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from the Stanford/CMU enet packet filter, + * (net/enet.c) distributed as part of 4.3BSD, and code contributed + * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence + * Berkeley Laboratory. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. ++ * ++ * @(#)bpf.h 7.1 (Berkeley) 5/7/91 + */ + +#ifndef _NET_DLT_H_ +#define _NET_DLT_H_ + +/* + * Link-layer header type codes. + * + * Do *NOT* add new values to this list without asking + * "tcpdump-workers@lists.tcpdump.org" for a value. Otherwise, you run + * the risk of using a value that's already being used for some other + * purpose, and of having tools that read libpcap-format captures not + * being able to handle captures with your new DLT_ value, with no hope + * that they will ever be changed to do so (as that would destroy their + * ability to read captures using that value for that other purpose). + * + * See + * + * https://www.tcpdump.org/linktypes.html + * + * for detailed descriptions of some of these link-layer header types. + */ + +/* + * These are the types that are the same on all platforms, and that + * have been defined by for ages. ++ * ++ * DLT_LOW_MATCHING_MIN is the lowest such value; DLT_LOW_MATCHING_MAX ++ * is the highest such value. + */ ++#define DLT_LOW_MATCHING_MIN 0 ++ +#define DLT_NULL 0 /* BSD loopback encapsulation */ +#define DLT_EN10MB 1 /* Ethernet (10Mb) */ +#define DLT_EN3MB 2 /* Experimental Ethernet (3Mb) */ +#define DLT_AX25 3 /* Amateur Radio AX.25 */ +#define DLT_PRONET 4 /* Proteon ProNET Token Ring */ +#define DLT_CHAOS 5 /* Chaos */ +#define DLT_IEEE802 6 /* 802.5 Token Ring */ +#define DLT_ARCNET 7 /* ARCNET, with BSD-style header */ +#define DLT_SLIP 8 /* Serial Line IP */ +#define DLT_PPP 9 /* Point-to-point Protocol */ +#define DLT_FDDI 10 /* FDDI */ + ++/* ++ * In case the code that includes this file (directly or indirectly) ++ * has also included OS files that happen to define DLT_LOW_MATCHING_MAX, ++ * with a different value (perhaps because that OS hasn't picked up ++ * the latest version of our DLT definitions), we undefine the ++ * previous value of DLT_LOW_MATCHING_MAX. ++ * ++ * (They shouldn't, because only those 10 values were assigned in ++ * the Good Old Days, before DLT_ code assignment became a bit of ++ * a free-for-all. Perhaps 11 is DLT_ATM_RFC1483 everywhere 11 ++ * is used at all, but 12 is DLT_RAW on some platforms but not ++ * OpenBSD, and the fun continues for several other values.) ++ */ ++#ifdef DLT_LOW_MATCHING_MAX ++#undef DLT_LOW_MATCHING_MAX ++#endif ++ ++#define DLT_LOW_MATCHING_MAX DLT_FDDI /* highest value in this "matching" range */ ++ +/* + * These are types that are different on some platforms, and that + * have been defined by for ages. We use #ifdefs to + * detect the BSDs that define them differently from the traditional + * libpcap + * + * XXX - DLT_ATM_RFC1483 is 13 in BSD/OS, and DLT_RAW is 14 in BSD/OS, - * but I don't know what the right #define is for BSD/OS. ++ * but I don't know what the right #define is for BSD/OS. The last ++ * release was in October 2003; if anybody cares about making this ++ * work on BSD/OS, give us a pull request for a change to make it work. + */ +#define DLT_ATM_RFC1483 11 /* LLC-encapsulated ATM */ + +#ifdef __OpenBSD__ +#define DLT_RAW 14 /* raw IP */ +#else +#define DLT_RAW 12 /* raw IP */ +#endif + +/* + * Given that the only OS that currently generates BSD/OS SLIP or PPP + * is, well, BSD/OS, arguably everybody should have chosen its values + * for DLT_SLIP_BSDOS and DLT_PPP_BSDOS, which are 15 and 16, but they + * didn't. So it goes. + */ +#if defined(__NetBSD__) || defined(__FreeBSD__) +#ifndef DLT_SLIP_BSDOS +#define DLT_SLIP_BSDOS 13 /* BSD/OS Serial Line IP */ +#define DLT_PPP_BSDOS 14 /* BSD/OS Point-to-point Protocol */ +#endif +#else +#define DLT_SLIP_BSDOS 15 /* BSD/OS Serial Line IP */ +#define DLT_PPP_BSDOS 16 /* BSD/OS Point-to-point Protocol */ +#endif + +/* + * NetBSD uses 15 for HIPPI. + * + * From a quick look at sys/net/if_hippi.h and sys/net/if_hippisubr.c + * in an older version of NetBSD , the header appears to be: + * - * a 1-byte ULP field (ULP-id)? ++ * a 1-byte ULP field (ULP-id)? + * + * a 1-byte flags field; + * + * a 2-byte "offsets" field; + * + * a 4-byte "D2 length" field (D2_Size?); + * + * a 4-byte "destination switch" field (or a 1-byte field + * containing the Forwarding Class, Double_Wide, and Message_Type + * sub fields, followed by a 3-byte Destination_Switch_Address + * field?, HIPPI-LE 3.4-style?); + * + * a 4-byte "source switch" field (or a 1-byte field containing the + * Destination_Address_type and Source_Address_Type fields, followed + * by a 3-byte Source_Switch_Address field, HIPPI-LE 3.4-style?); + * + * a 2-byte reserved field; + * + * a 6-byte destination address field; + * + * a 2-byte "local admin" field; + * + * a 6-byte source address field; + * + * followed by an 802.2 LLC header. + * + * This looks somewhat like something derived from the HIPPI-FP 4.4 + * Header_Area, followed an HIPPI-FP 4.4 D1_Area containing a D1 data set + * with the header in HIPPI-LE 3.4 (ANSI X3.218-1993), followed by an + * HIPPI-FP 4.4 D2_Area (with no Offset) containing the 802.2 LLC header + * and payload? Or does the "offsets" field contain the D2_Offset, + * with that many bytes of offset before the payload? + * + * See http://wotug.org/parallel/standards/hippi/ for an archive of + * HIPPI specifications. + * + * RFC 2067 imposes some additional restrictions. It says that the + * Offset is always zero + * + * HIPPI is long-gone, and the source files found in an older version + * of NetBSD don't appear to be in the main CVS branch, so we may never + * see a capture with this link-layer type. + */ +#if defined(__NetBSD__) +#define DLT_HIPPI 15 /* HIPPI */ +#endif + +/* + * NetBSD uses 16 for DLT_HDLC; see below. + * BSD/OS uses it for PPP; see above. + * As far as I know, no other OS uses it for anything; don't use it + * for anything else. + */ + +/* + * 17 was used for DLT_PFLOG in OpenBSD; it no longer is. + * + * It was DLT_LANE8023 in SuSE 6.3, so we defined LINKTYPE_PFLOG + * as 117 so that pflog captures would use a link-layer header type + * value that didn't collide with any other values. On all + * platforms other than OpenBSD, we defined DLT_PFLOG as 117, + * and we mapped between LINKTYPE_PFLOG and DLT_PFLOG. + * + * OpenBSD eventually switched to using 117 for DLT_PFLOG as well. + * + * Don't use 17 for anything else. + */ + +/* + * 18 is used for DLT_PFSYNC in OpenBSD, NetBSD, DragonFly BSD and + * macOS; don't use it for anything else. (FreeBSD uses 121, which + * collides with DLT_HHDLC, even though it doesn't use 18 for + * anything and doesn't appear to have ever used it for anything.) + * + * We define it as 18 on those platforms; it is, unfortunately, used - * for DLT_CIP in Suse 6.3, so we don't define it as DLT_PFSYNC - * in general. As the packet format for it, like that for - * DLT_PFLOG, is not only OS-dependent but OS-version-dependent, - * we don't support printing it in tcpdump except on OSes that - * have the relevant header files, so it's not that useful on - * other platforms. ++ * for DLT_CIP in SUSE 6.3, so we don't define it as 18 on all ++ * platforms. We define it as 121 on FreeBSD and as the same ++ * value that we assigned to LINKTYPE_PFSYNC on all remaining ++ * platforms. + */ +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__) +#define DLT_PFSYNC 18 +#endif + +#define DLT_ATM_CLIP 19 /* Linux Classical IP over ATM */ + *** 1494 LINES SKIPPED *** From nobody Sun Mar 15 05:37:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYRnw0BDSz6V7kB for ; Sun, 15 Mar 2026 05:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYRnv5Czbz4J7j for ; Sun, 15 Mar 2026 05:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773553075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cb687AUz0riuoh/5y3GdP1wD1tQpfy8g3IXEDHxRsSw=; b=XQj32SdjuTEsZJ9NqUDSY1H53iudexV7RYTCKUxxzjX4F37SorVZ21wHQ6eMjxyJPOKOQJ +iE8wDiAZT74lMME6j80p+GwmB7NEbhlHe51bOenvGVhn1m0mIndSQO34/zLDd0CrHwK0u Q1k70Twdr0adziP5F02Ft4JWVj3nkzZDyKrvas7EJFdutOT4O/Ha7RbduqSX3/mjY6EYDE QUJnzveSAMzhpTc/mGQ0Je6cp0oVJypeu2+3/+LaOCRnXbl9EdRwEObij2oIkHC1s5B9uy fwBRPGWb1kVbLnKsExERlgbFOgbTEFm/Jn+YNQTETHdoi/t/+AcxvYJ+20Wnkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773553075; a=rsa-sha256; cv=none; b=R1NEdDZ9kbeWWncytLgHYsb6BJN4OrHsZ8fZoqYJJ6t0MjxyI68NBA5j4qTRheH9Kfnr9N 5LjTI5rdQSF84ZenOZlG/vXf9Ya4QTr5uTq17a+LePFL5iINuxKVI2toYRgf3j+AXrE4ek foRTiE44qsJ9Qi9/NtHPjZt4PoL8J0RR0wTegA6kAy+XosoJaF9i4Ql2Gq2kzFMH55eDaO LfQA8dasK6YABT+ZEmI2aJBUzRo70QuaTEgWYYU/iIkVI/OPEOwNcVdENSyiejbvCtVVUb /Ln1fOK3yrjWwLwvKlHjHYjo+BdC3y4dvDfcAWUtiCXMrukRm8xRMCxmoDCcmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773553075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cb687AUz0riuoh/5y3GdP1wD1tQpfy8g3IXEDHxRsSw=; b=yXDD38/syiRU6SIDCJPMT1Ww3SJMXvPloc4YTVGcfwRQKtK/pFMJCgejXGe1qmUPfEJblm 9vImCk5Z6l1QuidO51hWi8KolhCHmCzyApgLmtio08qRh/yPkgjq8QTYfiSt4qCGxd747R mMrpRelS0L0kPJ4KwMP/10MWKVbz4njQO1Ehg6KLIvQ5CBecot41r7VikN9a6lKaD/Avys O6eVIuw84tLkIeJlwBVwfnnECHW0bqNRtQpMnnoQh7i9AfHeonJmUR8bpWVna699Q8guGG 5NvY/y1NGROtqa/lT53n3pzNQAgf4HSPr5Js3eaNJq3odNbczmbA3DC4HnSvow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYRnv3tHBzbxM for ; Sun, 15 Mar 2026 05:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e97a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 05:37:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: a0b3ef195260 - main - ipfwpcap: Fix build after libpcap 1.10.6 update List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0b3ef1952603ebf0307ca723b03e5a71598dd5a Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 05:37:50 +0000 Message-Id: <69b645ae.1e97a.46de4c5f@gitrepo.freebsd.org> The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=a0b3ef1952603ebf0307ca723b03e5a71598dd5a commit a0b3ef1952603ebf0307ca723b03e5a71598dd5a Author: Joseph Mingrone AuthorDate: 2026-03-15 05:32:01 +0000 Commit: Joseph Mingrone CommitDate: 2026-03-15 05:32:01 +0000 ipfwpcap: Fix build after libpcap 1.10.6 update pcap-int.h now references SIZEOF_TIME_T from libpcap's config.h, which is not available to consumers of the internal header outside of the libpcap build. Switch to the public header and replace the direct FILE* casts and ferror()/fflush() calls with pcap_dump_flush(3), which is the correct public API for flushing a pcap dump file. Sponsored by: The FreeBSD Foundation --- usr.sbin/ipfwpcap/ipfwpcap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ipfwpcap/ipfwpcap.c b/usr.sbin/ipfwpcap/ipfwpcap.c index a9cead99bd07..2032387aaa0b 100644 --- a/usr.sbin/ipfwpcap/ipfwpcap.c +++ b/usr.sbin/ipfwpcap/ipfwpcap.c @@ -41,11 +41,7 @@ #include -/* XXX normally defined in config.h */ -#define HAVE_STRLCPY 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 -#include /* see pcap(3) and /usr/src/contrib/libpcap/. */ +#include #ifdef IP_MAXPACKET #define BUFMAX IP_MAXPACKET @@ -295,8 +291,7 @@ if (debug) fprintf(stderr, " sendto(%d) = %d\n", sd, r); (void) gettimeofday(&(phd.ts), NULL); phd.caplen = phd.len = nr; pcap_dump((u_char *)dp, &phd, buf); - if (ferror((FILE *)dp)) { perror(dumpf); quit(14); } - (void) fflush((FILE *)dp); + if (pcap_dump_flush(dp) == -1) { pcap_perror(p, dumpf); quit(14); } } quit(0); From nobody Sun Mar 15 06:58:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYTZR1Hd3z6VFyQ for ; Sun, 15 Mar 2026 06:58: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYTZR0TPJz3DCs for ; Sun, 15 Mar 2026 06:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773557887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TyCpOZEe32vKJZT0uqI9xAVpiK4ZOGjiITJUC6VXRc=; b=uRKaLR8Ly1wVpqF6tedJ3BZvzeJlDuGsAf4kFw/8Owt6V/PHdQIks3PFW+pOEVrajP28K7 DJ25rwF6vmr5a2x171nOVrtuk4Fkpdw9kHZ5CnXgjAdDXzOvdUaDn42tJm9PCKBPbE0g7j c/6PNWXLw6e7oOuOZLJdLopMsoA9TgvpoSr1hF4QeDGZS80yW8HHVyIzMWvCwM09r3Vmit U9jG+/oMnvLVFzggQHMqlFED4jGrqNsF01MGWrzImh3U1CBKK1Ta5oKWt3Tu5EICe0EUS/ /Z+xywqDlm9oHbfWLKjAqD/1sSbWVjvsHe71eAS7FMYEVpqT3AntAOK3HvRzNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773557887; a=rsa-sha256; cv=none; b=dj5/zwVIiz/JbprocN6+L1NQ1pP85654LrrtJNwqgUSQypBA2/+CfYO7ZvtMk9YmDQ724A zQDSOogUQJDpirxhNG/wbT7OPY/+0CWUM4bBx6QHY5tKuoIANdAS+3nkdNGz9iD9WVT3Bh TufNT9ky81aFoMdtewHb92g272bC4ooSCRttetnlSgU1DtdkLoWVgVkYEMFKWgyyISZwU+ O4lGQPnM06caukw8R/mSttf9q5qpfVdZlPCov88Uu6GLUuv4RLRbj4CiDj1oBZBcUgq0VY uDQCElnK0Xf2oocmhw9oDrffkBfL0lYGy4D2w/jwoFM3uLHzAqwuwh1FTd9pJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773557887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TyCpOZEe32vKJZT0uqI9xAVpiK4ZOGjiITJUC6VXRc=; b=UZf9T0HR9OTwOLUhgfoE/Hil9ACebnbu2T8OTOPAPFwk4nGq6xe8DXWc2NCi2iub6CRgEH W10Ni88gw/Fd5BQ1Lhp4J6dhAjcRp5ZyX6B16G6xyk6kutUuVCZMy85IND//9+qZcrx+ty p1lPJiGJsvypS/vOsBKUmCYcfZSMTPDAJvQldfFqAgy2bgsxcOm3yFO04h5aOF8EMOwKrc 9Noti4OtoR5cLTGNSlntI1z7Au8h7I4v5wRcznHxc3hSqRBqMMEbgeQ7mYwu08aqddCR8l ic81CqdjbxyxGgxsTYk+4hiljaUCiSBY5THLvI5awRe0mXS/jFqaBA956WxXtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYTZQ6wNgzfWt for ; Sun, 15 Mar 2026 06:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27fa1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 06:58:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8365f877b1e4 - main - amd64: do reset %rip after page fault if pcb_onfault is set List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8365f877b1e4b6d4c30df72e0826ca60a412ce7d Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 06:58:01 +0000 Message-Id: <69b65879.27fa1.4fc60671@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8365f877b1e4b6d4c30df72e0826ca60a412ce7d commit 8365f877b1e4b6d4c30df72e0826ca60a412ce7d Author: Konstantin Belousov AuthorDate: 2026-03-14 11:40:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-15 06:57:08 +0000 amd64: do reset %rip after page fault if pcb_onfault is set for any kernel page fault, and not only for EFIRT case. Reported and tested by: pho Fixes: 914a53570750ce5a104a5870403d7669656fddc3 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/trap.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 4bf56226d076..3a9323936d2d 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -219,15 +219,19 @@ trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, } static bool -trap_check_efirt(struct thread *td, struct trapframe *frame) +trap_check_pcb_onfault(struct thread *td, struct trapframe *frame) { - /* - * Most likely, EFI RT faulted. This check prevents - * kdb from handling breakpoints set on the BIOS text, - * if such option is ever needed. - */ - if ((td->td_pflags & TDP_EFIRT) != 0 && - curpcb->pcb_onfault != NULL) { + bool res = false; + + if (curpcb->pcb_onfault == NULL) + return (res); + + if (__predict_false((td->td_pflags & TDP_EFIRT) != 0)) { + /* + * Most likely, EFI RT faulted. This check prevents + * kdb from handling breakpoints set on the BIOS text, + * if such option is ever needed. + */ u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); if ((print_efirt_faults == 1 && cnt == 0) || @@ -236,10 +240,13 @@ trap_check_efirt(struct thread *td, struct trapframe *frame) traptype_to_msg(frame->tf_trapno)); trap_diag(frame, 0); } - frame->tf_rip = (long)curpcb->pcb_onfault; - return (true); + res = true; + } else if (frame->tf_trapno == T_PAGEFLT) { + res = true; } - return (false); + if (res) + frame->tf_rip = (register_t)curpcb->pcb_onfault; + return (res); } static void @@ -494,7 +501,7 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); - if (type != T_PAGEFLT && trap_check_efirt(td, frame)) + if (type != T_PAGEFLT && trap_check_pcb_onfault(td, frame)) return; switch (type) { @@ -904,7 +911,7 @@ trap_pfault(struct trapframe *frame, bool usermode, int *signo, int *ucode) return (1); after_vmfault: if (td->td_intr_nesting_level == 0 && - trap_check_efirt(td, frame)) + trap_check_pcb_onfault(td, frame)) return (0); trap_fatal(frame, eva); return (-1); From nobody Sun Mar 15 07:07:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYTpw1xG4z6VGnq; Sun, 15 Mar 2026 07:08:56 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [85.220.129.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 4fYTpv5FTrz3Fvb; Sun, 15 Mar 2026 07:08:55 +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 smtp6.goneo.de (Postfix) with ESMTPS id DB2EE2405FA; Sun, 15 Mar 2026 08:08:52 +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 138852400D4; Sun, 15 Mar 2026 08:08:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1773558531; 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=pUZFHVjQRY/GGdvwq5c4LfDniAZN1XeIXqIS1DvjwJI=; b=VVbkRdhRAKCEJi/kSUGwBj+90FPR9qqdkUYIZZRbtRzJMTF89UsPDuI0HZ7f22zQRsEUL7 8Hs+US1YiI4MRgTBw72k8xFJRuFipKpezmCDGdAaHvMU6T1ybrWsYyWvxZEKQzxgi+mHLe sSOmGozaEw+R5y1Uq8duGzcD1pLhn8A3Hox8un/lChk00jCzXZbbLJ1/iJvNk9xCeMbt8R 2TmVJnxEMdlXy19fIG2QIGEWeQ0AauCPGBjzlDAojqqhF6/lqvLPTHQT5gouqFKnl6Ma8i gVAkVDyhHvWCUlVdR13VxVkNTpQXxgJDnaEDy1nInD17scCwg7D50eJ1SF8eJw== Received: from thor.sb211.local (dynamic-2a02-3100-2218-fc02-dded-68cf-e902-4bad.310.pool.telefonica.de [IPv6:2a02:3100:2218:fc02:dded:68cf:e902:4bad]) (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 ABB892400A4; Sun, 15 Mar 2026 08:08:50 +0100 (CET) Date: Sun, 15 Mar 2026 08:07:59 +0100 From: A FreeBSD User To: Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8a62a2a5659d - main - zfs: merge openzfs/zfs@f8e5af53e Message-ID: <20260315080826.6a07e638@thor.sb211.local> In-Reply-To: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> References: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd16.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/3BPityYhB1371w5jWWcZyuK"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: c74cb0 X-Rspamd-UID: fd31d4 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Queue-Id: 4fYTpv5FTrz3Fvb X-Spamd-Bar: ---- --Sig_/3BPityYhB1371w5jWWcZyuK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Tage des Herren Sat, 14 Mar 2026 13:26:23 +0000 Martin Matuska schrieb: > The branch main has been updated by mm: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D8a62a2a5659d1839d8799b4274= c04469d7f17c78 >=20 > commit 8a62a2a5659d1839d8799b4274c04469d7f17c78 > Merge: f91464171d61 f8e5af53e92f > Author: Martin Matuska > AuthorDate: 2026-03-14 12:14:56 +0000 > Commit: Martin Matuska > CommitDate: 2026-03-14 12:14:56 +0000 >=20 > zfs: merge openzfs/zfs@f8e5af53e > =20 > Notable upstream pull request merges: > #17358 4975430cf Add vdev property to disable vdev scheduler > #18031 c77f17b75 Add snapshots_changed_nsecs dataset property > #18080 dbb3f247e cmd/zfs: clone: accept `-u` to not mount newly crea= ted > datasets > #18089 -multiple Zstd: Update bundled library to version 1.5.7 > #18091 2301755df Fix zfs_open() to skip zil_async_to_sync() for the > snapshot > #18093 -multiple L2ARC: Rework write throttling with DWPD rate limit= ing > and parallel writes > #18095 2dbd6af5e Rename several printf attributes declarations to > __printf__ > #18096 8605bdfdd FreeBSD: unbreak compilation on i386 > #18105 794f1587d When receiving a stream with the large block flag, > activate feature > #18115 765929cb4 DDT: Add locking for table ZAP destruction > #18118 09e4e01e9 Fix history logging for `zpool create -t` > #18119 2f1f25217 icp: emit .note.GNU-stack section for all ELF targe= ts > #18131 3fffe4e70 Fix --enable-invariants on FreeBSD > #18133 d2f5cb3a5 Move range_tree, btree, highbit64 to common code > #18136 54b141fab FreeBSD: Remove references to DEBUG_VFS_LOCKS > #18138 cdf89f413 Flush RRD only when TXGs contain data > #18139 a157ef62a Make sure we can still write data to txg > #18140 cd895f0e5 remove thread unsafe debug code causing FreeBSD dou= ble > free panic > #18144 4f180e095 Fix activating large_microzap on receive > #18146 35b2d3970 Lock db_mtx around arc_release() in couple places > #18154 b36472052 nvpair: chase FreeBSD xdrproc_t definition > #18160 21bbe7cb6 Improve caching for dbuf prefetches > #18177 -multiple Multihost Improvements > #18179 2646bd558 Allow rewrite skip cloned and snapshotted blocks > #18180 aa29455dd Restrict cloning with different properties > #18184 040ba7a7c libzfs: improve error message for zpool create with > ENXIO > #18188 1412bdc6c zfs_vnops_os.c: Move a vput() to after > zfs_setattr_dir() > #18198 cc184fe98 Fix `send:raw` permission for send `-w -I` > #18208 ba970eb20 Cleanup allocation class selection > #18212 0f9564e85 Simplify dnode_level_is_l2cacheable() > #18214 370570890 Remove parent ZIO from dbuf_prefetch() > #18218 bfb276e55 freebsd: Fix TIMESPEC_OVERFLOW for PowerPC > #18222 d06a1d9ac Fix available space accounting for special/dedup > #18225 d48967728 ICP: AES-GCM VAES-AVX2: fix typos and document > source files > #18226 c8a72a27e ICP: AES-GCM assembly: remove unused Gmul functions > #18230 -multiple Fix zdb --key crash for unencrypted datasets, and > teach tests to understand this better > #18233 -multiple icp: add SHA-512 implementation using Intel SHA512 > extension > #18245 991fc56fa Introduce dedupused/dedupsaved pool properties > #18251 6a717f31e Improve misleading error messages for > ZPOOL_STATUS_CORRUPT_POOL > #18254 7744f0496 SIMD: libspl: test the correct CPUID bit for AVX512= VL > #18255 6495dafd5 range_tree: use zfs_panic_recover() for > partial-overlap remov > #18256 3408332d7 zhack: Fix importing large allocation profiles on > small pools > #18258 f8457fbdc Fix deadlock on dmu_tx_assign() from vdev_rebuild() > #18263 f8e5af53e Fix redundant declaration of dsl_pool_t > =20 > Obtained from: OpenZFS > OpenZFS commit: f8e5af53e92fa7c03393fbd4922cb9c1d0c15920 >=20 > cddl/lib/libzfs/Makefile | 36 +- > cddl/lib/libzpool/Makefile | 7 +- > stand/libsa/zfs/Makefile.inc | 6 +- > stand/libsa/zfs/xxhash.c | 24 + > sys/conf/files | 7 +- > .../.github/workflows/scripts/qemu-1-setup.sh | 110 +- > .../.github/workflows/scripts/qemu-2-start.sh | 53 +- > .../.github/workflows/scripts/qemu-3-deps-vm.sh | 50 +- > .../.github/workflows/scripts/qemu-5-setup.sh | 22 +- > .../workflows/scripts/qemu-6-lustre-tests-vm.sh | 51 + > .../.github/workflows/scripts/qemu-6-tests.sh | 132 +- > .../.github/workflows/scripts/qemu-8-summary.sh | 32 + > .../.github/workflows/scripts/qemu-test-repo-vm.sh | 27 +- > .../.github/workflows/zfs-qemu-packages.yml | 15 +- > sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 16 +- > sys/contrib/openzfs/.mailmap | 10 + > sys/contrib/openzfs/AUTHORS | 14 + > sys/contrib/openzfs/META | 2 +- > sys/contrib/openzfs/Makefile.am | 2 + > sys/contrib/openzfs/autogen.sh | 1 + > sys/contrib/openzfs/cmd/Makefile.am | 5 +- > sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zdb/Makefile.am | 5 +- > sys/contrib/openzfs/cmd/zdb/zdb.c | 53 +- > sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + > .../zed/zed.d/history_event-zfs-list-cacher.sh.in | 1 + > sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zfs/zfs_main.c | 89 +- > sys/contrib/openzfs/cmd/zhack.c | 166 +- > sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 16 +- > sys/contrib/openzfs/cmd/zpool/zpool_util.c | 26 - > sys/contrib/openzfs/cmd/zpool/zpool_util.h | 2 - > sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + > sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + > sys/contrib/openzfs/cmd/ztest.c | 7 +- > sys/contrib/openzfs/config/CppCheck.am | 1 + > sys/contrib/openzfs/config/Rules.am | 1 + > sys/contrib/openzfs/config/Shellcheck.am | 1 + > sys/contrib/openzfs/config/Substfiles.am | 1 + > sys/contrib/openzfs/config/always-arch.m4 | 1 + > .../openzfs/config/always-compiler-options.m4 | 1 + > sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + > sys/contrib/openzfs/config/always-parallel.m4 | 1 + > sys/contrib/openzfs/config/always-python.m4 | 1 + > sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + > sys/contrib/openzfs/config/always-sed.m4 | 1 + > sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + > sys/contrib/openzfs/config/always-system.m4 | 1 + > sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + > sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + > sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + > sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + > sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + > sys/contrib/openzfs/config/deb.am | 1 + > sys/contrib/openzfs/config/find_system_library.m4 | 1 + > sys/contrib/openzfs/config/gettext.m4 | 1 + > sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + > sys/contrib/openzfs/config/iconv.m4 | 1 + > .../openzfs/config/kernel-access-ok-type.m4 | 1 + > sys/contrib/openzfs/config/kernel-acl.m4 | 32 + > sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + > sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + > sys/contrib/openzfs/config/kernel-automount.m4 | 1 + > sys/contrib/openzfs/config/kernel-bio.m4 | 1 + > sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + > sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + > sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + > .../config/kernel-block-device-operations.m4 | 1 + > .../openzfs/config/kernel-commit-metadata.m4 | 1 + > .../openzfs/config/kernel-config-defined.m4 | 1 + > .../config/kernel-copy-from-user-inatomic.m4 | 1 + > .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + > .../openzfs/config/kernel-declare-event-class.m4 | 1 + > .../openzfs/config/kernel-dentry-operations.m4 | 1 + > .../openzfs/config/kernel-discard-granularity.m4 | 1 + > sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + > sys/contrib/openzfs/config/kernel-file.m4 | 1 + > sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + > .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + > .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + > sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + > .../openzfs/config/kernel-follow-down-one.m4 | 1 + > sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + > sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + > sys/contrib/openzfs/config/kernel-fs-context.m4 | 33 + > sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - > sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + > .../openzfs/config/kernel-generic_fadvise.m4 | 1 + > .../openzfs/config/kernel-generic_fillattr.m4 | 1 + > .../openzfs/config/kernel-generic_io_acct.m4 | 1 + > sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + > sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + > sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + > sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + > .../openzfs/config/kernel-inode-permission.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + > sys/contrib/openzfs/config/kernel-inode-state.m4 | 24 + > sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + > .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + > .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + > sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + > .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + > .../openzfs/config/kernel-kmap-local-page.m4 | 1 + > sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + > sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + > sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + > sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + > .../openzfs/config/kernel-make-request-fn.m4 | 1 + > sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + > sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + > sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + > sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 28 + > sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + > sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + > sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + > .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + > .../config/kernel-pagemap-readahead-page.m4 | 1 + > sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + > sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + > .../openzfs/config/kernel-pin-user-pages.m4 | 1 + > .../openzfs/config/kernel-proc-operations.m4 | 1 + > sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + > .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + > sys/contrib/openzfs/config/kernel-rename.m4 | 1 + > .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + > sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + > sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + > sys/contrib/openzfs/config/kernel-sched.m4 | 1 + > .../openzfs/config/kernel-security-inode-init.m4 | 1 + > sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + > .../openzfs/config/kernel-setattr-prepare.m4 | 1 + > sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + > sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + > sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + > sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + > sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + > sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + > sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + > sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + > sys/contrib/openzfs/config/kernel-timer.m4 | 1 + > sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + > .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + > .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + > .../openzfs/config/kernel-truncate-setsize.m4 | 1 + > sys/contrib/openzfs/config/kernel-types.m4 | 1 + > sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + > .../openzfs/config/kernel-vfs-file_range.m4 | 1 + > .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + > sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + > sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + > .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + > .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + > .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + > sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + > .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + > sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + > sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + > sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + > sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + > sys/contrib/openzfs/config/kernel.m4 | 9 +- > sys/contrib/openzfs/config/lib-ld.m4 | 1 + > sys/contrib/openzfs/config/lib-link.m4 | 1 + > sys/contrib/openzfs/config/lib-prefix.m4 | 1 + > sys/contrib/openzfs/config/mount-helper.m4 | 1 + > sys/contrib/openzfs/config/nls.m4 | 1 + > sys/contrib/openzfs/config/pkg.m4 | 1 + > sys/contrib/openzfs/config/po.m4 | 1 + > sys/contrib/openzfs/config/progtest.m4 | 1 + > sys/contrib/openzfs/config/rpm.am | 1 + > sys/contrib/openzfs/config/tgz.am | 1 + > sys/contrib/openzfs/config/toolchain-simd.m4 | 23 + > sys/contrib/openzfs/config/user-aio.h.m4 | 1 + > sys/contrib/openzfs/config/user-backtrace.m4 | 1 + > sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + > sys/contrib/openzfs/config/user-dracut.m4 | 1 + > sys/contrib/openzfs/config/user-gettext.m4 | 1 + > sys/contrib/openzfs/config/user-largefile.m4 | 1 + > sys/contrib/openzfs/config/user-libaio.m4 | 1 + > sys/contrib/openzfs/config/user-libatomic.m4 | 1 + > sys/contrib/openzfs/config/user-libblkid.m4 | 1 + > sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + > sys/contrib/openzfs/config/user-libexec.m4 | 1 + > sys/contrib/openzfs/config/user-libfetch.m4 | 1 + > sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + > sys/contrib/openzfs/config/user-libudev.m4 | 1 + > sys/contrib/openzfs/config/user-libunwind.m4 | 1 + > sys/contrib/openzfs/config/user-libuuid.m4 | 1 + > sys/contrib/openzfs/config/user-makedev.m4 | 1 + > sys/contrib/openzfs/config/user-pam.m4 | 1 + > sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + > sys/contrib/openzfs/config/user-statx.m4 | 1 + > sys/contrib/openzfs/config/user-systemd.m4 | 1 + > sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + > sys/contrib/openzfs/config/user-udev.m4 | 1 + > sys/contrib/openzfs/config/user-zlib.m4 | 1 + > sys/contrib/openzfs/config/user.m4 | 1 + > sys/contrib/openzfs/config/zfs-build.m4 | 3 +- > sys/contrib/openzfs/config/zfs-meta.m4 | 1 + > sys/contrib/openzfs/contrib/Makefile.am | 1 + > .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + > sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + > sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + > .../contrib/debian/openzfs-libpam-zfs.install | 1 + > .../openzfs/contrib/dracut/90zfs/mount-zfs.sh.in | 2 +- > sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + > sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + > .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + > .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c | 278 +- > sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + > .../openzfs/contrib/pyzfs/docs/source/index.rst | 3 +- > .../openzfs/contrib/pyzfs/libzfs_core/__init__.py | 10 - > .../pyzfs/libzfs_core/_error_translation.py | 58 - > .../contrib/pyzfs/libzfs_core/_libzfs_core.py | 350 +- > .../pyzfs/libzfs_core/bindings/libzfs_core.py | 4 - > .../pyzfs/libzfs_core/test/test_libzfs_core.py | 337 - > sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + > sys/contrib/openzfs/copy-builtin | 5 +- > sys/contrib/openzfs/etc/Makefile.am | 1 + > sys/contrib/openzfs/include/Makefile.am | 1 + > sys/contrib/openzfs/include/libzfs.h | 10 +- > sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + > .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + > sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + > .../include/os/linux/kernel/linux/dcache_compat.h | 19 +- > .../include/os/linux/kernel/linux/simd_x86.h | 14 + > .../include/os/linux/kernel/linux/vfs_compat.h | 8 + > .../include/os/linux/kernel/linux/xattr_compat.h | 17 + > .../openzfs/include/os/linux/spl/sys/kmem.h | 5 +- > sys/contrib/openzfs/include/sys/arc.h | 2 - > sys/contrib/openzfs/include/sys/arc_impl.h | 38 + > sys/contrib/openzfs/include/sys/btree.h | 9 +- > sys/contrib/openzfs/include/sys/ddt.h | 5 + > sys/contrib/openzfs/include/sys/dmu.h | 1 + > sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + > sys/contrib/openzfs/include/sys/fs/zfs.h | 24 +- > sys/contrib/openzfs/include/sys/metaslab.h | 4 +- > sys/contrib/openzfs/include/sys/metaslab_impl.h | 8 +- > sys/contrib/openzfs/include/sys/mmp.h | 5 + > sys/contrib/openzfs/include/sys/spa.h | 1 + > sys/contrib/openzfs/include/sys/spa_impl.h | 4 + > sys/contrib/openzfs/include/sys/uberblock_impl.h | 22 +- > sys/contrib/openzfs/include/sys/vdev.h | 2 + > sys/contrib/openzfs/include/sys/vdev_impl.h | 2 + > sys/contrib/openzfs/include/sys/vdev_rebuild.h | 2 +- > sys/contrib/openzfs/lib/Makefile.am | 31 +- > sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + > sys/contrib/openzfs/lib/libbtree/Makefile.am | 6 + > sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + > sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + > sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + > sys/contrib/openzfs/lib/librange_tree/Makefile.am | 9 + > sys/contrib/openzfs/lib/libshare/Makefile.am | 27 - > sys/contrib/openzfs/lib/libshare/libshare_impl.h | 48 - > sys/contrib/openzfs/lib/libshare/nfs.h | 38 - > sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + > sys/contrib/openzfs/lib/libspl/include/Makefile.am | 2 +- > sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 18 +- > .../openzfs/lib/libspl/include/sys/sysmacros.h | 29 +- > sys/contrib/openzfs/lib/libunicode/Makefile.am | 6 - > sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + > sys/contrib/openzfs/lib/libzfs/Makefile.am | 18 +- > sys/contrib/openzfs/lib/libzfs/libzfs.abi | 450 +- > sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 13 + > sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 3 +- > sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 7 +- > sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 16 +- > .../{libshare/libshare.c =3D> libzfs/libzfs_share.c} | 3 +- > .../include/libshare.h =3D> libzfs/libzfs_share.h} | 80 +- > .../{libshare/nfs.c =3D> libzfs/libzfs_share_nfs.c} | 5 +- > .../nfs.c =3D> libzfs/os/freebsd/libzfs_share_nfs.c} | 5 +- > .../smb.c =3D> libzfs/os/freebsd/libzfs_share_smb.c} | 4 +- > .../nfs.c =3D> libzfs/os/linux/libzfs_share_nfs.c} | 4 +- > .../smb.c =3D> libzfs/os/linux/libzfs_share_smb.c} | 24 +- > sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + > .../openzfs/lib/libzfs_core/libzfs_core.abi | 11 +- > sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + > sys/contrib/openzfs/lib/libzpool/Makefile.am | 14 +- > .../openzfs/lib/libzpool/include/Makefile.am | 1 + > sys/contrib/openzfs/lib/libzpool/kernel.c | 28 - > sys/contrib/openzfs/lib/libzstd/Makefile.am | 7 + > sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + > sys/contrib/openzfs/man/Makefile.am | 2 + > sys/contrib/openzfs/man/man4/zfs.4 | 36 +- > sys/contrib/openzfs/man/man7/vdevprops.7 | 17 + > sys/contrib/openzfs/man/man7/zfsprops.7 | 9 + > sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 14 + > sys/contrib/openzfs/man/man7/zpoolprops.7 | 15 + > sys/contrib/openzfs/man/man8/pam_zfs_key.8 | 221 + > sys/contrib/openzfs/man/man8/zfs-clone.8 | 4 +- > sys/contrib/openzfs/man/man8/zfs-create.8 | 2 +- > sys/contrib/openzfs/man/man8/zfs-load-key.8 | 4 + > sys/contrib/openzfs/man/man8/zfs-mount.8 | 6 + > sys/contrib/openzfs/man/man8/zfs-rename.8 | 2 +- > sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 19 +- > sys/contrib/openzfs/man/man8/zfs.8 | 1 + > sys/contrib/openzfs/module/Kbuild.in | 26 +- > sys/contrib/openzfs/module/Makefile.bsd | 13 +- > sys/contrib/openzfs/module/Makefile.in | 5 +- > sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 1 + > .../openzfs/module/icp/algs/sha2/sha512_impl.c | 18 + > .../icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S | 44 +- > .../module/icp/asm-x86_64/modes/ghash-x86_64.S | 64 - > .../module/icp/asm-x86_64/sha2/sha512-x86_64.S | 321 +- > .../icp/include/modes/gcm_asm_rename_funcs.h} | 30 +- > sys/contrib/openzfs/module/nvpair/nvpair.c | 4 +- > .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 19 + > .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 3 + > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 25 +- > .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 13 - > .../openzfs/module/os/linux/spl/spl-atomic.c | 36 - > .../openzfs/module/os/linux/spl/spl-generic.c | 258 - > .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 8 +- > sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 4 +- > .../openzfs/module/os/linux/spl/spl-kstat.c | 3 - > .../openzfs/module/os/linux/spl/spl-math-compat.c | 275 + > .../openzfs/module/os/linux/spl/spl-trace.c | 2 - > sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 16 + > .../openzfs/module/os/linux/zfs/vdev_disk.c | 7 + > .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 21 +- > .../openzfs/module/os/linux/zfs/zpl_export.c | 87 +- > sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 4 + > .../openzfs/module/os/linux/zfs/zpl_inode.c | 26 + > .../openzfs/module/os/linux/zfs/zpl_super.c | 63 + > sys/contrib/openzfs/module/zcommon/simd_stat.c | 2 + > sys/contrib/openzfs/module/zcommon/zfs_prop.c | 10 +- > sys/contrib/openzfs/module/zcommon/zpool_prop.c | 17 + > sys/contrib/openzfs/module/zfs/arc.c | 1347 ++-- > sys/contrib/openzfs/module/zfs/btree.c | 17 +- > sys/contrib/openzfs/module/zfs/dataset_kstats.c | 2 +- > sys/contrib/openzfs/module/zfs/dbuf.c | 26 +- > sys/contrib/openzfs/module/zfs/ddt.c | 95 +- > sys/contrib/openzfs/module/zfs/ddt_log.c | 4 +- > sys/contrib/openzfs/module/zfs/ddt_stats.c | 15 + > sys/contrib/openzfs/module/zfs/dmu.c | 4 +- > sys/contrib/openzfs/module/zfs/dmu_objset.c | 19 + > sys/contrib/openzfs/module/zfs/dmu_recv.c | 46 +- > sys/contrib/openzfs/module/zfs/dmu_tx.c | 7 +- > sys/contrib/openzfs/module/zfs/dsl_dataset.c | 8 +- > sys/contrib/openzfs/module/zfs/metaslab.c | 72 +- > sys/contrib/openzfs/module/zfs/mmp.c | 158 +- > sys/contrib/openzfs/module/zfs/range_tree.c | 22 +- > sys/contrib/openzfs/module/zfs/sa.c | 15 +- > sys/contrib/openzfs/module/zfs/spa.c | 791 ++- > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 5 +- > sys/contrib/openzfs/module/zfs/spa_misc.c | 75 +- > .../openzfs/module/{unicode =3D> zfs}/u8_textprep.c | 0 > sys/contrib/openzfs/module/zfs/vdev.c | 18 +- > sys/contrib/openzfs/module/zfs/vdev_file.c | 3 + > sys/contrib/openzfs/module/zfs/vdev_label.c | 10 +- > sys/contrib/openzfs/module/zfs/vdev_queue.c | 40 + > sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 20 +- > sys/contrib/openzfs/module/zfs/zcp_get.c | 8 + > sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 16 +- > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 83 +- > sys/contrib/openzfs/module/zfs/zio_compress.c | 2 +- > sys/contrib/openzfs/module/zstd/README.md | 44 +- > .../module/zstd/include/zstd_compat_wrapper.h | 271 +- > .../openzfs/module/zstd/lib/common/allocations.h | 56 + > sys/contrib/openzfs/module/zstd/lib/common/bits.h | 206 + > .../openzfs/module/zstd/lib/common/bitstream.h | 210 +- > .../openzfs/module/zstd/lib/common/compiler.h | 372 +- > sys/contrib/openzfs/module/zstd/lib/common/cpu.h | 40 +- > sys/contrib/openzfs/module/zstd/lib/common/debug.h | 57 +- > .../module/zstd/lib/common/entropy_common.c | 220 +- > .../openzfs/module/zstd/lib/common/error_private.c | 13 +- > .../openzfs/module/zstd/lib/common/error_private.h | 104 +- > sys/contrib/openzfs/module/zstd/lib/common/fse.h | 143 +- > .../module/zstd/lib/common/fse_decompress.c | 206 +- > sys/contrib/openzfs/module/zstd/lib/common/huf.h | 287 +- > sys/contrib/openzfs/module/zstd/lib/common/mem.h | 284 +- > sys/contrib/openzfs/module/zstd/lib/common/pool.c | 81 +- > sys/contrib/openzfs/module/zstd/lib/common/pool.h | 25 +- > .../module/zstd/lib/common/portability_macros.h | 172 + > .../openzfs/module/zstd/lib/common/xxhash.c | 865 --- > .../openzfs/module/zstd/lib/common/xxhash.h | 7199 ++++++++++++++= +++++- > .../openzfs/module/zstd/lib/common/zstd_common.c | 44 +- > .../openzfs/module/zstd/lib/common/zstd_deps.h | 124 + > .../openzfs/module/zstd/lib/common/zstd_internal.h | 345 +- > .../openzfs/module/zstd/lib/common/zstd_trace.h | 157 + > .../openzfs/module/zstd/lib/compress/clevels.h | 135 + > .../module/zstd/lib/compress/fse_compress.c | 249 +- > .../openzfs/module/zstd/lib/compress/hist.c | 66 +- > .../openzfs/module/zstd/lib/compress/hist.h | 11 +- > .../module/zstd/lib/compress/huf_compress.c | 1240 +++- > .../module/zstd/lib/compress/zstd_compress.c | 5917 ++++++++++++--= -- > .../zstd/lib/compress/zstd_compress_internal.h | 1017 ++- > .../zstd/lib/compress/zstd_compress_literals.c | 163 +- > .../zstd/lib/compress/zstd_compress_literals.h | 22 +- > .../zstd/lib/compress/zstd_compress_sequences.c | 75 +- > .../zstd/lib/compress/zstd_compress_sequences.h | 15 +- > .../zstd/lib/compress/zstd_compress_superblock.c | 693 +- > .../zstd/lib/compress/zstd_compress_superblock.h | 2 +- > .../openzfs/module/zstd/lib/compress/zstd_cwksp.h | 484 +- > .../module/zstd/lib/compress/zstd_double_fast.c | 611 +- > .../module/zstd/lib/compress/zstd_double_fast.h | 32 +- > .../openzfs/module/zstd/lib/compress/zstd_fast.c | 1039 ++- > .../openzfs/module/zstd/lib/compress/zstd_fast.h | 21 +- > .../openzfs/module/zstd/lib/compress/zstd_lazy.c | 1665 ++++- > .../openzfs/module/zstd/lib/compress/zstd_lazy.h | 184 +- > .../openzfs/module/zstd/lib/compress/zstd_ldm.c | 608 +- > .../openzfs/module/zstd/lib/compress/zstd_ldm.h | 27 +- > .../module/zstd/lib/compress/zstd_ldm_geartab.h | 107 + > .../openzfs/module/zstd/lib/compress/zstd_opt.c | 1004 ++- > .../openzfs/module/zstd/lib/compress/zstd_opt.h | 58 +- > .../module/zstd/lib/compress/zstd_preSplit.c | 239 + > .../module/zstd/lib/compress/zstd_preSplit.h | 34 + > .../module/zstd/lib/decompress/huf_decompress.c | 1858 +++-- > .../zstd/lib/decompress/huf_decompress_amd64.S | 603 ++ > .../module/zstd/lib/decompress/zstd_ddict.c | 24 +- > .../module/zstd/lib/decompress/zstd_ddict.h | 4 +- > .../module/zstd/lib/decompress/zstd_decompress.c | 897 ++- > .../zstd/lib/decompress/zstd_decompress_block.c | 1565 +++-- > .../zstd/lib/decompress/zstd_decompress_block.h | 24 +- > .../zstd/lib/decompress/zstd_decompress_internal.h | 79 +- > sys/contrib/openzfs/module/zstd/lib/zstd.h | 1848 ++++- > .../module/zstd/lib/{common =3D> }/zstd_errors.h | 45 +- > sys/contrib/openzfs/module/zstd/zfs_zstd.c | 35 +- > sys/contrib/openzfs/module/zstd/zstd-in.c | 93 +- > sys/contrib/openzfs/rpm/Makefile.am | 1 + > sys/contrib/openzfs/scripts/Makefile.am | 1 + > sys/contrib/openzfs/scripts/objtool-wrapper.in | 4 +- > sys/contrib/openzfs/scripts/spdxcheck.pl | 25 +- > sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- > sys/contrib/openzfs/tests/Makefile.am | 1 + > sys/contrib/openzfs/tests/runfiles/common.run | 15 +- > sys/contrib/openzfs/tests/runfiles/linux.run | 8 +- > sys/contrib/openzfs/tests/runfiles/sanity.run | 3 +- > .../openzfs/tests/test-runner/bin/zts-report.py.in | 4 - > sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + > .../tests/zfs-tests/callbacks/zfs_dbgmsg.ksh | 2 +- > .../openzfs/tests/zfs-tests/callbacks/zfs_mmp.ksh | 2 +- > sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + > .../openzfs/tests/zfs-tests/cmd/Makefile.am | 5 +- > .../tests/zfs-tests/cmd/checksum/sha2_test.c | 39 +- > .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 2 +- > sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 + > .../openzfs/tests/zfs-tests/include/commands.cfg | 5 +- > .../openzfs/tests/zfs-tests/include/libtest.shlib | 54 +- > .../openzfs/tests/zfs-tests/include/tunables.cfg | 4 +- > .../openzfs/tests/zfs-tests/tests/Makefile.am | 18 + > .../bclone/bclone_crossfs_corner_cases.ksh | 9 + > .../bclone/bclone_crossfs_corner_cases_limited.ksh | 9 + > .../functional/bclone/bclone_crossfs_data.ksh | 7 + > .../functional/bclone/bclone_crossfs_embedded.ksh | 7 + > .../functional/bclone/bclone_diffprops_all.ksh | 28 +- > .../bclone/bclone_diffprops_checksum.ksh | 18 +- > .../bclone/bclone_diffprops_compress.ksh | 16 +- > .../functional/bclone/bclone_diffprops_copies.ksh | 18 +- > .../bclone/bclone_diffprops_recordsize.ksh | 18 +- > .../tests/functional/bclone/bclone_prop_sync.ksh | 12 +- > .../bclone/bclone_samefs_corner_cases.ksh | 7 + > .../bclone/bclone_samefs_corner_cases_limited.ksh | 7 + > .../tests/functional/bclone/bclone_samefs_data.ksh | 6 + > .../functional/bclone/bclone_samefs_embedded.ksh | 6 + > .../functional/block_cloning/block_cloning.kshlib | 24 - > .../block_cloning_after_device_removal.ksh | 61 + > .../tests/functional/cache/cache_012_pos.ksh | 5 + > .../cli_root/zfs_clone/zfs_clone_nomount.ksh | 66 + > .../zfs_rewrite/zfs_rewrite_skip_clone.ksh | 83 + > .../zfs_rewrite/zfs_rewrite_skip_snapshot.ksh | 74 + > .../zpool_create/zpool_create_tempname.ksh | 2 + > .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + > .../functional/cli_root/zpool_get/zpool_get.cfg | 2 + > .../cli_root/zpool_get/zpool_get_parsable.cfg | 4 +- > .../cli_root/zpool_set/vdev_set_scheduler.ksh | 93 + > .../zfs_send_delegation_user/zfs_send_usertest.ksh | 11 +- > .../functional/events/zed_synchronous_zedlet.ksh | 6 +- > .../zfs-tests/tests/functional/l2arc/l2arc.cfg | 3 +- > .../functional/l2arc/l2arc_dwpd_ratelimit_pos.ksh | 138 + > .../functional/l2arc/l2arc_dwpd_reimport_pos.ksh | 169 + > .../l2arc/l2arc_multidev_scaling_pos.ksh | 162 + > .../l2arc/l2arc_multidev_throughput_pos.ksh | 133 + > .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + > .../tests/functional/lease/lease_setlease.ksh | 44 + > .../zfs-tests/tests/functional/lease/setup.ksh | 27 + > .../tests/zfs-tests/tests/functional/mmp/mmp.cfg | 6 +- > .../zfs-tests/tests/functional/mmp/mmp.kshlib | 47 +- > .../tests/functional/mmp/mmp_active_import.ksh | 42 +- > .../tests/functional/mmp/mmp_concurrent_import.ksh | 133 + > .../tests/functional/mmp/mmp_exported_import.ksh | 16 +- > .../zfs-tests/tests/functional/mmp/mmp_hostid.ksh | 8 +- > .../tests/functional/mmp/mmp_inactive_import.ksh | 20 +- > .../zfs-tests/tests/functional/mmp/mmp_on_off.ksh | 4 +- > .../tests/functional/mmp/mmp_on_thread.ksh | 4 +- > .../tests/functional/mmp/mmp_on_uberblocks.ksh | 14 +- > .../zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh | 3 +- > .../tests/functional/mmp/mmp_reset_interval.ksh | 8 +- > .../functional/mmp/mmp_write_distribution.ksh | 2 +- > .../tests/functional/mmp/mmp_write_uberblocks.ksh | 4 +- > .../tests/functional/mmp/multihost_history.ksh | 2 + > .../tests/functional/mount/mount_loopback.ksh | 3 +- > .../zfs-tests/tests/functional/pam/pam_basic.ksh | 58 + > .../tests/functional/pam/pam_change_unmounted.ksh | 13 +- > .../tests/functional/pam/pam_nounmount.ksh | 14 +- > .../tests/zfs-tests/tests/functional/pam/setup.ksh | 11 + > .../tests/functional/pam/utilities.kshlib.in | 6 + > .../rsend/send_large_blocks_incremental.ksh | 83 + > .../functional/rsend/send_large_blocks_initial.ksh | 86 + > .../rsend/send_large_microzap_incremental.ksh | 91 + > .../rsend/send_large_microzap_transitive.ksh | 100 + > .../tests/functional/snapshot/snapshot_018_pos.ksh | 52 +- > .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 5 +- > sys/contrib/openzfs/udev/Makefile.am | 1 + > sys/modules/dtrace/fasttrap/Makefile | 2 +- > sys/modules/zfs/Makefile | 8 +- > sys/modules/zfs/zfs_config.h | 24 +- > sys/modules/zfs/zfs_gitrev.h | 2 +- > 513 files changed, 34137 insertions(+), 10963 deletions(-) >=20 > diff --cc cddl/lib/libzfs/Makefile > index a034118a6f5b,000000000000..8f364d2c2bb1 > mode 100644,000000..100644 > --- a/cddl/lib/libzfs/Makefile > +++ b/cddl/lib/libzfs/Makefile > @@@ -1,109 -1,0 +1,105 @@@ > +.PATH: ${ZFSTOP}/module/icp > +.PATH: ${ZFSTOP}/module/zcommon > +.PATH: ${ZFSTOP}/lib/libzfs > +.PATH: ${ZFSTOP}/lib/libzfs/os/freebsd > - .PATH: ${ZFSTOP}/lib/libshare > +.PATH: ${ZFSTOP}/include > +.PATH: ${ZFSTOP}/module/zstd > +.PATH: ${ZFSTOP}/module/zstd/lib > + > +PACKAGE=3D zfs > +LIB_PACKAGE=3D > + > +LIB=3D zfs > +LIBADD=3D \ > + avl \ > + bsdxml \ > + crypto \ > + geom \ > + m \ > + md \ > + nvpair \ > + pthread \ > + rt \ > + umem \ > + util \ > + z \ > + zfs_core \ > + zutil > + > +INCS=3D libzfs.h > +USER_C =3D \ > - libzfs_changelist.c \ > - libzfs_config.c \ > - libzfs_crypto.c \ > - libzfs_dataset.c \ > - libzfs_diff.c \ > - libzfs_import.c \ > - libzfs_iter.c \ > - libzfs_mount.c \ > - libzfs_pool.c \ > - libzfs_sendrecv.c \ > - libzfs_status.c \ > - libzfs_util.c > ++ libzfs_changelist.c \ > ++ libzfs_config.c \ > ++ libzfs_crypto.c \ > ++ libzfs_dataset.c \ > ++ libzfs_diff.c \ > ++ libzfs_import.c \ > ++ libzfs_iter.c \ > ++ libzfs_mount.c \ > ++ libzfs_pool.c \ > ++ libzfs_sendrecv.c \ > ++ libzfs_share.c \ > ++ libzfs_share_nfs.c \ > ++ libzfs_status.c \ > ++ libzfs_util.c \ > ++ os/freebsd/libzfs_share_nfs.c \ > ++ os/freebsd/libzfs_share_smb.c > + > +# FreeBSD > +USER_C +=3D \ > + libzfs_compat.c \ > + libzfs_zmount.c > + > - # libshare > - USER_C +=3D \ > - libshare.c \ > - nfs.c \ > - os/freebsd/nfs.c \ > - os/freebsd/smb.c > -=20 > +KERNEL_C =3D \ > + cityhash.c \ > + zfeature_common.c \ > + zfs_comutil.c \ > + zfs_deleg.c \ > + zfs_fletcher.c \ > + zfs_fletcher_superscalar.c \ > + zfs_fletcher_superscalar4.c \ > + zfs_namecheck.c \ > + zfs_prop.c \ > + zfs_valstr.c \ > + zpool_prop.c \ > + zprop_common.c > + > +ARCH_C =3D > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386" > +ARCH_C +=3D zfs_fletcher_intel.c \ > + zfs_fletcher_sse.c=20 > +CFLAGS +=3D -DHAVE_SSE2 > +.endif > +.if ${MACHINE_ARCH} =3D=3D "amd64" > +ARCH_C +=3D zfs_fletcher_avx512.c > +CFLAGS+=3D -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F > +.endif > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > +ARCH_C +=3D zfs_fletcher_aarch64_neon.c > +.endif > + > +SRCS=3D $(USER_C) $(KERNEL_C) $(ARCH_C) > + > +WARNS?=3D 2 > +SHLIB_MAJOR=3D 4 > +CSTD=3D c99 > +CFLAGS+=3D -DIN_BASE > +CFLAGS+=3D -I${ZFSTOP}/include > +CFLAGS+=3D -I${ZFSTOP}/include/os/freebsd > +CFLAGS+=3D -I${ZFSTOP}/lib/libspl/include > +CFLAGS+=3D -I${ZFSTOP}/lib/libspl/include/os/freebsd > +CFLAGS+=3D -I${ZFSTOP}/lib/libshare > +CFLAGS+=3D -I${ZFSTOP}/lib/libzpool/include > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/ck/include > +CFLAGS+=3D -I${SRCTOP}/sys > +CFLAGS+=3D -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+=3D -I${ZFSTOP}/module/icp/include > +CFLAGS+=3D -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h > +CFLAGS+=3D -DHAVE_ISSETUGID > +CFLAGS+=3D -DHAVE_EXECVPE > +CFLAGS+=3D -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > +CFLAGS+=3D -DSYSCONFDIR=3D\"/etc\" > +CFLAGS+=3D -DPKGDATADIR=3D\"/usr/share/zfs\" > +CFLAGS+=3D -DZFSEXECDIR=3D\"${LIBEXECDIR}/zfs\" > + > +.include > diff --cc cddl/lib/libzpool/Makefile > index ade864790f1c,000000000000..74a5f6ccb438 > mode 100644,000000..100644 > --- a/cddl/lib/libzpool/Makefile > +++ b/cddl/lib/libzpool/Makefile > @@@ -1,343 -1,0 +1,342 @@@ > +.PATH: ${ZFSTOP}/lib/libzpool > + > +# ZFS_COMMON_SRCS > +.PATH: ${ZFSTOP}/module/zfs > +.PATH: ${ZFSTOP}/module/zcommon > +.PATH: ${ZFSTOP}/module/unicode > +# LUA_SRCS > +.PATH: ${ZFSTOP}/module/lua > +# ZSTD_SRCS > +.PATH: ${ZFSTOP}/module/zstd > +.PATH: ${ZFSTOP}/module/zstd/lib/common > +.PATH: ${ZFSTOP}/module/zstd/lib/compress > +.PATH: ${ZFSTOP}/module/zstd/lib/decompress > + > +.if > exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARC= H}/opensolaris_atomic.S) > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_AR= CH} > +ATOMIC_SRCS=3D opensolaris_atomic.S +ACFLAGS+=3D -Wa,--noexecstack > +.else > +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern > +ATOMIC_SRCS=3D opensolaris_atomic.c > +.endif > + > +.if ${MACHINE_ARCH} =3D=3D "powerpc" > +# Don't waste GOT entries on small data. > +PICFLAG=3D -fPIC > +.endif > + > +PACKAGE=3D zfs > +LIB_PACKAGE=3D > + > +LIB=3D zpool > + > +USER_C =3D \ > + arc_os.c \ > + kernel.c \ > + util.c \ > + zfs_debug.c > + > +.PATH: ${ZFSTOP}/module/os/linux/zfs > + > +KERNEL_C =3D \ > + simd_stat.c \ > + zfeature_common.c \ > + zfs_comutil.c \ > + zfs_deleg.c \ > + zfs_fletcher.c \ > + zfs_fletcher_superscalar.c \ > + zfs_fletcher_superscalar4.c \ > + zfs_namecheck.c \ > + zfs_prop.c \ > + zfs_zstd.c \ > + zpool_prop.c \ > + zprop_common.c \ > + abd.c \ > + abd_os.c \ > + aggsum.c \ > + arc.c \ > + blake3_zfs.c \ > + blkptr.c \ > + bplist.c \ > + bpobj.c \ > + bptree.c \ > + bqueue.c \ > + btree.c \ > + brt.c \ > + cityhash.c \ > + dbuf.c \ > + dbuf_stats.c \ > + ddt.c \ > + ddt_log.c \ > + ddt_stats.c \ > + ddt_zap.c \ > + dmu.c \ > + dmu_diff.c \ > + dmu_direct.c \ > + dmu_object.c \ > + dmu_objset.c \ > + dmu_recv.c \ > + dmu_redact.c \ > + dmu_send.c \ > + dmu_traverse.c \ > + dmu_tx.c \ > + dmu_zfetch.c \ > + dnode.c \ > + dnode_sync.c \ > + dsl_bookmark.c \ > + dsl_dataset.c \ > + dsl_deadlist.c \ > + dsl_deleg.c \ > + dsl_dir.c \ > + dsl_crypt.c \ > + dsl_pool.c \ > + dsl_prop.c \ > + dsl_scan.c \ > + dsl_synctask.c \ > + dsl_destroy.c \ > + dsl_userhold.c \ > + edonr_zfs.c \ > + entropy_common.c \ > + error_private.c \ > + fm.c \ > + fse_compress.c \ > + fse_decompress.c \ > + gzip.c \ > + hist.c \ > + hkdf.c \ > + huf_compress.c \ > + huf_decompress.c \ > + lzjb.c \ > + lz4.c \ > + lz4_zfs.c \ > + metaslab.c \ > + mmp.c \ > + multilist.c \ > + objlist.c \ > + pathname.c \ > + pool.c \ > + range_tree.c \ > + refcount.c \ > + rrwlock.c \ > + sa.c \ > + sha2_zfs.c \ > + skein_zfs.c \ > + spa.c \ > + spa_checkpoint.c \ > + spa_config.c \ > + spa_errlog.c \ > + spa_history.c \ > + spa_log_spacemap.c \ > + spa_misc.c \ > + spa_stats.c \ > + space_map.c \ > + space_reftree.c \ > + txg.c \ > ++ u8_textprep.c \ > + trace.c \ > + uberblock.c \ > + unique.c \ > + vdev.c \ > + vdev_draid.c \ > + vdev_draid_rand.c \ > + vdev_file.c \ > + vdev_indirect_births.c \ > + vdev_indirect.c \ > + vdev_indirect_mapping.c \ > + vdev_initialize.c \ > + vdev_label.c \ > + vdev_label_os.c \ > + vdev_mirror.c \ > + vdev_missing.c \ > + vdev_queue.c \ > + vdev_raidz.c \ > + vdev_raidz_math_aarch64_neon.c \ > + vdev_raidz_math_aarch64_neonx2.c \ > + vdev_raidz_math_avx2.c \ > + vdev_raidz_math_avx512bw.c \ > + vdev_raidz_math_avx512f.c \ > + vdev_raidz_math.c \ > + vdev_raidz_math_scalar.c \ > + vdev_rebuild.c \ > + vdev_removal.c \ > + vdev_root.c \ > + vdev_trim.c \ > - xxhash.c \ > + zap.c \ > + zap_leaf.c \ > + zap_micro.c \ > + zcp.c \ > + zcp_get.c \ > + zcp_global.c \ > + zcp_iter.c \ > + zcp_set.c \ > + zcp_synctask.c \ > + zfeature.c \ > + zfs_byteswap.c \ > + zfs_chksum.c \ > + zfs_crrd.c \ > + zfs_debug_common.c \ > + zfs_fm.c \ > + zfs_fuid.c \ > + zfs_impl.c \ > + zfs_sa.c \ > + zfs_znode.c \ > + zfs_racct.c \ > + zfs_ratelimit.c \ > + zfs_rlock.c \ > + zil.c \ > + zio.c \ > + zio_checksum.c \ > + zio_compress.c \ > + zio_crypt.c \ > + zio_inject.c \ > + zle.c \ > + zrlock.c \ > + zstd_common.c \ > + zstd_compress.c \ > + zstd_compress_literals.c \ > + zstd_compress_sequences.c \ > + zstd_compress_superblock.c \ > + zstd_ddict.c \ > + zstd_decompress.c \ > + zstd_decompress_block.c \ > + zstd_double_fast.c \ > + zstd_fast.c \ > + zstd_lazy.c \ > + zstd_ldm.c \ > + zstd_opt.c \ > ++ zstd_preSplit.c \ > + zthr.c > + > +ARCH_C =3D > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386" > +ARCH_C +=3D vdev_raidz_math_sse2.c \ > + vdev_raidz_math_ssse3.c \ > + zfs_fletcher_intel.c \ > + zfs_fletcher_sse.c=20 > +CFLAGS +=3D -DHAVE_SSE2 -DHAVE_SSE3 > +.endif > +.if ${MACHINE_ARCH} =3D=3D "amd64" > +ARCH_C +=3D zfs_fletcher_avx512.c > +CFLAGS+=3D -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ > + -DHAVE_AVX512BW > +.endif > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > +ARCH_C +=3D zfs_fletcher_aarch64_neon.c > +.endif > + > +LUA_C =3D \ > + lapi.c \ > + lauxlib.c \ > + lbaselib.c \ > + lcode.c \ > + lcompat.c \ > + lcorolib.c \ > + lctype.c \ > + ldebug.c \ > + ldo.c \ > + lfunc.c \ > + lgc.c \ > + llex.c \ > + lmem.c \ > + lobject.c \ > + lopcodes.c \ > + lparser.c \ > + lstate.c \ > + lstring.c \ > + lstrlib.c \ > + ltable.c \ > + ltablib.c \ > + ltm.c \ > + lvm.c \ > + lzio.c > + > - UNICODE_C =3D u8_textprep.c > -=20 > - SRCS+=3D ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} > ++SRCS+=3D ${USER_C} ${KERNEL_C} ${LUA_C} ${ARCH_C} > + > *** 15577 LINES SKIPPED *** >=20 buildworld failure after commit, immintrin.h not found error: [...] In file included from /usr/src/sys/contrib/openzfs/module/zstd/lib/common/f= se.h:230: /usr/src/sys/contrib/openzfs/module/zstd/lib/common/bitstream.h:38:14: fata= l error: 'immintrin.h' file not found 38 | # include /* support f= or bextr (experimental)/bzhi */ Kind regards, oh --=20 A FreeBSD user --Sig_/3BPityYhB1371w5jWWcZyuK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCabZa6gAKCRCxzvs8Oqok rzKfAQCG7COIZMN3gpojL4E4bvFXmjvPmXSNf6lHLXFC/mXAzQD/V8O0yKw7k7nG qQpCqROgsw8EyZLGiBs6CTdki8I7Dw8= =F3Wi -----END PGP SIGNATURE----- --Sig_/3BPityYhB1371w5jWWcZyuK-- From nobody Sun Mar 15 07:23:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYV8q440Wz6VHbF; Sun, 15 Mar 2026 07:24:27 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [85.220.129.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYV8p33SQz3K6T; Sun, 15 Mar 2026 07:24:26 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=walstatt-de.de header.s=DKIM001 header.b="nj1nitW/"; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd@walstatt-de.de designates 85.220.129.31 as permitted sender) smtp.mailfrom=freebsd@walstatt-de.de 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 852C024093E; Sun, 15 Mar 2026 08:24:24 +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 6DAEF240102; Sun, 15 Mar 2026 08:24:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1773559461; 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=qAZVkhCpzv1AEvwesh/hNtNIZjTKgjSRpUSJ/lkXvLo=; b=nj1nitW/rs0LaiUf7kgRK3bTm71L4gGNMSL0dBcRj569f5kHzp15MHidYhY1PI228wA82b 3PcAQ/WymwLYMtTxnN6K6OCEuujzjkWG3taUDCR28Sy1VGxceLLNNbLMPqg+NO4anMWHMn 4n/vc3Xt4bEnKULTH/rbl5wzAPATyI50uAQ2RuzrzYcNcEvktoIv6YzPSysycm65UVy73S p8YErIgexaLWyeQpmaOaupKvgTMLeVcnP9rRA/in8IlIVxagkbfeWVKDs3Fis3bUQHv+5H EzYkYGY/et30GgWyBUru6ncNewoK1bEOpPOsJ08kRdduJoFXexEdX2C6texEJQ== Received: from thor.sb211.local (dynamic-2a02-3100-2218-fc02-dded-68cf-e902-4bad.310.pool.telefonica.de [IPv6:2a02:3100:2218:fc02:dded:68cf:e902:4bad]) (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 168052400A4; Sun, 15 Mar 2026 08:24:21 +0100 (CET) Date: Sun, 15 Mar 2026 08:23:53 +0100 From: A FreeBSD User To: Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8a62a2a5659d - main - zfs: merge openzfs/zfs@f8e5af53e Message-ID: <20260315082420.01da7a33@thor.sb211.local> In-Reply-To: <20260315080826.6a07e638@thor.sb211.local> References: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> <20260315080826.6a07e638@thor.sb211.local> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd16.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/u=PR.TkrjpEx8p4V+ljeX27"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: 485e4a X-Rspamd-UID: b131af X-Spamd-Result: default: False [-5.69 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.989]; R_DKIM_ALLOW(-0.20)[walstatt-de.de:s=DKIM001]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip4:85.220.129.0/25]; RCVD_IN_DNSWL_LOW(-0.10)[85.220.129.31:from]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[walstatt-de.de]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[walstatt-de.de:+] X-Rspamd-Queue-Id: 4fYV8p33SQz3K6T X-Spamd-Bar: ----- --Sig_/u=PR.TkrjpEx8p4V+ljeX27 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Tage des Herren Sun, 15 Mar 2026 08:07:59 +0100 A FreeBSD User schrieb: > Am Tage des Herren Sat, 14 Mar 2026 13:26:23 +0000 > Martin Matuska schrieb: >=20 > > The branch main has been updated by mm: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D8a62a2a5659d1839d8799b42= 74c04469d7f17c78 > >=20 > > commit 8a62a2a5659d1839d8799b4274c04469d7f17c78 > > Merge: f91464171d61 f8e5af53e92f > > Author: Martin Matuska > > AuthorDate: 2026-03-14 12:14:56 +0000 > > Commit: Martin Matuska > > CommitDate: 2026-03-14 12:14:56 +0000 > >=20 > > zfs: merge openzfs/zfs@f8e5af53e > > =20 > > Notable upstream pull request merges: > > #17358 4975430cf Add vdev property to disable vdev scheduler > > #18031 c77f17b75 Add snapshots_changed_nsecs dataset property > > #18080 dbb3f247e cmd/zfs: clone: accept `-u` to not mount newly cr= eated > > datasets > > #18089 -multiple Zstd: Update bundled library to version 1.5.7 > > #18091 2301755df Fix zfs_open() to skip zil_async_to_sync() for the > > snapshot > > #18093 -multiple L2ARC: Rework write throttling with DWPD rate lim= iting > > and parallel writes > > #18095 2dbd6af5e Rename several printf attributes declarations to > > __printf__ > > #18096 8605bdfdd FreeBSD: unbreak compilation on i386 > > #18105 794f1587d When receiving a stream with the large block flag, > > activate feature > > #18115 765929cb4 DDT: Add locking for table ZAP destruction > > #18118 09e4e01e9 Fix history logging for `zpool create -t` > > #18119 2f1f25217 icp: emit .note.GNU-stack section for all ELF tar= gets > > #18131 3fffe4e70 Fix --enable-invariants on FreeBSD > > #18133 d2f5cb3a5 Move range_tree, btree, highbit64 to common code > > #18136 54b141fab FreeBSD: Remove references to DEBUG_VFS_LOCKS > > #18138 cdf89f413 Flush RRD only when TXGs contain data > > #18139 a157ef62a Make sure we can still write data to txg > > #18140 cd895f0e5 remove thread unsafe debug code causing FreeBSD d= ouble > > free panic > > #18144 4f180e095 Fix activating large_microzap on receive > > #18146 35b2d3970 Lock db_mtx around arc_release() in couple places > > #18154 b36472052 nvpair: chase FreeBSD xdrproc_t definition > > #18160 21bbe7cb6 Improve caching for dbuf prefetches > > #18177 -multiple Multihost Improvements > > #18179 2646bd558 Allow rewrite skip cloned and snapshotted blocks > > #18180 aa29455dd Restrict cloning with different properties > > #18184 040ba7a7c libzfs: improve error message for zpool create wi= th > > ENXIO > > #18188 1412bdc6c zfs_vnops_os.c: Move a vput() to after > > zfs_setattr_dir() > > #18198 cc184fe98 Fix `send:raw` permission for send `-w -I` > > #18208 ba970eb20 Cleanup allocation class selection > > #18212 0f9564e85 Simplify dnode_level_is_l2cacheable() > > #18214 370570890 Remove parent ZIO from dbuf_prefetch() > > #18218 bfb276e55 freebsd: Fix TIMESPEC_OVERFLOW for PowerPC > > #18222 d06a1d9ac Fix available space accounting for special/dedup > > #18225 d48967728 ICP: AES-GCM VAES-AVX2: fix typos and document > > source files > > #18226 c8a72a27e ICP: AES-GCM assembly: remove unused Gmul functio= ns > > #18230 -multiple Fix zdb --key crash for unencrypted datasets, and > > teach tests to understand this better > > #18233 -multiple icp: add SHA-512 implementation using Intel SHA512 > > extension > > #18245 991fc56fa Introduce dedupused/dedupsaved pool properties > > #18251 6a717f31e Improve misleading error messages for > > ZPOOL_STATUS_CORRUPT_POOL > > #18254 7744f0496 SIMD: libspl: test the correct CPUID bit for AVX5= 12VL > > #18255 6495dafd5 range_tree: use zfs_panic_recover() for > > partial-overlap remov > > #18256 3408332d7 zhack: Fix importing large allocation profiles on > > small pools > > #18258 f8457fbdc Fix deadlock on dmu_tx_assign() from vdev_rebuild= () > > #18263 f8e5af53e Fix redundant declaration of dsl_pool_t > > =20 > > Obtained from: OpenZFS > > OpenZFS commit: f8e5af53e92fa7c03393fbd4922cb9c1d0c15920 > >=20 > > cddl/lib/libzfs/Makefile | 36 +- > > cddl/lib/libzpool/Makefile | 7 +- > > stand/libsa/zfs/Makefile.inc | 6 +- > > stand/libsa/zfs/xxhash.c | 24 + > > sys/conf/files | 7 +- > > .../.github/workflows/scripts/qemu-1-setup.sh | 110 +- > > .../.github/workflows/scripts/qemu-2-start.sh | 53 +- > > .../.github/workflows/scripts/qemu-3-deps-vm.sh | 50 +- > > .../.github/workflows/scripts/qemu-5-setup.sh | 22 +- > > .../workflows/scripts/qemu-6-lustre-tests-vm.sh | 51 + > > .../.github/workflows/scripts/qemu-6-tests.sh | 132 +- > > .../.github/workflows/scripts/qemu-8-summary.sh | 32 + > > .../.github/workflows/scripts/qemu-test-repo-vm.sh | 27 +- > > .../.github/workflows/zfs-qemu-packages.yml | 15 +- > > sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 16 +- > > sys/contrib/openzfs/.mailmap | 10 + > > sys/contrib/openzfs/AUTHORS | 14 + > > sys/contrib/openzfs/META | 2 +- > > sys/contrib/openzfs/Makefile.am | 2 + > > sys/contrib/openzfs/autogen.sh | 1 + > > sys/contrib/openzfs/cmd/Makefile.am | 5 +- > > sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zdb/Makefile.am | 5 +- > > sys/contrib/openzfs/cmd/zdb/zdb.c | 53 +- > > sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + > > .../zed/zed.d/history_event-zfs-list-cacher.sh.in | 1 + > > sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zfs/zfs_main.c | 89 +- > > sys/contrib/openzfs/cmd/zhack.c | 166 +- > > sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 16 +- > > sys/contrib/openzfs/cmd/zpool/zpool_util.c | 26 - > > sys/contrib/openzfs/cmd/zpool/zpool_util.h | 2 - > > sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + > > sys/contrib/openzfs/cmd/ztest.c | 7 +- > > sys/contrib/openzfs/config/CppCheck.am | 1 + > > sys/contrib/openzfs/config/Rules.am | 1 + > > sys/contrib/openzfs/config/Shellcheck.am | 1 + > > sys/contrib/openzfs/config/Substfiles.am | 1 + > > sys/contrib/openzfs/config/always-arch.m4 | 1 + > > .../openzfs/config/always-compiler-options.m4 | 1 + > > sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + > > sys/contrib/openzfs/config/always-parallel.m4 | 1 + > > sys/contrib/openzfs/config/always-python.m4 | 1 + > > sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + > > sys/contrib/openzfs/config/always-sed.m4 | 1 + > > sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + > > sys/contrib/openzfs/config/always-system.m4 | 1 + > > sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + > > sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + > > sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + > > sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + > > sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + > > sys/contrib/openzfs/config/deb.am | 1 + > > sys/contrib/openzfs/config/find_system_library.m4 | 1 + > > sys/contrib/openzfs/config/gettext.m4 | 1 + > > sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + > > sys/contrib/openzfs/config/iconv.m4 | 1 + > > .../openzfs/config/kernel-access-ok-type.m4 | 1 + > > sys/contrib/openzfs/config/kernel-acl.m4 | 32 + > > sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + > > sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + > > sys/contrib/openzfs/config/kernel-automount.m4 | 1 + > > sys/contrib/openzfs/config/kernel-bio.m4 | 1 + > > sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + > > sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + > > sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + > > .../config/kernel-block-device-operations.m4 | 1 + > > .../openzfs/config/kernel-commit-metadata.m4 | 1 + > > .../openzfs/config/kernel-config-defined.m4 | 1 + > > .../config/kernel-copy-from-user-inatomic.m4 | 1 + > > .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + > > .../openzfs/config/kernel-declare-event-class.m4 | 1 + > > .../openzfs/config/kernel-dentry-operations.m4 | 1 + > > .../openzfs/config/kernel-discard-granularity.m4 | 1 + > > sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + > > sys/contrib/openzfs/config/kernel-file.m4 | 1 + > > sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + > > .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + > > .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + > > sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + > > .../openzfs/config/kernel-follow-down-one.m4 | 1 + > > sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + > > sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + > > sys/contrib/openzfs/config/kernel-fs-context.m4 | 33 + > > sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - > > sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + > > .../openzfs/config/kernel-generic_fadvise.m4 | 1 + > > .../openzfs/config/kernel-generic_fillattr.m4 | 1 + > > .../openzfs/config/kernel-generic_io_acct.m4 | 1 + > > sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + > > sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + > > sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + > > sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + > > .../openzfs/config/kernel-inode-permission.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + > > sys/contrib/openzfs/config/kernel-inode-state.m4 | 24 + > > sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + > > .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + > > .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + > > .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + > > .../openzfs/config/kernel-kmap-local-page.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + > > sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + > > .../openzfs/config/kernel-make-request-fn.m4 | 1 + > > sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + > > sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + > > sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + > > sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 28 + > > sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + > > sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + > > sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + > > .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + > > .../config/kernel-pagemap-readahead-page.m4 | 1 + > > sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + > > sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + > > .../openzfs/config/kernel-pin-user-pages.m4 | 1 + > > .../openzfs/config/kernel-proc-operations.m4 | 1 + > > sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + > > .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + > > sys/contrib/openzfs/config/kernel-rename.m4 | 1 + > > .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sched.m4 | 1 + > > .../openzfs/config/kernel-security-inode-init.m4 | 1 + > > sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + > > .../openzfs/config/kernel-setattr-prepare.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + > > sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + > > sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + > > sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + > > sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + > > sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + > > sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + > > sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + > > sys/contrib/openzfs/config/kernel-timer.m4 | 1 + > > sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + > > .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + > > .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + > > .../openzfs/config/kernel-truncate-setsize.m4 | 1 + > > sys/contrib/openzfs/config/kernel-types.m4 | 1 + > > sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + > > .../openzfs/config/kernel-vfs-file_range.m4 | 1 + > > .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + > > sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + > > sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + > > .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + > > .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + > > .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + > > sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + > > .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + > > sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + > > sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + > > sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + > > sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + > > sys/contrib/openzfs/config/kernel.m4 | 9 +- > > sys/contrib/openzfs/config/lib-ld.m4 | 1 + > > sys/contrib/openzfs/config/lib-link.m4 | 1 + > > sys/contrib/openzfs/config/lib-prefix.m4 | 1 + > > sys/contrib/openzfs/config/mount-helper.m4 | 1 + > > sys/contrib/openzfs/config/nls.m4 | 1 + > > sys/contrib/openzfs/config/pkg.m4 | 1 + > > sys/contrib/openzfs/config/po.m4 | 1 + > > sys/contrib/openzfs/config/progtest.m4 | 1 + > > sys/contrib/openzfs/config/rpm.am | 1 + > > sys/contrib/openzfs/config/tgz.am | 1 + > > sys/contrib/openzfs/config/toolchain-simd.m4 | 23 + > > sys/contrib/openzfs/config/user-aio.h.m4 | 1 + > > sys/contrib/openzfs/config/user-backtrace.m4 | 1 + > > sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + > > sys/contrib/openzfs/config/user-dracut.m4 | 1 + > > sys/contrib/openzfs/config/user-gettext.m4 | 1 + > > sys/contrib/openzfs/config/user-largefile.m4 | 1 + > > sys/contrib/openzfs/config/user-libaio.m4 | 1 + > > sys/contrib/openzfs/config/user-libatomic.m4 | 1 + > > sys/contrib/openzfs/config/user-libblkid.m4 | 1 + > > sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + > > sys/contrib/openzfs/config/user-libexec.m4 | 1 + > > sys/contrib/openzfs/config/user-libfetch.m4 | 1 + > > sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + > > sys/contrib/openzfs/config/user-libudev.m4 | 1 + > > sys/contrib/openzfs/config/user-libunwind.m4 | 1 + > > sys/contrib/openzfs/config/user-libuuid.m4 | 1 + > > sys/contrib/openzfs/config/user-makedev.m4 | 1 + > > sys/contrib/openzfs/config/user-pam.m4 | 1 + > > sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + > > sys/contrib/openzfs/config/user-statx.m4 | 1 + > > sys/contrib/openzfs/config/user-systemd.m4 | 1 + > > sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + > > sys/contrib/openzfs/config/user-udev.m4 | 1 + > > sys/contrib/openzfs/config/user-zlib.m4 | 1 + > > sys/contrib/openzfs/config/user.m4 | 1 + > > sys/contrib/openzfs/config/zfs-build.m4 | 3 +- > > sys/contrib/openzfs/config/zfs-meta.m4 | 1 + > > sys/contrib/openzfs/contrib/Makefile.am | 1 + > > .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + > > sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + > > sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + > > .../contrib/debian/openzfs-libpam-zfs.install | 1 + > > .../openzfs/contrib/dracut/90zfs/mount-zfs.sh.in | 2 +- > > sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + > > sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + > > .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + > > .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c | 278 +- > > sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + > > .../openzfs/contrib/pyzfs/docs/source/index.rst | 3 +- > > .../openzfs/contrib/pyzfs/libzfs_core/__init__.py | 10 - > > .../pyzfs/libzfs_core/_error_translation.py | 58 - > > .../contrib/pyzfs/libzfs_core/_libzfs_core.py | 350 +- > > .../pyzfs/libzfs_core/bindings/libzfs_core.py | 4 - > > .../pyzfs/libzfs_core/test/test_libzfs_core.py | 337 - > > sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + > > sys/contrib/openzfs/copy-builtin | 5 +- > > sys/contrib/openzfs/etc/Makefile.am | 1 + > > sys/contrib/openzfs/include/Makefile.am | 1 + > > sys/contrib/openzfs/include/libzfs.h | 10 +- > > sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + > > .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + > > sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + > > .../include/os/linux/kernel/linux/dcache_compat.h | 19 +- > > .../include/os/linux/kernel/linux/simd_x86.h | 14 + > > .../include/os/linux/kernel/linux/vfs_compat.h | 8 + > > .../include/os/linux/kernel/linux/xattr_compat.h | 17 + > > .../openzfs/include/os/linux/spl/sys/kmem.h | 5 +- > > sys/contrib/openzfs/include/sys/arc.h | 2 - > > sys/contrib/openzfs/include/sys/arc_impl.h | 38 + > > sys/contrib/openzfs/include/sys/btree.h | 9 +- > > sys/contrib/openzfs/include/sys/ddt.h | 5 + > > sys/contrib/openzfs/include/sys/dmu.h | 1 + > > sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + > > sys/contrib/openzfs/include/sys/fs/zfs.h | 24 +- > > sys/contrib/openzfs/include/sys/metaslab.h | 4 +- > > sys/contrib/openzfs/include/sys/metaslab_impl.h | 8 +- > > sys/contrib/openzfs/include/sys/mmp.h | 5 + > > sys/contrib/openzfs/include/sys/spa.h | 1 + > > sys/contrib/openzfs/include/sys/spa_impl.h | 4 + > > sys/contrib/openzfs/include/sys/uberblock_impl.h | 22 +- > > sys/contrib/openzfs/include/sys/vdev.h | 2 + > > sys/contrib/openzfs/include/sys/vdev_impl.h | 2 + > > sys/contrib/openzfs/include/sys/vdev_rebuild.h | 2 +- > > sys/contrib/openzfs/lib/Makefile.am | 31 +- > > sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libbtree/Makefile.am | 6 + > > sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + > > sys/contrib/openzfs/lib/librange_tree/Makefile.am | 9 + > > sys/contrib/openzfs/lib/libshare/Makefile.am | 27 - > > sys/contrib/openzfs/lib/libshare/libshare_impl.h | 48 - > > sys/contrib/openzfs/lib/libshare/nfs.h | 38 - > > sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libspl/include/Makefile.am | 2 +- > > sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 18 +- > > .../openzfs/lib/libspl/include/sys/sysmacros.h | 29 +- > > sys/contrib/openzfs/lib/libunicode/Makefile.am | 6 - > > sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libzfs/Makefile.am | 18 +- > > sys/contrib/openzfs/lib/libzfs/libzfs.abi | 450 +- > > sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 13 + > > sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 3 +- > > sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 7 +- > > sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 16 +- > > .../{libshare/libshare.c =3D> libzfs/libzfs_share.c} | 3 +- > > .../include/libshare.h =3D> libzfs/libzfs_share.h} | 80 +- > > .../{libshare/nfs.c =3D> libzfs/libzfs_share_nfs.c} | 5 +- > > .../nfs.c =3D> libzfs/os/freebsd/libzfs_share_nfs.c} | 5 +- > > .../smb.c =3D> libzfs/os/freebsd/libzfs_share_smb.c} | 4 +- > > .../nfs.c =3D> libzfs/os/linux/libzfs_share_nfs.c} | 4 +- > > .../smb.c =3D> libzfs/os/linux/libzfs_share_smb.c} | 24 +- > > sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + > > .../openzfs/lib/libzfs_core/libzfs_core.abi | 11 +- > > sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libzpool/Makefile.am | 14 +- > > .../openzfs/lib/libzpool/include/Makefile.am | 1 + > > sys/contrib/openzfs/lib/libzpool/kernel.c | 28 - > > sys/contrib/openzfs/lib/libzstd/Makefile.am | 7 + > > sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + > > sys/contrib/openzfs/man/Makefile.am | 2 + > > sys/contrib/openzfs/man/man4/zfs.4 | 36 +- > > sys/contrib/openzfs/man/man7/vdevprops.7 | 17 + > > sys/contrib/openzfs/man/man7/zfsprops.7 | 9 + > > sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 14 + > > sys/contrib/openzfs/man/man7/zpoolprops.7 | 15 + > > sys/contrib/openzfs/man/man8/pam_zfs_key.8 | 221 + > > sys/contrib/openzfs/man/man8/zfs-clone.8 | 4 +- > > sys/contrib/openzfs/man/man8/zfs-create.8 | 2 +- > > sys/contrib/openzfs/man/man8/zfs-load-key.8 | 4 + > > sys/contrib/openzfs/man/man8/zfs-mount.8 | 6 + > > sys/contrib/openzfs/man/man8/zfs-rename.8 | 2 +- > > sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 19 +- > > sys/contrib/openzfs/man/man8/zfs.8 | 1 + > > sys/contrib/openzfs/module/Kbuild.in | 26 +- > > sys/contrib/openzfs/module/Makefile.bsd | 13 +- > > sys/contrib/openzfs/module/Makefile.in | 5 +- > > sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 1 + > > .../openzfs/module/icp/algs/sha2/sha512_impl.c | 18 + > > .../icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S | 44 +- > > .../module/icp/asm-x86_64/modes/ghash-x86_64.S | 64 - > > .../module/icp/asm-x86_64/sha2/sha512-x86_64.S | 321 +- > > .../icp/include/modes/gcm_asm_rename_funcs.h} | 30 +- > > sys/contrib/openzfs/module/nvpair/nvpair.c | 4 +- > > .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 19 + > > .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 3 + > > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 25 +- > > .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 13 - > > .../openzfs/module/os/linux/spl/spl-atomic.c | 36 - > > .../openzfs/module/os/linux/spl/spl-generic.c | 258 - > > .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 8 +- > > sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 4 +- > > .../openzfs/module/os/linux/spl/spl-kstat.c | 3 - > > .../openzfs/module/os/linux/spl/spl-math-compat.c | 275 + > > .../openzfs/module/os/linux/spl/spl-trace.c | 2 - > > sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 16 + > > .../openzfs/module/os/linux/zfs/vdev_disk.c | 7 + > > .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 21 +- > > .../openzfs/module/os/linux/zfs/zpl_export.c | 87 +- > > sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 4 + > > .../openzfs/module/os/linux/zfs/zpl_inode.c | 26 + > > .../openzfs/module/os/linux/zfs/zpl_super.c | 63 + > > sys/contrib/openzfs/module/zcommon/simd_stat.c | 2 + > > sys/contrib/openzfs/module/zcommon/zfs_prop.c | 10 +- > > sys/contrib/openzfs/module/zcommon/zpool_prop.c | 17 + > > sys/contrib/openzfs/module/zfs/arc.c | 1347 ++-- > > sys/contrib/openzfs/module/zfs/btree.c | 17 +- > > sys/contrib/openzfs/module/zfs/dataset_kstats.c | 2 +- > > sys/contrib/openzfs/module/zfs/dbuf.c | 26 +- > > sys/contrib/openzfs/module/zfs/ddt.c | 95 +- > > sys/contrib/openzfs/module/zfs/ddt_log.c | 4 +- > > sys/contrib/openzfs/module/zfs/ddt_stats.c | 15 + > > sys/contrib/openzfs/module/zfs/dmu.c | 4 +- > > sys/contrib/openzfs/module/zfs/dmu_objset.c | 19 + > > sys/contrib/openzfs/module/zfs/dmu_recv.c | 46 +- > > sys/contrib/openzfs/module/zfs/dmu_tx.c | 7 +- > > sys/contrib/openzfs/module/zfs/dsl_dataset.c | 8 +- > > sys/contrib/openzfs/module/zfs/metaslab.c | 72 +- > > sys/contrib/openzfs/module/zfs/mmp.c | 158 +- > > sys/contrib/openzfs/module/zfs/range_tree.c | 22 +- > > sys/contrib/openzfs/module/zfs/sa.c | 15 +- > > sys/contrib/openzfs/module/zfs/spa.c | 791 ++- > > sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 5 +- > > sys/contrib/openzfs/module/zfs/spa_misc.c | 75 +- > > .../openzfs/module/{unicode =3D> zfs}/u8_textprep.c | 0 > > sys/contrib/openzfs/module/zfs/vdev.c | 18 +- > > sys/contrib/openzfs/module/zfs/vdev_file.c | 3 + > > sys/contrib/openzfs/module/zfs/vdev_label.c | 10 +- > > sys/contrib/openzfs/module/zfs/vdev_queue.c | 40 + > > sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 20 +- > > sys/contrib/openzfs/module/zfs/zcp_get.c | 8 + > > sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 16 +- > > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 83 +- > > sys/contrib/openzfs/module/zfs/zio_compress.c | 2 +- > > sys/contrib/openzfs/module/zstd/README.md | 44 +- > > .../module/zstd/include/zstd_compat_wrapper.h | 271 +- > > .../openzfs/module/zstd/lib/common/allocations.h | 56 + > > sys/contrib/openzfs/module/zstd/lib/common/bits.h | 206 + > > .../openzfs/module/zstd/lib/common/bitstream.h | 210 +- > > .../openzfs/module/zstd/lib/common/compiler.h | 372 +- > > sys/contrib/openzfs/module/zstd/lib/common/cpu.h | 40 +- > > sys/contrib/openzfs/module/zstd/lib/common/debug.h | 57 +- > > .../module/zstd/lib/common/entropy_common.c | 220 +- > > .../openzfs/module/zstd/lib/common/error_private.c | 13 +- > > .../openzfs/module/zstd/lib/common/error_private.h | 104 +- > > sys/contrib/openzfs/module/zstd/lib/common/fse.h | 143 +- > > .../module/zstd/lib/common/fse_decompress.c | 206 +- > > sys/contrib/openzfs/module/zstd/lib/common/huf.h | 287 +- > > sys/contrib/openzfs/module/zstd/lib/common/mem.h | 284 +- > > sys/contrib/openzfs/module/zstd/lib/common/pool.c | 81 +- > > sys/contrib/openzfs/module/zstd/lib/common/pool.h | 25 +- > > .../module/zstd/lib/common/portability_macros.h | 172 + > > .../openzfs/module/zstd/lib/common/xxhash.c | 865 --- > > .../openzfs/module/zstd/lib/common/xxhash.h | 7199 ++++++++++++= +++++++- > > .../openzfs/module/zstd/lib/common/zstd_common.c | 44 +- > > .../openzfs/module/zstd/lib/common/zstd_deps.h | 124 + > > .../openzfs/module/zstd/lib/common/zstd_internal.h | 345 +- > > .../openzfs/module/zstd/lib/common/zstd_trace.h | 157 + > > .../openzfs/module/zstd/lib/compress/clevels.h | 135 + > > .../module/zstd/lib/compress/fse_compress.c | 249 +- > > .../openzfs/module/zstd/lib/compress/hist.c | 66 +- > > .../openzfs/module/zstd/lib/compress/hist.h | 11 +- > > .../module/zstd/lib/compress/huf_compress.c | 1240 +++- > > .../module/zstd/lib/compress/zstd_compress.c | 5917 ++++++++++++= ---- > > .../zstd/lib/compress/zstd_compress_internal.h | 1017 ++- > > .../zstd/lib/compress/zstd_compress_literals.c | 163 +- > > .../zstd/lib/compress/zstd_compress_literals.h | 22 +- > > .../zstd/lib/compress/zstd_compress_sequences.c | 75 +- > > .../zstd/lib/compress/zstd_compress_sequences.h | 15 +- > > .../zstd/lib/compress/zstd_compress_superblock.c | 693 +- > > .../zstd/lib/compress/zstd_compress_superblock.h | 2 +- > > .../openzfs/module/zstd/lib/compress/zstd_cwksp.h | 484 +- > > .../module/zstd/lib/compress/zstd_double_fast.c | 611 +- > > .../module/zstd/lib/compress/zstd_double_fast.h | 32 +- > > .../openzfs/module/zstd/lib/compress/zstd_fast.c | 1039 ++- > > .../openzfs/module/zstd/lib/compress/zstd_fast.h | 21 +- > > .../openzfs/module/zstd/lib/compress/zstd_lazy.c | 1665 ++++- > > .../openzfs/module/zstd/lib/compress/zstd_lazy.h | 184 +- > > .../openzfs/module/zstd/lib/compress/zstd_ldm.c | 608 +- > > .../openzfs/module/zstd/lib/compress/zstd_ldm.h | 27 +- > > .../module/zstd/lib/compress/zstd_ldm_geartab.h | 107 + > > .../openzfs/module/zstd/lib/compress/zstd_opt.c | 1004 ++- > > .../openzfs/module/zstd/lib/compress/zstd_opt.h | 58 +- > > .../module/zstd/lib/compress/zstd_preSplit.c | 239 + > > .../module/zstd/lib/compress/zstd_preSplit.h | 34 + > > .../module/zstd/lib/decompress/huf_decompress.c | 1858 +++-- > > .../zstd/lib/decompress/huf_decompress_amd64.S | 603 ++ > > .../module/zstd/lib/decompress/zstd_ddict.c | 24 +- > > .../module/zstd/lib/decompress/zstd_ddict.h | 4 +- > > .../module/zstd/lib/decompress/zstd_decompress.c | 897 ++- > > .../zstd/lib/decompress/zstd_decompress_block.c | 1565 +++-- > > .../zstd/lib/decompress/zstd_decompress_block.h | 24 +- > > .../zstd/lib/decompress/zstd_decompress_internal.h | 79 +- > > sys/contrib/openzfs/module/zstd/lib/zstd.h | 1848 ++++- > > .../module/zstd/lib/{common =3D> }/zstd_errors.h | 45 +- > > sys/contrib/openzfs/module/zstd/zfs_zstd.c | 35 +- > > sys/contrib/openzfs/module/zstd/zstd-in.c | 93 +- > > sys/contrib/openzfs/rpm/Makefile.am | 1 + > > sys/contrib/openzfs/scripts/Makefile.am | 1 + > > sys/contrib/openzfs/scripts/objtool-wrapper.in | 4 +- > > sys/contrib/openzfs/scripts/spdxcheck.pl | 25 +- > > sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- > > sys/contrib/openzfs/tests/Makefile.am | 1 + > > sys/contrib/openzfs/tests/runfiles/common.run | 15 +- > > sys/contrib/openzfs/tests/runfiles/linux.run | 8 +- > > sys/contrib/openzfs/tests/runfiles/sanity.run | 3 +- > > .../openzfs/tests/test-runner/bin/zts-report.py.in | 4 - > > sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + > > .../tests/zfs-tests/callbacks/zfs_dbgmsg.ksh | 2 +- > > .../openzfs/tests/zfs-tests/callbacks/zfs_mmp.ksh | 2 +- > > sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + > > .../openzfs/tests/zfs-tests/cmd/Makefile.am | 5 +- > > .../tests/zfs-tests/cmd/checksum/sha2_test.c | 39 +- > > .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 2 +- > > sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 + > > .../openzfs/tests/zfs-tests/include/commands.cfg | 5 +- > > .../openzfs/tests/zfs-tests/include/libtest.shlib | 54 +- > > .../openzfs/tests/zfs-tests/include/tunables.cfg | 4 +- > > .../openzfs/tests/zfs-tests/tests/Makefile.am | 18 + > > .../bclone/bclone_crossfs_corner_cases.ksh | 9 + > > .../bclone/bclone_crossfs_corner_cases_limited.ksh | 9 + > > .../functional/bclone/bclone_crossfs_data.ksh | 7 + > > .../functional/bclone/bclone_crossfs_embedded.ksh | 7 + > > .../functional/bclone/bclone_diffprops_all.ksh | 28 +- > > .../bclone/bclone_diffprops_checksum.ksh | 18 +- > > .../bclone/bclone_diffprops_compress.ksh | 16 +- > > .../functional/bclone/bclone_diffprops_copies.ksh | 18 +- > > .../bclone/bclone_diffprops_recordsize.ksh | 18 +- > > .../tests/functional/bclone/bclone_prop_sync.ksh | 12 +- > > .../bclone/bclone_samefs_corner_cases.ksh | 7 + > > .../bclone/bclone_samefs_corner_cases_limited.ksh | 7 + > > .../tests/functional/bclone/bclone_samefs_data.ksh | 6 + > > .../functional/bclone/bclone_samefs_embedded.ksh | 6 + > > .../functional/block_cloning/block_cloning.kshlib | 24 - > > .../block_cloning_after_device_removal.ksh | 61 + > > .../tests/functional/cache/cache_012_pos.ksh | 5 + > > .../cli_root/zfs_clone/zfs_clone_nomount.ksh | 66 + > > .../zfs_rewrite/zfs_rewrite_skip_clone.ksh | 83 + > > .../zfs_rewrite/zfs_rewrite_skip_snapshot.ksh | 74 + > > .../zpool_create/zpool_create_tempname.ksh | 2 + > > .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + > > .../functional/cli_root/zpool_get/zpool_get.cfg | 2 + > > .../cli_root/zpool_get/zpool_get_parsable.cfg | 4 +- > > .../cli_root/zpool_set/vdev_set_scheduler.ksh | 93 + > > .../zfs_send_delegation_user/zfs_send_usertest.ksh | 11 +- > > .../functional/events/zed_synchronous_zedlet.ksh | 6 +- > > .../zfs-tests/tests/functional/l2arc/l2arc.cfg | 3 +- > > .../functional/l2arc/l2arc_dwpd_ratelimit_pos.ksh | 138 + > > .../functional/l2arc/l2arc_dwpd_reimport_pos.ksh | 169 + > > .../l2arc/l2arc_multidev_scaling_pos.ksh | 162 + > > .../l2arc/l2arc_multidev_throughput_pos.ksh | 133 + > > .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + > > .../tests/functional/lease/lease_setlease.ksh | 44 + > > .../zfs-tests/tests/functional/lease/setup.ksh | 27 + > > .../tests/zfs-tests/tests/functional/mmp/mmp.cfg | 6 +- > > .../zfs-tests/tests/functional/mmp/mmp.kshlib | 47 +- > > .../tests/functional/mmp/mmp_active_import.ksh | 42 +- > > .../tests/functional/mmp/mmp_concurrent_import.ksh | 133 + > > .../tests/functional/mmp/mmp_exported_import.ksh | 16 +- > > .../zfs-tests/tests/functional/mmp/mmp_hostid.ksh | 8 +- > > .../tests/functional/mmp/mmp_inactive_import.ksh | 20 +- > > .../zfs-tests/tests/functional/mmp/mmp_on_off.ksh | 4 +- > > .../tests/functional/mmp/mmp_on_thread.ksh | 4 +- > > .../tests/functional/mmp/mmp_on_uberblocks.ksh | 14 +- > > .../zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh | 3 +- > > .../tests/functional/mmp/mmp_reset_interval.ksh | 8 +- > > .../functional/mmp/mmp_write_distribution.ksh | 2 +- > > .../tests/functional/mmp/mmp_write_uberblocks.ksh | 4 +- > > .../tests/functional/mmp/multihost_history.ksh | 2 + > > .../tests/functional/mount/mount_loopback.ksh | 3 +- > > .../zfs-tests/tests/functional/pam/pam_basic.ksh | 58 + > > .../tests/functional/pam/pam_change_unmounted.ksh | 13 +- > > .../tests/functional/pam/pam_nounmount.ksh | 14 +- > > .../tests/zfs-tests/tests/functional/pam/setup.ksh | 11 + > > .../tests/functional/pam/utilities.kshlib.in | 6 + > > .../rsend/send_large_blocks_incremental.ksh | 83 + > > .../functional/rsend/send_large_blocks_initial.ksh | 86 + > > .../rsend/send_large_microzap_incremental.ksh | 91 + > > .../rsend/send_large_microzap_transitive.ksh | 100 + > > .../tests/functional/snapshot/snapshot_018_pos.ksh | 52 +- > > .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 5 +- > > sys/contrib/openzfs/udev/Makefile.am | 1 + > > sys/modules/dtrace/fasttrap/Makefile | 2 +- > > sys/modules/zfs/Makefile | 8 +- > > sys/modules/zfs/zfs_config.h | 24 +- > > sys/modules/zfs/zfs_gitrev.h | 2 +- > > 513 files changed, 34137 insertions(+), 10963 deletions(-) > >=20 > > diff --cc cddl/lib/libzfs/Makefile > > index a034118a6f5b,000000000000..8f364d2c2bb1 > > mode 100644,000000..100644 > > --- a/cddl/lib/libzfs/Makefile > > +++ b/cddl/lib/libzfs/Makefile > > @@@ -1,109 -1,0 +1,105 @@@ > > +.PATH: ${ZFSTOP}/module/icp > > +.PATH: ${ZFSTOP}/module/zcommon > > +.PATH: ${ZFSTOP}/lib/libzfs > > +.PATH: ${ZFSTOP}/lib/libzfs/os/freebsd > > - .PATH: ${ZFSTOP}/lib/libshare > > +.PATH: ${ZFSTOP}/include > > +.PATH: ${ZFSTOP}/module/zstd > > +.PATH: ${ZFSTOP}/module/zstd/lib > > + > > +PACKAGE=3D zfs > > +LIB_PACKAGE=3D > > + > > +LIB=3D zfs > > +LIBADD=3D \ > > + avl \ > > + bsdxml \ > > + crypto \ > > + geom \ > > + m \ > > + md \ > > + nvpair \ > > + pthread \ > > + rt \ > > + umem \ > > + util \ > > + z \ > > + zfs_core \ > > + zutil > > + > > +INCS=3D libzfs.h > > +USER_C =3D \ > > - libzfs_changelist.c \ > > - libzfs_config.c \ > > - libzfs_crypto.c \ > > - libzfs_dataset.c \ > > - libzfs_diff.c \ > > - libzfs_import.c \ > > - libzfs_iter.c \ > > - libzfs_mount.c \ > > - libzfs_pool.c \ > > - libzfs_sendrecv.c \ > > - libzfs_status.c \ > > - libzfs_util.c > > ++ libzfs_changelist.c \ > > ++ libzfs_config.c \ > > ++ libzfs_crypto.c \ > > ++ libzfs_dataset.c \ > > ++ libzfs_diff.c \ > > ++ libzfs_import.c \ > > ++ libzfs_iter.c \ > > ++ libzfs_mount.c \ > > ++ libzfs_pool.c \ > > ++ libzfs_sendrecv.c \ > > ++ libzfs_share.c \ > > ++ libzfs_share_nfs.c \ > > ++ libzfs_status.c \ > > ++ libzfs_util.c \ > > ++ os/freebsd/libzfs_share_nfs.c \ > > ++ os/freebsd/libzfs_share_smb.c > > + > > +# FreeBSD > > +USER_C +=3D \ > > + libzfs_compat.c \ > > + libzfs_zmount.c > > + > > - # libshare > > - USER_C +=3D \ > > - libshare.c \ > > - nfs.c \ > > - os/freebsd/nfs.c \ > > - os/freebsd/smb.c > > -=20 > > +KERNEL_C =3D \ > > + cityhash.c \ > > + zfeature_common.c \ > > + zfs_comutil.c \ > > + zfs_deleg.c \ > > + zfs_fletcher.c \ > > + zfs_fletcher_superscalar.c \ > > + zfs_fletcher_superscalar4.c \ > > + zfs_namecheck.c \ > > + zfs_prop.c \ > > + zfs_valstr.c \ > > + zpool_prop.c \ > > + zprop_common.c > > + > > +ARCH_C =3D > > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386" > > +ARCH_C +=3D zfs_fletcher_intel.c \ > > + zfs_fletcher_sse.c=20 > > +CFLAGS +=3D -DHAVE_SSE2 > > +.endif > > +.if ${MACHINE_ARCH} =3D=3D "amd64" > > +ARCH_C +=3D zfs_fletcher_avx512.c > > +CFLAGS+=3D -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F > > +.endif > > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > > +ARCH_C +=3D zfs_fletcher_aarch64_neon.c > > +.endif > > + > > +SRCS=3D $(USER_C) $(KERNEL_C) $(ARCH_C) > > + > > +WARNS?=3D 2 > > +SHLIB_MAJOR=3D 4 > > +CSTD=3D c99 > > +CFLAGS+=3D -DIN_BASE > > +CFLAGS+=3D -I${ZFSTOP}/include > > +CFLAGS+=3D -I${ZFSTOP}/include/os/freebsd > > +CFLAGS+=3D -I${ZFSTOP}/lib/libspl/include > > +CFLAGS+=3D -I${ZFSTOP}/lib/libspl/include/os/freebsd > > +CFLAGS+=3D -I${ZFSTOP}/lib/libshare > > +CFLAGS+=3D -I${ZFSTOP}/lib/libzpool/include > > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/ck/include > > +CFLAGS+=3D -I${SRCTOP}/sys > > +CFLAGS+=3D -I${SRCTOP}/cddl/compat/opensolaris/include > > +CFLAGS+=3D -I${ZFSTOP}/module/icp/include > > +CFLAGS+=3D -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h > > +CFLAGS+=3D -DHAVE_ISSETUGID > > +CFLAGS+=3D -DHAVE_EXECVPE > > +CFLAGS+=3D -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > > +CFLAGS+=3D -DSYSCONFDIR=3D\"/etc\" > > +CFLAGS+=3D -DPKGDATADIR=3D\"/usr/share/zfs\" > > +CFLAGS+=3D -DZFSEXECDIR=3D\"${LIBEXECDIR}/zfs\" > > + > > +.include > > diff --cc cddl/lib/libzpool/Makefile > > index ade864790f1c,000000000000..74a5f6ccb438 > > mode 100644,000000..100644 > > --- a/cddl/lib/libzpool/Makefile > > +++ b/cddl/lib/libzpool/Makefile > > @@@ -1,343 -1,0 +1,342 @@@ > > +.PATH: ${ZFSTOP}/lib/libzpool > > + > > +# ZFS_COMMON_SRCS > > +.PATH: ${ZFSTOP}/module/zfs > > +.PATH: ${ZFSTOP}/module/zcommon > > +.PATH: ${ZFSTOP}/module/unicode > > +# LUA_SRCS > > +.PATH: ${ZFSTOP}/module/lua > > +# ZSTD_SRCS > > +.PATH: ${ZFSTOP}/module/zstd > > +.PATH: ${ZFSTOP}/module/zstd/lib/common > > +.PATH: ${ZFSTOP}/module/zstd/lib/compress > > +.PATH: ${ZFSTOP}/module/zstd/lib/decompress > > + > > +.if > > exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_A= RCH}/opensolaris_atomic.S) > > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_= ARCH} > > +ATOMIC_SRCS=3D opensolaris_atomic.S +ACFLAGS+=3D -Wa,--noexecstack > > +.else > > +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern > > +ATOMIC_SRCS=3D opensolaris_atomic.c > > +.endif > > + > > +.if ${MACHINE_ARCH} =3D=3D "powerpc" > > +# Don't waste GOT entries on small data. > > +PICFLAG=3D -fPIC > > +.endif > > + > > +PACKAGE=3D zfs > > +LIB_PACKAGE=3D > > + > > +LIB=3D zpool > > + > > +USER_C =3D \ > > + arc_os.c \ > > + kernel.c \ > > + util.c \ > > + zfs_debug.c > > + > > +.PATH: ${ZFSTOP}/module/os/linux/zfs > > + > > +KERNEL_C =3D \ > > + simd_stat.c \ > > + zfeature_common.c \ > > + zfs_comutil.c \ > > + zfs_deleg.c \ > > + zfs_fletcher.c \ > > + zfs_fletcher_superscalar.c \ > > + zfs_fletcher_superscalar4.c \ > > + zfs_namecheck.c \ > > + zfs_prop.c \ > > + zfs_zstd.c \ > > + zpool_prop.c \ > > + zprop_common.c \ > > + abd.c \ > > + abd_os.c \ > > + aggsum.c \ > > + arc.c \ > > + blake3_zfs.c \ > > + blkptr.c \ > > + bplist.c \ > > + bpobj.c \ > > + bptree.c \ > > + bqueue.c \ > > + btree.c \ > > + brt.c \ > > + cityhash.c \ > > + dbuf.c \ > > + dbuf_stats.c \ > > + ddt.c \ > > + ddt_log.c \ > > + ddt_stats.c \ > > + ddt_zap.c \ > > + dmu.c \ > > + dmu_diff.c \ > > + dmu_direct.c \ > > + dmu_object.c \ > > + dmu_objset.c \ > > + dmu_recv.c \ > > + dmu_redact.c \ > > + dmu_send.c \ > > + dmu_traverse.c \ > > + dmu_tx.c \ > > + dmu_zfetch.c \ > > + dnode.c \ > > + dnode_sync.c \ > > + dsl_bookmark.c \ > > + dsl_dataset.c \ > > + dsl_deadlist.c \ > > + dsl_deleg.c \ > > + dsl_dir.c \ > > + dsl_crypt.c \ > > + dsl_pool.c \ > > + dsl_prop.c \ > > + dsl_scan.c \ > > + dsl_synctask.c \ > > + dsl_destroy.c \ > > + dsl_userhold.c \ > > + edonr_zfs.c \ > > + entropy_common.c \ > > + error_private.c \ > > + fm.c \ > > + fse_compress.c \ > > + fse_decompress.c \ > > + gzip.c \ > > + hist.c \ > > + hkdf.c \ > > + huf_compress.c \ > > + huf_decompress.c \ > > + lzjb.c \ > > + lz4.c \ > > + lz4_zfs.c \ > > + metaslab.c \ > > + mmp.c \ > > + multilist.c \ > > + objlist.c \ > > + pathname.c \ > > + pool.c \ > > + range_tree.c \ > > + refcount.c \ > > + rrwlock.c \ > > + sa.c \ > > + sha2_zfs.c \ > > + skein_zfs.c \ > > + spa.c \ > > + spa_checkpoint.c \ > > + spa_config.c \ > > + spa_errlog.c \ > > + spa_history.c \ > > + spa_log_spacemap.c \ > > + spa_misc.c \ > > + spa_stats.c \ > > + space_map.c \ > > + space_reftree.c \ > > + txg.c \ > > ++ u8_textprep.c \ > > + trace.c \ > > + uberblock.c \ > > + unique.c \ > > + vdev.c \ > > + vdev_draid.c \ > > + vdev_draid_rand.c \ > > + vdev_file.c \ > > + vdev_indirect_births.c \ > > + vdev_indirect.c \ > > + vdev_indirect_mapping.c \ > > + vdev_initialize.c \ > > + vdev_label.c \ > > + vdev_label_os.c \ > > + vdev_mirror.c \ > > + vdev_missing.c \ > > + vdev_queue.c \ > > + vdev_raidz.c \ > > + vdev_raidz_math_aarch64_neon.c \ > > + vdev_raidz_math_aarch64_neonx2.c \ > > + vdev_raidz_math_avx2.c \ > > + vdev_raidz_math_avx512bw.c \ > > + vdev_raidz_math_avx512f.c \ > > + vdev_raidz_math.c \ > > + vdev_raidz_math_scalar.c \ > > + vdev_rebuild.c \ > > + vdev_removal.c \ > > + vdev_root.c \ > > + vdev_trim.c \ > > - xxhash.c \ > > + zap.c \ > > + zap_leaf.c \ > > + zap_micro.c \ > > + zcp.c \ > > + zcp_get.c \ > > + zcp_global.c \ > > + zcp_iter.c \ > > + zcp_set.c \ > > + zcp_synctask.c \ > > + zfeature.c \ > > + zfs_byteswap.c \ > > + zfs_chksum.c \ > > + zfs_crrd.c \ > > + zfs_debug_common.c \ > > + zfs_fm.c \ > > + zfs_fuid.c \ > > + zfs_impl.c \ > > + zfs_sa.c \ > > + zfs_znode.c \ > > + zfs_racct.c \ > > + zfs_ratelimit.c \ > > + zfs_rlock.c \ > > + zil.c \ > > + zio.c \ > > + zio_checksum.c \ > > + zio_compress.c \ > > + zio_crypt.c \ > > + zio_inject.c \ > > + zle.c \ > > + zrlock.c \ > > + zstd_common.c \ > > + zstd_compress.c \ > > + zstd_compress_literals.c \ > > + zstd_compress_sequences.c \ > > + zstd_compress_superblock.c \ > > + zstd_ddict.c \ > > + zstd_decompress.c \ > > + zstd_decompress_block.c \ > > + zstd_double_fast.c \ > > + zstd_fast.c \ > > + zstd_lazy.c \ > > + zstd_ldm.c \ > > + zstd_opt.c \ > > ++ zstd_preSplit.c \ > > + zthr.c > > + > > +ARCH_C =3D > > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "i386" > > +ARCH_C +=3D vdev_raidz_math_sse2.c \ > > + vdev_raidz_math_ssse3.c \ > > + zfs_fletcher_intel.c \ > > + zfs_fletcher_sse.c=20 > > +CFLAGS +=3D -DHAVE_SSE2 -DHAVE_SSE3 > > +.endif > > +.if ${MACHINE_ARCH} =3D=3D "amd64" > > +ARCH_C +=3D zfs_fletcher_avx512.c > > +CFLAGS+=3D -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ > > + -DHAVE_AVX512BW > > +.endif > > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > > +ARCH_C +=3D zfs_fletcher_aarch64_neon.c > > +.endif > > + > > +LUA_C =3D \ > > + lapi.c \ > > + lauxlib.c \ > > + lbaselib.c \ > > + lcode.c \ > > + lcompat.c \ > > + lcorolib.c \ > > + lctype.c \ > > + ldebug.c \ > > + ldo.c \ > > + lfunc.c \ > > + lgc.c \ > > + llex.c \ > > + lmem.c \ > > + lobject.c \ > > + lopcodes.c \ > > + lparser.c \ > > + lstate.c \ > > + lstring.c \ > > + lstrlib.c \ > > + ltable.c \ > > + ltablib.c \ > > + ltm.c \ > > + lvm.c \ > > + lzio.c > > + > > - UNICODE_C =3D u8_textprep.c > > -=20 > > - SRCS+=3D ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} > > ++SRCS+=3D ${USER_C} ${KERNEL_C} ${LUA_C} ${ARCH_C} > > + > > *** 15577 LINES SKIPPED *** > > =20 >=20 > buildworld failure after commit, immintrin.h not found error: >=20 > [...] > In file included from /usr/src/sys/contrib/openzfs/module/zstd/lib/common= /fse.h:230: > /usr/src/sys/contrib/openzfs/module/zstd/lib/common/bitstream.h:38:14: fa= tal error: > 'immintrin.h' file not found 38 | # include /* support= for bextr > (experimental)/bzhi */ >=20 > Kind regards, > oh >=20 >=20 Correction: buildkernel fails. ZFS is, btw, built statically into the kernel. --=20 A FreeBSD user --Sig_/u=PR.TkrjpEx8p4V+ljeX27 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCabZepAAKCRCxzvs8Oqok r0Q7AQDbCfolWwG8r7FQOR7aG0zatbuPuA3cWwiPiAfogdl+FAEAjl2pcO4P4geO dyqKAxjSBCDwI19ALM66gKXt7MEB0gA= =XJGM -----END PGP SIGNATURE----- --Sig_/u=PR.TkrjpEx8p4V+ljeX27-- From nobody Sun Mar 15 15:18:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYhgk0R4nz6Vxf4 for ; Sun, 15 Mar 2026 15:18: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYhgj5slTz3DJy for ; Sun, 15 Mar 2026 15:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773587905; 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=OzSO2tY/pnSKOCu2STBP5E/RfOxtCNB4D8f92nbrBrs=; b=JTdyTH1NDL6rfkSRTUx05ZW/bbKl67y+Wdh67PyJMw37muqPVKJtoO3ZeI1U+JikMBEhVN aEh4QtvW/yvWCnotzKqzEqLEWxXiUydKi+Ra+9rPPgmUS94CCllgvbyuqK51q+NxPqmuRQ jRwpUX545hjEt2akv4t0UI6B5XRSFm6ABI/KYvqnJPgU8AY5qRHvZPzrcK9OJBITKXlH9M NPRzh9jZUCOcEM7PT+hEeLJfcxJsDs+taNaj3sg2/yJtcDg6sYyR3OUpWGBDMwdGlvtly4 ZeQK0L1cFFDVMeAU/Pidp0GhHj/O4q4NIa7wH3YOkqh/GrthCSLR+muoOhaWyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773587905; a=rsa-sha256; cv=none; b=aHcuJ9WXdlrTqN+vALm9TyXSbDTwBROyAfIW+QBWWQOSxpjG4dT0RxBazXEIOum4vnxAQC Ei/GAGyJrfbfpZqvWOHdU5XqqE6vm35QKQdjtb8DFK55COPMxEtAlruwGi2A3rKVu/Y0Il TpIis9HLu65vAuT8gr8vTnNXo14EeNcMavkL/7+BEyfyElHrulfk7qsJ5PTGB1gpPQ2ewq q6g+DCnsjbO/h8GuL7NIsJitvrdpbIQtZavtLc7sJarI6LrxDkjRNkXf+rWNPRfKIAeuF8 m4OUOe1rJEB8kVbJEqKgLr6ZLW0CVvilGQ9O12sOg4VARnIVjsA9XDT2ZHzRrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773587905; 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=OzSO2tY/pnSKOCu2STBP5E/RfOxtCNB4D8f92nbrBrs=; b=h/TPXNedpbTBJsAe+Eq132I2bcCMoZLS3jLu5vdIef5lIeT9yKCV/La/F6QUUBhD/+W4bc 9YjrhURfE8lTB1x6om2gcX0UC8v9GzBLI9qe2Z5f0SmlddvJz+E1kVXa8ef8n2ExL7FBDN feWWcoBrQ+pkfxme/jyjScm9qTD1n1mZJfuNf8Z/XXtB6rPHah49p1J5J5TKoJtBHWXzXX aWZgFPXKScQX/1scCNVGWOPp9rC3C4V3t7AxbmXzWMSd1YBLojmZza8LGk2AwiZ+rfjL2v s6p7qMD0Qc8sqkgNCwnmHwUC/RypfF5r4REPAlgRsd8yIsrP/g6rRSsQnTbfug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYhgj4rRFztj7 for ; Sun, 15 Mar 2026 15:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45c01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 15:18:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christos Longros From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 462a1f6197fa - main - resolver.5: document six previously undocumented options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 462a1f6197fa3de63e0eca2835b1d5b0bc6a3bbb Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 15:18:20 +0000 Message-Id: <69b6cdbc.45c01.d733e6b@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=462a1f6197fa3de63e0eca2835b1d5b0bc6a3bbb commit 462a1f6197fa3de63e0eca2835b1d5b0bc6a3bbb Author: Christos Longros AuthorDate: 2026-03-15 15:17:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-15 15:17:08 +0000 resolver.5: document six previously undocumented options Document the edns0, inet6, insecure1, insecure2, no-check-names, and rotate options which are parsed by res_init(3) but were not described in the resolver(5) man page. MFC after: 1 week Signed-off-by: Christos Longros Reviewed by: des Differential Revision: https://reviews.freebsd.org/D55864 --- share/man/man5/resolver.5 | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5 index 9f8c0d689a0a..4dd3f8c93a99 100644 --- a/share/man/man5/resolver.5 +++ b/share/man/man5/resolver.5 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 23, 2022 +.Dd March 15, 2026 .Dt RESOLVER 5 .Os .Sh NAME @@ -170,6 +170,38 @@ the allowed maximum is .Dv RES_MAXRETRY (see .In resolv.h ) . +.It Sy edns0 +Sets +.Dv RES_USE_EDNS0 . +Attach an OPT pseudo-RR for the EDNS0 extension, +as specified in RFC 2671. +This allows the resolver to advertise a larger UDP receive buffer size, +permitting responses larger than the original 512-byte limit. +.It Sy inet6 +Sets +.Dv RES_USE_INET6 . +Causes +.Xr gethostbyname 3 +to look up AAAA records before A records +and to map IPv4 responses into IPv6 addresses. +The use of this option is discouraged. +.It Sy insecure1 +Sets +.Dv RES_INSECURE1 . +Disables the check that the response was received from the +same server to which the query was sent. +Use of this option is a security risk and is not recommended. +.It Sy insecure2 +Sets +.Dv RES_INSECURE2 . +Disables the check that the response contains a query +matching the one that was sent. +Use of this option is a security risk and is not recommended. +.It Sy no-check-names +Sets +.Dv RES_NOCHECKNAME . +Disables the check of incoming host names for invalid characters +such as underscore, non-ASCII, or control characters. .It Sy no_tld_query tells the resolver not to attempt to resolve a top level domain name, that is, a name that contains no dots. @@ -179,6 +211,12 @@ the resolver from obeying the standard and .Sy search rules with the given name. +.It Sy rotate +Sets +.Dv RES_ROTATE . +Causes the resolver to round-robin among the configured name servers, +distributing the query load instead of always trying the first +listed server. .It Sy reload-period : Ns Ar n The resolver checks the modification time of .Pa /etc/resolv.conf From nobody Sun Mar 15 17:37:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYlmZ4kSmz6V8mw for ; Sun, 15 Mar 2026 17:37: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYlmZ303Sz3Tfc for ; Sun, 15 Mar 2026 17:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773596270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9gxohmscyorIEx8vh5iZM43nhRaaGAjcT2gx2SRic0=; b=p1DGlIHBBBwR7NIhZ5eu/6e16IhEZOt9LCWhsXJAcWQhDdmn0pwBytm2odwhY+ZR4CIhcN RRGbeFVWBSqiALVGr7cRLmBgw1LQfU8wV0Ueyq6GchpNQgzFSXJFGbkpx7fdn1fO4KVQWF BOQ2C6WDZaXFBCeerJpvitj6xgAv79W4OXPSnKC5dmGOwpIn7+BlK1VZykEKH2Rl0stU2y PoPSSVfW65lnooFMoEfmEN6a4KZh2Nru5jaoCF/GleqYB3yEbFZIH85i8lv3APVOC3MXPA AIi5e2GDgIFioqYhlBIZnCpDS2/uVHc/L8h4DAzF1FvGh4MrwHzH2xl85kiAyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773596270; a=rsa-sha256; cv=none; b=vyYEelrbDjVd963hJzR9klUqdYQ15TOrpJMkThoEeqwnyxU+G6eKgmoCdwPUNqLKk894WF AUCoE0tra7S3I/QE8vA/Oz+tndY6y+DBGX0AE2dXOlJJTWTBGWbfrCIpT1l+bdjpIletOl T75eXX9HEOShfwevRefmLs9/qMHPr1E+4tBhzqEcxnw0zy8G5YgLGdDEpmppaaQlPMCCuz 6G0OndZnFQwnostHxGooTWDP+0M9/8udjxKmZc7SSVruDlLUg50WmYkWjki7SAxZ6Mvot2 NoUD+CTN0Xzu6J4OC7yYjFxMsHFPCoxhs6BkcLwHbcSXwOSm54fACDMUXWFHNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773596270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9gxohmscyorIEx8vh5iZM43nhRaaGAjcT2gx2SRic0=; b=HKpx5d3UG7INWQxi9L03Y9Lm0liIx2LEIlMtIpRjsOEat15Zz7f8C2hIT9+UPSrp5uH3L/ u2ZU6mYUDuHgWQqVr5cdVKMn3TU5JNWKJKCv0DKFRwtouxYPpIl9e9iKz1/BvKjs4G+lVV TORUmMJE1zKl1Gq2YaoPajV64V+UXMV5kx3F2U3ffBOLdBYzTXH9jDs95vnpxC3+d484BE a3zCgJfXDC3HOCjUYTFEw70m7pMXb00NLKviBW3neG20EkB8UXSFJ70fVSR85P/c2THRkO T1tQjzYVCqhEteDsaBpKrv5nUfHQRQKDyPcVoIPFA+JyZoP3jv5OnwwRCAIp6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYlmZ1jWzzyMR for ; Sun, 15 Mar 2026 17:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24b2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 17:37:45 +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: 356415aaaa8c - main - Unbreak LINT after ZFS import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 356415aaaa8caa18a76ea74eed5c7de6e4d3b5fd Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 17:37:45 +0000 Message-Id: <69b6ee69.24b2f.421654a2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=356415aaaa8caa18a76ea74eed5c7de6e4d3b5fd commit 356415aaaa8caa18a76ea74eed5c7de6e4d3b5fd Author: Dag-Erling Smørgrav AuthorDate: 2026-03-15 17:36:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-15 17:36:27 +0000 Unbreak LINT after ZFS import Fixes: 8a62a2a5659d ("zfs: merge openzfs/zfs@f8e5af53e") --- sys/conf/files | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index bdba00188d10..c6151b0b73cf 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -742,6 +742,7 @@ dev/acpi_support/acpi_ibm.c optional acpi_ibm acpi dev/acpi_support/acpi_panasonic.c optional acpi_panasonic acpi dev/acpi_support/acpi_sbl_wmi.c optional acpi_sbl_wmi acpi dev/acpi_support/acpi_sony.c optional acpi_sony acpi +dev/acpi_support/acpi_system76.c optional acpi_system76 acpi dev/acpi_support/acpi_toshiba.c optional acpi_toshiba acpi dev/acpi_support/atk0110.c optional aibs acpi dev/acpica/Osd/OsdDebug.c optional acpi @@ -1850,6 +1851,7 @@ dev/iicbus/rtc/ds1307.c optional ds1307 dev/iicbus/rtc/ds13rtc.c optional ds13rtc | ds133x | ds1374 dev/iicbus/rtc/ds1672.c optional ds1672 dev/iicbus/rtc/ds3231.c optional ds3231 +dev/iicbus/rtc/hym8563.c optional hym8563 iicbus fdt dev/iicbus/rtc/isl12xx.c optional isl12xx dev/iicbus/rtc/nxprtc.c optional nxprtc | pcf8563 dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt @@ -3575,6 +3577,7 @@ dev/xdma/xdma_mbuf.c optional xdma dev/xdma/xdma_queue.c optional xdma dev/xdma/xdma_sg.c optional xdma dev/xdma/xdma_sglist.c optional xdma +dev/xen/acpi/xen-acpi.c optional xenhvm dev/xen/balloon/balloon.c optional xenhvm dev/xen/blkfront/blkfront.c optional xenhvm dev/xen/blkback/blkback.c optional xenhvm From nobody Sun Mar 15 18:48:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYnL26NRGz6VDt7 for ; Sun, 15 Mar 2026 18:48: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYnL23ylFz3dmL for ; Sun, 15 Mar 2026 18:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773600506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tiIhkxtwEUtCcByvooGrlqGpZn+S/Q9zqWCLNWIHYYI=; b=THXvh3vN/455xroIByAn7HSI8eiDPMA3fBZbnKYmPEdRbS7XpDgH6DGeKDMLcN38e8OIsF EyUMdnmcbjX6sxJUspboH5YDTUMrzUnHh5NDeCw/i9IOTzxKnxXuYRCBqzb8WLgy1gyEur XWI4Ou0JxeyzheekPzn/GwJEnp1MS0moGrWImTl2o+wejC1qw3075i3wur1UgzL0Pv0/t3 PZaRiBZgEGDk6lkxCa2B4hs7DZXYWymjUqcrzp4VY7x+IIjqUzTihK9IQihi09Io4WC/QX 8FWEwUBMRYq7KYP+3VamgRGXOo0kJkusB4n8aClIvkTnhwALLv8UNTcrs/tUeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773600506; a=rsa-sha256; cv=none; b=Fbd41VwblasSqAD/fu0qQ4PcLA9JiM8Cp4RquwzxQj4gAAWv9p0Z3oYeH7qRIX5dqWRHW2 LOVIiWoEYXc8a+EIOEoVeJ2X3cIQx0KhJF3+MEKN2CRHU78vcGSvFtg5AUVMjaBZx1jZcP smLTIt2pSi8xo9m1LDfBgCskNqLJQ8ZUH74GEu4+4iZZBvdmUXijV32OHS66ln7JCinxWR pNBYqZffghIKMHJUQC8hpkL9Rt7+8YKp2m/FuZKdsBLzPbZG/DqtRjxr5SRFA3+RdjEbSn nVae7XlgBYN3vXfmfwtEM41aqTWJc3h9M8yTqzyP4+RDTyXcQ0u+vD/3D7s4Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773600506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tiIhkxtwEUtCcByvooGrlqGpZn+S/Q9zqWCLNWIHYYI=; b=wXORPRKNIMOO62BlB4EKvCReQxHgOCy5TDtIhXxjLtX5RnDdtTlpZg6hBF32Sqln8PqJ+h 9FJQJmpAtWAkibRqqSFhvcsGoW7ymFGJ5QPBJa7uZ7FXKhughtIlH/bY5bxzmJ1+dJ6ROf kQCWqDvBiMJ/vrbzocvniPMda7Htye6qfD0t1Put3L77Q/A9IEpY1fvrD31IMrwo4MJ69X +yW1eY53Q/tIi+2TGpZPdh3CIDL2GpbAKzpK3FSQhUXmkI44OkUaUxJPVtmMj5JX0hJpCp OpaiMu5pqmu8MV0RyI4Pj+Nn1D/ucWalKvvU9lSogDf8pMllBUY6+IneYKinwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYnL23VvZz10f4 for ; Sun, 15 Mar 2026 18:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34243 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 18:48:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 0bebad8d072b - main - bsd.own.mk: Deorbit compat include of bsd.compiler.mk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bebad8d072bb7abef1cea0d8c8d04d500913adf Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 18:48:21 +0000 Message-Id: <69b6fef5.34243.6b7d7224@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bebad8d072bb7abef1cea0d8c8d04d500913adf commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-03-15 18:35:50 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-03-15 18:47:35 +0000 bsd.own.mk: Deorbit compat include of bsd.compiler.mk Commit b946bedd09d3bd1 ("Previous versions of bsd.own.mk [...]") mentions that bsd.own.mk included bsd.compiler.mk as a temporary workaround and was destined to be removed in FreeBSD 12. Do that now. PR: 203540 Reviewed by: bnovkov, imp Approved by: bnovkov (mentor) Differential Revision: https://reviews.freebsd.org/D55867 --- share/mk/bsd.own.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 4dffe9723a9e..01d41ae5ae6d 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -291,10 +291,4 @@ TESTSBASE?= /usr/tests DEPENDFILE?= .depend -# Compat for the moment -- old bsd.own.mk only included this when _WITHOUT_SRCCONF -# wasn't defined. bsd.ports.mk and friends depend on this behavior. Remove in 12. -.if !defined(_WITHOUT_SRCCONF) -.include -.endif # !_WITHOUT_SRCCONF - .endif # !target(____) From nobody Sun Mar 15 19:11:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYnrV3WkFz6VHGF for ; Sun, 15 Mar 2026 19:11: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYnrV0dgFz3hx7 for ; Sun, 15 Mar 2026 19:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773601882; 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=MwH+doIKw2QcXda+BCHxS+PH+9ZSXEkTPNPN9fAtO64=; b=aHZUYyc7dBPw2ioMI6A5n9KEypWYELUr3rBsqjqyHDfoiUc+okjUCqo/uHOQGc1aZvD44W MbJeWwQqbKsPQ+O9Ca/KsvkeU5SH2k3DZl0N15AwdKBbTUePB8VJGDzevkaY25Bds4zUYM D0mG9h4B7lI2xfQK09zt+HK7j4/F3Y+7Cn1WG4/tdEUjeJEGwMMxE96/F/NB+y90djzRKP k1KxytJeMEvv46+Zy3wqEWtzdngQJlzZhYpHUms3NlSn/UnhAtOo6jlp+O0mQZlxAuIBhc zRqjCMdhNqeOCeUQPrQ9Ibv5Wcr6Bui6orNpYJ7csFCzKK2MJdzo4MuC70DYNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773601882; a=rsa-sha256; cv=none; b=HHTWxqBgtNIEAg6d/rnKoBBNMeNmZr4wbYpWoiSa3JGiPzK7G3BVVewW89Gtn8op609UmR jt9jbG+6J8mJ5YlK4E9z6Oy2gKt0ceHZXv00g7nu9vSrVzScBaX4O4BW3t+v9El86+Sjn3 DkKZtV/WPZjJD/G90UX10UzTS30PBxYSd4Tf1xNO6/wSPb1Fskr+/teaWk+hmiawm96mv+ 3GkIlnfZuG6rbXvdSbbMlI5hdGggQvL2GwjTvc4FKJmqaYWaJN2NW800uC1WPNX5vzoMML w+R3tQIQXx/aeoJcSnQKRrGlX2Tpmr4tRlcHPWLAmKMusGc7ylNY2aN76lCLRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773601882; 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=MwH+doIKw2QcXda+BCHxS+PH+9ZSXEkTPNPN9fAtO64=; b=BL/fwf5xS0Rkd3gVYQXsUb4nU4wb/CWuDsDpOu9Bt6dla0nnNhqlgBFp5QMmnMJJENrTr1 xoS9aS7mM3MUXE0NEFbrkTeq+lHT4RnEx2ePkrVyqrEH1QmoOBY3Wo+IfgFLDgblow3HDj qclcmN1fgTL/eUpBe7xZBhxXTxaIz0wNXS/uU8n/zqyYVrcQGNJvwRp4D/6L1o8xfpxCwK n9/rr3keI3gIVL/yu+TsMA2qELVFv4bZnANooR/kdphHXCfSO3B6c2DA+Z6bPNQYZqo1KT rUlXPE7QmY4+82bCOriDKjZ1YKN/4bKfXDP0uevP8RUGNhyMZlcbsmCTSlwsxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYnrT726Tz12C0 for ; Sun, 15 Mar 2026 19:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3750f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 19:11:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ying Xu From: Pouria Mousavizadeh Tehrani Subject: git: 2e9366982798 - main - rtlbtfw(8): Add support for Realtek 8852CE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2e9366982798144764159f9c0faced5f0e208b85 Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 19:11:21 +0000 Message-Id: <69b70459.3750f.35a5bf3e@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=2e9366982798144764159f9c0faced5f0e208b85 commit 2e9366982798144764159f9c0faced5f0e208b85 Author: Ying Xu AuthorDate: 2026-03-11 07:55:45 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-15 19:08:42 +0000 rtlbtfw(8): Add support for Realtek 8852CE Add the USB Vendor/Product ID (0x13d3:0x3612) for the new Realtek 8852CE drive to make sure it works. Signed-off-by: Ying Xu Reviewed by: pouria, wulf Pull Request: https://github.com/freebsd/freebsd-src/pull/2071 --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c | 1 + usr.sbin/bluetooth/rtlbtfw/main.c | 1 + usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c index f35712cc8f69..f5dcac0a6846 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c @@ -100,6 +100,7 @@ const STRUCT_USB_HOST_ID ubt_rtl_devs[] = { USB_VPI(0x13d3, 0x3587, 0) }, { USB_VPI(0x13d3, 0x3586, 0) }, { USB_VPI(0x13d3, 0x3592, 0) }, + { USB_VPI(0x13d3, 0x3612, 0) }, { USB_VPI(0x0489, 0xe122, 0) }, /* Realtek 8852BE Bluetooth devices */ diff --git a/usr.sbin/bluetooth/rtlbtfw/main.c b/usr.sbin/bluetooth/rtlbtfw/main.c index 58503b8087b5..37c902739206 100644 --- a/usr.sbin/bluetooth/rtlbtfw/main.c +++ b/usr.sbin/bluetooth/rtlbtfw/main.c @@ -83,6 +83,7 @@ static struct rtlbt_devid rtlbt_list[] = { { .vendor_id = 0x13d3, .product_id = 0x3587 }, { .vendor_id = 0x13d3, .product_id = 0x3586 }, { .vendor_id = 0x13d3, .product_id = 0x3592 }, + { .vendor_id = 0x13d3, .product_id = 0x3612 }, { .vendor_id = 0x0489, .product_id = 0xe122 }, /* Realtek 8852BE Bluetooth devices */ diff --git a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf index 2ef56d2af93a..0a2b33d33b18 100644 --- a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf +++ b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf @@ -110,7 +110,7 @@ notify 100 { match "subsystem" "DEVICE"; match "type" "ATTACH"; match "vendor" "0x13d3"; - match "product" "(0x3587|0x3586|0x3592)"; + match "product" "(0x3587|0x3586|0x3592|0x3612)"; action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware"; }; notify 100 { From nobody Sun Mar 15 19:36:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYpPm0N4dz6VK6P for ; Sun, 15 Mar 2026 19:36: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYpPl6zdBz3nyB for ; Sun, 15 Mar 2026 19:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773603404; 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=UIDThBQ9lDHZPbElfQlv+M382Xcg8ONBe9P401S4SIs=; b=hZslW5wZJkEVo2iVAtsAdkKAG1zd03SCpqLKg/360JHh2KWU7QLojZPwBkA9LgNiwrKtJI rMwIvDmVbvAq1u06f10BlgJt6kvs8nAhZGK1ofTsDCYvZm67M6/WxsCKvHLa6QFwsFZs1J 1xQoXx6iwUufpIYVBcxDhE7uWxPlGuHXaRT4Xphq0ygbial0HzRnv7GuBdOs4d+a9JZumE VeQ1voxvOnJYKtD3tHRFBRdaxu+/TQozPlJ9gCNtHYWXlzwZ/iuzTkTOTYQVy8sGUZRFAj 0T5ax0eutzlh5X/3ZeIsw7/Qzd+LlIZVMVTGLhsZBPeJ0pL2Kk5X3J8/DeJQPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773603404; a=rsa-sha256; cv=none; b=O3o9PmKHuTKVZwD7tv3QHv10vseR9Wxwpy9ZjzVYmJvteD+FlL/36SyHNDqOsBFiB9+uYE 4y2ebdY+9FJoWxenQWXB3aCfozT0OmUACccw1VK3+is2CWKONAEw+qJ+AL8N88Dou1anyC NEviplest9T8MyouB979+FTQsH1xD/p/i3V8xvTsbAwr1gRWM2LKT4DuJLO9YwDtqQRiMQ XyIeJaqEUV3D71+FXNBDtaxx5Myk2M5zq+hxt3lDwU4uUPefSln1Au7QgamdvvEUvotpxm tVELmF/N8H/IOL3TEdAZLWbxkWaeidL+GHIbPUbOhNG7e3krvMVnADzgGRCONA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773603404; 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=UIDThBQ9lDHZPbElfQlv+M382Xcg8ONBe9P401S4SIs=; b=r+ZFhktdrIMWYwck8z4r/AfOW82h53+b0p/9XJGRrOLqSSApnzMwbvVCAwlCpvgqqDTzMX qmknq9gUN4j84GUzg/0zc7L8M+rjZGCz2PcvoLEhiFvj6wHb8UuSdsVu2aVWLSR8gBMR79 /wGYbtWuEOwSs5b8MSQp2jzvbqI8joe49ZVqQSBBEDyZnWFQxdGBXfE+kgwF8rrWCnRQAp UQjFSYr8hR6c6LRUq492hPOp8btLU1mGOJqDXM7mcojseYUp93pQEZVTSjBPcgLz4fvcrV I57obosOhIAuWRlzdcdACC6VXahQn9yc01KI2ci6h/gq8ooaqs/3/jB49fI1dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYpPl6WBpz12lY for ; Sun, 15 Mar 2026 19:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 397e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 19:36:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Salman Sarray From: Pouria Mousavizadeh Tehrani Subject: git: 424d3ca81f4e - main - backlight.8: Fix typo in man List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 424d3ca81f4e748afd90332fd6c37c944eb3b3cf Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 19:36:38 +0000 Message-Id: <69b70a46.397e4.3aeb1140@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=424d3ca81f4e748afd90332fd6c37c944eb3b3cf commit 424d3ca81f4e748afd90332fd6c37c944eb3b3cf Author: Salman Sarray AuthorDate: 2026-03-11 19:26:29 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-15 19:32:06 +0000 backlight.8: Fix typo in man Increment and decrement where swapped. Signed-off-by: Salman Sarray Reviewed by: ziaee, Christos Longros Pull Request: https://github.com/freebsd/freebsd-src/pull/2072 --- usr.bin/backlight/backlight.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/backlight/backlight.8 b/usr.bin/backlight/backlight.8 index 25fa91c0060c..291d1628d5ea 100644 --- a/usr.bin/backlight/backlight.8 +++ b/usr.bin/backlight/backlight.8 @@ -73,10 +73,10 @@ A trailing .Dq % is valid. .It Cm incr Ns | Ns Cm + Op Ar value -Decrement the backlight level. +Increment the backlight level. If no value is specified a default of 10 percent is used. .It Cm decr Ns | Ns Cm - Op Ar value -Increment the backlight level. +Decrement the backlight level. If no value is specified a default of 10 percent is used. .El .Sh EXAMPLES From nobody Sun Mar 15 19:39:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYpTW3ZV4z6VJk9; Sun, 15 Mar 2026 19:39:59 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp052.goneo.de [85.220.129.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYpTV6n36z3pPW; Sun, 15 Mar 2026 19:39:58 +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 4A1FB2402A3; Sun, 15 Mar 2026 20:39:56 +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 61B96240255; Sun, 15 Mar 2026 20:39:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1773603594; 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=kAMEToCMrp6eLoNcNIhy6HmfP210MicEVTXLZtzlKJU=; b=sYXFeovPlbl3qlGdA8G1VoQyvHHe+GCwxJMKH2tPnsjx2o2PNYp6flWePxx4WWuqfmx9D/ hXS9NAmHhOY2yZ95BFkHVgrgV8skPxSeGTw+1XdB2nMehbsTikOVcaadyB85OORGgCtafy 3aztMVo+v5X7RCG94IyPoZsP05xl6ga4O9ZOBOfwxNW2fNa83UjKhn4sfLR4/hpgDECv8W zS4bVRoWWS6CMSbZpr8vzsCpUW3g6KFl3Jb9McS/2so6mp7W3ruzuOjIM1AWW/ecPgY7u6 M6jVA51xkbCKv0o0X7pVfrtTJLjNWd2DSvYtI+ZkbkGbojS0LDRCdUvsVg56zw== Received: from thor.sb211.local (dynamic-2a02-3100-2919-7102-19f0-b1be-50ca-364f.310.pool.telefonica.de [IPv6:2a02:3100:2919:7102:19f0:b1be:50ca:364f]) (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 F236D240214; Sun, 15 Mar 2026 20:39:53 +0100 (CET) Date: Sun, 15 Mar 2026 20:39:26 +0100 From: A FreeBSD User To: Mateusz Piotrowski <0mp@FreeBSD.org> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 0bebad8d072b - main - bsd.own.mk: Deorbit compat include of bsd.compiler.mk Message-ID: <20260315203858.4a77460a@thor.sb211.local> In-Reply-To: <69b6fef5.34243.6b7d7224@gitrepo.freebsd.org> References: <69b6fef5.34243.6b7d7224@gitrepo.freebsd.org> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd16.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ShGV53VhxEPKvRVy=GYujmE"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: c1da90 X-Rspamd-UID: 09f576 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Queue-Id: 4fYpTV6n36z3pPW X-Spamd-Bar: ---- --Sig_/ShGV53VhxEPKvRVy=GYujmE Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Tage des Herren Sun, 15 Mar 2026 18:48:21 +0000 Mateusz Piotrowski <0mp@FreeBSD.org> schrieb: > The branch main has been updated by 0mp: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D0bebad8d072bb7abef1cea0d8c= 8d04d500913adf >=20 > commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf > Author: Mateusz Piotrowski <0mp@FreeBSD.org> > AuthorDate: 2026-03-15 18:35:50 +0000 > Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > CommitDate: 2026-03-15 18:47:35 +0000 >=20 > bsd.own.mk: Deorbit compat include of bsd.compiler.mk > =20 > Commit b946bedd09d3bd1 ("Previous versions of bsd.own.mk [...]") > mentions that bsd.own.mk included bsd.compiler.mk as a temporary > workaround and was destined to be removed in FreeBSD 12. Do that now. > =20 > PR: 203540 > Reviewed by: bnovkov, imp > Approved by: bnovkov (mentor) > Differential Revision: https://reviews.freebsd.org/D55867 > --- > share/mk/bsd.own.mk | 6 ------ > 1 file changed, 6 deletions(-) >=20 > diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk > index 4dffe9723a9e..01d41ae5ae6d 100644 > --- a/share/mk/bsd.own.mk > +++ b/share/mk/bsd.own.mk > @@ -291,10 +291,4 @@ TESTSBASE?=3D /usr/tests > =20 > DEPENDFILE?=3D .depend > =20 > -# Compat for the moment -- old bsd.own.mk only included this when _WITHO= UT_SRCCONF > -# wasn't defined. bsd.ports.mk and friends depend on this behavior. Remo= ve in 12. > -.if !defined(_WITHOUT_SRCCONF) > -.include > -.endif # !_WITHOUT_SRCCONF > - > .endif # !target(____) >=20 This seems to break "buildkernel": [...] make[3]: /usr/src/sys/modules/Makefile:949: Variable "COMPILER_TYPE" is und= efined in make[3] in directory "/usr/src/sys/modules" make[3]: Fatal errors encountered -- cannot continue make[3]: stopped making "all" in /usr/src/sys/modules *** Error code 1 Kind regards, oh --=20 A FreeBSD user --Sig_/ShGV53VhxEPKvRVy=GYujmE Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCabcLCQAKCRCxzvs8Oqok r9w4AQCmpkFNWV3r3lhTO8cyEhcWtr+NJ/ZjeysGbq04u/dF6wD/ZHpx9rONBp8L eKE3RqxU6guFfru0xs1//w9CURmxGws= =wrDa -----END PGP SIGNATURE----- --Sig_/ShGV53VhxEPKvRVy=GYujmE-- From nobody Sun Mar 15 19:46:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYpdR6VjWz6VKmW for ; Sun, 15 Mar 2026 19:46: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYpdR5hXbz3r7k for ; Sun, 15 Mar 2026 19:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773604011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IGrBdIynCPa3TDOcJ6rMgd5J3DaOzZu4ZERBJWdWdtw=; b=RbEoL2AK2aV52VolEhXU++HYlmh/AaWYkRGQex9WPWwDFWEGIncIQiuPoAkg8SxzvfcTf4 i6/ktdKQF19ZI21sWrD/n4eedMJ7p5ElBb+yBhgT6sT7OAV2CIpxL+qdLdvJygKMPBHWcw Nn63jbHfhDZTN7J7kCTX+VCc/5O9H9ATgBD6EX88r6EytL2SVnPT96E4kuoTNmgIL2U0Xu v4h4fd9CJX0/pmk25HoeMMOoPbArv6I7D7F3Z51Ij52de1jgeTP1WbvguJlesRihHINGK8 zKNKa4Un53713+QdX2VkFw68Wdfjh1Z5RmrVCCIvn57jJrIjmbai0OmFWO7QbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773604011; a=rsa-sha256; cv=none; b=mHfwHRSRxWeRMwqsKiu59UaRKWkuHgS4RUiD4JyZSlIJjSBBnVw6YjaWTo9U0RVzTMXj1U 5/K7exCNKHa0DXDWQxkU9ubtkyb9fOkGJ9KMSRCE4gwmCSJaHLr5ORklcNekVuxddeq1xz X+4j0Tx9QTtyTrGn7y/AU5ZzR6YejgZQ1ls8ibJZToBu68+bLla203tc9siqPsyX4CjZ5C k1czwhkqbesAskCW3QfPtXnwyXWNIRpc1jJaYXkdpHSRffMMin7omdrC1J2vcRrpaK4ury p/KXH0STll50AK4WPJWZus8YPC+eM/MisUiIR+s4k0dpO6xAA8tfAG3vAOY8eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773604011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IGrBdIynCPa3TDOcJ6rMgd5J3DaOzZu4ZERBJWdWdtw=; b=oMj1GYbVKgtAGrKxXFMLGW9XDX962lgRAQiMu4rsuNmkgkVvg2scq5QpU1ojEPdy/LrMwj G5ruAd3H44SBSoTo+vJrcjrp/K1+YH+jZeC4RHvh6boOSnop+czBLB0ce3uL4V/h8y+pSx zsrZ+H4khEc2dojdaq6vK7X3sunS/2g0Kuf1uO1cOwn7KNn+TN2KLfKIEAdGqghINPdWm/ 09cAJVbuzXCNRi54c3kh3H9DVZAhSDG0lwB5PtZ89ctUdc/2nF6ctC6JJFKN2SciifYmJH EadW+tlpBX3q9Yb5QCgeMOEi0DGC1O7dSWNQRPkz/dzQdlSc9R6duHBke/xAUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYpdR58S2z13Py for ; Sun, 15 Mar 2026 19:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38559 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 19:46:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 73f37a69f65e - main - Revert "bsd.own.mk: Deorbit compat include of bsd.compiler.mk" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73f37a69f65ef4a6243a1b80bd763271560fa677 Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 19:46:51 +0000 Message-Id: <69b70cab.38559.1f300727@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=73f37a69f65ef4a6243a1b80bd763271560fa677 commit 73f37a69f65ef4a6243a1b80bd763271560fa677 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-03-15 19:31:52 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-03-15 19:45:29 +0000 Revert "bsd.own.mk: Deorbit compat include of bsd.compiler.mk" This reverts commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf. It might be that all that's needed to fix this is to add ".include " to some Makefiles. I'll look into it soon but for now let's unbreak HEAD. Approved by: bnovkov (mentor) Differential Revision: https://reviews.freebsd.org/D55869 --- share/mk/bsd.own.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 01d41ae5ae6d..4dffe9723a9e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -291,4 +291,10 @@ TESTSBASE?= /usr/tests DEPENDFILE?= .depend +# Compat for the moment -- old bsd.own.mk only included this when _WITHOUT_SRCCONF +# wasn't defined. bsd.ports.mk and friends depend on this behavior. Remove in 12. +.if !defined(_WITHOUT_SRCCONF) +.include +.endif # !_WITHOUT_SRCCONF + .endif # !target(____) From nobody Sun Mar 15 19:47:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYpfB0GYnz6VKhN for ; Sun, 15 Mar 2026 19:47:30 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic311-24.consmr.mail.gq1.yahoo.com (sonic311-24.consmr.mail.gq1.yahoo.com [98.137.65.205]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYpf923Pmz3qyf for ; Sun, 15 Mar 2026 19:47:29 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1773604046; bh=zay+i/9qhmhkNBdyU4WruAetTmex0BRNZZn5Lz3Oiyc=; h=Date:Subject:To:References:From:In-Reply-To:From:Subject:Reply-To; b=Nu3ZUVkHTgfdWbEGKIIb0WNW3dKLr1waaR1WU9u6N/pHpmpZjy5v2zSTlmjtGtGgvGsXF5jijmwPaQqYhrzFXPaQ7GJYOK9C6R21VTqbKMGztlgq+EYYdJwz7zstlK7yLFVqueTqwEQyGVdbY/0KoLA611dFsyN9YBHSRs1AOH+63hA0sUUuWOh7MEEl4Tx1x0ReJ7zfwSOx3Q353dHGGiVjnsm5cPoqvLWhYtjUwjqa8s1Hhs5FcUlL4Vn1ySplZciUX7yB7iybF6LN+EZa3CYzX5x5luinkI3RWPwQig0iwgCnWdWxgcY9s25AjOigxF/sn6N57CelMX3E4MoLWQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1773604046; bh=JU/o2cfpLeEX8V0C5e8Piuzwx3IWTyYK/7JZxiuKE9X=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=J+ZI30HBSw/wUlCDmiRDTwNTs7K6wO04bd2113UV1hByP6tFWksbFPV6LgjPM/rxFJSmFFlBs2+m03gE2YQguGFCwMMAXsnZ9fZRVl4R0h1MgmiBi6Sm39mVLad31Jd8rWlP9MH/nyQWqO75t3ICItQX4LK2eI7WYwKs2JcksDl7hnd/O46dfks6pHCQpvESBTzaqdiCGUE+hKDlF2tMXv0NZoVoLjh7qteVnlpU6g7A8a8ij0ARx9my+8y2D6ABG3ueoVImIabsMPmZv8Lr3k+LmXU4zialF1vaGG5YvEIQ9GgCEB1uC98nJWAy9gJdiay+M4RTSzk6cpZoNVhbJA== X-YMail-OSG: CGZYIy0VM1mjtnHQKyZAlzGbaRe9R820.iMAozmHztoRtE8bSB49t_5T_UTdkmQ 6NcZ2kftQvHsVbBKlN3UyBaaSIpH02AB8CBacOqS2VR85pEjY80bIblFSKtBNLPMRhGsjgH_fUPz sB5s9r8SihsE1OlTmBKZxUxhOL4WIvgjCGwD4WTzh2OFLWuR6ME53.fQg6CEt8LuM7ghqTkJnTgL ApSzJpRhpNhj.Mlkkjt_i8lqkUZ9h_MSlLHAvLeR3UoEqsQraAPgN0gdn6XecgdCu6zGiVN.3xmP fOtxi17lpK_PGqrCtNXtBki1YgLHlYoSyMcbsJ05AmiAWhQhzBmVYZoM0nlvPilsJk25.SPdkKlJ .iQA_jfG.lPv3mVJCkj6yz8arZYhy_YoaqGO_7zGipTDEU6rwF8rACiufThbZwvmK3bGwdS.cvRy 00jnIrKAx6KkFEYkgLc5X.4lYKSQo.8fhtkOwDEGU4G22ZRFgXGP_8aIvtB132i_GoKfb._eFrdQ 2tTrnf6K5y9VPukwEffeQpLpODfN3ZVq9R9xW8C0kDfFcFg.WJRWfvEnZjKug6mJC54u7KOXvjtB QAvkx2EY8mxrTXb0w8JSDQFIoc3xCDtfsBNzm9wATn1LxGCE7mpUop2_cj7uOt5QMC3uZTdsf1Nk iEhFl5cURTYUvSEHfmZVaW37fjOOA5q5PJhUylOUlGErWUQC0rOGnF5aUMozcc1YX_vxZF5L2ZaQ av71SIODa9.pEO.UZFqM9uBDVXm07xoGqdayzbHNXBgYZQLJ7z6EjzEB270aPENQr76.mhSgbKaO eg1rBnfdUrNhffEvlwhYDAWTxWxT_.bHhCJ3XG_inqLNzQzHTFJV1ER0.ktb004a5Dg6x5BI2Xtf QVaALptM4X.hBUkX9VJsAvS.UqK4xwVITcaBBkTss2qe3fcEqG0K_XgAo8CImWZoGQRJXmGmibuB eqRgYT9TZzP53VFCo7J4.EojZUZBbiuMcWE0UvS2SOsnGJIZlMQjNvyBgjzlEDRD4OCZmJ3ajxT4 ac8c.GSi7yXGZnibL9Ld_TfwT6x9Xb8RU3MvRPXuZXyPIiDlYojuPZuRehnVpzShxtd4r7j392BP uH7dehiTsU.Nvs5kvtgHj6GRCVISt3TgMy2hi0KrvJsJUtSdiBJ5lO9FXoQpmRTHHqKurHXzSPkt oQxBkQs1WC9.pmTHyD1c5Qm0zEyWP_K0RZ654LJOfe_t04gIgLIqT9bVCjzjehdnekJT.IpWaQLe mivpplPxOuu7WgVHZmSGLlcE_HRgRmLJKJJPQAqUGvryCDcdAmtC8kV5OF74t2IRJd7KKz2uewl5 9ofJGmUNtW0EsKpcsMWfigbg7cL9Dak0N5gfzEgc54tYxP7uFulKhbtjfJTvFLK4o5BP8GwbVSEW 8RK2PSxX18BiXLDVX1FD9HN_9t9uCCbyGJA3iDbvc72ctR_ALKwuf5K31_ztWo.WBsIaJ9wpTfop 5tzgporUkRgTKnUborOrknNGx10BVhojH011ZtbWtZlyxUQxXTf8F53ETMjoUMR26PSsHy2Iq17d eZcy4eqZuVW1ZSP4bsvev9Fij0nmwyTySQyBYpktNVMG6PZ.CWF5uqOtq7xks0r944P4VO69DXBy mFWPq61VV8WZ6l.8RqeWuggxuMArpwZSSTnulzFas.hUbSZ4pov.sxB71PDuKUZOAHKlWLO8KVey wNI6E8cD3YHdIhcSAae9Vu7xf9_PAKMVE1wbm9H2T.WRsKgF.22xAD4hZ8jS2mZ1JVdRlecsdXtV PeqAuJlyLF7cazR.Ph2vNEtwVn_RntIgQpxKHOwj3lTcKLe8OtWcs8TKBmMJ7XoIxjMBuugdp500 ad3Hl5l_IHN8_TqJxBmVKhlNii3rY77ZdeH6vM0YK5k.GUv0a32LI7w.QI8UWWD70NFFEJsfUwec joA11eaZqAKHZ1jV8Z2Jsi2QPLEAKlc4MFH1SeygJBM4nIcmlVmuSKJ5xysPCnzLNew5cX69KeHd Yr6lHNEEumxro3aXR3_zE1iJPFoRCLiBxDSsJfO9kZdSWpfuHZz7rqSnU_Ivbe85CVOhu40yi_fh HoWU6w6Zthgso0iHcoX7ieOuTZQ_CRVn_jq78XrMkepOqTLUVhlQQZel_CdcQfzSMUut2wq3gPrK ipXXmid8yP8bWzIsA4sxStLvX2T.Qdtgm2o1CR1IwMQhliGZ0Of6eWejwAJiIVG4VlONVni1rAf9 kw550EY1_QavoL_U9AIJ3a3qVgZ5cBLO4UTdkNPmsrQbFIkAAcNtpy24nniRCtSfY02S_TJQGSTh iMBQEKaxHB4CElNc_m0xjbEa9FvYFh6X1WstayZwH92x1GnaY53P_KRJhFLiDAIoQgZsgMQ-- X-Sonic-MF: X-Sonic-ID: 9462269a-4881-41f3-b101-d06ba3b52f4e Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.gq1.yahoo.com with HTTP; Sun, 15 Mar 2026 19:47:26 +0000 Received: by hermes--production-gq1-6dfcf9f8b-vlhlt (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID dd2b74b4d0a4e5a11d65fdfcda43c25d; Sun, 15 Mar 2026 19:47:22 +0000 (UTC) Message-ID: <569f21d6-96f7-4ebf-a0a1-49590bde9424@yahoo.com> Date: Sun, 15 Mar 2026 12:47:21 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 0bebad8d072b - main - bsd.own.mk: Deorbit compat include of bsd.compiler.mk To: Mateusz Piotrowski <0mp@FreeBSD.org>, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <69b6fef5.34243.6b7d7224@gitrepo.freebsd.org> Content-Language: en-US From: Mark Millard In-Reply-To: <69b6fef5.34243.6b7d7224@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Mailer: WebService/1.1.25297 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo 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:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4fYpf923Pmz3qyf X-Spamd-Bar: ---- On 3/15/26 11:48, Mateusz Piotrowski wrote: > The branch main has been updated by 0mp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0bebad8d072bb7abef1cea0d8c8d04d500913adf > > commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf > Author: Mateusz Piotrowski <0mp@FreeBSD.org> > AuthorDate: 2026-03-15 18:35:50 +0000 > Commit: Mateusz Piotrowski <0mp@FreeBSD.org> > CommitDate: 2026-03-15 18:47:35 +0000 > > bsd.own.mk: Deorbit compat include of bsd.compiler.mk > > Commit b946bedd09d3bd1 ("Previous versions of bsd.own.mk [...]") > mentions that bsd.own.mk included bsd.compiler.mk as a temporary > workaround and was destined to be removed in FreeBSD 12. Do that now. > > PR: 203540 > Reviewed by: bnovkov, imp > Approved by: bnovkov (mentor) > Differential Revision: https://reviews.freebsd.org/D55867 > --- > share/mk/bsd.own.mk | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk > index 4dffe9723a9e..01d41ae5ae6d 100644 > --- a/share/mk/bsd.own.mk > +++ b/share/mk/bsd.own.mk > @@ -291,10 +291,4 @@ TESTSBASE?= /usr/tests > > DEPENDFILE?= .depend > > -# Compat for the moment -- old bsd.own.mk only included this when _WITHOUT_SRCCONF > -# wasn't defined. bsd.ports.mk and friends depend on this behavior. Remove in 12. > -.if !defined(_WITHOUT_SRCCONF) > -.include > -.endif # !_WITHOUT_SRCCONF > - > .endif # !target(____) > > This seems to have broken the CI builds. For example, from amd64's: https://ci.freebsd.org/job/FreeBSD-main-amd64-build/34829/consoleText there is: . . . > git checkout -f 0bebad8d072bb7abef1cea0d8c8d04d500913adf # timeout=10 Commit message: "bsd.own.mk: Deorbit compat include of bsd.compiler.mk" . . . make[7]: /usr/src/lib/libc/tests/gen/Makefile:10: Variable "COMPILER_FEATURES" is undefined while evaluating variable "COMPILER_FEATURES" with value "" in make[7] in directory "/usr/src/lib/libc/tests/gen" make[7]: /usr/src/lib/libc/tests/gen/Makefile:19: Variable "COMPILER_FEATURES" is undefined while evaluating variable "COMPILER_FEATURES" with value "" in make[7] in directory "/usr/src/lib/libc/tests/gen" make[7]: /usr/src/lib/libc/tests/gen/Makefile:29: Variable "COMPILER_FEATURES" is undefined while evaluating variable "COMPILER_FEATURES" with value "" in make[7] in directory "/usr/src/lib/libc/tests/gen" make[7]: /usr/src/lib/libc/tests/gen/Makefile:111: Variable "COMPILER_FEATURES" is undefined while evaluating variable "COMPILER_FEATURES" with value "" in make[7] in directory "/usr/src/lib/libc/tests/gen" . . . --- cleandir_subdir_lib/libc/tests/gen --- make[7]: Fatal errors encountered -- cannot continue make[7]: stopped making "cleandir" in /usr/src/lib/libc/tests/gen --- cleandir_subdir_lib/libdiff --- . . . The prior: https://ci.freebsd.org/job/FreeBSD-main-amd64-build/34828/consoleText with . . . > git checkout -f 356415aaaa8caa18a76ea74eed5c7de6e4d3b5fd # timeout=10 Commit message: "Unbreak LINT after ZFS import" > git rev-list --no-walk 462a1f6197fa3de63e0eca2835b1d5b0bc6a3bbb # timeout=10 . . . built just fine. Those are back-to-back commits. -- === Mark Millard marklmi at yahoo.com From nobody Sun Mar 15 20:18:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYqL61pN3z6VMhV for ; Sun, 15 Mar 2026 20:18: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYqL56Mk5z3tYJ for ; Sun, 15 Mar 2026 20:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773605917; 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=UdnCzw5XYSjD3P9HNiZKIj9YcF8pGn9PLKazM5UludI=; b=DmtKbTej0LoVF9HKCTL1vCD5zXFj1YKSSqABNrsccXoK7rpmwfBdoYnHgRglf28VkZSw9k OlvFQ1NhH6xrfJ264cpIg6wyxcZRgoM2gwDwAOvtV5wiOTtAQu4mRTUZdFdb/bgT6vkfj2 frVoDGb9U+nYyP/Yf1puQHmpP8kLDw7GvV6Rt6JI8KaTTLrtJ7EFuAorL5bCnUEhSty6dj Xa+lYE9+idlE5HkSpEi+cegjT55FFioDE7/IMqpjO/hn48WotwxyQaUWfjjN+ClxhNsnFB ZXAo6LO+o0z/jdFokSMbVehTje1lgOw/Ut2FF14aO8qLrf3c4K0YXULLD+WWCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773605917; a=rsa-sha256; cv=none; b=Fxz7UqauDgO18e34VtqTeEPDOh7PZDU7Mf7/7C1TB9tC9psEebp6bTPxiUn+Ve7t1Zkm8p 5GHuPGoMb73Orf6j0zuM+8k+DycxZ6voNDfPXZQQd7qPLrhOSa5ZP5zbrYjGGXuDi2ArdE oCcaPzwrUAeHqc1PLIgvmpXMCBvFf9aBfAF2NW8skF4lRt5fALIiaE7HyieMEHjNcuZNXS sfD9P57ul8ZpsYe/RE8AZbtLzhKtefcjAC8LkvT831mQ2mQ1neS/Z4mnN2VaB6e8WnZlmh 1ied86ZJX1q75uiJLvvfRmMzRaL1DKuXyGkVLi9FVS+Y8mZPv54oqyEuN+dfSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773605917; 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=UdnCzw5XYSjD3P9HNiZKIj9YcF8pGn9PLKazM5UludI=; b=Kuek3bGzO1jXfINRS6NmIiUN2OTvXY+TlVLZeMASg7qQa7oYMc0l7P/6oO0MFfOCYf3ytI 8vywiqC4Itng28eCH6O/2sJ9O9tfxXRK7WmM7d9pcyZld+wQOE1w1TUsNMWNrH7NLWd5MA UVET2Yutum/zlzf787pxJaw983TpdjrlU1yBPranCkO8AE73i9SSI4Jk5HXMBpo9RFsby3 W/OB3engjBoqgDQjCLcW3m949Ukin09LASnT9DRnr2OSPybDnUXXhoSvcHP08ipmrvw26M TCFYHYNWEVNXR2mglknlw4GTFQQuQMq5oUYXrVJf9Y9/vztgbsTAtSfCg1naXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYqL55FNJz13yZ for ; Sun, 15 Mar 2026 20:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ca6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 20:18:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christos Longros From: Adrian Chadd Subject: git: 9976cff55e88 - main - rge: use C style comments instead of C++ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9976cff55e8897f74d970567e61512103216cf58 Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 20:18:32 +0000 Message-Id: <69b71418.3ca6d.3f0c6d22@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=9976cff55e8897f74d970567e61512103216cf58 commit 9976cff55e8897f74d970567e61512103216cf58 Author: Christos Longros AuthorDate: 2026-03-15 20:09:56 +0000 Commit: Adrian Chadd CommitDate: 2026-03-15 20:10:59 +0000 rge: use C style comments instead of C++ FreeBSD style(9) mandates C style comments. The initial import from OpenBSD left several C++ style // comments in if_rge.c and if_rgevar.h. Replace them with proper /* */ comments. Also fix a malformed comment that mixed // with a closing */. Signed-off-by: Christos Longros Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55743 --- sys/dev/rge/if_rge.c | 4 ++-- sys/dev/rge/if_rgevar.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index b2f1311b4c87..e5297edfefbe 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -1125,7 +1125,7 @@ rge_init_locked(struct rge_softc *sc) * causing this to be initialised both from the ioctl * API and if_init() API. */ -// RGE_PRINT_ERROR(sc, "%s: called whilst running?\n", __func__); +/* RGE_PRINT_ERROR(sc, "%s: called whilst running?\n", __func__); */ return; } @@ -2409,7 +2409,7 @@ rge_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) { uint32_t crc, *hashes = arg; - // XXX TODO: validate this does addrlo? */ + /* XXX TODO: validate this does addrlo? */ crc = ether_crc32_be(LLADDR(sdl), ETHER_ADDR_LEN) >> 26; crc &= 0x3f; diff --git a/sys/dev/rge/if_rgevar.h b/sys/dev/rge/if_rgevar.h index 924133da45e3..6228f9ff229e 100644 --- a/sys/dev/rge/if_rgevar.h +++ b/sys/dev/rge/if_rgevar.h @@ -123,7 +123,6 @@ struct rge_rx { int rge_rxq_prodidx; int rge_rxq_considx; -// struct if_rxring rge_rx_ring; bus_addr_t rge_rx_list_paddr; bus_dmamap_t rge_rx_list_map; struct rge_rx_desc *rge_rx_list; @@ -137,7 +136,6 @@ struct rge_queues { void *q_ihc; int q_index; char q_name[16]; -// pci_intr_handle_t q_ih; struct rge_tx q_tx; struct rge_rx q_rx; }; @@ -171,8 +169,6 @@ struct rge_softc { bus_dma_tag_t sc_dmat_rx_buf; bus_dma_tag_t sc_dmat_stats_buf; -// pci_chipset_tag_t sc_pc; -// pcitag_t sc_tag; struct ifmedia sc_media; /* media info */ enum rge_mac_type rge_type; From nobody Sun Mar 15 23:18:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYvKx0trtz6VbxM for ; Sun, 15 Mar 2026 23:18: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYvKx0KDvz3J62 for ; Sun, 15 Mar 2026 23:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773616725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJr4GZhpMGLPTNOgz3SlfRmaZsbnP3tTMqPwgo8727E=; b=ESkgg94+m6nIgbD/P+14I7YzS7+Xa/4W5Q9eTv3fVBxIybt+k785Db7WpnBn7xTQZF8nuM KEnnV16h8Q3rvzrqAiT1xYLvSKHSfwNhI4yw4Nb/PxHomF7gt08Qv3S9+dyL87PjNFa3ZO cITbiOxh6IUPj3YaXtl+JSdBdLoq1/BJ9AOs8AXZfb5Izmy/MSdrDmXvAWvg/dT0UrdNTh 6EO3DFncSTQawNn0GI1Dii+q6OKOx4vZZXpPinS1Cxfi68WD/w7WMrok+Kld3D6+5h2Vjj 3dZdnm/bBUA0ukS5WUtnl0kiTr8/N++Wb1DBAQa8P75FXVi81Y5qw9xC9d0vQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773616725; a=rsa-sha256; cv=none; b=GnPa0kHizXpPez57b3QXo01XicOdUeeD20PY8AphluUk7OsPw1fi8oWcuIUIHJKnKlpZ5f mqnHhI2f5087L6C2l0egCcu0XNYtoRROtwNy34qTVMRXVuLBvh66TeXXOjn65q3J6VdB0a ZU1H+KOVRruf/8tx5W9KQ0jzdrkvUP5BuWBIwlsMLY4htdFitfKNfEyOXLHVMm9l8+U0aG fW4X2dDbElLEBVs+3mtQBpeusBMPBCJp8cZm5k6kw4wVJnrjlaKlpKrn7SWqMbdVG7NSVO Zm4cVR1oOlsiPD+Jz0ctdwuemNXdyi9e39R7nXl4Gcd9swNE/6KoEr51N9GMFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773616725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJr4GZhpMGLPTNOgz3SlfRmaZsbnP3tTMqPwgo8727E=; b=NUIb+OoSWOFe0krT2jIruiH8ZJfv61BRqAIj031gW6ySFLxBXVuF72/p/HAGmKLTUPjGBo lrGwiIFgjw44zxr7FzlUIKanYOcJLPTKg2NzKaK1lKdich5VXPLj0hY9Zxpp0c6q/nvYUy Jf04tR/b6hNNJw8Fe2CYsGK5sBi/GiefnC2VNQCUDtNifuSV1dn0j9Geg900u3tirYCnud UBLQ8sBhXtb36jcdJJupVLeEYqdi05aslSdqmwx6RFzirlv6+6M/9ZbHec9iKRLGatPYZ9 3b/X7BjhKQcWjeBJHLrGvmX/K9u051sG2oMJAuUbm04zMQnCpUPYGUHqGYGtPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fYvKw71rbz18bj for ; Sun, 15 Mar 2026 23:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 210f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Mar 2026 23:18:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 5f659f2b8533 - main - zfs: Fix build after merge of openzfs/zfs@f8e5af53e List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 5f659f2b8533fd6063880080618e940b3a9ee370 Auto-Submitted: auto-generated Date: Sun, 15 Mar 2026 23:18:39 +0000 Message-Id: <69b73e4f.210f1.1bd98000@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5f659f2b8533fd6063880080618e940b3a9ee370 commit 5f659f2b8533fd6063880080618e940b3a9ee370 Author: Olivier Certner AuthorDate: 2026-03-15 23:01:08 +0000 Commit: Olivier Certner CommitDate: 2026-03-15 23:16:56 +0000 zfs: Fix build after merge of openzfs/zfs@f8e5af53e The change causing it is the introduction of the test over __BMI2__ in 'module/zstd/lib/common/bitstream.h'. This is a stop-gap commit whose content needs to be upstreamed (after possibly having been improved). Fixes: 8a62a2a5659d ("zfs: merge openzfs/zfs@f8e5af53e") Sponsored by: The FreeBSD Foundation --- sys/modules/zfs/Makefile | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 5bb057ee95a2..4479c3c6eb12 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -448,28 +448,29 @@ CFLAGS.zprop_common.c= -Wno-cast-qual CFLAGS.zrlock.c= -Wno-cast-qual #zstd -CFLAGS.entropy_common.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.error_private.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.fse_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE} -CFLAGS.fse_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.huf_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.huf_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.xxhash.c+= -U__BMI__ -fno-tree-vectorize +CFLAGS.entropy_common.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.error_private.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.fse_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE} +CFLAGS.fse_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.huf_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.huf_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.xxhash.c+= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_common.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_compress_literals.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_compress_sequences.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_compress_superblock.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE} -CFLAGS.zstd_ddict.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_decompress_block.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_double_fast.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_fast.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_lazy.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} -CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_common.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_literals.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_sequences.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_superblock.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE} +CFLAGS.zstd_ddict.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_decompress_block.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_double_fast.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_fast.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_lazy.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_ldm.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_opt.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_preSplit.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} From nobody Sun Mar 15 23:22:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fYvQ01glpz6VcPM; Sun, 15 Mar 2026 23:22:16 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fYvPz4bYsz3JsF; Sun, 15 Mar 2026 23:22:15 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773616935; 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=7wSewImWeOnzjhundmIB4tvByZwuOe1K8xP4YFfZvvo=; b=r/rHiK6IBq8vegL4IgIOYlogqNVZ6Jp1Z6sqZzRnDEn8MCdkP5ZSKeP4XWs66/Txv6D2zG XthxwAR1Ns7Mao/U3vMY1/cw+Ma+pcQLzuM0CTtYPwDn8ciJf7bqDqoO6pO7UOWaaiU4E6 zfjD9D2LfoidI6BA23b8BiZRErhGZNGMytn/8lgIHJUkidSf7/tpkkgxOm30kP1HfQIDhV YYxJsqrh5JWU0zCldSVzA9A1C8hhSuJ8VZxDWqweADdUKhEf4IOvYu7dg8eYQvnO5kuGpL Bxqg2Gh9/WSylo04qtWDb4Ot8IJNhpyBigUjoIYHaewZCjejMKOhg8Snfx/Z2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773616935; a=rsa-sha256; cv=none; b=auPKAXvnm897+ntvlZ7JgGWcf7lorTH1WQ3aFa2+F/0bjQikukfXzHmhmLDAMcxHhxLe6x 0WRS8V/5ViRgMNAmcsa05Qj8e/yMX1mztP68mMde/TSJnQvTV1GDtLKaBx+WPy3eDKL/SP p3ZpzW06SPTGkoCJtqS2tLJK2Ryf5l4q4T8ySVYggzrExCO/L0q+Pn+gD70QY2SMIKV7ni PHyewDg1qUoWyPs5bkrcfxJL75xOI+/zd/LevaeBkDSKzdvgR2rVfvPVw/JSQ5q+nCAR8S /q0ypdpo3QQecY7+DNdR+fN8nF6NDpobxeJ97836JYdPY21vr8vp16qj1lq9mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773616935; 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=7wSewImWeOnzjhundmIB4tvByZwuOe1K8xP4YFfZvvo=; b=ddcatV0Pn5gWW1hlaFI0UG7rz9M+BRmMWan7nhMoBo82p2BHuoOG6FQw+z5PF3sLp9nTqK yXSzYQkS7txvV1a0ZR0jUAXUbmOmcDewto9ST0fVgk8v7/zWVszm4utjNgUckGQAdOaJPy zrLjtibEKe4zQ0L0XVy8qh9iuy22XQSeRlexVcWMc0qblL1jvP0ESP2TRusS5nhiBG0OoO /D4NLUVTzhXn4obIJrSyXdeSCwG803FYE3FtBgjF1wc9X2CPttI/ml/jDU7MXVUOEndsek d49F8t6nXihXnuxMDXOOIVhEI9qkpPkGdG/PNLHu0S86kYdQOowcDgg1om6f4Q== 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 4fYvPy6KPBzqZy; Sun, 15 Mar 2026 23:22:14 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Martin Matuska Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, src-committers@freebsd.org Subject: Re: git: 8a62a2a5659d - main - zfs: merge openzfs/zfs@f8e5af53e Date: Mon, 16 Mar 2026 00:22:07 +0100 Message-ID: <2437020.THHZn3L5Ee@ravel> In-Reply-To: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> References: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4081355.kAAoriTUSa"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart4081355.kAAoriTUSa Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: Martin Matuska Date: Mon, 16 Mar 2026 00:22:07 +0100 Message-ID: <2437020.THHZn3L5Ee@ravel> In-Reply-To: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> References: <69b561ff.39ea9.b797d91@gitrepo.freebsd.org> MIME-Version: 1.0 Hi Martin, > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8a62a2a5659d1839d8799b4274c04469d7f17c78 > > commit 8a62a2a5659d1839d8799b4274c04469d7f17c78 > Merge: f91464171d61 f8e5af53e92f > Author: Martin Matuska > AuthorDate: 2026-03-14 12:14:56 +0000 > Commit: Martin Matuska > CommitDate: 2026-03-14 12:14:56 +0000 > > zfs: merge openzfs/zfs@f8e5af53e This commit has broken the amd64 build for a day and a half. I've just discovered that there have been some mails about that already, to which nobody replied. I've just fixed it (see https://cgit.freebsd.org/src/commit/?id=5f659f2b8533). Please improve it if possible, and upstream it. Additionally, IIRC, it's not the first time an OpenZFS import causes build failures. Could you please be more careful on future imports? Thanks in advance. -- Olivier Certner --nextPart4081355.kAAoriTUSa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmm3Px8ACgkQjKEwQJce JicHUBAAlPG7h6J6udyBqmNiyjB4/AhZyWIxcDTc3Yk+2bYJp/+JO7V9YWngCw07 YXYP5i7rhJG3SAJeKFxLe/Q5h5+hKi5EMszniAJnj1lmy41B/gYSj1DQivzV41+S 43Z4mNinc9S3sz45KE0hIxaaeWD2bcsWlYuiLZ8e0KRwMsaIOutTV5uZTFQs6Ees +NpBrW1jYWPuiC6LrCiyylgLTwcBhpyTNgtnKoFLmcA72XIPbru7X0Mm4e0pDsoZ qYsBCcHqbUEi+W0xOuFMUshaPVtDaBjZal2JPsPhaRhN9OS5y4OjaGli5trh3xIW Wtw90vEl1CFGcIq8sNt6Dp6W18dc4hRaGMQYitAyzTtoizhTnXCQ6Wa+NkRx7fGi TlJzRSb5Yh3BIGK+CuxLmxkOu97byxhqXT75yYb1jAhoAy7diOQmzcHmFTj1aPwl V/mDx0eHIgklkzF40gFhO9TW5v6VrwzrQpYOxZ7PbW5UD0qhqQ1BWJQy7POFl/Kq WKTNVuG5RjBogcP6scWFXFVAqA6V096RiU+MGnGlOS+doPRAF5P+igKD3tYZECWx B9yElJIebow0J/isEqct6lXRyIbhNESD7E+97Fcm+SMQ+b3TNqCp+7NBe1oZDkav vShVjyVLtCjW5NQdYYRQTuRml5BYI9vBTuG3FoYLffEm/TTf+d8= =+W56 -----END PGP SIGNATURE----- --nextPart4081355.kAAoriTUSa--