From nobody Mon Feb 16 01:29:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDlYc71C2z6RqW0 for ; Mon, 16 Feb 2026 01:29:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDlYc3LMDz3rY0 for ; Mon, 16 Feb 2026 01:29:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-8249aca0affso1489323b3a.3 for ; Sun, 15 Feb 2026 17:29:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771205357; cv=none; d=google.com; s=arc-20240605; b=ShPdfpz/R2wxmYdsJemrisqQDusdSENzDfCSL+CdVmTszxTD50vDpNfSw94KoN1MWt orrhoEP4Vg0YBeW59Hn5IznxqNjv3TH6qra0iVj6NROMx5wkvfPxPqC87HXOph0AbVGD 3eUmnGJ2pIKL3JObt7r87Q18TknEIr+1oyHkecinT+iWbKobrcK/UqwjGjOUqk+gp7yp XNw6d/kRkq+tRGP7JArpyz3C2i+0YBSC7DKoDEtcehOwtlResCFW2sZvAQW+ZJcwOV+I jGEM3Cx16F4JT211lTdaI3nixcL6vCsVVg8So+2Ey3wTd3haO0oPjsyp20Ge0yncbvQf nAgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=pepB5p5va5hInw70eI+KOBapY/cJwwP0WP+Um9+KuhI=; fh=zYDkUEN27tCegASzaxRTc4ePOLVQ9DSNkyvulrgSzag=; b=MCuRAbf2Ia3ZBbOeXrdC3gUL/d2bMLJJ8zSRziw3+ghRbSJG17wde3HHlDDA/m/34u 3FVtMfeMMzEUOdbfPZRFKkDuIMFZuGJovBST4PDDRxbmi66W+DEu7D20IW931GIEmuQ2 RnJdeSOnCHLvZmijrCtyljHLv/lMSoI+K4k8LUvy0t2+jYdIHlQ5S254Lp4hGwxDqw12 GHW8URBFXBjQxI7dxaakSjUaAdb/2EaMapoDZHHqi9PeFVdxjj07nIk2p4f+8SmZptP+ GjvNhyby/rWlVjQUOAsvamWeu/x9EZFuTKpQkx0bR6HQsNqwt6IQEZfonz/GwhFQklXa dGJA==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1771205357; x=1771810157; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pepB5p5va5hInw70eI+KOBapY/cJwwP0WP+Um9+KuhI=; b=dgB3CrsZVLBFHSHHxpUovWeMdmayN3SoRo85XsrQOd38kJ3B5V2DHIYFf3ix2LYMCQ 4TJ33mNbJ1LGeYXGNseo9qT7Lwhxyr6uK37arJMDBSg+iJM+YnHyVQGe4x8ll7GvUfS9 oB0nXNje0j7rky635iRPtptN+3xrdACgBGRCQ6Y2GotrhPFtBt2a0DorAR62jv3/50/y KX4YJmaQ+CcBzOYRrQHp3yD3LLHKlCJRD7Np0AqblEFUfdV0oRGfcJHc61J2PZslD/kk VI/AwPf//4bDuySpZUDLYoEfQqCAmvmhTyX0rr4YPSW5WPZmevEvf+TY8VrdxRU/+eze rJNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771205357; x=1771810157; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pepB5p5va5hInw70eI+KOBapY/cJwwP0WP+Um9+KuhI=; b=bTPevQlKH/1wuTFdUMPWq5iap41GxQE2/RBC/Zm9ZszIcSE4yC3IP+xav4BeGcqbaR 6qfG9NTFSy5acDuqeulWbaVsPgHQHR/Jd4zcT29yOudkc/e9V3jgSaevfAL8T+SAErqO RGBQCBllnh2LtbjME3eWiyG5xRMWqvs4iBfu3JYY2uFVOec1xVzmmIkvcDl4nNnF1Lzm d4ouorFQX5L4q2RWVC49IXtqPPzl7Vva0vscJgR2Z8c6jbY0zxjB4Xv2qOh7Pp0uGEYb tskTYdoy9xYEd9uwJfJzRINwdprk3cMpK7X0Nlm8OjosleNTy3Uhp9/CCZk0n/c2td5A 3rbg== X-Forwarded-Encrypted: i=1; AJvYcCUHe03GtsNvXevJSBnXaK75MHvBpvE/QqtkU/lUVs/gYILIbohNDR4GQMqu/GxrSRIre9lBXL0L5aYWoFP8PxrRchQhig==@freebsd.org X-Gm-Message-State: AOJu0Yy8PVmUD7+XofHHZvgZfEvbIBdxgfeL9Tukxe3P1aujOBlw2zfU Zs/eqlQ84dPmJN3qoY3vky+Wg8KBNQ5UGhU//+vFAY067uOkWwaarNdp1xoprIFGqq4W+SEN8kZ AMT+QR1Lof+uOy3ba3ddoxAAeUrq1CiSXMYV+E2V2XQ== X-Gm-Gg: AZuq6aLpP60iJvhrI42D91V2+JRfztmUhgttiKzBvNFZDKWgM2eyJtiGCVpDY/Mnr7h wib3KN0yayDsNNBZC1+b4JtLeCj48LDCV4B+vjBpGUV6d+zQ7t5alwm0b9IXLWxi+A6FJs3sh0R pPGPKez7CH6UAyGj8KdgdgLeJ6BOwkpngH0eKiw+8cyYybPbWYldqzxiGkU0X9Mz4Qf60KhezZD HsMuRV396IYLIiH0d7X0nbhUKt3DsZiOMNPaRnDEt+7f1Qb5L3boDR9Ol0ZQT5k8FjsmqnFpZsR dj2QLQw= X-Received: by 2002:a05:6a20:160a:b0:364:be7:6fe9 with SMTP id adf61e73a8af0-394838f4811mr5597668637.32.1771205356951; Sun, 15 Feb 2026 17:29:16 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> <0B6A645E-D9E4-4337-B280-7E3CBA1FDC1B@freebsd.org> In-Reply-To: From: Warner Losh Date: Sun, 15 Feb 2026 18:29:05 -0700 X-Gm-Features: AaiRm51-opNm9IwtGM16bTVSBAbAloWTQLmTJTv2B4FrxL5qt0Ve-S_p387dhws Message-ID: Subject: Re: git: a60e7e6ff0ec - main - stand: compile ia32 EFI loader with -malign-double To: Ahmad Khalifa Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000202563064ae6e21c" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fDlYc3LMDz3rY0 X-Spamd-Bar: ---- --000000000000202563064ae6e21c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Feb 15, 2026 at 8:56=E2=80=AFAM Ahmad Khalifa wrote: > On Sun Feb 15, 2026 at 4:27 PM +0200, Ahmad Khalifa wrote: > > On Sun Feb 15, 2026 at 4:02 PM +0200, Jessica Clarke wrote: > >> On 15 Feb 2026, at 13:56, Ahmad Khalifa wrote: > >>> > >>> The branch main has been updated by vexeduxr: > >>> > >>> URL: > https://cgit.FreeBSD.org/src/commit/?id=3Da60e7e6ff0ec1fdd66c2568ac6c03b8= 43dbb3c9d > >>> > >>> commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d > >>> Author: Ahmad Khalifa > >>> AuthorDate: 2026-02-15 12:23:26 +0000 > >>> Commit: Ahmad Khalifa > >>> CommitDate: 2026-02-15 13:30:06 +0000 > >>> > >>> stand: compile ia32 EFI loader with -malign-double > >>> > >>> The UEFI spec says: > >>>> Structures are aligned on boundaries equal to the largest internal > >>>> datum of the structure and internal data are implicitly padded to > >>>> achieve natural alignment. > >>> > >>> By default, structs containing members of type "long long" have 4 > byte > >>> alignment on i386. This caused some EFI structures to be subtly > wrong. > >>> > >>> Fix this by compiling the ia32 EFI loader with -malign-double, whi= ch > >>> bumps the alignment up to 8 if such members are present. > >> > >> This seems like a dangerously big hammer. Are there any types shared > >> with libsa or the kernel itself that would change layout? (I suppose > >> for the latter they already need to be aligned as the kernel is 64-bit= ?) > > > > For the kernel, any shared types would have already needed to be > > aligned, yes. I didn't consider shared types with either libsa or libef= i > > though, I'll look into it now. Nice catch. > > > > Okay, so libsa, libefi, liblua and ficl all share types with the loader. > Quite obvious in hindsight... I'll back this out until I come up with > something better. > Yea, EFI lives in two worlds: The world of having to make UEFI calls, which has one calling convention and ABI (including structures), and then it also lives in the world of creating some binary structs for the kernel. These have to agree somehow. It's even worse, since the 32-bit loader code is also shared with the BIOS loader, which has some different layout conventions... If we have to do this, we'd likely need another libsa32 etc for the new conventions. I'm curious, which structures does this affect. UEFI / EDK2 tries hard to make details like this not matter. > >> > >> Annotating just the EFI types would seem more appropriate, like how we > >> annotate function pointers to use the Microsoft calling convention. > > > > They're all under contrib unfortunately. Not sure if we want to > > introduce that big of a diff with upstream. > > > >> > >> Jessica > > --000000000000202563064ae6e21c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Feb 15,= 2026 at 8:56=E2=80=AFAM Ahmad Khalifa <ahmadkhalifa570@gmail.com> wrote:
On Sun Feb 15, 2026 at 4:27 PM +0200,= Ahmad Khalifa wrote:
> On Sun Feb 15, 2026 at 4:02 PM +0200, Jessica Clarke wrote:
>> On 15 Feb 2026, at 13:56, Ahmad Khalifa <vexeduxr@FreeBSD.org&g= t; wrote:
>>>
>>> The branch main has been updated by vexeduxr:
>>>
>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da60e7e6ff0ec1fdd66c2568ac6c03b843= dbb3c9d
>>>
>>> commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d
>>> Author:=C2=A0 =C2=A0 =C2=A0Ahmad Khalifa <vexeduxr@FreeBSD.= org>
>>> AuthorDate: 2026-02-15 12:23:26 +0000
>>> Commit:=C2=A0 =C2=A0 =C2=A0Ahmad Khalifa <vexeduxr@FreeBSD.= org>
>>> CommitDate: 2026-02-15 13:30:06 +0000
>>>
>>>=C2=A0 =C2=A0 stand: compile ia32 EFI loader with -malign-doubl= e
>>>
>>>=C2=A0 =C2=A0 The UEFI spec says:
>>>> Structures are aligned on boundaries equal to the largest = internal
>>>> datum of the structure and internal data are implicitly pa= dded to
>>>> achieve natural alignment.
>>>
>>>=C2=A0 =C2=A0 By default, structs containing members of type &q= uot;long long" have 4 byte
>>>=C2=A0 =C2=A0 alignment on i386. This caused some EFI structure= s to be subtly wrong.
>>>
>>>=C2=A0 =C2=A0 Fix this by compiling the ia32 EFI loader with -m= align-double, which
>>>=C2=A0 =C2=A0 bumps the alignment up to 8 if such members are p= resent.
>>
>> This seems like a dangerously big hammer. Are there any types shar= ed
>> with libsa or the kernel itself that would change layout? (I suppo= se
>> for the latter they already need to be aligned as the kernel is 64= -bit?)
>
> For the kernel, any shared types would have already needed to be
> aligned, yes. I didn't consider shared types with either libsa or = libefi
> though, I'll look into it now. Nice catch.
>

Okay, so libsa, libefi, liblua and ficl all share types with the loader. Quite obvious in hindsight... I'll back this out until I come up with something better.

Yea, EFI lives in two= worlds: The world of having to make UEFI calls,
which has one ca= lling convention and ABI (including structures), and then
it also= lives in the world of creating some binary structs for the kernel. These
have to agree somehow.

It's even wors= e, since the 32-bit loader code is also shared with the BIOS
load= er, which has some different layout conventions...

If we have to do this, we'd likely need another libsa32 etc for the ne= w conventions.

I'm curious, which structures d= oes this affect.=C2=A0UEFI / EDK2 tries hard to make details
like= this not matter.
=C2=A0
>>
>> Annotating just the EFI types would seem more appropriate, like ho= w we
>> annotate function pointers to use the Microsoft calling convention= .
>
> They're all under contrib unfortunately. Not sure if we want to > introduce that big of a diff with upstream.
>
>>
>> Jessica

--000000000000202563064ae6e21c-- From nobody Mon Feb 16 01:52:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDm4h4LGGz6RsHk; Mon, 16 Feb 2026 01:52:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDm4h2f2Lz3tfG; Mon, 16 Feb 2026 01:52:52 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771206772; 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=JzjibTBrowbmAUMEolq8qEORkLFHh7VO+F6SDH3iLrQ=; b=XL5j3PJ8REEEaThD16gL+14bmGLVIMhxvkWMypa3GAJd4xs9RpHol6bEHLx4mmZb3BzcMD 85I9E/4PQzNounmpUff3s0OD1YJ7wNJurkguQOFw6djg3fgQ1J5+ZynNkD7wXxyAjxacRl c5oRAHipHPHwVzV7ySPVhhLyG7Fds0Qtsa96imACu1XT2akHRBPzaejNfGRWyxZjseFsIS vfIEyEgdFEH/BPmvmw60BuvArANuDcUNVoR1QDlMy16DAoHRa5zY4T2DtTW6mrnsYlFN5a d6/btSSmOLRtlEIvguTAy2ryzJzfsWA+QuBnUcz0GnGt8e4Ov3+x6LUUoKATtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771206772; a=rsa-sha256; cv=none; b=LfGCnc5A3faQKMYYt71SfMmZNwmVrpYNaRJvrTam8ggLEBkCnazw/TT3+gPKhLtOnytrmD p8f3wscu48TmBAcjJF57ZIUKaSrK7fIaTeZm/7Jzco5V4ORZtgD18HFPHJiNoFMitpbrCY jrMS+GOkrg3CREn7is6HZwIl2cGa5IJR4+s8swRRDysqycLT2+oCjodtlRY+u59byjuKdg iOCCHREQwHJ9o0wbCGRBjkjqUBZSjyXjd67Qt1R8Oczv15Sn2pkUccj6OpFgxYgJzQmnMZ saux2Ivmlr2fgyEZd7GXQKeasPPPY2P/meKqiTJMtTg4hzI0c6OYwFn51egFHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771206772; 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=JzjibTBrowbmAUMEolq8qEORkLFHh7VO+F6SDH3iLrQ=; b=BQW8OVLBD84r05ByAwIe04Vh3an1eeiUHIAyrGVAUpPEcgHBarFNdjoaYbQx/wKeVXIZVD G2iX9ubch6mouihqn33BaSD4XrGd/TcDLor1nrEREFJatQHIIxKP+My+POqdLWRu+rbq+4 IPcqz5nazTqIoX2/49CM/g5Al6aBvkKgm29gaM9LwFIl51HZb51rmGUHBkIGnzKuf+KBUM eUivK4LN56ZKtbGJEgUFOZxmZ+cC6ip9t4Np5pYecuVz+IdWmJr5EEhmiccHD9BHOZHk+/ S55cbsmjCpInE3MI6xU3zYmeZmN5q4f8C/pO3Bw9FiTuNSRkpHo6GSMLNYFTCA== 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 4fDm4h1ZSrzCMN; Mon, 16 Feb 2026 01:52:52 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 01A3775448; Mon, 16 Feb 2026 02:52:49 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Eugene Grosbein Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f8a7f6fffd7 - main - libfetch: apply timeout to SSL_read() In-Reply-To: <6971e2fa.d8f3.445991e5@gitrepo.freebsd.org> (Eugene Grosbein's message of "Thu, 22 Jan 2026 08:42:34 +0000") References: <6971e2fa.d8f3.445991e5@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 16 Feb 2026 02:52:49 +0100 Message-ID: <86pl651mku.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Eugene Grosbein writes: > commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e > Author: Eugene Grosbein > AuthorDate: 2026-01-22 08:40:35 +0000 > Commit: Eugene Grosbein > CommitDate: 2026-01-22 08:40:35 +0000 > > libfetch: apply timeout to SSL_read() >=20=20=20=20=20 > Currently, fetchTimeout works for non-SSL connections only, so does f= etch -T. > Fix it applying specified timeout to SSL_read(). >=20=20=20=20=20 > MFC after: 3 days I did not review or approve this, and it is incorrect. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Feb 16 02:18:43 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDmfX6WlZz6RvVD; Mon, 16 Feb 2026 02:18:44 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDmfX54BXz3xdT; Mon, 16 Feb 2026 02:18:44 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771208324; 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=u0B5+BSo14q2vID9Y4iDRd5Ns56Q6yb52saMNU1B+8M=; b=bN2+NyDXdjReSkKG3v2zob3EV49/3bXeua/+vtXzzlpzKZFM0XgfuEZIA/OouDpphEtw7S Nkx8HUqr0+tuZWW0BSKocC10DFI+r/gKL7FHcOmF1lVSVxG3eqPpDWyLnmtoVWbGXb0FCm eHg0u8/9TU+C9d3qMLPIXKolCutQhPV893ozENNgso02zI/S/Bc7YSweHV6jxjGuaum+l1 8zkQsaHk+MBC/2ryvhprc21JknHI+XtEfk+TX+fq+uCqH6WIhTxA2Z9aPDK2MOTCS6XI0r S5Jqe5Vw/MXHoB95Xhjj9JV3FBqI51xIXKNiRGcoW4niwZ3daJrS3/bkd71dyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771208324; a=rsa-sha256; cv=none; b=RCRsxHbmxG6hZfXlp0Prc80+hNQctTYKSmmaTUzb5USl+aBZ6oaFWdZMD9gA9Rhfjgt6RO LqNJ3VsJ3fNX2a3o2ZgoDnNplSnfAVsSP+0tr1ewi6ChpgbBAJoB9nxTAnTWZJxb3g4UkY KweQYifwzgaqH5Y0Y5ktUHqOKtN3pNcmcQovsp1rD7XkSysf6gCE6dYIEFXyfKyvwiRs+H vOVE4hE4smXNry6EhQLiIxzLSExllSaztAJY99wuTIiM1ROog0T6qrWWyipe9hogs4M8RC RUgwyI2VDxlJqkNlarZKgLAqKuzuK/tSSYMqxAbfT9xbhbD4kzzfp/ZF9YuUOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771208324; 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=u0B5+BSo14q2vID9Y4iDRd5Ns56Q6yb52saMNU1B+8M=; b=nvwBcl7lE5ovJBhJzlpVhz2TSORGWvxanUXcZU8DOu/PSJjIhtXx6FJz9vMk7/O9NUhNOm Cm2Y0en5pankJsRcgdDvwfjnQGHQt5BapOoL7wnHyx9UcYtYGCkdr9yx2jKge0oX8T8wH1 VtYRcqEgpQaIGjlzmKkgYDYmZQ5wEiiDubG3yJGPvsQYI79r/Vf2HsEC5bohP6iBNgYl5B QhgxOFsAgmfjgmgQGBXGvjNd8C7+3qIEa7kNjujETXnv2U0tDo/yjEStbZfiRDe32xhI7i muHF3M/75+tf74fyrzH+Aw9gsNfaeCS7zZYXVhaUJ4lhCBzViBp/VOa3s4+UGQ== 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 4fDmfX3QtszBLD; Mon, 16 Feb 2026 02:18:44 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 408477534D; Mon, 16 Feb 2026 03:18:43 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Eugene Grosbein Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f8a7f6fffd7 - main - libfetch: apply timeout to SSL_read() In-Reply-To: (Eugene Grosbein's message of "Mon, 16 Feb 2026 09:06:02 +0700") References: <6971e2fa.d8f3.445991e5@gitrepo.freebsd.org> <86pl651mku.fsf@ltc.des.dev> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 16 Feb 2026 03:18:43 +0100 Message-ID: <86fr711ldo.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Eugene Grosbein writes: > [moving to developers] [moving back where it belongs] > Dag-Erling Sm=C3=B8rgrav writes: > > I did not review or approve this, and it is incorrect. > Sorry, I did not check MAINTAINERS, indeed. Mea culpa. > But, why is it incorrect? It was tested by other users of FreeBSD and > it works for me and them. * It has almost as many style violations as lines of code. * It's in the wrong place. You're calling setsockopt() once per read operation instead of once per connection. * It doesn't fix unencrypted connections. * It's the wrong solution. As explained in code comments, libfetch was designed to work with non-blocking sockets. All you needed to do was restore the fcntl() call that was accidentally dropped a while ago. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From eugen@freebsd.org Mon Feb 16 02:26:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDmqf10yRz6RvsW for ; Mon, 16 Feb 2026 02:26:38 +0000 (UTC) (envelope-from eugen@freebsd.org) Received: from mail.rdtc.ru (mail.rdtc.ru [62.231.190.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDmqd5CvJz41ZV for ; Mon, 16 Feb 2026 02:26:37 +0000 (UTC) (envelope-from eugen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail.rdtc.ru (RDTC Post Office Server, from userid 1000) id 60E8D1CF46; Mon, 16 Feb 2026 09:26:35 +0700 (+07) Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [62.231.161.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: egrosbein@rdtc.ru) by mail.rdtc.ru (RDTC Post Office Server) with ESMTPSA id 31EDB1CF37; Mon, 16 Feb 2026 09:26:34 +0700 (+07) X-Envelope-From: eugen@freebsd.org X-Envelope-To: des@FreeBSD.org Received: from [10.58.0.10] (dadvw [10.58.0.10]) by eg.sd.rdtc.ru (8.18.1/8.18.1) with ESMTPS id 61G2QXlR094263 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 16 Feb 2026 09:26:33 +0700 (+07) (envelope-from eugen@freebsd.org) Subject: Re: git: 8f8a7f6fffd7 - main - libfetch: apply timeout to SSL_read() To: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= References: <6971e2fa.d8f3.445991e5@gitrepo.freebsd.org> <86pl651mku.fsf@ltc.des.dev> <86fr711ldo.fsf@ltc.des.dev> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Message-ID: <500ab66f-5bdb-191a-78c7-37dfac6f281b@freebsd.org> Date: Mon, 16 Feb 2026 09:26:12 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 In-Reply-To: <86fr711ldo.fsf@ltc.des.dev> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.4 required=5.0 tests=NICE_REPLY_A,SPF_SOFTFAIL, T_DATE_IN_FUTURE_96_Q autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Report: * 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) * 0.0 T_DATE_IN_FUTURE_96_Q Date: is 4 days to 4 months after Received: * date * -2.4 NICE_REPLY_A Looks like a legit reply (A) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on eg.sd.rdtc.ru 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:29072, ipnet:62.231.184.0/21, country:RU] X-Rspamd-Queue-Id: 4fDmqd5CvJz41ZV X-Spamd-Bar: ---- 16.02.2026 9:18, Dag-Erling Smørgrav wrote: > * It's the wrong solution. As explained in code comments, libfetch was > designed to work with non-blocking sockets. All you needed to do was > restore the fcntl() call that was accidentally dropped a while ago. Could you fix it then, please? Eugene From nobody Mon Feb 16 03:59:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDptM5vGXz6S53T for ; Mon, 16 Feb 2026 03:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDptM5Dlgz49xr for ; Mon, 16 Feb 2026 03:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771214347; 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=a00i/L+ojAZdH6erR7QIcSY/9tBGZPKkMWjft6RMftk=; b=p87T5hyMTCb+v/EpZl2Gcf3BCnYXhusdyFViNXgcwcIpPj64PT+x88V2S4vTbACwDFSGCl yTLEseU16kX/LkNjdZMfEuSwAuCzDh+TGrdi04dgn4DOUPdR82xW+yTLtdB7inSVe2LSPk Ob1adf76OofRvXWnRNi6ajh7KRIDfqmPnkxRGGdCLTr5bQLOHH49pLmlzWAPNVoTZppClj tyByp0EUSc/79wL7U8fXWiNIyTxZQDI/ex2MWVOsTvhJ4wLDXnIHBsdkOnxUxCW8kUSldu VwQ2jAEd3sAqyCHYPd5zm1vvPeU51yjNh41/9pQ5DI12ax14JBkRNyg66swZGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771214347; a=rsa-sha256; cv=none; b=iGAAuh5WkG0yPSSnRycnWpD8EEUzoupafaV9gEsBgQdX4rNbBknIb8D52kUFzXhLal+9Rw lGh249eWdRTKIXzhDGBqY2WogiITeae1p4BAYO4K9CF3rpkcZtt7OFoObi9K8TakAAtInO MmZT0wKIE2MLjsIVKjU14XdPkNf7GpeIxF8D64BtMnwXu8qKbiDAZknMF85uZE6137sOhV Ll4na1UclM9/05beoDGtQ4ve1OcLBTfPvTVJF3GVgENLWM3nOBQNa12xFRF2r6zbG/o6/n 8XoyJuCBvTzrbBMGymJzE4mD46wyusJ7kvdHxbFVlWna5TOj05XiVnJliGuc3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771214347; 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=a00i/L+ojAZdH6erR7QIcSY/9tBGZPKkMWjft6RMftk=; b=kWAloXfxX4qD5kuYfX1C7jARzJaxy549+A+M5mqkxK+7tMa89uiKh+XOU1wIKFNrdQVDUy xPb8BmAameYajJJLVdS7FUXn19SoB5gtapVh5ZNLzBUvUXdhLWF8P/oOMjz55GgRTvnF9B APv9j2eNEsNs7x/Wma2vY4N1uEctwfInaE2xDQOYNYUeL1hjsk2/vRbriaRrv1MlsxBKRn 7l3vg6B17AIkEnQjDRARWSxgtMNUKAE/7VfV6GHS9ITxypG/6L3OARoIFUL7SiG0A/1+9V 94JkFzEUDThSBEBCDIn5fmFWRoyhV95Q1Jv8TN7sr8U0TQoPPkgzuFOFvNN0zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDptM4ZBvz1Ln3 for ; Mon, 16 Feb 2026 03:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24b45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 03:59:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: e4bcfe4ebf03 - main - ichsmb: Add Intel Raptor Lake SMBus controller support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4bcfe4ebf03e321a5f8317491cdeea49e4f6357 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 03:59:07 +0000 Message-Id: <6992960b.24b45.720a03c9@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=e4bcfe4ebf03e321a5f8317491cdeea49e4f6357 commit e4bcfe4ebf03e321a5f8317491cdeea49e4f6357 Author: Abdelkader Boudih AuthorDate: 2026-02-16 03:58:41 +0000 Commit: Adrian Chadd CommitDate: 2026-02-16 03:58:53 +0000 ichsmb: Add Intel Raptor Lake SMBus controller support Add PCI device ID 0x7a23 for Intel 700 Series (Raptor Lake) chipset SMBus controller. This enables hardware monitoring functionality on 13th and 14th generation Intel Core platforms. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D54957 --- sys/dev/ichsmb/ichsmb_pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c index 9ffb1de62dac..7d6d94dbb4a4 100644 --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -114,6 +114,7 @@ #define ID_ALDERLAKE 0x7aa3 #define ID_ALDERLAKE2 0x51a3 #define ID_ALDERLAKE3 0x54a3 +#define ID_RAPTORLAKE 0x7a23 #define ID_METEORLAKE 0x7e22 #define ID_METEORLAKE2 0x7f23 #define ID_METEORLAKE3 0xae22 @@ -221,6 +222,8 @@ static const struct pci_device_table ichsmb_devices[] = { PCI_DESCR("Intel Alder Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_ALDERLAKE3), PCI_DESCR("Intel Alder Lake SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_RAPTORLAKE), + PCI_DESCR("Intel Raptor Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_METEORLAKE), PCI_DESCR("Intel Meteor Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_METEORLAKE2), From nobody Mon Feb 16 08:14:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDwXd2p4Mz6SVLk for ; Mon, 16 Feb 2026 08:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDwXc5F6dz3cKW for ; Mon, 16 Feb 2026 08:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771229648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=233eKo22tYTETvwlGoHn0j5d6f6UsCTgXs3yViG9UHE=; b=eyMHl6Sq1Db3ZoWsIxTmgkfP+Oaz+k4gVPUEb275A2pRKZ5oASs19vZuJfw6kby31ae1kL OUPa0MgYUTVub3tIMLLM9MsQpnC5cQ7ZopPjofIZOwdXDr0AlG2kRkAQgpm5kk/nPONNIE lIrKmsTvQmy2Ny/Z0m24Z7FOLScqZiZu4plPxHH+yXi/guMLziXGpbJW+SEK+gb07X+sPp V1fh9QEcoe22zV5hdbtyfi3sWJ1QZzfQpqlZS00ByITxJ+0tY+0UXJjFRJ1OW1TIo44F4u u6+NpvgdEeiUYXtpGogCEAf7ZFMqlsjWP1dTBS1sj0YMpb3P19D59Roon8WgWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771229648; a=rsa-sha256; cv=none; b=bYihGrVYVKgRXN/a98RmfajfoWtYeIDUBsul/dnltfToLjq0q/109i/kTeMW6m5HJ1mN1N ZbevBVuMaA9vnfjXZsB+nn+bKT5uSVuec5E2CutLoffTGowIAx1qRIGg7OT1fddNHIxkHa YXce6TS+9J+PCUAdnb4UwsVeihBXQvOOTRofYLAQwheK33Ez3IhrkPljBEqsTVPgbqaG3m K6CVqBR9LIzK8ijPqSVBn6cn1ng2zym3TjJU5wxbaep9j/s6jWQ6WLcb2W4Soq4qBg2qlO dYQrMlve8RAKOA9mk0bA9N6K3XSt5psX4KMY1bA8Qv5ETlwGKrc7PS+wz/QsZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771229648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=233eKo22tYTETvwlGoHn0j5d6f6UsCTgXs3yViG9UHE=; b=S37LweWuTr8xCUHOYYkisMcFpDrDv/lWY4KrPgOdccikH3dUXBLM9aAw+YqvCLqV3xuxPh Rib/Bvg5TmxipT6Sge7aYdncOUuigGXNFjsMZW51zme3N2az6TwXA4FKX9ixEO+Vjy26mH Ep5JCjSZexqv6O4pU2AgAb0tP6w9BvNKcW1BOACLHfJgKeg90uf3KnmpsGHPYHne251BHq N34QHXsTIN34k04zp8EpgO00V3QF/Cz8GOV+FDk0yLMzsxNPg4ZFnB9T8B/IjGwI9UvPJo +/abQtN49D0ha+XbbKSwX8uJWGrWLz53XNzucxdIczJVL54C3liHgmP5z4vu2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDwXc4Z7zzm4 for ; Mon, 16 Feb 2026 08:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47a0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 08:14:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: be522176951d - main - libusb: make libusb_hotplug_get_user_data actually return user_data List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be522176951d8b542de9354f4ec9ac7603745b71 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 08:14:08 +0000 Message-Id: <6992d1d0.47a0a.72b11e8e@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=be522176951d8b542de9354f4ec9ac7603745b71 commit be522176951d8b542de9354f4ec9ac7603745b71 Author: Baptiste Daroussin AuthorDate: 2026-02-15 19:39:18 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-16 08:14:05 +0000 libusb: make libusb_hotplug_get_user_data actually return user_data MFC After: 2 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55291 --- lib/libusb/libusb10_hotplug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index 9c46d4926bfa..359c818b5720 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -430,5 +430,7 @@ libusb_hotplug_get_user_data(struct libusb_context *ctx, } HOTPLUG_UNLOCK(ctx); - return (handle); + if (handle != NULL) + return (handle->user_data); + return (NULL); } From nobody Mon Feb 16 08:14:09 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDwXf32RSz6SVLl for ; Mon, 16 Feb 2026 08:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDwXd5T4zz3cKX for ; Mon, 16 Feb 2026 08:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771229649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SyiY1lBcRzJIDN3/8hiQ5Vm0QYEwUgSoj1151FrpbuU=; b=IUq+A58U08VuMZ6dJu/0LYlLhz3PmMIMZCoU/UxOo42EeDVPJoJ96bWUN9R9uroC47xSrd 9uAZCVCqqIMgUNAlZmUT1w8pO9qC6wYSUShRFZ4GaW+lLaRUJYIz7Pr7KPq0itdis0aMwL 4EAOmCMtdHJXaen0zelCrcmg/4m8SkcbP+yZD1JNWFe+jeWNJ6ZGwORqIeNWqTLGpI2cMU 77XxfEhPSlj15I6kbretXrcu5M/wxRNURvkaFarqplwLEijYSshSb6ZJyPXvaEEMVVaPBQ zxkcvOMBRwziQOVr709bmtJ18ZngUquM2j/1aJlYoW0brzw45oiq7b/15Og3oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771229649; a=rsa-sha256; cv=none; b=JaALl3ZYH65STaO+VU9DbB3MUBcOqGzPKwkT7jIHvj9KvmoV9EZkBk8+tZF3UztaRY36n7 08ymxml5VVvybxX94NpUBolo1ZOChaNyNcEvIRTEnBkZIowK53mKlIhd9d61A+2aT8vsNG lmyvARmOctt39ljQ3I0jG+VArw3dLjg5xXy2NE5lezfd3GpYHp5FpjHsrASZdJ3EHFOGaf qm0NI57mH1s/d+2GJHfXj4BfWtrChMq8v2L9YPM2R0F+iJCWLlaGnoxDFY4m6L6PXpwqtk rrO0yLqa7hi06eqq79TdRI9qaFWKdHZ2QXG3uxI+//CAhCo6N8lELJLxl6grNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771229649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SyiY1lBcRzJIDN3/8hiQ5Vm0QYEwUgSoj1151FrpbuU=; b=aiFoRPaFINH2Hp366yVa4mWaNLBWy0NmLlW57XrYCIYdhNISTwKdaSPj8NeIKoBCWiCjET o8X5EeWQeCzSRNPv7Bz7tnzF+8dCors3LnCGJTRPjCcH+0iY95YiZAIJXkz0vPQ/PN/htC zWzlJiqv7rYb30JH7y9ghkcJr05xGoMSqJx/Qs1MdV8YLDqAWds+JLH4Gn0Ei1YrGDtrXR BeOkZp2ZbpKA7gGsfQcj8d1JB2G6Q+PAjYw3ahpfAsfeHoeVti1hqYswkGbBdq1r2kFeO1 ypR93Xwpi8jdo6wItSaHpqEhdv+A5mhNkDmS6eKy2A6fQHcWyxok8DuWieC3WA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDwXd52p5zGP for ; Mon, 16 Feb 2026 08:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46a41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 08:14:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 38c183326425 - main - libusb: dequeue next transfer on completion to prevent stalls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38c18332642500fdfe075a82f88e033f6673a53f Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 08:14:09 +0000 Message-Id: <6992d1d1.46a41.4e799729@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=38c18332642500fdfe075a82f88e033f6673a53f commit 38c18332642500fdfe075a82f88e033f6673a53f Author: Baptiste Daroussin AuthorDate: 2026-02-15 18:07:07 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-16 08:14:05 +0000 libusb: dequeue next transfer on completion to prevent stalls The transfer proxy callbacks (bulk/interrupt, control, isochronous) only called libusb10_submit_transfer_sub() in the START path to pipeline the second kernel transfer slot. On completion or error, no attempt was made to dequeue the next pending transfer from tr_head onto the now-free slot. When more than two async transfers were submitted on the same endpoint, the third (and subsequent) transfers would remain stuck on tr_head indefinitely, since no completion ever triggered their submission. This caused a protocol-level deadlock in applications like adb that submit header + payload + zero-length terminator as three separate bulk transfers in sequence. Fix by calling libusb10_submit_transfer_sub() after every libusb10_complete_transfer() in all three proxy callbacks. MFC After: 2 weeks Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55289 --- lib/libusb/libusb10.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index e226def0b7b6..b3af017ab980 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -1259,6 +1259,9 @@ libusb10_isoc_proxy(struct libusb20_transfer *pxfer) libusb20_tr_get_length(pxfer, i); } libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); + + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; case LIBUSB20_TRANSFER_START: /* setup length(s) */ @@ -1281,6 +1284,9 @@ libusb10_isoc_proxy(struct libusb20_transfer *pxfer) break; default: libusb10_complete_transfer(pxfer, sxfer, libusb10_convert_error(status)); + + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } } @@ -1322,11 +1328,15 @@ libusb10_bulk_intr_proxy(struct libusb20_transfer *pxfer) } else { libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); } + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } /* check for end of data */ if (sxfer->rem_len == 0) { libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } /* FALLTHROUGH */ @@ -1353,6 +1363,8 @@ libusb10_bulk_intr_proxy(struct libusb20_transfer *pxfer) default: libusb10_complete_transfer(pxfer, sxfer, libusb10_convert_error(status)); + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } } @@ -1397,11 +1409,15 @@ libusb10_ctrl_proxy(struct libusb20_transfer *pxfer) } else { libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); } + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } /* check for end of data */ if (sxfer->rem_len == 0) { libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } /* FALLTHROUGH */ @@ -1442,6 +1458,8 @@ libusb10_ctrl_proxy(struct libusb20_transfer *pxfer) default: libusb10_complete_transfer(pxfer, sxfer, libusb10_convert_error(status)); + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } } From nobody Mon Feb 16 10:30:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDzYg3J1wz6SfMk for ; Mon, 16 Feb 2026 10: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDzYg2g58z3pV9 for ; Mon, 16 Feb 2026 10: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=1771237815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U869/na+fyMJ2fd3Xrcuvoa3uLjA13+1MD9FgE8z1xw=; b=IWxp74mqu3fPTmSTwSjckk+LSyB4t3yCKcebkf1yqTfL/h7E1LFSCOnSjOrBMsyvxZI9mY B/uUDBjwq6glPDtfo4vD+PjwNJE//gYTJaywIQuaNQi+1AGMdQrspvpO7JIcv7XiGqdzqq Zs0N9exJsZquP5mxmeeu3Xl6CZhfTOIoBGZmM35jCTO8aMQQZ3+j4dK0GStbtdmS7YwQWi WCySIva2N6t5aeg/mm7Mn/UPDF7dazXD5CYoKh8HCO6glg0r0dN833N2+ahAwGpQypGtyZ zBNvsmGgrAYnNWNS0N7Uo0VVBsQpZkKe11qTaudH9N4HqxQlhXijymTXjJayzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771237815; a=rsa-sha256; cv=none; b=nr+hk521jSTZq0fKIzfpilkwrCLfLDernqP1SU7s6DnpJzCdvuVmLuI+tVoDUTsk4caK9y NbJ2PkHcXs0E/5ukatckgP/MZCnxrzOfu3ifZgAVBXUsztE4/CVD6sDpCmACcZBUudSuOL 5TZ6UGlqMAG7z8qgEMrNyBInDDrIxC2oMu7RB5FD9pzIpj4Hl6pgV6dTy4bBsGb6lFuPZh RW1bzfo7eLFaimEz2njgMcPM+cW32qJw5s5jRnWUIn6ILBJKOExk7fIL+BnzFeFEQGNQ4E leb0WViClw/vE6Bu5rEbSmaUFQa8nFPEMiztA9oSqpYeczROyYeD6mwb/MobGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771237815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U869/na+fyMJ2fd3Xrcuvoa3uLjA13+1MD9FgE8z1xw=; b=BZQfx6B50MDUxPy7niwA/NaY/SZeM8WQNlv/pwlZE32v9PP4GZsAqGmrD8TdCHLDrknvyB otjY6o4JYMTWlIgIwnwfZOA8mbZsA6W6g0SH+MKFgFlbSoZeE3ffqpxqgH4k+pZyNy1L7Z b0dBcGR54xAqMSzjE5L3jG+0K2BY6p+oGtXom4GCEg1H6Aec5JpinjMuGLoU9vHVnlx0rx 1D9puWC/d+m3J1uq3v7ceUCQ3Y7Hlctgk5aTdw1ZHs9ME8PZAlsSOo5MqooOmWF8OxiYMI cgfX0YIYVY0bGk9RH/2HjjcM3t1Oay2bZiXyuGN6oxS56RpC5fqaw3YTETlEyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDzYg1j4Mz43C for ; Mon, 16 Feb 2026 10:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2730d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 10:30:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7c2fc4419db4 - main - sys/compat/freebsd32: FF clock struct: Don't pack, use 'ffcounter32' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c2fc4419db43a8a7d1886b0b8e08aa97bfa31e4 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 10:30:15 +0000 Message-Id: <6992f1b7.2730d.2ecb61cc@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7c2fc4419db43a8a7d1886b0b8e08aa97bfa31e4 commit 7c2fc4419db43a8a7d1886b0b8e08aa97bfa31e4 Author: Olivier Certner AuthorDate: 2026-02-13 17:03:31 +0000 Commit: Olivier Certner CommitDate: 2026-02-16 10:28:48 +0000 sys/compat/freebsd32: FF clock struct: Don't pack, use 'ffcounter32' Packing 'struct ffclock_estimate32', in absence of substitution of 'ffcounter' (some 'uint64_t') by a 32-bit compatible type, was necessary on amd64 since 'uint64_t' is 8-byte aligned, which leaves a padding gap of 4-byte between fields 'update_time' and 'update_ffcount'. This gap does not exist on i386 (or amd64 32-bit mode), as 'uint64_t' there is only 4-byte aligned. Change the type of the 'update_ffcount' and 'leapsec_next' fields to the recently introduced 'freebsd32_uint64_t', and adapt copy-in and copy-out accordingly. Using `CP()` previously worked due to the '__packed__' attribute. Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55282 --- sys/compat/freebsd32/freebsd32.h | 12 +++++------- sys/compat/freebsd32/freebsd32_misc.c | 8 ++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 5210ce55b228..1436b630689f 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -60,8 +60,8 @@ struct bintime32 { struct ffclock_estimate32 { struct bintime32 update_time; - ffcounter update_ffcount; - ffcounter leapsec_next; + freebsd32_uint64_t update_ffcount; + freebsd32_uint64_t leapsec_next; freebsd32_uint64_t period; uint32_t errb_abs; uint32_t errb_rate; @@ -69,11 +69,9 @@ struct ffclock_estimate32 { int16_t leapsec_total; int8_t leapsec; int8_t _pad; -} -#if defined(__amd64__) -__attribute__((packed)) -#endif -; +}; +_Static_assert(sizeof(ffcounter) == sizeof(freebsd32_uint64_t), + "'ffcounter' size discrepancy'"); #if defined(__amd64__) || defined(__i386__) _Static_assert(sizeof(struct ffclock_estimate32) == 52, "ffclock_estimate32 size"); #else diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 457e599c22d2..1064987c3abf 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4147,8 +4147,8 @@ freebsd32_ffclock_setestimate(struct thread *td, CP(cest.update_time, cest32.update_time, sec); memcpy(&cest.update_time.frac, &cest32.update_time.frac, sizeof(uint64_t)); - CP(cest, cest32, update_ffcount); - CP(cest, cest32, leapsec_next); + FU64_CP(cest, cest32, update_ffcount); + FU64_CP(cest, cest32, leapsec_next); FU64_CP(cest, cest32, period); CP(cest, cest32, errb_abs); CP(cest, cest32, errb_rate); @@ -4177,8 +4177,8 @@ freebsd32_ffclock_getestimate(struct thread *td, CP(cest32.update_time, cest.update_time, sec); memcpy(&cest32.update_time.frac, &cest.update_time.frac, sizeof(uint64_t)); - CP(cest32, cest, update_ffcount); - CP(cest32, cest, leapsec_next); + FU64_CP(cest32, cest, update_ffcount); + FU64_CP(cest32, cest, leapsec_next); FU64_CP(cest32, cest, period); CP(cest32, cest, errb_abs); CP(cest32, cest, errb_rate); From nobody Mon Feb 16 10:30:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fDzYh32y0z6SfMn for ; Mon, 16 Feb 2026 10: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDzYh21m7z3pbK for ; Mon, 16 Feb 2026 10: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=1771237816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBndjh24x0goEyfgMt59+xMiFi9lg9H7tVhmc4OrXEk=; b=wrUxnOIA4ckWp9Y7gkakzhZGQBgKrh1iqemStEDAyQTBiPGMWzhy+9v3o3BEqfohSJ0xRT uqyB/z/OdkL+5Y14dp3XUG9xrY0ziKLzh3nZZp25k0jyejZPDEne1tAjvryIlQMCAIIXzW bZpJTSgIjDzDhqqZwSemf87shKu9W4Y1LitdbGfWS5agVcP61COCosDxz7Yge5JheKyMgH 41OPng27QzzvB5/J3xe0pSFsvZoqfcAqzbnRiHFMEhxoX4xjVmouQ6F2mmeljbNEtV1c6u cxVwXObuEqsmWcJLftOH8OLwZSrcQNeEhQjdqeNWO5DbJJXYYfq1h8Ppjd9XVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771237816; a=rsa-sha256; cv=none; b=iaITH9fTVgcWovpb9TvAJccdo7NASu8gg/cDmIEPzqf8/Rd+GjqgLdM1Al4ggGXfPfBLZ4 elbzU7ZC+xCNTIloJdXMQPyj8lzFExtQEduHSPvVQlNlXt9IMfkA6u/OvT48OHZI6RWisF 2nkQj+oUxPnsmCLuW7zVYe4N4glFtvKtOOdOV5tb+t2YNgtvAnPwVN6i/wlk1yw/XILzJB Q30cx07AdMdiKGm8naixjUrvGnLpWZDxx2GxSKngbAaMRZkMrCCD3RdljbC/vQWtQZhCrK QYI+rXlkIf6MtyLWz/tovwvXWOfwPSSlKodnEjed5Ea5UG6y3s6QVcrDat19cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771237816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBndjh24x0goEyfgMt59+xMiFi9lg9H7tVhmc4OrXEk=; b=ylKgmectKq6va37BRqHCVWDFYndYRQ+3vR4PysjGkf//eDiogCg+BcMmto8PzFrvjtRpXj NVpy6kPwpNRpmb8TFA8AuE+oRVLRFChmJYACJkjUi0q1PKKSIx/K8wTw19aeeVAfuJluZ+ Iw24PKYkRm+e5di3PdkE4klBy0CXHR4FxccrnJYDk836l+dLk6H6Mz48XJfeiTqL0C86bc ZJ9DvhT043sdh/8d207J1KRTxXHQdEWQ2wEj8QGaxq0u3wGNJ+mqD5/h8UQiedctax2IxT KzfZ6LVd95I5Bg1/DTDXU00QTfuumqGh+Vl5F/DLvXMavFRpcaooQUflGO9w8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDzYh1SkCz4Vb for ; Mon, 16 Feb 2026 10:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25378 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 10:30:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 4ccca2100887 - main - sys/abi_types.h: time32_t is 64-bit on non-x86 architectures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ccca2100887943b11187787004bc8efc2a149c6 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 10:30:16 +0000 Message-Id: <6992f1b8.25378.59b9bc83@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4ccca2100887943b11187787004bc8efc2a149c6 commit 4ccca2100887943b11187787004bc8efc2a149c6 Author: Olivier Certner AuthorDate: 2026-02-13 17:20:13 +0000 Commit: Olivier Certner CommitDate: 2026-02-16 10:29:04 +0000 sys/abi_types.h: time32_t is 64-bit on non-x86 architectures As long as 'sys/compat/freebsd32/freebsd32.h' is used unconditionally on all platforms (in 'kern_umtx.c' at least), the rule of thumb is to ensure that 'struct foo32' on a 32-bit arch is type-compatible with 'struct foo' on the same arch. In practice, this is very simple to achieve: All 'foo32' types should be compatible with 'foo' on 32-bit architectures, which is what we are supposed to do already for compat' structures by design. The recently introduced 'freebsd32_uint64_t' type typically supports that. This change fixes commit 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") which was defining 'time32_t' to 'in32_t' for all 32-bit architectures, which is wrong but on i386. By luck, this did not change the size of whole 'struct ffclock_estimate32' (whose size is compile-time asserted) because 'struct bintime32''s one would stay the same, as even if its field 'sec' was incorrectly sized after that commit, the 'frac' one is 64-bit and 64-bit aligned on all non-x86 architectures so its offset in 'struct bintime32' would stay the same. Reviewed by: kib Fixes: 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55283 --- sys/sys/abi_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h index e449c86323f7..44d1bd733bbd 100644 --- a/sys/sys/abi_types.h +++ b/sys/sys/abi_types.h @@ -25,15 +25,11 @@ typedef struct { #endif } freebsd32_uint64_t; -#if __SIZEOF_LONG__ == 8 -#if defined __amd64__ +#if defined(__amd64__) || defined(__i386__) typedef __int32_t time32_t; #else typedef __int64_t time32_t; #endif -#else -typedef __int32_t time32_t; -#endif #define __HAVE_TIME32_T #endif From nobody Mon Feb 16 12:47:06 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF2bb2rgHz6RjRn for ; Mon, 16 Feb 2026 12:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF2bb0nv6z42ph for ; Mon, 16 Feb 2026 12:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771246027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qD8midF8tCn1uE0zY05U4vQgQaQ6GzdQziZqgt28Xcw=; b=Hx7GqkCCu4LiWKDPXi1G4maQokCo8Hs1MDVPnqj8HWhONOjOvyz1xMN2be2EoivJLEueiv DxAh8+U6jhwMh4MdasqOzisqH4NvnQP3UN/JwkzmJKxpLpEAqlq7oKDOCm0Zz+JuAfkjmg Cl0EMUxEnynLOufyCAog5Nfge7qBFq/kdqyoUKpBbSgnIw74SIpP9YIbF4C31COb1O7PfM 75qClbcOAKoCAUJcsL8uncO09/5SqZvunZabCrlpY/r+Hn+4MvouRLl6930AjMj5W+S+CC Pidp92jsUy6OnyN+Lk+NU9qSkQBAmiDOeafqggqQ7WnZJwYUsg+DdW3qLfo7BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771246027; a=rsa-sha256; cv=none; b=fJ/N66QqBPACkHNaULwfvCLeZ5b6nQ7c2Xd2a2GcWSctBrzyZtWwYObx5pLkXBvg69tcWn mn3iXnQtBuQfVdJzYYvIkIHsftJ2wkI6S3PfLAKTNZUj3Ldooa6RHkaNJt8zu0rUUQ0OuW kWiT/s0d+ajJ0QCWQFUnOkhrknBii9sBGXIeQOjiVarp9JaD64AwWWeBAUDLZmydNZWKpj C5y1WaiHnkrhKKSIZsIaLrcepzuCS2Z1VOecer2dMrwCL0MXyMdLdzUzYFGLUxTQerkFyY s/CTvG0GxlP+XW+3Jy3lsEvsobs6kGR+713Z6jvzlQtne9UZFGKdqQbbdFt8dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771246027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qD8midF8tCn1uE0zY05U4vQgQaQ6GzdQziZqgt28Xcw=; b=QvySdzRle2Q8Bgao84W8sFtxJtZRCXDUfjfPCD5yhBvh9sf9nYEP4MRCa0hDUUa7ZVMK0w EBwig9jdp98i0EXB8s1b/SmErQfxpLQ2q5fjZvEFlmHKMkliKY7LpvBYu1ZcR3Pw7XR0x+ 5n1X0Ai14eeyWjv3Tl2QP83Utxp4r5yB6X+n1+IWAveTZbdV8Vuj4cXtqL7XIfxQlljvR0 fIfywvcxxO3LpWyRmAF86AQ1cV55OpH64l6K88F07hGzn0G9UjWZQAcnUQjOg1Vhgu+aVL QGV7R1M0b5Q2c8FD4Hu5m53/jl8zPg5D8RFzcsh6L7h9wyTCfWSCjbUdqkeY9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF2bZ6qktz7xN for ; Mon, 16 Feb 2026 12:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 12:47:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 281282e9357b - main - pf: convert DIOCRTSTADDRS to netlink List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 281282e9357b95b679d36ca6d8561e96c1263937 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 12:47:06 +0000 Message-Id: <699311ca.3cf0a.35dca8f0@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=281282e9357b95b679d36ca6d8561e96c1263937 commit 281282e9357b95b679d36ca6d8561e96c1263937 Author: Kristof Provost AuthorDate: 2026-02-13 16:21:33 +0000 Commit: Kristof Provost CommitDate: 2026-02-16 12:42:50 +0000 pf: convert DIOCRTSTADDRS to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 67 +++++++++++++++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 2 ++ sbin/pfctl/pfctl_radix.c | 21 +++++--------- sys/netpfil/pf/pf_nl.c | 41 ++++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 1 + tests/sys/netpfil/pf/table.sh | 38 ++++++++++++++++++++++++ 6 files changed, 156 insertions(+), 14 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 9025b94249ce..cd484949e4da 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3916,6 +3916,73 @@ pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, return (ret); } +static int +_pfctl_test_addrs(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addrs, int size, int *nmatch, int flags) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + struct nl_astats attrs; + int family_id; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_TABLE_TEST_ADDRS); + + snl_add_msg_attr_table(&nw, PF_TA_TABLE, tbl); + snl_add_msg_attr_u32(&nw, PF_TA_FLAGS, flags); + for (int i = 0; i < size; i++) + snl_add_msg_attr_pfr_addr(&nw, PF_TA_ADDR, &addrs[i]); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + seq_id = hdr->nlmsg_seq; + + if (! snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + if (! snl_parse_nlmsg(&h->ss, hdr, &table_astats_parser, &attrs)) + continue; + } + + if (nmatch) + *nmatch = attrs.total_count; + + return (e.error); +} + +int +pfctl_test_addrs(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addrs, int size, int *nmatch, int flags) +{ + int ret; + int off = 0; + int partial_match; + int chunk_size; + + if (nmatch) + *nmatch = 0; + + do { + chunk_size = MIN(size - off, 256); + ret = _pfctl_test_addrs(h, tbl, &addrs[off], chunk_size, + &partial_match, flags); + if (ret != 0) + break; + if (nmatch) + *nmatch += partial_match; + off += chunk_size; + } while (off < size); + + return (ret); +} + static void snl_add_msg_attr_limit_rate(struct snl_writer *nw, uint32_t type, const struct pfctl_limit_rate *rate) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index d55267e56b4c..1012be53db65 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -597,6 +597,8 @@ int pfctl_get_astats(struct pfctl_handle *h, const struct pfr_table *tbl, struct pfr_astats *addr, int *size, int flags); int pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, struct pfr_addr *addr, int size, int *nzero, int flags); +int pfctl_test_addrs(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addr, int size, int *nmatch, int flags); struct pfctl_limit_rate { unsigned int limit; diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index e8d3a1b8dcc3..608c22141ae8 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -214,25 +214,18 @@ int pfr_tst_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, int *nmatch, int flags) { - struct pfioc_table io; + int ret; if (tbl == NULL || size < 0 || (size && addr == NULL)) { errno = EINVAL; return (-1); } - bzero(&io, sizeof io); - io.pfrio_flags = flags; - io.pfrio_table = *tbl; - io.pfrio_buffer = addr; - io.pfrio_esize = sizeof(*addr); - io.pfrio_size = size; - if (ioctl(dev, DIOCRTSTADDRS, &io)) { - pfr_report_error(tbl, &io, "test addresses in"); - return (-1); - } - if (nmatch) - *nmatch = io.pfrio_nmatch; - return (0); + + ret = pfctl_test_addrs(pfh, tbl, addr, size, nmatch, flags); + if (ret != 0) + errno = ret; + + return (ret); } int diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 7a7655d7d9c8..c2ea65f4b043 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -2467,6 +2467,40 @@ pf_handle_table_clear_astats(struct nlmsghdr *hdr, struct nl_pstate *npt) return (error); } +static int +pf_handle_table_test_addrs(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct nl_parsed_table_addrs attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + int error; + + PF_RULES_RLOCK_TRACKER; + + error = nl_parse_nlmsg(hdr, &table_addr_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_RULES_RLOCK(); + error = pfr_tst_addrs(&attrs.table, &attrs.addrs[0], + attrs.addr_count, &attrs.nchange, + attrs.flags | PFR_FLAG_USERIOCTL); + PF_RULES_RUNLOCK(); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_TABLE_TEST_ADDRS; + + nlattr_add_u32(nw, PF_TAS_ASTATS_COUNT, attrs.nchange); + + if (!nlmsg_end(nw)) + return (ENOMEM); + + return (error); +} + static const struct nlattr_parser nla_p_rate[] = { { .type = PF_LR_LIMIT, .off = 0, .cb = nlattr_get_uint32 }, { .type = PF_LR_SECONDS, .off = sizeof(unsigned int), .cb = nlattr_get_uint32 }, @@ -3154,6 +3188,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_TABLE_TEST_ADDRS, + .cmd_name = "TABLE_TEST_ADDRS", + .cmd_cb = pf_handle_table_test_addrs, + .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 84e9d3a97303..6591c707d9a4 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -82,6 +82,7 @@ enum { PFNL_CMD_SOURCE_GET = 44, PFNL_CMD_SOURCE_NGET = 45, PFNL_CMD_SOURCE_CLEAR = 46, + PFNL_CMD_TABLE_TEST_ADDRS = 47, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index cd83ac90e559..743bfe08557d 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -846,6 +846,43 @@ load_cleanup() pft_cleanup } +atf_test_case "test" "cleanup" +test_head() +{ + atf_set descr 'Test pfctl -T test functionality' + atf_set require.user root +} + +test_body() +{ + pft_init + + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1 }" \ + "pass all" \ + "match in from to any" \ + "match out from any to " + + atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 + + atf_check -s exit:2 -e match:"0/1 addresses match." \ + jexec alcatraz pfctl -t foo -T test 1.2.3.4 + atf_check -s exit:0 -e match:"1/1 addresses match." \ + jexec alcatraz pfctl -t foo -T test 192.0.2.1 +} + +test_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4_counters" @@ -866,4 +903,5 @@ atf_init_test_cases() atf_add_test_case "in_anchor" atf_add_test_case "replace" atf_add_test_case "load" + atf_add_test_case "test" } From nobody Mon Feb 16 15:26:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF6740rvLz6RvyH for ; Mon, 16 Feb 2026 15:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6740LYtz4KmN for ; Mon, 16 Feb 2026 15:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771255568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6OrNEAFuaUPPamvg7D7G4z7pncr4Ze5xk+WeJyaS7Y=; b=gbMUUtXjAPmlkw0sBgxpWqrlr+guU4TpjunI3Rcf/ZjUv1GiuA7A0GIMuR32iCOChE8YQZ HOvNchPfQxIMQg1sucV39nLVI/B1QmiXgmMHyudrSfy/FtyAiX3lMvNpglKq45/M7Cp+Ml DOTbn0hDgTlQJ86ti1eMyf/xN8cDY01VEmXbbYM7kwNKBDkbqfuBdGxOc647RX7CtJqpef D0HtjayF1JEuX2FT6AyEft8+tkMAZkzfs1umEdfIesRdky7G7vGE+SH10majDd7c3OLycO INouimNCHU2+BNfF27nmbqjvoyCAHZuenpDZgEmJI7xEpmbczuDRv6UC5psTAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771255568; a=rsa-sha256; cv=none; b=K0I5ezNiNdWYkL4gywdg27hOmF0s4C14ZFyoaxz3NJ3I+roTqD1M6Gd0h+Qr5PUXGbRkWM 9+dquNHYy6RoD6wtuJ3Q65rxMsmB9XYMvuJRL4fLumIkaux0SS+j1X3WNJQl8CzUF43bEm zALZ/B6nYhK4QJTXYhL4nrfKlfiQtDoLWHFs6BNrTKpPBNKA9uchU3Ibfe17chuC1lW7Fn YnU3g2d0GUVzduBhoQm5QZGHuoYOfkr0lu7Shoo0GZVd1AgNy9GszEuhzuyfWbwchji/bl JmRF36ZfKG/Gkpz8byZ/4RFXqvdzJM9vg6rfGgQf6ni2oYlUIW9tu6iF0itfpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771255568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6OrNEAFuaUPPamvg7D7G4z7pncr4Ze5xk+WeJyaS7Y=; b=LhpHq4jMy3+ly/OprIfRLRqkL+K0u3fCXaYmCudRzAMNUsMVikZC0y6v80kvBUyyroD4oE 4e3l4BVL/oMPz6IfG0p4BLatc/fpwC9QbVYTAsZMnGLDBJC1GgXgCb1yaIPB7dzO36raoK QRCd0/y7dWRh74j5d2w7xkKSHynUfnArqiDNFH7/eFsjEN/KN51yIhqV58MBLVuaN6XskC A51wUjX0allb4kCTv6rUQRKXhsvVpWhlr8n3ZsmAuznDbu/uMpC76MlaMV3XefhybyTrri /KVjWYJuYsITesMfgETeWM1YaKdgnT5osKKV6Bi+/Yxklz7xCMged9jR00/vQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6736pKVzDCh for ; Mon, 16 Feb 2026 15:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e17e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:26:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5bcccc702b29 - main - open.2: stop making impression that fd must be directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bcccc702b29a0e173a5916b001771dd7b280c7c Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:26:07 +0000 Message-Id: <6993370f.1e17e.70f9c4ac@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5bcccc702b29a0e173a5916b001771dd7b280c7c commit 5bcccc702b29a0e173a5916b001771dd7b280c7c Author: Konstantin Belousov AuthorDate: 2026-02-16 07:28:22 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 13:59:43 +0000 open.2: stop making impression that fd must be directory Reviewed by: des, rmacklem Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D55302 --- lib/libsys/open.2 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lib/libsys/open.2 b/lib/libsys/open.2 index a0e905a8f375..b4463180e4bc 100644 --- a/lib/libsys/open.2 +++ b/lib/libsys/open.2 @@ -72,11 +72,18 @@ function is equivalent to the .Fn open function except in the case where the .Fa path -specifies a relative path. +specifies a relative path or the +.Va O_EMPTY_PATH +flag is specified. For .Fn openat and relative .Fa path , +when +.Fa fd +references directory and without the +.Va O_EMPTY_PATH +flag, the file to be opened is determined relative to the directory associated with the file descriptor .Fa fd @@ -104,6 +111,14 @@ it ignores the .Fa fd argument. .Pp +When +.Fn openat +is called with the +.Fa fd +argument that does not reference a directory, the call fails unless +.Va O_EMPTY_PATH +flag is specified, see below. +.Pp In .Xr capsicum 4 capability mode, @@ -421,9 +436,11 @@ by the descriptor at the time of the call. .Pp .Dv O_PATH -returns a file descriptor that can be used as a directory file descriptor for +returns a file descriptor that can be used as the first argument for .Fn openat -and other system calls taking a file descriptor argument, like +and other filesystem-related system calls collectively named +.Fn *at +taking a file descriptor argument, like .Xr fstatat 2 and others. The other functionality of the returned file descriptor is limited to From nobody Mon Feb 16 15:29:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF6Bc4X25z6RwVG for ; Mon, 16 Feb 2026 15:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6Bc1xVvz4LyG for ; Mon, 16 Feb 2026 15:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771255752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DloOcOsbdqhjrE3V1r/tDNytcynSdEdOFofPX0aA3qM=; b=g+rqx0gQlDdUFx3XBloAH+I63nT6F/lu/++HzcRFyh73LnY7Wwc34dvW5V/yAbB76iTpmA 081ek0WLLCx7nANhiDboRy3+HZ3YtqPhSOjFG0IZeXkUzKz3xKVnqPG/B8EuU7V35iV07d ZeS0ZXdZnGS6gBMmVxdANAP/0IJ+r+teaH+XfbqVmq64QClamazzWELsrnj5E9uD9UUjgb OoWLTPKyi8jsbvVbnm2ycWiavkSFSAk3M22eJZnbMMfQteUYbgNr+Jy0brt4aDYpbQ/rLX aqdKXlAncFFwO7tPfTsDBM6VMtv3sVD55LFoSnJIxH2aly1stH2AgJon5/1UOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771255752; a=rsa-sha256; cv=none; b=MLOpUJyPEVKPRZ6DNvpAFBDBalgUaS5wNWQoKo6Ua3Zfs8EiDI7A8N4qrgEIar7jCiwnHB cpPYfwYhE4s2cvQZ7AIjFlWK9AKS07Ah+Zecc29+x8XMlprQpi9T9HsbuFZ79cK48kylLy incjpBdjzQyp+aX1GO/MDjcqa9Y+lpkfnKv21JebE8pdFo3Ytc6sDtJDTN2GRkPz4hcoy5 xcf1y6wiGhwUVV4tIUvcMS6K2CwTLTicNT5Aes7KW5DdQWUYLZ/se5r2Aa/ITplMe0tVLh bxLlSR+fBj3iItWKbPeTaBt9saQ+o52dWB+I7bQJ7ZyVfKcv5VOdOD/IXVtFVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771255752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DloOcOsbdqhjrE3V1r/tDNytcynSdEdOFofPX0aA3qM=; b=Da625uFuQrAngLXO2MTvZN8uOcwent+g+alU/WH6dUQdqoDt6+xDw5K3MeuPK/6qbLtd1q tcaUQM5CdN3zU9LZxy2P0EY2gMIL86BLi6Zagv9opJ9m8oFlzCI4/WAVhBnUKWX3lzAtJL tAEQ1hor7ZX+G3D/uK+pMwoa8r/+XwDneIgEOJCJMjE8mEPudt0hvvhhFhXsnh67h/HuP4 Gu13J26+kJTduFCgVWLoFP6DzDWDedzyf4E5DYgWaRrW50LIzDtmS1CF3C1LYs5Giyo4/A z5Ar6M+WVaOgVocnvFwXWebm4lRdL+cJsr5wqtH3XzWktzjf9ELtF9/DozTiFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6Bc0x56zDCl for ; Mon, 16 Feb 2026 15:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:29:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7ab5e3f29a50 - main - bhyve: Fix a misleading error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ab5e3f29a50bc9294a139cc0e8e661a7c036ba3 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:29:12 +0000 Message-Id: <699337c8.1df24.1dba7467@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7ab5e3f29a50bc9294a139cc0e8e661a7c036ba3 commit 7ab5e3f29a50bc9294a139cc0e8e661a7c036ba3 Author: Mark Johnston AuthorDate: 2026-02-16 14:56:39 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 15:28:49 +0000 bhyve: Fix a misleading error message The ioctl might fail because it's run in a jail which doesn't have permission to invoke ppt ioctls. Reviewed by: jhb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55070 --- usr.sbin/bhyve/pci_passthru.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 662390413dbc..e38dc327fdff 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -987,8 +987,13 @@ passthru_init(struct pci_devinst *pi, nvlist_t *nvl) } if (vm_assign_pptdev(pi->pi_vmctx, bus, slot, func) != 0) { - warnx("PCI device at %d/%d/%d is not using the ppt(4) driver", - bus, slot, func); + if (errno == ENOENT) { + EPRINTLN( + "PCI device at %d/%d/%d is not using the ppt driver", + bus, slot, func); + } else { + EPRINTLN("vm_assign_pptdev: %s", strerror(errno)); + } goto done; } From nobody Mon Feb 16 15:29:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF6Bh25vxz6RwMc for ; Mon, 16 Feb 2026 15:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6Bh1JW4z4Lts for ; Mon, 16 Feb 2026 15:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771255756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5r6Arord7LpQ0Ag+rz8wqN2/Z/A5VVvD6QOQmWqayk=; b=tjKSvGCEM1Vw7fwq6W3//zxsmZ3H2ZvNXZB+TacdB6vBS3Kka8OpB+RphFCvcB13E+pgZI DlgixDjUzsD1JrzfQT8sZjkh6cgK/2C2MHwNpNPUZEWevNaaGqvelQ1tYcWLdfRm+XMHvf K04jlDG3jxg71Z5+tm3Rw7s8UzW0HCtxcnMbO7irfcWjuaQhsZXT4+bb4BHwDF/cBlFGF+ n7ev1L1q8YfGnDYs7/q5ahodO80I7ncTQ8h7jMpxBjS8tuy5P6R9OVu8CAZTe24u+QExdb LTK9/iBy8eGeI+5rabMW4RwjA1r6M6btl35bepmXUAc8fcksbKGhj+5XrND/+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771255756; a=rsa-sha256; cv=none; b=wE9ptUrC/6vLRV1uSvF/s51glfLFw89w0sHSC6t22ADrFmJqnmSKhzEpA538N9YSYsXy6F fJou9fY+p6b8MQUulzO6cLL93mTCP2BO7SXppwVyyVJmkfqZrW1bZtjPbNf3rfplnZmPq2 WNoTdVtqhrdZ1MFEtu642GwZsngPC4m6+tpuUcvI63cDft1AfRwG8+464CKFFXE29acnsp o4mfevOosgJQX7dYpUO4K3sTm8Fe193Qyrzwfl8/dcqf5NC6W6tYxUz3o2VasUrP2sk8O6 k1zUosbnVMLOD/0BVxCe6eI0v3i/bZNoq3G9DmTBfib8NoeDmxf345CWLsCsjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771255756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5r6Arord7LpQ0Ag+rz8wqN2/Z/A5VVvD6QOQmWqayk=; b=ZrybaLxqLxzeifz/Z90Xo3AhwccTAo1h5Eq+mcLqXYVDbRsrQQqj54HB0mnE93lG0snYiH SQJ1/A9gFK38/8/pif0YGkdqZgnxOoUB6DNto2mGlYSL6P6UFBSfDrnRBtdqA8gPqjVCvu 92AOfqwjKLMX8oQQk3/FafDEUUqLHCU1KYCCa1QBXlMXwLF0IMFFOYHNQ7kp5s0i5BMXIZ NjW2Tw0i+i2VCmgPqrQClMHwAUowT7P4ogbEQnl4BtLWHa+uEY+T1YsAt3PTdjq2P4w2C4 eDpB1sO6UUFP2QpiRfK58zeIr3Ji7+iVFb1CIxt6ofTWRCdWh7E92OWgKs8OQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6Bh0VwyzCmQ for ; Mon, 16 Feb 2026 15:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dcc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:29:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c71354030a26 - main - vmm: Allow the use of PCI passthrough in a jail List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c71354030a26900e564f0c80a8abdff7e77b3c9e Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:29:11 +0000 Message-Id: <699337c7.1dcc8.3cb007a8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c71354030a26900e564f0c80a8abdff7e77b3c9e commit c71354030a26900e564f0c80a8abdff7e77b3c9e Author: Mark Johnston AuthorDate: 2026-02-16 14:56:25 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 15:28:49 +0000 vmm: Allow the use of PCI passthrough in a jail After commit e11768e94787 ("vmm: Add PRIV_DRIVER checks for passthru ioctls"), it is not possible to use PCI passthru from jails, as PRIV_DRIVER is not granted to jails. Apparently some users expect this to work, understanding that jailing bhyve provides little security benefit in this configuration. I believe we should disable ppt access in jails even when allow.vmm is configured. To provide an escape hatch for users, add a new allow.vmm_ppt jail configuration knob, and check it when handling ppt ioctls in jails. Also add a new PRIV_VMM_PPTDEV to replace the use of PRIV_DRIVER. PR: 292750 Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55066 --- sys/amd64/vmm/vmm_dev_machdep.c | 14 +++++++------- sys/dev/vmm/vmm_dev.c | 20 +++++++++++++------- sys/dev/vmm/vmm_dev.h | 2 +- sys/kern/kern_jail.c | 7 +++++++ sys/sys/priv.h | 7 ++++++- usr.sbin/jail/jail.8 | 11 +++++++++++ 6 files changed, 45 insertions(+), 16 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c index b84be809ea24..55fccf8f25b2 100644 --- a/sys/amd64/vmm/vmm_dev_machdep.c +++ b/sys/amd64/vmm/vmm_dev_machdep.c @@ -125,15 +125,15 @@ const struct vmmdev_ioctl vmmdev_machdep_ioctls[] = { VMMDEV_IOCTL(VM_BIND_PPTDEV, VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS | - VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL_PPT), VMMDEV_IOCTL(VM_UNBIND_PPTDEV, VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS | - VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL_PPT), VMMDEV_IOCTL(VM_MAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS | - VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL_PPT), VMMDEV_IOCTL(VM_UNMAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS | - VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL_PPT), #ifdef BHYVE_SNAPSHOT #ifdef COMPAT_FREEBSD13 VMMDEV_IOCTL(VM_SNAPSHOT_REQ_13, VMMDEV_IOCTL_LOCK_ALL_VCPUS), @@ -151,9 +151,9 @@ const struct vmmdev_ioctl vmmdev_machdep_ioctls[] = { VMMDEV_IOCTL(VM_LAPIC_LOCAL_IRQ, VMMDEV_IOCTL_MAYBE_ALLOC_VCPU), - VMMDEV_IOCTL(VM_PPTDEV_MSI, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), - VMMDEV_IOCTL(VM_PPTDEV_MSIX, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), - VMMDEV_IOCTL(VM_PPTDEV_DISABLE_MSIX, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_PPTDEV_MSI, VMMDEV_IOCTL_PPT), + VMMDEV_IOCTL(VM_PPTDEV_MSIX, VMMDEV_IOCTL_PPT), + VMMDEV_IOCTL(VM_PPTDEV_DISABLE_MSIX, VMMDEV_IOCTL_PPT), VMMDEV_IOCTL(VM_LAPIC_MSI, 0), VMMDEV_IOCTL(VM_IOAPIC_ASSERT_IRQ, 0), VMMDEV_IOCTL(VM_IOAPIC_DEASSERT_IRQ, 0), diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 09fd3a9048bd..0df21402683d 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -91,7 +91,7 @@ static bool vmm_initialized = false; static SLIST_HEAD(, vmmdev_softc) head; -static unsigned pr_allow_flag; +static unsigned int pr_allow_vmm_flag, pr_allow_vmm_ppt_flag; static struct sx vmmdev_mtx; SX_SYSINIT(vmmdev_mtx, &vmmdev_mtx, "vmm device mutex"); @@ -115,7 +115,7 @@ static int vmm_priv_check(struct ucred *ucred) { if (jailed(ucred) && - !(ucred->cr_prison->pr_allow & pr_allow_flag)) + (ucred->cr_prison->pr_allow & pr_allow_vmm_flag) == 0) return (EPERM); return (0); @@ -459,8 +459,11 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, if (ioctl == NULL) return (ENOTTY); - if ((ioctl->flags & VMMDEV_IOCTL_PRIV_CHECK_DRIVER) != 0) { - error = priv_check(td, PRIV_DRIVER); + if ((ioctl->flags & VMMDEV_IOCTL_PPT) != 0) { + if (jailed(td->td_ucred) && (td->td_ucred->cr_prison->pr_allow & + pr_allow_vmm_ppt_flag) == 0) + return (EPERM); + error = priv_check(td, PRIV_VMM_PPTDEV); if (error != 0) return (error); } @@ -1178,9 +1181,12 @@ vmmdev_init(void) sx_xlock(&vmmdev_mtx); error = make_dev_p(MAKEDEV_CHECKNAME, &vmmctl_cdev, &vmmctlsw, NULL, UID_ROOT, GID_WHEEL, 0600, "vmmctl"); - if (error == 0) - pr_allow_flag = prison_add_allow(NULL, "vmm", NULL, - "Allow use of vmm in a jail."); + if (error == 0) { + pr_allow_vmm_flag = prison_add_allow(NULL, "vmm", NULL, + "Allow use of vmm in a jail"); + pr_allow_vmm_ppt_flag = prison_add_allow(NULL, "vmm_ppt", NULL, + "Allow use of vmm with ppt devices in a jail"); + } sx_xunlock(&vmmdev_mtx); return (error); diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index f8f637fda687..4b971d88f80e 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -48,7 +48,7 @@ struct vmmdev_ioctl { #define VMMDEV_IOCTL_LOCK_ALL_VCPUS 0x08 #define VMMDEV_IOCTL_ALLOC_VCPU 0x10 #define VMMDEV_IOCTL_MAYBE_ALLOC_VCPU 0x20 -#define VMMDEV_IOCTL_PRIV_CHECK_DRIVER 0x40 +#define VMMDEV_IOCTL_PPT 0x40 int flags; }; diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 5111b98bf221..369b6aca926c 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4736,6 +4736,13 @@ prison_priv_check(struct ucred *cred, int priv) else return (EPERM); + case PRIV_VMM_PPTDEV: + /* + * Allow jailed root to manage passthrough devices. vmm(4) also + * checks for the dynamically added allow.vmm_ppt. + */ + return (0); + default: /* * In all remaining cases, deny the privilege request. This diff --git a/sys/sys/priv.h b/sys/sys/priv.h index 9c493629f7cf..1ad6a4882ffc 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -535,10 +535,15 @@ #define PRIV_VERIEXEC_NOVERIFY 701 /* Can override O_VERIFY */ #define PRIV_VERIEXEC_CONTROL 702 /* Can configure veriexec */ +/* + * vmm privileges. + */ +#define PRIV_VMM_PPTDEV 710 /* Can manipulate ppt devices. */ + /* * Track end of privilege list. */ -#define _PRIV_HIGHEST 703 +#define _PRIV_HIGHEST 711 /* * Validate that a named privilege is known by the privilege system. Invalid diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 45eb7dea096d..adba3f34101b 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -833,6 +833,17 @@ The jail may access This flag is only available when the .Xr vmm 4 kernel module is loaded. +.It Va allow.vmm_ppt +The jail may configure PCI passtrough devices for use by +.Xr vmm 4 +virtual machine guests. +This allows privileged users inside the jail to manipulate physical devices +claimed by the +.Dv ppt +driver, and thus must not be configured in untrusted jails. +This flag is only available when the +.Xr vmm 4 +kernel module is loaded. .It Va linux Determine how a jail's Linux emulation environment appears. A value of From nobody Mon Feb 16 15:36:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF6Lt484Hz6RwfK for ; Mon, 16 Feb 2026 15:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6Lt3FRJz4NPL for ; Mon, 16 Feb 2026 15:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t1fL0kIS3m+9SZFVbH0IHRC1UFUUJ6RsQwF4p+iDfU4=; b=X+4gPxeLGToek2zR1bvEF+JwtKQNQD/T19+a32VfHqH978wyV1bDYRwypofXepRXSsQqEU 5Wm9euAx9QIsVSY0Sy4VqWH7+36e7V7BU3PvKFlwdBSnDXE3V2bjMwwALNXJk5o0W+lk8X 2OY9tVJiq+yUk1XBr7FIH5wmRROTSR6u5vRW1YabsYjKqhn6WXwXDcIhDcNCzBFGeRkt/R AGCbf5WEGcP9sK0YYDydsqngfZZtqmSODjQlwRc77bauThElyLUZwYFKW8b/3hhQY7ktxf 0fEGJHksPnc45ZgkJjJBk8ePu2Ji7Xh+AbK5XXIFc7Mv2XEsyNsPQ2JnECQHYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256182; a=rsa-sha256; cv=none; b=wzRXnLVdmbe1F4ZUykTIbg0V7LFxUfVjr8vC3EXCuYDumHWnEJUIjOrJXVIGCW7Ei3IIeN 3iwj+3ZaNkCP2yARUr8XL91xB2/IggSGs26yGYF7Lf8/HVfdM1q0m11YWqhDqvCOKQt2c4 Dr2X2LqIIx+ShdmM+9Fa4HbPlfBIhHsqlZ1IVORicLriC3kHJ+8ByEQSmkyT1q2hRzTY4l Q9yzoudeAtcxZAkwJhGFmee+wcIVSkrmvL5TP1L88VntMfIAqDmfF5LDT9zcfdJ3LjdTzK GwnDRyXUSiPPged+/wA23bOZ0aINGj65mBqkkxLbB2vMucqAbgXGXUeRdynK6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t1fL0kIS3m+9SZFVbH0IHRC1UFUUJ6RsQwF4p+iDfU4=; b=d+G/DtYEuD+n/SdImo/XNVBzMZZjUuBTa9gr+DMropyijHkNuGN1NtNfueR10ltIYOx2xl UEUd2TcUJPFfC7X2/am4lVnDLCwTevoRlSS4uoNxqvL7Xv7JR6YEwAnSEiFZa3QkOxeH5X xsH5eCF7Njvpc2VTHkrGtnOsgSxnxpd0VqnWIsAxLhilxZGkeNAZclQk7O71fDREItK2Hs brSR2aUhHpBS2lYlsf+uWvdAy0E/dRFnQLyb55BI9a1kPeWbXLNYPbGj3EaidXB9gAszTo qklZonll+4aBMej5D2T2x0onYEGwzWsZY5BbFNVlQfIHYdhWdiMR3hA/GJEo0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6Lt2YYwzDH0 for ; Mon, 16 Feb 2026 15:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ebc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:36:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f1f142c01db4 - main - open.2: grammar improvements List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1f142c01db43c7dc8d0d172fc1726da2ee01972 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:36:22 +0000 Message-Id: <69933976.1ebc3.1f0dd6b4@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f1f142c01db43c7dc8d0d172fc1726da2ee01972 commit f1f142c01db43c7dc8d0d172fc1726da2ee01972 Author: Konstantin Belousov AuthorDate: 2026-02-16 15:34:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 15:36:14 +0000 open.2: grammar improvements Submitted by: matteo Fixes: 5bcccc702b29a0e173a5916b001771dd7b280c7c MFC after: 3 days --- lib/libsys/open.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/open.2 b/lib/libsys/open.2 index b4463180e4bc..4527100252eb 100644 --- a/lib/libsys/open.2 +++ b/lib/libsys/open.2 @@ -81,9 +81,9 @@ and relative .Fa path , when .Fa fd -references directory and without the +references a directory, and the .Va O_EMPTY_PATH -flag, +flag is not specified, the file to be opened is determined relative to the directory associated with the file descriptor .Fa fd From nobody Mon Feb 16 17:24:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF8lJ3rLmz6S4s4 for ; Mon, 16 Feb 2026 17:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF8lJ3DYzz3RM0 for ; Mon, 16 Feb 2026 17:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771262652; 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=wlumUAIcnlZ0deaLopdYUn3kvOcUpFt3wNdZZfPH4So=; b=d18GW+ApRq+zMNwNOAyxCt/OBIsppTUTb6SXZRxa6bUAHa1OBgfcpw1IxexyoiK53Sxeon IHSHex0PI0mUg5NE6bHRGT8xOPH7B3+9A5Lzy0Jm81TBlSZrmIbEFM9qaVOXWhTeusvtdp UUaG6Oug7WB77Gt0vmU2x53YavMJ90Kc4aGdCdhvTYHIN20NGMgbOJdDqeHQPW0Ze343uw VSyIxd+g/2aOAdLJDJawMASUHh7OCjg72L2qrNB3RW4HD/6jidjZAHgtQcTBmvfpvF2JyT hoonEgPUmDSokKkvBElZpK1eQZX/M/viiAw5CrzXC2lOQQJdNZMW4g47nt/grQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771262652; a=rsa-sha256; cv=none; b=swoqOvbauy1vl536DapIYJHSamgQHqrbvNw/FjjnydubR6fQYqfiMLcbl8lSDt18tDHWOZ nb/9Snn4vN7/s6eAQ1U8sDQb1wr6unjrCpCgkJVhTccjJBe4hAOI8Y7lmKpuOMo/Nz+oQq R4HTMREifr1pCH5yODSWtEZp82zNdvWk6ocxCJWnPwSpIhQT7JOuG13e4Hra0j5reLGoYf S7l7YTChQA1ZpOLKG9IT4KZqinvWFuKas1qUM7bq9bbQb3AxrAOlla7GeUMNVbmnMm/PH/ 3MGgnn9l9hFDUo6FXDxJNQtXdPQSBrRSqyAYD8FkGwyUVAJOoLgbBLGX2u+NjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771262652; 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=wlumUAIcnlZ0deaLopdYUn3kvOcUpFt3wNdZZfPH4So=; b=ErGV+9XnU8ZR9VWJWhf/XPP2fzidJv96og9elyaND1Dwg0U5+Agu80f7IFLuu9frqhRS7j a+olIodTfYdz/7Vs7Ou6SME69Te6cWm0AVyvAFfICFT+igis+AHPN9thJ8+zth9/F+dzCJ 7ul5bQ/N7HU+NLovoMOys4oBnLaMyhaTpIgfcMz9TeOzDQyWoiC80uo4atXxwDdTXvs/hH zi5VqzyMMzfc5vWBMD7lHouFTqGr/qUhAZvfRZIbLLJ+ihjnY8MOZgTiQhy901yncrSgJV r1Pf2vCsgCiw57/SXwG2Ud3+SOXf5sTWwaz7PaVBnJwpMu2GaVmgJcifsZYmeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF8lJ2mDyzZ7Y for ; Mon, 16 Feb 2026 17:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3268f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:24:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 931d4f0ae4f2 - main - sh.1: Document the exit status of return List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 931d4f0ae4f2dcd088bb92459ff19c8b6aafc2cc Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:24:12 +0000 Message-Id: <699352bc.3268f.48ff4fd@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=931d4f0ae4f2dcd088bb92459ff19c8b6aafc2cc commit 931d4f0ae4f2dcd088bb92459ff19c8b6aafc2cc Author: Artem Bunichev AuthorDate: 2026-02-16 17:14:00 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-16 17:19:40 +0000 sh.1: Document the exit status of return It's not obvious that if `exitstatus` is omitted, the exit status of the function is taken from the last executed command. MFC after: 3 days Reviewed by: jilles, ziaee Differential Revision: https://reviews.freebsd.org/D55026 --- bin/sh/sh.1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 3113c1cf6166..f4340fab6cdc 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -41,7 +41,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.Dd February 3, 2026 +.Dd February 9, 2026 .Dt SH 1 .Os .Sh NAME @@ -1223,6 +1223,10 @@ It terminates the current executional scope, returning from the closest nested function or sourced script; if no function or sourced script is being executed, it exits the shell instance. +If +.Ar exitstatus +is specified, the exit status is set to its value, +otherwise it is set to the exit status of the last executed command. The .Ic return command is implemented as a special built-in command. From nobody Mon Feb 16 17:24:13 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF8lK5Sr7z6S4Vp for ; Mon, 16 Feb 2026 17:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF8lK42dPz3RX0 for ; Mon, 16 Feb 2026 17:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771262653; 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=ax8R49CHzp9IGB6hOl+/SSTFxHK5PdqnAZz5w6rUe04=; b=NRKF+tN0k0JSYlazwYbUMzZMbItktSDEKCvA9Pxr+U4nFROoynxXp3uX0s4sihTwUmaXRA /My8dTNGU6s7Bq57O4j26E6tHPyS9exjKoW60RHZol6zgexrgVn6/WxO3fZ5zxtVIolj69 H4v9/8xyPv59s1D95D07z+xYg+R2kg8bdshVZJG5xVidcIvBjolPk8bBsVI5kFbkAbFRCk 4rhxw3grh0Jx9zCuxix6+hCz93IFR9N3nRFPZE6doZ5tyRRlbb0TawoEt6suZ5PNRsvXg/ 6LrylRc8rxJNRIQLxTsq131OEyx/C5PF9ifgNd2RRZutk1cXNEyt4SlKHHCwJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771262653; a=rsa-sha256; cv=none; b=GqQuMza1xn+GpBHe1RoSukrFsgz0L9bwveaFJNxJyy7MOCabii2Zf2WdEyFyBUMDI58Q45 2CbO1E0lQvbQajeiF4I9EyW/hNllr3VrzihA81kbF2UYUkMSRhzxRJAvM2j4ZgBdyaTMAf vVgRaoLnv9Fomj+eWpsxvbW3m6b6/w9PG4N1c+H1/drBUak13lf3zebK5UGrDgzAnoxlxO /5RergfLKfhuvVNv88hnIslJT7Le7c9uCcnbmKnbtZV9uFrYwi0BpHG7dRVP+A1x9chkVG 8DVcVySN094CB5oexPucDiYqbA+svWFwjtqtj5su3ptmEHwJNqeuRSIfxUCovw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771262653; 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=ax8R49CHzp9IGB6hOl+/SSTFxHK5PdqnAZz5w6rUe04=; b=s7AjtLpcm6IPC0xYCPRjl/oKeTmcDq/VvrWpoG8HADWu793tS5dF2PdLMdN5ECF5AFWAXx lThjzq+lF5LDuufPlcCm+ppfjiUzt9TjfWyUhHTfp89Kn83m1Ke31vwonGOHwrOf8NvJWE CrLuSX8wyGHlwWGcRD7ImHT3SqyDNfb39tqusZ/9PNpKIoXwJ8N1pSB16Dm79Jb6x+IqzH cXvLQi6Ik/E+BVohaWrEqL5qKN+2lAMszyNLe6EVa07lJm+umhOUIECsuGsYq44/8R4kI+ kZN8kg6FQSEKqMyQcXxa6mZUZRkUlOcjcS5wHwVuSw3DHQhhv+SGbDUbyXI92g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF8lK3TRQzYq7 for ; Mon, 16 Feb 2026 17:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32bd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:24:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: e5213ca4a3ca - main - sh.1: Fix ordering of Cm and Aq macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5213ca4a3ca742fd8d3b8db413a561b28fa6989 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:24:13 +0000 Message-Id: <699352bd.32bd6.4f432678@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e5213ca4a3ca742fd8d3b8db413a561b28fa6989 commit e5213ca4a3ca742fd8d3b8db413a561b28fa6989 Author: Artem Bunichev AuthorDate: 2026-02-16 17:21:21 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-16 17:21:44 +0000 sh.1: Fix ordering of Cm and Aq macros MFC after: 3 days Reviewed by: ziaee Fixes: 2711852bd9ac (sh.1: Provide detailed job control documentation) Differential Revision: https://reviews.freebsd.org/D55194 --- bin/sh/sh.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index f4340fab6cdc..dfe5419479a3 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -2554,7 +2554,7 @@ commands. .It Cm - Identifies the job that would become the default if the current default job were to exit. -.It Cm Aq space +.It Aq Cm space For all other jobs that are neither marked with .Cm + nor From nobody Mon Feb 16 17:50:04 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9K84cMpz6S6Vm for ; Mon, 16 Feb 2026 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9K83frDz3Wkc for ; Mon, 16 Feb 2026 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x4ijYrY3+KBhKc/Ri8vGHJ4XWff8z7B5xlco87BlU6k=; b=gT4kxl0OpKQV64QrOEb7YW8PNVBtYKESRPTjEAt9N9aDJu0mQPDsev10hMJRDr2/L/s8jB 77Iw50E5pMR7Td69lqm6lph30TisJiGkOzJAdSlDknaO4PauHCZXUMbx+I0cTOhTIO+v7i ETrlyLS2uo1yCzuKh2D9QKHeb3Izm5IlzdlOVfVIxGACf+R676VKzRGwaHbuXymLFZ51FE B/gdllFqdILA2ORlWPsqxpY04sCvFDrbq4bg0Jjq4sHUYqPGdoQprUsbdtmiyKBrRbilXm LWqhNWyeC0bNXE54FUOBeehqMUCBn6NReurqh9hYnG1H2wTx5nrAftssasJ0cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264204; a=rsa-sha256; cv=none; b=UiP4Roa90fulaGsq5MfP292kuK/kStM3D3nx+uialpBpKCsE5xkVr7Qxu31OeVImE5UtTy g2WA95EQwUwPvwanJKG4tSGSMBg6Fjg+hCI1ZKEbLNXvK8zXCurvGiDuGl4vjYq9mC+afv urTcMjQzuqLXA6LlNxir0JQ7p/mAYJivuh9ckdZmI4c8ExflfYqrjUe7prMzRMQb/qrOLX Ql4NWK5YWsC6aSgxWeytOwBa30MJ+gsjHF9KX3Y7bjD0FNDZJ90rVhdKF0N1hITiJn91ld MnHZooxaFLrDgojvHUhB+7skDD0en81sXxc21Yd2YM6OLPkVq5hz90QPyJJiCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x4ijYrY3+KBhKc/Ri8vGHJ4XWff8z7B5xlco87BlU6k=; b=VFq637Mysai1R/mAViCkuOIbThUlaNWejHrkuYIoV5CTN6++o+Rjfc3NLtJ135vj6+qa8j RyAvFg3dVsdUzDnBWOCLVfSsX48woEdmzPjC8gg4A2B8JMATENzL7a8jUU8/9z0HmP0R+q BM309NsdN22F7Ez/5qxDHA9CcjvNVdGARJy38bj9T6iDr2Iz51Gr7279B8RoQHsGZrddlK cZUSdAVxbnCERVv201o0eXZF1KN+cDCWWMa1wz0aWsbewrpXP0o7eP527cr4PyoYBcitaz UWoaoUAAwP3ch8rXoKi5+2za1eiWm/8jhrRQn9cxCHqjpAH4qxONxtSEkx6EbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9K83CcvzZbd for ; Mon, 16 Feb 2026 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 343e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:50:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: f412a5c565de - main - powerpc: enable HPT superpages by default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f412a5c565dedf5b6ea7cf3e43b57766ec0da63c Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:50:04 +0000 Message-Id: <699358cc.343e3.dc92f23@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=f412a5c565dedf5b6ea7cf3e43b57766ec0da63c commit f412a5c565dedf5b6ea7cf3e43b57766ec0da63c Author: Adrian Chadd AuthorDate: 2026-02-16 17:49:46 +0000 Commit: Adrian Chadd CommitDate: 2026-02-16 17:49:46 +0000 powerpc: enable HPT superpages by default It's time to flip these on and see if anything happens in -HEAD. It can be turned back off before 16.0-RELEASE if there are problems. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D55071 --- sys/powerpc/aim/mmu_oea64.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index a7042ffb02a9..7dfda5776a37 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -1921,13 +1921,8 @@ moea64_init(void) NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - /* - * Are large page mappings enabled? - * - * While HPT superpages are not better tested, leave it disabled by - * default. - */ - superpages_enabled = 0; + /* Are large page mappings enabled? */ + superpages_enabled = 1; TUNABLE_INT_FETCH("vm.pmap.superpages_enabled", &superpages_enabled); if (superpages_enabled) { KASSERT(MAXPAGESIZES > 1 && pagesizes[1] == 0, From nobody Mon Feb 16 17:50:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9K95QXGz6S6Rg for ; Mon, 16 Feb 2026 17:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9K944KXz3WbL for ; Mon, 16 Feb 2026 17:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZ65SqZCuc4EbWXwvnC+HLUbfKLPxsdkSweICZ5BY9Q=; b=KLaMtXZ7Pqv0ZVzTPvmn+TXERNo/5n566KcN1jF8mp/oT37NWz13fFHMRNuLiS7o6VTXQP vkDpAa1ZYGVPS00615pyntfexUL17k2bI/3rimmRjchS1S28DBy6OMs7gRnrfTviGXIJer bpaQrFsegut+RNa9eS7WyjPrvgZCb/FsPyQsWLWcKuu/vMt1fss2Zg9MPo+uVpNybdeYTn m6iUYEQegPeBBfKXQE0a1wKJoRKNDolQKDR/3zHgbXgxanWVZMeCS7fPWB6UzJ2NxdiUEl +jdIM+QPRR6kZcRYtBXqXUVqKALOR6JYy1YwaafFyrm0Leo70saI6xsKgPH/fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264205; a=rsa-sha256; cv=none; b=vnHvHQ5Vl1kIiLfKWJyEJo+CkZZ1Rkbb0q8GBnc+R1l59uQ8iH+HvYaUlvn5LWoPysC7HO i6B38yAz5VJ9uCcHfxC4H2XE3h/vjYzKaKdcXbve/lt6Gwg8R5FW0txITBtee4dJXMAFw+ Rmr4Bf/peEz6zQk6OH2ZhPuRRVMd3xXKpEvwtyLK7iFzgxLO2LqtZACTXvh5X4SLxH1JNO U0mShFRmiBAYO0QAHLbShQLGnlceLVDwSUgsA7HhiVbczxJytdf7wRRAhm1TzKO5796QF6 YUbTm4KK3ovvEK0BYr6JibgM1J58IO755E8nC/+zAeOf4yxhdE49/x40gkphRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZ65SqZCuc4EbWXwvnC+HLUbfKLPxsdkSweICZ5BY9Q=; b=yapWMK3xPADptICnQjA9++AdEDTNNCY1oxfaW7RCVuwyDXuhoX8t5QmPZ5lIJ72A7YE8sI 4vs4GcEyE2pfMHgwtyyMAkETv72O2sqasZViII2DxRN3c4+8AxeXQ5YiSlL7CFa4hj5+V+ ZJmTkeEvJBfXSnJ4bgt3yggawI8N29+SAmwl33xbdRXUCMKD+YPrWmpdbqafc6AOzsO7jM 8NhNKFxvbbnkbrK5taOH8cRAXY9cEcelRGd33nIxEBuVZ5Nns8FOaVXGhJ8E35RIgFc73i 9Yo8fbNlKjny0cFcjMdBqTA6i5pBSfbjHHX0TPwtRc/b4SkimDgZGTyku23FhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9K93XsBzZDL for ; Mon, 16 Feb 2026 17:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 343e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:50:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 995090202cae - main - powerpc: document the magic constants for 16MB page size List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 995090202cae47567cc5b0d92301692d49c1c035 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:50:05 +0000 Message-Id: <699358cd.343e7.33bbc623@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=995090202cae47567cc5b0d92301692d49c1c035 commit 995090202cae47567cc5b0d92301692d49c1c035 Author: Adrian Chadd AuthorDate: 2026-02-16 17:49:52 +0000 Commit: Adrian Chadd CommitDate: 2026-02-16 17:49:52 +0000 powerpc: document the magic constants for 16MB page size After discussion with jhibbits@, we pulled out what is supported here and how it's supported. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55093 --- sys/powerpc/aim/moea64_native.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c index 7714187c2f4d..a3f54940ab1a 100644 --- a/sys/powerpc/aim/moea64_native.c +++ b/sys/powerpc/aim/moea64_native.c @@ -130,6 +130,19 @@ /* POWER9 only permits a 64k partition table size. */ #define PART_SIZE 0x10000 +/* + * These values are derived from the POWER8 user manual Version 1.3 + * (16-March-2016), 3.8.4 (large page support) and 3.8.16 (TLBIE Invalidate + * Entry instructions.) + * + * Notably: + * + * + POWER8 supports an MPSS (Multple Page Sizes per Segment) configuration + * of 4KB base, 16MB actual page size + * + RB[56:58] encoding for 16MB page == 100, RB[54:55] segment either 00 or 01 + * + RB[56:58] encoding for 4K page == 000, RB[54:55] segment either 00 or 01 + */ + /* Actual page sizes (to be used with tlbie, when L=0) */ #define AP_4K 0x00 #define AP_16M 0x80 From nobody Mon Feb 16 17:58:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9VW5Qt7z6S75B for ; Mon, 16 Feb 2026 17:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9VW2NKDz3YT9 for ; Mon, 16 Feb 2026 17:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ShT1c2iFM7+WHVbJqHJHJuFvP75ioNuEu25BO77LxmA=; b=jt5YzNwf7U2z65ZM2Ppv8PcXtyh60KqzS7ssFXF6DAAf9yRktmZi9Ts2DCe2r7cYpiu8Wy gUppbdHFUgNWX/qnAjJF4IfbxjOiIvQVDoAxytS+GuJJ0v38l3FYmaVBLHjgNiTZjEdTDO DG80jZixN3XtuPniJ0/1J5FWpG4501qCObhf8kq+xvUgWRDG1g6oRdD79IFJDil0t1bzyi C2+KNqy2B4pyFe7oFsjm+wVT6xj0Aso9FVqJa6PubtiskS9pRZf0k2oAZa/5VZwK7c2Muz Q2qKYvUT3fs+0tea14B+UhWzbjqVZIWNmr5p0clJKXEsvJMOMVYtP4C6ZqhBlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264691; a=rsa-sha256; cv=none; b=h87QMysWuALRtzE09Ibz7jYV4bg1QHxrw3p98la+Wr8b3uWw9KqcHnnLdx+y58lm+R3t6J /HRltkw6Oxk4UsxTiNg2Nxe4+ul6vOYbuWDQOGPsSc2NV+D3pyftzQo0qW4Ft0fBcTzAct Otn4IHQ8hTFNGHrxsuAuAzwEFOMkYXBuGYux1+cr2w18F+qY6exZ35gYcfYMscrPSMnNso KVknA+I4u+RE+uC0wksvhh+AFE9Gy2w8CJ94D6jyWSwzw7Pukly5q/7NvDaguUlKiomQTq 14bGvfDPr2tLkpOxQA4dLX9nGMY447aXnd+Fi/NRaHp6isTKh2Jf7L4NOg1PBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ShT1c2iFM7+WHVbJqHJHJuFvP75ioNuEu25BO77LxmA=; b=Up0f5tN96Yr69xWh7MqDgUiPwF+lU3mVBuQrPLD0UnVUt670tTu/VeXSMWOOhcYKEqX3+P q7ohcP8gnVbL20bs4pQtsI2COS2uFIVAFSDAcMW/If+hH50R6gJOJFu/OJoCAy9XGhYgEc bHkLWeUZzLz/SDE2UM5Y1K1GfP7cLu8pbSetN0+NzGYkyhdlyGy2D2BdRe5xNy+NM5UAx6 E10K8Bgo+a6VEm4M3B5nSG54qJx4WJLjZVL4ywjUPwy5x2YTarC++qdysd3BrkfFo3oyQo pgxDnWfypTADC+DIhiT+Y/LTfOPis5gre8zl/n6lHKbVeSZSCU/CXX3iH30h5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9VW1415zZgP for ; Mon, 16 Feb 2026 17:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32fe8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:58:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b05be03ceea0 - main - pdrfork(2): do require RFPROCDESC | RFPROC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b05be03ceea0a95f7783ddc890885f34bb4023d4 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:58:11 +0000 Message-Id: <69935ab3.32fe8.761098e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b05be03ceea0a95f7783ddc890885f34bb4023d4 commit b05be03ceea0a95f7783ddc890885f34bb4023d4 Author: Konstantin Belousov AuthorDate: 2026-02-14 16:38:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 17:57:52 +0000 pdrfork(2): do require RFPROCDESC | RFPROC when RFSPAWN is not specified, as stated in the man page. rfork(2) cannot modify non-curproc, which is why RFPROC is required, the syscall cannot act on arbitrary process descriptor. If RFPROCDESC is not specified, the syscall does not make sense, use rfork(2). Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55306 --- lib/libsys/pdfork.2 | 8 +++++--- sys/kern/kern_fork.c | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/libsys/pdfork.2 b/lib/libsys/pdfork.2 index ad7eecb00dae..9cbeb65bc4fc 100644 --- a/lib/libsys/pdfork.2 +++ b/lib/libsys/pdfork.2 @@ -114,11 +114,13 @@ for a description of the possible flags. The .Fn pdrfork -system call requires that the +system call requires that both the .Va RFPROC -or +and +.Va RFPROCDESC +flags, or .Va RFSPAWN -flag is specified. +flag are specified. .Pp .Fn pdgetpid queries the process ID (PID) in the process descriptor diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 6313bf3bb651..36647ae44f08 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -214,6 +214,11 @@ sys_pdrfork(struct thread *td, struct pdrfork_args *uap) fr.fr_flags = RFFDG | RFPROC | RFPPWAIT | RFMEM | RFPROCDESC; fr.fr_flags2 = FR2_DROPSIG_CAUGHT; } else { + if ((uap->rfflags & (RFPROC | RFPROCDESC)) != + (RFPROC | RFPROCDESC)) { + return (EXTERROR(EINVAL, + "RFPROC|RFPROCDESC required %#jx", uap->rfflags)); + } fr.fr_flags = uap->rfflags; } From nobody Mon Feb 16 17:58:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9VX4R45z6S6vq for ; Mon, 16 Feb 2026 17:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9VX1skwz3YQW for ; Mon, 16 Feb 2026 17:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kRDMpkEjCOcAruW51zKSee8QOO0PBotI/4CDFymMiLU=; b=dAnYub3IBkX/VM8A2IEvxnrxruFtgL3ZxDiKXKFnQmRHowtb9QkinEv9l0BmSBzvyb41Bv rXxdhs+H1Qz1P6rN/EaFIgZB+yVKEI85r5mY1HXslJ/f3HBRn/9ugD/PEFIWM9Rt/K64Vx Pf3BA1rLWDvxQJnzSynnV9dblQLA1OiG7V0/F+yxMMTN7EQzlhS68Rj9baAzplVZctEyKg k0RiqHHy42xydj16QhxvGYqWF5BkZVzE5OxrEiO0nhmtBr6E9Vw3kqmUZmABoHBBv2818W qMJxMtRWqrozSQsHuctxaAbIgJDDRkxciXt5MnQjhM09zyoIcJqNGkBEvIDh7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264692; a=rsa-sha256; cv=none; b=CaVQyl6s0oXV8Gl9p0Zozg5tmLBNRnOAaiSeWs17VAWI/DeT3siUBxgHRDIAFkyCuBL5+5 uWr44X/oVDu/2Byz3b+JjDchHMKDCo5yqM6XN+gcwB79Mk3xlCquelwyNZE9XTRks48Zkf TksK36USljPujUlY1Jo+Qp4kYbCmCkBPoglGByP4TMkBlZqHrjwUWho/xC6Wz6GZHHx9zg qjmgUry6WoqgkttUN0H6WaMpZwDMxobF8hz+caCvEuV2KZm0O8b6Zba8D6HJDhbW1eUeyB F8gRDk+wn7d29vw/v6y/w7XCZ07l2F0s5cTi4x7fgEq9c5pm7BpPf2LsGNqN2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kRDMpkEjCOcAruW51zKSee8QOO0PBotI/4CDFymMiLU=; b=v3lBjbLzb6qcpNiAheq1eaZQ9C7DwGt1tjzYdcWjtg3tV+gGKot+5dkdsB3WSD1LoaqHBL fGkvC7/Naa08w5t0fGVsOlDNxBKlKUEzwoqWJzqIdMH+kPcZAF/uMTL3jxTzd3tEkO+i1A 30prChiiVh5QyuHhTIJ7X3PSFXXk22JwhRTUHMkzh1+Ycv7kCWtH7nE+8X78VS0Vv8EPLY yK+hFeU59TaBqf/8baNcyJkNSJyHmUTINMD4Q3m4q8A3CmnqAkE2tNblrVWqFdrlfkO3zh LBGEftZn7mDR/azY0BG6hgoOJ8QExU3BpPP1UAp9Qqfc+8r9hM76NNjBSe7pmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9VX1KGNzb7w for ; Mon, 16 Feb 2026 17:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34136 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:58:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: db80ea9b8862 - main - pdfork.2: add EFAULT as possible error, explain some consequences of it List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db80ea9b88628168d2bb7f17a60b73568a8ea102 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:58:12 +0000 Message-Id: <69935ab4.34136.5f99571e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=db80ea9b88628168d2bb7f17a60b73568a8ea102 commit db80ea9b88628168d2bb7f17a60b73568a8ea102 Author: Konstantin Belousov AuthorDate: 2026-02-16 10:18:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 17:57:52 +0000 pdfork.2: add EFAULT as possible error, explain some consequences of it Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55306 --- lib/libsys/pdfork.2 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/libsys/pdfork.2 b/lib/libsys/pdfork.2 index 9cbeb65bc4fc..49226cf069de 100644 --- a/lib/libsys/pdfork.2 +++ b/lib/libsys/pdfork.2 @@ -205,6 +205,24 @@ may return the same error numbers as .Xr fork 2 ) , with the following additions: .Bl -tag -width Er +.It Bq Er EFAULT +The copyout of the resulting file descriptor value to the memory pointed +to by +.Fa fdp +failed. +.Pp +Note that the child process was already created when this condition +is detected, +and the child continues execution, same as the parent. +If this error must be handled, it is advisable to memoize the +.Fn getpid +result before the call to +.Fn pdfork +or +.Fn pdrfork , +and compare it to the value returned by +.Fn getpid +after, to see if code is executing in parent or child. .It Bq Er EINVAL The signal number given to .Fn pdkill From nobody Mon Feb 16 17:58:13 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9VY4FDfz6S7Bv for ; Mon, 16 Feb 2026 17:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9VY2bxSz3YQX for ; Mon, 16 Feb 2026 17:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=raEPUJfqIdWCZixcnL7CrraBvxJzMHWg4JkWCt20/u0=; b=hijT+efCFLTf7HIuhPuw8O5R0uyb0mPtxWr1j3LC8GmRV6QvX2VHIoDFqQ7T9xjk/enHz8 52ZQTmP+JZiFALOMSzY+Kn523a5znlMPxlYqs12ZRIuQS7z92SXZuh8MIeTfTnzTBu1nxs 5k/OtbX9/gvft/6VaMCF4VkHH9EtkFdzGF1qSAh1M4VXpvfrYxDtMy2UeBb7niOMs1f/eU 7l89e9RpVERrqQaI2X6MDSo60e2NMdO3+MbYgZhbQe8infiOwrOgHCAL+JRJjXOZRqNuCD mI8U5nH0XoVd/SqWIMxdU4I1Lo0gdkprKja+cLyyrM5mLs5d1uanMp+cllyquQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264693; a=rsa-sha256; cv=none; b=RUERr/3HxzCerUTVFBH2J7eP4VBjxfcQHwTOa2tHDF0E4mBkO2CKCIwkkpu+uJhtc7uaep 5nBw4J4bU8hFVeeBNhnFl0sH+3bomV6waBkrRHkqau7zv9+mYuwm2gOlMqX9BnU4KvBzGa yYi3Um3wF7ElhefUlXpMlqYjFvqT/WWw3zC2HBDutzuJw2+gMh9VF81Kau9FcJnpQEuRt4 7hV5jbQj++2hXTRSztxDTOvCQlj/8JylDyXq5AlVk2W4PDcUjT5MC/Ny75dPGCO8cJzfWK doVg47NWq60dmrSI+WlH/EKJxt4oOP2PUZGjpuIvdsX2FQFY+TOK7Y5agtuI8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=raEPUJfqIdWCZixcnL7CrraBvxJzMHWg4JkWCt20/u0=; b=D/6f+a7GRQLsWF0eb+H25gq4wXc30v0b45NF4PCpUgZVZX4KRwNZQr0ZvIlI8q8yc/cGzD Odn5e+ccEuDm9ftEULoPIw2ORfxmedkS30rRdWdit4QkmkHBeKmgaJASO39ZYcuRTJJI7r tBVBq1oYKejAS9TXpWKFmXbeSWOKYEcIyDsWPNIri5VMj0PF9C5ASKvPLwoint189t5DZ8 CaTaK2/MtiHy+KuNDxzWTwhZF2F0OQu/XancZ6pE6CHj+wUJZTpmBa5ytYOo150jHp+VMq PFeMsHAe4pZsFa6CMytql5SAqgwDvfOONnmae1iVSlfNBLLDRtibHhllnr9afg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9VY25VlzZDm for ; Mon, 16 Feb 2026 17:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ebc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:58:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 68ba270f4fc7 - main - pdrfork(2) tests: RFPROCDESC|RFPROC are required List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68ba270f4fc7799929a3d59d710f44e5e9087def Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:58:13 +0000 Message-Id: <69935ab5.33ebc.6ebf11d1@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=68ba270f4fc7799929a3d59d710f44e5e9087def commit 68ba270f4fc7799929a3d59d710f44e5e9087def Author: Konstantin Belousov AuthorDate: 2026-02-15 15:00:57 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 17:57:52 +0000 pdrfork(2) tests: RFPROCDESC|RFPROC are required Tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55306 --- tests/sys/kern/pdrfork.c | 46 ++-------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index fa644b6658d7..7a560e4fa08d 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -107,48 +107,8 @@ ATF_TC_BODY(einval, tc) ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFSPAWN | RFNOWAIT) < 0); ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFPROC | RFFDG| RFCFDG) < 0); ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFPROCDESC) < 0); -} - -/* - * Without RFSPAWN, RFPROC, or RFPROCDESC, an existing process may be modified - */ -ATF_TC_WITHOUT_HEAD(modify_child); -ATF_TC_BODY(modify_child, tc) -{ - int fdp = -1; - pid_t pid1, pid2; - - pid1 = pdfork(&fdp, 0); - if (pid1 == 0) - _exit(0); - ATF_REQUIRE_MSG(pid1 >= 0, "pdfork failed: %s", strerror(errno)); - ATF_REQUIRE_MSG(fdp >= 0, "pdfork didn't return a process descriptor"); - - pid2 = pdrfork(&fdp, 0, RFNOWAIT); - ATF_REQUIRE_MSG(pid2 >= 0, "pdrfork failed: %s", strerror(errno)); - ATF_CHECK_EQ_MSG(pid2, 0, - "pdrfork created a process even though we told it not to"); - - close(fdp); -} - -/* - * Basic usage with RFPROC. No process descriptor will be created. - * I'm not sure why you would use pdrfork in this case instead of plain rfork - */ -ATF_TC_WITHOUT_HEAD(rfproc); -ATF_TC_BODY(rfproc, tc) -{ - int pd = -1; - pid_t pid; - - pid = pdrfork(&pd, 0, RFPROC); - ATF_REQUIRE_MSG(pid > 0, "rfork failed with %s", strerror(errno)); - if (pid == 0) - _exit(0); - - ATF_REQUIRE_EQ_MSG(pd, -1, - "rfork(RFPROC) returned a process descriptor"); + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, RFPROC) < 0); + ATF_CHECK_ERRNO(EINVAL, pdrfork(&pd, 0, 0) < 0); } /* basic usage with RFPROCDESC */ @@ -176,8 +136,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, child_gets_no_pidfd); ATF_TP_ADD_TC(tp, efault); ATF_TP_ADD_TC(tp, einval); - ATF_TP_ADD_TC(tp, modify_child); - ATF_TP_ADD_TC(tp, rfproc); ATF_TP_ADD_TC(tp, rfprocdesc); #if !(defined(__i386__)) && !(defined(__amd64__)) ATF_TP_ADD_TC(tp, rfspawn); From nobody Mon Feb 16 17:58:14 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vb0q9dz6S75C for ; Mon, 16 Feb 2026 17:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9VZ4Fcxz3YLG for ; Mon, 16 Feb 2026 17:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6WwmjRdM6b1k4lOsChbs18Xh/gqOC2DQPf4QB0wkq0=; b=XQ1Zq+AjE9hSqVhAT/q/2L+//B0do+Iegt25V59QFh18SClwxOcz4ZtlGUL86Y8EOOmi3z bEe4OF3mJxJOQYfnfk46whM9GwM2GmO6HtSTRXzzJqysmZjKtcXw9SGI7qSQiCHQr4hpbM aWq8Y4hfRwc+TptMM1NlLA5XYYC6FTlVvde5T5mERlzFFHvXlQYPgWxsfsXKbD1GL4F1WX aoneN2epLwABPfQn4dj9pB2NHIr8PzIbjQqTXHqJTMYhhF6WRIFh/fZL64glgOaGjUd4yS LHvGv2RwCSaKRJEEkkZ3GGmz0feHoVY2k729p/iU0EGsNSmuZDJsgUTcWgiStg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264694; a=rsa-sha256; cv=none; b=wR171FPHiwsof1Db7gUBa58pv2ypNITxFiVIjf2n5Is+UbMS7Jhuv1+iTA30Ov+sEDS7p0 fPGHYwfZRJn+SoqdjDz38fnMxWV6ioyr/Q9mjwkyRT5mAOutT0ocK0kWMzN0WwfrQDU5Sy /ttJvjRlIeiCmVaZhCGC4XKCFOzfs//yWq6tNW4bjXfN/6Q6mOOhljY0ZsbhApBXQOxlzs /jiZRTmRGpUdlV1pEAMcMwmb/46ucA7mOeVK6O7rv/AckYEPb3i6pnDclN5it/JapKUQ9V H24ZGg/AtRKMZFJ3B75ivOQOJHHezP16pPrywBo1JETO78ZCZSV69pcKKIgReg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6WwmjRdM6b1k4lOsChbs18Xh/gqOC2DQPf4QB0wkq0=; b=J97lp2HQftzAVXqHgm5HdbSW5cF4ioG1F9s+tozezEJJDKKL/+bDNadRxpNGjh1SRBaX8p VIrFhRmDDpkQGqaMZXWRO95dHvUg3jnglQsFXv9PbPtTbiHljxA3lSFtaPh2/FZZ3p3Fqy N9hMkKf0LXmdeOU26NAMUdG3lO/dmhMQfU7AlFUO1iByq5Ojx/q8EfhC+VKtXx3hx8O203 MVAt2wqBNemFGd6RGo0ANKPyVVF2B6kV0zqNyFQFpD6rS8g/LjxQ4pKSsGAuGcfVGKBpVp 3DYUBlv5ZfODCbqPhjk2Vvmqt2oazz58AV51NH5qgdnRxQFnosgmEBcEJOidQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9VZ2x47zZjS for ; Mon, 16 Feb 2026 17:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33dd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:58:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d6bf2d14a941 - main - pdrfork(2) tests: do not rely on (int *)-1 being invalid address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6bf2d14a941a88e27a82a3f91790353e134b8f6 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:58:14 +0000 Message-Id: <69935ab6.33dd3.51f55bbd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d6bf2d14a941a88e27a82a3f91790353e134b8f6 commit d6bf2d14a941a88e27a82a3f91790353e134b8f6 Author: Konstantin Belousov AuthorDate: 2026-02-15 15:09:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 17:57:52 +0000 pdrfork(2) tests: do not rely on (int *)-1 being invalid address Explicitly mmap guard and use it as the invalid address instead. Tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55306 --- tests/sys/kern/pdrfork.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 7a560e4fa08d..1003ad9dc746 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -26,8 +26,9 @@ */ #include -#include +#include #include +#include #include #include @@ -93,7 +94,12 @@ ATF_TC_BODY(child_gets_no_pidfd, tc) ATF_TC_WITHOUT_HEAD(efault); ATF_TC_BODY(efault, tc) { - ATF_REQUIRE_ERRNO(EFAULT, pdrfork((int*)-1, 0, RFPROC | RFPROCDESC) < 0); + void *unmapped; + + unmapped = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_GUARD, -1, 0); + ATF_REQUIRE(unmapped != MAP_FAILED); + ATF_REQUIRE_ERRNO(EFAULT, pdrfork(unmapped, 0, RFPROC | + RFPROCDESC) < 0); } /* Invalid combinations of flags should return EINVAL */ From nobody Mon Feb 16 17:58:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vc13yjz6S75D for ; Mon, 16 Feb 2026 17:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9Vb4bKRz3YGF for ; Mon, 16 Feb 2026 17:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4S5wrZxM91W4ERXyZjSlQCdU7imvdreSswATsMCjs0Y=; b=kV/7xyiAtRFQukWq0vcGDr9LjvaWpzdXRvB+IH+lMK6fUU0J8uwhhZXkD00TLoGpxAqhQ6 jdv9uZOLg2SONUR7xhryzisgEyBIfJG/KzH/y42UK0NhkJX3b9ZujYj28VeHp8IAYvNPD+ ljJe2fi+ci3cF4XymJO/yRQ/eeUJUivbhkZc0NeOZiRQjCmhhX7DX7SPvR7+8tnL2QJoLo /ngMt/RmYHiSGO4vDGFH8WZpniPRg8xAGSm4N2+YcZt8NJ1GU4KAPy6DJQ84jIyooGqdeT DA+XpTXXznCzjIRA9Cz25xsc/T2/taJzipC8Ni7nckioENlpX6cFOJo7YhJPcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264695; a=rsa-sha256; cv=none; b=Q+W/MQSHpiA//TziLDrLoqa7X4bYnWifd3SPoyCmEf0Sbcmp5k+dCUZRbWaKltAP/iJ62s qS6QLkj0gfn4SihMxcY2EL5xaILThpN0TjljT2dXZwbLyPtIZl2juZtPr4m1dABXekSuz8 CViNgrdP4Z2sH8Lj9rBptG8o4SzsGnknDVscUMIRoPcKofa/2mWIjINa0g4fNxF6a09o1Q dac4JdDMDBG+5jbJaeo/KFTUHon8Sy7AGyUKBOul5AntMkzyaYKhzvxfSpSypVbwqFkV2T FL5ZCwxkKOs2YWUj+8j7mNKasDwqZzUmv7dMq1EbD+8N2bJvidJ57qgyldZQFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4S5wrZxM91W4ERXyZjSlQCdU7imvdreSswATsMCjs0Y=; b=yi5Vlj8ZR46yyUmjlwWrNiz/L6dNmN8HKcwE0zuEwGn3gJBC52t7iRsOurcTcu+UFidgjO G/BkX7LKRdWL4CfQt5Y9bRqPW+XYAqhnEFAHZ45rpcpIiapKIDshYOLy4LZhWeIKEfnj6F Y04Oxe0iU4abPNnxSbwF7tA3jxb5zzPZo9cPqDtiiO6yttPt5l89v99DTHMfVPGPPQtwN0 PHe07ypAYG6ausBwi8ARvaJ9U+0k8v/U8/Df0l8YJxZXDpzpiLgO4QqbaTuBir1h/hOVBF fRaw4O858w7it2lJnzMgQH+tpNDJBq3zx8T0QWEhRPBnDc0U1valxjiJ4QqQgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vb3kJ2zZgS for ; Mon, 16 Feb 2026 17:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 369ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:58:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 44843695bc4e - main - pdrfork(2) tests: catch runaway child for EFAULT test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44843695bc4e36abd15835d627da7d38c06f2219 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:58:15 +0000 Message-Id: <69935ab7.369ec.59c8421d@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=44843695bc4e36abd15835d627da7d38c06f2219 commit 44843695bc4e36abd15835d627da7d38c06f2219 Author: Konstantin Belousov AuthorDate: 2026-02-16 10:04:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 17:57:52 +0000 pdrfork(2) tests: catch runaway child for EFAULT test Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55306 --- tests/sys/kern/pdrfork.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 1003ad9dc746..943e7fde835a 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -95,11 +95,21 @@ ATF_TC_WITHOUT_HEAD(efault); ATF_TC_BODY(efault, tc) { void *unmapped; + pid_t my_pid; unmapped = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_GUARD, -1, 0); ATF_REQUIRE(unmapped != MAP_FAILED); + my_pid = getpid(); ATF_REQUIRE_ERRNO(EFAULT, pdrfork(unmapped, 0, RFPROC | RFPROCDESC) < 0); + + /* + * EFAULT only means that the copyout of the procdesc failed. + * The runaway child was created anyway. Prevent + * double-destruction of the atf stuff. + */ + if (my_pid != getpid()) + _exit(0); } /* Invalid combinations of flags should return EINVAL */ From nobody Mon Feb 16 17:58:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vd2DgLz6S75J for ; Mon, 16 Feb 2026 17:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9Vc52JPz3YLT for ; Mon, 16 Feb 2026 17:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J1Io8VbB5cpGTc+mCTtILVnsCWT7J094XUmKtMiyCbM=; b=aiZvc9rBkwvFJi6myjrKZTNXI+Lo92i+h/OS56oa7vvYXT6yV6+5SXSm0wAhm/5AHVso53 glX0UtQ8g10okC30XNJoUpem+edmRztnPAYX4BvP9yfvw19Zg2GvmIZ5jgOBh+Whb6yObc m+dem9bo+UzZOXIJ7quiP4GcARiTCJ8u1awBl0gWAsmieVasjT4m7Co7PzwDInJgjxMiYG zz5xUEH6Iy4Axul9u0oyrrbyJ7IyA6xfWK1SAolKhtP+QaJL0kzyZIl3SAVpvhPWf4GCfr /TPj4deLdFESY/TLRSNtWtZ1e398jg2WLkhqsQppFFa429pugZxctwfxQElTPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264696; a=rsa-sha256; cv=none; b=QWu8v6ghAFqd+V5vTYNtocFbUZou+tCa8Xhnc8lfEil2ZVu4Z7tf8js37/E1MOh3QFNNeO U5ciwV7y2DZd8U8tBd2W7u+lnZQ+MOUHlFkIBNYUVfi+/7geLzNkQAYBTcZe6mwtFb610Y 9Y566L0vMrGQtwYNnxvl5pmKpLZItOukaKno9MRDdZqHBjqnCn4rsQ+fTWZAUS3K60fC/9 7XuOkihXCedrsIMBKDIWKOLtHRVpbhDkSyEA7zAv2haRMErO6h9i39V96jU95EQUY1Sf3p DU0J4Bfa3X6k7Zg3xLx6hYxXk7v6sa5OsfdyA+fwxXQwtBmZeU/gLFqc20JACA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J1Io8VbB5cpGTc+mCTtILVnsCWT7J094XUmKtMiyCbM=; b=oS8PyW/J02DOBa40FNR5lnb0uJ8Y5LJJnfBvhcT0vXkCciEathBRIEGJLaWtxhwwtQc0Hz kEU3IksYLN78NK0z5RsqkXUVfXvf9lOap0hROAHZaK3Cd5eOop4sOIinXBK7yPBY8OKlda 4fTEj6xCVo2QHP7Eh0qmsqoilkWD3GnxBMEL+PMMavi6IrXUq6W/LTt9DUmIzZn6gmJR5t T+SaGkV/44Vg546ObpmBobI4b9H3itVbNvzKX+lCbB1UQ/G/Af0L9LJvjE5HtrQ4Q/BPVL eVJKfUobPnB9T6+0Woc16LG6UfS9v26jCATMc4kxQ0Bu0LSJ2ktvJuSUXUd5dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vc4SzzzZxq for ; Mon, 16 Feb 2026 17:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:58:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 94e4de77dec8 - main - pdrfork(2) tests: split basic_usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94e4de77dec809fa5a6975e3495a41d1924c25ad Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:58:16 +0000 Message-Id: <69935ab8.35f9a.2977397c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=94e4de77dec809fa5a6975e3495a41d1924c25ad commit 94e4de77dec809fa5a6975e3495a41d1924c25ad Author: Konstantin Belousov AuthorDate: 2026-02-15 15:22:19 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 17:57:53 +0000 pdrfork(2) tests: split basic_usage into pdrfork(2) call itself, and basic_usage_tail() that checks the pdrfork(2) results. Tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55306 --- tests/sys/kern/pdrfork.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 943e7fde835a..658ffe117bbb 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -36,17 +36,12 @@ #include #include -static void basic_usage(int rfflags) { - int pd = -1; - pid_t pid, pd_pid, waited_pid; +static void +basic_usage_tail(int pd, pid_t pid) +{ + pid_t pd_pid, waited_pid; int r, status; - pid = pdrfork(&pd, 0, rfflags); - ATF_REQUIRE_MSG(pid >= 0, "rfork failed with %s", strerror(errno)); - if (pid == 0) { - /* In child */ - _exit(0); - } ATF_REQUIRE_MSG(pd >= 0, "rfork did not return a process descriptor"); r = pdgetpid(pd, &pd_pid); ATF_CHECK_EQ_MSG(r, 0, "pdgetpid failed: %s", strerror(errno)); @@ -62,6 +57,21 @@ static void basic_usage(int rfflags) { ATF_CHECK_EQ(ECHILD, errno); } +static void +basic_usage(int rfflags) +{ + int pd = -1; + pid_t pid; + + pid = pdrfork(&pd, 0, rfflags); + ATF_REQUIRE_MSG(pid >= 0, "rfork failed with %s", strerror(errno)); + if (pid == 0) { + /* In child */ + _exit(0); + } + basic_usage_tail(pd, pid); +} + /* pdrfork does not return a process descriptor to the child */ ATF_TC_WITHOUT_HEAD(child_gets_no_pidfd); ATF_TC_BODY(child_gets_no_pidfd, tc) From nobody Mon Feb 16 17:58:17 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vf17lZz6S77w for ; Mon, 16 Feb 2026 17:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9Vd5jHzz3Ycj for ; Mon, 16 Feb 2026 17:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aaFKgaRmK0On7E9JYPEp/hxYbV441lq/GbzzuBG9GkA=; b=ekxY5sPPZTF+ytbeMqqH+t4uLxGtE8M6SgUMtiirqKWtSmehd37jyoEcGa4VgRSUsq9EWX d0iYneLA24JVW1voCfm9J2hpV33ov3NgPjGJjA6uGMdbX34f2ZDI8O91rASvHm9EqWoXOm f+aYcP2e3xOTXCu9dSft9vqtxK8fJoCHearoSmRoCTKIs4y6xh7Y8xfg2KJW60B0Aw6qGX 1BKh8XBEPsAv5AhC8sexJrlNqKNJbDRx+1CqdoCS8NaMjwJ+4LPoYaCKFC+/+w5RGvzKJg /XUawzp3TKsDLAdc3WfxRtX67PEdrn2j5AxKgBLtw6sZSn7KYqnbTG0gU2Ch2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264697; a=rsa-sha256; cv=none; b=xrORBIRH3d0JeGfNNl3IjUQ0AZwa/SnPjWjuigkSaAiHlEvLr82c83LNAk9nkPx+pm9DQu +YJlsGTTr97t8kfnHp3xbFniFga4J1FIHm3NTv+qrMhzQ8odBh1GWor54WfzHBm2wHuN9T um24GPJg79kcyzrTlclSXD58zdXJttDCmuDA3iIvKE2qP71ctqLZu4M+Dg3GRBGiNOMts9 NYCM8e12HJLdr4r2nKDCgleH8rQ9Cr8VOnsZ8PAtbwn0lcN8j+by/Jk2yzeWIbLG1VSXM1 hyER8QkcYUBZEPDafYWTOQSIf7X/0/RUFCzoJ6NUU5hdxU21EnXME6EkfYM43w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aaFKgaRmK0On7E9JYPEp/hxYbV441lq/GbzzuBG9GkA=; b=GnhP1Z2CIXLNWplNLQUm7xh/F/rejtmeRDWxyEFJSuuJ30n2LqTHNbvbxrcJQbn1/bux9G lt/lxy7baTGRZngGGYFXcpWrL6LDqvE/eWvaUgQjsqx+8NpJWGtgfNGuAuxbAwzCqXL5aS 3x6RxQmxCudfpMXKMg91gpiD/EqMApXT5a57fUJa4W2OGMgnFTuTVlbYAsaUHahPUXCpBj O/UjK4BvRZm/PdS+vnF4fWFvt0vYp28mM2RQMJnzDPF6rrp5ykAigRRe29aQbtNuPNepjc DlO7KC6Q76O962ju/Gf8sINkeaoGBMjeioOtfafSEIqDsM2+oJkEaOIk16RXbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vd5G30zZxr for ; Mon, 16 Feb 2026 17:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3636a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:58:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f90ee665d035 - main - pdrfork(2) tests: should wait for the child to exit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f90ee665d035a5e4aea0bcaa18793e683ea253ed Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:58:17 +0000 Message-Id: <69935ab9.3636a.587f26d8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f90ee665d035a5e4aea0bcaa18793e683ea253ed commit f90ee665d035a5e4aea0bcaa18793e683ea253ed Author: Konstantin Belousov AuthorDate: 2026-02-15 16:53:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 17:57:53 +0000 pdrfork(2) tests: should wait for the child to exit Tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55306 --- tests/sys/kern/pdrfork.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 658ffe117bbb..8244a34b6577 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -45,9 +45,10 @@ basic_usage_tail(int pd, pid_t pid) ATF_REQUIRE_MSG(pd >= 0, "rfork did not return a process descriptor"); r = pdgetpid(pd, &pd_pid); ATF_CHECK_EQ_MSG(r, 0, "pdgetpid failed: %s", strerror(errno)); + ATF_CHECK_EQ(pd_pid, pid); /* We should be able to collect the child's status */ - waited_pid = waitpid(pid, &status, WEXITED | WNOWAIT); + waited_pid = waitpid(pid, &status, WEXITED); ATF_CHECK_EQ(waited_pid, pid); /* But after closing the process descriptor, we won't */ @@ -93,7 +94,7 @@ ATF_TC_BODY(child_gets_no_pidfd, tc) r = pdgetpid(pd, &pd_pid); ATF_CHECK_EQ_MSG(r, 0, "pdgetpid failed: %s", strerror(errno)); - waited_pid = waitpid(pid, &status, WEXITED | WNOWAIT); + waited_pid = waitpid(pid, &status, WEXITED); ATF_CHECK_EQ(waited_pid, pid); ATF_REQUIRE(WIFEXITED(status) && (WEXITSTATUS(status) == true)); From nobody Mon Feb 16 17:58:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vg3zK3z6S6w6 for ; Mon, 16 Feb 2026 17:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF9Vf6Rvgz3YRd for ; Mon, 16 Feb 2026 17:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x18p/QX25OHYwkTrsit7FYX7FRWwUxCqGuGPSAR568g=; b=Rw6ncyjldcSstuICn8/neF0HxgPlI7QrrqmZdEQc8NxiDt76z6OONFfjSZ/40PljCGB/nO 1qL/FLvK/T5kP+7mWNe8JaRnijco2IP70fQ8jaJK1N/ZKbn3N4qHmVhDLGMqJ90c4/XU4y Cv6TUPumc4yqqzsuOkegxj1Hby2qyW4FQxILM8LgDBC2Vacu9EDIO7/aEHQhUJKrhGi3Kr oJgZ+VrPDpM4G+TqjgcyRpAdC3Yf+rG73K3L9wEB+t58jf6BMvFLjUrD39dDX0qbyx6+am NSXSLbxCcx+mvUj8hV9IEGw4UvtRlX1yc+V0lxTR7b39Tew1ltXXapNpzRpQ/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771264698; a=rsa-sha256; cv=none; b=YWtmOIl4tkiAZu0pG8iFrR3hJmingFY0uKbgBWYXqiLHwdw3xsTmCJQcbNBB4Mx5M6YeH2 YtTpMyzCoup9dBIbtvVj8doD/pOIpZqGZQsXbB6AjmR/LkXq1wgD3ZloIi5jLfgoe42prt SDcdo1VtrzLz/gqFeJD9ps7o5zGcVgByi9dCTdh+X09V/ZTwZHQCNe2TytP4l7HfKy6PPY rk8loNaXoQgW3NQuHePMR3eQ/OsS1m7jiVJ2up8p1rUjvkw0++x6QRtfnfOZJH3qnUMrol ifUgKJcHCHp1R3ei+TseP7c/S/BUebcOS4LliHRKULwHYheLQqVYKIsdWW6Oig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771264698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x18p/QX25OHYwkTrsit7FYX7FRWwUxCqGuGPSAR568g=; b=lPpomtvJeesXBvovWKQohtDX47ivEAT7eImSaqI4zb9DkW7jBnRLwPaI/nFFR6au7Yqr6f Z6RvjEoMHwRDGlCI8CfVzj0YtCIMIEhk9dUwFT9wBN/DTMjcF0duclXIJED+VFT1OqXrHw P+1HYZV1c/BRVwHpq1zYWqXg6dCsvcPFqPvH6FY83q0x2rtPp/E9nwCC0/bjxW2iwEYxd0 fcjJClJLJykmT2klx9sT9DUY7kecReYZAEBFohdsHd34+ge8uy/6WnNegS5fhmcIlrGbvO W6zw9IeLS3jcq50Q/oDdO5rQoX1BPh7oiJfXLEBz3zRmU4gcsnhxk4RLIRLT5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF9Vf61NCzZgW for ; Mon, 16 Feb 2026 17:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3617e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 17:58:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 793e891f4ad1 - main - pdrfork(2) tests: enable on x86 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 793e891f4ad1ef450f562a241fb0bd3b21d72251 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 17:58:18 +0000 Message-Id: <69935aba.3617e.62380cb7@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=793e891f4ad1ef450f562a241fb0bd3b21d72251 commit 793e891f4ad1ef450f562a241fb0bd3b21d72251 Author: Konstantin Belousov AuthorDate: 2026-02-15 15:23:03 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 17:57:53 +0000 pdrfork(2) tests: enable on x86 Use pfrfork_thread(3) instead of pdrfork(RFSPAWN) to make tests working on x86. Tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55306 --- tests/sys/kern/pdrfork.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/tests/sys/kern/pdrfork.c b/tests/sys/kern/pdrfork.c index 8244a34b6577..30045e0a05a5 100644 --- a/tests/sys/kern/pdrfork.c +++ b/tests/sys/kern/pdrfork.c @@ -145,18 +145,31 @@ ATF_TC_BODY(rfprocdesc, tc) basic_usage(RFPROC | RFPROCDESC); } +static int +rfspawn_fn(void *arg) +{ + _exit(0); + return (0); +} + /* basic usage with RFSPAWN */ -/* - * Skip on i386 and x86_64 because RFSPAWN cannot be used from C code on those - * architectures. See lib/libc/gen/posix_spawn.c for details. - */ -#if !(defined(__i386__)) && !(defined(__amd64__)) ATF_TC_WITHOUT_HEAD(rfspawn); ATF_TC_BODY(rfspawn, tc) { - basic_usage(RFSPAWN); -} + char *stack = NULL; + int pd = -1; + pid_t pid; + +#if defined(__i386__) || defined(__amd64__) +#define STACK_SZ (PAGE_SIZE * 10) + stack = mmap(NULL, STACK_SZ, PROT_READ | PROT_WRITE, MAP_ANON, + -1, 0); + ATF_REQUIRE(stack != MAP_FAILED); + stack += STACK_SZ; #endif + pid = pdrfork_thread(&pd, 0, RFSPAWN, stack, rfspawn_fn, NULL); + basic_usage_tail(pd, pid); +} ATF_TP_ADD_TCS(tp) { @@ -164,9 +177,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, efault); ATF_TP_ADD_TC(tp, einval); ATF_TP_ADD_TC(tp, rfprocdesc); -#if !(defined(__i386__)) && !(defined(__amd64__)) ATF_TP_ADD_TC(tp, rfspawn); -#endif return (atf_no_error()); } From nobody Mon Feb 16 20:16:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFDZF1Vh8z6SHs3 for ; Mon, 16 Feb 2026 20:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFDZF123Tz40BP for ; Mon, 16 Feb 2026 20:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771272997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yh7BDk3Hky59/Rs6jsRLFB2W0FyPORv6+WQ+lKs2guM=; b=XOMVf+AlmOi7CZNZpaq82kYMIuQaE2CMACdbRhEJ2blaER59gb1Ou4OJ1nS2R0ZpJYHS0L JWGursllBTFdGNffx6j02NArj4Lv2Ml/h8lqrhGPL9C86+PdtzmzKHWM3c7McHkNJo8d7H 9wxJqMT9VazsGtx/H/JgpWUuOcVmd7hqNeVEprayCyhl075Lvm35yEI9GU2r082s+qhy+e 4mxobE3eNlhokwTsMhg0UMUATXKMzRU6pLsQn/wpnM5dzxSq1oZSlpqsyiFzMEzx49NiCp Tz2/CfuXtXws9sdiE+d1xvrZfseE2xYvzMO9oO9LLXv4N1f4Qc1Uh/0kRiXbwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771272997; a=rsa-sha256; cv=none; b=dHKvwBdDUXnECPTVsrTAkbZ89d5ngHA+HGFIpUZL4cIRRs5y3rwTQxIgV+XIPDuldPmXEG dgWpSh0m5+pLam9S5/BGlh7uai/g3EL+Ojon0nZSpi29dEBcQu9Bh6baJU1hjMtLnpNH0d 8YEz0PzgoBpeK1n7GyfjWnWiWLZB5/Tm0qnt1dokbRkvAuIsuXC1MrW2h8f7LBAm+YlqYD slVwpWEfWHCk645sFeC8AN7OnsCiXg4KaOCtW85FbVIfEjDpA2Y/AlX6sRx0iJRwpg4thX yZWr20yIXkvS3s6fZffqm+NV+d35TqA5tpQj9U4p+FZXzDZ/lor+8oXHwAEm6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771272997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yh7BDk3Hky59/Rs6jsRLFB2W0FyPORv6+WQ+lKs2guM=; b=xVQ9d9ZYmb5fijqFX5cnsryIKFPe3LNH8TQkoI7fZ8mKImuGOF00hIXZzJuQvZgviNCAyP c51zdLtDM7hUqR2N9qaXAi14fKXmSr1zJiuQLvgoc+q98LRikLQDexNuDn7gjpB51xGtMA kTLUm9DpE4N2lc2j6pFPM8B4hlnRXOwN1+aEtHBcBWXGKGVCbgLwSssnkOAS8tKw5VIQ92 hLD/95bPLp0LULFTV/DzKpMUgHV/djylMxyz93eeCjT7FHK6gmZoMOzTjgnFiqqjzJE86E 5e5VCjA+a97L9wOTmUsPNu9P0ySevpfRF0o9QdHAw9h31ci27pzCsdszwWwo1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFDZF0dXxzfXQ for ; Mon, 16 Feb 2026 20:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42646 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 20:16:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 29ec3907f193 - main - syslogd: Improve handling of configuration errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29ec3907f193e205a1c2118c182ec43e51baf717 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 20:16:37 +0000 Message-Id: <69937b25.42646.3f70352e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=29ec3907f193e205a1c2118c182ec43e51baf717 commit 29ec3907f193e205a1c2118c182ec43e51baf717 Author: Mark Johnston AuthorDate: 2026-02-16 19:50:45 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 20:16:12 +0000 syslogd: Improve handling of configuration errors Make parse_selector() print a warning to stderr and continue parsing the config if it encounters an invalid facility or priority. Note that because the parsing is done from a casper service, there isn't a good mechanism to log errors; the warnings are visible only when syslogd is started in debug mode. Reported by: Doug Hardie MFC after: 1 week Fixes: f4b4a10abb26 ("syslogd: Move selector parsing into its own function") Reviewed by: jfree, jlduran, eugen, delphij Differential Revision: https://reviews.freebsd.org/D55033 --- usr.sbin/syslogd/syslogd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index f109fcd02563..1b894ae54fc6 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -2932,8 +2932,9 @@ parse_selector(const char *p, struct filed *f) pri = decode(buf, prioritynames); if (pri < 0) { - dprintf("unknown priority name \"%s\"", buf); - return (NULL); + warnx("unknown priority name \"%s\", setting to 'info'", + buf); + pri = LOG_INFO; } } if (!pri_cmp) @@ -2955,11 +2956,12 @@ parse_selector(const char *p, struct filed *f) } else { i = decode(buf, facilitynames); if (i < 0) { - dprintf("unknown facility name \"%s\"", buf); - return (NULL); + warnx("unknown facility name \"%s\", ignoring", + buf); + } else { + f->f_pmask[i >> 3] = pri; + f->f_pcmp[i >> 3] = pri_cmp; } - f->f_pmask[i >> 3] = pri; - f->f_pcmp[i >> 3] = pri_cmp; } while (*p == ',' || *p == ' ') p++; From nobody Mon Feb 16 20:16:38 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFDZG3sDxz6SHwm for ; Mon, 16 Feb 2026 20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFDZG2Q14z40Bd for ; Mon, 16 Feb 2026 20: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=1771272998; 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=PRuOBdKwq4zA3MBB0c/MUiILlKpMKZM/t/Qj6OUOlfk=; b=w/eMUW3dVThAiaPyWhcWj4YGNElc3GCMCuV+uZ291QK+b7lRfxcSpDagu5+npTQd7PvJ5J C70aMRl0rPyQRBfqkeH7IrKbzjKrVP5km1y/MnByU0ouD/xEiKdTdP1niLOFOpB3o4VNto RYbhgJJW8apX8kxP7gQtNzvpx+/tGp9DH0P824qnINzUxNo33WUmEM6KhXaAv58JuhY3qX 1jlOthq3hgasq7IV3s1U9tfrUe2oouzaTVXwdzHA5Rqivu4xzJkvQX262K6slXLyGl2LBy d51HbDKPbi9jfQl6G5GsUlmLtNvigXVYtnyLCrdxFPbWFVVo+3DQFADUmQZkSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771272998; a=rsa-sha256; cv=none; b=xg+7X1n47/aBb8th07t1kEdxKOSNmZhBfTSLdh6LFwcwij/X9qWWI+RmgJjwv1d3s1DaHY VqWf2pUQOAn357EJtSEDAY/GM5nX582tSCwj0Y+TUZYNq4+SnDvk9wuZQAEHyhr9I69FPh elRmo61qNUcIpD3w+h1qfNM1xmUTGRUhFqvyrRElTFmvaxFsBZoTW0RkEDWwooIPNOXJUc 9fnSlJtQcm71zhC6+9ifQB7CFXB7Bfwzf6dPSlrpklEOe8UMyoszsZ02pTomk04fIbHoGq sAgivDvlFR2K2bPm8iNe9qwMnCgNoTKeJaBl1f9yM2fEjtvtOebAjCcJPPS+mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771272998; 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=PRuOBdKwq4zA3MBB0c/MUiILlKpMKZM/t/Qj6OUOlfk=; b=yIVkpjVHeVIBvLtD56VE+4pszJC8mYpwecekOWpEp2HSYmsewFKXmA+Ys3Cjg5X0Pn3VOp v1nMEFjgvKsZX84VU3g3LcHn0irlLzNLjlgJESNa2TGADbRocK5Kl3h9IqEtOHjLZVX7A2 iQbULloy/wTcgNkShSFmU9YwvNAeP4PbJgZNKbF3G74PNQpAhABxNHAHVdo/Dmk6ON3nSR Agm7hsWR+s7Y2TlRHQScd2tfKqgn/2v3CwLDx6UHGWIh1/CuxP/v/t25YH2eTnFA9EE3Wj tmTJKl7XKUiE7a1TcvjA8t/vunNNIRepsma2FTpyXBtqFWXILrh8LsahNFTTpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFDZG14m8zfXR for ; Mon, 16 Feb 2026 20:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4167f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 20:16:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 757b0bf5cf46 - main - bhyve: Propagate errors from rfb_recv_* functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 757b0bf5cf46230bcbeeb298f734b9bb7cde1817 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 20:16:38 +0000 Message-Id: <69937b26.4167f.2c6c9637@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=757b0bf5cf46230bcbeeb298f734b9bb7cde1817 commit 757b0bf5cf46230bcbeeb298f734b9bb7cde1817 Author: Hayzam Sherif AuthorDate: 2026-02-16 17:46:35 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 20:16:12 +0000 bhyve: Propagate errors from rfb_recv_* functions Update rfb_recv_* functions to return -1 on failure and 0 on success. Update rfb_handle to check these return values and drop the connection if an error occurs. Signed-off-by: Hayzam Sherif Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- usr.sbin/bhyve/rfb.c | 101 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 76 insertions(+), 25 deletions(-) diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c index aeaf8d1c0639..fe6b628f94e2 100644 --- a/usr.sbin/bhyve/rfb.c +++ b/usr.sbin/bhyve/rfb.c @@ -335,16 +335,19 @@ rfb_send_extended_keyevent_update_msg(struct rfb_softc *rc, int cfd) stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr)); } -static void +static int rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) { struct rfb_pixfmt_msg pixfmt_msg; uint8_t red_shift, green_shift, blue_shift; uint16_t red_max, green_max, blue_max; bool adjust_pixels = true; + int len; - (void)stream_read(cfd, (uint8_t *)&pixfmt_msg + 1, + len = stream_read(cfd, (uint8_t *)&pixfmt_msg + 1, sizeof(pixfmt_msg) - 1); + if (len <= 0) + return (-1); /* * The framebuffer is fixed at 32 bit and orders the colors @@ -356,7 +359,7 @@ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) WPRINTF(("rfb: pixfmt unsupported bitdepth bpp: %d " "truecolor: %d", pixfmt_msg.pixfmt.bpp, pixfmt_msg.pixfmt.truecolor)); - return; + return (0); } red_max = ntohs(pixfmt_msg.pixfmt.red_max); @@ -368,7 +371,7 @@ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) WPRINTF(("rfb: pixfmt unsupported max values " "r: %d g: %d b: %d", red_max, green_max, blue_max)); - return; + return (0); } red_shift = pixfmt_msg.pixfmt.red_shift; @@ -382,7 +385,7 @@ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) WPRINTF(("rfb: pixfmt unsupported shift values " "r: %d g: %d b: %d", red_shift, green_shift, blue_shift)); - return; + return (0); } if (red_shift == PIXEL_RED_SHIFT && @@ -400,19 +403,27 @@ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc __unused, int cfd) /* Notify the write thread to update */ rc->update_pixfmt = true; + + return (0); } -static void +static int rfb_recv_set_encodings_msg(struct rfb_softc *rc, int cfd) { struct rfb_enc_msg enc_msg; int i; uint32_t encoding; + int len; - (void)stream_read(cfd, (uint8_t *)&enc_msg + 1, sizeof(enc_msg) - 1); + len = stream_read(cfd, (uint8_t *)&enc_msg + 1, sizeof(enc_msg) - 1); + if (len <= 0) + return (-1); for (i = 0; i < htons(enc_msg.numencs); i++) { - (void)stream_read(cfd, &encoding, sizeof(encoding)); + len = stream_read(cfd, &encoding, sizeof(encoding)); + if (len <= 0) + return (-1); + switch (htonl(encoding)) { case RFB_ENCODING_RAW: rc->enc_raw_ok = true; @@ -431,6 +442,8 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int cfd) break; } } + + return (0); } /* @@ -843,12 +856,16 @@ done: } -static void +static int rfb_recv_update_msg(struct rfb_softc *rc, int cfd) { struct rfb_updt_msg updt_msg; + int len; - (void)stream_read(cfd, (uint8_t *)&updt_msg + 1 , sizeof(updt_msg) - 1); + len = stream_read(cfd, (uint8_t *)&updt_msg + 1, + sizeof(updt_msg) - 1); + if (len <= 0) + return (-1); if (rc->enc_extkeyevent_ok && (!rc->enc_extkeyevent_send)) { rfb_send_extended_keyevent_update_msg(rc, cfd); @@ -858,48 +875,68 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd) rc->pending = true; if (!updt_msg.incremental) rc->update_all = true; + + return (0); } -static void +static int rfb_recv_key_msg(struct rfb_softc *rc, int cfd) { struct rfb_key_msg key_msg; + int len; - (void)stream_read(cfd, (uint8_t *)&key_msg + 1, sizeof(key_msg) - 1); + len = stream_read(cfd, (uint8_t *)&key_msg + 1, + sizeof(key_msg) - 1); + if (len <= 0) + return (-1); console_key_event(key_msg.down, htonl(key_msg.sym), htonl(0)); rc->input_detected = true; + + return (0); } -static void +static int rfb_recv_client_msg(struct rfb_softc *rc, int cfd) { struct rfb_client_msg client_msg; struct rfb_extended_key_msg extkey_msg; + int len; - (void)stream_read(cfd, (uint8_t *)&client_msg + 1, + len = stream_read(cfd, (uint8_t *)&client_msg + 1, sizeof(client_msg) - 1); + if (len <= 0) + return (-1); if (client_msg.subtype == RFB_CLIENTMSG_EXT_KEYEVENT) { - (void)stream_read(cfd, (uint8_t *)&extkey_msg + 2, + len = stream_read(cfd, (uint8_t *)&extkey_msg + 2, sizeof(extkey_msg) - 2); + if (len <= 0) + return (-1); console_key_event((int)extkey_msg.down, htonl(extkey_msg.sym), htonl(extkey_msg.code)); rc->input_detected = true; } + + return (0); } -static void +static int rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd) { struct rfb_ptr_msg ptr_msg; + int len; - (void)stream_read(cfd, (uint8_t *)&ptr_msg + 1, sizeof(ptr_msg) - 1); + len = stream_read(cfd, (uint8_t *)&ptr_msg + 1, sizeof(ptr_msg) - 1); + if (len <= 0) + return (-1); console_ptr_event(ptr_msg.button, htons(ptr_msg.x), htons(ptr_msg.y)); rc->input_detected = true; + + return (0); } -static void +static int rfb_recv_cuttext_msg(struct rfb_softc *rc __unused, int cfd) { struct rfb_cuttext_msg ct_msg; @@ -907,12 +944,19 @@ rfb_recv_cuttext_msg(struct rfb_softc *rc __unused, int cfd) int len; len = stream_read(cfd, (uint8_t *)&ct_msg + 1, sizeof(ct_msg) - 1); + if (len <= 0) + return (-1); + ct_msg.length = htonl(ct_msg.length); while (ct_msg.length > 0) { len = stream_read(cfd, buf, ct_msg.length > sizeof(buf) ? sizeof(buf) : ct_msg.length); + if (len <= 0) + return (-1); ct_msg.length -= len; } + + return (0); } static int64_t @@ -1169,25 +1213,32 @@ report_and_done: switch (buf[0]) { case CS_SET_PIXEL_FORMAT: - rfb_recv_set_pixfmt_msg(rc, cfd); + if (rfb_recv_set_pixfmt_msg(rc, cfd) < 0) + goto done; break; case CS_SET_ENCODINGS: - rfb_recv_set_encodings_msg(rc, cfd); + if (rfb_recv_set_encodings_msg(rc, cfd) < 0) + goto done; break; case CS_UPDATE_MSG: - rfb_recv_update_msg(rc, cfd); + if (rfb_recv_update_msg(rc, cfd) < 0) + goto done; break; case CS_KEY_EVENT: - rfb_recv_key_msg(rc, cfd); + if (rfb_recv_key_msg(rc, cfd) < 0) + goto done; break; case CS_POINTER_EVENT: - rfb_recv_ptr_msg(rc, cfd); + if (rfb_recv_ptr_msg(rc, cfd) < 0) + goto done; break; case CS_CUT_TEXT: - rfb_recv_cuttext_msg(rc, cfd); + if (rfb_recv_cuttext_msg(rc, cfd) < 0) + goto done; break; case CS_MSG_CLIENT_QEMU: - rfb_recv_client_msg(rc, cfd); + if (rfb_recv_client_msg(rc, cfd) < 0) + goto done; break; default: WPRINTF(("rfb unknown cli-code %d!", buf[0] & 0xff)); From nobody Mon Feb 16 20:30:47 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFDtw3PMQz6SJqf for ; Mon, 16 Feb 2026 20:31:04 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) (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 4fFDtw1Qyhz42Xw for ; Mon, 16 Feb 2026 20:31:04 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-4375d4fb4d4so2925131f8f.0 for ; Mon, 16 Feb 2026 12:31:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771273858; cv=none; d=google.com; s=arc-20240605; b=DLHgPc6kSNuUkoC0LVBtFcrbK0dCYoFYrmKaC49mQKwsEC3OGvd9QHIP6/QI1MtbB+ 572n7FXGVREcf+TauV3zMnIWzZElCuudz+JjVyIWmImZkiy7J/p/SScLHMHG3xFrP8TI K4PPMRFfCmmuzMg7ys3DkyHLYaV6ks9/1V9lrV5NnCCVXqbu575mEruzo6ZsfMRJ9f1C xsnqPj5hPReMwk3OsuKjO97LlxOPU42rLxexOzCD7iwexQnlJ9ttbVPYv6QupxXReZw4 8tObKJWpgJzJ9+Vrv46ERF87raik6BRK9NAObv8l10+3B6RbF3pLJd0GlI8BXLDXE8Fg I+ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:cc:to:subject:message-id:date:in-reply-to :references:from:mime-version:dkim-signature; bh=PepELcEoFIiUyF1oBoKh2KdPlkrXVEu2CncTY7edj64=; fh=9bMH/jhaF0dqX0tnnyjVhgv70TSzBFGy2NQ4qjyUyPs=; b=D1J+x+gKciycwAN53LiXjlthe4XBo+zDrW1Cpsc1WSndVQ5TuaJbCHI9kAKG8Ee480 +O1Xy9aMITqfJyRA2NqyZ9WhCbD8+zkBMKU6WhzLqqTQrtCUFGhNtWY86M+b02Z+hQmD +eLRv7vS7+w+YMIyInOoyYAB1yzDLOoemvbG9e6xSAaRPIbUAuCCBINZYdI+tTHEznGq 7AMQ8ElgDYybnGzW9XeyyWs1Okja0M97/m94ttVeWs/ScgN5kOkm5iUUyURiYtLVVcVo NbOw0Xf9F/oj0ThNe6+KHZV9DKyRVY5cR9l0rtW0S9Z8Ug9Xk5Tz35dbQSP09jtDg0BE OGwg==; 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=1771273858; x=1771878658; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:in-reply-to :references:from:mime-version:from:to:cc:subject:date:message-id :reply-to; bh=PepELcEoFIiUyF1oBoKh2KdPlkrXVEu2CncTY7edj64=; b=O/fwjQX2q52EtpLfX4qjaP9Psa0NcmpcrPK4doHvPCLib6qd+rgpuHsdr82BQnNPI7 NCnHnpcyTqi2r55rJP5NblYmB541zJ3ClU6c7J0NrYgji7nksQ2B4KDS/eRE8JTzLvbo 7iaVNs/o7EmkrowMbk2kbrm0woVVlFAzdDZyKKK439xSZbDRxLKQDM4Ak2+K/AU1f0pL AVlxS++ILWWhLRMd+muD9puCI3oHgS+aiGDK+1Qi0iOUIlQxZ/IR6oNDp3P2/3PZ10Gu BdenAS2tPl0mhj35DRmutreteuVCFW12Kp/FzHpxmdhVIYEk+lN18XBpSF69pvRXLyD9 7yVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771273858; x=1771878658; h=content-transfer-encoding:cc:to:subject:message-id:date:in-reply-to :references:from:mime-version:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PepELcEoFIiUyF1oBoKh2KdPlkrXVEu2CncTY7edj64=; b=DWtRQAAFkIqTCja50lTbfpt3E5BMulIAYcMPLLfi5N0sJMCqCHhMw+0PmCRsltkplO VjY+/tJF8MM2IjRqQ+P9bZfwdJgj6AGXqX7n9qX34QKlF2A4DMo02MXNQWfVr7s11TSA PpS60IzQzxAs0ZeNzrCWpt5ANEIzwsw9LNGbYSbJiitwMj2NnMG6D20HGd16uwwDzEkj a6A7AfpgAT0W+ATQvWLiwveUXeBMwxUWhXtX6EjGaGCaPm1OIa7lv6Cmg75JpbKL8Fbc V1qHJJqk9vQNrTxHVMk3POamDN3CCQ+Znlv2YskmDYPPIiJW3aIDZu9ufR5ka7lolFtP RMJA== X-Forwarded-Encrypted: i=1; AJvYcCVVPc9ydN/utKCp+1oxdZJ4NmPOHm/dUeehvV967LNFPlZo/cQIqGuOskkjK5inQuvDP+ycx295FsjLSJYR+mMWUd4OeA==@freebsd.org X-Gm-Message-State: AOJu0YzhnhPpOt3lz64P3LVQl8/PiUrnt4QJ5KZm3zJb2r4n2Mx0ZGyi xN5p8J8Un6Sm6oSfWXbVOeHjqyTHHGUuNTjx/lYARLZrq1GyEl6OkbrKiAtmYpWV+u4RBLSXjvh eWaSEETMfBB2f47wfO6BDFI9owokxPaOemw== X-Gm-Gg: AZuq6aI6C5Da1Hfg4qZ1rmdVy//C6Sg9EfQKnKFAR8L/qGOoYaMlxnNH2q/7ajxuV+j yloEiqbsL74OyWkxpd6RdRaHcz2V9cah/bquXAqa8OGsXjb6jpzEOGl5iQmbBfDoM3Z/WCXyy4k 4d4Bmi5Jgz9GaKmY6o3hiG/cKVq9t0ihuwRD3wBegCRjucch40/+JlBLpi9eX+sPAh9gcpkH8GQ ArCrO6bKub5gEgCJElaTCS5VGf0W/q955Ly/fKqKvB9/9mNGgYMV3poHWb2Q5gByU5mZsgJ9V31 HRXexwp1 X-Received: by 2002:a5d:5f82:0:b0:437:6b73:ffb1 with SMTP id ffacd0b85a97d-4379790e752mr21209396f8f.30.1771273857748; Mon, 16 Feb 2026 12:30:57 -0800 (PST) Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Mon, 16 Feb 2026 12:30:47 -0800 Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Mon, 16 Feb 2026 12:30:47 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 From: Ahmad Khalifa X-Mailer: aerc 0.21.0 References: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> <0B6A645E-D9E4-4337-B280-7E3CBA1FDC1B@freebsd.org> In-Reply-To: Date: Mon, 16 Feb 2026 12:30:47 -0800 X-Gm-Features: AaiRm52xsaAxLnuZLRhFgxSjk3Iz41Im4hXy9iMRVKh9YFZC56BlzSt9Au7y8Eo Message-ID: Subject: Re: git: a60e7e6ff0ec - main - stand: compile ia32 EFI loader with -malign-double To: Warner Losh Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4fFDtw1Qyhz42Xw X-Spamd-Bar: ---- On Mon Feb 16, 2026 at 3:29 AM +0200, Warner Losh wrote: > On Sun, Feb 15, 2026 at 8:56=E2=80=AFAM Ahmad Khalifa > wrote: > >> On Sun Feb 15, 2026 at 4:27 PM +0200, Ahmad Khalifa wrote: >> > On Sun Feb 15, 2026 at 4:02 PM +0200, Jessica Clarke wrote: >> >> On 15 Feb 2026, at 13:56, Ahmad Khalifa wrote: >> >>> >> >>> The branch main has been updated by vexeduxr: >> >>> >> >>> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3Da60e7e6ff0ec1fdd66c2568ac6c03b= 843dbb3c9d >> >>> >> >>> commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d >> >>> Author: Ahmad Khalifa >> >>> AuthorDate: 2026-02-15 12:23:26 +0000 >> >>> Commit: Ahmad Khalifa >> >>> CommitDate: 2026-02-15 13:30:06 +0000 >> >>> >> >>> stand: compile ia32 EFI loader with -malign-double >> >>> >> >>> The UEFI spec says: >> >>>> Structures are aligned on boundaries equal to the largest internal >> >>>> datum of the structure and internal data are implicitly padded to >> >>>> achieve natural alignment. >> >>> >> >>> By default, structs containing members of type "long long" have 4 >> byte >> >>> alignment on i386. This caused some EFI structures to be subtly >> wrong. >> >>> >> >>> Fix this by compiling the ia32 EFI loader with -malign-double, wh= ich >> >>> bumps the alignment up to 8 if such members are present. >> >> >> >> This seems like a dangerously big hammer. Are there any types shared >> >> with libsa or the kernel itself that would change layout? (I suppose >> >> for the latter they already need to be aligned as the kernel is 64-bi= t?) >> > >> > For the kernel, any shared types would have already needed to be >> > aligned, yes. I didn't consider shared types with either libsa or libe= fi >> > though, I'll look into it now. Nice catch. >> > >> >> Okay, so libsa, libefi, liblua and ficl all share types with the loader. >> Quite obvious in hindsight... I'll back this out until I come up with >> something better. >> > > Yea, EFI lives in two worlds: The world of having to make UEFI calls, > which has one calling convention and ABI (including structures), and then > it also lives in the world of creating some binary structs for the kernel= . > These > have to agree somehow. > > It's even worse, since the 32-bit loader code is also shared with the BIO= S > loader, which has some different layout conventions... > > If we have to do this, we'd likely need another libsa32 etc for the new > conventions. Yep, that's the problem I ran into. I'd rather we have a more elegant solution, but this is the only one that comes to mind. > > I'm curious, which structures does this affect. UEFI / EDK2 tries hard to > make details > like this not matter. I ran into it with EFI_MEMORY_DESCRIPTOR. It wasn't immediately noticable since the kernel parsed the memory map with the correct layout. However, something as simple as this causes problems: struct { UINT32 a; UINT64 b; }; I looked into what EDK2 does, and it seems like they just pass -malign-double to their IA32 builds. > > >> >> >> >> Annotating just the EFI types would seem more appropriate, like how w= e >> >> annotate function pointers to use the Microsoft calling convention. >> > >> > They're all under contrib unfortunately. Not sure if we want to >> > introduce that big of a diff with upstream. >> > >> >> >> >> Jessica >> >> From nobody Mon Feb 16 21:16:30 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFFvk41fNz6SNHS for ; Mon, 16 Feb 2026 21:16:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (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 4fFFvj5C5cz46tJ for ; Mon, 16 Feb 2026 21:16:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-35305538592so2542972a91.0 for ; Mon, 16 Feb 2026 13:16:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771276603; cv=none; d=google.com; s=arc-20240605; b=RZtFUJA18LiHcn0pCliAgUTvTj3fgLPswBuPLfHb3PJYQ5r76QSEIlfXNukfSxW93L D1cMqbz2ELSpAGDxoRVIJBaKxB7fXudHruBshw/0eZp1aUbBCERRJNaiuV+TjmEb1ZB5 SaQj6MykvCvhLqQKBRXiVn5EXmwUYqOBQFh5ZqZBcoXpuKh9Rzrh4ykxa01+sNoN27R5 BnvMeAizcQaulKECCmSBBYxyMyH87bZPcMoqWX9U9c5t5qIAUcX+qZR2e3gQQ86xPGl0 N39CzoKC49MBoNuxicDgvE4196e4/dyUyaeaGq+xDX5MplPTI0lw0hyWW0uVCMxmn0gr X3Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=schAtvbneMBp6XiAV+6fB3pULomI+pBSE5fYCQHCVMQ=; fh=fJ+IseDLEaPi7JFg0RVLidTmw1oR4gaWrjD+suhmWzQ=; b=OpCJ327z9s0p1PlsFiRKtxiSx8msK5mmRFkmeltFwl6ko6XJdL9kej+vbKN3S06TAi iOeam1t4bG1U4Xqylw/P3hVunVDPTK3PMRctQCkfCgjpF7H17FpA8TOc3uWKDCnhvCwq IunYeRn4y0QHrhWQdvqJ1ymcf5tquYi+Ye49hveOzrZKepbSVW8MjGRZFU2EWuyRyRHW lWWyEwVCvc8Ld53ZlHNyQ1c24MWhTBpF1pyejKctV7heyLmNXjXKsXBTu6CBkvMusL0N sgc3B1ehf5f0LPApPGmsnFhw1FgiMWDpCkZYddme9cs9CzRrEq3U+crogYx5pjnqcEW3 7UrQ==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1771276603; x=1771881403; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=schAtvbneMBp6XiAV+6fB3pULomI+pBSE5fYCQHCVMQ=; b=oBOOcAXfHn+mRkrtE6OR2iFVtc23kgi/FhZPvBj0TrNPvoQIoqWyE0KNFz8J9eqPLL EMCyNllcy1jGqQB9oqNkvmm4n27/yylqsjRvpeXq3pV4IQr5/Ey6tgWGJcrSWF4iHiKZ ofCv4v1Ztmn2yhtno/fvnEOPok1eiySVqvOfZO6BeNW7gsEsVoBl2Hz801BPSQuaYA2+ Kc5yQXShpUx5xK6PUdxdNEhsEI8txgq7Rmtb/mHEfr3Cl/hX6rF3JRKI/LYuW5DLYOEg e97fuKwUmIa0WYZQAHyxUksNXO7PUHwZQgPViO97EbxS7yfAz9dzU5PniIqm1sBijK09 12Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771276603; x=1771881403; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=schAtvbneMBp6XiAV+6fB3pULomI+pBSE5fYCQHCVMQ=; b=MLNwcLnqI382nSdgusc4TP3l5zl0cVlszNtx1rplbSbs9WefBdnyam326+2p04SVs3 f5NSXwKbBhSM8C2e40y7/AfGPf51mj3Bpv5N0T5T+zClTfsyNibP9eArBdn8C9MW0swK X5EJsap+w/1GtNXzJrAhterktvKVWh8+8ByreMTdl/WKOCkTKyHk84r7yCLWxe5+rOTM WA13kvVjX/8HNDhmpyuVPAxmuNssYOjVPlhDv7f/EQ5WyJj1fOrkmD3tRfmvCLk+WU75 7Z9vdUMbGZr1B3TgVBLg1A7CjOJCRtOq4MnWLk2Mw5neY5ylmiC9s0VhEryTcL+3ru4R 89Lw== X-Forwarded-Encrypted: i=1; AJvYcCXN6pCwvSLiv7r94hfD83jGJWTCuG4GA20qWMVf/5ID2bvVdO8MeFBxw54wdmt4FYkIMKdFXKHwV5xRdM1g7TkXd8w6aA==@freebsd.org X-Gm-Message-State: AOJu0Yz9VUKNK4k7qnb5G64t0x1RHYvmy36w9wm8gGaE4bDUlMwfjTSv EOxfrLLHkf32W3VtAj1KmWmOBM8tiwzoz2ZYGvKww6kpLMkw2AkBDiXmOTgbzhfb1vGF4TF+FhA 9rwwO515tTaMBUmkwCodb/qoi+OmQOLEMSy6PDRcdHg== X-Gm-Gg: AZuq6aL54BWV4DhohtOEQRcRTayYUDSK1s1XDKyH/JaNoYyH+E9WQfW5Jqxa0xz8Fbk JJrOfQeEs8pW6j9mNEXZn2DHhnngB+IIVSaUbAkeugye/slIgaWzQy6CymYruJjCHr+1VgcFvpt +X2CuUt+gz0QUVmAfOkzSiG1HRs+x55u8gxJUx/M5PVQr5fvD8NvbRJqDRspIP1Igon2hFxkfe/ 95d6zL4UDpEmcpC9iQN+8Ksln9t/8Ekgn5WESh6MDrH/wSxnDgG31jvhEsoSnrSI/e1syb4hcpS YDKhg8M= X-Received: by 2002:a17:90b:35c7:b0:356:2c7b:c013 with SMTP id 98e67ed59e1d1-35844fc83f5mr8578906a91.29.1771276603459; Mon, 16 Feb 2026 13:16:43 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> <0B6A645E-D9E4-4337-B280-7E3CBA1FDC1B@freebsd.org> In-Reply-To: From: Warner Losh Date: Mon, 16 Feb 2026 14:16:30 -0700 X-Gm-Features: AaiRm52L-tKTtysf8z1JrzZA5d2Kv9vccHYioMiyirpFMTe7KOsu3FwL5U6l9Z4 Message-ID: Subject: Re: git: a60e7e6ff0ec - main - stand: compile ia32 EFI loader with -malign-double To: Ahmad Khalifa Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000bf9a2f064af77824" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fFFvj5C5cz46tJ X-Spamd-Bar: ---- --000000000000bf9a2f064af77824 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Feb 16, 2026 at 1:30=E2=80=AFPM Ahmad Khalifa wrote: > On Mon Feb 16, 2026 at 3:29 AM +0200, Warner Losh wrote: > > On Sun, Feb 15, 2026 at 8:56=E2=80=AFAM Ahmad Khalifa > > > wrote: > > > >> On Sun Feb 15, 2026 at 4:27 PM +0200, Ahmad Khalifa wrote: > >> > On Sun Feb 15, 2026 at 4:02 PM +0200, Jessica Clarke wrote: > >> >> On 15 Feb 2026, at 13:56, Ahmad Khalifa > wrote: > >> >>> > >> >>> The branch main has been updated by vexeduxr: > >> >>> > >> >>> URL: > >> > https://cgit.FreeBSD.org/src/commit/?id=3Da60e7e6ff0ec1fdd66c2568ac6c03b8= 43dbb3c9d > >> >>> > >> >>> commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d > >> >>> Author: Ahmad Khalifa > >> >>> AuthorDate: 2026-02-15 12:23:26 +0000 > >> >>> Commit: Ahmad Khalifa > >> >>> CommitDate: 2026-02-15 13:30:06 +0000 > >> >>> > >> >>> stand: compile ia32 EFI loader with -malign-double > >> >>> > >> >>> The UEFI spec says: > >> >>>> Structures are aligned on boundaries equal to the largest interna= l > >> >>>> datum of the structure and internal data are implicitly padded to > >> >>>> achieve natural alignment. > >> >>> > >> >>> By default, structs containing members of type "long long" have= 4 > >> byte > >> >>> alignment on i386. This caused some EFI structures to be subtly > >> wrong. > >> >>> > >> >>> Fix this by compiling the ia32 EFI loader with -malign-double, > which > >> >>> bumps the alignment up to 8 if such members are present. > >> >> > >> >> This seems like a dangerously big hammer. Are there any types share= d > >> >> with libsa or the kernel itself that would change layout? (I suppos= e > >> >> for the latter they already need to be aligned as the kernel is > 64-bit?) > >> > > >> > For the kernel, any shared types would have already needed to be > >> > aligned, yes. I didn't consider shared types with either libsa or > libefi > >> > though, I'll look into it now. Nice catch. > >> > > >> > >> Okay, so libsa, libefi, liblua and ficl all share types with the loade= r. > >> Quite obvious in hindsight... I'll back this out until I come up with > >> something better. > >> > > > > Yea, EFI lives in two worlds: The world of having to make UEFI calls, > > which has one calling convention and ABI (including structures), and th= en > > it also lives in the world of creating some binary structs for the > kernel. > > These > > have to agree somehow. > > > > It's even worse, since the 32-bit loader code is also shared with the > BIOS > > loader, which has some different layout conventions... > > > > If we have to do this, we'd likely need another libsa32 etc for the new > > conventions. > > Yep, that's the problem I ran into. I'd rather we have a more elegant > solution, but this is the only one that comes to mind. > > > > > I'm curious, which structures does this affect. UEFI / EDK2 tries hard = to > > make details > > like this not matter. > > I ran into it with EFI_MEMORY_DESCRIPTOR. It wasn't immediately > noticable since the kernel parsed the memory map with the correct > layout. > Hmmm, I thought they were smarter about things than that... Do you recall the details? > However, something as simple as this causes problems: > struct { > UINT32 a; > UINT64 b; > }; > > I looked into what EDK2 does, and it seems like they just pass > -malign-double to their IA32 builds. > They do pass that, but at least once upon a time they were careful to make sure that the structures they defined didn't have 'holes' like that. They'd do an element between a and b called reserved that was UINT32. But maybe a bigger issue for the ia32 loader is: are the structures invariant between 32 and 64 bit versions? Or do we need to worry about those structures that I've passing to the kernel that we borrowed the layout and didn't change? Warner > > > > > >> >> > >> >> Annotating just the EFI types would seem more appropriate, like how > we > >> >> annotate function pointers to use the Microsoft calling convention. > >> > > >> > They're all under contrib unfortunately. Not sure if we want to > >> > introduce that big of a diff with upstream. > >> > > >> >> > >> >> Jessica > >> > >> > --000000000000bf9a2f064af77824 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Feb 16,= 2026 at 1:30=E2=80=AFPM Ahmad Khalifa <ahmadkhalifa570@gmail.com> wrote:
On Mon Feb 16, 2026 at 3:29 AM +0200,= Warner Losh wrote:
> On Sun, Feb 15, 2026 at 8:56=E2=80=AFAM Ahmad Khalifa <ahmadkhalifa570@gmail.co= m>
> wrote:
>
>> On Sun Feb 15, 2026 at 4:27 PM +0200, Ahmad Khalifa wrote:
>> > On Sun Feb 15, 2026 at 4:02 PM +0200, Jessica Clarke wrote: >> >> On 15 Feb 2026, at 13:56, Ahmad Khalifa <vexeduxr@Free= BSD.org> wrote:
>> >>>
>> >>> The branch main has been updated by vexeduxr:
>> >>>
>> >>> URL:
>> https://c= git.FreeBSD.org/src/commit/?id=3Da60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d
>> >>>
>> >>> commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d
>> >>> Author:=C2=A0 =C2=A0 =C2=A0Ahmad Khalifa <vexeduxr= @FreeBSD.org>
>> >>> AuthorDate: 2026-02-15 12:23:26 +0000
>> >>> Commit:=C2=A0 =C2=A0 =C2=A0Ahmad Khalifa <vexeduxr= @FreeBSD.org>
>> >>> CommitDate: 2026-02-15 13:30:06 +0000
>> >>>
>> >>>=C2=A0 =C2=A0 stand: compile ia32 EFI loader with -mal= ign-double
>> >>>
>> >>>=C2=A0 =C2=A0 The UEFI spec says:
>> >>>> Structures are aligned on boundaries equal to the= largest internal
>> >>>> datum of the structure and internal data are impl= icitly padded to
>> >>>> achieve natural alignment.
>> >>>
>> >>>=C2=A0 =C2=A0 By default, structs containing members o= f type "long long" have 4
>> byte
>> >>>=C2=A0 =C2=A0 alignment on i386. This caused some EFI = structures to be subtly
>> wrong.
>> >>>
>> >>>=C2=A0 =C2=A0 Fix this by compiling the ia32 EFI loade= r with -malign-double, which
>> >>>=C2=A0 =C2=A0 bumps the alignment up to 8 if such memb= ers are present.
>> >>
>> >> This seems like a dangerously big hammer. Are there any t= ypes shared
>> >> with libsa or the kernel itself that would change layout?= (I suppose
>> >> for the latter they already need to be aligned as the ker= nel is 64-bit?)
>> >
>> > For the kernel, any shared types would have already needed to= be
>> > aligned, yes. I didn't consider shared types with either = libsa or libefi
>> > though, I'll look into it now. Nice catch.
>> >
>>
>> Okay, so libsa, libefi, liblua and ficl all share types with the l= oader.
>> Quite obvious in hindsight... I'll back this out until I come = up with
>> something better.
>>
>
> Yea, EFI lives in two worlds: The world of having to make UEFI calls,<= br> > which has one calling convention and ABI (including structures), and t= hen
> it also lives in the world of creating some binary structs for the ker= nel.
> These
> have to agree somehow.
>
> It's even worse, since the 32-bit loader code is also shared with = the BIOS
> loader, which has some different layout conventions...
>
> If we have to do this, we'd likely need another libsa32 etc for th= e new
> conventions.

Yep, that's the problem I ran into. I'd rather we have a more elega= nt
solution, but this is the only one that comes to mind.

>
> I'm curious, which structures does this affect. UEFI / EDK2 tries = hard to
> make details
> like this not matter.

I ran into it with EFI_MEMORY_DESCRIPTOR. It wasn't immediately
noticable since the kernel parsed the memory map with the correct
layout.

However, something as simple as this causes problems:
struct {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 UINT32 a;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 UINT64 b;
};

I looked into what EDK2 does, and it seems like they just pass
-malign-double to their IA32 builds.



>
>
>> >>
>> >> Annotating just the EFI types would seem more appropriate= , like how we
>> >> annotate function pointers to use the Microsoft calling c= onvention.
>> >
>> > They're all under contrib unfortunately. Not sure if we w= ant to
>> > introduce that big of a diff with upstream.
>> >
>> >>
>> >> Jessica
>>
>>
--000000000000bf9a2f064af77824-- From nobody Mon Feb 16 22:30:09 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFHXS1rfLz6SS0q for ; Mon, 16 Feb 2026 22:30:16 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFHXR6yB8z3JW8 for ; Mon, 16 Feb 2026 22:30:15 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-78fc4425b6bso30905327b3.1 for ; Mon, 16 Feb 2026 14:30:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771281010; cv=none; d=google.com; s=arc-20240605; b=U94OPedjGOk6Q0FONr4eTHOwlSQ4mUfRbpO/nR99ywPeFZCi8yi1/qHWHNBGuFx1CD 5OS+Us6EXHyg7reZD0gY8Uwd0BNwXUrFuilEn3kMwT5LdSoGXSDwYWoGw/AgL5oS/HbW e3bXG4i3SskR3bFyhM95syA/1OEW/QC0utmzy6tzPYcrE2NBJF/IJlnGwd1FP9g8UBZ0 lZip6IzCrjWGegG+VgEns4BFOea5GX91mPI9rJovWTxVfSS+g182rogaBPP+amxiYk0w heu0xqdSNifPs25jr4tCiaO4vnmvhDPIo4zLBQLnjtI4tycij/2OtSE/MsiSQ5hGITFj zrFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:cc:to:subject:message-id:date:in-reply-to :references:from:mime-version:dkim-signature; bh=NvHin97A2SVVMFVcNpIJGiQsdfkOuVBZstF6AcjZvQs=; fh=w3BXLB0lgLqiEHy9XAE7p9eZVYKzta4+IaoKlcLbctw=; b=FEQt5RAh16lDMVwivGBxN2DRZouDOZmCyyB5+1UFOvDntcuDshA7e6D1XPzov0Pt0n oGqYSnyPVYgs0DHbHnas+CjnQs/cfu+0U/iOWqSEXDYEVXrP4sr4UcZq8vJmulJ7KpVC 0sse+WYoJDPbWPPk+7WwjZkZuc67x7nYaGsOEY6sIx43Td68VkadgI5ght+pJbFvynjq VOqy2Ur9GRhcuftJH4890YMVpHYlFs0BzXiFvldSggXsu9HsPPmnsiTBaB8DNBmL1xt1 sPVRe495ST1AjMhHpw3m+DlTxHJs3qJ2883fUqV8dstyirR1C3JwtP2z7NHDhOEIsif3 2qfA==; 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=1771281010; x=1771885810; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:in-reply-to :references:from:mime-version:from:to:cc:subject:date:message-id :reply-to; bh=NvHin97A2SVVMFVcNpIJGiQsdfkOuVBZstF6AcjZvQs=; b=Wi/X6/R+fS9wJGIYRiyp3dEIJ24fdwjvYYwuQhfHl7bIsDDYe+Vu8ZwSx/UYgnYRVo Nxnj79AHmOaq4/OO1pMh7qqvHzvb6CL/yUmfrAr+xN2amcla3LZP/C3OFxHkCvQGfr7g HwKIz+Dp57UObQQmPSoa1c/0nBU30yDB6YRgm78sOqCxOvsG20dPvOQMkiHHAsIHKcwJ IaW7hMVIVel5FHkJRxTPyr0xmJK/ZFnlgZ0kJa+Rt2hA+lViVN0vm0KpSU4f3AwxTPaI ysbV+Q7RcgN3x9O7gCOKKRu/qhZIZEcLrFfNytuPArlOgzZkxSH+6btfZauOz2xJn0eT qfzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771281010; x=1771885810; h=content-transfer-encoding:cc:to:subject:message-id:date:in-reply-to :references:from:mime-version:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NvHin97A2SVVMFVcNpIJGiQsdfkOuVBZstF6AcjZvQs=; b=tJwZ+NRS9Ve3L/n0OfdiooTCfqIDScZopqTcgnKtG07yU17OZk5xZxqxdQxFE6t/UJ 1kQGNhqV7BYgx71QO+gT4vHO1BtVZoNLWO9IVjbUHiXaYQJSTxGeKnlzP7jEXym4onpG R6znm1F0IkfHUN4IPYRvIzpDRVkkaAGJk3G/Bcb5MFrcJtnN94SnXOffzNG/QRGnGVKx gnC8e9voln/YcF/leJpmHRg4O5YZPF2N9/Bx+V3d8NWs71J525wjeC50mzyOMK3izoZA votS2HWVWXhaRy0BYTqSzL+xFNcnQR9AB2NNzLuQS5f9e6pOEYsWV0dhZoHKEDUg4GId KEXw== X-Forwarded-Encrypted: i=1; AJvYcCX9fXUFclel9g4JMlZ7q+E/dkD/BeI7G9DG6AJxC9UHfxoPBdSD7jB4zRR3E8nIq3NFJOqcPMYwYFrr4MDhyjowFHoqqA==@freebsd.org X-Gm-Message-State: AOJu0YwOqrAEINX2ZVcURSxLR7WT4Qa4Tq3vaesR1bxA20rgWnY+Pm/2 symL1WSMKrjZG2l51s/XEZwvIltmX7kbQabtPTAdX3m6D76+p8aNSIe5RxTdm6AIQz33PuXYKzo hqgSlkZVq0ZtSTP4CSxwZl+OFRGJosc0= X-Gm-Gg: AZuq6aIM2c5HnOeczj1xq9x2qFysO41TjjAulQhbo5HmhPnQE+yyu2Ak3sG22MkkvGh IuryqWHCBvT6QDorX20p05he1pT3Ctf2SRn17r9Sa0zFAQ3UgMcmGSd4icdTEfMznI0fvCEdRxx 0ncDu3R30H2ye2aP0Dfxty4ipkMbUZKP2IeVT6A31K+N2SqsJRb7jMN/bMK9azREQ/QHG0PbB8y DR8Q3MeD880YfGMpQZxnUAuH0pJogjesL5ZPm5FwkCekFk9RxY4bhIbuq74Ri+z9udzFA5Z9B0z A91tgPfWzlMnnO4swAs= X-Received: by 2002:a05:690c:6285:b0:794:911a:a3ad with SMTP id 00721157ae682-797a0d31e7amr92100517b3.53.1771281010135; Mon, 16 Feb 2026 14:30:10 -0800 (PST) Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Mon, 16 Feb 2026 14:30:09 -0800 Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Mon, 16 Feb 2026 14:30:09 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 From: Ahmad Khalifa X-Mailer: aerc 0.21.0 References: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> <0B6A645E-D9E4-4337-B280-7E3CBA1FDC1B@freebsd.org> In-Reply-To: Date: Mon, 16 Feb 2026 14:30:09 -0800 X-Gm-Features: AaiRm50ZHIIF6HEaNthO1HBdBmeIcS5D6fb0M9YC_bPFJA0mUjFOjW8BxXQQ_0k Message-ID: Subject: Re: git: a60e7e6ff0ec - main - stand: compile ia32 EFI loader with -malign-double To: Warner Losh Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fFHXR6yB8z3JW8 X-Spamd-Bar: ---- On Mon Feb 16, 2026 at 11:16 PM +0200, Warner Losh wrote: > On Mon, Feb 16, 2026 at 1:30=E2=80=AFPM Ahmad Khalifa > wrote: > >> On Mon Feb 16, 2026 at 3:29 AM +0200, Warner Losh wrote: >> > On Sun, Feb 15, 2026 at 8:56=E2=80=AFAM Ahmad Khalifa > > >> > wrote: >> > >> >> On Sun Feb 15, 2026 at 4:27 PM +0200, Ahmad Khalifa wrote: >> >> > On Sun Feb 15, 2026 at 4:02 PM +0200, Jessica Clarke wrote: >> >> >> On 15 Feb 2026, at 13:56, Ahmad Khalifa >> wrote: >> >> >>> >> >> >>> The branch main has been updated by vexeduxr: >> >> >>> >> >> >>> URL: >> >> >> https://cgit.FreeBSD.org/src/commit/?id=3Da60e7e6ff0ec1fdd66c2568ac6c03b= 843dbb3c9d >> >> >>> >> >> >>> commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d >> >> >>> Author: Ahmad Khalifa >> >> >>> AuthorDate: 2026-02-15 12:23:26 +0000 >> >> >>> Commit: Ahmad Khalifa >> >> >>> CommitDate: 2026-02-15 13:30:06 +0000 >> >> >>> >> >> >>> stand: compile ia32 EFI loader with -malign-double >> >> >>> >> >> >>> The UEFI spec says: >> >> >>>> Structures are aligned on boundaries equal to the largest intern= al >> >> >>>> datum of the structure and internal data are implicitly padded t= o >> >> >>>> achieve natural alignment. >> >> >>> >> >> >>> By default, structs containing members of type "long long" hav= e 4 >> >> byte >> >> >>> alignment on i386. This caused some EFI structures to be subtl= y >> >> wrong. >> >> >>> >> >> >>> Fix this by compiling the ia32 EFI loader with -malign-double, >> which >> >> >>> bumps the alignment up to 8 if such members are present. >> >> >> >> >> >> This seems like a dangerously big hammer. Are there any types shar= ed >> >> >> with libsa or the kernel itself that would change layout? (I suppo= se >> >> >> for the latter they already need to be aligned as the kernel is >> 64-bit?) >> >> > >> >> > For the kernel, any shared types would have already needed to be >> >> > aligned, yes. I didn't consider shared types with either libsa or >> libefi >> >> > though, I'll look into it now. Nice catch. >> >> > >> >> >> >> Okay, so libsa, libefi, liblua and ficl all share types with the load= er. >> >> Quite obvious in hindsight... I'll back this out until I come up with >> >> something better. >> >> >> > >> > Yea, EFI lives in two worlds: The world of having to make UEFI calls, >> > which has one calling convention and ABI (including structures), and t= hen >> > it also lives in the world of creating some binary structs for the >> kernel. >> > These >> > have to agree somehow. >> > >> > It's even worse, since the 32-bit loader code is also shared with the >> BIOS >> > loader, which has some different layout conventions... >> > >> > If we have to do this, we'd likely need another libsa32 etc for the ne= w >> > conventions. >> >> Yep, that's the problem I ran into. I'd rather we have a more elegant >> solution, but this is the only one that comes to mind. >> >> > >> > I'm curious, which structures does this affect. UEFI / EDK2 tries hard= to >> > make details >> > like this not matter. >> >> I ran into it with EFI_MEMORY_DESCRIPTOR. It wasn't immediately >> noticable since the kernel parsed the memory map with the correct >> layout. >> > > Hmmm, I thought they were smarter about things than that... Do you recal= l > the details? The struct starts out like so: typedef struct { UINT32 Type; EFI_PHYSICAL_ADDRESS PhysicalStart; ... } EFI_MEMORY_DESCRIPTOR; EFI_PHYSICAL_ADDRESS is a UINT64, but Type doesn't get padded to an 8 byte boundry like it should be. > > >> However, something as simple as this causes problems: >> struct { >> UINT32 a; >> UINT64 b; >> }; >> >> I looked into what EDK2 does, and it seems like they just pass >> -malign-double to their IA32 builds. >> > > They do pass that, but at least once upon a time they were careful to mak= e > sure that the structures they defined didn't have 'holes' like that. They= 'd > do an element between a and b called reserved that was UINT32. Yeah, that seems like the more sane way to do it. > > But maybe a bigger issue for the ia32 loader is: are the structures > invariant between 32 and 64 bit versions? Or do we need to worry about > those structures that I've passing to the kernel that we borrowed the > layout and didn't change? In cases like the one mentioned above there would be a difference in layout. Although that would also be a concern for the BIOS loader, unless you're talking about something EFI specific. We do actually pass the framebuffer info struct (for both efifb and vbefb) to the kernel without specifying its alignment. AFAICT they just happen to align. Not sure what other oddities like that are lying around. > > Warner > > >> > >> > >> >> >> >> >> >> Annotating just the EFI types would seem more appropriate, like ho= w >> we >> >> >> annotate function pointers to use the Microsoft calling convention= . >> >> > >> >> > They're all under contrib unfortunately. Not sure if we want to >> >> > introduce that big of a diff with upstream. >> >> > >> >> >> >> >> >> Jessica >> >> >> >> >> From nobody Mon Feb 16 23:41:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFK6F4665z6SXdD for ; Mon, 16 Feb 2026 23:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFK6D6ZB2z3PTj for ; Mon, 16 Feb 2026 23:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771285268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xqbo4ljCdwBcq402ePA/xxnJLwPewWpTB/dFJShI+uU=; b=STWW823KSMUOVfhyf0LnW+qvvEdsB7ORNH8Mkz2epnU2Bwsowmgqhg2HZK8nBLVpLonH0S WfUCErP/tXv1nj0jYXYVcyn+h5eAyD1MxqdYloHAARqmZEcN8tWZ861Cpq7W0GPQAIoqL8 GPCvn75Sq+IPtZVmhhFnMIe/q2SkU8TDtFFXK5vDc4Fd28/kXMqRM2yPFMoT1RzdCy1orE Smzmkxr+qiio9FKaqnLU1Q4YFHuIw4O910hyAK1ErF7cmF1K9k0dYS/eZL5O6QV5NYbXt0 u8kc4g5M8sjKLSu044yhezYGIfxlRZSYRByvODNEATSQodQJ4SbL/UI0Rmvu2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771285268; a=rsa-sha256; cv=none; b=vMU1Rno6oOaeq4Zb2bvGJhj4CfWX/v+r7WfSxReP6z80j/gIRNa8kSAy2YR450tZEEqNEc tNI5GA0H5aGEQCXgrd+kDi5aoFE0bmHw/yFh+/VBPIIvYsvCykEV5ETlXGBVFE34QoxGfZ kHkd1nY64afERZiA2p1omozabYlU4XZ031dr/K8h5mSUmGABXDh3BR6bdtTfEOWrcjNOPn jtna7LVpiWZQcw+A0CWr4ZwYhpN5NclR/K5SswjEjjMIlbdGmx+t9XRxF8XeDvylUONxpv WGIYw9YYIOAdLzbdh4dND+7/Zkn6ItrRjkWjlVife8JwrnqjHWoI9Rs/bFhNXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771285268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xqbo4ljCdwBcq402ePA/xxnJLwPewWpTB/dFJShI+uU=; b=lPTfIdmEIocTXeoyudlmS3dAUJWUjwnLAo1AtboVnurC2J/hi29lHR4ZHlGS9IinKCWYA7 kwK6tKtXPs3dyIYC0ICJeGlnmIzONreZM1AXKWynCRIxr8P1hzATalWOAVJCbfjpY4RfjE nkT9fAEOJOAs/Jsxw0xgYz/36C6FUaEecT/qKUTlq5RNWJsRVjQXADJvIhSGj1yMn+Cy87 bThvbauaN7dLzE9A18puo4MmztBiQs8DKVwgXfVWPgUijrcqVBT/Ls2bbBrhr7Sg6CqAx9 jr48ZvyXJciv10qd6JfQi3w+DsP6RELq5w999/iy5WvPdJQSsBJqA9ac8xzq7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFK6D3ssBzlrH for ; Mon, 16 Feb 2026 23:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3191d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 23:41:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 11c1b69885be - main - netlink: force uninline of nl_receive_message() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11c1b69885be9c20fba8f7b0d41bd6da8202b972 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 23:41:03 +0000 Message-Id: <6993ab0f.3191d.1b4f2d06@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=11c1b69885be9c20fba8f7b0d41bd6da8202b972 commit 11c1b69885be9c20fba8f7b0d41bd6da8202b972 Author: Gleb Smirnoff AuthorDate: 2026-02-16 23:39:29 +0000 Commit: Gleb Smirnoff CommitDate: 2026-02-16 23:39:29 +0000 netlink: force uninline of nl_receive_message() The entire netlink(4) message processing thread is all inlined into nl_taskqueue_handler() making it difficult to dtrace(1) on a message level. --- sys/netlink/netlink_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c index 882c2181d24f..9646eb2650d5 100644 --- a/sys/netlink/netlink_io.c +++ b/sys/netlink/netlink_io.c @@ -256,7 +256,7 @@ nl_send(struct nl_writer *nw, struct nlpcb *nlp) } } -static int +static __noinline int nl_receive_message(struct nlmsghdr *hdr, int remaining_length, struct nlpcb *nlp, struct nl_pstate *npt) { From nobody Tue Feb 17 00:29:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFL9W6CpDz6SbRg for ; Tue, 17 Feb 2026 00:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFL9W4Bw4z3Td9 for ; Tue, 17 Feb 2026 00:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771288143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uX+8IpyOadKYZmRsijnAbxXerBLOFCSEzVqim+SknQk=; b=e8Bab1bMAuNEp12O+t6UPlcz5lXvwWvuOGy4deb+5gs2fW7EJkHseXmB0MGuFehZUCNe7/ QCcM4W3mjqFLhSJV1gDBD08//dWW0VjnfV8Wrfl2ArVHKqbjCex1cH0z6+r6B1lyKsReCJ h6T0sJQi2b1NULaE/JzDhSqXN0uiJkWD3Uh4io/1sjYtDuKJ2tYaQhA1DTS7c8mthOCFSA VZaj0Yd/uYkCYLOM8DJO+Vwat33hpykEqoOnEoC8qM0rOyfeyLT6V5qS3zXMF5Ffw9KV91 OpdvbJrkDkzn7buOJWGjB2sT9JWWu0jQ3n53KuwcTrZjeUoGinLH7n6ghT8wCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771288143; a=rsa-sha256; cv=none; b=x4LsIlcRSYTQxE2BrE9arSy84X3gAIvcydCF30Pj3g4unQw7ETz/wVV0ydgsU6ZjZxqTIr i3NDIWe2GsPkFhjPzgxsexPtBt7uhNQkrFXpmdbXTvVMlTqLTdWQiJ/vTv0l+bCmiECBR/ 0IKsYB5s80fKsLGI0AVH8D+yauM+SpkPsJ0iSUx6JofxYs7Xat+3XFFMch6thvzopw44RZ oGZToiS2y3KmzKq0A1H7YQk2RvuoR5wIO9koOXfwnPu02ZVKjzpR/DElasTVchihUCMSrL stAjejtuiPRKmc0YR4HxDgMDVzq4qq3oV/MdCq0ae5MvY/CwPxQMuRYBgz0t0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771288143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uX+8IpyOadKYZmRsijnAbxXerBLOFCSEzVqim+SknQk=; b=hBRSbRrv5/b0eSVX85zzcQWyrzwHNmvRwCpzIbb0hGINxMMKn3udPgrG68eTrBgYMcL2Js ukMXppjeqSeODTJ9atSxDmBAkmcG1qoe1Q6owWb2ZJ0NEjUwkh/nsMCT0UVyiEpAStK5Nv 6RivX1NK761s4K4VYd2BCvTUHYNs3qWzyuglfoD9wuLSvxqy6SRtjVVJLIRxs0JoSb2nos YPPUyYi/rJv9D8fJL9+xg/4lTBOzzk1+v78BlvAiB19yc1yZRkiOTO5ov3JpbNm50VS+U2 FaeowtNYnsXpB/VYmHG6lxXW4UFjfwMKbH6wLUiGF/FOe5Q9x08ybQF2dTfIXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFL9W2jg1zmq1 for ; Tue, 17 Feb 2026 00:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36869 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 00:29:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 05492ff6f636 - main - pdwait(2) tests: do not rely on (int *)-1 being invalid address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05492ff6f636108c4fac40c259defe9b2eac7833 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 00:29:03 +0000 Message-Id: <6993b64f.36869.6246406@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=05492ff6f636108c4fac40c259defe9b2eac7833 commit 05492ff6f636108c4fac40c259defe9b2eac7833 Author: Alan Somers AuthorDate: 2026-02-17 00:25:58 +0000 Commit: Alan Somers CommitDate: 2026-02-17 00:27:38 +0000 pdwait(2) tests: do not rely on (int *)-1 being invalid address Explicitly mmap guard and use it as the invalid address instead. MFC after: 1 week --- tests/sys/kern/pdwait.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/sys/kern/pdwait.c b/tests/sys/kern/pdwait.c index 513b07cae87e..c7b2c40a87ba 100644 --- a/tests/sys/kern/pdwait.c +++ b/tests/sys/kern/pdwait.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -37,6 +38,16 @@ #include #include +static void* +unmapped(void) { + void *unmapped; + + unmapped = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_GUARD, -1, 0); + ATF_REQUIRE(unmapped != MAP_FAILED); + + return(unmapped); +} + /* basic usage */ ATF_TC_WITHOUT_HEAD(basic); ATF_TC_BODY(basic, tc) @@ -108,7 +119,8 @@ ATF_TC_BODY(efault1, tc) ATF_REQUIRE_MSG(pid >= 0, "pdfork failed: %s", strerror(errno)); ATF_REQUIRE_MSG(fdp >= 0, "pdfork didn't return a process descriptor"); - ATF_CHECK_ERRNO(EFAULT, pdwait(fdp, (int*)-1, WEXITED, NULL, NULL) < 0); + ATF_CHECK_ERRNO(EFAULT, + pdwait(fdp, (int*)unmapped(), WEXITED, NULL, NULL) < 0); close(fdp); } @@ -127,7 +139,8 @@ ATF_TC_BODY(efault2, tc) ATF_REQUIRE_MSG(fdp >= 0, "pdfork didn't return a process descriptor"); ATF_CHECK_ERRNO(EFAULT, - pdwait(fdp, NULL, WEXITED, (struct __wrusage*)-1, NULL) < 0); + pdwait(fdp, NULL, WEXITED, (struct __wrusage*)unmapped(), NULL) < 0 + ); close(fdp); } @@ -146,7 +159,8 @@ ATF_TC_BODY(efault3, tc) ATF_REQUIRE_MSG(fdp >= 0, "pdfork didn't return a process descriptor"); ATF_CHECK_ERRNO(EFAULT, - pdwait(fdp, NULL, WEXITED, NULL, (struct __siginfo*)-1) < 0); + pdwait(fdp, NULL, WEXITED, NULL, (struct __siginfo*)unmapped()) < 0 + ); close(fdp); } From nobody Tue Feb 17 00:29:04 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFL9X5JmXz6SbGJ for ; Tue, 17 Feb 2026 00:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFL9X3c2yz3TYp for ; Tue, 17 Feb 2026 00:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771288144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18LswnUyNJqeH9z4jBFtiyVYDweWh491yMnIfbHr/xo=; b=HkxGryVsGSNEODRhwzbnZwwntGzBdDy9a422EoedyhUoWKOe+ubgCewB6pIBXownoB/wFH eLl69vkx3jx2YtLqizmTScpaBriHuG73YCwELm7oIB7tMlOfvo9nfIe2TO1hgAXooW8ZYt ZvxLZB/b+dqc6jlB4SIuY5SZBCNcneczUIO+8vzSuLlJF5VZ9BcITv4rR16wNONl3qbnQm CtBiB+W2gJxncDVx9Qv0A5EKSbabntjqA0Ho/g6ZOZpcHwWceH0j46017hszp5YIm7bGVV hE64WWFnO1vfss0STkNBgCiWSsdwO4ozvBbZXHTyPWUlnucPQh5exGtud3i1zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771288144; a=rsa-sha256; cv=none; b=pbCfIjRt+xx7XDtrakOSO3Eh4Rvz2FGYQzp1t7+GLgkE10Pah7TB/yb8wkiQky0LhV05qx iUccon9673Pdd7L149jyxRWDVgmO6887HbkDXaTZ+AALWrNsgMS5uJwlIZHYj2w2D3OhXm SlUgfJNJLwro+on17pd6CDVdvcGUIc5fdjBdxmiVYKCeA9PRY89F4BqfI/v9fymmgGnEi8 nuDQm/Dj4FzVGzgM3km/fjWrZkjWlBWOGnokqmD26Bt+8T/BdjEllZH7DdBBDmOy4mj9iE 0H+duGtqFyRR0B/llAchs7qtb9/krR9b0guNNpld9lnKJa1Z7MKqlIuGiybfRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771288144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18LswnUyNJqeH9z4jBFtiyVYDweWh491yMnIfbHr/xo=; b=F3brKnt99c5A3aa3oRzkasraceEDp9qk6dxPlE49IXJnocwLDi7gbBuOb3Er4/3SBdN6CS MuT6oVL5Xwqri5/wCcMVC7oIeHfK9E3NZTdxI1L2Imh9M7OKWsorPEt39lBfOirmjEUYLp /I5kcBnLggfEg9W3fBxTlIdRLPNAZhM5nuy3EEf2O+9jq9OQzbb8R1wlrGajx0XgfM4SRD Q16jbF70gVEZs+i/DzW3HXUstiJbshXYIlM5hvb4OstYIYO2WSV+yprvLyNWZiI6actd2a rJh6swnMKwztfbzZ5pgOUodcXQ8HhQC7PwfNILzO+ryzWHgiMVAElR308PfaPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFL9X38xmzmgS for ; Tue, 17 Feb 2026 00:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36266 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 00:29:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: dc9a8d300ba5 - main - aio(4) tests: do not rely on (int *)-1 being invalid address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc9a8d300ba5c4c319589d78231e9d0e76576cbf Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 00:29:04 +0000 Message-Id: <6993b650.36266.1439c545@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=dc9a8d300ba5c4c319589d78231e9d0e76576cbf commit dc9a8d300ba5c4c319589d78231e9d0e76576cbf Author: Alan Somers AuthorDate: 2026-02-17 00:27:02 +0000 Commit: Alan Somers CommitDate: 2026-02-17 00:27:38 +0000 aio(4) tests: do not rely on (int *)-1 being invalid address Explicitly mmap guard and use it as the invalid address instead. MFC after: 1 week --- tests/sys/aio/aio_test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/sys/aio/aio_test.c b/tests/sys/aio/aio_test.c index def8a9d548d6..3f07d9df9810 100644 --- a/tests/sys/aio/aio_test.c +++ b/tests/sys/aio/aio_test.c @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -1665,6 +1666,7 @@ ATF_TC_BODY(aio_writev_efault, tc) struct aiocb aio; ssize_t buflen; char *buffer; + void *unmapped; struct iovec iov[2]; long seed; int fd; @@ -1673,13 +1675,16 @@ ATF_TC_BODY(aio_writev_efault, tc) fd = aio_md_setup(); + unmapped = mmap(NULL, PAGE_SIZE, PROT_NONE, MAP_GUARD, -1, 0); + ATF_REQUIRE(unmapped != MAP_FAILED); + seed = random(); buflen = 4096; buffer = malloc(buflen); aio_fill_buffer(buffer, buflen, seed); iov[0].iov_base = buffer; iov[0].iov_len = buflen; - iov[1].iov_base = (void*)-1; /* Invalid! */ + iov[1].iov_base = (void*)unmapped; /* Invalid! */ iov[1].iov_len = buflen; bzero(&aio, sizeof(aio)); aio.aio_fildes = fd; From nobody Tue Feb 17 00:31:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFLD340sdz6SbPr for ; Tue, 17 Feb 2026 00:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFLD33MVXz3Vbx for ; Tue, 17 Feb 2026 00:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771288275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9s8ZBEqRENfvblFTMbQKq2SP2NXuOStMeK5qFHN/r2s=; b=F8f2U2/LIDJoNRfRyytWiL/sPS2F/wTuIL98kCp7RUjICIZbTffI1VWLDnOdZ7NgRl3db3 DO0G4ivDSPy8/hfQ6Fh3SplAuR1mIzDSrCFc4dPTqT3plIRnedQroWAfc95FHVF8I5D3ft qCdzGO3Z4eiq7C7MNXLyR41A9UifcDTluMQqCjToVlfWPdd1vN79qdHmstchCIOF3TISCn 06kRtstWJA/NBHN2+6VOW921sOlR/te/V6yg2zgMBk1TWylL/nsaazVTASjMDA89t9h1Qz 7CZ7kHxnmbWZEUuPGVXE6abgJqaSiS8cR1ZYdNQpZSId4sAme3LL7FsbEK05BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771288275; a=rsa-sha256; cv=none; b=S/k4nM2/0CQQIN7VeeuqWH7x2gZWOQd/t/rR87Aj5oxqhpsgVVF6ZJ/5dMT4Hhew6PPrQ4 HWgD5B8cRpO/wTtnbML59xYeTlGaan1qz9BYRaxE6Zwll8/k3Nu1JxctrvPdzQAnpnb6VV vp83YPrstzaO/Ln5bHYTD4lqGY1vF+o84kiZDDT4c4VU7d8qzolJ7VAziKvUDW5JFNnrV4 FMWeykKdyQbdtym+L+YpgB4ChP8dIwI0L51Mh6vQcIiOz4hKQLEssC4pVfQ3875knslvWR aKoR7gLzB3I6L3m8/DtG8K+i1+RpvzJ9O/2vBlyxIgrCsNZUSnyJb5vUHwNjcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771288275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9s8ZBEqRENfvblFTMbQKq2SP2NXuOStMeK5qFHN/r2s=; b=vMY4wleP8zvoZhK4l4pxPVKbt7EbfFwnCqBmfkQNG+O2Ql7rEFaMh1y3/yF2YfJocqOkn6 fWhQlSgAtTfirdxcuKQzLIFAchRn7pe27RKYl+1YBPAORMvFmesETBQZWNROIvDvwTmmYf OcjPxVx/2K90vLwl92i/isi6QJIL+zKi3jg5O06+iEBTBCIQAPL8UJorm6IXOl0vy+iC1y aw+HqrMDMgbsyaetp/rKHKKDPJgpfD6x6vG6gOTZ1kosmIWV6xBfS6v1XUcp0eq/6egRaw pGLOnHeAIIh1dTWavCaLtvn6ibCFHDUAlzO0wMnhK19vntURfEFaW9ljkTAq+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFLD32vQBzm2r for ; Tue, 17 Feb 2026 00:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37fc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 00:31:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: fba81b33aabf - main - capsicum-tests: remove Linux support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fba81b33aabff74ad03d5f9f9663c176cf060fa6 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 00:31:15 +0000 Message-Id: <6993b6d3.37fc6.5c7ba688@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=fba81b33aabff74ad03d5f9f9663c176cf060fa6 commit fba81b33aabff74ad03d5f9f9663c176cf060fa6 Author: Alan Somers AuthorDate: 2026-01-29 20:39:20 +0000 Commit: Alan Somers CommitDate: 2026-02-17 00:29:32 +0000 capsicum-tests: remove Linux support Now that this project is part of freebsd-src, it no longer needs to be portable. Remove Linux-only tests, cross-os compatibility code, and compatibility with older FreeBSD versions. Leave in place some originally Linux-only tests that could now be ported to FreeBSD, like the pipe2 tests. Sponsored by: ConnectWise Reviewed by: oshogbo Differential Revision: https://reviews.freebsd.org/D54985 --- tests/sys/capsicum/README.md | 48 ++-------- tests/sys/capsicum/capability-fd-pair.cc | 140 ----------------------------- tests/sys/capsicum/capability-fd.cc | 70 ++------------- tests/sys/capsicum/capmode.cc | 51 +---------- tests/sys/capsicum/capsicum-freebsd.h | 18 ---- tests/sys/capsicum/capsicum-linux.h | 40 --------- tests/sys/capsicum/capsicum-rights.h | 103 --------------------- tests/sys/capsicum/capsicum-test-main.cc | 19 ---- tests/sys/capsicum/capsicum-test.cc | 23 ----- tests/sys/capsicum/capsicum.h | 148 +------------------------------ tests/sys/capsicum/fcntl.cc | 11 +-- tests/sys/capsicum/ioctl.cc | 29 +----- tests/sys/capsicum/linux.cc | 2 +- tests/sys/capsicum/openat.cc | 16 ---- tests/sys/capsicum/procdesc.cc | 66 ++++---------- tests/sys/capsicum/sctp.cc | 4 - tests/sys/capsicum/select.cc | 4 - tests/sys/capsicum/smoketest.c | 41 ++++----- tests/sys/capsicum/socket.cc | 4 - tests/sys/capsicum/syscalls.h | 144 ------------------------------ tests/sys/capsicum/sysctl.cc | 2 - tests/sys/capsicum/waittest.c | 9 -- 22 files changed, 55 insertions(+), 937 deletions(-) diff --git a/tests/sys/capsicum/README.md b/tests/sys/capsicum/README.md index a8c8c6686759..8dea65d8d198 100644 --- a/tests/sys/capsicum/README.md +++ b/tests/sys/capsicum/README.md @@ -1,9 +1,8 @@ # Capsicum User Space Tests -This directory holds unit tests for [Capsicum](http://www.cl.cam.ac.uk/research/security/capsicum/) +This directory holds unit tests for [Capsicum](https://man.freebsd.org/cgi/man.cgi?query=capsicum) object-capabilities. The tests exercise the syscall interface to a Capsicum-enabled operating system, -currently either [FreeBSD >=10.x](http://www.freebsd.org) or a modified Linux kernel (the -[capsicum-linux](http://github.com/google/capsicum-linux) project). +Currently, [FreeBSD >=10.x](http://www.freebsd.org) is the only such operating system. The tests are written in C++11 and use the [Google Test](https://code.google.com/p/googletest/) framework, with some additions to fork off particular tests (because a process that enters capability @@ -17,46 +16,15 @@ The original basis for these tests was: written by Robert Watson and Jonathan Anderson for the original FreeBSD 9.x Capsicum implementation - [unit tests](http://git.chromium.org/gitweb/?p=chromiumos/third_party/kernel-capsicum.git;a=tree;f=tools/testing/capsicum_tests;hb=refs/heads/capsicum) written by Meredydd Luff for the original Capsicum-Linux port. -These tests were coalesced and moved into an independent repository to enable -comparative testing across multiple OSes, and then substantially extended. +These tests were coalesced and moved into an [independent repository](https://github.com/google/capsicum-test) +to enable comparative testing across multiple OSes, and then substantially extended. -## OS Configuration +Subsequently, the [capsicum-linux port](https://github.com/google/capsicum-linux) was abandoned by +its maintainers, rendering the independent repository obsolete. So the tests were copied back into +the FreeBSD source tree in time for 16.0-RELEASE. -### Linux - -The following kernel configuration options are needed to run the tests: - - - `CONFIG_SECURITY_CAPSICUM`: enable the Capsicum framework - - `CONFIG_PROCDESC`: enable Capsicum process-descriptor functionality - - `CONFIG_DEBUG_FS`: enable debug filesystem - - `CONFIG_IP_SCTP`: enable SCTP support - -### FreeBSD (>= 10.x) +## Configuration The following kernel configuration options are needed so that all tests can run: - `options P1003_1B_MQUEUE`: Enable POSIX message queues (or `kldload mqueuefs`) - -## Other Dependencies - -### Linux - -The following additional development packages are needed to build the full test suite on Linux. - - - `libcaprights`: See below - - `libcap-dev`: Provides headers for POSIX.1e capabilities. - - `libsctp1`: Provides SCTP library functions. - - `libsctp-dev`: Provides headers for SCTP library functions. - - -## Linux libcaprights - -The Capsicum userspace library is held in the `libcaprights/` subdirectory. Ideally, this -library should be built (with `./configure; make` or `dpkg-buildpackage -uc -us`) and -installed (with `make install` or `dpkg -i libcaprights*.deb`) so that the tests will -use behave like a normal Capsicum-aware application. - -However, if no installed copy of the library is found, the `GNUmakefile` will attempt -to use the local `libcaprights/*.c` source; this requires `./configure` to have been -performed in the `libcaprights` subdirectory. The local code is also used for -cross-compiled builds of the test suite (e.g. `make ARCH=32` or `make ARCH=x32`). diff --git a/tests/sys/capsicum/capability-fd-pair.cc b/tests/sys/capsicum/capability-fd-pair.cc index d56dac049805..63522b960d1e 100644 --- a/tests/sys/capsicum/capability-fd-pair.cc +++ b/tests/sys/capsicum/capability-fd-pair.cc @@ -46,143 +46,3 @@ TEST(CapabilityPair, sendfile) { close(sock_fds[1]); unlink(TmpFile("cap_sendfile_in")); } - -#ifdef HAVE_TEE -TEST(CapabilityPair, tee) { - int pipe1_fds[2]; - EXPECT_OK(pipe2(pipe1_fds, O_NONBLOCK)); - int pipe2_fds[2]; - EXPECT_OK(pipe2(pipe2_fds, O_NONBLOCK)); - - // Put some data into pipe1. - unsigned char buffer[4] = {1, 2, 3, 4}; - EXPECT_OK(write(pipe1_fds[1], buffer, 4)); - - cap_rights_t r_ro; - cap_rights_init(&r_ro, CAP_READ); - cap_rights_t r_wo; - cap_rights_init(&r_wo, CAP_WRITE); - cap_rights_t r_rw; - cap_rights_init(&r_rw, CAP_READ, CAP_WRITE); - - // Various attempts to tee into pipe2. - int cap_in_wo = dup(pipe1_fds[0]); - EXPECT_OK(cap_in_wo); - EXPECT_OK(cap_rights_limit(cap_in_wo, &r_wo)); - int cap_in_rw = dup(pipe1_fds[0]); - EXPECT_OK(cap_in_rw); - EXPECT_OK(cap_rights_limit(cap_in_rw, &r_rw)); - int cap_out_ro = dup(pipe2_fds[1]); - EXPECT_OK(cap_out_ro); - EXPECT_OK(cap_rights_limit(cap_out_ro, &r_ro)); - int cap_out_rw = dup(pipe2_fds[1]); - EXPECT_OK(cap_out_rw); - EXPECT_OK(cap_rights_limit(cap_out_rw, &r_rw)); - - EXPECT_NOTCAPABLE(tee(cap_in_wo, cap_out_rw, 4, SPLICE_F_NONBLOCK)); - EXPECT_NOTCAPABLE(tee(cap_in_rw, cap_out_ro, 4, SPLICE_F_NONBLOCK)); - EXPECT_OK(tee(cap_in_rw, cap_out_rw, 4, SPLICE_F_NONBLOCK)); - - close(cap_in_wo); - close(cap_in_rw); - close(cap_out_ro); - close(cap_out_rw); - close(pipe1_fds[0]); - close(pipe1_fds[1]); - close(pipe2_fds[0]); - close(pipe2_fds[1]); -} -#endif - -#ifdef HAVE_SPLICE -TEST(CapabilityPair, splice) { - int pipe1_fds[2]; - EXPECT_OK(pipe2(pipe1_fds, O_NONBLOCK)); - int pipe2_fds[2]; - EXPECT_OK(pipe2(pipe2_fds, O_NONBLOCK)); - - // Put some data into pipe1. - unsigned char buffer[4] = {1, 2, 3, 4}; - EXPECT_OK(write(pipe1_fds[1], buffer, 4)); - - cap_rights_t r_ro; - cap_rights_init(&r_ro, CAP_READ); - cap_rights_t r_wo; - cap_rights_init(&r_wo, CAP_WRITE); - cap_rights_t r_rs; - cap_rights_init(&r_rs, CAP_READ, CAP_SEEK); - cap_rights_t r_ws; - cap_rights_init(&r_ws, CAP_WRITE, CAP_SEEK); - - // Various attempts to splice. - int cap_in_wo = dup(pipe1_fds[0]); - EXPECT_OK(cap_in_wo); - EXPECT_OK(cap_rights_limit(cap_in_wo, &r_wo)); - int cap_in_ro = dup(pipe1_fds[0]); - EXPECT_OK(cap_in_ro); - EXPECT_OK(cap_rights_limit(cap_in_ro, &r_ro)); - int cap_in_ro_seek = dup(pipe1_fds[0]); - EXPECT_OK(cap_in_ro_seek); - EXPECT_OK(cap_rights_limit(cap_in_ro_seek, &r_rs)); - int cap_out_wo = dup(pipe2_fds[1]); - EXPECT_OK(cap_out_wo); - EXPECT_OK(cap_rights_limit(cap_out_wo, &r_wo)); - int cap_out_ro = dup(pipe2_fds[1]); - EXPECT_OK(cap_out_ro); - EXPECT_OK(cap_rights_limit(cap_out_ro, &r_ro)); - int cap_out_wo_seek = dup(pipe2_fds[1]); - EXPECT_OK(cap_out_wo_seek); - EXPECT_OK(cap_rights_limit(cap_out_wo_seek, &r_ws)); - - EXPECT_NOTCAPABLE(splice(cap_in_ro, NULL, cap_out_wo_seek, NULL, 4, SPLICE_F_NONBLOCK)); - EXPECT_NOTCAPABLE(splice(cap_in_wo, NULL, cap_out_wo_seek, NULL, 4, SPLICE_F_NONBLOCK)); - EXPECT_NOTCAPABLE(splice(cap_in_ro_seek, NULL, cap_out_ro, NULL, 4, SPLICE_F_NONBLOCK)); - EXPECT_NOTCAPABLE(splice(cap_in_ro_seek, NULL, cap_out_wo, NULL, 4, SPLICE_F_NONBLOCK)); - EXPECT_OK(splice(cap_in_ro_seek, NULL, cap_out_wo_seek, NULL, 4, SPLICE_F_NONBLOCK)); - - close(cap_in_wo); - close(cap_in_ro); - close(cap_in_ro_seek); - close(cap_out_wo); - close(cap_out_ro); - close(cap_out_wo_seek); - close(pipe1_fds[0]); - close(pipe1_fds[1]); - close(pipe2_fds[0]); - close(pipe2_fds[1]); -} -#endif - -#ifdef HAVE_VMSPLICE -// Although it only involves a single file descriptor, test vmsplice(2) here too. -TEST(CapabilityPair, vmsplice) { - int pipe_fds[2]; - EXPECT_OK(pipe2(pipe_fds, O_NONBLOCK)); - - cap_rights_t r_ro; - cap_rights_init(&r_ro, CAP_READ); - cap_rights_t r_rw; - cap_rights_init(&r_rw, CAP_READ, CAP_WRITE); - - int cap_ro = dup(pipe_fds[1]); - EXPECT_OK(cap_ro); - EXPECT_OK(cap_rights_limit(cap_ro, &r_ro)); - int cap_rw = dup(pipe_fds[1]); - EXPECT_OK(cap_rw); - EXPECT_OK(cap_rights_limit(cap_rw, &r_rw)); - - unsigned char buffer[4] = {1, 2, 3, 4}; - struct iovec iov; - memset(&iov, 0, sizeof(iov)); - iov.iov_base = buffer; - iov.iov_len = sizeof(buffer); - - EXPECT_NOTCAPABLE(vmsplice(cap_ro, &iov, 1, SPLICE_F_NONBLOCK)); - EXPECT_OK(vmsplice(cap_rw, &iov, 1, SPLICE_F_NONBLOCK)); - - close(cap_ro); - close(cap_rw); - close(pipe_fds[0]); - close(pipe_fds[1]); -} -#endif diff --git a/tests/sys/capsicum/capability-fd.cc b/tests/sys/capsicum/capability-fd.cc index 0551d9bd81ef..a9e4d30ac4b9 100644 --- a/tests/sys/capsicum/capability-fd.cc +++ b/tests/sys/capsicum/capability-fd.cc @@ -110,40 +110,11 @@ static right_info known_rights[] = { RIGHTS_INFO(CAP_KQUEUE), /* Rights that are only present in some version or some OS, and so are #ifdef'ed */ /* LINKAT got split */ -#ifdef CAP_LINKAT - RIGHTS_INFO(CAP_LINKAT), -#endif -#ifdef CAP_LINKAT_SOURCE RIGHTS_INFO(CAP_LINKAT_SOURCE), -#endif -#ifdef CAP_LINKAT_TARGET RIGHTS_INFO(CAP_LINKAT_TARGET), -#endif - /* Linux aliased some FD operations for pdgetpid/pdkill */ -#ifdef CAP_PDGETPID_FREEBSD - RIGHTS_INFO(CAP_PDGETPID_FREEBSD), -#endif -#ifdef CAP_PDKILL_FREEBSD - RIGHTS_INFO(CAP_PDKILL_FREEBSD), -#endif /* Linux-specific rights */ -#ifdef CAP_FSIGNAL - RIGHTS_INFO(CAP_FSIGNAL), -#endif -#ifdef CAP_EPOLL_CTL - RIGHTS_INFO(CAP_EPOLL_CTL), -#endif #ifdef CAP_NOTIFY RIGHTS_INFO(CAP_NOTIFY), -#endif -#ifdef CAP_SETNS - RIGHTS_INFO(CAP_SETNS), -#endif -#ifdef CAP_PERFMON - RIGHTS_INFO(CAP_PERFMON), -#endif -#ifdef CAP_BPF - RIGHTS_INFO(CAP_BPF), #endif /* Rights in later versions of FreeBSD (>10.0) */ }; @@ -152,7 +123,7 @@ void ShowCapRights(FILE *out, int fd) { size_t ii; bool first = true; cap_rights_t rights; - CAP_SET_NONE(&rights); + CAP_NONE(&rights); if (cap_rights_get(fd, &rights) < 0) { fprintf(out, "Failed to get rights for fd %d: errno %d\n", fd, errno); return; @@ -210,11 +181,11 @@ FORK_TEST(Capability, CapNew) { cap_rights_t r_rws; cap_rights_init(&r_rws, CAP_READ, CAP_WRITE, CAP_SEEK); cap_rights_t r_all; - CAP_SET_ALL(&r_all); + CAP_ALL(&r_all); int cap_fd = dup(STDOUT_FILENO); cap_rights_t rights; - CAP_SET_NONE(&rights); + CAP_NONE(&rights); EXPECT_OK(cap_rights_get(cap_fd, &rights)); EXPECT_RIGHTS_EQ(&r_all, &rights); @@ -511,7 +482,7 @@ static void TryFileOps(int fd, cap_rights_t rights) { close(cap_cap_fd); char ch; - CHECK_RIGHT_RESULT(read(cap_fd, &ch, sizeof(ch)), rights, CAP_READ, CAP_SEEK_ASWAS); + CHECK_RIGHT_RESULT(read(cap_fd, &ch, sizeof(ch)), rights, CAP_READ, 0); ssize_t len1 = pread(cap_fd, &ch, sizeof(ch), 0); CHECK_RIGHT_RESULT(len1, rights, CAP_PREAD); @@ -519,11 +490,10 @@ static void TryFileOps(int fd, cap_rights_t rights) { CHECK_RIGHT_RESULT(len2, rights, CAP_PREAD); EXPECT_EQ(len1, len2); - CHECK_RIGHT_RESULT(write(cap_fd, &ch, sizeof(ch)), rights, CAP_WRITE, CAP_SEEK_ASWAS); + CHECK_RIGHT_RESULT(write(cap_fd, &ch, sizeof(ch)), rights, CAP_WRITE, 0); CHECK_RIGHT_RESULT(pwrite(cap_fd, &ch, sizeof(ch), 0), rights, CAP_PWRITE); CHECK_RIGHT_RESULT(lseek(cap_fd, 0, SEEK_SET), rights, CAP_SEEK); -#ifdef HAVE_CHFLAGS // Note: this is not expected to work over NFS. struct statfs sf; EXPECT_OK(fstatfs(fd, &sf)); @@ -531,7 +501,6 @@ static void TryFileOps(int fd, cap_rights_t rights) { if (!is_nfs) { CHECK_RIGHT_RESULT(fchflags(cap_fd, UF_NODUMP), rights, CAP_FCHFLAGS); } -#endif CHECK_RIGHT_MMAP_RESULT(mmap(NULL, getpagesize(), PROT_NONE, MAP_SHARED, cap_fd, 0), rights, CAP_MMAP); @@ -551,9 +520,6 @@ static void TryFileOps(int fd, cap_rights_t rights) { rights, CAP_MMAP_RWX); CHECK_RIGHT_RESULT(fsync(cap_fd), rights, CAP_FSYNC); -#ifdef HAVE_SYNC_FILE_RANGE - CHECK_RIGHT_RESULT(sync_file_range(cap_fd, 0, 1, 0), rights, CAP_FSYNC, CAP_SEEK); -#endif int rc = fcntl(cap_fd, F_GETFL); CHECK_RIGHT_RESULT(rc, rights, CAP_FCNTL); @@ -575,10 +541,6 @@ static void TryFileOps(int fd, cap_rights_t rights) { struct statfs cap_sf; CHECK_RIGHT_RESULT(fstatfs(cap_fd, &cap_sf), rights, CAP_FSTATFS); -#ifdef HAVE_FPATHCONF - CHECK_RIGHT_RESULT(fpathconf(cap_fd, _PC_NAME_MAX), rights, CAP_FPATHCONF); -#endif - CHECK_RIGHT_RESULT(futimes(cap_fd, NULL), rights, CAP_FUTIMES); struct pollfd pollfd; @@ -806,14 +768,12 @@ static void TryDirOps(int dirfd, cap_rights_t rights) { } EXPECT_OK(unlinkat(dirfd, "cap_fsync", 0)); -#ifdef HAVE_CHFLAGSAT rc = openat(dirfd, "cap_chflagsat", O_CREAT, 0600); EXPECT_OK(rc); EXPECT_OK(close(rc)); rc = chflagsat(dfd_cap, "cap_chflagsat", UF_NODUMP, 0); CHECK_RIGHT_RESULT(rc, rights, CAP_CHFLAGSAT, CAP_LOOKUP); EXPECT_OK(unlinkat(dirfd, "cap_chflagsat", 0)); -#endif rc = openat(dirfd, "cap_fchownat", O_CREAT, 0600); EXPECT_OK(rc); @@ -871,13 +831,11 @@ static void TryDirOps(int dirfd, cap_rights_t rights) { EXPECT_OK(unlinkat(dirfd, "cap_mkdirat", AT_REMOVEDIR)); } -#ifdef HAVE_MKFIFOAT rc = mkfifoat(dfd_cap, "cap_mkfifoat", 0600); CHECK_RIGHT_RESULT(rc, rights, CAP_MKFIFOAT, CAP_LOOKUP); if (rc >= 0) { EXPECT_OK(unlinkat(dirfd, "cap_mkfifoat", 0)); } -#endif if (getuid() == 0) { rc = mknodat(dfd_cap, "cap_mknodat", S_IFCHR | 0600, 0); @@ -980,12 +938,10 @@ FORK_TEST(Capability, DirOperations) { DirOperationsTest(0); } -#ifdef O_PATH FORK_TEST(Capability, PathDirOperations) { // Make the dfd in the test a path-only file descriptor. DirOperationsTest(O_PATH); } -#endif static void TryReadWrite(int cap_fd) { char buffer[64]; @@ -1136,22 +1092,6 @@ TEST(Capability, SyscallAt) { EXPECT_OK(mkfifoat(cap_dfd_all, "cap_fifo", 0755)); unlink(TmpFile("cap_at_topdir/cap_fifo")); -#ifdef HAVE_MKNOD_REG - // Need CAP_CREATE to create a regular file with mknodat(2). - EXPECT_NOTCAPABLE(mknodat(cap_dfd_all, "cap_regular", S_IFREG|0755, 0)); - unlink(TmpFile("cap_at_topdir/cap_regular")); - EXPECT_OK(mknodat(cap_dfd_create, "cap_regular", S_IFREG|0755, 0)); - unlink(TmpFile("cap_at_topdir/cap_regular")); -#endif - -#ifdef HAVE_MKNOD_SOCKET - // Need CAP_BIND to create a UNIX domain socket with mknodat(2). - EXPECT_NOTCAPABLE(mknodat(cap_dfd_all, "cap_socket", S_IFSOCK|0755, 0)); - unlink(TmpFile("cap_at_topdir/cap_socket")); - EXPECT_OK(mknodat(cap_dfd_bind, "cap_socket", S_IFSOCK|0755, 0)); - unlink(TmpFile("cap_at_topdir/cap_socket")); -#endif - close(cap_dfd_all); close(cap_dfd_no_mkfifo); close(cap_dfd_no_mkdir); diff --git a/tests/sys/capsicum/capmode.cc b/tests/sys/capsicum/capmode.cc index 5ff025290211..c6eef19b350f 100644 --- a/tests/sys/capsicum/capmode.cc +++ b/tests/sys/capsicum/capmode.cc @@ -3,9 +3,7 @@ // whether or not they return the expected ECAPMODE. #include #include -#ifdef __FreeBSD__ #include -#endif #include #include #include @@ -69,18 +67,14 @@ FORK_TEST_F(WithFiles, DisallowedFileSyscalls) { EXPECT_CAPMODE(access(TmpFile("cap_capmode_access"), F_OK)); EXPECT_CAPMODE(acct(TmpFile("cap_capmode_acct"))); EXPECT_CAPMODE(chdir(TmpFile("cap_capmode_chdir"))); -#ifdef HAVE_CHFLAGS EXPECT_CAPMODE(chflags(TmpFile("cap_capmode_chflags"), UF_NODUMP)); -#endif EXPECT_CAPMODE(chmod(TmpFile("cap_capmode_chmod"), 0644)); EXPECT_CAPMODE(chown(TmpFile("cap_capmode_chown"), -1, -1)); EXPECT_CAPMODE(chroot(TmpFile("cap_capmode_chroot"))); EXPECT_CAPMODE(creat(TmpFile("cap_capmode_creat"), 0644)); EXPECT_CAPMODE(fchdir(fd_dir_)); -#ifdef HAVE_GETFSSTAT struct statfs statfs; EXPECT_CAPMODE(getfsstat(&statfs, sizeof(statfs), MNT_NOWAIT)); -#endif EXPECT_CAPMODE(link(TmpFile("foo"), TmpFile("bar"))); struct stat sb; EXPECT_CAPMODE(lstat(TmpFile("cap_capmode_lstat"), &sb)); @@ -89,9 +83,7 @@ FORK_TEST_F(WithFiles, DisallowedFileSyscalls) { EXPECT_CAPMODE(open("/dev/null", O_RDWR)); char buf[64]; EXPECT_CAPMODE(readlink(TmpFile("cap_capmode_readlink"), buf, sizeof(buf))); -#ifdef HAVE_REVOKE EXPECT_CAPMODE(revoke(TmpFile("cap_capmode_revoke"))); -#endif EXPECT_CAPMODE(stat(TmpFile("cap_capmode_stat"), &sb)); EXPECT_CAPMODE(symlink(TmpFile("cap_capmode_symlink_from"), TmpFile("cap_capmode_symlink_to"))); EXPECT_CAPMODE(unlink(TmpFile("cap_capmode_unlink"))); @@ -122,9 +114,7 @@ FORK_TEST_F(WithFiles, AllowedFileSyscalls) { int fd_dup = dup(fd_file_); EXPECT_OK(fd_dup); EXPECT_OK(dup2(fd_file_, fd_dup)); -#ifdef HAVE_DUP3 EXPECT_OK(dup3(fd_file_, fd_dup, 0)); -#endif if (fd_dup >= 0) close(fd_dup); struct stat sb; @@ -134,12 +124,10 @@ FORK_TEST_F(WithFiles, AllowedFileSyscalls) { EXPECT_OK(read(fd_file_, &ch, sizeof(ch))); EXPECT_OK(write(fd_file_, &ch, sizeof(ch))); -#ifdef HAVE_CHFLAGS rc = fchflags(fd_file_, UF_NODUMP); if (rc < 0) { EXPECT_NE(ECAPMODE, errno); } -#endif char buf[1024]; rc = getdents_(fd_dir_, (void*)buf, sizeof(buf)); @@ -152,7 +140,7 @@ FORK_TEST_F(WithFiles, AllowedFileSyscalls) { struct iovec io; io.iov_base = data; io.iov_len = 2; -#if !defined(__i386__) && !defined(__linux__) +#if !defined(__i386__) // TODO(drysdale): reinstate these tests for 32-bit runs when possible // libc bug is fixed. EXPECT_OK(pwritev(fd_file_, &io, 1, 0)); @@ -160,18 +148,6 @@ FORK_TEST_F(WithFiles, AllowedFileSyscalls) { #endif EXPECT_OK(writev(fd_file_, &io, 1)); EXPECT_OK(readv(fd_file_, &io, 1)); - -#ifdef HAVE_SYNCFS - EXPECT_OK(syncfs(fd_file_)); -#endif -#ifdef HAVE_SYNC_FILE_RANGE - EXPECT_OK(sync_file_range(fd_file_, 0, 1, 0)); -#endif -#ifdef HAVE_READAHEAD - if (!tmpdir_on_tmpfs) { // tmpfs doesn't support readahead(2) - EXPECT_OK(readahead(fd_file_, 0, 1)); - } -#endif } FORK_TEST_F(WithFiles, AllowedSocketSyscalls) { @@ -301,19 +277,10 @@ FORK_TEST(Capmode, AllowedIdentifierSyscalls) { gid_t egid; gid_t sgid; EXPECT_OK(getresgid(&rgid, &egid, &sgid)); -#ifdef HAVE_GETLOGIN EXPECT_TRUE(getlogin() != NULL); -#endif // Set various identifiers (to their existing values). EXPECT_OK(setgid(my_gid)); -#ifdef HAVE_SETFSGID - EXPECT_OK(setfsgid(my_gid)); -#endif - EXPECT_OK(setuid(my_uid)); -#ifdef HAVE_SETFSUID - EXPECT_OK(setfsuid(my_uid)); -#endif EXPECT_OK(setregid(my_gid, my_gid)); EXPECT_OK(setresgid(my_gid, my_gid, my_gid)); EXPECT_OK(setreuid(my_uid, my_uid)); @@ -410,14 +377,6 @@ FORK_TEST(Capmode, AllowedPipeSyscalls) { int rc = pipe(fd2); EXPECT_EQ(0, rc); -#ifdef HAVE_VMSPLICE - char buf[11] = "0123456789"; - struct iovec iov; - iov.iov_base = buf; - iov.iov_len = sizeof(buf); - EXPECT_FAIL_NOT_CAPMODE(vmsplice(fd2[0], &iov, 1, SPLICE_F_NONBLOCK)); -#endif - if (rc == 0) { close(fd2[0]); close(fd2[1]); @@ -605,7 +564,6 @@ FORK_TEST_F(WithFiles, AllowedMiscSyscalls) { // TODO(FreeBSD): ktrace -#ifdef HAVE_SYSARCH // sysarch() is, by definition, architecture-dependent #if defined (__amd64__) || defined (__i386__) long sysarch_arg = 0; @@ -613,14 +571,13 @@ FORK_TEST_F(WithFiles, AllowedMiscSyscalls) { #else // TOOD(jra): write a test for other architectures, like arm #endif -#endif } void *thread_fn(void *p) { int fd = (int)(intptr_t)p; if (verbose) fprintf(stderr, " thread waiting to run\n"); AWAIT_INT_MESSAGE(fd, MSG_PARENT_CHILD_SHOULD_RUN); - EXPECT_OK(getpid_()); + EXPECT_OK(getpid()); EXPECT_CAPMODE(open("/dev/null", O_RDWR)); // Return whether there have been any failures to the main thread. void *rval = (void *)(intptr_t)testing::Test::HasFailure(); @@ -670,7 +627,7 @@ FORK_TEST(Capmode, NewThread) { SEND_INT_MESSAGE(proc_pipe[0], MSG_PARENT_CHILD_SHOULD_RUN); // Do an allowed syscall. - EXPECT_OK(getpid_()); + EXPECT_OK(getpid()); // Wait for the first child to exit (should get a zero exit code message). AWAIT_INT_MESSAGE(proc_pipe[0], 0); @@ -686,7 +643,7 @@ FORK_TEST(Capmode, NewThread) { if (verbose) fprintf(stderr, " second child started\n"); EXPECT_OK(close(proc_pipe[0])); // Child: do an allowed and a disallowed syscall. - EXPECT_OK(getpid_()); + EXPECT_OK(getpid()); EXPECT_CAPMODE(open("/dev/null", O_RDWR)); // Notify the parent of success/failure. int rval = (int)testing::Test::HasFailure(); diff --git a/tests/sys/capsicum/capsicum-freebsd.h b/tests/sys/capsicum/capsicum-freebsd.h index 13fa24a0f722..9cb3149a05a4 100644 --- a/tests/sys/capsicum/capsicum-freebsd.h +++ b/tests/sys/capsicum/capsicum-freebsd.h @@ -1,6 +1,5 @@ #ifndef __CAPSICUM_FREEBSD_H__ #define __CAPSICUM_FREEBSD_H__ -#ifdef __FreeBSD__ /************************************************************ * FreeBSD Capsicum Functionality. ************************************************************/ @@ -12,15 +11,9 @@ extern "C" { /* FreeBSD definitions. */ #include #include -#if __FreeBSD_version >= 1100014 || \ - (__FreeBSD_version >= 1001511 && __FreeBSD_version < 1100000) #include -#else -#include -#endif #include -#if __FreeBSD_version >= 1000000 #define AT_SYSCALLS_IN_CAPMODE #define HAVE_CAP_RIGHTS_GET #define HAVE_CAP_RIGHTS_LIMIT @@ -32,11 +25,7 @@ typedef uint32_t cap_fcntl_t; // ioctl(2) and cap_ioctls_limit(2) take unsigned long. typedef unsigned long cap_ioctl_t; -#if __FreeBSD_version >= 1101000 #define HAVE_OPENAT_INTERMEDIATE_DOTDOT -#endif - -#endif #ifdef __cplusplus } @@ -45,13 +34,8 @@ typedef unsigned long cap_ioctl_t; // Use fexecve_() in tests to allow Linux variant to bypass glibc version. #define fexecve_(F, A, E) fexecve(F, A, E) -#ifdef ENOTBENEATH -#define E_NO_TRAVERSE_CAPABILITY ENOTBENEATH -#define E_NO_TRAVERSE_O_BENEATH ENOTBENEATH -#else #define E_NO_TRAVERSE_CAPABILITY ENOTCAPABLE #define E_NO_TRAVERSE_O_BENEATH ENOTCAPABLE -#endif // FreeBSD limits the number of ioctls in cap_ioctls_limit to 256 #define CAP_IOCTLS_LIMIT_MAX 256 @@ -66,6 +50,4 @@ typedef unsigned long cap_ioctl_t; // FreeBSD generates a capability from sctp_peeloff(cap_fd,...). #define CAP_FROM_PEELOFF -#endif /* __FreeBSD__ */ - #endif /*__CAPSICUM_FREEBSD_H__*/ diff --git a/tests/sys/capsicum/capsicum-linux.h b/tests/sys/capsicum/capsicum-linux.h deleted file mode 100644 index 5bea418a2bc7..000000000000 --- a/tests/sys/capsicum/capsicum-linux.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef __CAPSICUM_LINUX_H__ -#define __CAPSICUM_LINUX_H__ - -#ifdef __linux__ -/************************************************************ - * Linux Capsicum Functionality. - ************************************************************/ -#include -#include -#include - -#define HAVE_CAP_RIGHTS_LIMIT -#define HAVE_CAP_RIGHTS_GET -#define HAVE_CAP_FCNTLS_LIMIT -#define HAVE_CAP_IOCTLS_LIMIT -#define HAVE_PROC_FDINFO -#define HAVE_PDWAIT4 -#define CAP_FROM_ACCEPT -// TODO(drysdale): uncomment if/when Linux propagates rights on sctp_peeloff. -// Linux does not generate a capability from sctp_peeloff(cap_fd,...). -// #define CAP_FROM_PEELOFF -// TODO(drysdale): uncomment if/when Linux allows intermediate .. path segments -// for openat()-like operations. -// #define HAVE_OPENAT_INTERMEDIATE_DOTDOT - -// Failure to open file due to path traversal generates EPERM -#ifdef ENOTBENEATH -#define E_NO_TRAVERSE_CAPABILITY ENOTBENEATH -#define E_NO_TRAVERSE_O_BENEATH ENOTBENEATH -#else -#define E_NO_TRAVERSE_CAPABILITY EPERM -#define E_NO_TRAVERSE_O_BENEATH EPERM -#endif - -// Too many links -#define E_TOO_MANY_LINKS ELOOP - -#endif /* __linux__ */ - -#endif /*__CAPSICUM_LINUX_H__*/ diff --git a/tests/sys/capsicum/capsicum-rights.h b/tests/sys/capsicum/capsicum-rights.h index 73c445434404..751781fd2628 100644 --- a/tests/sys/capsicum/capsicum-rights.h +++ b/tests/sys/capsicum/capsicum-rights.h @@ -5,114 +5,11 @@ extern "C" { #endif -#ifdef __FreeBSD__ #include -#if __FreeBSD_version >= 1100014 || \ - (__FreeBSD_version >= 1001511 && __FreeBSD_version < 1100000) #include -#else -#include -#endif -#endif - -#ifdef __linux__ -#include -#endif #ifdef __cplusplus } #endif -#ifndef CAP_RIGHTS_VERSION -/************************************************************ - * Capsicum compatibility layer: implement new (FreeBSD10.x) - * rights manipulation API in terms of original (FreeBSD9.x) - * functionality. - ************************************************************/ -#include -#include - -/* Rights manipulation macros/functions. - * Note that these use variadic macros, available in C99 / C++11 (and - * also in earlier gcc versions). - */ -#define cap_rights_init(rights, ...) _cap_rights_init((rights), __VA_ARGS__, 0ULL) -#define cap_rights_set(rights, ...) _cap_rights_set((rights), __VA_ARGS__, 0ULL) -#define cap_rights_clear(rights, ...) _cap_rights_clear((rights), __VA_ARGS__, 0ULL) -#define cap_rights_is_set(rights, ...) _cap_rights_is_set((rights), __VA_ARGS__, 0ULL) - -inline cap_rights_t* _cap_rights_init(cap_rights_t *rights, ...) { - va_list ap; - cap_rights_t right; - *rights = 0; - va_start(ap, rights); - while (true) { - right = va_arg(ap, cap_rights_t); - *rights |= right; - if (right == 0) break; - } - va_end(ap); - return rights; -} - -inline cap_rights_t* _cap_rights_set(cap_rights_t *rights, ...) { - va_list ap; - cap_rights_t right; - va_start(ap, rights); - while (true) { - right = va_arg(ap, cap_rights_t); - *rights |= right; - if (right == 0) break; - } - va_end(ap); - return rights; -} - -inline cap_rights_t* _cap_rights_clear(cap_rights_t *rights, ...) { - va_list ap; - cap_rights_t right; - va_start(ap, rights); - while (true) { - right = va_arg(ap, cap_rights_t); - *rights &= ~right; - if (right == 0) break; - } - va_end(ap); - return rights; -} - -inline bool _cap_rights_is_set(const cap_rights_t *rights, ...) { - va_list ap; - cap_rights_t right; - cap_rights_t accumulated = 0; - va_start(ap, rights); - while (true) { - right = va_arg(ap, cap_rights_t); - accumulated |= right; - if (right == 0) break; - } - va_end(ap); - return (accumulated & *rights) == accumulated; -} - -inline bool _cap_rights_is_valid(const cap_rights_t *rights) { - return true; -} - -inline cap_rights_t* cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src) { - *dst |= *src; - return dst; -} - -inline cap_rights_t* cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src) { - *dst &= ~(*src); - return dst; -} - -inline bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little) { - return ((*big) & (*little)) == (*little); -} - -#endif /* old/new style rights manipulation */ - #endif /*__CAPSICUM_RIGHTS_H__*/ diff --git a/tests/sys/capsicum/capsicum-test-main.cc b/tests/sys/capsicum/capsicum-test-main.cc index d0f955270fd4..2a2c75000039 100644 --- a/tests/sys/capsicum/capsicum-test-main.cc +++ b/tests/sys/capsicum/capsicum-test-main.cc @@ -1,10 +1,5 @@ #include -#ifdef __linux__ -#include -#include -#elif defined(__FreeBSD__) #include -#endif #include #include #include @@ -16,11 +11,6 @@ #include "gtest/gtest.h" #include "capsicum-test.h" -// For versions of googletest that lack GTEST_SKIP. -#ifndef GTEST_SKIP -#define GTEST_SKIP GTEST_FAIL -#endif - std::string tmpdir; class SetupEnvironment : public ::testing::Environment @@ -38,7 +28,6 @@ public: std::cerr << tmpdir << std::endl; } void CheckCapsicumSupport() { -#ifdef __FreeBSD__ int rc; bool trap_enotcap_enabled; size_t trap_enotcap_enabled_len = sizeof(trap_enotcap_enabled); @@ -60,7 +49,6 @@ public: << "Skipping tests because its enablement invalidates the " << "test results."; } -#endif /* FreeBSD */ } void CreateTemporaryRoot() { char *tmpdir_name = tempnam(nullptr, "cptst"); @@ -148,13 +136,6 @@ int main(int argc, char* argv[]) { } } -#ifdef __linux__ - // Check whether our temporary directory is on a tmpfs volume. - struct statfs fsinfo; - statfs(tmpdir.c_str(), &fsinfo); - tmpdir_on_tmpfs = (fsinfo.f_type == TMPFS_MAGIC); -#endif - testing::AddGlobalTestEnvironment(new SetupEnvironment()); return RUN_ALL_TESTS(); } diff --git a/tests/sys/capsicum/capsicum-test.cc b/tests/sys/capsicum/capsicum-test.cc index 1e722089761f..d221aca9e4a8 100644 --- a/tests/sys/capsicum/capsicum-test.cc +++ b/tests/sys/capsicum/capsicum-test.cc @@ -1,6 +1,5 @@ #include "capsicum-test.h" -#ifdef __FreeBSD__ #include #include #include @@ -8,7 +7,6 @@ #include #include #include -#endif #include #include @@ -38,26 +36,6 @@ const char *TmpFile(const char *p) { } char ProcessState(int pid) { -#ifdef __linux__ - // Open the process status file. - char s[1024]; - snprintf(s, sizeof(s), "/proc/%d/status", pid); - FILE *f = fopen(s, "r"); - if (f == NULL) return '\0'; - - // Read the file line by line looking for the state line. - const char *prompt = "State:\t"; - while (!feof(f)) { - fgets(s, sizeof(s), f); - if (!strncmp(s, prompt, strlen(prompt))) { - fclose(f); - return s[strlen(prompt)]; - } - } - fclose(f); - return '?'; -#endif -#ifdef __FreeBSD__ // First check if the process exists/we have permission to see it. This // Avoids warning messages being printed to stderr by libprocstat. size_t len = 0; @@ -115,5 +93,4 @@ char ProcessState(int pid) { procstat_close(prstat); if (verbose) fprintf(stderr, "Process %d in state '%c'\n", pid, result); return result; -#endif } diff --git a/tests/sys/capsicum/capsicum.h b/tests/sys/capsicum/capsicum.h index 0005e7884673..5880bbc8b882 100644 --- a/tests/sys/capsicum/capsicum.h +++ b/tests/sys/capsicum/capsicum.h @@ -4,141 +4,11 @@ #ifndef __CAPSICUM_H__ #define __CAPSICUM_H__ -#ifdef __FreeBSD__ -#include "capsicum-freebsd.h" -#endif - -#ifdef __linux__ -#include "capsicum-linux.h" -#endif - -/* - * CAP_ALL/CAP_NONE is a value in FreeBSD9.x Capsicum, but a functional macro - * in FreeBSD10.x Capsicum. Always use CAP_SET_ALL/CAP_SET_NONE instead. - */ -#ifndef CAP_SET_ALL -#ifdef CAP_RIGHTS_VERSION -#define CAP_SET_ALL(rights) CAP_ALL(rights) -#else -#define CAP_SET_ALL(rights) *(rights) = CAP_MASK_VALID -#endif -#endif - -#ifndef CAP_SET_NONE -#ifdef CAP_RIGHTS_VERSION -#define CAP_SET_NONE(rights) CAP_NONE(rights) -#else -#define CAP_SET_NONE(rights) *(rights) = 0 -#endif -#endif *** 1001 LINES SKIPPED *** From nobody Tue Feb 17 01:01:58 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFLvq3pc9z6SdYH for ; Tue, 17 Feb 2026 01:02:15 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) (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 4fFLvp0WrLz3X8X for ; Tue, 17 Feb 2026 01:02:14 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=drZ3D9se; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::435 as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-823075fed75so2087380b3a.1 for ; Mon, 16 Feb 2026 17:02:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771290131; x=1771894931; 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=Ix9uBaNxMVcxpktOMTqHy/hRmQnEuqWWHwD40eiQ2aQ=; b=drZ3D9seeQRvBCwtd38QcKrqG6IJ0tSwCDh9jauh/V6CZV+Tccok+PuOH6hGY5jBPU 4kzjCuIMYzBb/ZcsafM8wQ0/N+N5pizQ27T2avHwesQRJkPLSHh+q66m6G/+a9h4Kq4n 0PcNQ+KAn7aDpmrnr7GXZyQC/pejPERPzxg9ITIN56PPA6X55FBN+VdTlFga6FYLJWfB PpLqX5MJCJ+TrbNXVof4cLy4Szg6cg6EscDIreieEKlvta9TUzz9cRhis4b2qsKFp+97 KoSUK1/QxdeFp0LXEacKPEsH2zqMUoZqpOsvE7kKvDC1NB4mmUJepWUyXSplijLvgMXk AjNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771290131; x=1771894931; 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=Ix9uBaNxMVcxpktOMTqHy/hRmQnEuqWWHwD40eiQ2aQ=; b=F12lv4dn6LWUJlg8NQfJltzpbxRZJUugc4nDD9YY2szhgsvCRJYlU/EipS8YbvyZq1 /7rCS7LAi1y7ahJmgMs8rBxXTlNYmxWtKhjvZUYrvuqvFE0DGVvGYMA25XJoek46db38 2Hak5tbEule+G9QEO6PLDzCSG+AO/TaPbNTTSCDtSWhvZ40AyaGzbbO2Q5yPH5t5Y4rz eva+dmyNwceMFITu9x2mqy9Je8MDlkn4aq7lNSNPRTxw7QVJthrNSx3bqKkZGSpLLMAB 6s0XMn0li8bKwPWd4cFGUUe283Q8eJxxZ7k9IPdUNnHzu80w+JkRiI9gesSLKdHqEM9q c6fw== X-Forwarded-Encrypted: i=1; AJvYcCXuVvKjkDhNmf58DFwE+nSz+WMV6uiDm6Tu2qD2V8DRaRrGTYpACPFU7Prb3MWVN2DY7WKPGKeFbf/6n2iFhl0pT8xGKw==@freebsd.org X-Gm-Message-State: AOJu0YyliR4SYP7v0YnCwcHiJ62FT2IH6m6mYnE9412fTxkdvCXeNIfu y19wi8N/VCOtUiUqU+2AFAD89qN1/K6Ybn5OGKs4/IwoGwvwWDSBTfOW X-Gm-Gg: AZuq6aIaG/MZpzQM+oxqjKq6tCdA0uG6CprOCNpjH9GhHKML+9iIQLfvh3HYlMrUK1N BP09WaH2A8d0tbc6FSvlCBlJ8ICnMu9SN9u9zrV/MLU9XR1D9EukaheEcsPwj4OFHFUtzgXtZDL MIEUrm0bIgwak9eSkvCtME1a+RjfE9iU2nnmvvrUI+HtC1b0HymEy0mL97tD2DukICWBcqx1+o1 SY6ygV7qnxWeD16feuQUZBfCt2EU4gWpr7B0A5p2fwHIYzApR4SHx2u9LsxXwWn7684V4XUwybq aYLg//+OMVb4HSbeYSt7e0SAJqh83mXSSJtASZNPD7MPdbsMJrBSpbihpfc/xw9Wi5Rx6CGB2RV zKw1BoImS21eExtWOhtjkfhrfbBB/A6JEagtfCnQvIr8aV+WEQG/I3R34fdLpdvjt3zsKkVD4PG VOknDBm2dQwCJJExI4H1mTIniPmKjEgld0nFWUVGTnnB38Eb0/eeoz X-Received: by 2002:a05:6a00:4b0a:b0:7e8:3fcb:9b05 with SMTP id d2e1a72fcca58-824d5eace48mr9065927b3a.27.1771290130741; Mon, 16 Feb 2026 17:02:10 -0800 (PST) Received: from smtpclient.apple ([176.100.43.168]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c6e5300d135sm8678187a12.11.2026.02.16.17.02.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Feb 2026 17:02:10 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_69E1E9F5-284D-4BB0-8AE8-BBD66EF84136"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.3\)) Subject: Re: git: 97ce8f7d2b8e - main - amd64: define and use STACKALIGN and REDZONE_SZ From: "Enji Cooper (yaneurabeya)" In-Reply-To: <698a1ffe.26e3c.47182d66@gitrepo.freebsd.org> Date: Mon, 16 Feb 2026 17:01:58 -0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <698a1ffe.26e3c.47182d66@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Spamd-Result: default: False [-5.60 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.997]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MV_CASE(0.50)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(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]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; HAS_ATTACHMENT(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::435:from] X-Rspamd-Queue-Id: 4fFLvp0WrLz3X8X X-Spamd-Bar: ----- --Apple-Mail=_69E1E9F5-284D-4BB0-8AE8-BBD66EF84136 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 9, 2026, at 9:57=E2=80=AFAM, Konstantin Belousov = wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D97ce8f7d2b8eff42460f60e8c49d9849= b58b6e81 >=20 > commit 97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 > Author: Konstantin Belousov > AuthorDate: 2026-02-07 00:36:44 +0000 > Commit: Konstantin Belousov > CommitDate: 2026-02-09 17:57:00 +0000 >=20 > amd64: define and use STACKALIGN and REDZONE_SZ >=20 > Reviewed by: brooks, emaste, jhb > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D55151 Hi kib@! It looks like this broke the build with gcc12 on main: = https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc14_build/2893/console . Cheers, -Enji --Apple-Mail=_69E1E9F5-284D-4BB0-8AE8-BBD66EF84136 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----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmTvgcACgkQGpE5DjPs NJitJA/+ILKCSP146K+KsThC9sVU6X99kSznOWPQub02t9e4rE6wByJ2Dx+T1BoZ 2BdNqnYnO8bvA/+LxfFTy446ngXo1vnP8GoY7xvUuh4rOoPgF8Qk7+OF9VnZTQur im3i8BtOydbTy64SD2Dk8egq00Od5QTdh4fh+TLbSpkyHoeqyQjqb1NU/BNGcNyO /iF6D6ZaBoCTbf2nCC+e81wWG5PrjptOV+NS072R7UmXd+5pfpvxuKVxQKpCnUGs A4gNQBGzltfwswKqt8GcQxKC2gHKXX2oIdbsEWL8GWjrN47BONlCOHJ4lp2iFPhT IuAaT4rRZgIgebjZVzxl8xBS29192qITn2bbiCoQkifLOLLS6cOVbQ3mb08Dizoj 5lSFUfdtAc3eRve8Woflnq1HWDUSnDyjuvuFHANzb+LYr+3mn6O+zxO0FrFKT4bU U/pi2Ciix7PwtTMOMLlS0p/Yx9t6sVNt/GbtQLbfWUmK7RJZxoqLiYlgbgOoyOHs F+KDLKmRf+79FwEl+ajyIdzChCUghPOXSJZkmoTOK/SbNVGB14y2fG4dN5GLwuPB hpGwBfvchAEa80Y7EP2b6151yd6vNlzAHb23o2I2QIZd1FCUTo8DwbBVCegzdeKH MRHZXgP7ZggLJh0t7reElCTGyiXfwDT73s8sxR5xFrNPXeLYbwo= =9Aa4 -----END PGP SIGNATURE----- --Apple-Mail=_69E1E9F5-284D-4BB0-8AE8-BBD66EF84136-- From nobody Tue Feb 17 02:22:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFNhH57DVz6Skn7 for ; Tue, 17 Feb 2026 02:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFNhG2pQCz3ftl for ; Tue, 17 Feb 2026 02:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771294942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVRT2mrQhkCyVGdXPr+JYvT0GTKrghKAN5qyXpFmop8=; b=OEYyVRJ2jciyuOlugbSQ6UcCn6jOA5gSQYo/9bTQ2/JVVbewSBM1aOiZxksbpIIsCTVz6l dO3MbZsl4IeY7EAUO7zqdUqG87euSrZE0fnhatFdpQ74/UlNwfl/rgOPHlIUb6jDywW0/P VHN9J/H7rALV2Eypw4y4B6MEstqDjxkLXMc5FfSrWrN05KPX3gnliFGftauoXOd3jG/gLN hEXkrmy/TEkNBRBYBI4rRmav23rEqAJhinDMn12TvUQtcDHmP7sucL0G5riii00/ISteFL jBZ+ROanTzaHXuRDZYdxnBDpveaGds2Wqtz0oB3GSVBkm/2Q2/D+IXkiaRs5ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771294942; a=rsa-sha256; cv=none; b=BzzE0KR5wbT810UQzMp6KAkLPx1wFN76airSbHz9NUpjOIm2lqCa5sC1zovnefLrWiakH3 /svSiocDpoFmyG699nSjE6ITjsITrVx207DCNnhnRyoaMuQDUqt4B8XrSWVxG+2e4174qu +1dFRXdeOXfzSXPQ2ebJc+jkgFbUvBNu6IT0+a+xlJVrdrwbT9xP/9dDK0VFPJiIWCXG6V Ws3+0nBlPrcsZUrVUTSIMPhQoH+dM/ExT/A3rx89fMX+ATAf3OPtURfR+a72acOK5Zb2LT pPhYtC+q0AG84qyh+Ub2PgITdbFhIoTxx2WQbDKpIlYNbNa3wJWBBuUMARoABw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771294942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVRT2mrQhkCyVGdXPr+JYvT0GTKrghKAN5qyXpFmop8=; b=JZgygpdYwrS0ta3L4Adw0tyS2s4viNdfCNi77FLp4ExGLlrAyJzWN22i7sd17bKxDqIZTW q5EDXIkFUlkKgrAGfA6oITH+Hzuw0pPmFeESff8VlefT/8s+1oZ8JmvEEqeskczHlN9Smm mU6m3sg/T0x7lyzAiUKJODiJHI/Cdlk+flOeA+je5ppH2Ab+MPTTmrib7Dw/WWgpI9PbN7 j3LziU7igX37vpNBcr8B0zNgWLn8dQpFhU2mUosl2p6UOlNNY+pygL74/Cc1sMODKcfXuM 6wd9vR/iU8wFLweleWY8lPhMrL0WzbVntbMwQps+VCYbU/24Nf8d9avScFLaAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFNhG2Fz2zqxJ for ; Tue, 17 Feb 2026 02:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a317 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 02:22:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 3fdbd8a07a2d - main - ipfilter: Avoid negative array indicies List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fdbd8a07a2dcb8fe3cec19fc59ef064453e4755 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 02:22:22 +0000 Message-Id: <6993d0de.1a317.43855e24@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3fdbd8a07a2dcb8fe3cec19fc59ef064453e4755 commit 3fdbd8a07a2dcb8fe3cec19fc59ef064453e4755 Author: Cy Schubert AuthorDate: 2026-02-11 19:30:38 +0000 Commit: Cy Schubert CommitDate: 2026-02-17 02:21:59 +0000 ipfilter: Avoid negative array indicies Array indices must always be posive. We avoid this by making each index unsigned. This mitigates out-of-bounds reads and writes. Reported by: Ilja Van Sprundel Reviewed by: glebius MFC after: 3 days Differential revision: https://reviews.freebsd.org/D55260 --- sys/netpfil/ipfilter/netinet/fil.c | 4 ++-- sys/netpfil/ipfilter/netinet/ip_fil.h | 2 +- sys/netpfil/ipfilter/netinet/ip_state.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index 657097ca7b85..9217572aac50 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -8530,7 +8530,7 @@ ipf_matcharray_load(ipf_main_softc_t *softc, caddr_t data, ipfobj_t *objp, int ipf_matcharray_verify(int *array, int arraysize) { - int i, nelem, maxidx; + u_int i, nelem, maxidx; ipfexp_t *e; nelem = arraysize / sizeof(*array); @@ -8591,7 +8591,7 @@ ipf_matcharray_verify(int *array, int arraysize) static int ipf_fr_matcharray(fr_info_t *fin, int *array) { - int i, n, *x, rv, p; + u_int i, n, *x, rv, p; ipfexp_t *e; rv = 0; diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h index 81ad50373fe9..dbfc045a8646 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil.h +++ b/sys/netpfil/ipfilter/netinet/ip_fil.h @@ -1473,7 +1473,7 @@ typedef struct ipfexp { int ipfe_cmd; int ipfe_not; int ipfe_narg; - int ipfe_size; + u_int ipfe_size; int ipfe_arg0[1]; } ipfexp_t; diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c index 8a21e7593995..c8d6e4e0feb3 100644 --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -4910,7 +4910,7 @@ ipf_state_matchflush(ipf_main_softc_t *softc, caddr_t data) static int ipf_state_matcharray(ipstate_t *state, int *array, u_long ticks) { - int i, n, *x, rv, p; + u_int i, n, *x, rv, p; ipfexp_t *e; rv = 0; From nobody Tue Feb 17 02:44:59 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFPBc6FYnz6QJ2Y; Tue, 17 Feb 2026 02:45:12 +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 4fFPBc1J09z3jY3; Tue, 17 Feb 2026 02:45: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 61H2ix1l081158; Tue, 17 Feb 2026 04:45:02 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61H2ix1l081158 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61H2ix3o081157; Tue, 17 Feb 2026 04:44:59 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 17 Feb 2026 04:44:59 +0200 From: Konstantin Belousov To: "Enji Cooper (yaneurabeya)" Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 97ce8f7d2b8e - main - amd64: define and use STACKALIGN and REDZONE_SZ Message-ID: References: <698a1ffe.26e3c.47182d66@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4fFPBc1J09z3jY3 X-Spamd-Bar: ---- On Mon, Feb 16, 2026 at 05:01:58PM -0800, Enji Cooper (yaneurabeya) wrote: > > > On Feb 9, 2026, at 9:57 AM, Konstantin Belousov wrote: > > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 > > > > commit 97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 > > Author: Konstantin Belousov > > AuthorDate: 2026-02-07 00:36:44 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2026-02-09 17:57:00 +0000 > > > > amd64: define and use STACKALIGN and REDZONE_SZ > > > > Reviewed by: brooks, emaste, jhb > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D55151 > > Hi kib@! > It looks like this broke the build with gcc12 on main: https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc14_build/2893/console . https://reviews.freebsd.org/D55319 might be the fix. From nobody Tue Feb 17 11:50:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFdHd4gfQz6SJ3m for ; Tue, 17 Feb 2026 11:50: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 4fFdHd49SVz3b2h for ; Tue, 17 Feb 2026 11:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771329021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JawtQ17un6TJSNow//moBBBiJ2s4w0RaQM5ul1/fhoQ=; b=GzbJklhK9EMh1a4bDhhFleRsyxvGk+Q895I+Qnc4dbR+cx/fQ1IoBYT1g/4OSJEMMpUwJD kD2yk2oKSgFTeym7YN7unEo49gEbmn0AlyrCEGckJYlyep8MQFkUHPeY9K9ET1aBduiLcV RwClRnBFAYsFUJiz8/QjXsI8L3zyrT+74oR0/dP5KQkX+WVERVsvza6vwfDibQppxcL6Ha 7ywVBQunrj+h7zbVzhuM9L7+Bfkyu1RO7ktI8nuGfGHdc0GJUXYJmMIKctEHlZXoQ2kYJh 3FaIm8b2r+LQyA7/f5oRQZ+f+kA7TrgSuotEQRal6DCRNfAL5eFs2rq36lWl0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771329021; a=rsa-sha256; cv=none; b=u1f41clvxcJGgVJlYEncoQGbICL79XXMZhbr6R8nOmrGHD5HCKZlXZdSb5i5iWPB++gyO9 FJpOK9Bi9YF8PUkGzbMX9FGebt33EDuWLldnWSsq/1c7oje6mb+T6rZaWgWxMx6E53HYFQ T9hALNyOVGY7tnFYqYjfnQpL9jRJIbJaFPKEHHtoPZV07ivSjAXZNNkk1GGd8L5YRfC7al N+JV1depnTYgYW2g9vs6ddrp2tpKN90T1vWNZO2nZrdxq038Z66yHfBvvdzAkqTkrz9nNg Kcbcc954c1Ki8x5En7O1HUID1nF5lGlXq8Lz0o66fKAQgQa5K9dCAIfNKfa7WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771329021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JawtQ17un6TJSNow//moBBBiJ2s4w0RaQM5ul1/fhoQ=; b=M4U/osHCpTZUch3+XSJhmSu5I7w5Fwp02ebOZIfPVR1OScl0cOB9EN0mDCPrq+HXhpzoC6 f+NoFyStHmUiQCrnv1fDq8gqnqzNfknnXZZsHAsftZkSVs0V5eZMDx9OcQEgIV6KIVdpwT z7UjfjW5feSMrbIxsSiVXDRJP+H78HHf7kzw5GQZFl2IsrfVjml90gejDMM5FphuMRhwyn gsPPFuzkduhyEdNu4+UJ4Igu/J/L/pnHbFS/tCdZmeJD7BNVjnHs+4N/85hpucUxCNoAg2 7VklEGOr3GAueAw4fa76EOi8cSvk46scyJdwh55zsQgVZf5vIzypSmmJ+DjJ9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFdHd3h75z17S0 for ; Tue, 17 Feb 2026 11:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 11:50:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 62fba0054d9e - main - ee: add unicode support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62fba0054d9eb2303116f54be1f9bc0e7b75cc15 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 11:50:21 +0000 Message-Id: <699455fd.367bf.2fdbdb7f@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=62fba0054d9eb2303116f54be1f9bc0e7b75cc15 commit 62fba0054d9eb2303116f54be1f9bc0e7b75cc15 Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:44:54 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-17 11:50:16 +0000 ee: add unicode support - Add native support for unicode everywhere. - Remove Big5 specific code (and the menu entry) PR: 291279 MFC After: 1 month Tested by: Marek Zarychta Differential Revision: https://reviews.freebsd.org/D55303 --- contrib/ee/ee.c | 639 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 408 insertions(+), 231 deletions(-) diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c index a14f9c0ead13..13a554bf0146 100644 --- a/contrib/ee/ee.c +++ b/contrib/ee/ee.c @@ -64,13 +64,17 @@ char *version = "@(#) ee, version " EE_VERSION " $Revision: 1.104 $"; #ifdef NCURSE #include "new_curse.h" #elif HAS_NCURSES +#define _XOPEN_SOURCE_EXTENDED #include #else #include #endif #include +#include #include +#include +#include #include #include #include @@ -181,10 +185,6 @@ int local_LINES = 0; /* copy of LINES, to detect when win resizes */ int local_COLS = 0; /* copy of COLS, to detect when win resizes */ int curses_initialized = FALSE; /* flag indicating if curses has been started*/ int emacs_keys_mode = FALSE; /* mode for if emacs key binings are used */ -int ee_chinese = FALSE; /* allows handling of multi-byte characters */ - /* by checking for high bit in a byte the */ - /* code recognizes a two-byte character */ - /* sequence */ unsigned char *point; /* points to current position in line */ unsigned char *srch_str; /* pointer for search string */ @@ -216,6 +216,53 @@ WINDOW *text_win; WINDOW *help_win; WINDOW *info_win; +/* + | UTF-8 utility functions. + */ + +/* Return the number of bytes in the UTF-8 character starting at s. */ +static int +utf8_len(const unsigned char *s) +{ + if (*s < 0x80) + return 1; + if ((*s & 0xE0) == 0xC0) + return 2; + if ((*s & 0xF0) == 0xE0) + return 3; + if ((*s & 0xF8) == 0xF0) + return 4; + return 1; /* invalid byte: treat as single byte */ +} + +/* Return a pointer to the start of the previous UTF-8 character. */ +static unsigned char * +utf8_prev(const unsigned char *start, const unsigned char *ptr) +{ + if (ptr <= start) + return (unsigned char *)start; + ptr--; + while (ptr > start && (*ptr & 0xC0) == 0x80) + ptr--; + return (unsigned char *)ptr; +} + +/* Return the display width of the UTF-8 character starting at s. */ +static int +utf8_width(const unsigned char *s) +{ + wchar_t wc; + mbstate_t mbs; + int w; + + if (*s < 0x80) + return 1; + memset(&mbs, 0, sizeof(mbs)); + if (mbrtowc(&wc, (const char *)s, utf8_len(s), &mbs) == (size_t)-1) + return 1; + w = wcwidth(wc); + return (w >= 0) ? w : 1; +} /* | The following structure allows menu items to be flexibly declared. @@ -247,6 +294,7 @@ struct menu_entries { unsigned char *resiz_line(int factor, struct text *rline, int rpos); void insert(int character); +void insert_utf8(const unsigned char *mb, int len); void delete(int disp); void scanline(unsigned char *pos); int tabshift(int temp_int); @@ -345,14 +393,13 @@ struct menu_entries modes_menu[] = { {"", NULL, NULL, NULL, NULL, -1}, /* 6. info window */ {"", NULL, NULL, NULL, NULL, -1}, /* 7. emacs key bindings*/ {"", NULL, NULL, NULL, NULL, -1}, /* 8. right margin */ - {"", NULL, NULL, NULL, NULL, -1}, /* 9. chinese text */ - {"", NULL, NULL, NULL, dump_ee_conf, -1}, /* 10. save editor config */ + {"", NULL, NULL, NULL, dump_ee_conf, -1}, /* 9. save editor config */ {NULL, NULL, NULL, NULL, NULL, -1} /* terminator */ }; -char *mode_strings[11]; +char *mode_strings[10]; -#define NUM_MODES_ITEMS 10 +#define NUM_MODES_ITEMS 9 struct menu_entries config_dump_menu[] = { {"", NULL, NULL, NULL, NULL, 0}, @@ -422,8 +469,8 @@ char *emacs_help_text[22]; char *emacs_control_keys[5]; char *command_strings[5]; -char *commands[32]; -char *init_strings[22]; +char *commands[30]; +char *init_strings[20]; #define MENU_WARN 1 @@ -523,8 +570,6 @@ char *menu_too_lrg_msg; char *more_above_str, *more_below_str; char *separator = "==============================================================================="; -char *chinese_cmd, *nochinese_cmd; - #ifndef __STDC__ #ifndef HAS_STDLIB extern char *malloc(); @@ -553,7 +598,7 @@ main(int argc, char *argv[]) signal(SIGCHLD, SIG_DFL); signal(SIGSEGV, SIG_DFL); signal(SIGINT, edit_abort); - d_char = malloc(3); /* provide a buffer for multi-byte chars */ + d_char = malloc(5); /* UTF-8 chars can be up to 4 bytes + NUL */ d_word = malloc(150); *d_word = '\0'; d_line = NULL; @@ -624,41 +669,59 @@ main(int argc, char *argv[]) } wrefresh(text_win); - in = wgetch(text_win); - if (in == -1) - exit(0); /* without this exit ee will go into an - infinite loop if the network - session detaches */ + { + wint_t win; + int wret = wget_wch(text_win, &win); + /* + * ERR if the undersneath terminal is closed (like network failure on a ssh + * session) + * Normal exit as this is not an editor's error, but a network connection + * issue + */ + if (wret == ERR) + exit(0); + in = (int)win; - resize_check(); + resize_check(); - if (clear_com_win) - { - clear_com_win = FALSE; - wmove(com_win, 0, 0); - werase(com_win); - if (!info_window) + if (clear_com_win) { - wprintw(com_win, "%s", com_win_message); + clear_com_win = FALSE; + wmove(com_win, 0, 0); + werase(com_win); + if (!info_window) + { + wprintw(com_win, "%s", com_win_message); + } + wrefresh(com_win); } - wrefresh(com_win); - } - if (in > 255) - function_key(); - else if ((in == '\10') || (in == 127)) - { - in = 8; /* make sure key is set to backspace */ - delete(TRUE); - } - else if ((in > 31) || (in == 9)) - insert(in); - else if ((in >= 0) && (in <= 31)) - { - if (emacs_keys_mode) - emacs_control(); - else - control(); + if (wret == KEY_CODE_YES) + function_key(); + else if ((in == '\10') || (in == 127)) + { + in = 8; + delete(TRUE); + } + else if (in >= 0x80) + { + unsigned char mb[MB_LEN_MAX + 1]; + mbstate_t mbs; + memset(&mbs, 0, sizeof(mbs)); + size_t n = wcrtomb((char *)mb, (wchar_t)win, + &mbs); + if (n != (size_t)-1) + insert_utf8(mb, (int)n); + } + else if ((in > 31) || (in == 9)) + insert(in); + else if ((in >= 0) && (in <= 31)) + { + if (emacs_keys_mode) + emacs_control(); + else + control(); + } } } return(0); @@ -716,7 +779,7 @@ insert(int character) } *point = character; /* insert new character */ wclrtoeol(text_win); - if (!isprint((unsigned char)character)) /* check for TAB character*/ + if (!isprint((unsigned char)character)) { scr_pos = scr_horz += out_char(text_win, character, scr_horz); point++; @@ -763,6 +826,85 @@ insert(int character) draw_line(scr_vert, scr_horz, point, position, curr_line->line_length); } +/* insert a complete multi-byte UTF-8 character into line */ +void +insert_utf8(const unsigned char *mb, int len) +{ + int counter; + unsigned char *temp; + unsigned char *temp2; + int i; + + text_changes = TRUE; + if ((curr_line->max_length - curr_line->line_length) < (len + 5)) + point = resiz_line(len + 10, curr_line, position); + + /* shift the tail of the line right by len bytes */ + curr_line->line_length += len; + temp = point; + counter = position; + while (counter < curr_line->line_length) + { + counter++; + temp++; + } + temp++; + while (point < temp) + { + temp2 = temp - len; + *temp = *temp2; + temp--; + } + + /* copy all bytes of the UTF-8 character */ + for (i = 0; i < len; i++) + point[i] = mb[i]; + + /* display the character before advancing past it */ + wclrtoeol(text_win); + { + char buf[5]; + memcpy(buf, point, len); + buf[len] = '\0'; + waddstr(text_win, buf); + } + + point += len; + position += len; + + scanline(point); + scr_pos = scr_horz; + + if ((observ_margins) && (right_margin < scr_pos)) + { + counter = position; + while (scr_pos > right_margin) + prev_word(); + if (scr_pos == 0) + { + while (position < counter) + right(TRUE); + } + else + { + counter -= position; + insert_line(TRUE); + for (i = 0; i < counter; i++) + right(TRUE); + } + } + + if ((scr_horz - horiz_offset) > last_col) + { + horiz_offset += 8; + midscreen(scr_vert, point); + } + + formatted = FALSE; + + draw_line(scr_vert, scr_horz, point, position, curr_line->line_length); +} + /* delete character */ void delete(int disp) @@ -778,29 +920,18 @@ delete(int disp) { text_changes = TRUE; temp2 = tp = point; - if ((ee_chinese) && (position >= 2) && (*(point - 2) > 127)) - { - del_width = 2; - } + unsigned char *prev = utf8_prev(curr_line->line, point); + del_width = point - prev; tp -= del_width; point -= del_width; position -= del_width; temp_pos = position; curr_line->line_length -= del_width; - if ((*tp < ' ') || (*tp >= 127)) /* check for TAB */ - scanline(tp); - else - scr_horz -= del_width; + scanline(point); scr_pos = scr_horz; if (in == 8) { - if (del_width == 1) - *d_char = *point; /* save deleted character */ - else - { - d_char[0] = *point; - d_char[1] = *(point + 1); - } + memcpy(d_char, point, del_width); d_char[del_width] = '\0'; } while (temp_pos <= curr_line->line_length) @@ -891,8 +1022,12 @@ scanline(unsigned char *pos) temp++; else if (*ptr == 127) temp += 2; - else if (!eightbit) - temp += 5; + else if (*ptr >= 0x80) + { + temp += utf8_width(ptr); + ptr += utf8_len(ptr); + continue; + } else temp++; ptr++; @@ -1016,29 +1151,55 @@ draw_line(int vertical, int horiz, unsigned char *ptr, int t_pos, int length) } while (column < 0) { - d = len_char(*temp, abs_column); - abs_column += d; - column += d; - posit++; - temp++; + if (*temp >= 0x80) + { + d = utf8_width(temp); + abs_column += d; + column += d; + posit += utf8_len(temp); + temp += utf8_len(temp); + } + else + { + d = len_char(*temp, abs_column); + abs_column += d; + column += d; + posit++; + temp++; + } } wmove(text_win, row, column); wclrtoeol(text_win); while ((posit < length) && (column <= last_col)) { - if (!isprint(*temp)) + if (*temp >= 0x80) + { + int clen = utf8_len(temp); + int dw = utf8_width(temp); + char buf[5]; + memcpy(buf, temp, clen); + buf[clen] = '\0'; + waddstr(text_win, buf); + abs_column += dw; + column += dw; + posit += clen; + temp += clen; + } + else if (!isprint(*temp)) { column += len_char(*temp, abs_column); abs_column += out_char(text_win, *temp, abs_column); + posit++; + temp++; } else { abs_column++; column++; waddch(text_win, *temp); + posit++; + temp++; } - posit++; - temp++; } if (column < last_col) wclrtoeol(text_win); @@ -1404,13 +1565,10 @@ left(int disp) { if (point != curr_line->line) /* if not at begin of line */ { - if ((ee_chinese) && (position >= 2) && (*(point - 2) > 127)) - { - point--; - position--; - } - point--; - position--; + unsigned char *prev = utf8_prev(curr_line->line, point); + int char_bytes = point - prev; + point = prev; + position -= char_bytes; scanline(point); wmove(text_win, scr_vert, (scr_horz - horiz_offset)); scr_pos = scr_horz; @@ -1439,14 +1597,11 @@ right(int disp) { if (position < curr_line->line_length) { - if ((ee_chinese) && (*point > 127) && - ((curr_line->line_length - position) >= 2)) - { - point++; - position++; - } - point++; - position++; + int char_bytes = utf8_len(point); + if (position + char_bytes > curr_line->line_length) + char_bytes = curr_line->line_length - position; + point += char_bytes; + position += char_bytes; scanline(point); wmove(text_win, scr_vert, (scr_horz - horiz_offset)); scr_pos = scr_horz; @@ -1485,12 +1640,16 @@ find_pos(void) scr_horz += tabshift(scr_horz); else if (*point < ' ') scr_horz += 2; - else if ((ee_chinese) && (*point > 127) && - ((curr_line->line_length - position) >= 2)) + else if (*point >= 0x80) { - scr_horz += 2; - point++; - position++; + int clen = utf8_len(point); + int dw = utf8_width(point); + if (scr_horz + dw > scr_pos) + break; + scr_horz += dw; + point += clen; + position += clen; + continue; } else scr_horz++; @@ -1789,20 +1948,6 @@ command(char *cmd_str1) expand_tabs = FALSE; else if (compare(cmd_str, Exit_string, FALSE)) finish(); - else if (compare(cmd_str, chinese_cmd, FALSE)) - { - ee_chinese = TRUE; -#ifdef NCURSE - nc_setattrib(A_NC_BIG5); -#endif /* NCURSE */ - } - else if (compare(cmd_str, nochinese_cmd, FALSE)) - { - ee_chinese = FALSE; -#ifdef NCURSE - nc_clearattrib(A_NC_BIG5); -#endif /* NCURSE */ - } else if (compare(cmd_str, QUIT_string, FALSE)) quit(0); else if (*cmd_str == '!') @@ -1855,9 +2000,19 @@ scan(char *line, int offset, int column) j = column; while (i < offset) { - i++; - j += len_char(*stemp, j); - stemp++; + if (*(unsigned char *)stemp >= 0x80) + { + int clen = utf8_len((const unsigned char *)stemp); + j += utf8_width((const unsigned char *)stemp); + stemp += clen; + i += clen; + } + else + { + j += len_char(*stemp, j); + stemp++; + i++; + } } return(j); } @@ -1885,14 +2040,25 @@ get_string(char *prompt, int advance) g_pos = 0; do { + wint_t win; + int wret; + esc_flag = FALSE; - in = wgetch(com_win); - if (in == -1) + wret = wget_wch(com_win, &win); + if (wret == ERR) exit(0); - if (((in == 8) || (in == 127) || (in == KEY_BACKSPACE)) && (g_pos > 0)) + in = (int)win; + if (wret == KEY_CODE_YES && win == KEY_BACKSPACE) + in = 8; + if (((in == 8) || (in == 127)) && (g_pos > 0)) { + unsigned char *prev = utf8_prev( + (const unsigned char *)g_point, + (const unsigned char *)nam_str); + int char_bytes = (unsigned char *)nam_str - prev; tmp_int = g_horz; - g_pos--; + g_pos -= char_bytes; + nam_str -= char_bytes; g_horz = scan(g_point, g_pos, g_position); tmp_int = tmp_int - g_horz; for (; 0 < tmp_int; tmp_int--) @@ -1904,28 +2070,65 @@ get_string(char *prompt, int advance) waddch(com_win, '\010'); } } - nam_str--; } - else if ((in != 8) && (in != 127) && (in != '\n') && (in != '\r') && (in < 256)) + else if (wret == KEY_CODE_YES) { - if (in == '\026') /* control-v, accept next character verbatim */ - { /* allows entry of ^m, ^j, and ^h */ + /* ignore other function keys in string input */ + } + else if ((in != 8) && (in != 127) && (in != '\n') && (in != '\r')) + { + if (in == '\026') /* control-v */ + { esc_flag = TRUE; - in = wgetch(com_win); - if (in == -1) + wret = wget_wch(com_win, &win); + if (wret == ERR) exit(0); + in = (int)win; + } + if (in >= 0x80) + { + char mb[MB_LEN_MAX + 1]; + mbstate_t mbs; + memset(&mbs, 0, sizeof(mbs)); + size_t n = wcrtomb(mb, (wchar_t)win, &mbs); + if (n != (size_t)-1) + { + size_t i; + for (i = 0; i < n; i++) + { + *nam_str = mb[i]; + nam_str++; + g_pos++; + } + if (g_horz < (last_col - 1)) + { + char buf[5]; + memcpy(buf, mb, n); + buf[n] = '\0'; + waddstr(com_win, buf); + } + g_horz += utf8_width( + (const unsigned char *) + (nam_str - n)); + } } - *nam_str = in; - g_pos++; - if (!isprint((unsigned char)in) && (g_horz < (last_col - 1))) - g_horz += out_char(com_win, in, g_horz); else { - g_horz++; - if (g_horz < (last_col - 1)) - waddch(com_win, (unsigned char)in); + *nam_str = in; + g_pos++; + if (!isprint((unsigned char)in) && + (g_horz < (last_col - 1))) + g_horz += out_char(com_win, in, + g_horz); + else + { + g_horz++; + if (g_horz < (last_col - 1)) + waddch(com_win, + (unsigned char)in); + } + nam_str++; } - nam_str++; } wrefresh(com_win); if (esc_flag) @@ -2606,11 +2809,26 @@ search(int display_message) else /* if not case sensitive */ { srch_3 = u_srch_str; - while ((toupper(*srch_2) == *srch_3) && (*srch_3 != '\0')) + while (*srch_3 != '\0') { + wchar_t wc_text, wc_srch; + mbstate_t mbs; + int len_text, len_srch; + memset(&mbs, 0, sizeof(mbs)); + len_text = (int)mbrtowc(&wc_text, + (char *)srch_2, + MB_CUR_MAX, &mbs); + if (len_text <= 0) len_text = 1; + memset(&mbs, 0, sizeof(mbs)); + len_srch = (int)mbrtowc(&wc_srch, + (char *)srch_3, + MB_CUR_MAX, &mbs); + if (len_srch <= 0) len_srch = 1; + if (towupper(wc_text) != towupper(wc_srch)) + break; found = TRUE; - srch_2++; - srch_3++; + srch_2 += len_text; + srch_3 += len_srch; } } /* end else */ if (!((*srch_3 == '\0') && (found))) @@ -2688,12 +2906,38 @@ search_prompt(void) srch_str = get_string(search_prompt_str, FALSE); gold = FALSE; srch_3 = srch_str; - srch_1 = u_srch_str = malloc(strlen(srch_str) + 1); + srch_1 = u_srch_str = malloc(strlen((char *)srch_str) * 4 + 1); while (*srch_3 != '\0') { - *srch_1 = toupper(*srch_3); - srch_1++; - srch_3++; + if (*srch_3 >= 0x80) + { + wchar_t wc; + mbstate_t mbs; + int clen; + memset(&mbs, 0, sizeof(mbs)); + clen = (int)mbrtowc(&wc, (char *)srch_3, + utf8_len(srch_3), &mbs); + if (clen > 0) + { + wc = towupper(wc); + memset(&mbs, 0, sizeof(mbs)); + size_t n = wcrtomb((char *)srch_1, + wc, &mbs); + if (n != (size_t)-1) + srch_1 += n; + srch_3 += clen; + } + else + { + *srch_1++ = *srch_3++; + } + } + else + { + *srch_1 = toupper(*srch_3); + srch_1++; + srch_3++; + } } *srch_1 = '\0'; search(TRUE); @@ -2706,14 +2950,11 @@ del_char(void) in = 8; /* backspace */ if (position < curr_line->line_length) /* if not end of line */ { - if ((ee_chinese) && (*point > 127) && - ((curr_line->line_length - position) >= 2)) - { - point++; - position++; - } - position++; - point++; + int clen = utf8_len(point); + if (position + clen > curr_line->line_length) + clen = curr_line->line_length - position; + point += clen; + position += clen; scanline(point); delete(TRUE); } @@ -2730,15 +2971,12 @@ undel_char(void) { if (d_char[0] == '\n') /* insert line if last del_char deleted eol */ insert_line(TRUE); + else if ((unsigned char)d_char[0] >= 0x80) + insert_utf8(d_char, strlen((char *)d_char)); else { in = d_char[0]; insert(in); - if (d_char[1] != '\0') - { - in = d_char[1]; - insert(in); - } } } @@ -2750,14 +2988,12 @@ del_word(void) int difference; unsigned char *d_word2; unsigned char *d_word3; - unsigned char tmp_char[3]; + unsigned char tmp_char[5]; if (d_word != NULL) free(d_word); d_word = malloc(curr_line->line_length); - tmp_char[0] = d_char[0]; - tmp_char[1] = d_char[1]; - tmp_char[2] = d_char[2]; + memcpy(tmp_char, d_char, 5); d_word3 = point; d_word2 = d_word; tposit = position; @@ -2790,9 +3026,7 @@ del_word(void) curr_line->line_length -= difference; *d_word2 = '\0'; draw_line(scr_vert, scr_horz,point,position,curr_line->line_length); - d_char[0] = tmp_char[0]; - d_char[1] = tmp_char[1]; - d_char[2] = tmp_char[2]; + memcpy(d_char, tmp_char, 5); text_changes = TRUE; formatted = FALSE; } @@ -3310,11 +3544,6 @@ set_up_term(void) local_LINES = LINES; local_COLS = COLS; -#ifdef NCURSE - if (ee_chinese) - nc_setattrib(A_NC_BIG5); -#endif /* NCURSE */ - } void @@ -3424,10 +3653,12 @@ menu_op(struct menu_entries menu_list[]) wmove(temp_win, (counter + top_offset - off_start), 3); wrefresh(temp_win); - in = wgetch(temp_win); - input = in; - if (input == -1) - exit(0); + { + wint_t win; + if (wget_wch(temp_win, &win) == ERR) + exit(0); + in = input = (int)win; + } if (isascii(input) && isalnum(input)) { @@ -3665,9 +3896,12 @@ help(void) wmove(com_win, 0, 0); wprintw(com_win, "%s", press_any_key_msg); wrefresh(com_win); - counter = wgetch(com_win); - if (counter == -1) - exit(0); + { + wint_t win; + if (wget_wch(com_win, &win) == ERR) + exit(0); + counter = (int)win; + } werase(com_win); wmove(com_win, 0, 0); werase(help_win); @@ -3905,14 +4139,12 @@ Format(void) unsigned char *tmp_srchstr; unsigned char *temp1, *temp2; unsigned char *temp_dword; - unsigned char temp_d_char[3]; + unsigned char temp_d_char[5]; - temp_d_char[0] = d_char[0]; - temp_d_char[1] = d_char[1]; - temp_d_char[2] = d_char[2]; + memcpy(temp_d_char, d_char, 5); /* - | if observ_margins is not set, or the current line is blank, + | if observ_margins is not set, or the current line is blank, | do not format the current paragraph */ @@ -4104,9 +4336,7 @@ Format(void) case_sen = temp_case; free(srch_str); srch_str = tmp_srchstr; - d_char[0] = temp_d_char[0]; - d_char[1] = temp_d_char[1]; - d_char[2] = temp_d_char[2]; + memcpy(d_char, temp_d_char, 5); auto_format = tmp_af; midscreen(scr_vert, point); @@ -4210,19 +4440,11 @@ ee_init(void) else if (compare(str1, NOEIGHTBIT, FALSE)) { eightbit = FALSE; - ee_chinese = FALSE; } else if (compare(str1, EMACS_string, FALSE)) emacs_keys_mode = TRUE; else if (compare(str1, NOEMACS_string, FALSE)) emacs_keys_mode = FALSE; - else if (compare(str1, chinese_cmd, FALSE)) - { - ee_chinese = TRUE; - eightbit = TRUE; - } - else if (compare(str1, nochinese_cmd, FALSE)) - ee_chinese = FALSE; } fclose(init_file); } @@ -4230,15 +4452,6 @@ ee_init(void) free(string); free(home); - string = getenv("LANG"); - if (string != NULL) - { - if (strcmp(string, "zh_TW.big5") == 0) - { - ee_chinese = TRUE; - eightbit = TRUE; - } - } } /* @@ -4332,7 +4545,6 @@ dump_ee_conf(void) fprintf(init_file, "%s\n", nohighlight ? NOHIGHLIGHT : HIGHLIGHT ); fprintf(init_file, "%s\n", eightbit ? EIGHTBIT : NOEIGHTBIT ); fprintf(init_file, "%s\n", emacs_keys_mode ? EMACS_string : NOEMACS_string ); - fprintf(init_file, "%s\n", ee_chinese ? chinese_cmd : nochinese_cmd ); fclose(init_file); @@ -4505,13 +4717,10 @@ Auto_Format(void) unsigned char *tmp_srchstr; unsigned char *temp1, *temp2; unsigned char *temp_dword; - unsigned char temp_d_char[3]; + unsigned char temp_d_char[5]; unsigned char *tmp_d_line; - - temp_d_char[0] = d_char[0]; - temp_d_char[1] = d_char[1]; - temp_d_char[2] = d_char[2]; + memcpy(temp_d_char, d_char, 5); /* | if observ_margins is not set, or the current line is blank, @@ -4737,9 +4946,7 @@ Auto_Format(void) case_sen = temp_case; free(srch_str); srch_str = tmp_srchstr; - d_char[0] = temp_d_char[0]; - d_char[1] = temp_d_char[1]; - d_char[2] = temp_d_char[2]; + memcpy(d_char, temp_d_char, 5); auto_format = TRUE; dlt_line->line_length = tmp_d_line_length; d_line = tmp_d_line; @@ -4771,10 +4978,8 @@ modes_op(void) (info_window ? ON : OFF)); sprintf(modes_menu[7].item_string, "%s %s", mode_strings[7], (emacs_keys_mode ? ON : OFF)); - sprintf(modes_menu[8].item_string, "%s %d", mode_strings[8], + sprintf(modes_menu[8].item_string, "%s %d", mode_strings[8], right_margin); - sprintf(modes_menu[9].item_string, "%s %s", mode_strings[9], - (ee_chinese ? ON : OFF)); ret_value = menu_op(modes_menu); @@ -4796,15 +5001,6 @@ modes_op(void) break; case 5: eightbit = !eightbit; - if (!eightbit) - ee_chinese = FALSE; -#ifdef NCURSE - if (ee_chinese) - nc_setattrib(A_NC_BIG5); - else - nc_clearattrib(A_NC_BIG5); -#endif /* NCURSE */ - redraw(); *** 62 LINES SKIPPED *** From nobody Tue Feb 17 14:02:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFhCx4YB4z6SSTN for ; Tue, 17 Feb 2026 14:02: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 4fFhCx3sBQz3qRM for ; Tue, 17 Feb 2026 14:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771336941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KesNe1kQNkWkU1+nXCK/X/jRQ75y2xh/O/y8TlIWULI=; b=TdURvwT2l5vAB0wYKTDQmxNYZxcEldXfu8C1bfDTIt9pB/Z4yQqqOyNd1uqqglsVUZzpub uKk2TMVzISjOx74A47ZfmKDKeBXIKhqUON2McdUL/5FilNKidk7nbOx5OzvByjlXRmEDQc EuKvp0ZkoSsXRcn7ruZ7FVzqXz6AnpVN6+1ui0Mk6r2vmniCuyLHUyX/uxk1uOwlv8JUuY TLDiJri9v04NGxY1ZKlx81aAK3kkrIhl8VAHWUWzekDOJToIYJXCcy5DjQRpHXaKkYFjzR +xRuHYIYw/9ml8kixt8jssMW0c0JWw+jBMxZcAvzxlrixyZXOLnSQc++KnbbuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771336941; a=rsa-sha256; cv=none; b=CFkoaYP/R2bhaQIznJQL5KqHSDwNtUp6O9Mrz4ymc3TcUaJFbohImCuay6HkwUYx+CNGuD w62WyCUw0yj4VYpb4zCSf0etnmsQ6txIXEwvsrhfr8JDWyUlfNtFfE4RVL8rrbVrwX8AIP QtwUt6Fp3c2m3T+0d8W+0YW+AdEwuluDcMqrKh0HQ7P0MxILAuTz9/3+ZxU9vyb/317fDp RuVq3blu3dqCHet/7U0r5oyHjQ9lvqJ5K+BYuxMLJD7a05ytMhvT2RX7WWrg1pGaFcGToi hMlBKXtd0zAUBWXj+IEDeHdBxV8nwPQ+zhg/gBrN+FwU9Jqq7d0gfJMgAT0A7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771336941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KesNe1kQNkWkU1+nXCK/X/jRQ75y2xh/O/y8TlIWULI=; b=ZJt1nZigtGN1s/oTIgNdp3ZojKH/LeRD4DWEAA4qQuQEgieByRqb5gSMSwxYMpsRHd8FV0 2O9ErYs2ytdQAoy7tdgyEV0DVyT7HNJNJe5vtusjDKFWrcUvAXA9yRRXEFFwzq5Ba62hSI L0m9NzkjzQiO8pTwnNRHXj8lGkG3Bl6Eo/d2KKlF/Eym9jZWKeJl8N5Vi/15Fdx6ShzrOQ C83+S3rSj/Qpt4n2vrG6ZKoHPfz58dq4vlYT3CZ4VB2Bkh8zoKqyUA5GnVniHvSxJeP8ij smI59igNHTOrfdHSvgnHmhNhzSA5cn7EjYzpn5RTmzdoGaO1ONbuKJ9BJPSxZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFhCx2ymGz1C3P for ; Tue, 17 Feb 2026 14:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 430b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 14:02:21 +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: 507c611aeac7 - main - m4: Fix eval output width List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 507c611aeac7ca9aed12353b1044bb21ab00afae Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 14:02:21 +0000 Message-Id: <699474ed.430b3.aec99f6@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=507c611aeac7ca9aed12353b1044bb21ab00afae commit 507c611aeac7ca9aed12353b1044bb21ab00afae Author: Dag-Erling Smørgrav AuthorDate: 2026-02-17 14:01:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 14:01:42 +0000 m4: Fix eval output width According to POSIX, the optional third argument is the minimum number of digits to print regardless of sign. We interpreted it as the minimum width of the output including the sign. Additionally, the variable used to hold this value was confusingly named “maxdigits”. PR: 293214 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55311 --- usr.bin/m4/eval.c | 8 ++++---- usr.bin/m4/misc.c | 2 -- usr.bin/m4/tests/eval.m4 | 2 ++ usr.bin/m4/tests/regress.eval.out | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index 4e45a71874e1..0963a61a2914 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -178,7 +178,7 @@ expand_builtin(const char *argv[], int argc, int td) */ { int base = 10; - int maxdigits = 0; + int mindigits = 0; const char *errstr; if (argc > 3 && *argv[3] != '\0') { @@ -189,14 +189,14 @@ expand_builtin(const char *argv[], int argc, int td) } } if (argc > 4) { - maxdigits = strtonum(argv[4], 0, INT_MAX, &errstr); + mindigits = strtonum(argv[4], 0, INT_MAX, &errstr); if (errstr) { - m4errx(1, "expr: maxdigits is %s: %s.", + m4errx(1, "expr: mindigits is %s: %s.", errstr, argv[4]); } } if (argc > 2) - pbnumbase(expr(argv[2]), base, maxdigits); + pbnumbase(expr(argv[2]), base, mindigits); break; } diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index 3091f2ad1f9e..fd72292aeac0 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -138,8 +138,6 @@ pbnumbase(int n, int base, int d) } while ((num /= base) > 0); - if (n < 0) - printed++; while (printed++ < d) pushback('0'); diff --git a/usr.bin/m4/tests/eval.m4 b/usr.bin/m4/tests/eval.m4 index 1d3f886d0d89..dc0fada781f1 100644 --- a/usr.bin/m4/tests/eval.m4 +++ b/usr.bin/m4/tests/eval.m4 @@ -3,3 +3,5 @@ dnl expr parser eval(224&127) eval(224|127) eval(224&&127) +eval(3-2, 10, 5) +eval(2-3, 10, 4) diff --git a/usr.bin/m4/tests/regress.eval.out b/usr.bin/m4/tests/regress.eval.out index 7298b3f43840..b1bb211dcb64 100644 --- a/usr.bin/m4/tests/regress.eval.out +++ b/usr.bin/m4/tests/regress.eval.out @@ -1,3 +1,5 @@ 96 255 1 +00001 +-0001 From nobody Tue Feb 17 14:52:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFjKs5PhNz6QJRy for ; Tue, 17 Feb 2026 14:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFjKm4sg4z3wWW for ; Tue, 17 Feb 2026 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771339948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E/qyvyBgvkApIqsnb9wMncNZUdOpayObR7l3z16r/Os=; b=FVok24FghsSSTQa9woOYn5cwNLnhcyJaYKFQnFyBFrAKm/2neIUzThDiqLuUX3sgQH9YUb aj7fbqGv/Sc04D/VTDe3CwdqhbhbYf4xa5YxMlQRA//ZXClhmk8FiAj/+0w8CtjCkhR/Eo 1RHlaVc3XyyzgVaEMqnQyhIdVxxg4a1fMI6JiJVZ2ApvtyBljcchbvkvqMXWMnXF8fbK5A v/U0zZp8qZQV47snfglKP6ZOnzz8L0PYKKdJv0Ea6Oj8Ulo/6waIRH6Gr6KQAmpPg3nAiE b1CQhXduWpm9+cPeycro75a/4Ol8x05X7wtkHQFYbtC7c16stZ5kLBmvegJzvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771339948; a=rsa-sha256; cv=none; b=qQDfUTwyvDtM2uraa9VUYvIMrMNv/XJ52JbFllrNIAqyH70mujcK56T/IIugIcdMyPaBSH EPwmCJcF/BqDLwhP7a23foMQC/lmM84tPNn9zqXJdX9F7U6YTIrGxawukgTulHiTIzykSi BN62X+aYr1FVy71EM25pLyPMYT03kVD0VZjf0E/KcoPiXSoQ7p78f+gRBi2DrkxcJ9bMid MEZbd9sFTiUrd8kKdSb6B7sPRf5uLwwzUfna02fqdLSPg+gSd6VJ8M5/urRXX1mdg9NRbc fNSlRAgppk/+dEXOwhpnlpQMnsxL0ybc0n2C0KmA76Ns11QYa8uU9qe5sbeFDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771339948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E/qyvyBgvkApIqsnb9wMncNZUdOpayObR7l3z16r/Os=; b=CZjrgYSMZ9/O600VLZvs9hs4IAeWwvEzeBKibS1KkGsj4t9Dt2JA3fK2s/5WmlxCuuN4Wh /ZKLks8IxRABfXxkt27J+FWgTcPuAXLXYgte+s2eSQERcKG8eJuCguAHVtRnnS62zro/dN RA0UEXz2AR2krDnU45XY0GLXuJj8GoMYBRhou3TiQAkCzGVCFmf7U+Larbebg+vK1c/S+D 8P9AAOVtlljDu/cua3Y4XQ9Hwr7PTMLXJrATvQZUIQbl12Kvaa85oD0WiifU5fitIVjhCp EhcSqpB6hb+hXsKADenwkT1IHOSXxtkSoAksQqKQYOjPxTJjW69skeOB1rz2Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFjKm4RN0z1Cpg for ; Tue, 17 Feb 2026 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47f34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 14:52:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4c247f120492 - main - krb5: Make the build a bit quieter List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c247f120492d999ac90efcfc73e5fea29206d1f Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 14:52:28 +0000 Message-Id: <699480ac.47f34.1bdff7f2@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4c247f120492d999ac90efcfc73e5fea29206d1f commit 4c247f120492d999ac90efcfc73e5fea29206d1f Author: Mark Johnston AuthorDate: 2026-02-17 14:45:50 +0000 Commit: Mark Johnston CommitDate: 2026-02-17 14:46:52 +0000 krb5: Make the build a bit quieter compile_et.sh is run during buildworld and prints a bunch of debug output. It's intrusive and probably not needed, at least by default, so let's make the build output a bit cleaner. This is an upstream script, but it hasn't been modified in 15 years so the local modification is unlikely to cause any pain. Also remove a print that shows up in buildworld -s output. Reviewed by: cy MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55317 --- crypto/krb5/src/util/et/compile_et.sh | 2 +- krb5/lib/gssapi/generic/Makefile.inc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crypto/krb5/src/util/et/compile_et.sh b/crypto/krb5/src/util/et/compile_et.sh index f17ddba71247..9da3cf1bd21d 100755 --- a/crypto/krb5/src/util/et/compile_et.sh +++ b/crypto/krb5/src/util/et/compile_et.sh @@ -30,7 +30,7 @@ fi ROOT=`echo $1 | sed -e s/.et$//` BASE=`echo "$ROOT" | sed -e 's;.*/;;'` -set -ex +set -e $AWK -f ${DIR}/et_h.awk "outfile=${BASE}.h" "$ROOT.et" $AWK -f ${DIR}/et_c.awk "outfile=${BASE}.c" "textdomain=$TEXTDOMAIN" \ "localedir=$LOCALEDIR" "$ROOT.et" diff --git a/krb5/lib/gssapi/generic/Makefile.inc b/krb5/lib/gssapi/generic/Makefile.inc index f449ab15c379..47f2961db979 100644 --- a/krb5/lib/gssapi/generic/Makefile.inc +++ b/krb5/lib/gssapi/generic/Makefile.inc @@ -42,7 +42,6 @@ CLEANFILES+= gssapi.h ${GGEN} ${GGENI} INCLUDE_XOM= echo "/* no xom.h */" gssapi.h: gssapi.hin - echo "Creating gssapi.h" ; \ h=gss$$$$; rm -f $$h; \ (echo "/* This is the gssapi.h prologue. */"; \ ${INCLUDE_XOM} && \ From nobody Tue Feb 17 15:12:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFjmW3wcdz6QKwD; Tue, 17 Feb 2026 15:12:11 +0000 (UTC) (envelope-from bapt@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 4fFjmW3G7Tz3yyx; Tue, 17 Feb 2026 15:12:11 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771341131; 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=r5NU6Z/Q2K4dcT/7lZ0nVhK6GKjKWLs93euzPqQ6ZfE=; b=EpAzrqV5tR2jpmVSRhOCaCNOTlwfT0zX97hZfzCYOvBf3Zy2POYfRghB/DCLpjQ8HW6iHp I4U1FSCBQlSlmeD6BuyeAVRbiSdVkw2SWQGAMLOiwBvK7cQbIMgfA5fscw4J57aTDnY43z h79t4zyGX2f14k99Kl6CnUmBYrudrz3DzENwX18767rHumTlYx2Fhinhm5Ef8pp9TijZZx H8sV+kDFvcpjJ94Gs95z/8Cov9f6v48pcIh5ClW2urefb8MaXsx1uEKecxXy5Qykv8zsUQ 5tIUA5Z+U/8kO7BlsDhqmh/e1FFp1ug4TMxZPRy81GIAJtkLi/RdpBreOLZaEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771341131; a=rsa-sha256; cv=none; b=m26Z0/MYdfGazoPE6wg+vXY+IF7aGz18nTz9L2sdtof+/jADNJ//w4HHz/OoXjT5uIUG+s Egm9j0qgipjzqGZWVGGe5l7KmYdzJEJs8VH/owc9iXqJQniKL0IdLxSZAneM3VrzVZptFi h50VPRpyijvoxdtAKNusTlsLu39VVxHKB6X6dznqZbbzBOLqT4BqXqMH/BoY7zxzREJPnM SJjKlYXO1HfttAJ3jQp/UezXOycJlhmcbPeuCCKxMJ1rDsHBfOtSZpaR8hiDa8wB/+h8sH W9xUvdUs7qqPuQknfkmey5zHWpFUFD+Svtqi9VVGRHIPqp5XCKUT+tIYVO/CkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771341131; 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=r5NU6Z/Q2K4dcT/7lZ0nVhK6GKjKWLs93euzPqQ6ZfE=; b=ZDn6gvsHX0UxfPz2WOOWvDSVkVvoKnSOe2N8qy2NsKWPWw9N2hzxQTO4dmF5no4ZJqshia cPutB/A3ZqL4zlFdQfj3qJW6Lhv5GJ5GdY/KDXUTZ/CvLOe8zrNNG6BcLYwPdksK6/Pnrf DR5KSWsL0M9hjdW+Bz04UX5A0M6tXUV/vx+GiPYAI/APCD6Qo83yNA1NwEXjr62q0GdOuX GSirEoQt+ezKrFO7k6Hn4tblprobmO5MLdAsPMQ4qH5+eYIAEfAIe0V+wwSubpkUgA+PzU 95dEWu/QaSHPlgSRZo9ziISgiRUjkL+6iFiKZfolCgPLFRnQkvP9MwMo5dYftA== Received: from b.nours.eu (b.nours.eu [IPv6:2001:41d0:303:5e39::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fFjmW27MZz34s; Tue, 17 Feb 2026 15:12:11 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by b.nours.eu (Postfix, from userid 1001) id B1E0AB06F9; Tue, 17 Feb 2026 16:12:03 +0100 (CET) Date: Tue, 17 Feb 2026 16:12:03 +0100 From: Baptiste Daroussin To: Dag-Erling =?utf-8?B?U23DuHJncmF2?= Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 507c611aeac7 - main - m4: Fix eval output width Message-ID: References: <699474ed.430b3.aec99f6@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <699474ed.430b3.aec99f6@gitrepo.freebsd.org> On Tue 17 Feb 14:02, Dag-Erling Smørgrav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=507c611aeac7ca9aed12353b1044bb21ab00afae > > commit 507c611aeac7ca9aed12353b1044bb21ab00afae > Author: Dag-Erling Smørgrav > AuthorDate: 2026-02-17 14:01:34 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2026-02-17 14:01:42 +0000 > > m4: Fix eval output width > > According to POSIX, the optional third argument is the minimum number > of digits to print regardless of sign. We interpreted it as the minimum > width of the output including the sign. Additionally, the variable used > to hold this value was confusingly named “maxdigits”. > Did you try to upstream this? espie@ is responsive to such patches in general. Best regards, Bapt From nobody Tue Feb 17 17:30:23 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFmqz6TqVz6Rlm4 for ; Tue, 17 Feb 2026 17:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFmqz3Ll3z3JqL for ; Tue, 17 Feb 2026 17:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771349423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRM8GejzS/ZjTooP/KJx5dH4RGrNTk12YQuuZ3CzIHM=; b=BpT+wZJpYpr3lUsWO6O+8wj6yylK4vaYh8BivpG2hU130+R1aEXXs6J8nLw19Yz/Hptmbm 0trhxDIcpdE15lCCjXsmEq60sB2+g4qJjApga4RMDupcUTEShyOYDPAn78YwhwEW/Ktu9x MiWGu+JunzP+yxjxsRAe8LEinF09b19T6Z+N2gRlyAvuCNyUAy8UWEacrqY4rjlvRGVj/M 2fE/io2eTqwsuDXl4n7y56ZOKaJ5lFYuMaqwgOKiGY7Yb0hG2D5+xULyqfElPKLv7OLBTY KBlkezclEs4ve7ldzGl7viRYerjlW3hRIgnYc/aq988e336KKzbt58V6XCpF4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771349423; a=rsa-sha256; cv=none; b=Yt27Yo9mCuyJL+1M/+ZjF5Va/u+zHjQDNeb9SUuj5zqo5zCn2pusQ3NwrhmGHu6g60LtNw CO4C7INqdUXpEmZa9XAX3bn+cAId15CdgISU5N5qWdA0ukt3/YpDlpkO5GT6eH5f/p/JvX OfjPtKpPBkhwYVJ8wWqhEbd8AfSzu7GFReUca3nDyOqTFWfhh25teBJeJyiQuxbL879vE3 xffwUBGv+4vs7hc/aX0zqOJvFyulFYDHxw6t6jyYpEeTyINbQ21G1k7bN0lVJP4T6PHbar hZGSawVq3dhbNMxpvpoNSwC+iWkPMlMvWrYaS/VFdRGRCLIeaUnQ31soLdEDNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771349423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRM8GejzS/ZjTooP/KJx5dH4RGrNTk12YQuuZ3CzIHM=; b=LwsbpIkEWvjJRFMIF5iCrf7OxGk/0BYjwVaexVU5cY4wmWIcRLkEyTX69OMBECo610zAaD eWdiJIZ7pMND8gwvypdErBQ+EPLWhycHXGx9hz5enrGZtWtlcwZiUysXchGxkyUi1putee PEroHEanxtsxG/tsL7smHAz8UT4QEQYoHM1P1hanxlHQUe2guIG8ZSCgYRRMBTHNUZrkke BqsGPYfPgmb4OjJsVIGCGRzWATcqurF+E/2wgKJxhopC/fvpP6J8vPhtEOjw2CHXHb/z29 aCBO7UA5KkMv2em6EiXUeEKrHgl8PFnMv3F2tprzKWH9V8WvewEx+5jOSW+lXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFmqz230Qz40L for ; Tue, 17 Feb 2026 17:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32cfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 17:30:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 960719762f0a - main - trimdomain.3: Explain DISPLAY a bit more List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 960719762f0a1f6689ec58bc6d8ce21c4daa9096 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 17:30:23 +0000 Message-Id: <6994a5af.32cfb.3f4f1157@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=960719762f0a1f6689ec58bc6d8ce21c4daa9096 commit 960719762f0a1f6689ec58bc6d8ce21c4daa9096 Author: Alexander Ziaee AuthorDate: 2026-02-17 17:22:26 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-17 17:28:25 +0000 trimdomain.3: Explain DISPLAY a bit more MFC after: 3 days Reported by: jrtc27 Reviewed by: des Differential Revision: https://reviews.freebsd.org/D54629 --- lib/libutil/trimdomain.3 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3 index 0e65a864936c..114d8d139869 100644 --- a/lib/libutil/trimdomain.3 +++ b/lib/libutil/trimdomain.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 1999 +.Dd February 17, 2025 .Dt TRIMDOMAIN 3 .Os .Sh NAME @@ -60,20 +60,18 @@ name does not exceed .Pp If the passed .Ar fullname -is actually a -.Dv DISPLAY +is actually an X11 +.Ev DISPLAY specification of the form .Sm off -.Ar host . domain : nn Oo . -.Ar nn -.Oc +.Ar host . Ar domain : Ar display Op . screen , .Sm on and the domain name is the same as the local domain name, .Fn trimdomain will remove the embedded domain name, copying the screen and display numbers to the end of the base host name and resulting in .Sm off -.Ar host : nn Op . Ar nn . +.Ar host : display Op . Ar screen . .Sm on .Sh RETURN VALUES The From nobody Tue Feb 17 18:25:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFp3Q4pSbz6RrJG for ; Tue, 17 Feb 2026 18:25: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 4fFp3Q28tJz3RGn for ; Tue, 17 Feb 2026 18:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771352722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x6W9mYZdpwsJP8Qzbbhlc4l7c35Puvvbk6eseqEnYWY=; b=XRWz7Xw/65qYs/HWUtMKCYsWKLbA4FfbMWZQNbRhJXWlOYCnJAiD7rvDDpwr8HVbraPqVC YPzIQKmUJzBKIm4wMLSCaeWfBD+wHmyqjCdYG9LjLn1I78/uHjjJ33OuXjzOUvHO0M3JFt miHJWW7l7BuWvPEhXs086GRotRzmYIA3Nx+A3ZIlO7sjGnBZYmO5zk9YVKvdPMK3ICV/fL XQH2ZlwNkAuWcL+Pn5C8H1c7MNFI7Stf8pBpLIkq7+FdZqX/PEcB+a/IZAJgscL2gAgApq CCoUeC5MYX9hDDiG1DXX1AMS6LarCzpvxclIdVOnJavTOn8k+tQoF+Ai1Im83g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771352722; a=rsa-sha256; cv=none; b=SCqYR3UO35W1N+LHo/0K5tOa4p8bmht0GFismaJNFnFasv6Our/a4hw/O76o5cB857jZqU ShOhkAe9mTvZWVgcxP+VC2dRNmAH6jdUICzIp8LYPol1F4PjaiG0Qm4dZpj6tSaNzf1++1 1kufT2UQh+citcqTkDFGDiJapZ3zQf8SsSJ7p9rqMS7433xCmVfXF9vY+oZxDILgwec8Kg UYSpALwr/5qg4poJQ+lXNsKQD86nT3BM790BeLiB2BJwhCTP0Pnc4lkkSObQoNGhF0zxwh YNq9mFyYy9nF1xvcZiuJeVXpGHiChQ367wj3m203+6fNulzjA0utQ54XrcB0mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771352722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x6W9mYZdpwsJP8Qzbbhlc4l7c35Puvvbk6eseqEnYWY=; b=nwwDRjMsv0ww3O52MER1OxgWpjR7l736jxhp1o4htgz0vGb+BJvzi1KoQkITwLMTCr+D4L 6Cfam/XprOB0U2uDI8QfGyy63hMxZ1l7WOnbugd0hSFjmGCkfCabG0rosvTxe45CZFmoU8 TU2gcKrSfV/YzHzD+dQX5CaN3sgtb5YY3O+Yy46hjSUf/tUiDXNqD42lVzNH6Tyqe1Ahmo Rn8zmwvrzLDy9QzQ6ok97B9VYrlGGYCpKE2xVu0Wy8NLWmeg+zS4fBnfuQzhJo9b/orNGM XuRrd4o5pv7KHR31KeNZHKNRJTTWbnejGmDksJwiOSX7ABxTK69+z9F/n2QPIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFp3Q1gQyz5Kj for ; Tue, 17 Feb 2026 18:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37bea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 18:25:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: c4130a8a84e1 - main - OpenSSL: install EVP_CIPHER_CTX_get_app_data.3 once List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4130a8a84e1ce0fc9c05d2b48f83e66ade302aa Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 18:25:22 +0000 Message-Id: <6994b292.37bea.2d798582@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c4130a8a84e1ce0fc9c05d2b48f83e66ade302aa commit c4130a8a84e1ce0fc9c05d2b48f83e66ade302aa Author: Brooks Davis AuthorDate: 2026-02-17 18:24:29 +0000 Commit: Brooks Davis CommitDate: 2026-02-17 18:24:29 +0000 OpenSSL: install EVP_CIPHER_CTX_get_app_data.3 once A separate EVP_CIPHER_CTX_get_app_data.3 was added in the OpenSSL 3.5.5 import, but the link to EVP_EncryptInit.3 was still being installed which stomped on the file and created inconsistent entries in the METALOG. Reviewed by: emaste Found by: package_check script in Cirrus-CI Fixes: 1731fc70f734 ("OpenSSL: update vendor sources to match 3.5.5 content") Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D55332 --- secure/lib/libcrypto/man/man3/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/secure/lib/libcrypto/man/man3/Makefile b/secure/lib/libcrypto/man/man3/Makefile index 01c40aed495e..172444fcb68c 100644 --- a/secure/lib/libcrypto/man/man3/Makefile +++ b/secure/lib/libcrypto/man/man3/Makefile @@ -1973,7 +1973,6 @@ MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_free.3 MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get0_cipher.3 MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get0_name.3 MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get1_cipher.3 -MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get_app_data.3 MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get_block_size.3 MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get_iv_length.3 MLINKS+= EVP_EncryptInit.3 EVP_CIPHER_CTX_get_key_length.3 From nobody Tue Feb 17 18:34:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFpFw496Tz6RrYF for ; Tue, 17 Feb 2026 18:34: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 4fFpFw1X85z3Rvx for ; Tue, 17 Feb 2026 18:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771353268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6TLb5+FzAIhukhZzPkt/ByDLaM0emzryuYeWnvhtL0=; b=LjlbKfYO+E6rGejMonOxxF0+JEabTvJyQlH8Qt9l9dtpJfNSYSx3SxW+phBUtiwh8oF4Mx TFIxKI1wRALOnwy/mLF5nZKF5Tdjym0VwhQe+8AmDACwSDOqvxW8a7UFCGt0V4zda0SeTz 9dZPz4LPz6xbVF9JhnG9rhcmb6fmp/YVK5me3VglsBXiwn1HvrVY0dF0ljjkva0GxU3s9Y bF3ngSX6uCr7FdwN0yk0w67M23cthHo4/oP6aqburkqDSdjGy80CFNuHfC6EG1GXfG73mg bTXzQy1dKcu0KHPRaiITnCyhusa482bBP/CUE25dLjxCbFvp7sfAKULlQFl6dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771353268; a=rsa-sha256; cv=none; b=puUvl8p+LWfYBNBVWj28cV6gL6EjgzppTTp47VgI1Iy4Fxq2egECfxMeUNa8MtuyWF20BC d+GpAXQovhGrI4CHrSI9rTgS4omFocrYE+a+zbvOugZSQqWYdXOa3knjQNkTjSxpMGag/X qsbvjbW9Y9Xw0tLUTcQ6rGjK6UimcgQ4UKgfadZezBPKxGLbUyWogQHfAxi5UAxrauKSXq rIkVoqeVUijSi/fFGQoRYBhRkctH+o2pbz8UAHzVCv2GkraUfqe2qSBIuT37Dt4s8NyhHh 62I7jtGUVHGCluxyNxnvD0aAukL2AEM0Rm+AB0nJHrf8nFhs2ji85RUlIi7KQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771353268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6TLb5+FzAIhukhZzPkt/ByDLaM0emzryuYeWnvhtL0=; b=ybpkf21r6IBAsF2KS7BrPLfcCNuBky55ylXoIa667FL5R36wkUj0iLdVryE/WBxJJrNX2X hwUw9XhyZ7rQrY4UDqvcr4j+k73nodAPkWckL5Ma9kc/vJiUT6baORvY3RxNL6UVWjSSlM NUCvoi6GgRAleGd4HjvF+DIK8nF/9p2Yxy1Pqw98cu8645EfEVgMJJ/gMU0rAScfSZRhPu 6yCyOFZiIAdXyAAQg/tu/12A4RzZFGDdBVuoraWw3SJnBrzftljYIrMfxSBv8iT+SqM8v6 lpq2qJbGCr0rujulnW/ZPvW+wRUvZQu644TNbcglyjC03stKvdq840iEnKGy3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFpFw0H6Xz6Bg for ; Tue, 17 Feb 2026 18:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3894c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 18:34:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: d7d0369ad331 - main - recoverdisk: Ensure medium_read is multiple of small_read. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7d0369ad331d17ca2bc0076b2f1ab8bed88c5f4 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 18:34:28 +0000 Message-Id: <6994b4b4.3894c.1eb1087d@gitrepo.freebsd.org> The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=d7d0369ad331d17ca2bc0076b2f1ab8bed88c5f4 commit d7d0369ad331d17ca2bc0076b2f1ab8bed88c5f4 Author: Poul-Henning Kamp AuthorDate: 2026-02-17 18:33:41 +0000 Commit: Poul-Henning Kamp CommitDate: 2026-02-17 18:33:41 +0000 recoverdisk: Ensure medium_read is multiple of small_read. --- sbin/recoverdisk/recoverdisk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/recoverdisk/recoverdisk.c b/sbin/recoverdisk/recoverdisk.c index 5971f78738ac..a002a8304579 100644 --- a/sbin/recoverdisk/recoverdisk.c +++ b/sbin/recoverdisk/recoverdisk.c @@ -677,6 +677,9 @@ determine_read_sizes(void) l <<= 1; } medium_read = h; + medium_read -= medium_read % small_read; + if (medium_read < small_read) + medium_read = small_read; printf("# Got medium_read from small_read & big_read: %ju\n", (uintmax_t)medium_read ); From nobody Tue Feb 17 18:38:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFpLB1jgGz6RsDx for ; Tue, 17 Feb 2026 18:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFpLB1B1jz3Tbr for ; Tue, 17 Feb 2026 18:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771353490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gzLe3wfBt5rqzghZb51Cl2m6WVKOwGOYi4haq5W+mjo=; b=t0HQ5eJP9Om568tHVu4q7odzfdCiXORd+Gfm6Njc82ZCDMTEPXRa33llvpgsl0JSFITk2N Mw+w82NlCMdMBNZO/9IOrCjP7wREtuNyrBwRR5n0sTqhdJWpXTepx2rZL2ayI53BEnB9fB nmiTzXJ/PPT/z/hoTKn5W7U93beh6pqvozVqNUdFhIPdsXCdw9ygzZ50R4oAaqBcQaN1L6 jgM9pqsc4rIuqgeZSsGzsBOMdc+94O/FovIN+WpbbJB+4XwH21+00JQRbM+jWnGcaui0YA P9QxK29AL9WOAoZsnmZf7UnFvczjSVHwB5URtDUGjpVkZ+IGp7c5NwdDN8WZIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771353490; a=rsa-sha256; cv=none; b=spFfpXp8cztaN/QEBJ4BlG0ZVOmmz7Otu+PdHVsGAfwR/pFSBAD2LpOUe276puWWTjpTLi 8tjfjzIBABG90mJ/MgM321M1g9pLWeDbZL8Yk3naaBm3suIiHwBgpigZ2wieTkpOWuzIeP uRejB7dEAfTO047HEr6OfnrYH2zba1/KQIFo4EmTJbZnrF7tCiY19S+JAT9+mPw+sUQlQe 0mYqYfHvY725m0HeRSN1sVlOwLwL95tQoYd7KffMz4QwMnQyKPt/8P44gW+MXK5irDUZTN 6Dw5oBYrf29VvEba5rrpXGCbrcjyUw/DCWPu5PZlxaEg5eePzl3KlbRsJ1Rrew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771353490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gzLe3wfBt5rqzghZb51Cl2m6WVKOwGOYi4haq5W+mjo=; b=TWbm1h6ZXujNoeFJ6Cte5JdcJgfflAlLI12ONE7a9BiYvRVPrJKytwnfJ05i75JVbefZ4O uCw77yBBkaMr1zTwhJDTsQ0zW2/v06zDcbCpmfZYGV4s40atA9OodxYO4mcYh6JO4DtySv SGNsIHesEDrJ5FM7QAvIcjJJFr1fXZo64MJghAe3I94rRF0m8R7WnHSxPuflP8Q20zHbtw MprzFforRPeprFxcmSJ9iKqcGoktKsUzbWB7VLHzf3g7MY9oBN2Iq1A7r1ozevidFlTJgP crTzG8qlgwgn229LnBAmbvRieZw4+pvay7ysIIJVDxfIPgFQfOtHZYRnaHgRTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFpLB0dCHz61V for ; Tue, 17 Feb 2026 18:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 384e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 18:38:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 0f2b7181ea5a - main - bhyveload: If disk cannot be opened RW try RO. (=same as bhyve) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f2b7181ea5acbabe11bf2c732078e8898c02c40 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 18:38:10 +0000 Message-Id: <6994b592.384e0.343a766e@gitrepo.freebsd.org> The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=0f2b7181ea5acbabe11bf2c732078e8898c02c40 commit 0f2b7181ea5acbabe11bf2c732078e8898c02c40 Author: Poul-Henning Kamp AuthorDate: 2026-02-17 18:36:04 +0000 Commit: Poul-Henning Kamp CommitDate: 2026-02-17 18:36:04 +0000 bhyveload: If disk cannot be opened RW try RO. (=same as bhyve) Not expecting it to turn into yak-shaving: kevans --- usr.sbin/bhyveload/bhyveload.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 5250e2120938..2b1bfec9a62d 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -722,6 +722,8 @@ disk_open(char *path) return (ERANGE); fd = open(path, O_RDWR); + if (fd < 0) + fd = open(path, O_RDONLY); if (fd < 0) return (errno); From nobody Tue Feb 17 19:20:24 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFqGx2KNDz6RwHJ for ; Tue, 17 Feb 2026 19:20: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 4fFqGw6t60z3YBJ for ; Tue, 17 Feb 2026 19:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771356025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EakHVIzmo3Qwq+Y+/FFwuQNzroAw6PhI1qGzABG/e2A=; b=eWVUF07AMSK8oeY++OZkr+bsmIk/8jeowrRyGZ+xCxmh1LT2OsBmJafbpOj0OcMFKtyaTe B41s5WM75j9PzPevsn6DAEYQbQlZ4xdt0s0qqsY4zwU98UyEOjo/iPpoYhY012Iez2EUQ2 yFQ+jgknuFgj57fBxoqCIQ3aTXswk0crfYSVZ9hdcVKGJu8IoK5Wn00iR4e3gugnRRXGGd GBtBjdbY4De9yvdR2E/3soIpPVLvq61yMac5YyjIzSdbTjg6sHJMhhi6LSeg1jED4JksFh hvmIUf2wdh9XG0+FUvwnvIqxhz5FIrwSBlK2UlMHCTbEAZmlnMRbWDoNjR8UoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771356025; a=rsa-sha256; cv=none; b=g6+4q/bCKHDoT9gUVgx0mTSQAX0cxhSrPk46CcMxcj/411E5C83Me+sXzt0Mub7xy/M4NT t1GKUf26ma0O4lFuHUck4Uri2FXxztRAIyjjnM0KGAzlVTcB4aVJ6nArmeXl6NkZ2RilKt nGZMySpN87uOyCfOP60Omwtn+MhjdCsI8TRwlHcoNxf4Jb2yTFlZzwDM/eiviw5DINOKBt tBbHGpCcdtjCC+GNdXTs7k8aSWZBuro+xZRIIIeUKKrTrkWZzsgg+iIrZSfNSm9QPJOJY0 m1XDaif+AmMxZ08+aYKdDEY/GHcwnX1qRX/tIeehOz8anK77HAwZeo/RERlNcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771356025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EakHVIzmo3Qwq+Y+/FFwuQNzroAw6PhI1qGzABG/e2A=; b=bg+5HWSdUl+Cz37PFvhYKegWrSXS1cNmV/eWiqAfumsZ6D4kdJGTNZqyc2bKMq4tYoPed9 +io3PWa/97lEsIQzw7pbCWRpvwhKUOKFHnPbRgElOxmu3e3lHYE7KJBejWqAoDIsGzunxU 1Y2Vy8WmWjMwV/ed0aUNo5iGsOqe7sVj93rd1TskIVbM4HkM2e0O0kdUe1jjkygVvTq0Xa U840++yK20j95HPPwV36iixjTIKEmKDVJyF3TT80uYCEpuLY6Mo/Af4NzNoVB1/styn7i5 hFvOd9enPyTmrLB6ewMPQ9XfIf/gs35qvQgi/sEDIMsTZFF/oAnU6mLC+atf/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFqGw5Sjzz70M for ; Tue, 17 Feb 2026 19:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d6aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 19:20:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 93122ead724b - main - mfi(4)/mrsas(4): Print driver versions consistently List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93122ead724b3ba0ccdaedadcd371ec53f9a9844 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 19:20:24 +0000 Message-Id: <6994bf78.3d6aa.c45a931@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=93122ead724b3ba0ccdaedadcd371ec53f9a9844 commit 93122ead724b3ba0ccdaedadcd371ec53f9a9844 Author: Michael Osipov AuthorDate: 2025-12-21 17:13:21 +0000 Commit: Michael Osipov CommitDate: 2026-02-17 19:20:09 +0000 mfi(4)/mrsas(4): Print driver versions consistently Reviewed by: ziaee, des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54519 --- sys/dev/mfi/mfi.c | 2 +- sys/dev/mrsas/mrsas.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 6ab6e5a7f19e..6f94e4203f1a 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -371,7 +371,7 @@ mfi_attach(struct mfi_softc *sc) if (sc == NULL) return EINVAL; - device_printf(sc->mfi_dev, "Megaraid SAS driver Ver %s \n", + device_printf(sc->mfi_dev, "LSI MegaRAID SAS driver version: %s\n", MEGASAS_VERSION); mtx_init(&sc->mfi_io_lock, "MFI I/O lock", NULL, MTX_DEF); diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index e362d4b455fc..379fcbcb19ca 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -349,15 +349,9 @@ mrsas_find_ident(device_t dev) static int mrsas_probe(device_t dev) { - static u_int8_t first_ctrl = 1; struct mrsas_ident *id; if ((id = mrsas_find_ident(dev)) != NULL) { - if (first_ctrl) { - printf("AVAGO MegaRAID SAS FreeBSD mrsas driver version: %s\n", - MRSAS_VERSION); - first_ctrl = 0; - } device_set_desc(dev, id->desc); /* between BUS_PROBE_DEFAULT and BUS_PROBE_LOW_PRIORITY */ return (-30); @@ -830,6 +824,9 @@ mrsas_attach(device_t dev) struct mrsas_softc *sc = device_get_softc(dev); uint32_t cmd, error; + device_printf(dev, "AVAGO MegaRAID SAS driver version: %s\n", + MRSAS_VERSION); + memset(sc, 0, sizeof(struct mrsas_softc)); /* Look up our softc and initialize its fields. */ From nobody Tue Feb 17 19:42:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFqmF56Xxz6Rxj6; Tue, 17 Feb 2026 19:42:21 +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 4fFqmF4Sj7z3dxP; Tue, 17 Feb 2026 19:42:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771357341; 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=yeu4fzyuSLpImXuEm0jiYeN3cjRj0XH7sqJYA/tdL5c=; b=PQR7xv3lpEHiWr7BYE3ibaD7FKqvVwU6c7Zz2NiroJWJ/l6v2H/hyP4eAF15zJy2A19tdW gSomdNEpuU98xbYUCyGelInhq8GlJZ+ecyVPurqmlBkS/X6U+S9IKu1kcurBCCBusCpdx0 zKUYQ2TTSD4o5AEtCp/hbzfNLEwHa+8mdyfgXOOmsCQbO4TtekrZ3Z3h+STYGgn0mHHX2v e9Niy36eYI1KKPxrCqedfIJ4OrfxwTMJ0bzLWHG6apvBf5UPcIj0gvJzJ1PueZvZ3ieaTS wbRT1Uk7n5CVrtSPgk2bh1cfxgLIiXrmKHOQWlnQHJ8JaTHKUDBAgWxiacJaZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771357341; a=rsa-sha256; cv=none; b=XwVQy1tFumgAKLRztCKtHFcAHsGelIlRwp4Ilt8cs5hr2NtCFEdHX8vHDU0JmJbqm4dEHq 34u5LNGqXSCvqK3U70/6aVUKQ16AzIU7nIANa0DMecJOS/W6LhXg2en9VLtg3e/eU7UIH2 /sHHpWGVHMfEvzrn8xLcyEQptgeboqkDhSwWRDgUv1y8pF/h4CMLKI81uwnRnxtpLKiJ/E 7yd62Q2tKfnY3vmoPXravwVGpmszPz2EKF+MAr9rzihpVds29dLCeEvAYbIjgv3HGgwrF2 mg/w8mfrC4FcVkOzy4b3nlI8fDsjUOblJQmZXe58JHDb30cnWSb4xCybbPuFcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771357341; 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=yeu4fzyuSLpImXuEm0jiYeN3cjRj0XH7sqJYA/tdL5c=; b=aHBouHgy9pRJmqcqJoX1y6QrUg1TcbXWhGp4CpbwmeUROiP3boVLR8gbi1RR3gB1TC0ZPp ao2SrFT5wLxbbDkAaZyMmhI6nuk5p7+MyFcuORiUJZzu8uHVG0i9RicrcZIT2O0MpVcDhi oulNnAMiwQA4bvLoAjEtZ4aH9bHxbQ4tb2sUiyoN5JAw9SlOAqzPVwhiqYxku8JBrtyr0J L6O9mjjJeI4Q4BDX1tsDAXyWqXyc9xgZP1w2sTgZyV+lefiP9PuqzBdsmWKN0b/oULNbfC YusPj15SPjT2JAwSdPYFMOdtaKTibqL6t8Yb74Fu9gS5fqSR3BUvZjzA33HlMg== Received: from [IPV6:2601:5c0:4202:5670:475:8f88:8099:d67] (unknown [IPv6:2601:5c0:4202:5670:475:8f88:8099:d67]) (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 4fFqmF2W9Gz8Yb; Tue, 17 Feb 2026 19:42:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <1d35e758-ff0d-4fb3-9a4c-a0fc69182d41@FreeBSD.org> Date: Tue, 17 Feb 2026 14:42:20 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 97ce8f7d2b8e - main - amd64: define and use STACKALIGN and REDZONE_SZ Content-Language: en-US To: Konstantin Belousov , "Enji Cooper (yaneurabeya)" Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <698a1ffe.26e3c.47182d66@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/16/26 21:44, Konstantin Belousov wrote: > On Mon, Feb 16, 2026 at 05:01:58PM -0800, Enji Cooper (yaneurabeya) wrote: >> >>> On Feb 9, 2026, at 9:57 AM, Konstantin Belousov wrote: >>> >>> The branch main has been updated by kib: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 >>> >>> commit 97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 >>> Author: Konstantin Belousov >>> AuthorDate: 2026-02-07 00:36:44 +0000 >>> Commit: Konstantin Belousov >>> CommitDate: 2026-02-09 17:57:00 +0000 >>> >>> amd64: define and use STACKALIGN and REDZONE_SZ >>> >>> Reviewed by: brooks, emaste, jhb >>> Sponsored by: The FreeBSD Foundation >>> MFC after: 1 week >>> Differential revision: https://reviews.freebsd.org/D55151 >> >> Hi kib@! >> It looks like this broke the build with gcc12 on main: https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc14_build/2893/console . > > https://reviews.freebsd.org/D55319 > might be the fix. I have the same thing at https://reviews.freebsd.org/D55161 Per my comments there, I do think it might break 32-bit kernels, but we probably don't care about that. (Namely, if rounddown2() is used on a type larger than uintptr_t such as trunc_page on a vm_paddr_t on i386, this change truncates the value). If we really care, we could use _Generic or the like to only use the uintptr_t casts for pointer types. -- John Baldwin From nobody Tue Feb 17 20:01:46 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFrBw1VnGz6Ryyl; Tue, 17 Feb 2026 20:02:00 +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 4fFrBv3BXZz3hLl; Tue, 17 Feb 2026 20:01:59 +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 61HK1kZf021860; Tue, 17 Feb 2026 22:01:49 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61HK1kZf021860 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61HK1kEW021859; Tue, 17 Feb 2026 22:01:46 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 17 Feb 2026 22:01:46 +0200 From: Konstantin Belousov To: John Baldwin Cc: "Enji Cooper (yaneurabeya)" , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 97ce8f7d2b8e - main - amd64: define and use STACKALIGN and REDZONE_SZ Message-ID: References: <698a1ffe.26e3c.47182d66@gitrepo.freebsd.org> <1d35e758-ff0d-4fb3-9a4c-a0fc69182d41@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1d35e758-ff0d-4fb3-9a4c-a0fc69182d41@FreeBSD.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4fFrBv3BXZz3hLl X-Spamd-Bar: ---- On Tue, Feb 17, 2026 at 02:42:20PM -0500, John Baldwin wrote: > On 2/16/26 21:44, Konstantin Belousov wrote: > > On Mon, Feb 16, 2026 at 05:01:58PM -0800, Enji Cooper (yaneurabeya) wrote: > > > > > > > On Feb 9, 2026, at 9:57 AM, Konstantin Belousov wrote: > > > > > > > > The branch main has been updated by kib: > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 > > > > > > > > commit 97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 > > > > Author: Konstantin Belousov > > > > AuthorDate: 2026-02-07 00:36:44 +0000 > > > > Commit: Konstantin Belousov > > > > CommitDate: 2026-02-09 17:57:00 +0000 > > > > > > > > amd64: define and use STACKALIGN and REDZONE_SZ > > > > > > > > Reviewed by: brooks, emaste, jhb > > > > Sponsored by: The FreeBSD Foundation > > > > MFC after: 1 week > > > > Differential revision: https://reviews.freebsd.org/D55151 > > > > > > Hi kib@! > > > It looks like this broke the build with gcc12 on main: https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc14_build/2893/console . > > > > https://reviews.freebsd.org/D55319 > > might be the fix. > > I have the same thing at https://reviews.freebsd.org/D55161 > > Per my comments there, I do think it might break 32-bit kernels, but we probably > don't care about that. (Namely, if rounddown2() is used on a type larger than > uintptr_t such as trunc_page on a vm_paddr_t on i386, this change truncates the > value). > > If we really care, we could use _Generic or the like to only use the uintptr_t > casts for pointer types. I must admit that I initially wrote the cast to uintmax_t, and only then looked at the nearby code (__builtin_align_up() and others). Since uintptr_t was good enough for them, I used it in the patch as well. From nobody Tue Feb 17 20:04:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFrFX6RkBz6S0Np for ; Tue, 17 Feb 2026 20:04: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 4fFrFX5zC7z3htT for ; Tue, 17 Feb 2026 20:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771358656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ddubdat0ut953QbE1mrrN0kXtcFEdieFZQwaKSQrQSg=; b=yPHIYEF6lAVKJsz3wYPTQKSsRjpsS9WnHdiJq85UR0gn2/jzx0VmZoevzeM29fNNWiHi5P 4BbmhObR9POYHc0rxv6NVZBxC1NK2Ofj30FVd9nJzK0NhrK2FeHucXe1rk07jR7R41XOiw mp36EUFh3UL/h7D7yH3fKUPx0cv99phgfFysdNKA2fFjLJw8Wt1B5d4W9CDRM/TOE+9sx7 XThTNYpD9ewZTUVIr4AqZ6SRKwuDNUXJDkSNkAo1krm9YrzirMW+XHxtKV0kcRJXfElGWc Dy5E8mKofom6pRV73oQzpjAD2pPGW8tuJsuP5heGCgmaYnqXHopc+whmODYXoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771358656; a=rsa-sha256; cv=none; b=nNfzFA+PeiCfKRaalRwvNkfEkPkE9VQG6O+YqKtEuvAiw6hUj7CZE4CI3sFlbe01cVijB5 baTljIKMLbA5FDm/2Y3SmsmlAM9Enq18n6Chg1CKVyGPbhhVKfrl1F7qIqFw9QvpQS81cL 8xpgKBHNgZw4Q2vIRBL43OFUPtevqAxsV0R7EbrQ+ykO+4Z4gbGM49XKCo7b1xH5DL6nTU G2aNO1AySChHKEZ2HeX6eUF4X/Mra2Qb5bwO1MkbegeNm35trivNlAXg650J0DZ0H3G/JN awZHkYZ3UIS7UaiYHijIufGAvs+1Qy1BOBvpn+P7qd43UKap2kxRWi675h4yyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771358656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ddubdat0ut953QbE1mrrN0kXtcFEdieFZQwaKSQrQSg=; b=XexyzeP+FNP6zXbkTlHysGrHlX509D4JAaIghxaiI/dVqpJBqXMub3fCfB5zvkBA/3LYY4 Bll+TF163XbATjT7bckwM9VeYSEalKOW4FxlPbSjsZrlTwmvonlZ0OFTf1GJ8SRS1UJsSa esA3kUExxAwN5NrmqHNdFjDccFQRShheFn5gifG7O6Bd1UefqUps6/K0xrmU72ob0Es3VQ W6LBCxvlJMJx+nWg4pCHYFzR0zMUZQcvCdxsrrJHMpacAnJYT2m3aJw3/83uxXY426h7E7 0LPioPdCLXjEPjXHRkj7NiXlrooTeLnPFDjUZ9SLVN5Xk6UxU1HN3ddrJLr6Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFrFX5Gcwz8l0 for ; Tue, 17 Feb 2026 20:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19f2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:04:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ffbf95907039 - main - libc: print extended errors from warn(3) and vwarn(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffbf95907039821b69dfe1607d1695b46af82e35 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:04:16 +0000 Message-Id: <6994c9c0.19f2a.5d09023b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ffbf95907039821b69dfe1607d1695b46af82e35 commit ffbf95907039821b69dfe1607d1695b46af82e35 Author: Konstantin Belousov AuthorDate: 2026-02-17 11:12:02 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-17 20:04:07 +0000 libc: print extended errors from warn(3) and vwarn(3) Noted and reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55327 --- lib/libc/gen/err.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c index 793bf7522e42..2628eb8186cc 100644 --- a/lib/libc/gen/err.c +++ b/lib/libc/gen/err.c @@ -163,14 +163,14 @@ _warn(const char *fmt, ...) { va_list ap; va_start(ap, fmt); - vwarnc(errno, fmt, ap); + vwarnci(true, errno, fmt, ap); va_end(ap); } void vwarn(const char *fmt, va_list ap) { - vwarnc(errno, fmt, ap); + vwarnci(true, errno, fmt, ap); } void From nobody Tue Feb 17 20:22:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFrfg4G2Vz6S2D6 for ; Tue, 17 Feb 2026 20:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFrfg3XzBz3nWn for ; Tue, 17 Feb 2026 20:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771359755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfCz+rXLU/dnr4wenqRRLmqd507SoW1ohYCjuEvX50Q=; b=OzON4bG6h4GseU3GLfROPm8GkruFnCm+6VTVdHGTSinbID2mxva/A0yBNbtAr8PTtVQkP5 tmXlGV01BMcl9Xr+cVIuHBpyJw1LSRKszkYo1lPirCl+q/uVeEv/eKAEU3k8OXd3UTaiEu kpvdSo/J+XCFzGTrw/DHP5foSojwyalQYk+1yCT65ihJI9thOq7OQ5mxGpY8alpPMqZ4QL gWXPBiWNjeVtYmqVKEObnkFNC8kCz204wO6iPIGrGOLyNFIv6+hQLg+L/cODZc5hUE384i s3M69FscGx2K74DHhjeU0YIQkuUFdCP3l4VetwpUYNVPaQwW4wvBdh2Vu5KTgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771359755; a=rsa-sha256; cv=none; b=xeBAFCnPKLuzri6w9g5Uzku+6Rgng0J4CzVO6c7+DEHUUukbgsZs191UyR5zLlTV698kQj ujySP7EBttIeAo50Ws2vV9VjZcLYRJXKosvOrY/0T68pGKOCxiKcL0g74oVG49CD5bA3Gs 1QXDk8EVpyZ8xc3BkCnM32zBaEXC9CKIK9YQNiaQU1KdWmsV5Fh8d/Lxo7NpmJNu7BZkkw vWGFB2Cqtk+HBhRdxQKFiqnoBMRouj7y7PVoHecfStpc0+VC5Y2UsUYA4US97J0Z0kAnIy HepqNmXoOiV5TYqatUDuJxLwzHOHj+LEagg/bcaNesHQ8bQvcWXmOspKOO4d6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771359755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfCz+rXLU/dnr4wenqRRLmqd507SoW1ohYCjuEvX50Q=; b=sIk9Lo8nE/tWM2GrvvDR/uP5dzzMEEbpe1E1zH8AwUg2m3r/1++yILB0+BHS3PDFbKYLBa IdGnf1JLP4cpgJY73y80yQu+5O2DqO2BRUsOgsNh/kuRfpwKN3QhwYhg6vO/KP+19mj/9v xvtlNMcI1v+kdel12LRHLbI8+myNw169a6BDLTjvlcDU2XXjUcBFlDpoAe6mATafBMWf77 B1dBEjTQr2OHDkEjYtp+/1FfLR87cqAsxzLQenKGw46Cv7SyznW4oOd6baw/XBEAitsuwP HfES/NoSRNjzy6G0cczsd5gEOJdW0cbfaTbr0mjXJwsPaePvG3uIe33punyyZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFrfg2y6Bz9BN for ; Tue, 17 Feb 2026 20:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e24e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:22:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: afd64316c869 - main - dtrace: Implement ustackdepth for arm64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afd64316c869eb00dde4d6b4af61bca0cb2197f1 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:22:35 +0000 Message-Id: <6994ce0b.1e24e.6af44787@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=afd64316c869eb00dde4d6b4af61bca0cb2197f1 commit afd64316c869eb00dde4d6b4af61bca0cb2197f1 Author: Mark Johnston AuthorDate: 2026-02-17 17:37:42 +0000 Commit: Mark Johnston CommitDate: 2026-02-17 20:22:05 +0000 dtrace: Implement ustackdepth for arm64 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52475 --- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c index ff0e068006bd..037d4734659e 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c @@ -228,10 +228,22 @@ zero: int dtrace_getustackdepth(void) { + proc_t *p = curproc; + struct trapframe *tf; + uintptr_t pc, fp; + int n = 0; - printf("IMPLEMENT ME: %s\n", __func__); + if (p == NULL || (tf = curthread->td_frame) == NULL) + return (0); + + if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_FAULT)) + return (-1); + + pc = tf->tf_elr; + fp = tf->tf_x[29]; + n += dtrace_getustack_common(NULL, 0, pc, fp); - return (0); + return (n); } void From nobody Tue Feb 17 20:22:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFrfh6sDKz6S2DC for ; Tue, 17 Feb 2026 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFrfh4KWTz3nKB for ; Tue, 17 Feb 2026 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771359756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7AG49b+5/2CUOhORzpEJiOf3czaRYcBA+/1W4mfpPCc=; b=g83iCQM1QBnXtLkFenR70G7Wu9x0HFBAqyKKAhaKTae2U17F1Ui0BjNc09DhfdXgKJUpyK r/P5eFMajBMRhsYyz8/dxO0JiKBxQQkPP8yCMsk0J6biR+rl2Cpq4IHclDG7LYOWPCVq1n 400s1K+UX511fowxNcPci0UfbsnUiFfzkh/hG3RhiBmuB989yghObQSrWX+svm6Tkv9Mwv F81IO+5sMJgeTNHWxiEfjPqFbvyc9ccxtHVStku5ottN6x/yNSx5dHNGlpIz5R3+PrwjvJ yXmldloLN9P+IBOuALNpti2pagldAMatIurrm6WTNKUlDeieCLnHHgMAUQAHWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771359756; a=rsa-sha256; cv=none; b=Fvks7W1g/WTf3mueVjOHkiRqJAG1dBZFnaQlMMHj/suXnKWggXjm5S6lzD9jUVEq2hSAyv /Hnj3b+foj68wUTDFXxguFx0pgJSDQEf4XDWe0IkxG6p+obbnPHraFp/F2b1SP3hHgok99 N1dAo33xJ8DIllSik4K3GQ/ecepoZA+Jlfhfzj7Mz4gSTPyfDYjnw1tygKJQ3WQ5NVMF6C g4eu2NEm92Ma6WcnIU+iSZe8X/MDgaUYzOtkPWUPEI/q4a5jMufRfyXlB6wQ+db5vnnk9e LP/xpL3qRltSIrx5TH2AWtdMiOZyeHADXbeR/1CJM44RzWnL7ybeRL9wL71hNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771359756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7AG49b+5/2CUOhORzpEJiOf3czaRYcBA+/1W4mfpPCc=; b=Zkn1HS8B0oKiNMTlEws/aQDG84nWyEnRERALE0pXCtFtn6y8YKEBYDZgeZbVgAvu7Wf/yb /Fn0HDYHLcWYmoPvDX3zk4WKEFDFhe0vC+DbxHXUmIVF5Ygtuo+RzGuvUwEuLK3P0vc/v9 L42ojVYf3zyfItNUsjPSv5d0DlOikHfFcIqDzpwYKB+JCDmyiztqkeA9TQnTmQUo9wPbdY iK6ONqcvTU+zmEBZX4PHasASCNzzyDM80usVXNpCZBu/srI4QUZVFk4wJSITiR6X/cPLbo QpwekTLSNNegPP07gjWph8p/og4wNuyvjiIZi3YgnlC+OrH/7hE/D8M2A3Pt3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFrfh3llmz8Zy for ; Tue, 17 Feb 2026 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d1ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:22:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: eb425dfab19b - main - ndp tests: Fix an assertion in ndp_prefix_lifetime_extend List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb425dfab19be8720cf29d560b4e778fc3531106 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:22:36 +0000 Message-Id: <6994ce0c.1d1ad.149e2ee4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb425dfab19be8720cf29d560b4e778fc3531106 commit eb425dfab19be8720cf29d560b4e778fc3531106 Author: Mark Johnston AuthorDate: 2026-02-17 17:08:34 +0000 Commit: Mark Johnston CommitDate: 2026-02-17 20:22:05 +0000 ndp tests: Fix an assertion in ndp_prefix_lifetime_extend Here we have two interface addresses sharing a v6 prefix with finite lifetime. The intent was to make sure that adding the second address didn't cause the prefix's valid lifetime to drop from 20s to 10s, but of course, while the test is running it may drop from 20s to 19s, causing the test to fail spuriously. Relax the check a bit to avoid this. PR: 293152 Fixes: 74999aac5eff ("in6: Modify address prefix lifetimes when updating address lifetimes") MFC after: 1 week Sponsored by: Klara, Inc. --- tests/sys/netinet6/ndp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet6/ndp.sh b/tests/sys/netinet6/ndp.sh index 8a16316740be..159a51485c49 100755 --- a/tests/sys/netinet6/ndp.sh +++ b/tests/sys/netinet6/ndp.sh @@ -357,8 +357,8 @@ ndp_prefix_lifetime_extend_body() { atf_fail "Unexpected lifetimes: ${t}" fi ex3=$(prefix_expiry ${prefix}/64) - if [ "${ex3}" -lt "${ex2}" ]; then - atf_fail "Expiry time was shortened: ${ex2} <= ${ex3}" + if [ "${ex3}" -le 10 -o "${ex3}" -gt 20 ]; then + atf_fail "Unexpected expiry time: ${ex3}" fi } From nobody Tue Feb 17 20:22:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFrfj6SD6z6S2K0 for ; Tue, 17 Feb 2026 20:22: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 4fFrfj4pxfz3nZ6 for ; Tue, 17 Feb 2026 20:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771359757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/tAZVNuu+or8rABrjTh8REQ1Ji+ei2Owue6BtmVUrc=; b=qvekj9PCjVzfv+eac5X/XE8w1wGpdVZpvCzw9SU5nR/srHG1PwbgYNBSRFnA1istguceJy sST00dEeoyakxGQIUH7nguINZeYIF+9pg3w6irWvzICaaQzxklzOZHk4rVGLZ1YyNN2uEW SyGOJRO4Qk1xUZBuKBo8+WVxTff5cBQHL4cXYnSwqs0edDCC3evuVeyb+s+sQQrzlAbynL XLZebYqNYkkSIcMGQjcTsmJbyn4uaQ0Ba4sRqI4McHM1eE/AgxDoMqDgc4ue+LXWATsPsn KOKBUo0yKBmZ4VI8tGXKl9aon6lSr/46w7d5IZnDXatkthWgaYEDIdN0sccdwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771359757; a=rsa-sha256; cv=none; b=Y7HO5FDZmomSQP+DLFGm2ikrMEEKZAFw3JoO6Ctx3finx2ieCEJ/gW2xcl+MpRavpGXMc9 I+pCSpbTy31NGv4X6IF+NjvpSvbMcy1bi4AjTijx6gB/CRIBdKoYTKoOqDCjU5fSLbnvnc SKPxxfTLh36FijxnN+oa7WGbAUbuNoaU7hxxGIayRUyWT+9r25Jsw4tPZ0+koZS7/F+kUu j1LdcEUtXUV0vFtBVQ+M/2IYdzMEkCFwF6rQxMWXhBX+W6rQ7m2d4ABlKtEeN/bB9bUxK/ +p9nJT1BcPhHbS4a20gG6r8LGVaHH00h1lCZhXpjC+pv3bjm9/RZ71fByqEhag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771359757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/tAZVNuu+or8rABrjTh8REQ1Ji+ei2Owue6BtmVUrc=; b=ygH0PNYwNR7ufJqbwfP3fgr9DDmmBjqAhkXuT3L+8HSjn4oqHKmJCqCu/MaSqR+1BRSufu Wjrat/i3+3QrLa8Ts5+TU6za/3LrUz1fBSBFnLoLYcDR25+bgQq2BuFTdn9txgZYHOybAT +p/55dUsgZO26XQLJHZdf3X9aUwMMPwGafrhthTzr6umM7cOk3Xo88KetRKU3kXm3ZxTaj lE5KhpxgInswhMu+TzaNwdsOLPKPB3P2tJ7uxenEVl7VywLY5Xf0430RWBwYFw3ER+oEyk WNdmFR7JMOu13zLvmh6g6eA+FmgyFTv1Lx/1rnf+jzHUIE1bWCS7VzLwk/zxeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFrfj48rfz9BP for ; Tue, 17 Feb 2026 20:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c8ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:22:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1eb727727a9a - main - ndp tests: Fix flakiness in ndp_slaac_default_route List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1eb727727a9acb5f1e66e3f70b0146e7c9c5f710 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:22:37 +0000 Message-Id: <6994ce0d.1c8ef.245094d8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1eb727727a9acb5f1e66e3f70b0146e7c9c5f710 commit 1eb727727a9acb5f1e66e3f70b0146e7c9c5f710 Author: Mark Johnston AuthorDate: 2026-02-17 19:03:35 +0000 Commit: Mark Johnston CommitDate: 2026-02-17 20:22:05 +0000 ndp tests: Fix flakiness in ndp_slaac_default_route The test sends RAs in order to test SLAAC handling in another host. The router needs to also set net.inet6.ip6.forwarding=1, otherwise NAs sent from it have the ROUTER flag clear, and upon receiving such an NA the host will automatically delete routes learned from the router. Fixes: feda329622bc ("netinet6 tests: Add a regression test for default router handling") MFC after: 1 week Sponsored by: Klara, Inc. --- tests/sys/netinet6/ndp.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet6/ndp.sh b/tests/sys/netinet6/ndp.sh index 159a51485c49..c8de4083a9ea 100755 --- a/tests/sys/netinet6/ndp.sh +++ b/tests/sys/netinet6/ndp.sh @@ -152,7 +152,10 @@ ndp_slaac_default_route_body() { ndp_if_up ${epair0}b atf_check jexec ${jname} ifconfig ${epair0}a inet6 accept_rtadv - # Send an RA advertising a prefix. + # Make sure that NAs from us are flagged as coming from a router. + atf_check -o ignore sysctl net.inet6.ip6.forwarding=1 + + # Send an RA advertising a prefix. atf_check -e ignore python3 $(atf_get_srcdir)/ra.py \ --sendif ${epair0}b \ --dst $(ndp_if_lladdr ${epair0}a ${jname}) \ @@ -167,7 +170,7 @@ ndp_slaac_default_route_body() { jexec ${jname} netstat -rn -6 # Get rid of the default route. - jexec ${jname} route -6 flush + atf_check -o ignore jexec ${jname} route -6 flush atf_check -o not-match:"^default[[:space:]]+fe80:" \ jexec ${jname} netstat -rn -6 From nobody Tue Feb 17 20:46:17 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB16HzXz6S3kY for ; Tue, 17 Feb 2026 20:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFsB149J5z3vHq for ; Tue, 17 Feb 2026 20:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JDqxyBdXUcTqIuZ5rbVbURTKrdxUEFANVxdwbbWPmrQ=; b=iXs7+aWUi7Gg7WCDeOqdRCuFykaJdS3pHERbIGlOrpbDhiDeM2hLh7g0MysRfSk/v6u6v5 Q5LzTc67j7r5XjxQQkT0t333W+RkJIFUwR0Q5/IGY0c6lV7SQpuqT2qBFwpg1t3zPmVPTh An/obIX2e3tuBoxu3okOuzTGqQO5A2O2DOjnbxTgtbhK8WQlSkv1kTkClW7vMd3z+Ty2XP 5QlHvbCQn8y6ac1kBGPrOeoUUWa3E1c7FXsh3hY2woncKS9l/ixRQdJzl1nXd3H0MaMNVy WN/EY14rwGdycW/uE3eBZL7fT1BDDqNi2gu/vvJQe01GzPFCstapq1qJ1IEjSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361177; a=rsa-sha256; cv=none; b=LTbHYnWEJ2hCLhlzB6CwOp0TeVveOaajL2q8RBPGJIhxsjpBDGPgmYv5d1THE1q6lPDlk1 jKSyZszsCaQXwGN70Z8v4ELYavF/r365PtAaoqJl7A1GZF3JeUlQKK3Z7oLySWURrdF1TA 64RStqxNRNKirs0zYsXCiHN9MbAcmMCnyGuSIA3wmS0donBx4BtVxddOWGabIbrydQqaGd YCFRTW51LW406DwkqZmQRVGOK9sWuQvEL101vb1l4GVe+sEl1+Ig8U6KXjb6JDlu7W1UXj Z5ytgkP62sBg9GT2CeKJzifaJ9pS3baYaxJv8OVyxLeUixfQPZ7+ZzLN7CIU8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JDqxyBdXUcTqIuZ5rbVbURTKrdxUEFANVxdwbbWPmrQ=; b=Kok8zBJh804ABn4J23yS1ANG22UehncxQYDshaGqtaTd/IjkhCf/GBanklrAq5AtW6xJML apjNNeTBKjKy2j72JdKwIa4PFluBokOAP8JAiVstu8F/gcOL/oZN3I4+QTRxGP7jXWR7Z4 8zXzApqI5ANazhwh9qGJk7f47Gj19iWgr1PMdTu35CAyjcUz8rFXZ0j/sghHZNIlkV2oxW MrbZefDv9Yrh+QsiMRZ1yqgfGGEn2orP0qBniFasRu1IrcwC1clE1u+Jla3M84Up/WB7fp jtztOf7BxK3yCx/yKStheoL/tsetlftBiPcB0FZa5ZKNJlfCattzZVBV/8bZuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB12xXWz9B5 for ; Tue, 17 Feb 2026 20:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f209 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:46:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b9f1e45e685b - main - acpi_gpiobus: Reuse the existing IVAR index for an ACPI handle List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9f1e45e685b5e007d0c3a9513ac13e6d82e9518 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:46:17 +0000 Message-Id: <6994d399.1f209.71bd704a@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f1e45e685b5e007d0c3a9513ac13e6d82e9518 commit b9f1e45e685b5e007d0c3a9513ac13e6d82e9518 Author: John Baldwin AuthorDate: 2026-02-17 20:44:58 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:44:58 +0000 acpi_gpiobus: Reuse the existing IVAR index for an ACPI handle ACPI_IVAR_HANDLE is a global index shared across multiple busses, there is no need for a unique constant here. Reviewed by: vexeduxr, imp Differential Revision: https://reviews.freebsd.org/D54155 --- sys/dev/gpio/acpi_gpiobus.c | 2 +- sys/dev/gpio/acpi_gpiobusvar.h | 13 ------------- sys/dev/gpio/gpioaei.c | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index 0c31f4fec16d..117c05799c08 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -401,7 +401,7 @@ acpi_gpiobus_read_ivar(device_t dev, device_t child, int which, struct acpi_gpiobus_ivar *devi = device_get_ivars(child); switch (which) { - case ACPI_GPIOBUS_IVAR_HANDLE: + case ACPI_IVAR_HANDLE: *result = (uintptr_t)devi->handle; break; default: diff --git a/sys/dev/gpio/acpi_gpiobusvar.h b/sys/dev/gpio/acpi_gpiobusvar.h index 288e8bd0f2af..ea4e7d44a217 100644 --- a/sys/dev/gpio/acpi_gpiobusvar.h +++ b/sys/dev/gpio/acpi_gpiobusvar.h @@ -28,21 +28,8 @@ #ifndef __ACPI_GPIOBUS_H__ #define __ACPI_GPIOBUS_H__ -#include - #include -enum acpi_gpiobus_ivars { - ACPI_GPIOBUS_IVAR_HANDLE = 10600 -}; - -#define ACPI_GPIOBUS_ACCESSOR(var, ivar, type) \ - __BUS_ACCESSOR(acpi_gpiobus, var, ACPI_GPIOBUS, ivar, type) - -ACPI_GPIOBUS_ACCESSOR(handle, HANDLE, ACPI_HANDLE) - -#undef ACPI_GPIOBUS_ACCESSOR - uint32_t acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *); #endif /* __ACPI_GPIOBUS_H__ */ diff --git a/sys/dev/gpio/gpioaei.c b/sys/dev/gpio/gpioaei.c index 9a769a793e5a..3451d3120843 100644 --- a/sys/dev/gpio/gpioaei.c +++ b/sys/dev/gpio/gpioaei.c @@ -208,7 +208,7 @@ gpio_aei_attach(device_t dev) /* This is us. */ device_set_desc(dev, "ACPI Event Information Device"); - handle = acpi_gpiobus_get_handle(dev); + handle = acpi_get_handle(dev); status = AcpiGetParent(handle, &sc->dev_handle); if (ACPI_FAILURE(status)) { device_printf(dev, "Cannot get parent of %s\n", From nobody Tue Feb 17 20:46:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB25hmNz6S3c0 for ; Tue, 17 Feb 2026 20: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 4fFsB23xG5z3vGX for ; Tue, 17 Feb 2026 20: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=1771361178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIhn7sb7Vj0lluJsjllMjZuDcngyL0Ul0+zHTPPaGeg=; b=hL576ZoYJNPWZoe1kEl2IrD4FbRWSLRNp9j+zvVCS48LBwsi+dfHQxieB/xniC5a3kMT8M y+qTaaQp8G2eJPKsN/GmwN5sO8xehnkm7wgjt2HpwjnzS2V6DcNMhaLJSE1+JNyG1owIx8 jeng8+Q/VKdiQAtH2cBgQV7hFMGpmjWUGuY5nCixia5zI4zHi27Gd4vUpB+vCwUbQMKVQw qdTMPEmOHXWmi6d5xFsLNx5+yebzt75hiYPu3emTkUNPtMlM8ixLaYpKoJpigZ9Kpq4F1z qqL6W60Hc+yV4KUcSxco4PZW4T8dYNZ4KijHxgZqrBIQjWC5qsn0R/NaIzbV0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361178; a=rsa-sha256; cv=none; b=vNO87SySoR0wYBiYwEKzOxSMuhshhRWTYutF7zGnGae1Oxv6UTSzP4Se2GY+fdnljlf0iY 2q3vTGtk8aF5DvbCBPCGvI5QbJx7vHskOrLqkXvCoy+SUGwYr2glaOB33KLXDp3Rdx0XOq ICU2N9K3dt+VxuvHfIe7AN4JDZu5CkDk30W8kcULbfTPHN4hyC+99ADxPqxP/+BMZWaTVq T7xiPLM+77R4NNWJ3IwdSSEpK3N1iVtKRXVsChLsgT/vkQTim83HLdz/NRmx3Z7bIl3PhB AxBu0q0rskXvhBRRlCeDiIUdMLult/iQfgT9l7BTqKLu8yLj5KXjp3gyA+IVzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIhn7sb7Vj0lluJsjllMjZuDcngyL0Ul0+zHTPPaGeg=; b=f0Sf6F1RIw1SwEuu6krDw7jN+8765hr+zPPn8h9/aanxxBVcugeH/H3RoogpC06VijVKU7 ad9Q6+7r+Ff568UOfQCtW2QgIl2WkNAdoPzXD+4yCAIof0Oi8PspmVZOPGCMR8HfaWI7S1 w26jkiozWT5Npfr0rANWbq/1h1XT3gLbNLq3T+PPVYWYYOoE+LP2KpZcCgsIJWxj4ey3yu ACWHe+ntuS08qOTACkPk2GeJzwgTcyt2DE76ZdYRMfSV8OECZwWMnRWiNxbm79NJUALXy2 zTK+rV3ZhJK6+Zl698XLDY91xqgH800c07HJlJH1QI9l3u6KF9ULMfpXChrw6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB23H6dz9B7 for ; Tue, 17 Feb 2026 20:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f5f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:46:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6cf4e30252fe - main - bus: Document special ranges of IVARs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cf4e30252fe48b230b9d76cac20576d5b3d2ffa Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:46:18 +0000 Message-Id: <6994d39a.1f5f9.509a54e4@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6cf4e30252fe48b230b9d76cac20576d5b3d2ffa commit 6cf4e30252fe48b230b9d76cac20576d5b3d2ffa Author: John Baldwin AuthorDate: 2026-02-17 20:45:13 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:45:13 +0000 bus: Document special ranges of IVARs Some IVAR indices are special in that they have global meaning across multiple buses where as other IVARs are always private to the local bus. Try to document this a bit and add constants for the various ranges to avoid future conflicts. This is a no-op, but IVAR indices are now generally defined as enums as that makes it easier to define them in terms of ranges. Reviewed by: imp, royger, andrew Differential Revision: https://reviews.freebsd.org/D54159 --- sys/arm/arm/gic_common.h | 10 ++++++---- sys/arm64/arm64/gic_v3_var.h | 10 ++++++---- sys/dev/acpica/acpivar.h | 12 +++++++----- sys/dev/atkbdc/atkbdcreg.h | 2 +- sys/dev/bhnd/bhnd.h | 2 +- sys/dev/fdc/fdcvar.h | 2 +- sys/dev/gpio/gpiobusvar.h | 2 +- sys/dev/hid/hidbus.h | 2 +- sys/dev/iicbus/iicbus.h | 2 +- sys/dev/mii/miivar.h | 2 +- sys/dev/mmc/mmcbrvar.h | 2 +- sys/dev/mmc/mmcvar.h | 2 +- sys/dev/nvdimm/nvdimm_var.h | 2 +- sys/dev/ow/ow.h | 2 +- sys/dev/pccard/pccardvar.h | 2 +- sys/dev/pci/pcivar.h | 4 ++-- sys/dev/ppbus/ppbconf.h | 12 ++++++++---- sys/dev/puc/puc_bus.h | 6 ++++-- sys/dev/pwm/pwmbus.h | 2 +- sys/dev/quicc/quicc_bus.h | 8 +++++--- sys/dev/scc/scc_bus.h | 14 ++++++++------ sys/dev/sdio/sdiob.h | 2 +- sys/dev/smbus/smbconf.h | 2 +- sys/dev/sound/pci/hda/hdac.h | 2 +- sys/dev/spibus/spibusvar.h | 2 +- sys/dev/superio/superio.h | 2 +- sys/dev/virtio/virtio.h | 16 +++++++++------- sys/isa/isavar.h | 2 +- sys/powerpc/ps3/ps3bus.h | 2 +- sys/powerpc/psim/iobusvar.h | 2 +- sys/sys/bus.h | 16 ++++++++++++++++ sys/sys/cpu.h | 10 ++++++---- sys/x86/include/legacyvar.h | 2 +- sys/xen/xenbus/xenbusvar.h | 2 +- 34 files changed, 100 insertions(+), 64 deletions(-) diff --git a/sys/arm/arm/gic_common.h b/sys/arm/arm/gic_common.h index c2d1b1340b9b..d2f422ab6536 100644 --- a/sys/arm/arm/gic_common.h +++ b/sys/arm/arm/gic_common.h @@ -35,10 +35,12 @@ struct arm_gic_range { uint64_t size; }; -#define GIC_IVAR_HW_REV 500 -#define GIC_IVAR_BUS 501 -#define GIC_IVAR_VGIC 502 -#define GIC_IVAR_SUPPORT_LPIS 503 +enum { + GIC_IVAR_HW_REV = BUS_IVARS_GIC, + GIC_IVAR_BUS, + GIC_IVAR_VGIC, + GIC_IVAR_SUPPORT_LPIS +}; /* GIC_IVAR_BUS values */ #define GIC_BUS_UNKNOWN 0 diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index a490b69b7417..58523bb42cd6 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -109,10 +109,12 @@ struct gic_v3_devinfo { MALLOC_DECLARE(M_GIC_V3); /* ivars */ -#define GICV3_IVAR_NIRQS 1000 -/* 1001 was GICV3_IVAR_REDIST_VADDR */ -#define GICV3_IVAR_REDIST 1002 -#define GICV3_IVAR_FLAGS 1003 +enum { + GICV3_IVAR_NIRQS = BUS_IVARS_GICV3, + _GICV3_IVAR_REDIST_VADDR, /* unused */ + GICV3_IVAR_REDIST, + GICV3_IVAR_FLAGS, +}; __BUS_ACCESSOR(gicv3, nirqs, GICV3, NIRQS, u_int); __BUS_ACCESSOR(gicv3, redist, GICV3, REDIST, void *); diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index d585fc8f2e23..34f4204a812c 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -277,11 +277,13 @@ extern int acpi_override_isa_irq_polarity; * interface compatibility with ISA drivers which can also * attach to ACPI. */ -#define ACPI_IVAR_HANDLE 0x100 -#define ACPI_IVAR_UNUSED 0x101 /* Unused/reserved. */ -#define ACPI_IVAR_PRIVATE 0x102 -#define ACPI_IVAR_FLAGS 0x103 -#define ACPI_IVAR_DOMAIN 0x104 +enum { + ACPI_IVAR_HANDLE = BUS_IVARS_ACPI, + ACPI_IVAR_UNUSED, /* Unused/reserved. */ + ACPI_IVAR_PRIVATE, + ACPI_IVAR_FLAGS, + ACPI_IVAR_DOMAIN +}; /* * ad_domain NUMA domain special value. diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h index dc2194dc69c2..a731d33b8de2 100644 --- a/sys/dev/atkbdc/atkbdcreg.h +++ b/sys/dev/atkbdc/atkbdcreg.h @@ -215,7 +215,7 @@ typedef struct atkbdc_softc { } atkbdc_softc_t; enum kbdc_device_ivar { - KBDC_IVAR_VENDORID, + KBDC_IVAR_VENDORID = BUS_IVARS_PRIVATE, KBDC_IVAR_SERIAL, KBDC_IVAR_LOGICALID, KBDC_IVAR_COMPATID, diff --git a/sys/dev/bhnd/bhnd.h b/sys/dev/bhnd/bhnd.h index 1a29b922d491..3d855e23c7e1 100644 --- a/sys/dev/bhnd/bhnd.h +++ b/sys/dev/bhnd/bhnd.h @@ -60,7 +60,7 @@ * bhnd child instance variables */ enum bhnd_device_vars { - BHND_IVAR_VENDOR, /**< Designer's JEP-106 manufacturer ID. */ + BHND_IVAR_VENDOR = BUS_IVARS_PRIVATE, /**< Designer's JEP-106 manufacturer ID. */ BHND_IVAR_DEVICE, /**< Part number */ BHND_IVAR_HWREV, /**< Core revision */ BHND_IVAR_DEVICE_CLASS, /**< Core class (@sa bhnd_devclass_t) */ diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h index 881f6f9f898d..8b7081e0a6cc 100644 --- a/sys/dev/fdc/fdcvar.h +++ b/sys/dev/fdc/fdcvar.h @@ -69,7 +69,7 @@ struct fdc_data { }; enum fdc_device_ivars { - FDC_IVAR_FDUNIT, + FDC_IVAR_FDUNIT = BUS_IVARS_PRIVATE, FDC_IVAR_FDTYPE, }; diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h index 22a10ad2abc2..3d93e3d291b9 100644 --- a/sys/dev/gpio/gpiobusvar.h +++ b/sys/dev/gpio/gpiobusvar.h @@ -109,7 +109,7 @@ struct gpiobus_ivar }; enum gpiobus_ivars { - GPIOBUS_IVAR_NPINS = 10500, + GPIOBUS_IVAR_NPINS = BUS_IVARS_GPIOBUS, GPIOBUS_IVAR_PINS, }; diff --git a/sys/dev/hid/hidbus.h b/sys/dev/hid/hidbus.h index 3de4a6291511..50b680c41065 100644 --- a/sys/dev/hid/hidbus.h +++ b/sys/dev/hid/hidbus.h @@ -27,7 +27,7 @@ #define _HID_HIDBUS_H_ enum { - HIDBUS_IVAR_USAGE, + HIDBUS_IVAR_USAGE = BUS_IVARS_PRIVATE, HIDBUS_IVAR_INDEX, HIDBUS_IVAR_FLAGS, #define HIDBUS_FLAG_AUTOCHILD (0<<1) /* Child is autodiscovered */ diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h index 74503d3e54ec..a72b004fcc7f 100644 --- a/sys/dev/iicbus/iicbus.h +++ b/sys/dev/iicbus/iicbus.h @@ -57,7 +57,7 @@ struct iicbus_ivar /* Value of 0x100 is reserved for ACPI_IVAR_HANDLE used by acpi_iicbus */ enum { - IICBUS_IVAR_ADDR /* Address or base address */ + IICBUS_IVAR_ADDR = BUS_IVARS_PRIVATE /* Address or base address */ }; #define IICBUS_ACCESSOR(A, B, T) \ diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index 5b0782775359..ef82d9f66a5d 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -250,7 +250,7 @@ struct mii_phydesc { (*(p)->mii_funcs->pf_reset)(p) enum miibus_device_ivars { - MIIBUS_IVAR_FLAGS + MIIBUS_IVAR_FLAGS = BUS_IVARS_PRIVATE }; /* diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h index c47966793098..06d38553c201 100644 --- a/sys/dev/mmc/mmcbrvar.h +++ b/sys/dev/mmc/mmcbrvar.h @@ -60,7 +60,7 @@ #include "mmcbr_if.h" enum mmcbr_device_ivars { - MMCBR_IVAR_BUS_TYPE, + MMCBR_IVAR_BUS_TYPE = BUS_IVARS_PRIVATE, MMCBR_IVAR_BUS_MODE, MMCBR_IVAR_BUS_WIDTH, MMCBR_IVAR_CHIP_SELECT, diff --git a/sys/dev/mmc/mmcvar.h b/sys/dev/mmc/mmcvar.h index 268b298bce58..a335e098d2ad 100644 --- a/sys/dev/mmc/mmcvar.h +++ b/sys/dev/mmc/mmcvar.h @@ -56,7 +56,7 @@ #define DEV_MMC_MMCVAR_H enum mmc_device_ivars { - MMC_IVAR_SPEC_VERS, + MMC_IVAR_SPEC_VERS = BUS_IVARS_PRIVATE, MMC_IVAR_DSR_IMP, MMC_IVAR_MEDIA_SIZE, MMC_IVAR_RCA, diff --git a/sys/dev/nvdimm/nvdimm_var.h b/sys/dev/nvdimm/nvdimm_var.h index ad931e8fbb23..6b7c8afe42b3 100644 --- a/sys/dev/nvdimm/nvdimm_var.h +++ b/sys/dev/nvdimm/nvdimm_var.h @@ -79,7 +79,7 @@ _Static_assert(sizeof(struct nvdimm_label) == 256, "Incorrect layout"); typedef uint32_t nfit_handle_t; enum nvdimm_acpi_ivar { - NVDIMM_ROOT_IVAR_ACPI_HANDLE, + NVDIMM_ROOT_IVAR_ACPI_HANDLE = BUS_IVARS_PRIVATE, NVDIMM_ROOT_IVAR_DEVICE_HANDLE, NVDIMM_ROOT_IVAR_MAX, }; diff --git a/sys/dev/ow/ow.h b/sys/dev/ow/ow.h index b4d97f957504..6d38111d925c 100644 --- a/sys/dev/ow/ow.h +++ b/sys/dev/ow/ow.h @@ -27,7 +27,7 @@ #define DEV_OW_OW_H 1 enum ow_device_ivars { - OW_IVAR_FAMILY, + OW_IVAR_FAMILY = BUS_IVARS_PRIVATE, OW_IVAR_ROMID }; diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 546d69939699..c6a03b242f35 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -191,7 +191,7 @@ int pccard_select_cfe(device_t dev, int entry); /* ivar interface */ enum { - PCCARD_IVAR_ETHADDR, /* read ethernet address from CIS tupple */ + PCCARD_IVAR_ETHADDR = BUS_IVARS_PRIVATE, /* read ethernet address from CIS tupple */ PCCARD_IVAR_VENDOR, PCCARD_IVAR_PRODUCT, PCCARD_IVAR_PRODEXT, diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 4abb5e977346..696e1c688c68 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -340,7 +340,7 @@ struct pci_devinfo { #include "pci_if.h" enum pci_device_ivars { - PCI_IVAR_SUBVENDOR, + PCI_IVAR_SUBVENDOR = BUS_IVARS_PRIVATE, PCI_IVAR_SUBDEVICE, PCI_IVAR_VENDOR, PCI_IVAR_DEVICE, @@ -414,7 +414,7 @@ pci_write_config(device_t dev, int reg, uint32_t val, int width) /*typedef enum pci_device_ivars pcib_device_ivars;*/ enum pcib_device_ivars { - PCIB_IVAR_DOMAIN, + PCIB_IVAR_DOMAIN = BUS_IVARS_PRIVATE, PCIB_IVAR_BUS }; diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h index 66f45634ea6d..673006bff4c6 100644 --- a/sys/dev/ppbus/ppbconf.h +++ b/sys/dev/ppbus/ppbconf.h @@ -178,7 +178,9 @@ struct ppb_context { /* * List of IVARS available to ppb device drivers */ -#define PPBUS_IVAR_MODE 0 +enum { + PPBUS_IVAR_MODE = BUS_IVARS_PRIVATE +}; /* other fields are reserved to the ppbus internals */ @@ -208,9 +210,11 @@ struct ppb_device { #define EPP_1_7 0x1 /* Parallel Port Chipset IVARS */ /* elsewhere XXX */ -#define PPC_IVAR_EPP_PROTO 0 -#define PPC_IVAR_LOCK 1 -#define PPC_IVAR_INTR_HANDLER 2 +enum { + PPC_IVAR_EPP_PROTO = BUS_IVARS_PRIVATE, + PPC_IVAR_LOCK, + PPC_IVAR_INTR_HANDLER +}; /* * Maximum size of the PnP info string diff --git a/sys/dev/puc/puc_bus.h b/sys/dev/puc/puc_bus.h index 75c39a0f22fc..09fbe2dc42ab 100644 --- a/sys/dev/puc/puc_bus.h +++ b/sys/dev/puc/puc_bus.h @@ -32,8 +32,10 @@ #include #include -#define PUC_IVAR_CLOCK 0 -#define PUC_IVAR_TYPE 1 +enum { + PUC_IVAR_CLOCK = BUS_IVARS_PRIVATE, + PUC_IVAR_TYPE +}; /* Port types. */ #define PUC_TYPE_SERIAL 1 diff --git a/sys/dev/pwm/pwmbus.h b/sys/dev/pwm/pwmbus.h index 59aacc7beee4..172d8939bcf5 100644 --- a/sys/dev/pwm/pwmbus.h +++ b/sys/dev/pwm/pwmbus.h @@ -38,7 +38,7 @@ struct pwmbus_ivars { }; enum { - PWMBUS_IVAR_CHANNEL, /* Channel used by child dev */ + PWMBUS_IVAR_CHANNEL = BUS_IVARS_PRIVATE, /* Channel used by child dev */ }; #define PWMBUS_ACCESSOR(A, B, T) \ diff --git a/sys/dev/quicc/quicc_bus.h b/sys/dev/quicc/quicc_bus.h index 01d8952dddbb..385c24b93f01 100644 --- a/sys/dev/quicc/quicc_bus.h +++ b/sys/dev/quicc/quicc_bus.h @@ -29,9 +29,11 @@ #ifndef _DEV_QUICC_BUS_H_ #define _DEV_QUICC_BUS_H_ -#define QUICC_IVAR_CLOCK 1 /* The CPM clock. */ -#define QUICC_IVAR_BRGCLK 2 /* The BRG clock affected by SCCR. */ -#define QUICC_IVAR_DEVTYPE 3 +enum { + QUICC_IVAR_CLOCK = BUS_IVARS_PRIVATE + 1, /* The CPM clock. */ + QUICC_IVAR_BRGCLK, /* The BRG clock affected by SCCR. */ + QUICC_IVAR_DEVTYPE +}; /* Device types. */ #define QUICC_DEVTYPE_SCC 1 diff --git a/sys/dev/scc/scc_bus.h b/sys/dev/scc/scc_bus.h index 96169d7403d8..3b86dabf1046 100644 --- a/sys/dev/scc/scc_bus.h +++ b/sys/dev/scc/scc_bus.h @@ -32,12 +32,14 @@ #include #include -#define SCC_IVAR_CHANNEL 0 -#define SCC_IVAR_CLASS 1 -#define SCC_IVAR_CLOCK 2 -#define SCC_IVAR_MODE 3 -#define SCC_IVAR_REGSHFT 4 -#define SCC_IVAR_HWMTX 5 +enum { + SCC_IVAR_CHANNEL = BUS_IVARS_PRIVATE, + SCC_IVAR_CLASS, + SCC_IVAR_CLOCK, + SCC_IVAR_MODE, + SCC_IVAR_REGSHFT, + SCC_IVAR_HWMTX +}; /* Hardware class -- the SCC type. */ #define SCC_CLASS_UNUSED 0 diff --git a/sys/dev/sdio/sdiob.h b/sys/dev/sdio/sdiob.h index 316a23b86103..f356cca42588 100644 --- a/sys/dev/sdio/sdiob.h +++ b/sys/dev/sdio/sdiob.h @@ -64,7 +64,7 @@ #ifdef _SYS_BUS_H_ /* Ivars for sdiob. */ enum sdiob_dev_enum { - SDIOB_IVAR_SUPPORT_MULTIBLK, + SDIOB_IVAR_SUPPORT_MULTIBLK = BUS_IVARS_PRIVATE, SDIOB_IVAR_FUNCTION, SDIOB_IVAR_FUNCNUM, SDIOB_IVAR_CLASS, diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h index a6c320594064..6d2d03f11def 100644 --- a/sys/dev/smbus/smbconf.h +++ b/sys/dev/smbus/smbconf.h @@ -75,7 +75,7 @@ * ivars codes */ enum smbus_ivars { - SMBUS_IVAR_ADDR, /* slave address of the device */ + SMBUS_IVAR_ADDR = BUS_IVARS_PRIVATE, /* slave address of the device */ }; int smbus_request_bus(device_t, device_t, int); diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index bc0ae651a3b6..27d592242578 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -982,7 +982,7 @@ typedef int nid_t; ****************************************************************************/ enum hdac_device_ivars { - HDA_IVAR_CODEC_ID, + HDA_IVAR_CODEC_ID = BUS_IVARS_PRIVATE, HDA_IVAR_NODE_ID, HDA_IVAR_VENDOR_ID, HDA_IVAR_DEVICE_ID, diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h index 25cd380173ad..82100f767bda 100644 --- a/sys/dev/spibus/spibusvar.h +++ b/sys/dev/spibus/spibusvar.h @@ -48,7 +48,7 @@ struct spibus_ivar #define SPIBUS_CS_HIGH (1U << 31) enum { - SPIBUS_IVAR_CS, /* chip select that we're on */ + SPIBUS_IVAR_CS = BUS_IVARS_PRIVATE, /* chip select that we're on */ SPIBUS_IVAR_MODE, /* SPI mode (0-3) */ SPIBUS_IVAR_CLOCK, /* maximum clock freq for device */ SPIBUS_IVAR_CS_DELAY, /* delay in microseconds after toggling chip select */ diff --git a/sys/dev/superio/superio.h b/sys/dev/superio/superio.h index c19ffbb43fe2..82530b14429b 100644 --- a/sys/dev/superio/superio.h +++ b/sys/dev/superio/superio.h @@ -60,7 +60,7 @@ device_t superio_find_dev(device_t superio, superio_dev_type_t type, int ldn); enum superio_ivars { - SUPERIO_IVAR_LDN = 10600, + SUPERIO_IVAR_LDN = BUS_IVARS_SUPERIO, SUPERIO_IVAR_TYPE, SUPERIO_IVAR_IOBASE, SUPERIO_IVAR_IOBASE2, diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h index 855dafd63033..6266dc29b94c 100644 --- a/sys/dev/virtio/virtio.h +++ b/sys/dev/virtio/virtio.h @@ -53,13 +53,15 @@ struct vq_alloc_info; /* * VirtIO instance variables indices. */ -#define VIRTIO_IVAR_DEVTYPE 1 -#define VIRTIO_IVAR_FEATURE_DESC 2 -#define VIRTIO_IVAR_VENDOR 3 -#define VIRTIO_IVAR_DEVICE 4 -#define VIRTIO_IVAR_SUBVENDOR 5 -#define VIRTIO_IVAR_SUBDEVICE 6 -#define VIRTIO_IVAR_MODERN 7 +enum { + VIRTIO_IVAR_DEVTYPE = BUS_IVARS_PRIVATE + 1, + VIRTIO_IVAR_FEATURE_DESC, + VIRTIO_IVAR_VENDOR, + VIRTIO_IVAR_DEVICE, + VIRTIO_IVAR_SUBVENDOR, + VIRTIO_IVAR_SUBDEVICE, + VIRTIO_IVAR_MODERN +}; struct virtio_feature_desc { uint64_t vfd_val; diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h index 2d4f643d531d..f0b880de2930 100644 --- a/sys/isa/isavar.h +++ b/sys/isa/isavar.h @@ -103,7 +103,7 @@ struct isa_pnp_id { }; enum isa_device_ivars { - ISA_IVAR_PORT, + ISA_IVAR_PORT = BUS_IVARS_PRIVATE, ISA_IVAR_PORT_0 = ISA_IVAR_PORT, ISA_IVAR_PORT_1, ISA_IVAR_PORTSIZE, diff --git a/sys/powerpc/ps3/ps3bus.h b/sys/powerpc/ps3/ps3bus.h index 386e54065b35..36433202f193 100644 --- a/sys/powerpc/ps3/ps3bus.h +++ b/sys/powerpc/ps3/ps3bus.h @@ -29,7 +29,7 @@ #define _POWERPC_PS3_PS3BUS_H enum { - PS3BUS_IVAR_BUS, + PS3BUS_IVAR_BUS = BUS_IVARS_PRIVATE, PS3BUS_IVAR_DEVICE, PS3BUS_IVAR_BUSTYPE, PS3BUS_IVAR_DEVTYPE, diff --git a/sys/powerpc/psim/iobusvar.h b/sys/powerpc/psim/iobusvar.h index e95478c6f411..d732eacfaf34 100644 --- a/sys/powerpc/psim/iobusvar.h +++ b/sys/powerpc/psim/iobusvar.h @@ -35,7 +35,7 @@ */ enum iobus_ivars { - IOBUS_IVAR_NODE, + IOBUS_IVAR_NODE = BUS_IVARS_PRIVATE, IOBUS_IVAR_NAME, IOBUS_IVAR_NREGS, IOBUS_IVAR_REGS, diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 10f596654150..5bf8df4ca0b0 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -297,6 +297,22 @@ enum intr_polarity { INTR_POLARITY_LOW = 2 }; +/** + * Bus drivers may maintain a set of bus-specific instance variables + * for each child device. The BUS_READ_IVAR/BUS_WRITE_IVAR API can be + * used to access these variables using an index value. Some index + * values are private to a single bus and should be defined in the + * private range. Other index values are shared by multiple busses + * and must have the same meaning in all bus drivers. + */ + +#define BUS_IVARS_PRIVATE 0x0 /* private variables */ +#define BUS_IVARS_ACPI 0x100 +#define BUS_IVARS_GIC 500 +#define BUS_IVARS_GICV3 1000 +#define BUS_IVARS_GPIOBUS 10500 +#define BUS_IVARS_SUPERIO 10600 + /** * CPU sets supported by bus_get_cpus(). Note that not all sets may be * supported for a given device. If a request is not supported by a diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h index 5bb55679a05b..24c7ec6aacfe 100644 --- a/sys/sys/cpu.h +++ b/sys/sys/cpu.h @@ -35,10 +35,12 @@ * CPU device support. */ -#define CPU_IVAR_PCPU 1 -#define CPU_IVAR_NOMINAL_MHZ 2 -#define CPU_IVAR_CPUID_SIZE 3 -#define CPU_IVAR_CPUID 4 +enum { + CPU_IVAR_PCPU = BUS_IVARS_PRIVATE + 1, + CPU_IVAR_NOMINAL_MHZ, + CPU_IVAR_CPUID_SIZE, + CPU_IVAR_CPUID +}; static __inline struct pcpu * cpu_get_pcpu(device_t dev) diff --git a/sys/x86/include/legacyvar.h b/sys/x86/include/legacyvar.h index 8a7618781b00..442d1eca1063 100644 --- a/sys/x86/include/legacyvar.h +++ b/sys/x86/include/legacyvar.h @@ -30,7 +30,7 @@ #define _X86_LEGACYVAR_H_ enum legacy_device_ivars { - LEGACY_IVAR_PCIDOMAIN, + LEGACY_IVAR_PCIDOMAIN = BUS_IVARS_PRIVATE, LEGACY_IVAR_PCIBUS, LEGACY_IVAR_PCISLOT, LEGACY_IVAR_PCIFUNC diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index 0f4168f17e6a..83638ed6302f 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -55,7 +55,7 @@ enum { /** * Path of this device node. */ - XENBUS_IVAR_NODE, + XENBUS_IVAR_NODE = BUS_IVARS_PRIVATE, /** * The device type (e.g. vif, vbd). From nobody Tue Feb 17 20:46:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB36cHJz6S3hn for ; Tue, 17 Feb 2026 20:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFsB3436Qz3vHs for ; Tue, 17 Feb 2026 20:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d4PckCeM0P76TddhwolH/AuTGxGndRsRl0mp4dMjLZc=; b=Z1zgoHTnsSRn6KyTp4/ngmXMK71NLmS1TMm2QHHTRBw40gX0nB8xXweYaiL1Aek0s4OBd4 O61DGUWVMl6KLeY4fe3TR5Oulib5u0XyMWhBsWpat6UBipS5A0rtqMiUm9Cy7SFo807cdw Zp//dFlVfkszQxmGY3rLmtQCMbvG24pakHexZfVFfO8TxgGSdXSMHUUnBWEJrIkUDjGJtf DycJdtqmSKbvYSxdxMQfAnhGJggPIcgj6FAe1ewNm7ileiut9qXsd/Ln2aIck0ovdUqfex 7LZzaq/ZXq4i2PMU9/8aou64IlMD0NqDGyPWZ33rRzYg4udaw9DE8Uc5uXB4Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361179; a=rsa-sha256; cv=none; b=oGD48KpAX2gDbxeYwyQX+Na0z/jcL+MCZ1ntDs2wGNPUvTO0RgIyn5bdaQOsVoCBu5LHpN J1IFQMNMEjXjYD5I3tTVBt+AV68NzVxsbcEW3EpNTmM4lPIvWZNVH7TRfZU40DfLRcKPHu I8hGjhArTVKPfVJTAv13OEVWzv5vPcS26ogNhw499BScc5GhnD4zyOxua8avZE8lTF5WMW CWtrhigWGinjcsvgtow2CRzO23gBVBR1uV+gRDfMP9+y0oCoxdqiKj04QjQIavP05bP89g B0H9nLT1mrup9SKiSaNLvw5D9xul2Rbs+i8NY2yWp4yZUGHmxOv1VxOcdTf0HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d4PckCeM0P76TddhwolH/AuTGxGndRsRl0mp4dMjLZc=; b=L2CsVWhztiFq9YIHHIHDhyWVdQ15xB0eKNdqejiRjiuhSMV/VFAtRKH1uJnH781WKsPqAD UyVNOx2LaQ4np1UjRptEo48DQ24jYDwwFzBOmpvnu0EmqilnJOHPBVjiKYdQys4Jsiis6E 1ivCKMuiAnGkNr6rn6iBRvYcJOe4+2gOp/XoV1qx3pXQP1QkaaYytXSf0NbJRWLbFM97pC mD9pumbVqBnSLJcql65rK5pCKMnvMVWjhoOnfXKoXedtVE5ziszA68REV+ZiFsSbPLNkCp eK6E9yKy8p3UCzF0EqAf+DTfIv8Z6kxxHVNB+WGEsfMonpSxibQEhnATAg6LLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB33c6Tz9XJ for ; Tue, 17 Feb 2026 20:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f4fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:46:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e3d2108a6e90 - main - bus: Change a few bus drivers to use consistent IVAR ranges List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3d2108a6e90098010c62638ab9f8bdf974e2c39 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:46:19 +0000 Message-Id: <6994d39b.1f4fb.95ae28c@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e3d2108a6e90098010c62638ab9f8bdf974e2c39 commit e3d2108a6e90098010c62638ab9f8bdf974e2c39 Author: John Baldwin AuthorDate: 2026-02-17 20:45:25 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:45:25 +0000 bus: Change a few bus drivers to use consistent IVAR ranges A few bus drivers used 1 instead of 0 as the starting index of their private IVARs. Fix those drivers to start at BUS_IVARS_PRIVATE for consistency. Differential Revision: https://reviews.freebsd.org/D54934 --- sys/dev/quicc/quicc_bus.h | 2 +- sys/dev/virtio/virtio.h | 2 +- sys/sys/cpu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/quicc/quicc_bus.h b/sys/dev/quicc/quicc_bus.h index 385c24b93f01..4c8bcd4210d4 100644 --- a/sys/dev/quicc/quicc_bus.h +++ b/sys/dev/quicc/quicc_bus.h @@ -30,7 +30,7 @@ #define _DEV_QUICC_BUS_H_ enum { - QUICC_IVAR_CLOCK = BUS_IVARS_PRIVATE + 1, /* The CPM clock. */ + QUICC_IVAR_CLOCK = BUS_IVARS_PRIVATE, /* The CPM clock. */ QUICC_IVAR_BRGCLK, /* The BRG clock affected by SCCR. */ QUICC_IVAR_DEVTYPE }; diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h index 6266dc29b94c..1b8dc630e339 100644 --- a/sys/dev/virtio/virtio.h +++ b/sys/dev/virtio/virtio.h @@ -54,7 +54,7 @@ struct vq_alloc_info; * VirtIO instance variables indices. */ enum { - VIRTIO_IVAR_DEVTYPE = BUS_IVARS_PRIVATE + 1, + VIRTIO_IVAR_DEVTYPE = BUS_IVARS_PRIVATE, VIRTIO_IVAR_FEATURE_DESC, VIRTIO_IVAR_VENDOR, VIRTIO_IVAR_DEVICE, diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h index 24c7ec6aacfe..21e79e6db6a4 100644 --- a/sys/sys/cpu.h +++ b/sys/sys/cpu.h @@ -36,7 +36,7 @@ */ enum { - CPU_IVAR_PCPU = BUS_IVARS_PRIVATE + 1, + CPU_IVAR_PCPU = BUS_IVARS_PRIVATE, CPU_IVAR_NOMINAL_MHZ, CPU_IVAR_CPUID_SIZE, CPU_IVAR_CPUID From nobody Tue Feb 17 20:46:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB46zHpz6S3fm for ; Tue, 17 Feb 2026 20:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFsB45q4yz3vTC for ; Tue, 17 Feb 2026 20:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZpW5LUYTc3SOiLpp4oRqVBSe0ZRdgL2RU7SfcaKW70=; b=rSH1zPbliIPTCxjPzrPd8aJWIFNsu/SIyVn8b7aCUBP0ED9sbgZToEMnBuyxkxbdSqqoq7 0oxrX/MSuFZvkSq2u1vslwUgjd/KwEiu0O3g/ggrbz7lbT36iIy6uPfx3j4na6mYh1u0iB CQEyZl8Fzc51oLVlThE1OIxDNXNqE2P3b/udSybNeizojK92LHNIYR6jA2ugbUqsMfr8Mk 4qgUdM3wa6Ma81wI4jDmBYDUvYbmc+6kS/++lE8A6jXUYyPE4JeS5L9EaicGp8bcZKyq1t n327Uq0MoGhQKxE6k1j0XzEHmEHVrjDtbldvREOwDf04Og7wCM4Ga/M2gI4HzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361180; a=rsa-sha256; cv=none; b=DYx/Ir3fvVqmi7C1SS1bEM3gsqyB3PoNtK4h0eTKi+Pnw2LSxwix73vJZlJiVvLhRjeDu5 lTAzmbjczyi76RFvkkr0gPMnJDKAT36azAaP6G9gjBoZSR/TTEHP6uFXuYpZvxnPnhR7wh D5bxrT2naYiJCvTVahoCBAED9dlYDjXfmefvgg75QiPuSWaZT1r+fU9fjpwwPeLIUrehWm d7U/+3kSBvAsOISq4/C1W7tWlrP8v56Quyc0w2d1kKXeFgSAQF/qMrx1XlCbKc7/lT/qJe 22fvvwoafGwgf/SSGqjFJo08T5No5gAsJX76DX88jf7RHNU8xq28/8EUJuGq7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZpW5LUYTc3SOiLpp4oRqVBSe0ZRdgL2RU7SfcaKW70=; b=eZB6Tw9EJpRmGG1wCPNVQ24olENhFPPhDfCY5GRRqV0ww+AhsMy1wZEroe0osJ5IDhW3S/ 6upV0NYAq8BlUkfVCOTIitc5XASC9RTCOklGEGz9Suz9pDCWUdcBw5myCc9BnF1T4gl3GD zvfYx/2N38jtIKJujGHDRvWj76fN5ceeRkUrQYiuNb/TJyg6b6GGr9xAq7z7/5C+2G0f5A fzDKe+/RmjDdpomouEIMYY/0ztZbJRh6sAW5/+ArQgnsrZVxCcpOXF7jkUFr5E4jkLWv7I hfA+Z3I2To9PKKyTgNzB5DYi0c9ij8y5DaR5silZdEQrwsTH2WrrIEjc2a7RmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB43zR4z9B9 for ; Tue, 17 Feb 2026 20:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e3cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:46:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 824ce81f74b5 - main - bus: Drop a couple of unused IVAR indices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 824ce81f74b5aece73620c94693dcf3c718e96c4 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:46:20 +0000 Message-Id: <6994d39c.1e3cd.18ba5443@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=824ce81f74b5aece73620c94693dcf3c718e96c4 commit 824ce81f74b5aece73620c94693dcf3c718e96c4 Author: John Baldwin AuthorDate: 2026-02-17 20:45:38 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:45:38 +0000 bus: Drop a couple of unused IVAR indices This changes the in-kernel ABI, but that is permitted across major versions and is cleaner than leaving these around forever. Differential Revision: https://reviews.freebsd.org/D54160 --- sys/arm64/arm64/gic_v3_var.h | 1 - sys/dev/acpica/acpivar.h | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 58523bb42cd6..1f7170933be0 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -111,7 +111,6 @@ MALLOC_DECLARE(M_GIC_V3); /* ivars */ enum { GICV3_IVAR_NIRQS = BUS_IVARS_GICV3, - _GICV3_IVAR_REDIST_VADDR, /* unused */ GICV3_IVAR_REDIST, GICV3_IVAR_FLAGS, }; diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 34f4204a812c..d1d55d2b7e5f 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -279,7 +279,6 @@ extern int acpi_override_isa_irq_polarity; */ enum { ACPI_IVAR_HANDLE = BUS_IVARS_ACPI, - ACPI_IVAR_UNUSED, /* Unused/reserved. */ ACPI_IVAR_PRIVATE, ACPI_IVAR_FLAGS, ACPI_IVAR_DOMAIN From nobody Tue Feb 17 20:46:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB733pvz6S3ZN for ; Tue, 17 Feb 2026 20:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFsB6645Vz3vDD for ; Tue, 17 Feb 2026 20:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNehqaKmRp8qXbfDu3yd2fe/B3pNfcQL/vk0nAsuQ7U=; b=rs/C9mgB2EX/ByMdS2H9gQ0n+YhVN5EapDf59/zCs5RD/w2VPekh+0ORtBD9x+B7bXpWzu SgyowQndINwrF6hQvsqEBnTBxFIQrbYLL2S4usaEkRLP6eGsZ/mMPELgDNBAd9hutEyP3O 3zxtqrY7IcyQFeMMIUe1pwJdUmOz5U5Kh28ReF5hsZklH9OH3UfLnHNJuNYOWeDIGyXrp3 RaRgvsl+9vUEXKn++3y4Vd4O8oUpHL/3Ue5f3hqObOyRR4jUi3kz3gyYxykAFbN92mqWJd XaJNXEYWcTg/JtG2vALP3t4M7GoGIxgxDkJRzx5Ra6ZeJ/pt7vLFnkMlQMDgfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361182; a=rsa-sha256; cv=none; b=mkqNqZOkh1/8+8F75eN9pyQLDSeVVyc0HEwH5T/K6cQEdUz6hcxaZbEiN/hIgaDEn5h5Ba GQ6XuNfimQODOKjXL1Gl/3OPM4641o/B9vPantfWKtTo/9yEt4TrGXuBRFI2d/KGL9g0fk BUyOIcNvt8glwNCco/wWEz52n+qc0kgYf0UlpmZiK6sKiFOeqSBElqKNxAlYmWTpr8uA9l 5RlWGl6t0EcdgkZxFGMbo/p9haTLdKIQ/AhFQbQERAfPNjFfhqcSi6whFCsXTmr83xe5yb 1Lu5R88UkwaaY5W97OR3KM/BU3rCRyHzF72frbzB8Ex+Xa6PQ8LFHXvWs+rMMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNehqaKmRp8qXbfDu3yd2fe/B3pNfcQL/vk0nAsuQ7U=; b=bw2aAWpty3H+4qm02Yk31Adj7RvcKNqL2TZfJysV+Qp8ZgYpBGjD8ER9a2MVCco5aHd+g2 uZRmchOVRkpJzxJZiUvhMtcnla8DL0m3orzoYYUQy4l9yfTJ2Cj/65zn100n3QCb9VbuIn dEklXGd0moh5QSYhVlw7tn3tCC8PP++grpw3msx8jbpY2/DDGNujnCvu88Pp+veq+3oem3 IHrtSgd27nwZqMw4TpGsYEBZKYEE9lZPtZGJol/zMQPiLCu7CsS4uBozcwqRIiJVdKKYSw bRddhBekLyR2ekE53b4nn8R168+6A9FFJ4d4oTxyhK7LJjntiFUOgI3lZofO7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsB65S6mz9Ty for ; Tue, 17 Feb 2026 20:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d27a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:46:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 87984eddde4d - main - bus: Renumber global IVAR ranges List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87984eddde4dca3ded908f70d2699788e9d8d019 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:46:22 +0000 Message-Id: <6994d39e.1d27a.706bcb6b@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=87984eddde4dca3ded908f70d2699788e9d8d019 commit 87984eddde4dca3ded908f70d2699788e9d8d019 Author: John Baldwin AuthorDate: 2026-02-17 20:46:06 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:46:06 +0000 bus: Renumber global IVAR ranges Use a more consistent scheme for allocating shared IVAR index ranges. Differential Revision: https://reviews.freebsd.org/D54161 --- sys/sys/bus.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 2b5a3fb7d2ee..d90e2a81f054 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -308,9 +308,9 @@ enum intr_polarity { #define BUS_IVARS_PRIVATE 0x0 /* private variables */ #define BUS_IVARS_ACPI 0x100 -#define BUS_IVARS_GIC 500 -#define BUS_IVARS_GPIOBUS 10500 -#define BUS_IVARS_SUPERIO 10600 +#define BUS_IVARS_GIC 0x200 +#define BUS_IVARS_GPIOBUS 0x300 +#define BUS_IVARS_SUPERIO 0x400 /** * CPU sets supported by bus_get_cpus(). Note that not all sets may be From nobody Tue Feb 17 20:46:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsBB73mNz6S3kk for ; Tue, 17 Feb 2026 20:46: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 4fFsBB5Cb9z3vcr for ; Tue, 17 Feb 2026 20:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y7D6yNnOMVyRiTuq1WFl8Xt/cRbGRDXoq1a7jU/wdnE=; b=We9Yp/2przo/P3d5frbGwOW4H8S30CvKC/c2o43/VzzO78RCU7kTSLcfPqlTFjl0SkBw3y hAatEtaM5nAmUFKDAdUTIb2d53RdmqpdeyZyXwOTYpAaeJkxpCi7z2K5xY77XICnzmMxLM n731N/uG1RzKWo+Q0lCsNUr2TCpB1onjfplFq1cfv4yP5Es/S1fRlaXH4pjykT/USbDVyJ xtucoYX9pNfQVDJrra32hfG/8aMYWilrvaSpwG33fnDHVCclLjO3R/qp3Xkc/NdOFj/4Tm c+90lBbyXRxlkKxG7V+WYbOPAwbpbIo6SRyEnrUV1KYa+ksJ1u4+T7bW6l76BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361186; a=rsa-sha256; cv=none; b=lY2w0rdcu718O6klV7Cfsubt8hQWV3OhncbMxdiLBIK+/yujWkvPPr4XGvdAYPF7P6o2xG oevTSooH7j8rzGT98t9Ct4nRVgUB/mw0dOlczU1PfdsA9lN/sMviCp3PDzSlQDBYTJgOOX JLMZFDcCQmaiu6KvoMsGaT9ykrq5DRJop8q8g2pWJb76wyvdGbQV+37izqS/mLtvD58zo5 23G6QNQWPO2J0N0F1RZtoqLXUQWpxhuoPljAstDtSwElmEU8UZBBdSzBi8WZuDUHViRh/J kX7F4droWthxzDQXHAk81ULb8earq90dWFwY/+dyglwA3NoTaPMlHGZlCAELoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y7D6yNnOMVyRiTuq1WFl8Xt/cRbGRDXoq1a7jU/wdnE=; b=xu8YX5AaoZz3YKpSbsmcQ0S6qJsmy1kta+PhFPm7PhFw5MC4CMQ1mX7XQcL+0tYIMqvzGf jcnJy9H7HUm5TZw6gaQapge+mqdu7FWIKWcj10Dn0yfEWO/xuqScj4zHFrNOpraqGUy+Ch gsg0uQcsfkjd+RJtNMF/lSJIAwFSv/XIcsg5eNdcRQBu02mSzj7HCo3D+8y0iQdZ4c4M8D 1Y8ZfDH8VCidFHm1gkVsDIJCifPbs5ZfTF3DYS+iSf5Ik/Na1ZTdaImX0Cr355Ia2wu302 q5XR0Mmas+3TjNMV3HgfxKzEmsDi6PolJmAjTeMJpPsJCmCMa6v7GftmNl+HlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsBB4k4kz9Pv for ; Tue, 17 Feb 2026 20:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f399 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:46:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: dc47d99c5022 - main - arm gicv3: Use private IVAR range for GICV3 IVARs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc47d99c5022540477489d2b850b92a537965c0f Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:46:21 +0000 Message-Id: <6994d39d.1f399.4e11dc17@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dc47d99c5022540477489d2b850b92a537965c0f commit dc47d99c5022540477489d2b850b92a537965c0f Author: John Baldwin AuthorDate: 2026-02-17 20:45:48 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:45:48 +0000 arm gicv3: Use private IVAR range for GICV3 IVARs Suggested by: andrew Differential Revision: https://reviews.freebsd.org/D54191 --- sys/arm64/arm64/gic_v3_var.h | 2 +- sys/sys/bus.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 1f7170933be0..8c1e39d63774 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -110,7 +110,7 @@ MALLOC_DECLARE(M_GIC_V3); /* ivars */ enum { - GICV3_IVAR_NIRQS = BUS_IVARS_GICV3, + GICV3_IVAR_NIRQS = BUS_IVARS_PRIVATE, GICV3_IVAR_REDIST, GICV3_IVAR_FLAGS, }; diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 5bf8df4ca0b0..2b5a3fb7d2ee 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -309,7 +309,6 @@ enum intr_polarity { #define BUS_IVARS_PRIVATE 0x0 /* private variables */ #define BUS_IVARS_ACPI 0x100 #define BUS_IVARS_GIC 500 -#define BUS_IVARS_GICV3 1000 #define BUS_IVARS_GPIOBUS 10500 #define BUS_IVARS_SUPERIO 10600 From nobody Tue Feb 17 20:48:13 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDG0hy5z6S40V for ; Tue, 17 Feb 2026 20:48: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 4fFsDF4V2bz3xbb for ; Tue, 17 Feb 2026 20:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWzRSksK8WC4YsEATtMe/1VYUrOJybsSGjHEEPzZAb4=; b=qLXkb2024r7/eMvp9IW7IIY/t2Og+mHiPfV9jc1ng4epFnru2xR2/+WJNTIrCGF8KFLVuW /HMmayyqeS4pf6DY/3MyQf9T6gYZ2vNLgYZVsC67ZDE35EVYHAQazoI0VhAt4P+68sBDtW JQ12TVGcjJ0OyEmKuCHrdFKuqb/87Fdpfmm7RXFPNLTbjm1uQ+zzcHfLMSvatDk8pN/lrv nMlQrsocXC3KsAMuZ4DNeNax7E2teoO5QLXbmT+9vFKJ3LEQkwXdmZ/yb9jAcUQPKZaHhq EDuiDuPZYPnll1/x4tYJ5prgU+JYTO99LT+gkQ/kpmyoJU/JPTJPlqd8VvsIug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361293; a=rsa-sha256; cv=none; b=NB8F6E8VruzQLqHAf6IZLwoCiJSBmHuKiHhUREWA3s5KnOHJYrYIICyCrRbxbIvpz/KWCd y/uq1G2DZ5OUpUBdyQkyo4/OhwbkSklaxptcAr5rXWincz04zemE7T1QfyLX2O350qjsJG PtEqUbOAKVRkA9WnhdL+ZTA2nSf/pgS16PYIisRsjhefvgMSdCTKvTMDz+VF1pUEaRQoq6 eshc5lCoZx/Ma56jh8B5RUHgDza+0hOZkhfrpKFfrPp2Ii0ahGXhNVB22G68WMOA25x6ow W11J/EU1ALtWdJMaakBVJMQFYW460sBlTaYhJTw3+J3glZPSSWJM3jBlbHP5Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWzRSksK8WC4YsEATtMe/1VYUrOJybsSGjHEEPzZAb4=; b=eHujO7C6b3jgfMqfMQx1HAP8j5wnlDseHOADc9NoFPpxaA5aG0UMhxYlA/g+jYQ0r6QeF5 ZQn758AXN7fKz4EwHu4d3w8OCyQZuRaJwxivl4SdrLhQcsZfRQLrvOG6gCZNqz1h8Foo5d bt10n1lBdIOM0JSgRv13IfI/yPkdZT+o9oxRV9u5/xr8A8f/cmA+G+TjJa2B1bqWAo5Qsh exTm/bFpmEhx9pFI0A3qDwvqCfr9/amxNOejZu4HeaUsJk2RFqLdCsKDVPJ/wK2cl3IT+L CMVZxVJWHK9k49iIPPB+StEdzK81Pqi3NwBudZ+Sg8j3w7O16MJMWAQa4gDslA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDF3L3Mz9jm for ; Tue, 17 Feb 2026 20:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d27e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:48:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4092df8820ea - main - arm64: Explicitly use movz List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4092df8820ea01951ab6df6cfd4fdc5b239e636e Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:48:13 +0000 Message-Id: <6994d40d.1d27e.700da0b2@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4092df8820ea01951ab6df6cfd4fdc5b239e636e commit 4092df8820ea01951ab6df6cfd4fdc5b239e636e Author: John Baldwin AuthorDate: 2026-02-17 20:46:35 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:46:35 +0000 arm64: Explicitly use movz This appeases GNU as which doesn't map the mov alias to movz. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D55160 --- sys/arm64/arm64/locore.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 46d3bac576e8..f1228235dfe7 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -44,7 +44,7 @@ * This can be used early on when we don't know the CPUs endianness. */ .macro mov_q reg, val - mov \reg, :abs_g0_nc:\val + movz \reg, :abs_g0_nc:\val .if (\val >> 16) & 0xffff != 0 movk \reg, :abs_g1_nc:\val .endif From nobody Tue Feb 17 20:48:14 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDG4yGfz6S42W for ; Tue, 17 Feb 2026 20:48: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 4fFsDG42bKz3xYL for ; Tue, 17 Feb 2026 20:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaQDP8g/j9Qcy1uaJxAZWD+rFfrZ/g8UL3VciqvcOew=; b=umFn4cuZ/5pKknqNhhqT+gMIGaoXqMo9dqUmDac3jcBTKMWgTFmwuf8KxGe+CA8UwHR60Q TZKHVaHHCb761jWcnUKEPGW0dWG5OlDy+9+DIH2168JTNZ2Mx5Kemk5agGQvU+U5tVmIlC U+yl0B/pPukBpJnuLuIpYYGKNVblrT5gO0A1C2qNeAr7H2xSYqLynxtouvxnV+71B3OoQ5 m4CQfZ+qih9/JH2UJftc1ZZpq4e4WUiPD7OmSUdM6bZtdtuBvHCgyTNV4bqVc6mNZpToOK 61z5JGffQOk2TKqNsJeDymkMg41npKHi6aoioN5M9RO4Kuy4QYsw3j8Xc4Ofsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361294; a=rsa-sha256; cv=none; b=m4cmB790wwnNAAiXDwTTf3I/y+BHwRbD2uj3cs9DLB6JoO1CQtmvL93K9XQMZfzYe5j7wP GsbJJeRj0mBbDFpaw7ydM5/0vnrpMZZ5vIHbtcqUz4jL04YgIj2xiCXjyIHpitdkpOGfT0 AGuz12cOnjZWt8QekPqZlOCFm3FhYl5qrORmKrQ3tj6PqHKMTPa7u1PjLS3RztTLAgsLNs 0K9eDsYUK0x8nxpTUd4gKGJUlkwvdVbFC8sgPlVpS9nJSCsCXIGbJh0McQZQHAih9R64YT ziaAmGLvFS1gmE2HopLUQSUudMwxUk2MO2GxT1f4xXGYMkgIdtPDXpRhndLzKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaQDP8g/j9Qcy1uaJxAZWD+rFfrZ/g8UL3VciqvcOew=; b=nGwVWpDtsU62G6VIa5PFcUX8VODA7eTmbm6TjdkSiw0YTfRvySRJ/J1MvO41yWE/ynnjke MNkC1J6mu1t8ss81U8uBcoa8yK8IDh63Q7Sg619IJeaRHAUuGa4rvqjBCZx3ogH42g+Wx+ /yUZ0RfHrYwTMFhNfht7jr6BgGJ03Y0HDt01PsoKTt3IC4nXsqxQ5WdbKvilYzrCNHsTtP FSfG2SjmPanQM/RSP0vEJmrWYYGnDW9hIP8x6Fa3XkwhXF1ELBuU764Q46MePzCl8vyx2v zecm5KVIS3C56RthuUElTDFRKCorQAaCl46j7p5BEoJoE85jYdz7jsgL6bvvDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDG3XRGz9KL for ; Tue, 17 Feb 2026 20:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f415 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:48:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c7f7b67411b2 - main - arm bcm2835: Appease a warning from GCC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7f7b67411b2ac325b548422191896cfa66d15cb Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:48:14 +0000 Message-Id: <6994d40e.1f415.34d0eb1b@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f7b67411b2ac325b548422191896cfa66d15cb commit c7f7b67411b2ac325b548422191896cfa66d15cb Author: John Baldwin AuthorDate: 2026-02-17 20:46:48 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:46:48 +0000 arm bcm2835: Appease a warning from GCC No code currently uses the vc_audio_msg_type_names array of strings. Reported by: -Wunused-variable Differential Revision: https://reviews.freebsd.org/D55162 --- sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h b/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h index ea972ff2d001..575cbb0bba9d 100644 --- a/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h +++ b/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h @@ -56,7 +56,7 @@ typedef enum } VC_AUDIO_MSG_TYPE; -static const char *vc_audio_msg_type_names[] = { +static const char __used *vc_audio_msg_type_names[] = { "VC_AUDIO_MSG_TYPE_RESULT", "VC_AUDIO_MSG_TYPE_COMPLETE", "VC_AUDIO_MSG_TYPE_CONFIG", From nobody Tue Feb 17 20:48:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDH6z2qz6S3rg for ; Tue, 17 Feb 2026 20:48: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 4fFsDH4R7Fz3xbc for ; Tue, 17 Feb 2026 20:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rsD8+0CI6IFXrUruZHVWa6METJxWFY6puFco6C7PTvY=; b=HP33WBO6AuXZQriUMSg0n+2GOfeBFZK5+WAX5AEijftl4UtJJT3OpW7wn/SWCZF+/M6iuc 0ddwEERVmJPCVKs7WtnOMxHnBzQisJKCWvFJLRdjZre8XmOsOVzTmow0Fzr6hy8cRnCVuZ f8NSinfV9+SGIa6XQN1LRvwbQ2pdz/2WHQXm4lULpwsbD2fW4HF84669dGB6Y7IZHaI3wX iISuLSIEoHeppSHeXV41tDr65rwXOvVfPwaeQDGebIZ8Fd8K3rxWdwMqMztYnfQyf5mxaB 41XtWOjZzxDFA9I+1f9TJEmAo31BMH7vQI0BU+BOenNQ6ty+a8G2VubOwCu6Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361295; a=rsa-sha256; cv=none; b=mqgK6bMLlScehBIecjovj/KG4FPOwFGoDhF3+pHHoFWtIQ10nWXrhkOqHZ2NZgV3IvYqHH idC41elUqVcfplK/8GcCzIeLXe/0I2N67m/qZ/pg0/5tbe8MQS6QiXqfhZV0uDCXDSk3ZK k7gbIY2BZWdivClMKyPTn0CegMFZ7mg971+Cov73N8hqGw2Nh0oPE8Zeq6aHxbKSAHuXmZ F+0QoVM1HziM2zN1tT0tFkyABrrZq/ZFg9AYAerRrmeXbynh+G8DK+jzpBtDCYJ7GhA2e2 Ze5ADAvM6yE+MK3OumjvepMMwZdWnkGOAU2A+8oVCi+yPcGbDG93VI0n0ftEBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rsD8+0CI6IFXrUruZHVWa6METJxWFY6puFco6C7PTvY=; b=g/fEmB7yFQkWjzTAgO2jhHJsAp+zlSvwbT8Z/+FakaZW5F8TZBggVNeKO9hHVIBjVqdWZf cTiZyMtj4fVWhhERMtc7gFVpRyzJo8YX2SHfWZzhTMYZ3oaFk0sqnXXTUaPp2BcZV6cQGB 6dFGVaw+xifGk3Avoqtjp9JTu0RNx1GbLpL90eJj0JXh3KA4HE7wdXduK1GVMCfeFFdOAs C6hGelGbAUqoHmUZsfmG+gyIDWrEKklfjpWpOcRu80zygpgx4VtosncLnZskTlfBmMe8NE quwK0hC2/HiBLw70MzeomzeJljxfF9SKTelv3D9pMGkGMiThikd71iJ846T3mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDH3zZRz9BC for ; Tue, 17 Feb 2026 20:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ffc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:48:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1101292a555d - main - vchiq: Fix return type of vchiq_copy_from_user List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1101292a555d24c11d7630b638dc25e1ed22c061 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:48:15 +0000 Message-Id: <6994d40f.1ffc3.2b6e266f@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1101292a555d24c11d7630b638dc25e1ed22c061 commit 1101292a555d24c11d7630b638dc25e1ed22c061 Author: John Baldwin AuthorDate: 2026-02-17 20:47:00 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:47:00 +0000 vchiq: Fix return type of vchiq_copy_from_user Change the function definition to map the declaration and consistently return an enum value. This fixes the following error reported by GCC: sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c:322:1: error: conflicting types for 'vchiq_copy_from_user' due to enum/integer mismatch; have 'int(void *, const void *, int)' [-Werror=enum-int-mismatch] 322 | vchiq_copy_from_user(void *dst, const void *src, int size) | ^~~~~~~~~~~~~~~~~~~~ In file included from sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.h:38, from sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c:61: sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h:647:1: note: previous declaration of 'vchiq_copy_from_user' with type 'VCHIQ_STATUS_T(void *, const void *, int)' 647 | vchiq_copy_from_user(void *dst, const void *src, int size); | ^~~~~~~~~~~~~~~~~~~~ Differential Revision: https://reviews.freebsd.org/D55163 --- sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c index 7e105a6b3b77..57e5036ca363 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c @@ -318,7 +318,7 @@ vchiq_platform_get_arm_state(VCHIQ_STATE_T *state) return &((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->arm_state; } -int +VCHIQ_STATUS_T vchiq_copy_from_user(void *dst, const void *src, int size) { @@ -329,7 +329,7 @@ vchiq_copy_from_user(void *dst, const void *src, int size) else bcopy(src, dst, size); - return 0; + return VCHIQ_SUCCESS; } VCHIQ_STATUS_T From nobody Tue Feb 17 20:48:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDJ6dlrz6S3hm for ; Tue, 17 Feb 2026 20:48: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 4fFsDJ5BtNz3xSb for ; Tue, 17 Feb 2026 20:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mmIIG7jkERHuy2NMOqzZvhLAxgyELJBhMGcTsaPZMfI=; b=Cevr8aMZ2yQ3cT7kN1Xk2osyS2wN5yiMUqr50SFLjJ3p/RMgTgR1zdBKUdewqAKPsDTs2p EHd8C3eFM4EYVh8fEjxKvg3OeTCXqe/CYPanoO1UcxpXURggPxYICOzksTsrGZVqlsSYZa hx46xEuCUe0YTXq2dVtY43uZKGfo0khzihnm0gQO+kT+sKuAJiKCJGjExKiZAVV+JyIUmN Nftnz7N1IR1YDRwpHbCKLO3UL7RpaQMaoIJwVuVs9u8tEH+y6vofgV+EsSx1pIygVy25To mxTK+CWrIUPN0UGUuBW1rBDV2PiT745MOYIV6+R2KjfU29ZJYfOQoGXWZeCQqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361296; a=rsa-sha256; cv=none; b=gwe2IUuEZq4WpPgvs9jQSGqn/iede/kBJ7oTt/T91iqctXWG/ySIHo7buOR+VTOMH7pGX4 +UHAtCyhXs4nmp5VExQ3yPAODDOnbHoftXk7vdLQIlBvLetkawFpUp5VGadx6Zp5j9DdlT RGPwuH1OUBVmFj+QBpPk/sJYjokNnHqTCWAl5Npee5eH41I6+VLYWsNnF/RFgvoE3pLRKH 7EnkwnNBV7puWB063jHGE1jTzm0VLvtkQzQUnB1w7lZnqjtbw6x+mbxAz9Z5X+wpacS4Xu ybw7VGUaHIXCy4oPsTm7AHvR76EEe2OMpDu6Qh0bkovHrNM7gMFFYwoREeRKwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mmIIG7jkERHuy2NMOqzZvhLAxgyELJBhMGcTsaPZMfI=; b=Ze5gWdkRwPDUONc5ev/SGqKH7SG0OUL+u61/8K7nVVuhqjGsCg/k088YqS0bKijTpg2n5C mJuyTS8nK20DEG2RU5LWAX6nhB8Gb4Mf1Sb9xUe599nTFcnM7xKi424PK34ccQMFdoOjLW 7qOe6ywQ+yXssN1Iy8x6Ez3T4+ACnXKUy6vG/0+P2QkBy/YDiXPF+bo6JreYQtUosMVM9i ZuGSQArIOEwPRw1HXD3q6ikvYIjXDSYfl4MjmPCNO4z6I8NhMBRfxL9PhyP6EvuYHRqNOO dGXf9uDshBb0j4Yvr5OIAZyWK0fADL8zbBeASU5Y++dX1a1nR2w6wRJ3Amu0tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFsDJ4lZvz9KM for ; Tue, 17 Feb 2026 20:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f1ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:48:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5a02f004fbac - main - sdt: Disable SDT probes in kernel modules for GCC on aarch64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a02f004fbacee9b2d59b59b11f8910e5736b89c Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:48:16 +0000 Message-Id: <6994d410.1f1ad.492b511f@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5a02f004fbacee9b2d59b59b11f8910e5736b89c commit 5a02f004fbacee9b2d59b59b11f8910e5736b89c Author: John Baldwin AuthorDate: 2026-02-17 20:48:04 +0000 Commit: John Baldwin CommitDate: 2026-02-17 20:48:04 +0000 sdt: Disable SDT probes in kernel modules for GCC on aarch64 For PIC code, the existing assembly constraints do compile on aarch64. Some kernel modules build ok using the 'p' constraint with the 'a' operand modifier, but not all. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55166 --- sys/sys/sdt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h index 0be4e9ba6240..26c60831f667 100644 --- a/sys/sys/sdt.h +++ b/sys/sys/sdt.h @@ -212,6 +212,12 @@ struct sdt_tracepoint { STAILQ_ENTRY(sdt_tracepoint) tracepoint_entry; }; +/* XXX: GCC is not able to compile probes in kernel modules for aarch64. */ +#if !defined(__clang__) && defined(KLD_MODULE) && defined(__aarch64__) +#undef __sdt_used +#define __sdt_used __unused +#define __SDT_PROBE(prov, mod, func, name, uniq, f, ...) +#else #define __SDT_PROBE(prov, mod, func, name, uniq, f, ...) do { \ __WEAK(__CONCAT(__start_set_, _SDT_TRACEPOINT_SET)); \ __WEAK(__CONCAT(__stop_set_, _SDT_TRACEPOINT_SET)); \ @@ -234,6 +240,7 @@ __sdt_probe##uniq:; \ f(_SDT_PROBE_NAME(prov, mod, func, name).id, __VA_ARGS__); \ } \ } while (0) +#endif #define _SDT_PROBE(prov, mod, func, name, uniq, f, ...) \ __SDT_PROBE(prov, mod, func, name, uniq, f, __VA_ARGS__) #define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \ From nobody Tue Feb 17 20:55:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFsNn61VNz6S4X0; Tue, 17 Feb 2026 20:55:37 +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 4fFsNn5BtQz41Dj; Tue, 17 Feb 2026 20:55:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361737; 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=Fov85U0CbhId9w4AxEtuNisCqtDvJqBapNfXbDQZccs=; b=w30aByfoGjC9xy06nrLQb9l8cBZ/HkK+QgID+HAXXtFIXu8+TC5Ihn5sMQE7JKkKiOi8Hk hMoTmRqiNq0oSFh29821wrFk/fIZNou7s4A+XffzRo4oEb930w+yS0YmlggET2rdubLj+f xzeva3Hnb5ggPAAnZqLBO5H7Wl3ErO+L8vh+cJ8qLAtdZIEfpApfPnPv/58/fcb8+op8pq Mqv7tLaVavZbSQXcnQt1nfx7mB+61+MLyhC4mm1dTrp1eL7tQN8txp5o3NIDAOTVERCw6X Xm0wjCpLjOPB54KjYPaKQmkM7td9GmM57Xwsiw1lEaqM0z6Nc+FAha3+8sSDaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771361737; a=rsa-sha256; cv=none; b=nnz3Eu+jW5/iR5DLF430n8EgzwYXw5q1d3f21twRxhkoE93JvgOZZ49w0wiSF+P2A1LR3b huAh8v9iskBraDnuolu4nZkrNE8BtMxuO5/LjTBmRkL0EB7x7RV0VnBfY4UQSZhAPMGSCe wkXSR22OA2YSGI3zQLnKmrpVWqJ6Gp/ovCw3O6wPMyLfZf9wyuipbOsFX3qKl1iF0mj3vs Kqdoq+JQq5ZwADMn7j4gXfY1B6pXExrDUNA/ia7wkRAgfObV+RSvmoteeHa64Bcch99q09 XqA0hFT3Xp/axFObpqtj80S8Lu0E7H6t26dveWZuXydnuCMQvYP9QTBAo8Qb9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771361737; 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=Fov85U0CbhId9w4AxEtuNisCqtDvJqBapNfXbDQZccs=; b=jlkx55TdHVLlMWngNdPnh/W0B9SZjgKt7BOKURh39teVdVHhcPhc83KJi5JOnyLB9pUQ9i dzzudNwAFDqrEHxss/KRAPUtgCCUmItMy5mQRAf1OAAR7/6Hov7wFGmSH/dgrVq1x7OEr3 mjc0EK0wjZC7XdH0Q0itl/Z8D4OiQeaZE9gNhTmRK3ukJleexw5cPDA9RQVxwPoykU/XsO 63Bj3a0nJhTXiby2FJJLFOpuuLtu+W+cB9COrLhjUuVp1EB4AccmD85rx/biao2SZnRZEC Mid8CthUszIBZ/b9mLvP2otcnk34XrMdzId27112Ub11iBRjgywMAd/m66VlvQ== Received: from [IPV6:2601:5c0:4202:5670:475:8f88:8099:d67] (unknown [IPv6:2601:5c0:4202:5670:475:8f88:8099:d67]) (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 4fFsNn2zg9z9KJ; Tue, 17 Feb 2026 20:55:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <9a743a8a-fbba-4a2b-89d4-5d6745a01516@FreeBSD.org> Date: Tue, 17 Feb 2026 15:55:36 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 97ce8f7d2b8e - main - amd64: define and use STACKALIGN and REDZONE_SZ Content-Language: en-US To: Konstantin Belousov Cc: "Enji Cooper (yaneurabeya)" , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <698a1ffe.26e3c.47182d66@gitrepo.freebsd.org> <1d35e758-ff0d-4fb3-9a4c-a0fc69182d41@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/17/26 15:01, Konstantin Belousov wrote: > On Tue, Feb 17, 2026 at 02:42:20PM -0500, John Baldwin wrote: >> On 2/16/26 21:44, Konstantin Belousov wrote: >>> On Mon, Feb 16, 2026 at 05:01:58PM -0800, Enji Cooper (yaneurabeya) wrote: >>>> >>>>> On Feb 9, 2026, at 9:57 AM, Konstantin Belousov wrote: >>>>> >>>>> The branch main has been updated by kib: >>>>> >>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 >>>>> >>>>> commit 97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 >>>>> Author: Konstantin Belousov >>>>> AuthorDate: 2026-02-07 00:36:44 +0000 >>>>> Commit: Konstantin Belousov >>>>> CommitDate: 2026-02-09 17:57:00 +0000 >>>>> >>>>> amd64: define and use STACKALIGN and REDZONE_SZ >>>>> >>>>> Reviewed by: brooks, emaste, jhb >>>>> Sponsored by: The FreeBSD Foundation >>>>> MFC after: 1 week >>>>> Differential revision: https://reviews.freebsd.org/D55151 >>>> >>>> Hi kib@! >>>> It looks like this broke the build with gcc12 on main: https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc14_build/2893/console . >>> >>> https://reviews.freebsd.org/D55319 >>> might be the fix. >> >> I have the same thing at https://reviews.freebsd.org/D55161 >> >> Per my comments there, I do think it might break 32-bit kernels, but we probably >> don't care about that. (Namely, if rounddown2() is used on a type larger than >> uintptr_t such as trunc_page on a vm_paddr_t on i386, this change truncates the >> value). >> >> If we really care, we could use _Generic or the like to only use the uintptr_t >> casts for pointer types. > > I must admit that I initially wrote the cast to uintmax_t, and only then > looked at the nearby code (__builtin_align_up() and others). Since > uintptr_t was good enough for them, I used it in the patch as well. I'm happy to just merge it as after my last batch of merges it is now the last patch needed to build aarch64 kernels with GCC. Userspace for aarch64 for GCC needs one more fix (though I think we want to fix it in the compiler rather than in src, GCC isn't passing -lgcc when linking shared libraries for some reason). -- John Baldwin From nobody Tue Feb 17 22:58:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFw731rqhz6SDhx for ; Tue, 17 Feb 2026 22:58: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 4fFw724gKkz4HvC for ; Tue, 17 Feb 2026 22:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771369134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDp7Z/bBLUqFbB/ZUTXRp/KSZSAi1v51xvdwzHln7yg=; b=CPXqJRtXphN/IcTcils6YNqit4UsBB/RFi/vT3DAEXBNxq77uQcY00LOSjRm9wu5vZkpA/ PkY/5qyoQwrc7N1w+mPvIUTpnE0/mrz1oyi6kn/RmUubW0YGOe2r8B+fkqbz3kqHDsmcKG 4GbjiBN6jMVR5E23KQDK6CIEaNDbqLHX5im2dng8ONr//IYqXZqV25YhyCKwtpmrWlzbWt Hv5vBSGCmaizHOdW3Zmu1qDq7DDDFe6enp1LKAGD4bAK09AdruoavsdLdOJzLnCwK+hwC/ QCqkJrdrTeFZxMScsCGuYT6OjS39jvtzGnN4bSG1s7IJOLATVz1+WLK7IBpCIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771369134; a=rsa-sha256; cv=none; b=yIjbYF8Lju4WCJ3RpJxjgEwmq/ZxTU98F8llTh4YP8VW/6vJlEXxk/KEllAkYePnjUvyjr 3hvwNv/qzIMQADFe5+p1ViHOmrjQhdG0ebN/ChfSh0FxyplhmRUOa7Hif6kETbMCqvFfJL JybMnASI7uTTEjYii45oCn4T83Ms2vsEQNWkjo0D8TGRkPvJiYMPD3tdPOTknVWMotXtFA mGIE3VPnQbPXeuyAWz81pMuFxuzoe/IIWCaBYG03vBlpywJ6ZgJFSpK+eSLPe4Dh4UICkr a81922fNyl28evuIbiIw+XW91yvslc0U7b8370ttaIJqVyQdV9D+si7JaI+nVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771369134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDp7Z/bBLUqFbB/ZUTXRp/KSZSAi1v51xvdwzHln7yg=; b=x1YMR7izJQjm2p1Db7PLFnarg+LzRS+iZoVQwlHINjqGQovvx7R2iOeWYIFtIWXAAFHZqy Oag9FQntXcDGvi/RUUTVAT0XiAN2aA5H6YmFDWw4DBsSXdVSl4p+WxLP7C00xtXjU1k+Rj rF7S+2nYqOCmW1CQM2Kv+JaOCbHVNqlVSW75nbckPcFfCaP9slXqW7Rux9UOXAeGQINNwP T1irrEItRTjbmbJFmKlaZEHo2bOWaG0F4RnAbu+nXc2w3kYHP/yTAfVKqGR31sW8y0h2xZ l5wp67HyW+gOrE+2vuRvH9RwduSjGiW5/oKa0jJm7+/0JsH/Huia3htlyqQfXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFw723hF9zTbJ for ; Tue, 17 Feb 2026 22:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36481 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 22:58:54 +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: f9f4a022a858 - main - ObsoleteFiles: Deduplicate List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9f4a022a8583763903771915eafcd064184766a Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 22:58:54 +0000 Message-Id: <6994f2ae.36481.1e5ea7fd@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f9f4a022a8583763903771915eafcd064184766a commit f9f4a022a8583763903771915eafcd064184766a Author: Dag-Erling Smørgrav AuthorDate: 2026-02-17 22:58:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 22:58:43 +0000 ObsoleteFiles: Deduplicate Since we dropped support for profile libraries, all optional entries for them are now non-optional. Most of them were already duplicated there, a few were not. MFC after: 3 days Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D55329 --- ObsoleteFiles.inc | 5 +++-- tools/build/mk/OptionalObsoleteFiles.inc | 38 -------------------------------- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a534ff1e4249..309ea6dfd92e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -103,11 +103,9 @@ OLD_FILES+=boot/firmware/iwm8000C OLD_LIBS+=lib/libuutil.so.2 OLD_FILES+=usr/lib/libuutil.a OLD_FILES+=usr/lib/libuutil.so -OLD_FILES+=usr/lib/libuutil_p.a OLD_LIBS+=lib/libtpool.so.2 OLD_LIBS+=usr/lib/libtpool.a OLD_LIBS+=usr/lib/libtpool.so -OLD_LIBS+=usr/lib/libtpool_p.a OLD_FILES+=usr/tests/cddl/lib/libtpool/libtpool_test OLD_FILES+=usr/tests/cddl/lib/libtpool/Kyuafile @@ -376,6 +374,8 @@ OLD_FILES+=usr/lib/libalias_skinny_p.a OLD_FILES+=usr/lib/libalias_smedia_p.a OLD_FILES+=usr/lib/libarchive_p.a OLD_FILES+=usr/lib/libasn1_p.a +OLD_FILES+=usr/lib/libatf-c++_p.a +OLD_FILES+=usr/lib/libatf-c_p.a OLD_FILES+=usr/lib/libavl_p.a OLD_FILES+=usr/lib/libbe_p.a OLD_FILES+=usr/lib/libbegemot_p.a @@ -384,6 +384,7 @@ OLD_FILES+=usr/lib/libbluetooth_p.a OLD_FILES+=usr/lib/libbsdxml_p.a OLD_FILES+=usr/lib/libbsm_p.a OLD_FILES+=usr/lib/libbsnmp_p.a +OLD_FILES+=usr/lib/libbsnmptools_p.a OLD_FILES+=usr/lib/libbz2_p.a OLD_FILES+=usr/lib/libc++_p.a OLD_FILES+=usr/lib/libc_p.a diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index aae83a44e53e..38faebeca63a 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -166,7 +166,6 @@ OLD_FILES+=etc/blocklistd.conf OLD_FILES+=etc/rc.d/blocklistd OLD_FILES+=usr/include/blocklist.h OLD_FILES+=usr/lib/libblocklist.a -OLD_FILES+=usr/lib/libblocklist_p.a OLD_FILES+=usr/lib/libblocklist.so OLD_LIBS+=usr/lib/libblocklist.so.0 OLD_FILES+=usr/libexec/blocklistd-helper @@ -185,7 +184,6 @@ OLD_FILES+=etc/blacklistd.conf OLD_FILES+=etc/rc.d/blacklistd OLD_FILES+=usr/include/blacklist.h OLD_FILES+=usr/lib/libblacklist.a -OLD_FILES+=usr/lib/libblacklist_p.a OLD_FILES+=usr/lib/libblacklist.so OLD_LIBS+=usr/lib/libblacklist.so.0 OLD_FILES+=usr/libexec/blacklistd-helper @@ -237,11 +235,9 @@ OLD_FILES+=usr/include/sdp.h OLD_FILES+=usr/lib/libbluetooth.a OLD_FILES+=usr/lib/libbluetooth.so OLD_LIBS+=usr/lib/libbluetooth.so.4 -OLD_FILES+=usr/lib/libbluetooth_p.a OLD_FILES+=usr/lib/libsdp.a OLD_FILES+=usr/lib/libsdp.so OLD_LIBS+=usr/lib/libsdp.so.4 -OLD_FILES+=usr/lib/libsdp_p.a OLD_FILES+=usr/sbin/ath3kfw OLD_FILES+=usr/sbin/bcmfw OLD_FILES+=usr/sbin/bluetooth-config @@ -480,11 +476,9 @@ OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a OLD_FILES+=usr/lib/libbsnmp.so OLD_LIBS+=usr/lib/libbsnmp.so.7 -OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a OLD_FILES+=usr/lib/libbsnmptools.so OLD_LIBS+=usr/lib/libbsnmptools.so.0 -OLD_FILES+=usr/lib/libbsnmptools_p.a OLD_FILES+=usr/lib/snmp_bridge.so OLD_LIBS+=usr/lib/snmp_bridge.so.6 OLD_FILES+=usr/lib/snmp_hast.so @@ -1417,7 +1411,6 @@ OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h OLD_FILES+=usr/include/cuse.h OLD_FILES+=usr/lib/libcuse.a OLD_LIBS+=usr/lib/libcuse.so.1 -OLD_FILES+=usr/lib/libcuse_p.a OLD_FILES+=usr/share/man/man3/cuse.3.gz OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number.3.gz OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number_by_id.3.gz @@ -1474,11 +1467,9 @@ OLD_FILES+=usr/bin/dpv OLD_FILES+=usr/lib/libdialog.a OLD_FILES+=usr/lib/libdialog.so OLD_LIBS+=usr/lib/libdialog.so.10 -OLD_FILES+=usr/lib/libdialog_p.a OLD_FILES+=usr/lib/libdpv.a OLD_FILES+=usr/lib/libdpv.so OLD_LIBS+=usr/lib/libdpv.so.3 -OLD_FILES+=usr/lib/libdpv_p.a OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz @@ -1532,10 +1523,8 @@ OLD_FILES+=usr/lib/dtrace/udplite.d OLD_FILES+=usr/lib/dtrace/unistd.d OLD_FILES+=usr/lib/libctf.a OLD_FILES+=usr/lib/libctf.so -OLD_FILES+=usr/lib/libctf_p.a OLD_FILES+=usr/lib/libdtrace.a OLD_FILES+=usr/lib/libdtrace.so -OLD_FILES+=usr/lib/libdtrace_p.a OLD_LIBS+=lib/libdtrace.so.2 OLD_FILES+=usr/libexec/dwatch/chmod OLD_FILES+=usr/libexec/dwatch/errno @@ -2195,19 +2184,15 @@ OLD_FILES+=usr/include/private/gtest/internal/gtest-port.h OLD_FILES+=usr/include/private/gtest/internal/gtest-string.h OLD_FILES+=usr/include/private/gtest/internal/gtest-type-util.h OLD_FILES+=usr/lib/libprivategmock.a -OLD_FILES+=usr/lib/libprivategmock_p.a OLD_LIBS+=usr/lib/libprivategmock.so OLD_LIBS+=usr/lib/libprivategmock.so.0 OLD_FILES+=usr/lib/libprivategmock_main.a -OLD_FILES+=usr/lib/libprivategmock_main_p.a OLD_LIBS+=usr/lib/libprivategmock_main.so OLD_LIBS+=usr/lib/libprivategmock_main.so.0 OLD_FILES+=usr/lib/libprivategtest.a -OLD_FILES+=usr/lib/libprivategtest_p.a OLD_LIBS+=usr/lib/libprivategtest.so OLD_LIBS+=usr/lib/libprivategtest.so.0 OLD_FILES+=usr/lib/libprivategtest_main.a -OLD_FILES+=usr/lib/libprivategtest_main_p.a OLD_LIBS+=usr/lib/libprivategtest_main.so OLD_LIBS+=usr/lib/libprivategtest_main.so.0 OLD_FILES+=usr/tests/lib/googletest/Kyuafile @@ -2284,7 +2269,6 @@ OLD_FILES+=usr/include/libgpio.h OLD_FILES+=usr/lib/libgpio.a OLD_FILES+=usr/lib/libgpio.so OLD_LIBS+=usr/lib/libgpio.so.0 -OLD_FILES+=usr/lib/libgpio_p.a OLD_FILES+=usr/sbin/gpioctl OLD_FILES+=usr/share/man/man3/gpio.3.gz OLD_FILES+=usr/share/man/man3/gpio_close.3.gz @@ -3829,7 +3813,6 @@ OLD_LIBS+=usr/lib/libverto.so.122 OLD_FILES+=usr/lib/libprivateldns.a OLD_FILES+=usr/lib/libprivateldns.so OLD_LIBS+=usr/lib/libprivateldns.so.5 -OLD_FILES+=usr/lib/libprivateldns_p.a .endif .if ${MK_LDNS_UTILS} == no @@ -5747,7 +5730,6 @@ OLD_FILES+=usr/include/netgraph.h OLD_FILES+=usr/lib/libnetgraph.a OLD_FILES+=usr/lib/libnetgraph.so OLD_LIBS+=usr/lib/libnetgraph.so.4 -OLD_FILES+=usr/lib/libnetgraph_p.a OLD_FILES+=usr/libexec/pppoed OLD_FILES+=usr/sbin/flowctl OLD_FILES+=usr/sbin/lmcconfig @@ -5813,7 +5795,6 @@ OLD_FILES+=usr/include/ypclnt.h OLD_FILES+=usr/lib/libypclnt.a OLD_FILES+=usr/lib/libypclnt.so OLD_LIBS+=usr/lib/libypclnt.so.4 -OLD_FILES+=usr/lib/libypclnt_p.a OLD_FILES+=usr/libexec/mknetid OLD_FILES+=usr/libexec/yppwupdate OLD_FILES+=usr/libexec/ypxfr @@ -6840,7 +6821,6 @@ OLD_LIBS+=usr/lib/pam_ssh.so.6 OLD_FILES+=usr/lib/libprivatessh.a OLD_FILES+=usr/lib/libprivatessh.so OLD_LIBS+=usr/lib/libprivatessh.so.5 -OLD_FILES+=usr/lib/libprivatessh_p.a OLD_FILES+=usr/libexec/sftp-server OLD_FILES+=usr/libexec/ssh-keysign OLD_FILES+=usr/libexec/ssh-pkcs11-helper @@ -6980,18 +6960,15 @@ OLD_FILES+=usr/include/libpmcstat.h OLD_FILES+=usr/lib/libipt.a OLD_FILES+=usr/lib/libipt.so OLD_LIBS+=lib/libipt.so.0 -OLD_FILES+=usr/lib/libipt_p.a .endif .if ${TARGET_ARCH} == "aarch64" OLD_FILES+=usr/lib/libopencsd.a OLD_FILES+=usr/lib/libopencsd.so OLD_LIBS+=lib/libopencsd.so.0 -OLD_FILES+=usr/lib/libopencsd_p.a .endif OLD_FILES+=usr/lib/libpmc.a OLD_FILES+=usr/lib/libpmc.so OLD_LIBS+=usr/lib/libpmc.so.5 -OLD_FILES+=usr/lib/libpmc_p.a OLD_FILES+=usr/sbin/pmc OLD_FILES+=usr/sbin/pmcannotate OLD_FILES+=usr/sbin/pmccontrol @@ -7094,7 +7071,6 @@ OLD_FILES+=usr/share/man/man8/repquota.8.gz OLD_FILES+=usr/lib/libradius.a OLD_FILES+=usr/lib/libradius.so OLD_LIBS+=usr/lib/libradius.so.4 -OLD_FILES+=usr/lib/libradius_p.a OLD_FILES+=usr/lib/pam_radius.so OLD_LIBS+=usr/lib/pam_radius.so.6 OLD_FILES+=usr/include/radlib.h @@ -7180,7 +7156,6 @@ OLD_DIRS+=usr/include/libmilter OLD_FILES+=usr/lib/libmilter.a OLD_FILES+=usr/lib/libmilter.so OLD_LIBS+=usr/lib/libmilter.so.5 -OLD_FILES+=usr/lib/libmilter_p.a OLD_FILES+=usr/libexec/mail.local OLD_FILES+=usr/libexec/sendmail/sendmail OLD_FILES+=usr/libexec/smrsh @@ -7732,11 +7707,9 @@ OLD_FILES+=usr/lib/libatf-c++.a OLD_FILES+=usr/lib/libatf-c++.so OLD_LIBS+=usr/lib/libatf-c++.so.1 OLD_LIBS+=usr/lib/libatf-c++.so.2 -OLD_FILES+=usr/lib/libatf-c++_p.a OLD_FILES+=usr/lib/libatf-c.a OLD_FILES+=usr/lib/libatf-c.so OLD_LIBS+=usr/lib/libatf-c.so.1 -OLD_FILES+=usr/lib/libatf-c_p.a OLD_LIBS+=usr/lib/libprivateatf-c.so.0 OLD_LIBS+=usr/lib/libprivateatf-c++.so.1 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc @@ -8206,11 +8179,9 @@ OLD_FILES+=usr/include/atf-c++/macros.hpp OLD_FILES+=usr/include/atf-c++/tests.hpp OLD_FILES+=usr/include/atf-c++/utils.hpp OLD_FILES+=usr/include/atf-c++.hpp -OLD_FILES+=usr/lib/libatf-c_p.a OLD_FILES+=usr/lib/libatf-c.so.1 OLD_FILES+=usr/lib/libatf-c.so OLD_FILES+=usr/lib/libatf-c++.a -OLD_FILES+=usr/lib/libatf-c++_p.a OLD_FILES+=usr/lib/libatf-c++.so.1 OLD_FILES+=usr/lib/libatf-c++.so OLD_FILES+=usr/lib/libatf-c.a @@ -8780,7 +8751,6 @@ OLD_FILES+=etc/unbound OLD_FILES+=usr/lib/libprivateunbound.a OLD_FILES+=usr/lib/libprivateunbound.so OLD_LIBS+=usr/lib/libprivateunbound.so.5 -OLD_FILES+=usr/lib/libprivateunbound_p.a OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz @@ -8808,11 +8778,9 @@ OLD_FILES+=usr/include/usbhid.h OLD_FILES+=usr/lib/libusb.a OLD_FILES+=usr/lib/libusb.so OLD_LIBS+=usr/lib/libusb.so.3 -OLD_FILES+=usr/lib/libusb_p.a OLD_FILES+=usr/lib/libusbhid.a OLD_FILES+=usr/lib/libusbhid.so OLD_LIBS+=usr/lib/libusbhid.so.4 -OLD_FILES+=usr/lib/libusbhid_p.a OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc @@ -9271,24 +9239,18 @@ OLD_FILES+=usr/bin/zinject OLD_FILES+=usr/bin/zstreamdump OLD_FILES+=usr/bin/ztest OLD_FILES+=usr/lib/libbe.a -OLD_FILES+=usr/lib/libbe_p.a OLD_FILES+=usr/lib/libbe.so OLD_LIBS+=lib/libbe.so.1 OLD_FILES+=usr/lib/libavl.a OLD_FILES+=usr/lib/libavl.so -OLD_FILES+=usr/lib/libavl_p.a OLD_FILES+=usr/lib/libnvpair.a OLD_FILES+=usr/lib/libnvpair.so -OLD_FILES+=usr/lib/libnvpair_p.a OLD_FILES+=usr/lib/libumem.a OLD_FILES+=usr/lib/libumem.so -OLD_FILES+=usr/lib/libumem_p.a OLD_FILES+=usr/lib/libzfs.a OLD_FILES+=usr/lib/libzfs.so OLD_FILES+=usr/lib/libzfs_core.a OLD_FILES+=usr/lib/libzfs_core.so -OLD_FILES+=usr/lib/libzfs_core_p.a -OLD_FILES+=usr/lib/libzfs_p.a OLD_FILES+=usr/lib/libzpool.a OLD_FILES+=usr/lib/libzpool.so OLD_LIBS+=usr/lib/libzpool.so.2 From nobody Tue Feb 17 22:58:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFw741qL5z6SDl4 for ; Tue, 17 Feb 2026 22:58: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 4fFw734jmwz4J5F for ; Tue, 17 Feb 2026 22:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771369135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+iD1ZVMKrJ5fuVMj681H2CZ9I+YSkBOec15fW54Lkk=; b=hrrjsECkes2JujfZmHzBav17JEy+1ZTgw4PmxXv89JzAG4AJRBvBo/0dS2kgN53XH3aQsV BPB7FfNtu4ODzoGyD8v4aBddFcaPiH8+U9Iu+32A9MmksolKXPjhclxn7pPtzQgymOMFyu xWAWy1dZQeeRyOlcaF1vrDVjW2AI7i2T4Np5mqHtE7uqKldI72nIWfoRTjZ3Go5rvQRqWP dLE+jAGMwZL8vupx/NUSNy/sEcJV0e7J3L9gTnj3QG8wngY5+/J5x4XNLpr+AVSLP1Iox2 FJQA9dwA5eR2fe91j71LYaZBY5QC1CcBBe5hUV9YXj9ZlcTu/idYovK0orbNFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771369135; a=rsa-sha256; cv=none; b=o6Kk01K0KMt4CJlTt1H52LaJ7rURTCbur/1YdtkmcWZyStvChpQgbA0muSL2rrZetGDvwb xn0kNViOoBfAM3WTrTQ+Cdvny/8rNOn1Q0R6rzhnWiVl4LwJtaYzQiJPsYb7n4f5qSri7r +RGunxJg6ayBmIbIIo3IxYv4jlgfmu9vlx+TqHYo0u+K9R9eWtYNR60jPHnPR6TOPhYGRl NtEJvaVOupRnZ1MOFPuK/Wzm5px2u/EHbJYauVO1G8BG6E/bSTv8ZcxBhneRMZH2hTsXDp 3hoOSy1TOypEr0NHisVkyRylFsWqQl0BKD9FJVEIX8VHfyjYc24sRbO2UNNZJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771369135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+iD1ZVMKrJ5fuVMj681H2CZ9I+YSkBOec15fW54Lkk=; b=t2S7ZJzyAKX575watEQTNuXYhCwcOyxwq+p2OjKH7wqOjp0OSUUBNOyV6LEwS9tRh1xuUU Yzo3S4AYkdaCgnipHUA2kwbRp4/CmWIacRfLOEx9o5XPJkoWVO94vhsCJg6LV+OV2Eq7ol ZI/FAoGVqe4io/CRLZMAKUczDQ/Z02HBAaIxdvhYJm3pfkBOWswZTXOXE8Ui07lguiZPsu FxLXQwjb+TCzDByGYL1f4PY1vIklTxaSE+bTKuAEPcMu/mBCS7Xeuo4CEos7liHUDKqoNh cXphNmKk2PfCMqxYXc68Ae0b4CWe2GmU5yyLEi9zhb8dMRjRQmeUHaQJCU5uBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFw7340gjzTpj for ; Tue, 17 Feb 2026 22:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 335d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 22:58:55 +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: bc6c827078b7 - main - OptionalObsoleteFiles: Add figpar to dialog section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc6c827078b7ab62271ce7ac1c4439b82fd2f98c Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 22:58:55 +0000 Message-Id: <6994f2af.335d1.10109cec@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bc6c827078b7ab62271ce7ac1c4439b82fd2f98c commit bc6c827078b7ab62271ce7ac1c4439b82fd2f98c Author: Dag-Erling Smørgrav AuthorDate: 2026-02-17 22:58:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 22:58:43 +0000 OptionalObsoleteFiles: Add figpar to dialog section MFC after: 3 days Fixes: 15d781b53233 ("lib: Gate libfigpar under MK_DIALOG") Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D55330 --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 38faebeca63a..045abde55ffa 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1470,10 +1470,14 @@ OLD_LIBS+=usr/lib/libdialog.so.10 OLD_FILES+=usr/lib/libdpv.a OLD_FILES+=usr/lib/libdpv.so OLD_LIBS+=usr/lib/libdpv.so.3 +OLD_FILES+=usr/lib/libfigpar.a +OLD_FILES+=usr/lib/libfigpar.so +OLD_LIBS+=usr/lib/libfigpar.so.0 OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz +OLD_FILES+=usr/share/man/man3/figpar.3.gz .endif .if ${MK_DICT} == no From nobody Tue Feb 17 23:01:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fFwB017GSz6SDsl for ; Tue, 17 Feb 2026 23:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFwB005b7z4JhM for ; Tue, 17 Feb 2026 23:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771369288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3i72Z3Ho+Yorp3x3mTumkVdrEH6zZUEL2ziVXJjyU0=; b=lAwknvT7zUJpgi3MOc8a5U/EOjZntaKF0GjMKZAsPVgQNtMLvSLTgun76bbDsji1lgO/1/ 3sKzczRNH7retLc8CLte4E+WF3tDUwEuHyupNiOoTF+HnnYvT9OmZ3DW+b4nSTn7mVX3CM emd/lEJoRNG2aoiHnMTYLmpHwXUnSrCOBlDFxHQ4XQ6+zZMI730FszeDK0BPlgpkgvr4DY 8EVJbx5ud+sT97AqWxvjiYhUdaXYP/GVlHiX0MPHNIn3s2iFZyK7mpSeDsRUTGgpz5qVID Y/oBYDrIVBsECzAnUW0BJMqkptD8GEY92eoMNu0o4+BtMqCpW/Y4AJMPvies/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771369288; a=rsa-sha256; cv=none; b=m9EMBxM0m0aAhfCwbL44/+WH4RPphC5pqzGWzrI8aT0cGrRRmGaswqfDVxTAwoNVOd/m7e afiwbvqCa8SG69yGrfTDYm2p8Q/MzQdKaClug+kUBDiHyg/qAoWqUCGgCb1iqbPe1nw9eb Efu/NrsPXEfy+nKNYEo4V42U01pTU24ABi43lF18Oj0km9IeQpqLPZm9ZUXxBs5y7PHZZE gB0nUzbWDye0GzoKqqKY/Z5iOQLkecUzcocfvtQr/w3nGFbjodu6L4ld6Q/GNKOF5PuLuZ rMsXYJmR2zV4yxqktZ2fYmriqcFUbF1dk80Fx0sOZ6a4XjgF4OxKrYmxN4+qZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771369288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3i72Z3Ho+Yorp3x3mTumkVdrEH6zZUEL2ziVXJjyU0=; b=KWkOQqsauV+kmEEqCzKS5c26s1znBtaKxb7UahJYzbzj9g6qApUBClPON8R6O23qaEigIf eRlCLVGOUvq/P0ljrzXiDPCWbzAKBt+rd0KblDN0orcdYxv4t9ZFM5aijRyKiX9AZWdchQ 5UuN40lbkPdGBiDiYpkhYuy06KdKq1/JMJodKueLRSdUm3VqlfjH5Gc9DLuJJv6l9Tr+Md wdSjn26nTXWj84owsWdyADL9I6sKMUje4XjHPYfkehx2oB3ha2qV2aKvbt02rgreoITb1w rysa7NsAjYrzUxkLu4mCecTM3ZMJ8qFYGvZBLytl2pxjgg1R/a+NbY0iHZFvLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFw9z6lGyzTbS for ; Tue, 17 Feb 2026 23:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34832 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 23:01:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 935cf3284f52 - main - vfs_mount.c: Don't call VFS_MOUNT() if only exports are being updated List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 935cf3284f520c90a63baaadb762caaa30084f5c Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 23:01:27 +0000 Message-Id: <6994f347.34832.52d33fe@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=935cf3284f520c90a63baaadb762caaa30084f5c commit 935cf3284f520c90a63baaadb762caaa30084f5c Author: Rick Macklem AuthorDate: 2026-02-17 22:57:42 +0000 Commit: Rick Macklem CommitDate: 2026-02-17 22:59:57 +0000 vfs_mount.c: Don't call VFS_MOUNT() if only exports are being updated PR#293198 reports a hang within ZFS when exports are being updated concurrently with a VOP_SETEXTATTR(). The hang appears to be caused by mishandling of the z_teardown_lock, but fixing handling of this lock appears to be a major effort. Since the hang occurs when VFS_MOUNT() acquires a write/exclusive z_teardown_lock, which rarely occurs, except when exports are being updated, this patch avoids the VFS_MOUNT() call for this case. Avoiding a VFS_MOUNT() call fixes the hang for the case reported by PR#293198 and is also an optimization. As such, this patch avoids the VFS_MOUNT() call when only exports are being updated similar to what was already being done within vnet prisons. PR: 293198 Reviewed by: kib, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55318 --- sys/kern/vfs_mount.c | 52 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 2237fcc6b423..383ccf98c10e 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -74,7 +74,7 @@ #define VFS_MOUNTARG_SIZE_MAX (1024 * 64) static int vfs_domount(struct thread *td, const char *fstype, char *fspath, - uint64_t fsflags, bool jail_export, + uint64_t fsflags, bool only_export, bool jail_export, struct vfsoptlist **optlist); static void free_mntarg(struct mntarg *ma); @@ -806,7 +806,7 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) struct vfsopt *opt, *tmp_opt; char *fstype, *fspath, *errmsg; int error, fstypelen, fspathlen, errmsg_len, errmsg_pos; - bool autoro, has_nonexport, jail_export; + bool autoro, has_nonexport, only_export, jail_export; errmsg = fspath = NULL; errmsg_len = fspathlen = 0; @@ -861,12 +861,11 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) * when we want to update the root filesystem. */ has_nonexport = false; - jail_export = false; + only_export = false; TAILQ_FOREACH_SAFE(opt, optlist, link, tmp_opt) { int do_freeopt = 0; - if (jailed(td->td_ucred) && - strcmp(opt->name, "export") != 0 && + if (strcmp(opt->name, "export") != 0 && strcmp(opt->name, "update") != 0 && strcmp(opt->name, "fstype") != 0 && strcmp(opt->name, "fspath") != 0 && @@ -957,7 +956,7 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) fsflags |= MNT_UNION; else if (strcmp(opt->name, "export") == 0) { fsflags |= MNT_EXPORTED; - jail_export = true; + only_export = true; } else if (strcmp(opt->name, "automounted") == 0) { fsflags |= MNT_AUTOMOUNTED; do_freeopt = 1; @@ -989,14 +988,22 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) } /* - * If has_nonexport is true or the caller is not running within a - * vnet prison that can run mountd(8), set jail_export false. + * only_export is set to true only if exports are being + * updated and nothing else is being updated. + */ + if (has_nonexport) + only_export = false; + /* + * If only_export is true and the caller is running within a + * vnet prison that can run mountd(8), set jail_export true. */ - if (has_nonexport || !jailed(td->td_ucred) || - !prison_check_nfsd(td->td_ucred)) - jail_export = false; + jail_export = false; + if (only_export && jailed(td->td_ucred) && + prison_check_nfsd(td->td_ucred)) + jail_export = true; - error = vfs_domount(td, fstype, fspath, fsflags, jail_export, &optlist); + error = vfs_domount(td, fstype, fspath, fsflags, only_export, + jail_export, &optlist); if (error == ENODEV) { error = EINVAL; if (errmsg != NULL) @@ -1014,8 +1021,8 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) printf("%s: R/W mount failed, possibly R/O media," " trying R/O mount\n", __func__); fsflags |= MNT_RDONLY; - error = vfs_domount(td, fstype, fspath, fsflags, jail_export, - &optlist); + error = vfs_domount(td, fstype, fspath, fsflags, only_export, + jail_export, &optlist); } bail: /* copyout the errmsg */ @@ -1307,6 +1314,7 @@ vfs_domount_update( struct thread *td, /* Calling thread. */ struct vnode *vp, /* Mount point vnode. */ uint64_t fsflags, /* Flags common to all filesystems. */ + bool only_export, /* Got export option. */ bool jail_export, /* Got export option in vnet prison. */ struct vfsoptlist **optlist /* Options local to the filesystem. */ ) @@ -1442,15 +1450,16 @@ vfs_domount_update( * get. No freeing of cn_pnbuf. */ /* + * When only updating mount exports, VFS_MOUNT() does not need to + * be called, as indicated by only_export being set true. * For the case of mountd(8) doing exports from within a vnet jail, * "from" is typically not set correctly such that VFS_MOUNT() will - * return ENOENT. It is not obvious that VFS_MOUNT() ever needs to be - * called when mountd is doing exports, but this check only applies to - * the specific case where it is running inside a vnet jail, to - * avoid any POLA violation. + * return ENOENT. For ZFS, there is a locking bug which can result in + * deadlock if VFS_MOUNT() is called when extended attributes are + * being updated. */ error = 0; - if (!jail_export) + if (!only_export) error = VFS_MOUNT(mp); export_error = 0; @@ -1590,6 +1599,7 @@ vfs_domount( const char *fstype, /* Filesystem type. */ char *fspath, /* Mount path. */ uint64_t fsflags, /* Flags common to all filesystems. */ + bool only_export, /* Got export option. */ bool jail_export, /* Got export option in vnet prison. */ struct vfsoptlist **optlist /* Options local to the filesystem. */ ) @@ -1693,8 +1703,8 @@ vfs_domount( } free(pathbuf, M_TEMP); } else - error = vfs_domount_update(td, vp, fsflags, jail_export, - optlist); + error = vfs_domount_update(td, vp, fsflags, only_export, + jail_export, optlist); out: NDFREE_PNBUF(&nd); From nobody Wed Feb 18 07:56:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fG82p3DdMz6QTH3 for ; Wed, 18 Feb 2026 07:56: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 4fG82p1pjWz443b for ; Wed, 18 Feb 2026 07:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZsWjlJZO2APFeqalUzWyZDAMVX52VHtdgZgmlSVSZb0=; b=lCDy51aGgEkNQz0/HUOHQUAg00T0oepb5wUZOrQDt1gCOG2cSlIQCnpUnaIa9KqdJLG80S twtiwwuR+i8IXbrJbQqMtZBRT6EmLOKi0KoLmu36C5IpuF1wxQR/XC6h7j002o5bFTZoq5 GzfX+EFN4A0Zz/xcthbT16CR3uT924JzkrXdVScFFhYJBDQlPkEDf2QUwFQsxPFcf7gdqG efi8z3tpzpauF6h41R1BbeTBRXR5Baibz2IHKGU9KXiMLVpVGYMZ9z1RTgxLqk6p+jHsEk LmAHz9eB3JxQO+Sp1uwA6qIR/4I/55dQYPc1HbZLR6nVcEHxYMUysSr3onrldg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771401362; a=rsa-sha256; cv=none; b=ZN2+dy3GraCl8AK7fUlYR/M8h8JveTzYAHjwxRgmUBM7HpJVioZgqRKhsDINWPpuFFAALT Wgk7AJdN3tf8RLttqWkqvg9c4Pey3vNb9/VUqliCp0QzV/X48qmIV2gnNcWDBK8wUDEaXo iVFGFOXP7heFhHz2QDknkmspMyZtCfKuohp5hn/SW1EE+iMI5EOYRGVSHnjoVWO3gIr5hI tWxi/vsfJb9d9W34ILINpl44Z8HS5oRlGrs64wY2GH1W2v8HPaC4njKXQvEHGmCaO2IwfW C1BpuhnCABeMO2jfABi14rQB3tJhUAgPIg/bYfyWj/djFonK5Rh5zRNlS9cOOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZsWjlJZO2APFeqalUzWyZDAMVX52VHtdgZgmlSVSZb0=; b=DTgnJStab4BrtxAp9LabzjsOxpIY+SUIFKvU5cdB9UfhMM1iJpkZ5khWWj/DOPpTTN5NoH Ot5pAfaAqa1rjjqn6oVVeG4tiPfIBncb1v92X5rjEdllnHFiSSZivxhymcRknPtsy29Jl0 gFEMJddY1X+mVThuKj+5tbVLJim/AOtv8MRr/JV55fjeBjcp5KfZhNaWkavbdWXFrnx3mf 6i1Ksf2gYQnZmGvtOXP47i8AiBvONBTneX0+HRzlzg+4hX1a2auGEEXgUn/4dri/jr9S61 UixYW950egBUw0DG0+/qgzAFWY7HRU6c1SqXkzQceseG1PJdoKQxp2984F4kbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG82p1Mnyznfp for ; Wed, 18 Feb 2026 07:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 07:56:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1443a455a96e - main - libc: improve include usage for exterror sources List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1443a455a96e587a7b49608def79495e9d74513f Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 07:56:02 +0000 Message-Id: <69957092.44d25.2fa62a0d@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1443a455a96e587a7b49608def79495e9d74513f commit 1443a455a96e587a7b49608def79495e9d74513f Author: Konstantin Belousov AuthorDate: 2026-02-17 20:56:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-18 07:54:01 +0000 libc: improve include usage for exterror sources Include sys/types.h by exterr.h, since size_t is used. Drop include of sys/exterr_cat.h, it is useless for the only prototype provided. Reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55337 --- include/exterr.h | 3 +-- lib/libc/gen/uexterr_format.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/exterr.h b/include/exterr.h index c0273d72ce03..43f1efaef34a 100644 --- a/include/exterr.h +++ b/include/exterr.h @@ -11,8 +11,7 @@ #ifndef _EXTERR_H_ #define _EXTERR_H_ -#include -#include +#include __BEGIN_DECLS int uexterr_gettext(char *buf, size_t bufsz); diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 8d3b458ca9f2..c1974f3c361a 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include From nobody Wed Feb 18 07:56:01 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fG82n4rRvz6QSrN for ; Wed, 18 Feb 2026 07:56: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 4fG82n1pSsz443Z for ; Wed, 18 Feb 2026 07:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A2C2407/hLbWIafmatIO12NJeWiLu1Hsy4Cwfo1uiNc=; b=DvDcVEJ+OKLPou2NlwvYClIlhDMlkQYgNXyATGD+r0uQ0DiooQRyq6mZGVc0LO6/eT4YvQ 0CuPdBPoOIbYoo9ixR4jEc5AWqdZ3IjwUI6ozg4RBNe8a8fiPxKrL6NU+duh6xGm/KhOwT Lf3UbBFXL/VnbCX/middQUSCqBP4/Ova7TampHORlIncWyRXGNtuQBLnBg1O13iwQwxKnq 25jooqLm2B/wb91sEsm+Bhbg/qZPWkRIN5mkfP7FH1lvxAs3ktapy2K1UJ4czKeBbbMY/0 3uKI+j0yyW5Vdt9X7cWNoJiZKTB3PWA10pknk087pKmIu9A7GK++QxH2W2IhwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771401361; a=rsa-sha256; cv=none; b=o09U0mpMxBh92aNBlT0kSXIGd4rlr8eFHP3eoyBRPa1z8k/mQS1YWyAiWnYdtDFEJbXEzn gwKoeHYSR2/lhLtPCVezcVakp7Pb23yZFPuKidktlFPlpHkDcIHMPRy9V3Tim9KDMUfW89 DJJD+Ap5SnX8MKA5pLnsCFF6b3SbAue6WU1opZET3f3MpD54ZTmX+EZ1YbE3ulRCNk5jpb 5aqgjePMCGHp7/ZlLxs8mYADaySV/f0covYraCewZud6S7E9x0dnNRz6Loe3f3vpd6lEXv QXppsF5VyoslxIZRQ/LzDl1TByfoAr+mFDBupcvkdwzjJpfCxJSgDvhM5QepKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771401361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A2C2407/hLbWIafmatIO12NJeWiLu1Hsy4Cwfo1uiNc=; b=jFmjY5L/onDeabKbpQESbVYDxnXXNgTGGhgvs4nJoB0zWoiL9bkh9kEy9kvkzbTRG/kkO7 oge2tKsEx9DeKrR3OT9NTBQa2SJs4XrhYKX2PT9W06SqrHkrH6Diq/8uNT2E+d3mPAL89r Qp/7Z9aZFtH/GXURXwwcC2g9z/chXNg9VKbX1PeEL0y+EFuAXANienz4306xLNeJjwnUAr IBvU4H7uiopwaqZR7+0DLjWU6WWgsU8sPNkn/vCaoAUtp/BIn+95MG1YWc6oZllmqCOff1 opG5+k+wONbItWcUgwsRwwMrtgTMD8Wy4Be3yY0MU7V+STYXJtLLWY3mt1Ylow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG82n0bWSznfn for ; Wed, 18 Feb 2026 07:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4464b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 07:56:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a03f285afafa - main - libc: add man page for uexterr_gettext(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a03f285afafae243396c9bc7892cbe717a3ac37d Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 07:56:01 +0000 Message-Id: <69957091.4464b.108e08b5@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a03f285afafae243396c9bc7892cbe717a3ac37d commit a03f285afafae243396c9bc7892cbe717a3ac37d Author: Konstantin Belousov AuthorDate: 2026-02-17 20:46:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-18 07:54:01 +0000 libc: add man page for uexterr_gettext(3) Reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D55336 --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/uexterr_gettext.3 | 71 ++++++++++++++++++++++++++++++++++++++++++ share/man/man9/exterror.9 | 3 +- 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 3e68f8400c5c..28e55f58ccf3 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -323,6 +323,7 @@ MAN+= alarm.3 \ ttyname.3 \ ualarm.3 \ ucontext.3 \ + uexterr_gettext.3 \ ulimit.3 \ uname.3 \ unvis.3 \ diff --git a/lib/libc/gen/uexterr_gettext.3 b/lib/libc/gen/uexterr_gettext.3 new file mode 100644 index 000000000000..576fe49d0c37 --- /dev/null +++ b/lib/libc/gen/uexterr_gettext.3 @@ -0,0 +1,71 @@ +.\" Copyright 2026 The FreeBSD Foundation +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" This documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" +.Dd Feburary 17, 2026 +.Dt UEXTERR_GETTEXT +.Os +.Sh NAME +.Nm uexterr_gettext +.Nd "get string representation of the current extended error" +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In exterr.h +.Ft int +.Fo uexterr_gettext +.Fa "char *buffer" +.Fa "size_t buffer_size" +.Fc +.Sh DESCRIPTION +The +.Nm +function fills the buffer pointed to by the +.Fa buffer +pointer with the formatted extended null-terminated +error string, as reported by the +last error from a system call, which returned an extended error. +The capacity of the passed buffer is +.Va buffer_size +bytes. +.Pp +Normally, applications should use the +.Xr err 3 +family of functions to display errors from system calls. +If this is not convenient or even not possible, +for instance for applications with an advanced user interface, the +.Nm +function can be used to fetch the string with the extended error. +.Pp +Note that most parts of the extended errors are directly provided by +the kernel, and as such cannot be localized. +.Pp +See +.Xr exterror 9 +for the description of the extended error facilities. +.Sh RETURN VALUES +The +.Fn +function returns zero. +There are currently no errors defined for the function, +which might change in future. +.Pp +If any error condition is added, it will be reported by returning \-1 +and setting +.Va errno +to the corresponding value. +.Sh SEE ALSO +.Xr errno 3 , +.Xr err 3 , +.Xr exterror 9 +.Sh STANDARDS +The +.Nm +is a +.Fx +extension that first appeared in +.Fx 15.0 . diff --git a/share/man/man9/exterror.9 b/share/man/man9/exterror.9 index a7c7a11d1315..47ffda065d43 100644 --- a/share/man/man9/exterror.9 +++ b/share/man/man9/exterror.9 @@ -221,7 +221,8 @@ They pass from the failed request back to the thread that create the request. .Sh SEE ALSO .Xr errno 3 , -.Xr err 3 +.Xr err 3 , +.Xr uexterr_gettext 3 .Sh HISTORY The .Nm From nobody Wed Feb 18 08:13:32 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fG8R06kR0z6QVXR for ; Wed, 18 Feb 2026 08:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fG8R03hjjz46dB for ; Wed, 18 Feb 2026 08:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771402412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5r41uEBdfqcuCzJUl/2W0iTKduy/YuxESgcBAPl9ZSk=; b=wad51e4IUSrrJdC04Igj5rKzo9VS5mzNunavnCn+awYIWoQceT8J8+WQGHxPxrXtGnpY3s Xp3YAQymAzTyM5HGCmi7Oy9+D8ES3fb47vkDuvz0zQPE4cL1X/DcSre5+66SwuoEDsYnKO 6VmnWZ7/p//Y4o2Rzq0e81gauIThm4jA3906BdVG7q+kTkqJ1CMoF/rWSVs3wxjbCpn2Gf LXiTBnl1QRtJ5cS9dJlpKWPPJCpyL8tZvIPraZtcHqnpuSnR4Fa2GHp5/ZbIsNhWcz/B7L ibiFo3Ua8rm40qo3LktHfVi4vR+flB8Af7h1hDPZhHbIe+R6HhunNRmS5uj3dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771402412; a=rsa-sha256; cv=none; b=hRUYmy8Kh4u7pEo0ISpSxexxwNBqZPYUA6+UCIqku+Ted3/Ou5YbICqBjR5IkNxwn3Mucb QgGI/MEzJV1mCgG7SHrbNlBt7nrsqDgkIVxXlGGwQhSb07rKFhkCoSKoYoQ6X+HFo2V6ca tVdCMmu2osUQbW5hIf0CKuEIoTMp6Tu+pJR5cnw9e8f8cb/Wb2ECcOThArX7OEzB5YoFkJ cOvwx/xjx9UetuqkJQSYJ+x83nxhV8MgphAgvJwnbp1bXwFf7oQzbduV+C2kEWsiNYMzBO 3wWqK60ROJ6X6egTS9fPkBYMYp+8Wt0m3ynvKEbInTj84aSWq/Pvk21KbxXguQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771402412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5r41uEBdfqcuCzJUl/2W0iTKduy/YuxESgcBAPl9ZSk=; b=jSrTnnLNkVrUau2PrCBc5V8JZ1FWK6UJVt4+vLOO84HojRqU8y7xbdpbI4ZWyJV8djz5vu pdc0gtbXpfvK8CbkycAeoKm/ut8YfyUSUieHe0trQ/NlUkUHnXALjKBjHyvfRh7OS+7g+M +UAKOJJPoyQIBnhMMOPD58eH/bFXu5kHjHX0lot9KYShvDdzrSdYV8LxwHipSUMEBu/Gh5 eNV3aJNAGP6N+s7F97w+KRmrqlm3hCDpUmhA3kKITPg656cwNmwRpJfROxSOF6r9jcg2tq NZcHUI0UqEhoEEGzqXPHwYL3JCUzSF0EX7hmD2rAf5692x1+q6dNN8JsAI9FnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG8R03B9JznV8 for ; Wed, 18 Feb 2026 08:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46368 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 08:13:32 +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: efcfba9b31ad - main - OptionalObsoleteFiles: Add missing figpar MLINKS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efcfba9b31ad11ec901085c38b79e40289b9e7bc Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 08:13:32 +0000 Message-Id: <699574ac.46368.4adc430a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=efcfba9b31ad11ec901085c38b79e40289b9e7bc commit efcfba9b31ad11ec901085c38b79e40289b9e7bc Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 08:12:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 08:13:28 +0000 OptionalObsoleteFiles: Add missing figpar MLINKS MFC after: 3 days Fixes: bc6c827078b7 ("OptionalObsoleteFiles: Add figpar to dialog section") --- tools/build/mk/OptionalObsoleteFiles.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 045abde55ffa..eb949ec50773 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1478,6 +1478,13 @@ OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz OLD_FILES+=usr/share/man/man3/figpar.3.gz +OLD_FILES+=usr/share/man/man3/get_config_option.3.gz +OLD_FILES+=usr/share/man/man3/parse_config.3.gz +OLD_FILES+=usr/share/man/man3/replaceall.3.gz +OLD_FILES+=usr/share/man/man3/strcount.3.gz +OLD_FILES+=usr/share/man/man3/strexpand.3.gz +OLD_FILES+=usr/share/man/man3/strexpandnl.3.gz +OLD_FILES+=usr/share/man/man3/strtolower.3.gz .endif .if ${MK_DICT} == no From nobody Wed Feb 18 08:46:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fG99q6zBGz6RmwB; Wed, 18 Feb 2026 08:47:11 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fG99q4m82z3CRg; Wed, 18 Feb 2026 08:47:11 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfhigh.phl.internal (Postfix) with ESMTP id DB5A81400144; Wed, 18 Feb 2026 03:47:10 -0500 (EST) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Wed, 18 Feb 2026 03:47:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1771404430; x=1771490830; bh=PtIZkZY1qzADglw5Y4Ibo8SSOoH2uLg9geqEvH9pMLE=; b= iLHvrHMbizzscp5Jc3L++sZxanuhG5lBQ1ZxSMFnzXBxQdMEhrQTdcjkl89PeKkC OTeysEobgv471m9ebKoifYtChR0s26QoReuTE0iWk5yMweb648g3egtXtJrsIsS8 FjENzRr/IvSrL5BAcLDJyyrQUe3/1kDP1Fi2GkNjBCIRK7FBTt8aHdpKQ6UyhCYo oyFTn7hJztVrNSoVqMK4CYxyKxNnz1f+dDAEOizqJtj+0CZXonwot2nxgGrxPnHP kvDNynqAWC2aag6h8V3CedCib3nPgpcMTDkbPRs7Syo6v4PRF5WidrqfJUtspin3 xDqJgTyi/xYNdnsu7qkKcw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1771404430; x= 1771490830; bh=PtIZkZY1qzADglw5Y4Ibo8SSOoH2uLg9geqEvH9pMLE=; b=t uMuYTszM2k/M+Ge8bD+5BS/Onj/jEinUqZhG9zZ8VruPkbsi/nfma+p99wy4CwM+ p0ctqbmA5hXMPiI9SMweVuo4u88+fpOv4rUt8/pdUDuZv++IVBNUtb1tqXmdmDad cHbdkbdvkwLmA6ren+G8N8A7KYp/MrhGYGegUUaGyf+2o+VZwS8y78CQWs3pH5UK qQpodEhmV0ELRUFQTrsEvBG1jdn7m8Opnt2ml8Doy9xFl3osxyT6pjw9SIWnqed6 /psZ/5WOGHYww2B98Eht4J029MRvQhjNq8CT4hcZQ2ciL9J2GpPAt52g33tXMukD XE7rS7ZMiAmOHkwjZ8pcA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddvvddvvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpeffkffhvfevufgjfhgfgggtgfesthhqre dttderudenucfhrhhomhepfdfjvghrsggvrhhtucflrdcuufhkuhhhrhgrfdcuoehhvghr sggvrhhtsehgohhjihhrrgdrrghtqeenucggtffrrghtthgvrhhnpefhteefkeffheeuue ejudeuudeivdduiedtffehleekgeevkedvkeevheefjeeffeenucffohhmrghinhepfhhr vggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehhvghrsggvrhhtsehgohhjihhrrgdrrghtpdhnsggprhgtphhtthhopeeg pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeguvghssehfrhgvvggsshgurdhorh hgpdhrtghpthhtohepshhrtgdqtghomhhmihhtthgvrhhssehfrhgvvggsshgurdhorhhg pdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqrghllhesfhhrvggvsghsug drohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqdhmrghinhesfhhr vggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 18 Feb 2026 03:47:09 -0500 (EST) Date: Wed, 18 Feb 2026 09:46:00 +0100 Message-ID: <87wm0ao2wn.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: efcfba9b31ad - main - OptionalObsoleteFiles: Add missing figpar MLINKS In-Reply-To: <699574ac.46368.4adc430a@gitrepo.freebsd.org> References: <699574ac.46368.4adc430a@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:151847, ipnet:103.168.172.0/24, country:AU] X-Rspamd-Queue-Id: 4fG99q4m82z3CRg X-Spamd-Bar: ---- On Wed, 18 Feb 2026 09:13:32 +0100, Dag-Erling=3D?utf-8?Q? Sm=3DC3=3DB8rg?= =3Drav wrote: >=20 > The branch main has been updated by des: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Defcfba9b31ad11ec901085c38b= 79e40289b9e7bc >=20 > commit efcfba9b31ad11ec901085c38b79e40289b9e7bc > Author: Dag-Erling Sm=F8rgrav > AuthorDate: 2026-02-18 08:12:26 +0000 > Commit: Dag-Erling Sm=F8rgrav > CommitDate: 2026-02-18 08:13:28 +0000 >=20 > OptionalObsoleteFiles: Add missing figpar MLINKS > =20 > MFC after: 3 days > Fixes: bc6c827078b7 ("OptionalObsoleteFiles: Add figpar to d= ialog section") > --- > tools/build/mk/OptionalObsoleteFiles.inc | 7 +++++++ > 1 file changed, 7 insertions(+) >=20 > diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/Op= tionalObsoleteFiles.inc > index 045abde55ffa..eb949ec50773 100644 > --- a/tools/build/mk/OptionalObsoleteFiles.inc > +++ b/tools/build/mk/OptionalObsoleteFiles.inc > @@ -1478,6 +1478,13 @@ OLD_FILES+=3Dusr/share/man/man1/dpv.1.gz > OLD_FILES+=3Dusr/share/man/man3/dialog.3.gz > OLD_FILES+=3Dusr/share/man/man3/dpv.3.gz > OLD_FILES+=3Dusr/share/man/man3/figpar.3.gz > +OLD_FILES+=3Dusr/share/man/man3/get_config_option.3.gz > +OLD_FILES+=3Dusr/share/man/man3/parse_config.3.gz > +OLD_FILES+=3Dusr/share/man/man3/replaceall.3.gz > +OLD_FILES+=3Dusr/share/man/man3/strcount.3.gz > +OLD_FILES+=3Dusr/share/man/man3/strexpand.3.gz > +OLD_FILES+=3Dusr/share/man/man3/strexpandnl.3.gz > +OLD_FILES+=3Dusr/share/man/man3/strtolower.3.gz > .endif > =20 > .if ${MK_DICT} =3D=3D no Unrelated to commit 15d781b53233 I think the following is still missing: OLD_FILES+=3Dusr/share/man/man3/dpv_free.3.gz https://lists.freebsd.org/archives/dev-commits-src-all/2026-February/068295= .html From nobody Wed Feb 18 09:41:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGBN43Cppz6RrcK for ; Wed, 18 Feb 2026 09:41: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 4fGBN42N07z3HK1 for ; Wed, 18 Feb 2026 09:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771407668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tq5BN+agT5vEnoyu7e8eUVpqS8PISlL/a5MjuHCk+0A=; b=agpBwW8YeFn4kYdYPqv5d7piYLgrX1fweQhE+4ewSRkpdbz20zhOvg/rVLTlF6iVfH7mg9 M2yqW4F2+o+HnYhrPdG77k+l0Q9HehrZXnFWaTKhlyxgXjTmZcfMTDs76KdiUYfFfsEy5j M0yNQQYAr4hsJFdryfLy0weho3U62TcjhlFdMMIMQeDEg/kD85TQ7NsUuSYk/WxE3HL9SM lVEtZ2D0xnvWHFEGUmODew1fMzUq+3kDqCC5cFdQMFFR1QsglObQTch4GtpNG4/NVUUUOG hwHieJWz+joA3ZQ0I7FFK8ZcUnCtIXWzYcx9QS4Cvbt+6JLxxNRSaQxly86ctA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771407668; a=rsa-sha256; cv=none; b=esqUrbAXl+QuS4WWIpmllQeS1yW8NcxTVapRF08RTV7/MHyVJshqOINOs6QPePezXeoKSx pS6NODST+KRXD3GfWjVrh9Wh7oTVHo8D7JYq99pT550u0SPNSw76ccVsxIl83OZcQmNqWi vXp4He2kMbC3wgpMbHvh8Djm/2H97EpR5CSqlPxE4Mh0tCR5nWod6KwIG2NvikKB2rcRKq Bx0Ei/YDj433HbF3cUc8H8YLJEj79lMHdgcP/fakcCzibCEOXz0xHW/dixIikm8Og6c+aO XPpAeLQdLXvc4dowC9MrZZm0MZF+ISzMNKpniLsb94OCzvLXbHMrEk8lqBL3Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771407668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tq5BN+agT5vEnoyu7e8eUVpqS8PISlL/a5MjuHCk+0A=; b=PSaZx7ftToxBO+HujxSbpEyzWgY6o0kEXPzEhCd0479dmYPe4WoCpbzE7TXBQK1Fx1qkUF cNnVhk7kA6Oh8JqsjOlfLyJODIQmfoR4aUF+0R39XljTfwQUuvDhFU3820+HTV5K4e4sur 9URlBPbnKnjulH+ziF47wqWqs4ehNdR1PtdW8WDOzN73lm+5gpmhWM1Rvwgplrt2QCoXb5 GhivmMWspn9ZBTF1LQ9VHS22555w2cF4Ku04imp8ux2QNyw1V13taxQ9MO38oy1joQnOHK /wm1kA4Iq96C3yBfARnbCZj2ljirtQsvo2+adPbl4fsPsJreCU4GfWLT2fRnow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGBN41zn8zrMh for ; Wed, 18 Feb 2026 09:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21605 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 09:41:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: e387d9438ba0 - main - smp: Use bitwise operation to count cpu number List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e387d9438ba0258b88ebe03ef139bc6fd70b5a46 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 09:41:08 +0000 Message-Id: <69958934.21605.2d0ec77a@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=e387d9438ba0258b88ebe03ef139bc6fd70b5a46 commit e387d9438ba0258b88ebe03ef139bc6fd70b5a46 Author: ShengYi Hung AuthorDate: 2026-01-03 16:32:50 +0000 Commit: ShengYi Hung CommitDate: 2026-02-18 09:40:54 +0000 smp: Use bitwise operation to count cpu number Previously, we iterated over all CPUs using CPU_FOREACH and checked individual bits to count valid CPUs. Refactor this to use a bitwise AND and popcount to count the number of enabled bits directly. Approved by: markj (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54474 --- sys/kern/subr_smp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 2256ba648e4d..148b366e7435 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -588,7 +588,7 @@ smp_rendezvous_cpus(cpuset_t map, void (* teardown_func)(void *), void *arg) { - int curcpumap, i, ncpus = 0; + int curcpumap, ncpus = 0; /* See comments in the !SMP case. */ if (!smp_started) { @@ -609,10 +609,8 @@ smp_rendezvous_cpus(cpuset_t map, */ MPASS(curthread->td_md.md_spinlock_count == 0); - CPU_FOREACH(i) { - if (CPU_ISSET(i, &map)) - ncpus++; - } + CPU_AND(&map, &map, &all_cpus); + ncpus = CPU_COUNT(&map); if (ncpus == 0) panic("ncpus is 0 with non-zero map"); From nobody Wed Feb 18 10:05:32 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGBwG0Jc0z6Rtpg; Wed, 18 Feb 2026 10:05:34 +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 4fGBwF5tnfz3LD8; Wed, 18 Feb 2026 10:05:33 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771409133; 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=2hn0b2OZb1K/VFfrxkWHQIuwHRH0lwcojU2NLP+1TlA=; b=Ov0rfxnOkMfxa3y+F/FcbCSi7lTQPMZsCnCMP7j9U/WwFTJDyW/7XnJ4h3z9BFO18avlws tbG7Wq/xXxagJ58jTtZy0up678w9Oi6CX2RzK9DxDcw1Hg/kPhP9oRPMaiS67HtBymQ8Aq 07D1KZXCn1UGbHEiyTFKZ0sCifWE0foD2FJ9sIPuZj4Sf0edNPdTDFAngmL2jAqyKBnBWF d4HqvjbjdmXCuuP2yIV1gk8tP8e3/xKnHc3WLJpxxIgFmnpq1wJaKP9PcbbqadWQOUGD/y oPVNo73yqK57R/9hLQbKe0eIfFdmYiTZvRBu73vrgIxR2+yc7Rpf0h7aOALyIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771409133; a=rsa-sha256; cv=none; b=JJRvYArma2uz64TIJCBOJrtlT2UZN0D6y7nr1LYtM2Z66bbj91qcVGywpl/TnFJsGhiltP sl/RyO+vKYRZBdXyF++S1I/nym8rlmweJScgrMc2QGNmQIFE4RCViXbhnIkwm16IRgcPoE Hi1ZvcKJFNKe7B/0AepBGVY1daS8SQay5y4wY6+14IaS3RM/+LgtYSDHE1G5SUS7T6JFvK JJNHijGV02yV11hTRyY3FzgaLbcUficS5yNqqi7UF7At6LKxoG8NbKaYEMqPjE7Nq1PHxK MzjKjzazJWuL3NuysrhIBIcOYiAgxWVpP0nOk7Q3JNa2KhN4+OHLZiHpVEV2aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771409133; 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=2hn0b2OZb1K/VFfrxkWHQIuwHRH0lwcojU2NLP+1TlA=; b=E5ilG2oIkeXhvONj94NS1WDvzTBzoBETzd0dmCYDO8CVDY/4LBUEdTBSnSfnSJCIrblMuF VF5ufnzHtVSCICJ81ZIEyywYSAgJN17M1Z7mhLOVk7h8U7WLQyiiPuLb7DV9hD7tSG/nAQ pQlqy3uRiACyUB9949oTouLph2Z7/zezVcC3QyrLb862p/bq7WEk0z22441+n64+KSFymr aAJ27xtfEcG6boXTdJ+5jMvtsdh6WGvBBfixvUbJPGelh8zLJp3YM5hxNzIoym4m98kzbV MlMYlD1cBlhujXTGBsYLl3jru4cJyrcZIGZ7xKeFhZccU/+a22KKHDBABC3x8A== 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 4fGBwF4WcBzZP5; Wed, 18 Feb 2026 10:05:33 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 0E42B7544E; Wed, 18 Feb 2026 11:05:32 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Herbert J. Skuhra" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: efcfba9b31ad - main - OptionalObsoleteFiles: Add missing figpar MLINKS In-Reply-To: <87wm0ao2wn.wl-herbert@gojira.at> (Herbert J. Skuhra's message of "Wed, 18 Feb 2026 09:46:00 +0100") References: <699574ac.46368.4adc430a@gitrepo.freebsd.org> <87wm0ao2wn.wl-herbert@gojira.at> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 18 Feb 2026 11:05:32 +0100 Message-ID: <86pl62z7rn.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "Herbert J. Skuhra" writes: > Unrelated to commit 15d781b53233 I think the following is still > missing: Maybe next time try not speaking in riddles? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Feb 18 10:08:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGBzH0GXpz6Rtyq for ; Wed, 18 Feb 2026 10:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGBzG52zQz3LWQ for ; Wed, 18 Feb 2026 10:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771409290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nLBM4vkD91qwV0YzdQLI6vyDSHSsPs9wLGakkaaIX9w=; b=BNLBgyPt0jorNHb+6jquJVjfVRktrnpAjrXYd9rAnBqyMLtK8RJEWKsecHndfwJ4HhD5JI AV7LaTdhR6esB7ppsrwLj308zruulDfD1JCNC3THO/RZeCJqrou8iDWx9o+K3nuHqURCWI 8hRKYpgVp6Kj97SwRF68SJyxZwVSiII7iQBlppIv3H03xUViQgE8/2RYZBgButEt/M9tVU JTv0eswMbItmxrdwusaA8wNQ0xtRH6SeITbHCZCm0sRnHYK7CMQY/oqSca1Ni8//Q8Hak8 GtvQB/kygB5+29bme/RyW8gCXh0yWv9AVNBNgQDBRgEHxCCf/xhIJZOOkf5g2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771409290; a=rsa-sha256; cv=none; b=A9ymu863UetQ2EAevCkr+D1GgwATDPENPVpRQWlGSBQZy0iDQwRyA847oxZP31BsRn+kZx S1mjbBs84gqU8WkZuvO+DugE3RilR3f7d8h7DaFEQ+Pkxi1DSMx7F+Xqvklij6C4ZCprvO 3pI+xMeAwI8iYoTka9LrAddLWzFdAVL/fugJt3PvToqVpSVk4pgPOQvBd3qvtLukEnBnVn 2tfQQ4ixHkTF4bIprCwPDHXlRqS94C2fhOd+1EsRSoA5FwIbz0RojVoaxMLEv986KQgdZd vtYKVd86SBVk55OJiVavQRWrNdA6LsL8jIiH6CSMxL1nVR/vO4MZ+BW4FAZINA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771409290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nLBM4vkD91qwV0YzdQLI6vyDSHSsPs9wLGakkaaIX9w=; b=ZAQgqgg4SdlnDP0PGVNUsY4s6I0IsF6NxdthFUa2p09I/cQY7GzM8ajWOCR/wT8h6V49ph 0GjVitbr6SvdWURArkHAPZkpcyd6e6blVkpNw9NVLIUdynprvT42pJW071zZYlae0f4GCh bULLEN5vPCO7JepZdxiry3QRA5Xifo0ZIFOs/BZH/sc5zBlfJUCyc18GkF4VAJy2MMNCUN 77myRl4N2DtDct9feh+2DtZE8nX5BAn16EvWQ5Y09T0k8MV/+GmtiI1bYGmIv4Ta+a78gk EcxD/7XjG9PU42Tb5dT9yX36rB424yvuqpeln7TIUE2AH+eb8m1tnt5ChrwN1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGBzG3r0Pzrmp for ; Wed, 18 Feb 2026 10:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2380a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 10:08:10 +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: 32ec8e29a6c3 - main - OptionalObsoleteFiles: Add missing dpv MLINK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32ec8e29a6c3025a864f85678db63a8568c8fc86 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 10:08:10 +0000 Message-Id: <69958f8a.2380a.39650ce3@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=32ec8e29a6c3025a864f85678db63a8568c8fc86 commit 32ec8e29a6c3025a864f85678db63a8568c8fc86 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 10:06:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 10:06:50 +0000 OptionalObsoleteFiles: Add missing dpv MLINK MFC after: 3 days --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index eb949ec50773..a30ede4c1866 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1477,6 +1477,7 @@ OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz +OLD_FILES+=usr/share/man/man3/dpv_free.3.gz OLD_FILES+=usr/share/man/man3/figpar.3.gz OLD_FILES+=usr/share/man/man3/get_config_option.3.gz OLD_FILES+=usr/share/man/man3/parse_config.3.gz From nobody Wed Feb 18 13:55:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1N1QlXz6SD1d for ; Wed, 18 Feb 2026 13:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGJ1M6WPlz3lv9 for ; Wed, 18 Feb 2026 13:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422919; 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=jVWofGrrehmOwKvopT1tGkF+mIOsWh7Owmhvo1B1tpA=; b=CFn0G0X5R1dzawrkoXTcDrMlumxbd8WNlpzYbE/zmchaJrwJpLJiaQyKp1newJ73lnFutg Yd8ORrJoTWrh6fZcLyRDAidep0br6MBm55WypcxIJTL19W1EGgsnq1YMDvgT2S+vqFzQ4A LFoHhMTUtSFF+tNF5oTB1b+cJUCn81YNZJDuQXJyLWGUUf0Ccl+wWOL6sTNjyd79ZljMLe 15uGgxWX2u9uzshMGJ32f1XruDCcSRFA5mYxh0drhaOCVXJrCqBM0fc5YPB4vXbZQgM/NM 80F2rGoWf5cGRmKjwTS+NIFrBL/mM1DJAPDWTa913D1nGqe9j/VgyIgAhkQePw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771422919; a=rsa-sha256; cv=none; b=ETNjaPShU3pbB7vemxAAd6GQvFS9dbQQ/cn0mR8PdMnPaxsdcPb+87E7H7oHDy1hVIcqbq WBfxYmtltMQNnoNI6TM+igx3HInGcPnCW/LFu+xqyeWDneAt2RxhusctTa1vUsqkX4nFRe zkGP5QhcKTHkLNRMEBrJFt0Nh3dVZ0Y0Y6OpLk6/PpYKwBlgtB31R6wxPt9liPlTefAJUq 27mhrKLkR4DEk+u1JvkCBdAuiMb6KW1+FNmaCzVI9OGU1YEPH9fzAQm0y7zKCGl8a8UNrl hX00wkdmG4zE+f7kOw5X6Wq5b3qH6+tCvD6u67jDt4tXaGqesyQigztA5/8z+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=1771422919; 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=jVWofGrrehmOwKvopT1tGkF+mIOsWh7Owmhvo1B1tpA=; b=Auh3WQXChFU9Z56YRseW0PXHmPB9DjauMxzWQmiD/gP+Qc/+9FBCmIf9vKfCwgh2cfUTFG Y4rOkF+yRZ2Vz07eHvNMJF+vnFoywGnc+0y4IP/NPBsLcLZQmN9bvyn34FO+IvMSJdt7cw 55FRdNXCw+WPmfAY0CzE+G9I6zNj0ZOrewoQhZ7chk7ln7fLwuwz6RkbYBf+D0R6T75pwK 2aLsRJYjfp4rhLDqkfxwTbLRZYxcWbQZ8EF6gxAQQI1MitiRk8rQtxEgezy1m2kyL9G9kO di25+FhhX6seJdRUy6mb5+Fx+0Diyc2pK+wQtOCkt0cxqniMljCOfV2O5LvGXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1M50Lvzyd8 for ; Wed, 18 Feb 2026 13:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 13:55:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 25ed5ee654a8 - main - camcontrol: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25ed5ee654a8cd7d9f694307c62bb84ff4d16866 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 13:55:19 +0000 Message-Id: <6995c4c7.19d34.6ed55700@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=25ed5ee654a8cd7d9f694307c62bb84ff4d16866 commit 25ed5ee654a8cd7d9f694307c62bb84ff4d16866 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:12:25 +0000 Commit: Ed Maste CommitDate: 2026-02-18 13:43:39 +0000 camcontrol: Add SPDX-License-Identifier tag Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55269 --- sbin/camcontrol/camcontrol.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 15a5d42a2ba5..c2deafbd81da 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 Wed Feb 18 13:55:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1P120Dz6SCY4 for ; Wed, 18 Feb 2026 13:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGJ1N5Q6mz3lmV for ; Wed, 18 Feb 2026 13:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422920; 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=MyZZHdslidZM+h2+RiLxFfJZnM0HFtyliL8jnQwgLu4=; b=Yl1SicFtT+w3qT3sMcYFxlBZeqs+hXw6wdaUPWAACGMsHOGMEyIHWEemqZyeelCy7N9IzO MK6wrJ6S1ocr9ZrgsKwfXxutSU9kPs5h1t9AxPf8N4o7YF+HFg0AwWW3KtK8o9TINtSpx/ ManyiXrPcP0u12oSW3nb9eweeUUs4V8qD/9GeRRkyRKC53HO+E+T9bscLYT3EacfttIe80 29NuxZyhYPwjIuDL8Y01EOa07hq3AyHMRaXCqu938QHxkUKlh3RKdwvdAW7zVvl2LjQfBx LuhdljCHyzV972jB1f14cUaN/Y4Bj2jwx+NyF8fJvF0nGStR0f5fEjXJLi60VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771422920; a=rsa-sha256; cv=none; b=Ad2+HoewZgkO9h28Ib0zL06jZDeU1VrZSqQqhsgnYwaz+i5Xs7b4gvLMQoLtOoU4C9IMAo 3vKkQGe2oWxE+qRDn4FH4xpI9htdOeVuHzl5nWx+MGzB7N1HNlUjUnJIHbWZmbRZKFhlK3 MBT/E8UYq25dj2YVSjSenAnkbHWKYDMTPvcctZpivQqSOaB17ZawD+NZt35QFzVTYu3id5 SYKzSm8VL8UUH9BEpewFgTR4yVbVqO6a3b9nN5ZryiDMqkwz35DYvVZiTW3FDUhnv+E5yP CAf3R4wu3GOdDSsYJw5tSShAG5Mb/q+iwpmcDoplk4aQxs4isRUzLIoq7vukcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422920; 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=MyZZHdslidZM+h2+RiLxFfJZnM0HFtyliL8jnQwgLu4=; b=r08IcZhiSHdE6x+Vl5NJluP12zsMm4JewsJNPXttedeImqc63N031UQgNlRHZLS+GZnwpo Bc5o/34UnonjJP8DvHN4YZhTd2B26ow5mTvoUHn0eB6CwdZ3xy3C+G1nX7bM/7T61LyB+S HRIpxOlK5adMQleaaKytPm015W8cOFFg5gBPFs6Na/2ks2nQi2Gns62wwC6EP7JUnme9fJ sb6QaRK84vTlNUMdsm9pTckW29c6vdyEc3acS6ENaFBljgj2l3caJ3kPTHNEt9JCY1QTgO skMrlXtvgyBeyYaAwncoeGKrGsrAaWav6NZKEyQKLgF5IKpQubKwQUL6Ij/4jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1N50rszynm for ; Wed, 18 Feb 2026 13:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c06e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 13:55:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 8ac992645850 - main - newfs_msdos: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ac992645850318d8b2cf93b083372b99b6374e1 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 13:55:20 +0000 Message-Id: <6995c4c8.1c06e.e793edc@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ac992645850318d8b2cf93b083372b99b6374e1 commit 8ac992645850318d8b2cf93b083372b99b6374e1 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:20:05 +0000 Commit: Ed Maste CommitDate: 2026-02-18 13:43:58 +0000 newfs_msdos: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55274 --- sbin/newfs_msdos/mkfs_msdos.c | 2 ++ sbin/newfs_msdos/mkfs_msdos.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index a570d92cd17b..21b0785fb6ea 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1998 Robert Nordier * All rights reserved. * diff --git a/sbin/newfs_msdos/mkfs_msdos.h b/sbin/newfs_msdos/mkfs_msdos.h index 6e5bad0da8f0..e1f46f4d74cf 100644 --- a/sbin/newfs_msdos/mkfs_msdos.h +++ b/sbin/newfs_msdos/mkfs_msdos.h @@ -1,6 +1,8 @@ /* $NetBSD: mkfs_msdos.h,v 1.3 2015/10/16 17:38:17 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * From nobody Wed Feb 18 13:55:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1Q0GQLz6SCY5 for ; Wed, 18 Feb 2026 13:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGJ1P6KTMz3lpk for ; Wed, 18 Feb 2026 13:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422921; 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=PDAAtwTxlmOa57PWyuCkbU6z112rsLUD4em0VKs5SB8=; b=M30O6v13xHonSHk9vzoRKUM+dBiI2TvtJIZyeLWPrvDhfWzuO1dh6re1ViwDzx6pkYpE7R kt7KWqNBWuqlAlH4ear61uyUCSNqCd8AB27wbCjsoc/GHtyuQ8qJ7BqMJaA82BIOdyil+x Egkm1EA38AJQPvwfna1OyXfcbiL6hXHIgbQ42VLyAfEDG2o1JwqVaxhCC0DOCep2KGL2Cm S6mlB3Wqgks2h21Tiqk+kP1suu5HfO2v//hHZ8sUMyPi2Iqt1dGzx1XkNhHnxXlnKmtmmD 8uXNPdE1EgRyoC0W/tZ9yGKk0yF4WNT4jH31s3UyWQLbccZv3w5dJtqfC8sg7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771422921; a=rsa-sha256; cv=none; b=bbynHPcQg71sXlTPr5gekzQ+fnx2TGE5SCylGDg/lOkh8nyhy95AOsIAXf+gi5dcQ6576m wmdDt4glt5iXIqFDs0WSeMdCv/J+eW6iK3jJv3YA1mzYBypP2r2L4cThiPP8hHu4ZhUpbO u3ytjAMO5qy8n8IeI1OOl2xy7/si0I/5e0ZDS/EfEfQhNZqX5RQCr8KDagYo1lmhahzuSK KjXVEJleJ1UDNQeLmd5uaBLrkWFbTv34dLLUCuvmdVE9JErGI/tizXWlKbNpykdH2UVmZP lH8XIfJSYrS7cAqp+f/Pg+qDghffoPCQLg/v5dYMh97q8d0ZZvPWJTIdyzLBtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422921; 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=PDAAtwTxlmOa57PWyuCkbU6z112rsLUD4em0VKs5SB8=; b=ywjtDVGgsx8nSeurMWBaaZPoMqBwbkXoWABYXuuG7tCeZZ/aumvF6tTQO1d6lWj7r94/t0 c/WL1poqiW06Uo1nManiRmLu4Kc7ZZ0LRBEJDAyyxdYPYDjI6fL0TvbycH+LiLL8Pq4MdS g7d3qFLVVy9R/PCKY9gaBYlhAogFHT5WLrGHdbaEfEDDpDGV1BmxyrPD1EwyprlW4iFpTR rLz0QInlVwHOdptB5I6RoW/YbidDQaTSxJzNKhUVKvl1P7aFsFfz+L56YTFqimjgy/oYCu gmrS7MWL8kc7yWoOxmGnZQFnop0Vu+ccz4YiqHT5IN5tdfZVRyGsTQTHpzb5tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1P5vYGzynp for ; Wed, 18 Feb 2026 13:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bced by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 13:55:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 299d3e944a15 - main - decryptcore: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 299d3e944a15cbffc8ed16a49869e1eaec1fb493 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 13:55:21 +0000 Message-Id: <6995c4c9.1bced.3fddc7a1@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=299d3e944a15cbffc8ed16a49869e1eaec1fb493 commit 299d3e944a15cbffc8ed16a49869e1eaec1fb493 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:14:10 +0000 Commit: Ed Maste CommitDate: 2026-02-18 13:46:07 +0000 decryptcore: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55270 --- sbin/decryptcore/decryptcore.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/decryptcore/decryptcore.c b/sbin/decryptcore/decryptcore.c index 1e7cf4070e51..c35f7660bb33 100644 --- a/sbin/decryptcore/decryptcore.c +++ b/sbin/decryptcore/decryptcore.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Konrad Witaszczyk * All rights reserved. * From nobody Wed Feb 18 13:55:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1R374bz6SDFH for ; Wed, 18 Feb 2026 13:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGJ1Q6wyvz3m0g for ; Wed, 18 Feb 2026 13:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422923; 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=Ld0dIPpbsQETP/UWeXcYSYQ+6QUcQbThEZ+aVHJ0lRM=; b=M2E8afWa6ZJDECmLQiLSg3qktDITuxDt2L5erCA5DdY+YIo/LLKREqQ1gtKQHhrqcGSZEa 2j0uEkr1E1Rwfa1C9qDO53/RbIkSMgWPUMYq+xUoJbKHUFqhDJ6dHMNV1Y0wDQBPEUhbIT Xxdlgo9/zAJuaajPDl7TWq76Hy/6mW34I80aNgzoiat1Ni9kH7MxTMIoOws1aS3eBoWRfp ZwoC3QRwNqt3uPNW+CES6VRIRr01SENlbMnNfseyxo4tgPs32nUsaImKs2eTrqgIAZx/63 ciiriXAMmf828wPfce12/TfKZDEvoEYzsjxom1pRCU2qU0ekAyT4GFFIe1yTyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771422923; a=rsa-sha256; cv=none; b=msocgLCakwmiy27nsvAEP6WH91s9cIUFjVJ6awmdnOEr2m3kbjJk0eGJpLSx9ZksBkxiC5 nRWZLlMUEOPI4mftBKb7+3NgVGPe30ftD1eZoDOcKLUmiPWjv/WpxGJxk8GgUDGnU7Eyd0 UalEKiCHpkUr+0Nxjzi8ijhTEFkPXn++pEI756NX/enw1mq0HaLOp5QqsM/A6qjgZcLC5G +hYV2hfA4k755WsfbQ8Ixj9sXHaR+fLsrgblQOAin5JHofLlOXhfFcryZ+Cq0X4LL6NJC+ 832EL0SycUsA4CogjxFlM+Z9P/EKl2jenN0tsuEDcF0x47BCUfkg38u9THlrdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422923; 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=Ld0dIPpbsQETP/UWeXcYSYQ+6QUcQbThEZ+aVHJ0lRM=; b=R2B5T46fLoCvu68KeTiJID+GOT6fdMk0slT0lavkGvAt/D+3XxpYNF+JDu+OCIBRhu24b7 f0i6+HRkb3h4X8zghGUWt6Cwcw+6/7YD7uakVIEa/bVlXz9a7HGYKwaEYSGHqK1EGxZ2YJ GqPxX8ahgfiUWW/9t4BJW07u7tC36kNLnduJTw9dN7IM8PAQ5RycDSfM/Lj7+pMH8VvLcV G5kY2fIb47UD9nph2V1u0aQSNc7BkSgWCjXtwIkfhJysWxP950f8nb3G75Fw2BI27CE/Ju y+TLdjNpzVvOtku6KNpWhndPhs8MuNyM1INKeFAuRBcCUH8M5eYKCrViQsQW7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1Q6VT2zynq for ; Wed, 18 Feb 2026 13:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c208 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 13:55:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 904e0dcd2967 - main - ipfw: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 904e0dcd2967cfe72899e7285e6cd6e9977ae68c Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 13:55:22 +0000 Message-Id: <6995c4ca.1c208.2c46bf34@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=904e0dcd2967cfe72899e7285e6cd6e9977ae68c commit 904e0dcd2967cfe72899e7285e6cd6e9977ae68c Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:19:20 +0000 Commit: Ed Maste CommitDate: 2026-02-18 13:47:50 +0000 ipfw: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55273 --- sbin/ipfw/nptv6.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c index eee6109a3d9e..b78c5c236e75 100644 --- a/sbin/ipfw/nptv6.c +++ b/sbin/ipfw/nptv6.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Yandex LLC * Copyright (c) 2016 Andrey V. Elsukov * All rights reserved. From nobody Wed Feb 18 13:55:24 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1S4Zw7z6SCnD for ; Wed, 18 Feb 2026 13:55: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 4fGJ1S0kNwz3lsF for ; Wed, 18 Feb 2026 13:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422924; 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=REiaQvoMw3ka2hLTDK1BY4Yo1RN4osxyceXJvXjDDxQ=; b=n7dPSmlpcSr/SeGleGDc6mYJYWdXtSlpb0fPHe8LBX5R5R5zuaSRgTqKVkLNXCm9U4OUnC parxaWw9GH73ZE/lP2s09IHjy5uuvik+Prtb+XeMpp5L1E4GHTydfP/S2Y1KyeFZV369Sw W7NVIi4in6NalTwtWPaOr8ZZgW+ED8WDEonqlzen+4ouRMpePkSCp1T+8HiANr0m8/u/0G oiVnsxKCQvAObY4sSs5W5vL08oRtp7S5KyDNBLYAKuBYp1+be0dE+TvdB5OTBcnCZQNsA4 2nUTCdemkN567Q2iQv1zvvX2fiLanjJwLYBnSKRDnV2+HFGD6yaVyMMLL2nfLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771422924; a=rsa-sha256; cv=none; b=lbaXdj93JKjMcI2LHB4c1zX9j40F9+Q90mcDaC9lrfZdHK9Ljsa3l6QO1o9W7VSV+GHAe3 rbzc4b9bBIp8nGlWSC6B6pxUBbP5QkiefJmh8daKNSDKl/T/ziWvpWg42hEZYx629AlfY1 JE/VPkMRH4mTqjmbFI6IrhlyJXpuuhj57w3osRNd6c5kX2BdMT6dLfCom4kWHb4IKDyXqF kjTNRvor19rkeIH+7c7544u9QLvuj4xesy5akS4PmL5Sa3ymAcPbPqAwvhs2CPSJ4iGk6Q Tety3LdC6k2jrlEOHdHoVCbXpiVA8yXRl/GuIZYLyCiOLhfl7px3py4bE7tNtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771422924; 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=REiaQvoMw3ka2hLTDK1BY4Yo1RN4osxyceXJvXjDDxQ=; b=LV0N1WsiEZWBjEJt8Py3rh5tM5magrgnbWEQvlzW3GE/qedGxIfagdjZOJgIReFHYVP+us XlEhRYW7m9Ib5fWUIinRnaAUmhh9NmRonm41Hed7hTUVYesDszMGWzmjlT/edpC6KpwWBq IeZ6VuqDWnZ7M6Zlq0ai6HLk9zhk2zk2rYkB1MWjAYOKcuPyeVa3O24VZzTY8GVuXllqRF h32mjur+n968JrsKyLCW/RcirTqW1y9cPPYsCuUrwijaLK1pLOPLsNDWhFh5sQ7mR2IJwg NuinqPWbEI+3rpkXvxX1qTZ1htn8DDR58n1BDIZyIcL+ECezOR+N7diysl4Dng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGJ1S0BT3zyJC for ; Wed, 18 Feb 2026 13:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 13:55:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: f8517c21d57f - main - nvmecontrol: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8517c21d57f1db005c0d15e14d16252e8e4bfd0 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 13:55:24 +0000 Message-Id: <6995c4cc.1c6de.69173eaf@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f8517c21d57f1db005c0d15e14d16252e8e4bfd0 commit f8517c21d57f1db005c0d15e14d16252e8e4bfd0 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:21:25 +0000 Commit: Ed Maste CommitDate: 2026-02-18 13:50:27 +0000 nvmecontrol: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55275 --- sbin/nvmecontrol/modules/wdc/wdc.c | 2 ++ sbin/nvmecontrol/power.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sbin/nvmecontrol/modules/wdc/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c index 55758dc7e037..723289c483f7 100644 --- a/sbin/nvmecontrol/modules/wdc/wdc.c +++ b/sbin/nvmecontrol/modules/wdc/wdc.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017 Netflix, Inc. * * Redistribution and use in source and binary forms, with or without diff --git a/sbin/nvmecontrol/power.c b/sbin/nvmecontrol/power.c index b26570da0c52..dd6d8bcdca0a 100644 --- a/sbin/nvmecontrol/power.c +++ b/sbin/nvmecontrol/power.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Netflix, Inc. * * Redistribution and use in source and binary forms, with or without From nobody Wed Feb 18 15:11:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGKj048h4z6SL28 for ; Wed, 18 Feb 2026 15:11: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 4fGKj03X6qz3vwY for ; Wed, 18 Feb 2026 15:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTfVkCVPIolVQ8oEWkNgodhyrM1/15JrKxiNX1lYpww=; b=lO7igNncDrYuBDjaEAEPC3PTfxiCxejt9AJ2IuAAhWbc9Dd/60Q/DCsS6fyQOxt9Ix1Pb3 he/9uDvw7V5svRq0Cd5e66y1UZMkm7ovW/64iz1YoCqKCs3d8ZUKmQ4l/+jUQV5ea1xD1v F8Uir2mNYvBrZu3XvkjalViYouAoIfXEF4IpXJ6Xv+EOsdjpBMkg3WTG1wB/8EH+7cP+0c UbjLocMI2K+wuQuBGd5unv/ZkLso4zrscf6Ta07shkR4v+vHT8KRm9OHSUreY63MwWNAZj g9drRw0IetcMWu36SlwCI7sSazjkLeGk2rMPnBLHCcC+rRS220Gaaes8sjp4jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771427476; a=rsa-sha256; cv=none; b=Hs9b5qDVwseGdTUgcV1C0fZJW9WUpK37kij3SIOBsEttXJ2eMeZWueLyvfkO/sJkEQR97Q T4aIR+ironti23J4iTeVwrkEURYVoHVWy0zG66lV70u0hy+fP2ulcvHS4TMGxbXAUNI8k3 lLEAGgp4dfYtJw4S2/2ohsyCMw/OR+zyDaeF6YOCTsy7lM5jJV5Qg2RaAvy/W20/jp3K9k 0yZmsozffw8QsdYg0sVjsm53djKV3UX+MwL8j/tsba5MvWmLDKNviXwH9Cs3BwGJmeDzXF e242cU+7+D8ADt6UkUepq18ojzC87Xcn34iBJyGxmMzqqU7gbuhETR5NgIAxug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTfVkCVPIolVQ8oEWkNgodhyrM1/15JrKxiNX1lYpww=; b=buqRigWVO+nnN+sV/zEVB/0lzG1nJ4OAc2V9mNFYxBqt1eDA/lmCaxa7nGxjMESwrpzVkV 5RhUp0ZHlPv4hYHl66OoGZWLme90/yENjoLGK3acp5a6BLOi5p/KFCIW+NmZbN+nQ+VMh9 HKcUUUXGTvMcL9J2dZtVj1qWzznkFMAE1OdxZhfaQob0pdbukuKvV5Asv5ZJZgmGcbLTlo uArDv3Zx/8OUAcn1s5B5rvbaV/iB/oyO+oeDBhnH3JYULWDX+CwAW2fy4A3UGYSFRojOCv 1El4v/xNZ/nLHyVRpJ3NTnvkkt7uUTaJgpCoDuFpuEmN/LiNDEkl+3HRmOblCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGKj031HLz11Y1 for ; Wed, 18 Feb 2026 15:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21875 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:11:16 +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: 73b82d1b0a2f - main - libfetch: Restore timeout functionality List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73b82d1b0a2f09224e6d0f7a13dd73c66d740207 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:11:16 +0000 Message-Id: <6995d694.21875.4e33fc3d@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=73b82d1b0a2f09224e6d0f7a13dd73c66d740207 commit 73b82d1b0a2f09224e6d0f7a13dd73c66d740207 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 15:10:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 15:10:47 +0000 libfetch: Restore timeout functionality PR: 293124 MFC after: 1 week Fixes: 792ef1ae7b94 ("Refactor fetch_connect() and fetch_bind() to improve readability and avoid repeating the same DNS lookups.") Reverts: 8f8a7f6fffd7 ("libfetch: apply timeout to SSL_read()") Reviewed by: eugen, imp Differential Revision: https://reviews.freebsd.org/D55293 --- lib/libfetch/common.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index ec010909218b..75cb4320ad99 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -286,6 +286,9 @@ fetch_reopen(int sd) flags = fcntl(sd, F_GETFD); if (flags != -1 && (flags & FD_CLOEXEC) == 0) (void)fcntl(sd, F_SETFD, flags | FD_CLOEXEC); + flags = fcntl(sd, F_GETFL); + if (flags != -1 && (flags & O_NONBLOCK) == 0) + (void)fcntl(sd, F_SETFL, flags | O_NONBLOCK); (void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); conn->sd = sd; ++conn->ref; @@ -1271,14 +1274,6 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; - struct timeval tv; - - if (fetchTimeout > 0) { - tv.tv_sec = fetchTimeout; - tv.tv_usec = 0; - setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, - &tv, sizeof(tv)); - } rlen = SSL_read(ssl, buf, len); if (rlen < 0) { From nobody Wed Feb 18 15:16:01 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGKpT5CDSz6SLYL for ; Wed, 18 Feb 2026 15:16: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 4fGKpT2Rwbz3x2K for ; Wed, 18 Feb 2026 15:16:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7novWErdb/bDADbd57VcWcuJRmyxCC3fn5KkB1oM64=; b=FARh2fTfDVJpri/2Io98e0nOMo7tLLNLz78jg0VRt+svRsVeHiVHnOSTYzba3vGazh8tn2 pw9zrdkQl8q3rIQP8gaujRpbWCMgdLeAfwJEzjvPvqDnrcR6Cqjx8rLPbCAEEQUfIN70c/ ar58P2EOypcI/tJZqReKlrl0EGQ4zaGrtKk20ECPSF0tcNDt6S79LPHxJhHl9MrEfyOIM8 xxXbmsaTM1m3ty8nwhCxUGwWo5HN4fkuy5/C/sSdW4ozn1Frg+nbfC/tp9w8K60weXxsmd rHOnIJQQq5jkJUsBUIntDQe3mCupR9KHEX2+d3lYCscH9iMNJtQDTg1oR5Nrug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771427761; a=rsa-sha256; cv=none; b=u0cV7qwvSy/PddrSRvj4xR9yZfaySTA+QKjFEKdN/AwYJkt+8D1FawhrWEQXl00b/0piWx fcp3R2Z/5pY2kjzsyva+96KPcD4jpRPUCQjM3CSjxLS4sKzmtXYS/czuob7k7LKX60oGTb DPeGGKO3LF4kCBtATThANW9YXH0/zE5poMnConKFNd7KKfDEV7WPbC8Blr5bWtsahqU+zw UJdvY8yGEg3ZeVhoeYugRus3CvkFFtXJAoAFhPKKcH6yXCxhffApOBTkIA+3R2n7owKP0P hqVMlWzCN8mpzin5YJpg3ILd2IaSraqC0B+BhXOpg74OWjNuJqwG/6GCo/sMJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7novWErdb/bDADbd57VcWcuJRmyxCC3fn5KkB1oM64=; b=aZjhjDBw9I1P60SehEvYIfHAuIJAHqIrUtJ5isxCtZsp8qfLYZ5XrcOuyOh3ipz9NAqLtq qZMHZWyCe/TRs8/2UjiMOY9cXO2osZL6kHLy5AujzWzs+eqTnrXspaYMG1w2ZrCywcsBgC Z39TS/9nkzml7m92y+ED98Frj51DRG3mioY4DusNTHG0l5ESPN7gzadnzn7kM8WxfmghKG Fy9K/fUVhZ95se36hbTX6aB7kzM5IB6132Y0hMzKmV34z4ELid728EYSLm4MK4eMT9uf1e zBkE+7bFwN2oATWnp1y5SXVzhpmiqO6pI3NSLLyCjAEy85vbcSx0Z0FqHWG+3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGKpT1xkcz115g for ; Wed, 18 Feb 2026 15:16:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:16:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: bfb7c81f93b5 - main - nvmecontrol: Remove an incorrect use of PAGE_SIZE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfb7c81f93b534f8c10928d80ea56c8177a6f39f Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:16:01 +0000 Message-Id: <6995d7b1.235e1.7f51839@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=bfb7c81f93b534f8c10928d80ea56c8177a6f39f commit bfb7c81f93b534f8c10928d80ea56c8177a6f39f Author: Andrew Turner AuthorDate: 2026-02-18 14:20:57 +0000 Commit: Andrew Turner CommitDate: 2026-02-18 15:15:41 +0000 nvmecontrol: Remove an incorrect use of PAGE_SIZE The mdts value is in terms of the nvme page size, not the host page size. On many architectures these are both 4k, however on arm64 it is possible to build a system with the host page size of 16k. Use NVME_MPS_SHIFT to get the correct nvme page shift. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55334 --- sbin/nvmecontrol/identify_ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c index 95ca4b5187d4..13b1d21ce97e 100644 --- a/sbin/nvmecontrol/identify_ext.c +++ b/sbin/nvmecontrol/identify_ext.c @@ -106,7 +106,7 @@ nvme_print_controller(struct nvme_controller_data *cdata) if (cdata->mdts == 0) printf("Unlimited\n"); else - printf("%ld bytes\n", PAGE_SIZE * (1L << cdata->mdts)); + printf("%ld bytes\n", 1L << (cdata->mdts + NVME_MPS_SHIFT)); printf("Sanitize Crypto Erase: %s\n", NVMEV(NVME_CTRLR_DATA_SANICAP_CES, cdata->sanicap) != 0 ? "Supported" : "Not Supported"); From nobody Wed Feb 18 15:16:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGKpV4gPqz6SLTl for ; Wed, 18 Feb 2026 15:16: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 4fGKpV2Srwz3x7k for ; Wed, 18 Feb 2026 15:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPAw58UlcMid3Tjloke1FFQbPWTZCfMz/fzHpo7Uofo=; b=VFsUAQarltAXvAymek+lvuEyMzb5Rq24SYxpPMb+2HSsAn1+EWE4Ar8k54+n5W5y9BEULp TOMV7e96OUFur/TkEYKXXxdz4EzAZHXUFdQPZgqz+GWhm9dl4DJH2HD1bCpXKmfKRJfss8 uHRXktzk11NZY+ZlOYRwDpNsWpPQdxP5Ya0DQVr4KQeNtVcStPQH1QDjsofQJdTBs5Ivg2 0/x6w17wVzqLFY0a12E5aGLgviR8K0V+lNbrAvKDyEIxp7apWuYm+F6lBhwzUjP83Mrqb3 GFIT37L8ZOV/Zs4RBGFdfmT90bd+F02JZ4ONLtfAFzQ+8TDjp1YUxALoAzCKhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771427762; a=rsa-sha256; cv=none; b=c1t3Le8mqK0uManFlXVy8zS6u9lrE1PPh2sIpT/LZsq7WvzQ9junZ0XJBbUIwyA63+fwBQ v8fVKS3TbNER8R4wKbuSeMSVE9oWZJjk4eYP81ElS99+qHHWyKHccqg6ZAJ9At9SxJJqlg D7nbIDrKVjPgA5mCO6oXEpueMjD34+DZ+2JrcAuQt90FA/lrTg2ft/jVFuWMmQ7LNr1vVm PL0UwsNEaCLDNPQfRpCrjjzYDMTxY/VgZRMnCXdec8aPoH0/DqnA7pePIs+aJRs4jBkpvh 0fxt89yl5YjOHzth6Od3cXKgcfAfaS8mEGI6IE3M65ZEQomBsdcX0VCixtuasw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPAw58UlcMid3Tjloke1FFQbPWTZCfMz/fzHpo7Uofo=; b=r0dOw7bAQe9KrUcUrxBMJSFWMh73KzdV/qTCpiFTwhCczE2BhN8qyOr1UKU8VlsCIb7FI3 smTYN917ZtsFOwhPz2KTXbG7TDneNFEx5eaVOINeVlu22nSSJhUnxJEClB90I0s0xop/m6 nKCj0dUaRJYl/oiGsGxmcVE3Uw9t+zI7eK0czrsM1vuvIpKwEfTlo2zSzBJhx0oHoUT3Vx dVQBeaARRzfqAiJLSAhe8ziXzzTBiNOw8CWJsdShfZFu79pmrqmlr9IAlMODfYDbbS0n9B o/HFW2JQnFpdIPQsmdwu397SHPi7LaMCOEOM5ysx/uYqSvuRNGdA6RO+9qWK/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 4fGKpV202cz11kQ for ; Wed, 18 Feb 2026 15:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 222d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:16:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f4d1a3ab0271 - main - arm64: Fix the ESR_ELx_EC_MASK definition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4d1a3ab0271216df05bab14c641d8023cc43a04 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:16:02 +0000 Message-Id: <6995d7b2.222d8.7aad2a90@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f4d1a3ab0271216df05bab14c641d8023cc43a04 commit f4d1a3ab0271216df05bab14c641d8023cc43a04 Author: Andrew Turner AuthorDate: 2026-02-18 15:10:44 +0000 Commit: Andrew Turner CommitDate: 2026-02-18 15:15:41 +0000 arm64: Fix the ESR_ELx_EC_MASK definition Sponsored by: Arm Ltd --- sys/arm64/include/armreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 138a1eff51ac..271fe693cdea 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -658,7 +658,7 @@ #define ISS_DATA_DFSC_TLB_CONFLICT (0x30 << 0) #define ESR_ELx_IL (0x01 << 25) #define ESR_ELx_EC_SHIFT 26 -#define ESR_ELx_EC_MASK (0x3f << 26) +#define ESR_ELx_EC_MASK (UL(0x3f) << 26) #define ESR_ELx_EXCEPTION(esr) (((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT) #define EXCP_UNKNOWN 0x00 /* Unkwn exception */ #define EXCP_TRAP_WFI_WFE 0x01 /* Trapped WFI or WFE */ From nobody Wed Feb 18 15:16:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGKpY4W0Lz6SLHH for ; Wed, 18 Feb 2026 15:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGKpY1vWZz3xRK for ; Wed, 18 Feb 2026 15:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nf8+d6mbUlty2pBBSlQ7WLlaNOziNlVYz/P1oxuycp8=; b=sckQN2uPFD5l92Te+mZ+fbeUH6T+msyCmtf5An0rKfd/d/ctveOeRkk6UM6S/UAclPrY5j Z6d7zLbQUGIhhsiuqaP/9iIMfJakX2XC+rcIuV8DxHAeQRAsCIPMCJzfyEXLrGj38BV63A 5Kwn81gvBUkSqm8ocqNAL3uLE98MM+TMR8aVDPH3nOgXFHF1DaMkJyLDRzD9yKIvtfWBVP xFlEc98oY4R0n1VkE0yaU17f3rdeSFaGyil5s4uxWxxQlAexA5BCIvIjTboYxVAP/tiIuT Ha/1LC+dQsRco85f5Z+XGbkZaw/alI0kaieAvyQQNtmrqgpama7zm1ShSvbvJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771427765; a=rsa-sha256; cv=none; b=eS2awTP92PrIrZ5u6zDD9AqWupCjZkHRIMBLrYh/WmvuaE7F+XTn/AR5pYs9jWgHY4iGha kIGCEQZhss0+tiuFYpdP0hOuDYBe4S+v5SGAQBxIA+0tSJYNY8uQW/IY+NX42/lc8HRYyN AYIz5XVI+nYhjcyCW58pz99GAyNBI0qZcjFq78Bg1/HG+tIa30WNxSImI5WNNrcPSe82rJ 4YJJm4CsWZE/nYT4hdulK+oEom6pGWDyqeXOKnhYheB6Tj8sNrWEu33Mej9phHhuRY/07z ahpOoOmVHzV8EizJTc3xitpHiCPl8RAR/h3DuFvls/hu60EOUeBBM1MwjaA21w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nf8+d6mbUlty2pBBSlQ7WLlaNOziNlVYz/P1oxuycp8=; b=w73swlrHcwHs+Elqbxlx6xDBJ+H2SPiuX/8ZboNXBe/K1mIn73wiNom2RwC2bSs5hYRnsd kMF0lBzdiG473frZGfhClo3Bd1EWKMoUuk4ORIYwIejwxsmLWx9nywsYOJrJts2sRgyjHf RCZGG1jfAAdee9kLaTRIo0Xfiaam3WcSE6SE9zuYbww6XpqcjcuAB2VQ50SynpI01tgiP3 wF3Ce/QhE112vxuRkROrmsuQt5jjbVcdNv1BHHEJ3kTeaRSPu3AeIk9X7qSE6HYaLyQhxA f1BLQa6pMQIS2n7FjK0NR5RySlnmp4osW6jJ3wnScU6uBk3qwgJYd8VgfTAbvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGKpY0qGkz11kR for ; Wed, 18 Feb 2026 15:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24c15 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:16:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a6ad3d4ca050 - main - CODEOWNERS: Add myself for sys/arm64/vmm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6ad3d4ca05058b2b78f91be941e1da0bb272ff5 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:16:00 +0000 Message-Id: <6995d7b0.24c15.7fb40d5b@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ad3d4ca05058b2b78f91be941e1da0bb272ff5 commit a6ad3d4ca05058b2b78f91be941e1da0bb272ff5 Author: Andrew Turner AuthorDate: 2026-02-17 09:52:47 +0000 Commit: Andrew Turner CommitDate: 2026-02-18 15:15:41 +0000 CODEOWNERS: Add myself for sys/arm64/vmm Sponsored by: Arm Ltd --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e49d90a5dc76..4f940d3d508a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -85,6 +85,7 @@ /sys/arm64/arm64 @zxombie /sys/arm64/include @zxombie /sys/arm64/rockchip @evadot +/sys/arm64/vmm @zxombie /sys/compat/linprocfs/ @dag-erling /sys/crypto/openssl/ @juikim /sys/dev/drm2 @bsdimp From nobody Wed Feb 18 15:22:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGKxx5SKVz6SM90 for ; Wed, 18 Feb 2026 15:22: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 4fGKxx3j5Rz40jL for ; Wed, 18 Feb 2026 15:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771428149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UAR3XV70cvNayOolXIkDfb92SH4G2eZwUKfEW4Vb5hQ=; b=KGsGpeUbc5bYetQIS5LRVrIW8wemBlQr9SIL89qQwaQN8OufBD/tBE/wiY6NWD1saeql3i kr/o4MAcTyLwSPiG5uI54Spdf+5JBj8glG/wbBT1lmkNkUu4Mc3Ud+83HIt6GwhfrpbcjL gS8Bou7b2q+RTUGYtmD9uFNOaGvkUR+zV71oGQc89w8NKwafPJ59tIG7f7GBuKUuNXMOD5 OMELj+7ERHE6dJpnHYdmFbA5dnVn9RhZWhYIuIoawPrCsxLnjcWrtsY/EjTpjl5aTTgacP C/3mMuJnu6K8G4C3nagIwvgbfHXWenQQnk7QsI0KrWhDtVFSXBQzqUPFOnKLoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771428149; a=rsa-sha256; cv=none; b=VMqyAcclOiSMmRvC9jsdCtIPPyMLSlYjGfofWdKPzE9i8gvBT39Pga/dnN8gx53inSDM3U W/s76hfiXrmb8Em7DlR4QyKSrZJk6ZFKlR1+YnUZZqbm0oqkQb8bvdKcV8vLBawkMyGt26 NstFBV96kxi9/cXOJwlIujPRbD2zBd9iOgMtQArNAhoVdpPIcxil0I+cgV4hNrVFMnEMPK hAt8Gnu2eFALEOUwF9JMStduRJNA2DoyHGkPWsFJTpY3v0BNimz+ksbMAlqRmENqBwBtDB upD2Xg0EB1t4O0Yjkes/pkAp/apiIO7aNTcMOqZeeP9TlImHg5V/MTesBwAMig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771428149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UAR3XV70cvNayOolXIkDfb92SH4G2eZwUKfEW4Vb5hQ=; b=WTtTqpC80ixhmrnc7p/mPjvA9Gl9EDRV3CEfBP6aV+LLsY2STXemofqfc/QUOx1xeD3zkm zjSnoTLdR3lIlI0vYp0wm+rRh4fS5DobOMv7fDbsg1ekF6Zrl8vL5bO763DXoFWiRTjOLQ gzup5aUGMyOL8NX8XjV5Wq3OuMqvGgIasWbpMF5CvQrXXVHalR8765cIiVjDvGbvXi2sbB KugTQb5CkTZfuP/HgcEXrVJZsivjJIjFVR8rvZ8RSxftuJ6fWy0ueyNdRN1Mb1DML0WjXa H5BMou9ElbltWm+sp5/LMHUdfcJNkylhTA+dAAdF9/fZnDwT3k9fui4OXFCH5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGKxx0yHYz120c for ; Wed, 18 Feb 2026 15:22:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24430 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:22:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b20883e8210e - main - mitigations.7: Describe LASS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b20883e8210eb30c8ffba467c4bc9fce89bde6c4 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:22:29 +0000 Message-Id: <6995d935.24430.40fd2e67@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b20883e8210eb30c8ffba467c4bc9fce89bde6c4 commit b20883e8210eb30c8ffba467c4bc9fce89bde6c4 Author: Ed Maste AuthorDate: 2026-02-13 20:31:51 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:22:14 +0000 mitigations.7: Describe LASS Reviewed by: kib, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55281 --- share/man/man7/mitigations.7 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index c3c6ab55c480..37a81986e372 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -335,8 +335,17 @@ Another feature prevents unintended reads from or writes to user space memory from the kernel. This also provides effective protection against NULL pointer dereferences from kernel. +An additional mechanism, +Linear Address Space Separation (LASS), is available on some amd64 machines. +LASS prevents user-mode applications from accessing kernel-mode memory, +and the kernel from unsanctioned access to userspace memory. +Unlike page table-based permission controls, LASS is based only on address +values. +As a consequence of enforcing this separation in hardware, LASS also provides +mitigation against certain speculative-execution side-channel attacks. .Bl -column -offset indent "Architecture" "Feature" "Access Type Prevented" .It Sy Architecture Ta Sy Feature Ta Sy Access Type Prevented +.It amd64 Ta LASS Ta All .It amd64 Ta SMAP Ta Read / Write .It amd64 Ta SMEP Ta Execute .It arm64 Ta PAN Ta Read / Write @@ -345,8 +354,12 @@ kernel. .It riscv Ta - Ta Execute .El .Pp -These features are automatically used by the kernel. -There is no user-facing configuration. +Most of these features are automatically used by the kernel, +with no user-facing configuration. +LASS is controlled by the +.Va hw.lass +loader tunable. +It is enabled by default, when available. .\" .Ss Capsicum Capsicum is a lightweight OS capability and sandbox framework. From nobody Wed Feb 18 15:23:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGKzq0MHPz6SMCT for ; Wed, 18 Feb 2026 15:24:07 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) (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 4fGKzn1dj0z41Q1 for ; Wed, 18 Feb 2026 15:24:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; arc=pass ("google.com:s=arc-20240605:i=1"); dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.161.43 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-67934c83063so819990eaf.0 for ; Wed, 18 Feb 2026 07:24:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771428244; cv=none; d=google.com; s=arc-20240605; b=Rv8dhvPoudTCgOO9EL09Y8YtMJHhITDss+ZTQ4bnFNQPcvFJvvvfygYkfssRQo6HDz 1gJE11qB76KNpRb7i0ID/C7o4JaBSsKwsZxjna279uCYi1zN0dOSxaFIkfYvXjM8p2Jz HpvwiCTjjbuY+BMzrkPTMuMlK0virhuPpp3McPVx/LUFaeW8KfCX9CkVrW6VfzyVy+EP LCQSMLZddiCjF4cOKPDH/Muql6YYf2i0N8aXmVrZnc+6DPAE98crsUAapRWDGICJqovs Bq3da20sJlfaCCwOZCV75Bcsj53i5cqX2uW7MBzvwhc2PAhfalFgU6qNkjJ9w/OOrDU0 qLDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=to:subject:message-id:date:from:in-reply-to:references:mime-version; bh=+ql1UQp8mcq+7HU5rSvb+yM+qN4soF4kRysnfIz2nLY=; fh=PUqJvETMgSAQn/q4cPffZyNZ1zAZB2TWFPRArLP+fNA=; b=a51QXYvbuUOwMRh5hk5lVhkqrOZbyN01SYepYChAC2qV1diKaOXrvjcldoPG6zV3V8 iTWdw//sm2h1ZjJwK8Q7jOQ0yT5VuzQTJIFysDE+cyRQOwgxicIuyCwLidNlhQZpQsW7 N9VjgvT0PgR4dm0GyT91LGy8bI9DZ4vd2oKTO2MPTjlyzqMkOjbjOpZxuw6mOHnCOos1 C8zHEsEhDOIu8rcJIAsS/AqYR6CQFBU0gD8xTSlQD1lLgL+wu2gHt8uYLfe2HUE2f/Sc CNRI4WmhlpYlVmVIZOr5iE6NkmG3NtsEhkUsDvxRxiM2LN/nq88iD80fPoYANp7mIgjT KBtg==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771428244; x=1772033044; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+ql1UQp8mcq+7HU5rSvb+yM+qN4soF4kRysnfIz2nLY=; b=ISdbagP5GkUPQ1r7Iz7KON21QwL8Ps6j5wEG/FuWrARek9xYM1p4BRHLj2vhkOHfPi nDAW9VaWp2qw4Szhv1Rz/EC7MOs1pA27JbZgq6t6qBPUTsSE+SkkM3lrxAcJpV8Kwy58 FcyUBLxTmQGO0n52uFpcpnTb6gjprq4Dp1IX3XKGAF1FvZl7lwGNgG6qWAryRD8I9s+Q aKKejYMP7wUh6euSVgmJmYqWi5n2VXuqX+AltMF1tBPavof6KuUdm4CvJgTAz8vaonrm P1TUqUM8IEC+8e2NjuewotwGSfc/FKW0ereUWekADqBTGYp58bheMc0N5saFYPJ05rbf 8FuQ== X-Forwarded-Encrypted: i=1; AJvYcCXBzoqvaNXKZS5IrmR8l4U0UW21XwFN55rAyF2l0SfjXk3fRaREbO5eTCqzsM81d+RBLciAM32Jjl8f3yvE0Mfk1v5mJg==@freebsd.org X-Gm-Message-State: AOJu0YwrUVU5WWuJid6EYaGix0x+H0FAn7U3GJsQPgoCs5C9wz9iKaTN tl83t9LrDhyJEqPXmdRI+B3iZSfAuS5tjfoSDhryvFCJzJ4Y90cwOjO7FvEYr/a5IUQisTwAWd3 0uqUw65Qo14nIIFT0yiLlUvLw7Hny5I7fLw== X-Gm-Gg: AZuq6aJQdpf1d9cZPoFfH85qKNM+q3rH7kQsTAoQlZtxVUVwNiTH42zEe1mGEuJQNnQ 5WSbZhfNZ9CkBGnTxUXf5kwzxLrsG70Ttgn7jyg8IfoIEN9alwo2BPD3tYj868IAmy+YP/5ICd8 tEByCc9LAHOtz5jQHe/wuuEbpEywBDJUDwFlFAtM6krSrHWDxsnuhABztWyj69niMZY7bPr/ztg 2B6ulIgjN6mjKVHV1Xfp8VMMjjQBfJ+zWIczfecXklV/8/t7FIxqmcc0Wwvxp0DwER+7MePd3p0 UmET+xRtNLA3RCAh6EZLpnLfZnF7Pq5bYiSyVdDZVevBB4wCIcFls/btnf3OY2T8Cp2WrVpgtw= = X-Received: by 2002:a05:6820:c84:b0:679:a560:cac1 with SMTP id 006d021491bc7-679a560ce45mr1705019eaf.52.1771428243904; Wed, 18 Feb 2026 07:24:03 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <6995d935.24430.40fd2e67@gitrepo.freebsd.org> In-Reply-To: <6995d935.24430.40fd2e67@gitrepo.freebsd.org> From: Ed Maste Date: Wed, 18 Feb 2026 10:23:52 -0500 X-Gm-Features: AaiRm51ARcvo0e2lRvvuAWTqT2Oe9SNm7YSz5q6Foam9tQvrWxoUYmx-y_vARAI Message-ID: Subject: Re: git: b20883e8210e - main - mitigations.7: Describe LASS To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-2.55 / 15.00]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_SHORT(-0.98)[-0.979]; NEURAL_HAM_LONG(-0.88)[-0.875]; NEURAL_SPAM_MEDIUM(0.31)[0.309]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.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]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.161.43:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEFALL_USER(0.00)[carpeddiem]; RCVD_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[209.85.161.43:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_DN_NONE(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_HAS_DN(0.00)[]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[] X-Rspamd-Queue-Id: 4fGKzn1dj0z41Q1 X-Spamd-Bar: -- On Wed, 18 Feb 2026 at 10:22, Ed Maste wrote: > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b20883e8210eb30c8ffba467c4bc9fce89bde6c4 > > commit b20883e8210eb30c8ffba467c4bc9fce89bde6c4 > Author: Ed Maste > AuthorDate: 2026-02-13 20:31:51 +0000 > Commit: Ed Maste > CommitDate: 2026-02-18 15:22:14 +0000 > > mitigations.7: Describe LASS > > Reviewed by: kib, markj Sorry, that should be ziaee reviewed an earlier version and markj provided some feedback. From nobody Wed Feb 18 15:47:51 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLWC5mVRz6SNjP for ; Wed, 18 Feb 2026 15:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGLWC3ZL1z44g2 for ; Wed, 18 Feb 2026 15:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3GsE5jtlRZz7nX/2WqHqnxmizjQzOVE1EK2Q8PVSNc=; b=uVvLXkRmyt5BhJWXczlEdwbVHeIQwUVJQx9ScbE0p8h3GihS+egZfRlNxkfCjt8xZrV8fL +hPgQp3Qy1YUe0EV4e8h2XabO3oXMzDOqw3iq3KGgmMArndRQKxAd0fcCItNj0q/TFB2q9 YXGrFgSyvXr0qNghov0+WFFppJyiLuGxeTOhJhQsL1rQxK9zkmo/gl92/Acuev6cavDrBQ OGuYvq5jNxwk1Q4VRqe2SCamlvEkinApsGNufTWp5yF9X09FrH8/qyDkc4V7DMKzqfw0xT SSRupTvLfJaiQmSTuAfb7aZHk+GIfa3k3V9odjlyPEgIj/uad29slQO4seK8Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429671; a=rsa-sha256; cv=none; b=UvzLxpNQgKsa/Zz4IaXivdxh5km8hb2erCrDnIaly8zPXLOJU4pTYDQpX4nNaekMPe8PMT I0U5T8gVFz+6F681JMUw5hDhhmKIAvx+wSKp7KoLrl6MpAEJSYFzuEI09VvUSGrOYi988C rqK3M1xfjQvNTJJvHjo0qammGybho+aLX12FA4ohzBNF/lv+4/rk33NZxwykA2f/eR4GTe nvnNKgkLXSJAupI8jVYhwgPC6dWFyjMjO0jghBp6K8B1qRy07AZPpgKibVI1w3wkPw/+6Z cvqyNPad1QCompYCSCjBBn0hlQjsvI1+IQnknL/GnDkiLh7H1Z3pYl42xGy1Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3GsE5jtlRZz7nX/2WqHqnxmizjQzOVE1EK2Q8PVSNc=; b=eHBQ/2vhV1NdEBH+6l5h6zLViD4NWI8FLVc+1yszF0vVOwW9R1xP8sRoySUtfXr3fCyuv3 TZBH4FdcqVUf15iCw3aw6qBgCj3/vno8O/tRACCVRJdc5fIC1sHP7uQGBP5cE4Z3v9GYBL Djojhe94M0r33IFwizUpMrVJsB3ci9k/hDKE7V3bxALVpMMDICprGURHhvmqrv5SGTfEBg q02xhNfapdFlmqs8u0qkRI/cmYeLw6DDPkV40u4u2kF1Wddybz/CO1xIvY/QTa1jEKwdvj x7rMsm7A2eW27JVq688M82018MY6w/QDpSs7RseHb6VOLyq5I1eG3VyVLKslzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLWC35Dxz12PB for ; Wed, 18 Feb 2026 15:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27cd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:47:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a346348e45ec - main - Use OLD_FILES for libtpool symlink and static libraries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a346348e45ec9f61c9fcc0e8f16042cc98f405f0 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:47:51 +0000 Message-Id: <6995df27.27cd7.56dff8ef@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a346348e45ec9f61c9fcc0e8f16042cc98f405f0 commit a346348e45ec9f61c9fcc0e8f16042cc98f405f0 Author: John Baldwin AuthorDate: 2026-02-18 15:47:18 +0000 Commit: John Baldwin CommitDate: 2026-02-18 15:47:18 +0000 Use OLD_FILES for libtpool symlink and static libraries Fixes: b78806b156f7 ("Remove additional libtpool and libuutil-related files") --- ObsoleteFiles.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 309ea6dfd92e..f0e2e12a695a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -104,8 +104,8 @@ OLD_LIBS+=lib/libuutil.so.2 OLD_FILES+=usr/lib/libuutil.a OLD_FILES+=usr/lib/libuutil.so OLD_LIBS+=lib/libtpool.so.2 -OLD_LIBS+=usr/lib/libtpool.a -OLD_LIBS+=usr/lib/libtpool.so +OLD_FILES+=usr/lib/libtpool.a +OLD_FILES+=usr/lib/libtpool.so OLD_FILES+=usr/tests/cddl/lib/libtpool/libtpool_test OLD_FILES+=usr/tests/cddl/lib/libtpool/Kyuafile From nobody Wed Feb 18 15:50:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZl6tmfz6SNxc for ; Wed, 18 Feb 2026 15:50: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 4fGLZl5cqjz4500 for ; Wed, 18 Feb 2026 15:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429855; 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=aWKhA0DrAZYkV5XopZ4jbEUaMUJX76e/wG6vMT+9A6o=; b=ofl/rYorSqZlzfGVo3gv+XUApMdnTxMzrFvQDO+wo+dbnumNNp01t2W1cZVT9wR31yNkai Hjbu1Th8ZeuNqHNoEW4zc2xnWj+Co4CbEIb7MX/9RjlP/VdGQdQt89vuKYruYswMjCtom3 0nG5B7QDoX8NzpPN7lPGTg2t/CuX9sL+xuysbMQTsM8N/pYghztpmmb8/9K5fC79tf1cF+ 8ronnriVO6mDsny7l8jyyFivtnarq5cThGBjIHDUh6EGhHMLF0HxLPYvgQ1FoGWtgGH2GF zR9qniCQ7vorYks5XdsH0RJgNmymF5pk5jDePO7KBdb4DBT4CWsQ/IFKFDyfFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429855; a=rsa-sha256; cv=none; b=DrfSojIWxKMHkEvbOFG+Ha74N8R7bt5J7M6dQ0N1HlmNNipd/hagdIW9OeC8ASNh5953SJ PEhKtLnEImaZunGXwbpqcAB8AsHSgMZb3QXoFTEaELdk+PtJfhDBf0uDV2OxNrECNIGbHr mUDuBEWFQOvxLNPvOoTneGy7m+g/oTena1oPel2YiKdjiCEvfSC0iWxiurnue5HJVPcQyd ytBWLxltqWkwvIeh+PFDkZBZM0RnQjRNZ6KBNxhQko7Whi6QAHoCtAaXNFvOTzkJzlVM89 5Yh2PY+Lgv3IFnaipijtCSKO6YJDYBtbgbU9aJizAym5GDsziRN28I/sFyDEdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429855; 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=aWKhA0DrAZYkV5XopZ4jbEUaMUJX76e/wG6vMT+9A6o=; b=j7tQ3hHU5MN+OZ1bOCzJAK8H2rtnjbI0b6GCf8UpPc++njyMYOhXm5g9ctqaVyLDwaJPEM p/hpTiBiOwAjTpNzbvGaeJdLTnQeqrjx+YRDXgA0KOhZyNlh02xPPLB7w9KjwM8n8ni9rp Wiu52g0BCVD3UIy3RZterPs+PllM+vQveC8b0mHgLRkCisAd7JEG5hyhz2VYHjJj1a2qey Ha2e5JegnhCU6QA+7NeDvGf+vgwjEMkA/rX2Ns2cEYUp5zfDHKuE9VxFfrzdwoVasXpRGi SX8ThFro82bvQy0ASYhdJkTesZCrUrgm5RV1bigSLksKfN2DY+9FfHaB5Z760w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZl59Nwz12Bw for ; Wed, 18 Feb 2026 15:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 275a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:50:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 62269b2f2385 - main - date: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62269b2f23859a20bc6a68ca64648217c421c616 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:50:55 +0000 Message-Id: <6995dfdf.275a1.47a0c364@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=62269b2f23859a20bc6a68ca64648217c421c616 commit 62269b2f23859a20bc6a68ca64648217c421c616 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:03:08 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:20 +0000 date: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55207 --- bin/date/vary.c | 2 ++ bin/date/vary.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bin/date/vary.c b/bin/date/vary.c index ec556139c201..d3127f0ae746 100644 --- a/bin/date/vary.c +++ b/bin/date/vary.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1997 Brian Somers * All rights reserved. * diff --git a/bin/date/vary.h b/bin/date/vary.h index a63ee64db055..7c240adfe222 100644 --- a/bin/date/vary.h +++ b/bin/date/vary.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1997 Brian Somers * All rights reserved. * From nobody Wed Feb 18 15:50:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZn2QzNz6SNvj for ; Wed, 18 Feb 2026 15:50: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 4fGLZm6zMFz45Kp for ; Wed, 18 Feb 2026 15: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=1771429857; 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=eYAUk+OpK1kKVwGh6fWUwtsPIrjWjfYPIdudf+pVmm0=; b=PvG2/I5ym1O8b5TvK1CYNdZuWZ2cEjejRJ5qs5I6T2Kh24fbSm0HVjfMZhQQ8tkd1aTfWy eMI/5g6wSzJ7/KgY1F5g8ItYaY2rd74sep0YJpcLMwzlAyOiADCggjpPJINPJboYFFsZ3a yfn2IuWhzWnIZAMtMpWpqeqSTaGdP8H6jcyezYXHzDJkaQIvVBKkIKjZq7yjygnMJbU2ia 7towXCPRj1P2V+xI3htbKeCI1L5RT/kuq2QDDKV9dpjVGb/Cnp5k5BZSVVLgHXhdiGFlRY +AAk0PIo36eQWnVelWhd2tk0+0MAGfqfORrTvK64fggTx1b7ayCB/PCoLwWbvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429857; a=rsa-sha256; cv=none; b=sbWFC0W8Sax8WRx7W3lhklsli7nbMtBMP23rKxqlTgNdZlvCmghs9/0ULw7wKNu9Kc3qop 24+T2xTR44U8hhZu7oa5OCGgTIfBr9AE92L3+jO/2hC36tj3udKxk9zxhijf1KpzCUIJSp ytKiJyV2q8QxcgvWOJGSgKZPxW+FxKcrCw53IGXC5MWigrtG2vxQ+RdCgvoS05VfIS5EQm +T/DfLLnH9VsYOX94qJTXrFqts27xybaAuCowVN6RTqEV9EVGQgMbfUoUvrbMAdJd4uboW aLPwbQKva7lwM4BlQXK6LLKkk7/j00JBXlGKSDCqAZPY6Jzo8JMsEJ/PGE482w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429857; 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=eYAUk+OpK1kKVwGh6fWUwtsPIrjWjfYPIdudf+pVmm0=; b=VlHDSfTyEmH2k/eFqkWnOopdc9xQMBRUu16jWfRCgHjBpcaoKCY0aAZVmBwqP0cALmJ3Lt 7wUlEO4SaM7rqiIiBHDrIELrgiIV+tjuslU+YUqc6VceG5b+mIFS/Jav+teQjKCCR75CAz zw7gYtouxYC/zV6tauMOv5T1Y6p6o3lkgPLTmyEQ7KLKPs30vmHzXgxp5UWm1/VhmrDWzj yVV/nDyReiLArWMDOfydBW/guEAaAw7LGI1PLlKnOny5qASTCyyeVZKeEhUJeRYK2fXCjh we6n0UKkgXItWEZXU5AAbbyJvgNr1DhfeHSs3ywdCf3bq7vF46ktbh4W854b8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZm5yRtz129W for ; Wed, 18 Feb 2026 15:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:50:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 9eeab27c56db - main - ed: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9eeab27c56db507f88c3334172e62357c092707e Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:50:56 +0000 Message-Id: <6995dfe0.30b29.5233b99d@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9eeab27c56db507f88c3334172e62357c092707e commit 9eeab27c56db507f88c3334172e62357c092707e Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:05:17 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:20 +0000 ed: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55208 --- bin/ed/buf.c | 2 ++ bin/ed/ed.h | 2 ++ bin/ed/glbl.c | 2 ++ bin/ed/io.c | 2 ++ bin/ed/main.c | 2 ++ bin/ed/re.c | 2 ++ bin/ed/sub.c | 2 ++ bin/ed/undo.c | 2 ++ 8 files changed, 16 insertions(+) diff --git a/bin/ed/buf.c b/bin/ed/buf.c index 1f111e7d513d..5ee27eb47e35 100644 --- a/bin/ed/buf.c +++ b/bin/ed/buf.c @@ -1,6 +1,8 @@ /* buf.c: This file contains the scratch-file buffer routines for the ed line editor. */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1993 Andrew Moore, Talke Studio. * All rights reserved. * diff --git a/bin/ed/ed.h b/bin/ed/ed.h index 788106e68b51..e1e41cf3fe40 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -1,5 +1,7 @@ /* ed.h: type and constant definitions for the ed editor. */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1993 Andrew Moore * All rights reserved. * diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c index d0a1d570ee16..f921f7e0483a 100644 --- a/bin/ed/glbl.c +++ b/bin/ed/glbl.c @@ -1,6 +1,8 @@ /* glob.c: This file contains the global command routines for the ed line editor */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1993 Andrew Moore, Talke Studio. * All rights reserved. * diff --git a/bin/ed/io.c b/bin/ed/io.c index fda3f5d55fd6..b3262ea9e217 100644 --- a/bin/ed/io.c +++ b/bin/ed/io.c @@ -1,5 +1,7 @@ /* io.c: This file contains the i/o routines for the ed line editor */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1993 Andrew Moore, Talke Studio. * All rights reserved. * diff --git a/bin/ed/main.c b/bin/ed/main.c index 57f1faba29c4..07fa0c3cada9 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -1,6 +1,8 @@ /* main.c: This file contains the main control and user-interface routines for the ed line editor. */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1993 Andrew Moore, Talke Studio. * All rights reserved. * diff --git a/bin/ed/re.c b/bin/ed/re.c index 3dacb619a2bc..96ccc9816620 100644 --- a/bin/ed/re.c +++ b/bin/ed/re.c @@ -1,6 +1,8 @@ /* re.c: This file contains the regular expression interface routines for the ed line editor. */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1993 Andrew Moore, Talke Studio. * All rights reserved. * diff --git a/bin/ed/sub.c b/bin/ed/sub.c index 2bf70b8ac4bf..a56ca53a9ee9 100644 --- a/bin/ed/sub.c +++ b/bin/ed/sub.c @@ -1,6 +1,8 @@ /* sub.c: This file contains the substitution routines for the ed line editor */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1993 Andrew Moore, Talke Studio. * All rights reserved. * diff --git a/bin/ed/undo.c b/bin/ed/undo.c index d5f56833ec66..08298e8af36c 100644 --- a/bin/ed/undo.c +++ b/bin/ed/undo.c @@ -1,5 +1,7 @@ /* undo.c: This file contains the undo routines for the ed line editor */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1993 Andrew Moore, Talke Studio. * All rights reserved. * From nobody Wed Feb 18 15:50:57 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZp4q8wz6SNk1 for ; Wed, 18 Feb 2026 15:50: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 4fGLZp2mflz459Z for ; Wed, 18 Feb 2026 15:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429858; 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=TajN0VN7FqaSoUmCeZoCKr6iMwxrEnTmAIAmfQ9bovY=; b=IhzWZcC/HiET1kiYOj04epghjdt0k+8DFQ9d5vK9j8JAXEsNhZUdl+MAYlMQFVyhhrZydk rwavBfYPjSmCNoGBim68SrUMgjH52UwmIC8cQaiaAuV7HSP5SQZeCuXcvfyhvS9Db575O2 LridwKLAonVwpiEj71iPmZUlMRMSmDjNrttW9rkEEOnlOauk3v5hKd4gR7keH4NsgGCsib FQS3r00ugoxtEbYur+MEy8KbmMoDQVBq0//D+aOkrGDOuXL778OPlz8XnyFSLCkEdLyYu0 728fR1InfcO3lU8cNXgYcx/HBww7r2G/SDplOXvrPV8ZTpJKuaOj5wE8Z0Kz6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429858; a=rsa-sha256; cv=none; b=htEUW+KNYcpBu9pQcXXRhWww7lZLM1M3nK33th4Hmsi60mG8FBd8riw9RZ2BZ4fB6Sx3wv 0uJ/OFXjZs7MAPIvQxiQjMpQzH0DTNdnsl2MA9MssEoZ8ZqeHcT4vqxTjpchDOvFz7yeL7 EBbDHlaUz2e+odEvZR2iaJelQqFwH5q/kLIJVhemQJAMHS4+433yJYDHYXx5kxq6WtaU6C dh3TV4SrP8YI5u4s1UKegD1znBQHv0PiMUsqYLcBKuSs7clr344CH3lm4FfWhC34pLJjcC nct8OnFW7aLcMFdtS1IK+QwGztFFvE2OIYlESXfNAQwTjeJUo/cqzgPzTHpMiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429858; 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=TajN0VN7FqaSoUmCeZoCKr6iMwxrEnTmAIAmfQ9bovY=; b=X0uQ5ocGgt/lZLcZ1DbowwJ/Da3t4Gmi42rkZsqGoidkVuOeu1ndFxcbc/kIygxm+U13DS fDvwnt/UxYr4Vm62nT43xe4Oh5nfDkVdf+nOw58rbaS/w3feYVgySBa3aO8J/i3kYe/ILO p4+bzzkU4/5h4E/Hu/CkDdRm7FwLnVpUWjSMl0Ksj2DSjIonsbZYxALhSoHhyo1prE4UV4 DwACGzPzoAsPwIGDYLsVhNvY3Uu0ybBUmJT49Ij8aNGb5Mg5bQ44l/z1VN6ajBXI61OqSU PGfG3OCWgKyIQBiq07TcLYGYX9YI19To6CC4SP9t5QMWdTbPnW5rDv5DPs1gpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZn6kvkz12PQ for ; Wed, 18 Feb 2026 15:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26fe9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:50:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 6e8bb77b4c23 - main - getfacl: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e8bb77b4c23837d95ba9fb50b41b948c21cbdc3 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:50:57 +0000 Message-Id: <6995dfe1.26fe9.665bd734@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6e8bb77b4c23837d95ba9fb50b41b948c21cbdc3 commit 6e8bb77b4c23837d95ba9fb50b41b948c21cbdc3 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:06:07 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:21 +0000 getfacl: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55209 --- bin/getfacl/getfacl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c index 5f55819c81a1..3492ec092d91 100644 --- a/bin/getfacl/getfacl.c +++ b/bin/getfacl/getfacl.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1999, 2001, 2002 Robert N M Watson * All rights reserved. * From nobody Wed Feb 18 15:50:59 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZr0gqgz6SNtN for ; Wed, 18 Feb 2026 15:51: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 4fGLZq0dVwz45GS for ; Wed, 18 Feb 2026 15:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429859; 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=osLimc7XUv4iIFdgmcsgY5HZjHYpWDOd67vHniiWqtM=; b=P5QF0Xe/QmlknciYxe63mr9Ae3QBr/yONfTS+4Zwd7k5LoMQsg9dgP1RoKSjOBEDnA8/Yx f1BxpNEyi1FpReoS8QREmY6mM4ZWB1HQUhvode0i5p6+OWNP+plVNRbGHB+VG+WIJ03CFM XEWelDqmmn0UeP5Ktytp7ksHeOo5i0pyx1XmXbAmDdyQQbfBlv1rsfMnYSIyp2ywDpbxp+ jVQuWH8YpbLaTz9sXiCAi/cnljRDkfhFRjFZ2y7AxBqviXd9oMRVAGfFAtuOJxFhxB/7iV g+5XQQ0IfMdMtPOF0KoY4jh9zpvcfE3enYrCOOr5+FA78zrCDOUjaPEfMx04DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429859; a=rsa-sha256; cv=none; b=jaTzJ/+8gthr5ZdYXer6CAM/wyblWiksDaDJH42iREZq/XO/OgaLr0T0uYIrz5PGgggKGN Zo7uC7WWCYKrb+bqda3DoKUmv06jIUouXNYr3YriVlgkeCIy0suApLCVWX+9n5ZWK2DL1K LH5vLHJzpCphRH9LkJcRUtoMOfn9fsf1Fc3w1yH0+bQD0LlF8fM8qnBnpmYCj59QgNbSUr i1hF0QkSOVgQSOx6B/3fA1ZyTUOjq8dmdPdxqAq41zdy54+jM2xSkNelfo9Aw0lbej8kB4 8ITMqeclQJTja/EAZSZGqeYIW+xTLPkAaqtUiIq4A90J44nPR8GWeuiMc92S1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429859; 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=osLimc7XUv4iIFdgmcsgY5HZjHYpWDOd67vHniiWqtM=; b=YYoQA/Z+wQwn1giJA1M9RFfx/9uucta79FcJGtRxe2V4vCMqUu70ygkPjl+0cSTWWkSFks WPLzoudOtHT0yZn1G+yHg2xqyq/L9ROYJpGUBSn2y0EeTwZc2PnWNM8ZhuT3svpqJxFe9S O9JJ+YVEk35GZvd9TLIF6VkXEMiEdPemUbWkw2SXTXC2Ytx/oSeWH4BmOL8c0iAe5xliLI OQNdfXwVNnR9ur/6Com5A6hwVviu+J1U3uJ5/1P3v+XQwhX8G7y/WGOMxVxI87pXem+riM 6+U+n7nlvfgieENfaiRksL0aWk7fd4rM2jU1njiokqyIfg4qikUi475oJiLSMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZq09TTz11t0 for ; Wed, 18 Feb 2026 15:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 274dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:50:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 5705d171dacc - main - kenv: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5705d171dacc69bcdbfc17849a9dc898249dae2e Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:50:59 +0000 Message-Id: <6995dfe3.274dc.4b9ddc39@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5705d171dacc69bcdbfc17849a9dc898249dae2e commit 5705d171dacc69bcdbfc17849a9dc898249dae2e Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:07:32 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:21 +0000 kenv: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55210 --- bin/kenv/kenv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c index fe7ec4236bfb..b92a443c29df 100644 --- a/bin/kenv/kenv.c +++ b/bin/kenv/kenv.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2000 Peter Wemm * * Redistribution and use in source and binary forms, with or without From nobody Wed Feb 18 15:50:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZr1bVdz6SNnr for ; Wed, 18 Feb 2026 15:51: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 4fGLZq5F78z45Nj for ; Wed, 18 Feb 2026 15:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429859; 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=HyGuWIxh+gWWBR5kZHBzIunvV5cwr3gMb82wC/l0W1M=; b=TY0h27U/6xnQ5c04XFu5UkO4D7dvXUuXCLR55iafOBYf5lxp/+fD+fM5XtYio6RYVxZwdS DV+1Pbd1k+pSNqDfhaq5h70bY4NucbMffazP15WBWTShKPq5gEKsE+/ps3dfNic7vwUmz9 4Yx38oAALHrhAiQB13PusZj12DU9hh5O8gHR0kKyX9oIBjNaIGfwmmf+KSLaam2hXKiPvQ jLehsuA9QZ2ArPFlhVsQ74UoKaWFk94lyO3f4PAC2NBcdEDqOV2YhuLFnbJAPPYKRu0kSV 1y4atpesN6UHApSw17DMNnqYR4r5MTohYLHAN199pxo4m95+KIRQetv9oEi+gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429859; a=rsa-sha256; cv=none; b=b5bpA9enUTgUP8nKlI4/Y2F+GbPiwKuRr50cV6QxCqBQuf5IjzDy8QicJ5SqO24TQDdOWr xJoA/LibJFPTS8ZYEW82zJpUWtvq3H2fcdvoddvmUaUyzaoczRMOYj0sajPY/pZ3Qpso6M njlMVYY8+9rs68EPRW6NeSLiJi0q4Y2LXTRgQrQHDZrOpK5jxPi25HhHLnN+30rz7qUrpg TYS3v8xt5YRmqN/qTs7tg5zToLCrSjKROHbzOq62zvSmPQf/1sBJHFezFeBIjwPxLngcs6 h5opPQaI2byv69ycGF4QijFTOzz5LPhpTWyuHgoRjBlK3GQToxvFvTjfNZL3kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429859; 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=HyGuWIxh+gWWBR5kZHBzIunvV5cwr3gMb82wC/l0W1M=; b=u2oMP9X08blATx7KFeJlZ1gpVUAdqOOZKvj0CQaEYpu1jedZ6byWyuAo3NNy10nCf0uz2z 4RqeRxy8S+rOyjWJtjji8vOQubYrwQ3haGDpCoVI4AgJeMUk7s3Hlxdo8D6orVdD3OH+4e HreXZnNmTLi/bpXzXkNDexvsqE50FVu4z21mdX/MMcih3nAU3Pmv7hzRrfYM+w4vCLrfx4 3AmHlBjmIj1S5k0X3Scrkj4kjznzVuIAFaVtpln7zHUVqAvW0Vg2a22ehPRhVFaAkWzLZB 7gnVh0wYrsAavtR/ZkfEKhG7eQ8M7IGd5B300QeLGYCMyfNSbYhITsUs+8HTNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZq4m7Tz11qV for ; Wed, 18 Feb 2026 15:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27632 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:50:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 10a8680b4e9a - main - csh: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10a8680b4e9a728a20825d1c8425487bc1a43700 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:50:54 +0000 Message-Id: <6995dfde.27632.45e8a8f0@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10a8680b4e9a728a20825d1c8425487bc1a43700 commit 10a8680b4e9a728a20825d1c8425487bc1a43700 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:00:56 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:20 +0000 csh: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55206 --- bin/csh/iconv_stub.c | 2 ++ bin/csh/iconv_stub.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bin/csh/iconv_stub.c b/bin/csh/iconv_stub.c index 67659d9f20a3..22a0fe3a030d 100644 --- a/bin/csh/iconv_stub.c +++ b/bin/csh/iconv_stub.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2006 Hajimu UMEMOTO * All rights reserved. * diff --git a/bin/csh/iconv_stub.h b/bin/csh/iconv_stub.h index d85bcf3b113b..ab9cf5a71974 100644 --- a/bin/csh/iconv_stub.h +++ b/bin/csh/iconv_stub.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2006 Hajimu UMEMOTO * All rights reserved. * From nobody Wed Feb 18 15:51:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZr4kHJz6SP1C for ; Wed, 18 Feb 2026 15:51: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 4fGLZr1WN7z45Gh for ; Wed, 18 Feb 2026 15:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429860; 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=5ZDNjDzqQnfMOVqKQA7Lmrqzx9upvuAyMwe/tPic36k=; b=J4nPfw4U4J5A9kqTS1DizUVVLs/+4ihsHFABLrP1hq+p4OoLAylkIYx3duIqDD4W6/9Ep/ 1Z/n68OxxFmFfIFPV+uTJWZsqmf1axvAXYCb0mTkJuibM3nBd5Ze0LFIeozOzBqM5n9qVb ProLwG8MUpqFHwtLAy0RNwMjr9JPxp530n8Qn4/XhuzVPuK5fA+DzRCb2mmGzN1MdzE2sK Vtb//lc2RoywjDAsOOqGwHEn/UxUUuLDl7vmG62H/LMkpmNLxkbW7hdQyHJdb57q8brTep aS7afoq24bhO68LJ1KezPStEVxZgOD85lFy6lG9QJ6UIiZ1guJSLk6tPDAjd2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429860; a=rsa-sha256; cv=none; b=kGBnwcKQaXT7aS3LnKcNgLJvVQG58u9v8+Hh2FhVBvRmeW3RJZCDGjuEuQK+oUMeZjq8ip CH1Mtnt4RWH34vMoJTGqTudemOARR5otHnZym3481tlG9BfJ7Rkqv9V1J/o89sJUeMen8Y YIEMMW/2D5zc78XzCh6Mq8Qblik+n481Wt0jbU1g3mvXbqJBoeWO0SURplyWnBmEUQJ/oN adH5fcEhArCDmHd2vq8VA8E8PGJ4+p6g8GJiBuCu7czVrO6lNj516s5mpkBg86qqXI6aQt PTfqavfL+X5NvUoIjlMDk7juC4QbfiEvhZ1h33iXtjHYDCofKy9ArVYM9YUNUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429860; 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=5ZDNjDzqQnfMOVqKQA7Lmrqzx9upvuAyMwe/tPic36k=; b=Au88UsBdMTmTne3fod0ctDuv5BOaGR3iB7KhW4nLOZXZrtYrWbhJp3MrSVOqZYBS/n8rQy PBTHBhFbVGjAZgoOf6AgSZH88aAOEdFnAgHAhxk4PC6MVcMO/RQoY2XdvKUu8fp4JkQtPw jFa9KIykiD985UNnmSZmpcMatfqH6tV+mnpHNY+ennhqqncaIRN+s8yeWuoE4wWFu+tkP+ aqUTWYMy1y9ua7tzBEYS2vASi4rRcFEexFAR/A9D6D9ZQOadWMboKQyWZob007PZZaMS3H OxIqTn65e2toM9fCswUOtqkWEkIIgmGoHloiduJizvseJ0Ia1Lc3orRoLJSCcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZr0xCDz126j for ; Wed, 18 Feb 2026 15:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27443 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:51:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 0a1fd13e7320 - main - pwait: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a1fd13e73200756b61d06c949622b4f6bba7dad Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:51:00 +0000 Message-Id: <6995dfe4.27443.5831faac@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0a1fd13e73200756b61d06c949622b4f6bba7dad commit 0a1fd13e73200756b61d06c949622b4f6bba7dad Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:09:10 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:21 +0000 pwait: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55211 --- bin/pwait/pwait.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c index 59bf0eb93ced..7f134036f1b9 100644 --- a/bin/pwait/pwait.c +++ b/bin/pwait/pwait.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2004-2009, Jilles Tjoelker * All rights reserved. * From nobody Wed Feb 18 15:51:01 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZs6GFYz6SNrH for ; Wed, 18 Feb 2026 15:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGLZs2FLgz45P5 for ; Wed, 18 Feb 2026 15:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429861; 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=OicHM2qepxd9AYpYL/zZN5tM2fEdvBqkDSKzp62+Gn0=; b=cwSCz2BJaXTIctf+wooFF65GqCNbFO1Gu6aXbEqhM69ZffgrHq0FOJZwRWy0ZCGO3JOCEi WXb8Kbb1SmdO1u8v7UtWKUhDWvXTdWFTGaVdAeVUmntIoBvi+0BU9XBmn8xFcGQrg3c46c kCC8q/+747U8VTIYUPrc3e71GLQuhxsLVr98Cdh+fHGVVZFZRjx7cuXa7nAn8aGK39IVvr 3qjep+YfR5ecTPtp1thfYsJgoZj+yAznAp1us+gLmQCi/U0jNIUBtr/BA3mxfb7Bp/kYLV heEgxzegpoRinpZSdTDXTT5Kkvz6dTwelvroVU98dEHMIaglx7eQUEq86nBQyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429861; a=rsa-sha256; cv=none; b=hI81O/Nik1geKpe4KbXha+xLS1cg8nwkLHFw3tct/3Fpu4uBMkPGj0wYThUzf3oo1mczFR 5rrRKyuoSQzoYcT+JNAFctYyD+ISv3iVtd0YdvCBv07wcRqoZD4Rq4O1wgqdGFas7lJukD DE0SI/KATomThmS6HzxLoctPv6THEQuCY0l/mJBk9xH/O05t3630XtmQLWOA/BitOplsw8 A27fGG9F7fbs3Gf+yk2rItPDUfk/cKZb8hdlUHCu8uaU1bqlobcZ16E/6s6rim7JKjejLj bIAuSMkd6MiTgYYA3jGoBzbvR9NuPRT7FtECuX5doOzubps08CF5xSMQCiOJIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429861; 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=OicHM2qepxd9AYpYL/zZN5tM2fEdvBqkDSKzp62+Gn0=; b=mpjdtBHQl735yhlm2l+04NchwuEZKuVI0uWm2jb+BUK6rkmKYiaH+Y8pv71fYU0GDCPgIM AcJ8PIOlhZqxiWgweqYgqaQoCqv7H7IsEUYW/02I8/Ham8/9oc+smziC5UxwQzlrX6k8kz ncvUBavztyPCNIihR4uxm66a23zrWrd1QuB09GHQy0f6KPnkT9YvzVwv1+ibeG/WojIW02 lTZmr6rEO71pUnP4fbw1+psPXcZ21UU4NOGnIEjqxy+YeQAlZvnPedTc98BRn54Bnlrb7u 2+0FV+mY5frIR4WC6t4qOCHkPd4PuGytM6iLXqZb+3cdRhKUgwHqnprjdNUOzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZs1lJyz129c for ; Wed, 18 Feb 2026 15:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27637 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:51:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 575e89cb1786 - main - setfacl: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 575e89cb1786a00387e9c1391055263068c4e0ae Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:51:01 +0000 Message-Id: <6995dfe5.27637.4574fc07@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=575e89cb1786a00387e9c1391055263068c4e0ae commit 575e89cb1786a00387e9c1391055263068c4e0ae Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:09:45 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:21 +0000 setfacl: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55212 --- bin/setfacl/file.c | 2 ++ bin/setfacl/mask.c | 2 ++ bin/setfacl/merge.c | 2 ++ bin/setfacl/remove.c | 2 ++ bin/setfacl/setfacl.c | 2 ++ bin/setfacl/setfacl.h | 2 ++ bin/setfacl/util.c | 2 ++ 7 files changed, 14 insertions(+) diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c index 24ef3869cf4c..dc014c4f0084 100644 --- a/bin/setfacl/file.c +++ b/bin/setfacl/file.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2001 Chris D. Faulhaber * All rights reserved. * diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c index 5154b17fb5bc..85be30b07389 100644 --- a/bin/setfacl/mask.c +++ b/bin/setfacl/mask.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2001-2002 Chris D. Faulhaber * All rights reserved. * diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c index d77a52ed2f25..5d23b67a20e9 100644 --- a/bin/setfacl/merge.c +++ b/bin/setfacl/merge.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2001 Chris D. Faulhaber * All rights reserved. * diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c index 5bfab9c2ec9d..92a67a0cbfb3 100644 --- a/bin/setfacl/remove.c +++ b/bin/setfacl/remove.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2001 Chris D. Faulhaber * All rights reserved. * diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c index ef3f58b326a3..788cbc5008da 100644 --- a/bin/setfacl/setfacl.c +++ b/bin/setfacl/setfacl.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2001 Chris D. Faulhaber * All rights reserved. * diff --git a/bin/setfacl/setfacl.h b/bin/setfacl/setfacl.h index b7e7cfd8ca1d..c05defbe9f8b 100644 --- a/bin/setfacl/setfacl.h +++ b/bin/setfacl/setfacl.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2001 Chris D. Faulhaber * All rights reserved. * diff --git a/bin/setfacl/util.c b/bin/setfacl/util.c index ee28b9d5503e..2c729d12a145 100644 --- a/bin/setfacl/util.c +++ b/bin/setfacl/util.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2001 Chris D. Faulhaber * All rights reserved. * From nobody Wed Feb 18 15:51:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZt5C6Mz6SNrL for ; Wed, 18 Feb 2026 15:51: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 4fGLZt3HF0z45X2 for ; Wed, 18 Feb 2026 15:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429862; 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=+h4MT8pRGmAuff/C7qLf/MErELhPv4DgO1wr2X1W9XM=; b=dg0S2w0PdyLYQwnlDBh/zzc5gHnAhKHAa0pLmsbKQwh8iFlpBQddZBsg86kypffUestCUZ UpjTX+E+c6mKIgW1YW92m2p0VglEXAagv8YwyMdAro3g5zYunjroufdSkngs60h6ZjPdCc +OfF9fSBwTdpShN0byJPs1BL6B3Dxt+drdow5KEbyKQlZIsyFGLDVsyeHqeEtgUv6TGgvF hPhSTB2yJFsxC9BUlTPF6Zzk+Kip5UE2yc3G+dvNFbDbZEmNEodWHa2i0xsMNE9ksjCk24 4kCOfTpfYjwTxRpic89YNccP+I+3hd8ddJDtxACNGudRek5WDVV1e1JM0n5ilA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429862; a=rsa-sha256; cv=none; b=i9dk0zpPUdOKw7iRpDdxoCYJJ/KpBJwMn7Fk1ewtkGg58jDCmMDAje2Hw56tcCCKH+/clR ua99wEDsAdgovJ1fonBQeYM3rajLJPcEongYfNeuth5eJOEimCrWjBW1RILTcW5N6XxtSk yPXmNZqK9s6CL3H+KzGREmgIP0IrAjZX+VcQYY9opWk8SJOsJsiKSZTJnTU2nACj9oTgcQ gvAHQd/yYC0nQorDfpfMWtSIIXZpX6zFnc6ek4R4ewAjTYxlu7RmfS0qJymvUHQN9qHU6w Foe5tBRn1rbCV0H03SUCVnILPByUgH4jjctXMRfNA4x7QgHeScGjYF5mXlXWeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429862; 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=+h4MT8pRGmAuff/C7qLf/MErELhPv4DgO1wr2X1W9XM=; b=tpeROGaeOEUjgbWwzsvuKvwStKjAru79i7/Zs1JJ2+EGqylMcoBbVTKMS7MYayHx0CmMMV nw9EykOPxSoRkymWadeMkb0uJNL2oncfSfZHOPgHtqGAb7K5PLNABP07LfcCEfjGbsS7yQ n69R2fLZ5X0N4pXtLi6ikdrwYW962vfkS5X/H/9ru/PyYLDNSHFtGj+xbUKMT6Fo1PPQrm BEHy/LKBUdN3mkRmSjuFpjJHSKlmgXbe0W0x9JSBjqM2nsFnI48u1Ll3UHkDngk1Vnddg6 o94r4pO7jtMJzZSy5zC4sozY2OOWQHz15Cl2VrFGthHtEA8mjDevobWrcUywoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZt2XX1z12C1 for ; Wed, 18 Feb 2026 15:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3072a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:51:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 632c73b4bfd4 - main - sh: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 632c73b4bfd48b89b7c2318079fd50835b8b5016 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:51:02 +0000 Message-Id: <6995dfe6.3072a.76ac7d2c@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=632c73b4bfd48b89b7c2318079fd50835b8b5016 commit 632c73b4bfd48b89b7c2318079fd50835b8b5016 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:10:25 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:21 +0000 sh: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55213 --- bin/sh/alias.c | 2 ++ bin/sh/alias.h | 2 ++ bin/sh/arith.h | 2 ++ bin/sh/arith_yacc.c | 2 ++ bin/sh/arith_yacc.h | 2 ++ bin/sh/arith_yylex.c | 2 ++ bin/sh/cd.c | 2 ++ bin/sh/cd.h | 2 ++ bin/sh/error.c | 2 ++ bin/sh/error.h | 2 ++ bin/sh/eval.c | 2 ++ bin/sh/eval.h | 2 ++ bin/sh/exec.c | 2 ++ bin/sh/exec.h | 2 ++ bin/sh/expand.c | 2 ++ bin/sh/expand.h | 2 ++ bin/sh/histedit.c | 2 ++ bin/sh/input.c | 2 ++ bin/sh/input.h | 2 ++ bin/sh/jobs.c | 2 ++ bin/sh/jobs.h | 2 ++ bin/sh/mail.c | 2 ++ 22 files changed, 44 insertions(+) diff --git a/bin/sh/alias.c b/bin/sh/alias.c index 681e82b3e19e..7ddc2b30ec3e 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/alias.h b/bin/sh/alias.h index d0644b317472..473f31ece686 100644 --- a/bin/sh/alias.h +++ b/bin/sh/alias.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/arith.h b/bin/sh/arith.h index 3a7521956c09..1371b02a5630 100644 --- a/bin/sh/arith.h +++ b/bin/sh/arith.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1995 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/arith_yacc.c b/bin/sh/arith_yacc.c index cb88cdb4cbea..5c42ce0054e5 100644 --- a/bin/sh/arith_yacc.c +++ b/bin/sh/arith_yacc.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * Copyright (c) 2007 diff --git a/bin/sh/arith_yacc.h b/bin/sh/arith_yacc.h index 3203c664a8a8..b0e51f19c466 100644 --- a/bin/sh/arith_yacc.h +++ b/bin/sh/arith_yacc.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * Copyright (c) 2007 diff --git a/bin/sh/arith_yylex.c b/bin/sh/arith_yylex.c index 68a641d807af..e6c5f39d4da4 100644 --- a/bin/sh/arith_yylex.c +++ b/bin/sh/arith_yylex.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2002 * Herbert Xu. * Copyright (c) 1993 diff --git a/bin/sh/cd.c b/bin/sh/cd.c index 6f97bff3c9f0..c47e39b92055 100644 --- a/bin/sh/cd.c +++ b/bin/sh/cd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/cd.h b/bin/sh/cd.h index e2f8ca54748e..6aa046913398 100644 --- a/bin/sh/cd.h +++ b/bin/sh/cd.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1995 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/error.c b/bin/sh/error.c index fcc2f309ccbc..c634026befb5 100644 --- a/bin/sh/error.c +++ b/bin/sh/error.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/error.h b/bin/sh/error.h index cb64ec85c09f..80c36a7f5f2e 100644 --- a/bin/sh/error.h +++ b/bin/sh/error.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/eval.c b/bin/sh/eval.c index fdc7a2560694..d0fddf160771 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/eval.h b/bin/sh/eval.h index 9a47e9a8db23..aaffcf9af284 100644 --- a/bin/sh/eval.h +++ b/bin/sh/eval.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/exec.c b/bin/sh/exec.c index f7788d0758e3..42ce5414922b 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/exec.h b/bin/sh/exec.h index ff4d5b3c20bc..6463a72bb06f 100644 --- a/bin/sh/exec.h +++ b/bin/sh/exec.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/expand.c b/bin/sh/expand.c index dfafe35fbaca..e1e5ac07b7bd 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * Copyright (c) 1997-2005 diff --git a/bin/sh/expand.h b/bin/sh/expand.h index 972032583958..f9fce10cc764 100644 --- a/bin/sh/expand.h +++ b/bin/sh/expand.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 5aea58650c67..c109cf20613d 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/input.c b/bin/sh/input.c index 26f233ebf7b6..e88d31be12be 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/input.h b/bin/sh/input.h index 8cf4df1e4044..70e6b06c72da 100644 --- a/bin/sh/input.h +++ b/bin/sh/input.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index a4cd76473921..af9dda11a483 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h index 149b85d7df80..69562e8c151a 100644 --- a/bin/sh/jobs.h +++ b/bin/sh/jobs.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/sh/mail.c b/bin/sh/mail.c index be5e76c221f8..f4469399eb7e 100644 --- a/bin/sh/mail.c +++ b/bin/sh/mail.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * From nobody Wed Feb 18 15:51:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZv6YJ6z6SNrP for ; Wed, 18 Feb 2026 15:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGLZv3j00z45M4 for ; Wed, 18 Feb 2026 15:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429863; 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=sR40p2FIIFWtk/8KNX29O1NF6qVnriqgsXELZLGDoZ0=; b=lIdu+uLp7sGQDL2OPwnpFEDdN3KZtIWl4dSi+x4P899i3kW18ba1sx3ZuOpWhAuA80aH2X 73ELsB9NHMbXCr0xy4UqSOBlof4U9yAHBKho5laHrY0WAh6BP6XxTKKMe7OkYlrrvSF2Zd IWZd8PfD1hpkt3UIY188h9SqER3YqTnyznNQGpxAEDIGkmcYi6qjHM6M/mfNwFAz4Eam87 RV1RR1HQq4X8t42d1WMDGzpOMNW3uC21XEzze5kpbM19FxOvSfui/qaVYARuKLkCDLF56C +7ZYUHWbKpoP11LtEJtbvbrqrFZl0rSCmTEk1jx2gpA/OCetQky56J/jL2mwJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429863; a=rsa-sha256; cv=none; b=IXpVhfFrF9Gk7DDoq7N3+QW5Q/aXjTiajd/6GGSqBNglv0r9iyWcFnp6PVP7/Koy6izJW6 rWb7gIW100FTHjDbj7zbX8KBohe7lAC5QGmAjyAlgkxHxoxdRkg9h5zVV2Q0RTtVqagXcI hK02bW4bsOg3AwEe0T/5cDzdNzhKXy9Q6pVzHgtHfzbPdyk8eO2bQem6Z/nAYKBJxGxrbp iQajw6FC9Ca59BcbwikQr61X0G//uR7Gzr5A7V9mo5iskaLQ36XBDWy2+ZtgakbUh8oDjW yZZPujocVhY2WAIitflShqp9Indi1B9dqtO7gx/upZDerg0YFaE2h4yz4eVyPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429863; 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=sR40p2FIIFWtk/8KNX29O1NF6qVnriqgsXELZLGDoZ0=; b=bXhH+cpmTnLy5uOiwfD8zOx9Jc6JRSrNq5T+LrIJLyCn275vIM4XNOeQCs17W6Ii+eJy2c dHE2LpVd6YukzIJtsI9NVQpti5cF0Na007sw61AkoTe5Y7M0HCnYEdIJt0+LMFkjGux6FM JX80WMABT6wXUsiCfEzzM2E3eqbS0+Vc9zrgcW+S22Tv4XFUrB+HPjmWE0RnqMYeScfbmM cCVi2tmGXcGhGSH5vzUuQSdeWG6pWxRcToNBid0CtFAxS5btA/SaSf5ZBZuP2Jpq5CJhQF 47sjkC8c8S/ecPU/sTdW7OG5+yb1ijk37+m0tfyPpsGP0GcyWRN7xDmFFn5Rtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZv3J66z129f for ; Wed, 18 Feb 2026 15:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 307b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:51:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: f4eccc3add7b - main - sleep: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4eccc3add7b91532396970913792fa264fc5430 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:51:03 +0000 Message-Id: <6995dfe7.307b7.1c8ad372@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f4eccc3add7b91532396970913792fa264fc5430 commit f4eccc3add7b91532396970913792fa264fc5430 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:11:04 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:22 +0000 sleep: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55215 --- bin/sleep/sleep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index 34d335cf4736..3be82dbd2189 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1988, 1993, 1994 * The Regents of the University of California. All rights reserved. * From nobody Wed Feb 18 15:51:04 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZx1nkcz6SP3Z for ; Wed, 18 Feb 2026 15:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGLZw4S62z45Pb for ; Wed, 18 Feb 2026 15:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429864; 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=CVGz/S7kAjFHlWmS7OK76NEgUigTdWsK1ayZJdXE/pE=; b=alsl9LlPW5Lu+pFp8vgys4n8DQq17kRDF+ropoIXAOkx2goyHp6SwBmnZJy6ec47BUWpok M3foXc5EbHa4KOdiCUEVNDpBCh9wk1C1qBj2aX1PlddC2aCtzcYSERDuyj9W0LmnXVulVr Wf54JLT3ps7XJT+hX4+Q0faxFPr9o1n2k4LUPOIrcCc9+694cVmnbU3Jgh/1LStDgJlYVt 26r6ER2uUeerBuZwWVaihgK1Z6HMq9KmR0xZXx0RmQsXFS3GIU68taPhzVmrghPcryBoGf KcHev3dcEmvNhBFX8+3bF8Jn0+6cbyVwf0tJnalbDvt7PCdv4d2doGrNBADvCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429864; a=rsa-sha256; cv=none; b=C20tyT078aSi36LGUSPQKwM8GY+y0irw+tuKosyhDRC/3wcutspRXAvGvoAnefa8EXYIMg ZMROM7RIwK2FfnmwuzdJvtQXVNp4k+JW1MGD2uSaYk1UL3I3OjcKbJ1hsbabD5ne4uFCsY D12Q/UryA9/3Gu/s2OesGouaqy+zmW6xpq+48mXMIKg3XdLMEBJjgM4X9V4VzTAinDzkXO kBaYFpNvAC6Ar11alV1mS593Orb3vQspeYvRxV3gcj+fu5D5Po6TnYNZClry5S7mtwO0Vd pN+HipXOuXFf42f181EK9QTSaj9dxNyLpdpvgx0/SAgjFz4sIqh1Mwd0NHja2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429864; 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=CVGz/S7kAjFHlWmS7OK76NEgUigTdWsK1ayZJdXE/pE=; b=QTeEyXU4ty+v3oEs5wVDTLrHvkZG7DRhP46+QfP2BBSwMp3oTTppUf3ok/+GWIV/HXlcDz gjNweGF5sSTMg5ONIXRJ9KIixj0cnGHJQrcBH1cdZIWkuqhiaWZWvM8haf+/KoZR+Q3NQ7 4VXiDe6MkOx66V6pnvhX7TUu3qQ5FwePEvU0iLkEy2zOYjJGWYNTf5k5Ws800vjuoIqY+O nE9IG6t/a5qx595e4vYtrwPi+MihkaHE3dPup+xc9zmHYWBnzSkn0HNIDdXkdIvWDghV7i GqGO/7v4PKYLpUvqjWoqsG2vQAyfPcgzbSR3JKNaGHfm5EV7VV1VFipzbwJXsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZw3yfKz12gB for ; Wed, 18 Feb 2026 15:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30596 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:51:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 0486b5243f09 - main - sync: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0486b5243f094160fd782c1dc15f28392072b259 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:51:04 +0000 Message-Id: <6995dfe8.30596.330f1ddc@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0486b5243f094160fd782c1dc15f28392072b259 commit 0486b5243f094160fd782c1dc15f28392072b259 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:38:13 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:22 +0000 sync: Add SPDX-License-Identifier tags Reviewed by: immp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55216 --- bin/sync/sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/sync/sync.c b/bin/sync/sync.c index 7560e794d35f..f4619d94c36b 100644 --- a/bin/sync/sync.c +++ b/bin/sync/sync.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1987, 1993 * The Regents of the University of California. All rights reserved. * From nobody Wed Feb 18 15:51:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZy125pz6SNtd for ; Wed, 18 Feb 2026 15:51: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 4fGLZx59rwz45Rx for ; Wed, 18 Feb 2026 15:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429865; 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=3ogRJNmfWehGMycgrbP80oiTLEV/DqooD1lqTOcoHZM=; b=B1zFKa7th+BMfL2Sfk41ePebfTtDBqFdBctGj8UnasmiSFDsuZf91pmW6Ln0DPZP1+AGla FYkW1e61xNpo36UpmpPIwleKISdY1jCv29U31vWMsDGjUYnuWA/ITK4l9XxKF1l+snwPUS JizucuY6CmV9FaAw11/aQUR/VK6MvYZvhr8VbbEA28qVPmIsrbEj4Uj6BG1yo12bPKnc1z 4Lo5ec4xnrGfDlyanZDiMJZZsycCo6Z4UstLGh7XyzxpgMUlgPZRj8AirCYksnKTDCJce0 W5VzSqWcU6TDoUnIFksDQQ27fu8uof0g191LuulOTHqW2plxHBN1dd218wdryQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771429865; a=rsa-sha256; cv=none; b=kf6nbVNnh96mUo0xl5AetufviuVsAIcKQYQtHr4nXr8392Den9plyty006AmUJWCEyhWX3 vH3DIEmHaaWMaSR58/nubiTrl99gpDebAXKuWrmr7kWEzK31qhgrOt0iZNVYwoOBfoob+y 5EdmT8C8QpZCEqmln+wrEhzSu6hkGXhTBJenIbAlrQZwG1iEvnXK4nc0S6PfcNij3j4s33 w2nBwVlQWmJiIxCL6KZJzwsD0UEox/8LodxPmFqM5HBdTZrQmpilCfFAmJjXqdrhd4p4cy p6mHgVf6wtDAAZVj8JgTYOT+jKIIjLIeCmgaBk6ZlOhlqsJG5tLyCMGaXJakCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771429865; 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=3ogRJNmfWehGMycgrbP80oiTLEV/DqooD1lqTOcoHZM=; b=Vtt7nb9229PkS4Tb9oAnA/WQG99KuRLzeeUX0k7muaODMU5r7yhCvss8FVcO4257Yf6KBH sIafOMcZPvohGRU/qJaViyWCGn1l32Y9p2cFjZ+ZsdkwnFKSiuXZt+uMOP4PAuFpZEYKJN ZvOgopVBjfaikW8qY6ApiNdSvMt1LppQlWf0pyDuH87mRRt5skFgiLWMjz56WL10qQCn2O poayeFfebn3eCjxaWFRUtpgOoadOSeTVp1YpaOyVuNBKJkM8XOJ6flcX3YPlePk1Pa0FhU aBfAcHRrCcViffuTGL8fda66VDFzfSjdif4cJIUoLHTicqCHK9ZIi4e8kbycsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLZx4kycz12C4 for ; Wed, 18 Feb 2026 15:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3072f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:51:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 743a7f954c27 - main - stty: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 743a7f954c2720fa318e9e1f7ca1c549977560f9 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:51:05 +0000 Message-Id: <6995dfe9.3072f.f9d4426@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=743a7f954c2720fa318e9e1f7ca1c549977560f9 commit 743a7f954c2720fa318e9e1f7ca1c549977560f9 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:11:41 +0000 Commit: Ed Maste CommitDate: 2026-02-18 15:50:22 +0000 stty: Add SPDX-License-Identifier tags Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55217 --- bin/stty/cchar.c | 2 ++ bin/stty/extern.h | 2 ++ bin/stty/gfmt.c | 2 ++ bin/stty/key.c | 2 ++ bin/stty/modes.c | 2 ++ bin/stty/print.c | 2 ++ bin/stty/stty.c | 2 ++ bin/stty/stty.h | 2 ++ bin/stty/util.c | 2 ++ 9 files changed, 18 insertions(+) diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c index 4a65d1b518d5..aaa0c5bdc39d 100644 --- a/bin/stty/cchar.c +++ b/bin/stty/cchar.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff --git a/bin/stty/extern.h b/bin/stty/extern.h index b6029396445f..c27a69c2a19d 100644 --- a/bin/stty/extern.h +++ b/bin/stty/extern.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c index fbd21382dd82..973281e10888 100644 --- a/bin/stty/gfmt.c +++ b/bin/stty/gfmt.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff --git a/bin/stty/key.c b/bin/stty/key.c index 6e8f635ac237..a5b2758ffb22 100644 --- a/bin/stty/key.c +++ b/bin/stty/key.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff --git a/bin/stty/modes.c b/bin/stty/modes.c index d63b958680de..0c702f97f86c 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff --git a/bin/stty/print.c b/bin/stty/print.c index d7ab2abbcf14..f9d3afa34a38 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff --git a/bin/stty/stty.c b/bin/stty/stty.c index 38834aaccea0..3051536c7cc9 100644 --- a/bin/stty/stty.c +++ b/bin/stty/stty.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * diff --git a/bin/stty/stty.h b/bin/stty/stty.h index 64ad2945cfa9..87df400cb8fd 100644 --- a/bin/stty/stty.h +++ b/bin/stty/stty.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/bin/stty/util.c b/bin/stty/util.c index 4077ee354f8e..e01a08e90225 100644 --- a/bin/stty/util.c +++ b/bin/stty/util.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * From nobody Wed Feb 18 15:57:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLk11QgLz6SPTC for ; Wed, 18 Feb 2026 15:57: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 4fGLk06lNjz3C99 for ; Wed, 18 Feb 2026 15:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771430232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YegtAYKDn4ZKIXqVCUEO6iplfiEDUF9bTvkxrS3F8LU=; b=laSBgez1hn99mWSME9mYKNRTAyAL9vT1vLs42CaO3miNblQeE/FeWu+VvPZJfpTKCjh0cD /LxHzB4fQ64/UyP5P8u4K2UKJAZA8ZOfj0yUZkK3N1C6NmRnIX6FLqt4YawPJxSxE5Vj1L oSMYmNSL42TR4HDH0BbLUCZaZFW0l0s5H6aTEVFkeRpDgkSD4anD7Kuz4JQRJw6612Dx6h 7DA1ZPFJ3JN3/lwpF9jMMMFVVz5fh+mIR9XyKzWk73jfexQxY0Lo7XzvpzybSrUU44B0in N3kQTbltrBbPeob2+XAFJkdxzdQ06YamMj46GYMSgyQsXe02v/zpPjLtRlebLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771430232; a=rsa-sha256; cv=none; b=LlZJeJ0tUo+vfnluwkoue3nBVhtoXT5v4oZSe+zGYNUXJAuQLWNZOsq/fgDV5GIyKyNCqA slLKSJb/10cDzTMGgjGfZFFq+AyQkUwZUYnKoWc/QDXCDFgt5Xtho0MEyulq9H9ALIW+A6 dqhTJkZYQYlMKYIdTyoYR6T1ftFnAtY40SoIU0vepqMAH+rY7oRyKCbp2hLcDMCxU8AwCN jvEq4gYxflEqorC5LTWiPpJdLWz3MP8UCqNPodpkwXMjFZFazDFGTdYheJQwVo5n8D2b83 8ARAY+KJie31V/G/dss7s0tFtE8ZaMv1GnwxSYfWNZAwahFK6/UO0aMRIuNgqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771430232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YegtAYKDn4ZKIXqVCUEO6iplfiEDUF9bTvkxrS3F8LU=; b=tBL/iMvqdU9JLOgxg7DszykATuKpkqYvsWCMbD6UkR/ShCy1+4iONoQnYvfNJFoiosDEug jNmSXbCxEGKqivVY+REZNfVelQG3Y8PW6GWUdlkPWgwbmM8x794wFnHvKIv14Q0tW4IFxJ P06ZNcZevrOMpvdCAFI0gDijnamV6Ny9+SdSh2d/Uu36Vqi7yMj+Fh/yc6tQPPGu//KhhA JAxTzcd4PE+5YtRay33AYuLMYHn2s7PnNZdp8cdu0ylZQW45q1zLOeRD3bzdhNtJD5C+ht xtR+a1MPmVD8lY47qykrN+nTY7T10LKOcj04Tl2Ak+Wab8BQdll7Bk6WaVvkFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLk066p9z12mq for ; Wed, 18 Feb 2026 15:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30512 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:57:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 3a960425df75 - main - arm64: Add more HWCAP values List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a960425df759a7bb8f946d23f035c63f3a5de7a Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:57:12 +0000 Message-Id: <6995e158.30512.10d57b78@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3a960425df759a7bb8f946d23f035c63f3a5de7a commit 3a960425df759a7bb8f946d23f035c63f3a5de7a Author: Andrew Turner AuthorDate: 2026-02-18 15:28:14 +0000 Commit: Andrew Turner CommitDate: 2026-02-18 15:56:46 +0000 arm64: Add more HWCAP values Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55219 --- sys/arm64/include/elf.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h index 81ee7392f866..a5a90f8c7712 100644 --- a/sys/arm64/include/elf.h +++ b/sys/arm64/include/elf.h @@ -135,6 +135,21 @@ __ElfType(Auxinfo); #define HWCAP_PACA (1 << 30) #define HWCAP_PACG (1UL << 31) #define HWCAP_GCS (1UL << 32) +#define HWCAP_CMPBR (1UL << 33) +#define HWCAP_FPRCVT (1UL << 34) +#define HWCAP_F8MM8 (1UL << 35) +#define HWCAP_F8MM4 (1UL << 36) +#define HWCAP_SVE_F16MM (1UL << 37) +#define HWCAP_SVE_ELTPERM (1UL << 38) +#define HWCAP_SVE_AES2 (1UL << 39) +#define HWCAP_SVE_BFSCALE (1UL << 40) +#define HWCAP_SVE2P2 (1UL << 41) +#define HWCAP_SME2P2 (1UL << 42) +#define HWCAP_SME_SBITPERM (1UL << 43) +#define HWCAP_SME_AES (1UL << 44) +#define HWCAP_SME_SFEXPA (1UL << 45) +#define HWCAP_SME_STMOP (1UL << 46) +#define HWCAP_SME_SMOP4 (1UL << 47) /* HWCAP2 */ #define HWCAP2_DCPODP (1 << 0) @@ -202,6 +217,12 @@ __ElfType(Auxinfo); #define HWCAP2_SME_SF8DP2 (1UL << 62) #define HWCAP2_POE (1UL << 63) +/* HWCAP3 */ +#define HWCAP3_MTE_FAR (1 << 0) +#define HWCAP3_MTE_STORE_ONLY (1 << 1) +#define HWCAP3_LSFE (1 << 2) +#define HWCAP3_LS64 (1 << 3) + #ifdef COMPAT_FREEBSD32 /* ARM HWCAP */ #define HWCAP32_HALF 0x00000002 /* Always set. */ From nobody Wed Feb 18 16:05:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGLvB41VBz6SQFd for ; Wed, 18 Feb 2026 16:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGLvB3XqCz3DX1 for ; Wed, 18 Feb 2026 16:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771430710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WLBur0/0e14QZmllaaaEm8Am0sK3W2u4q/EGZJ/5IBs=; b=q4rotQs+9Nip8GnOtcfIfjxNoDeIy5AmyuRgxQNIN5d/H6rzJr0bJrHZb6+gM4evDVxEU2 C04G5d4/DOBda1awEpgFqopefCLPznupVpD5RAp6y7HTOSV2kEebaPjkQAJ8tpKprpuc5H SWYpwSb6CFEtA0UUm1VWWnbJM6CgViwsTVDu9tl1j/DodlkbfwiSn/mD+x3rJH3D7fWUnj R4WojE6oJ9h+cfRRHm0clvbjRLh/sK4/PLsV2J1aHs0dxiKb6N8JR8x0aCOGx1N6QRBYC5 2rhOr3wYhxRf07p8Jm5VxDdH1Req+Ncd1Eds8jGqZov7O2oGQi7eQpA7sXZCbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771430710; a=rsa-sha256; cv=none; b=ZHyMYJKJ3JsL1R60OeMMwNcoefvHqeNyeTTawdE6aqTg5QqSYwjb/KNB8JakPVgrDzkDDl QtBd02Z9l493z7RKHn5Y3x8YDJMEcxtcq1AliHM5j24G1iMMrYAuadcLd+NoEZalM6qL5z UDA31dZewdEdQnuiSF2aoSbJCIRLJsXvKyx0WvpKxvhqNbRwXxz4m5DnGdxHq2I5I0sTdE hIkJAqaCPtpO/TRr0KsS/pVDdNfXR72m8DCfg+++P5SxlAd/Fz1rmiE3S+XsfOhp8Q9lsq ppsXP1sPA4YlYwfoFC4ENH9k0gs+waPSP5Vtvl2Xb7g/skw3xXBUs84a4qmH6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771430710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WLBur0/0e14QZmllaaaEm8Am0sK3W2u4q/EGZJ/5IBs=; b=RnAvIaODiE9TfZV49e9FAcOad5mfu27hxrJNzYMOHZw4g3qzGL+bzF1gHjDxLeLbrrSIKN WkLTCbzPmFeHQ+ndwcE0tPi6o0i+88CUzBDQBqb8M3eX5uIuKq0zlci/4n4z5MiHxjrdOm AmdYrB97YPtyq98hcr584MHKYg8HexL+/W3L84s8dyN21iv7AW/L9+qKykbXKkx/fNDNE9 hfQcEGd6bwoxgWm2r5UsK3I9udpkE/mbSoJl3s9fQG+gitCVyUowJy903UR2cZLA6cjhDz JbGdQJ4OL1vtz+RKfVkRInOEpOIABslU/TquUToXJT/jhwUOixxLiTKERoFNvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGLvB2lhfz12dx for ; Wed, 18 Feb 2026 16:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31e5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 16:05:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 349808d8bd19 - main - pcib: Assume a window where both the base and limit are 0 is uninitialized List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 349808d8bd197165390a286bccdaa29a1d77c7ab Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 16:05:10 +0000 Message-Id: <6995e336.31e5c.551f1ab6@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=349808d8bd197165390a286bccdaa29a1d77c7ab commit 349808d8bd197165390a286bccdaa29a1d77c7ab Author: John Baldwin AuthorDate: 2026-02-18 16:04:54 +0000 Commit: John Baldwin CommitDate: 2026-02-18 16:04:54 +0000 pcib: Assume a window where both the base and limit are 0 is uninitialized Since the low bits of a window's limit are hardwired to 1, this configuration looks like a minimally sized window at address 0. However, PCI resources are not generally at address 0 (see the __PCI_BAR_ZERO_VALID macro that was only defined on sparc64), and some PCI-PCI bridges report these register values after a reset. The result today is a lot of spam in dmesg as the minimally-sized windows fail to allocate. By ignoring these windows and treating them as closed the end result is the same, but there is less spam during boot. Reported by: jrtc27 Differential Revision: https://reviews.freebsd.org/D43922 --- sys/dev/pci/pci_pci.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 788af7339418..5cdb1de71c3f 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -437,6 +437,24 @@ pcib_alloc_window(struct pcib_softc *sc, struct pcib_window *w, int type, if (!pcib_is_window_open(w)) return; + /* + * Assume that a window where both the base and limit read as + * zero is not really open, or at least not assigned a valid + * range by the firmware. This can happen if a bridge device + * is never initialized by firmware, or if a platform driver + * resets the bridge. + * + * If devices behind this bridge have firmware-assigned + * resources in this range then the window will be reallocated + * on-demand. + */ + if (w->base == 0 && w->limit == ((pci_addr_t)1 << w->step) - 1) { + w->base = max_address; + w->limit = 0; + pcib_write_windows(sc, w->mask); + return; + } + if (w->base > max_address || w->limit > max_address) { device_printf(sc->dev, "initial %s window has too many bits, ignoring\n", w->name); From nobody Wed Feb 18 16:26:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGMNH5BKZz6SRjk for ; Wed, 18 Feb 2026 16:26: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 4fGMNH4XsPz3GB3 for ; Wed, 18 Feb 2026 16:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771432015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jcN2v40dkxilEVidWf/l5Xv1WIg8uVuKYst4atWrRUY=; b=UAJCGmvBn5JaOYeklHEvhhqppwfeIbfcXvvZyv40oDwvsZczNI6KosecuLI3OtMlYvUct+ 0ke/RG0Dso/wpV9wKfpT6RWQHf+NACawe0OgFQEsoi/PAomuTBJ8mCYwPF2FRXG8yXo7gW zU5QX/EiBKd+wyfnF34OUCG2Dn/JYTBwMYMbpyUSM29cFfN3HqVV1YsIqT9XziAw125dK0 Zc+0vVkZQbDKwnDm+TkTwaJxEFR9EXwqAo+o4lgveY5bqDYShXQub9s9PqAxa1qD1mRKrU Tzbz65oC36e6RNRAPffEXR5v2eVs1FK2IpnKFsPKUTbJZvuQdBkJ5p98XNaKcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771432015; a=rsa-sha256; cv=none; b=TNVwK/YcRc9AHUchTeptVmo+JSgn0F8mMu/h7kZ1IqhBMjllSZfs70U3FwAelB+oNSRBdb BWaCmjZ9NXtjKsJFWbCk26RMhp5IkBQY77mdlCSpq07Nt6o2M2t/Yj43SONcpDgrHUHBPc pKK2sRiQFSskVWft1Ojayw2Qnc/euNsisPpMt2Ggo/a9E2fY0/EFiSnW0VrgKDzNfhTQ34 djwrxhIiu+JcxKW4oRL9ss0SzJQugt4tzf4pz0uQT0qBNWXrro0R96InP4EAD+oBtcKbzg Eul//qf/LI152mGb2TzRTuySJUp+09SfKAswQPUtuYfxF7nEDmrXCj+slBaOpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771432015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jcN2v40dkxilEVidWf/l5Xv1WIg8uVuKYst4atWrRUY=; b=bkOSt8Um/z64RXpxxwDOobt9To3XDIr/342SNwBIlaznfNDS8CZW2h6GG3XWtCfUWOy+p4 idoMNnUNaE7BxIySG9NJ5pEpvDGPbrr6OkzunfjMS1IMWO0RdByZLmkkyXhODBqALPpLCR oOuQYBdi9MMZIqgHn1k6QxyBXQjMo5yfbCVWSmJY30Mm6wRJA90zBuD2Px3XyQjh7pq+qi VMm4XoCagRGMXLGKKKMHIh2U7L+GqyVX6B1YT+KLNXIk61vROjnZKpcch/O94vtJdi1QuB edU8s3IlXBPIeA3TdaTjman73YXDPSq8leqI6AH+jwNUQkWCFbzGGYnuk1v88g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGMNH3B0Tz13fX for ; Wed, 18 Feb 2026 16:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33613 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 16:26:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: b2ba4131b9b0 - main - intrng: Shuffle unhandled interrupts too List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2ba4131b9b08d6231392c0b798d0ff35809f600 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 16:26:55 +0000 Message-Id: <6995e84f.33613.11c3a9c3@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b2ba4131b9b08d6231392c0b798d0ff35809f600 commit b2ba4131b9b08d6231392c0b798d0ff35809f600 Author: Colin Percival AuthorDate: 2026-02-14 00:35:26 +0000 Commit: Colin Percival CommitDate: 2026-02-18 16:26:37 +0000 intrng: Shuffle unhandled interrupts too When interrupt vectors are first allocated, they get assigned to CPU #0; at SI_SUB_SMP / SI_ORDER_SECOND (aka once we have multiple CPUs), the intr_irq_shuffle SYSINIT clears their CPU sets with the effect of forcing them to be assigned to new CPUs later. In case where interrupt vectors were allocated *but not yet bound* this code did not run, with the effect that those interrupts would remain pinned to CPU #0 forever. This affected the ena(4) driver, which allocates interrupts for I/O when the device is attached but doesn't set them up until the interface is brought up much later in the boot process (and, crucially, long after intr_irq_shuffle runs). Adjust intr_irq_shuffle to clear the CPU set for an interrupt source even if it currently has no handlers, so that it will be properly assigned to a CPU when it is used later. Reviewed by: andrew, mhorne MFC after: 1 month Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55284 --- sys/kern/subr_intr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 3de753a5192f..52170f083624 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -1291,10 +1291,22 @@ intr_irq_shuffle(void *arg __unused) irq_assign_cpu = true; for (i = 0; i < intr_nirq; i++) { isrc = irq_sources[i]; - if (isrc == NULL || isrc->isrc_handlers == 0 || + if (isrc == NULL || isrc->isrc_flags & (INTR_ISRCF_PPI | INTR_ISRCF_IPI)) continue; + /* + * We can reach this point with isrc_handlers == 0 if a + * driver allocates interrupts but does not set them up + * immediately; for example, a network driver might + * postpone calling bus_setup_intr on I/O IRQ(s) until + * the interface is brought up. + */ + if (isrc->isrc_handlers == 0) { + CPU_ZERO(&isrc->isrc_cpu); + continue; + } + if (isrc->isrc_event != NULL && isrc->isrc_flags & INTR_ISRCF_BOUND && isrc->isrc_event->ie_cpu != CPU_FFS(&isrc->isrc_cpu) - 1) From nobody Wed Feb 18 16:55:09 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGN0s50Dnz6STwG for ; Wed, 18 Feb 2026 16:55: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 4fGN0s2xt9z3K3t for ; Wed, 18 Feb 2026 16:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771433709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcoLi5TS0txCzFtvRVRnoVWuE19CQlcXSns3xk4M4IM=; b=I85u48CK70DNyZYFZE9ENq9AhrzvyTzwHF2bRjxtF4ag7Wi7vPQq0oCWl0pRz7iTfgqK8k j8pgszk1mVq7bWS9sRDRsDhCzenwe8NzHivXRZLLt46A0caNd458p5wiJr1u1D+x3QGSdF bAyVQjLUmHqjIwtD2yFiGUeae9aoqqz6E6X4aXVXWMFqD0Fpt4V+4Lnz6HGVyuL4vdXzS2 7TtvooU8iAaqpUd3WhJei1XVziy/9IDrZkWdzgTLT1hqyrmEO00VFSzJKNF3bie8bvrmsA 3a/92uobdFbPlSugliKMJn+zV0eCRWhu/LpipsZCXO4vxV4mXGYIh+bdbPdxYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771433709; a=rsa-sha256; cv=none; b=fSoPfYBPInLS4lWWr0LTinjincCNfQPMcsWYQmeeG/QY/yEyJh3DSXvroxy7VrKZeSV5Ll pJRrwKUTjDzbIPvV1z86npJTJrupjTgt4Yik+EMug9IKTE94ZwDRozD4mUWqi6xyzdiuYm +ykFO0mrSX79ES9yasoRFw1jd9oeWw5p7OxBF48WS5n68B9WVsrVGe80yndcl82UTcbqe3 K8CgOeDExu+NQqoGG36kRXWs1wN8Fc4JMT2zSpZHx11q26Uz3eMAISjATfKC11IiGKh9QL X072SDcV0zJ0ecXS0HKUYI2eVjZCulEsCNvt4zhDL7utgQvz0eKxw55aLbWreg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771433709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcoLi5TS0txCzFtvRVRnoVWuE19CQlcXSns3xk4M4IM=; b=IqAobNMRhipIAEPNe9iP1bvu2i8u5kNCkwFK1nQ6fn5UVtBCs618FbYOtltgX+VYtiJRKt Lx0QnLraqDXY9jIfQvRW1ITbNMWctPJDwqthrNsjfx9iBoXHRaf1GiqA1Lw2z2OFIAhdb+ EOU7FvwlE4nAJeihcBjbCWDS3sQWCbrfJ6xNzbtkdGaFhTufL89W4MlmEKWQkMdskbeA2j wO+9goFtJoq9+Z7yTnBsxT0uoilUJT69sKIFchMek2Zq1veCAfLv+QtHtdXinvdOwrloV8 WOmZ5PuP0bcjlSxx/Eu+PyBFa82uY2ibMzao+E5LpkZodWYBQoA3Lm5KVd4j9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGN0s1lk8z14P6 for ; Wed, 18 Feb 2026 16:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37955 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 16:55:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4fb507cae916 - main - git-arc: Tweak heuristic for email address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fb507cae916d04fcd1e80e69923c5ca5c4340eb Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 16:55:09 +0000 Message-Id: <6995eeed.37955.6018fb3a@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4fb507cae916d04fcd1e80e69923c5ca5c4340eb commit 4fb507cae916d04fcd1e80e69923c5ca5c4340eb Author: Warner Losh AuthorDate: 2026-02-09 16:14:16 +0000 Commit: Warner Losh CommitDate: 2026-02-18 16:39:28 +0000 git-arc: Tweak heuristic for email address In the email address heuristic, assume guest-* are external contributors. It's a new convention, apparently. Sponsored by: Netflix --- tools/tools/git/git-arc.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index f15cade1f1e7..23b855aef8af 100755 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -459,6 +459,7 @@ find_author() # commits reviewed). case "${addr}" in *.*) ;; # external user + guest-*) ;; # Fake email address, not a FreeBSD user *) echo "${name} <${addr}@FreeBSD.org>" return From nobody Wed Feb 18 16:55:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGN0t5gh3z6STcq for ; Wed, 18 Feb 2026 16:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGN0t3bVVz3K6P for ; Wed, 18 Feb 2026 16:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771433710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0oMxkiYDM7W4drXV9R1+izdmbqb+9dXTdhFHJRhyqg=; b=gJzaYBme3VwWAp7YiUUKPgCUGsxfyrJOXGXkxzeFxIbDPMQRSNjmvormKELN1rAB7q2wI7 oYRB7kg868mBTC5zMuPZvBSqrXd42WokNTAkTYVQtEfP8DOzcsBhpx7TyHhpab9/bX07Fp fipEiSan4UZVBiig3L2OA+7GcDfCzBNkCMk31JBMnqs7lUUFM+j4hWZ83LArW2GUrj9+tj kXc7wjDQVnF+KCVgS4GcX3aalfmGLbbz8Rb+NQG74ADhdvWA1LSN/MrAGQNSxTMdyZlkLu 2JoNO//YIbG9Xd7plifj23esnW1EOM/hKvcdtbIKQp9uMT881Xf05EeVvIeWaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771433710; a=rsa-sha256; cv=none; b=FbWRtBZugEIlbgLHwTnw5FaaTXJ5trO5cAkY2xSGVnffPg1eOIz+QIXJgVXy1Px2EpQzEn pCC80nwulUGkMp+nWRBzuPTFkbDWy5kQSFbd1bSv+Lkzw1fOUYJ34ISs3qTZB6huFYh9ke YRzBT/2pddcagCEzicqCooQo1ByAZaqBGQdAOJje5QgCwR0v0YtsxwhCMFvtf87t9AXZUr y04DEKMA/ikCsHq4ZIW5/ZB1kPo0OD7QQpWJNEnrlaTTqLXXkK78iJ8wd9YI79/lHuayAR iQI3I+d3hSVvKDsqa4X/QUS1g017UnLbNOH/RI4p7cVwWDGoAcx+mdVipFf8SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771433710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0oMxkiYDM7W4drXV9R1+izdmbqb+9dXTdhFHJRhyqg=; b=n2ARFv/IyZ9Nk9PZE6MBK6MP8ZJkLQR+Q1cmtpEBDLm8s9cA7sGusdbrNHXt0bFT27NCOX ANv8RTxMVf3+OU0C9CqQCsw63eQe2RiNZcwMUBP+rI0TawXbwp3FbohnZKepTBCUL8J5L0 84rUNJ2SJejeAHz2Dpnoux9qeQ1oiHM10Uc/28wiN2vlEk/qKzJsa5b9ciiroD8qoHq0JY Z6mD5891t60sbxcJhrKgEEJWdiPK1C9x/87xH0OztAi7001wDU4cSd6G9hfNNMFPyhQWys HQscxCc4XMC3wgact/H9zr+y+pifHUBh/kViXx+oJ+s8HNOjHig19thbGTd2jQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGN0t1yGcz14Lm for ; Wed, 18 Feb 2026 16:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37508 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 16:55:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8e593a1f1432 - main - fortune: fix netstat tip List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e593a1f143203cace2e14bd6629a8ebdf9b47dc Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 16:55:10 +0000 Message-Id: <6995eeee.37508.1de1224c@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e593a1f143203cace2e14bd6629a8ebdf9b47dc commit 8e593a1f143203cace2e14bd6629a8ebdf9b47dc Author: Warner Losh AuthorDate: 2026-02-10 14:59:58 +0000 Commit: Warner Losh CommitDate: 2026-02-18 16:39:28 +0000 fortune: fix netstat tip netstati 8 reports in bytes per second (averaged over 8 seconds) rather than bits per second because it reports the total in bits over the 8 seconds... Sponsored by: Netflix --- usr.bin/fortune/datfiles/freebsd-tips | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index 379f772fea88..c73f5d01c520 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -856,7 +856,7 @@ $ fc-list ':charset=0x1F4A1' $ pkg which /usr/local/share/fonts/noto/NotoColorEmoji.ttf /usr/local/share/fonts/noto/NotoColorEmoji.ttf was installed by package noto-emoji-2.042 % -When netstat reports every 8 seconds, it tells traffic in bits per second: +When netstat reports every 8 seconds, it tells traffic in bytes per second: $ netstat -I bge0 8 % From nobody Wed Feb 18 16:55:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGN0v4HWCz6STMv for ; Wed, 18 Feb 2026 16:55: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 4fGN0v3BNJz3K1Y for ; Wed, 18 Feb 2026 16:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771433711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzHgSDC7Vzq0tD7PRUikRWbehp0TXlNsmNc/+Oz6nKU=; b=Cbbh4G5SZTEXSnCtkjC0fgRGNyl6DrL4CS1IaK4tO1CI4EuStxBVbZ+RGyIOA1QhUMhmmS FSv7trtCir7P8MKZ7qBnzSHl080pdthPlPFKhvjogBznCJBEbrd/6fWXackLW4sQACo2J9 Q4P/mjBTlG9WfyGmYzqGG3chjqUD8EPD2A+QgeGKi9+evKJS77LqSoLIFBTtwm2oEGm14v ALH1qN/Rqstb6ag3jyj1hlQ/j5ZeFbWtdGKBZrUPw6dX16siamBZSP9pOv4Ln0KKrRC1qB ceVbl7FuaW5c2DeXdqn4yuMU4VVLUOyy1vTRJBpcdWPgEEhMtafpNldn5SnrHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771433711; a=rsa-sha256; cv=none; b=j82oyOcI0OEVfiCXpI88fSm7IbdlGD3zM4poqPqDXkdfC3OQ2Y/1jWsK5wSLuRchxcMyjh 9pZLB2s2HAuJ7pB2SfwuYk6DGJGkxSM1qAunG0eDyg9mhign+PBXW97vr995xi7tmEsZZu /yOqsqGXypwTxcOfWbj4O0MuC1NyQKYQjRq/dp+E0jJss2RGwUg+Wy//OHD/yO+h1Ixn9G Mb6ZbqSDzPx6c2h9t5Q7iwRidj5H5zLAoTdQjZ30etXgI99b2qTv32C01n2N6jq7VRkiNb MV2ZYt5KC2QXSZklGjj1xjh7IMUD3q37KzWXEWBkGytIbcWHQjUnfANa+FKopQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771433711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzHgSDC7Vzq0tD7PRUikRWbehp0TXlNsmNc/+Oz6nKU=; b=yH/misopvaSN/rihuzddPRt1jS4qREMUuS9YfofwjnwUki86jH9roYo4NaTIvbhcNhUaAq gTcJicCXyXYsVhT3J1PJ2BmKAYiFb6AObNIm9CqmZNPgxdbH0yNyPPB5WudeMfGTtKWfUi uDnzCbBj3PK7A/xyBpzRODvXkRk5PnD2Hp/I8RjwkNXMQfUtw6MvK1oRYji4Gfga7anSYh IE/M+BrQ9X2M58qscNHPms5r9keXt0u32kpUUhNTwKDfrAcXuZ4UNrdid/3ljvxIHnExa5 bzzqHEwLHhANKK8DaoQmr30EzkVUTDIivdY2cTLu+E6iizkJC7Zu6mBtCLOx0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGN0v2h81z146c for ; Wed, 18 Feb 2026 16:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 362a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 16:55:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c8d63d63679f - main - nvme: fix panic if we boot w/o a namespace List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8d63d63679fc0d8a67b33499a2a2edd444c8e2e Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 16:55:11 +0000 Message-Id: <6995eeef.362a7.15721196@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d63d63679fc0d8a67b33499a2a2edd444c8e2e commit c8d63d63679fc0d8a67b33499a2a2edd444c8e2e Author: Warner Losh AuthorDate: 2026-02-17 08:00:34 +0000 Commit: Warner Losh CommitDate: 2026-02-18 16:39:28 +0000 nvme: fix panic if we boot w/o a namespace If we format a drive, and then crash, we'll come back up. nvme_sim_ns device won't attach because we don't have a namespace. Some drives (all? I couldn't find it in the standard) send an AER with a namespace change, which causes a NULL dereference because s_sim wasn't initialized because we didn't attach. So, if we get into the ns_changed routine, bail early if we didn't attach. We'll attach later, and deal with the ns correctly if it's really there, or not attach one if it's not. Sponsored by: Netflix --- sys/dev/nvme/nvme_sim.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index 8b861cf3aa71..a59823847c39 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -405,6 +405,16 @@ nvme_sim_ns_added(device_t dev, struct nvme_namespace *ns) struct nvme_sim_softc *sc = device_get_softc(dev); union ccb *ccb; + /* + * If we have no namespaces, then we both do not attach the nvme_sim_ns + * device. And then get a ns changed AER as well to tell us about it + * (which is how we get here). If there's no device attached, then + * there's nothing to do. sc->s_sim will be NULL as well (since it + * only gets set when we attach). + */ + if (!device_is_attached(dev)) + return (0); + /* * We map the NVMe namespace idea onto the CAM unit LUN. For each new * namespace, scan or rescan the path to enumerate it. From nobody Wed Feb 18 16:55:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGN0x1qGKz6STyW for ; Wed, 18 Feb 2026 16:55: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 4fGN0x0CnSz3KG6 for ; Wed, 18 Feb 2026 16:55:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771433713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4JTMZPTAeN5rqBW9AZGv0oGwQn4mCgmaO1jh7lnXPaQ=; b=V59HT4eEcHoOkaXUIXIJh7t2F/JIKAZJ9S16bYtFKgUJx8pT1K6UZfdPAlXHUCn/hEXjlt 8nNjiX/k+2tpdspJSR7AeISchUB/Wwkrwlh+B7WQorYFCcISV/fYducAQTta2fafkv2uI1 LeT3xNvv6isUWMVeDkKErEdEuX2VzLq1e9P7Xzb+Pm0IT59oLilBECLX7QTe5g8kOrZG24 5TW81ULk0hEF5AWeM+x5RCasPeV3qmwnBUbMGLuDbnbXIdVwPnOMMD4k1x4UijVSZV/8iJ 8UgiL+UypnaaCJRQWTxI9iw/yiUSQgyZLr0jBwdUo88hXX8QTjfw5zZBuMCgMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771433713; a=rsa-sha256; cv=none; b=n9HgiVfq8G+tlGvyYo7LoTtaWXX8h1juPE9kaR6stFK2L29jrM5dk/Fe0XxWwxUrCQIOFc 62HO5wuosT1e5CdbrxJv/YopYq9K6Bp938U7hYqTwU4eIGQle8MJzvrp6VizgG3sRhtIZE 9cdLwJCiGQW24ymlWoK+sy6ASZAh/zCS6Z/7xyBl7AYjaGguubVpe7CHjAVg8RcQnJHoUS S1lk3GM3W7ml59JwaLWpskadpwofBvN2Qi+uu4Q2oIh9DO45VBjuL0HcbklUgj+o6E9pPE 53MMQmWUefukrRMZq4/muFv81/leksEwmeNsgg0yibcOeyg2UUrT3vX2w95UHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771433713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4JTMZPTAeN5rqBW9AZGv0oGwQn4mCgmaO1jh7lnXPaQ=; b=hr9u8hiFkH9TQtXmS4qeGIFKkYJf2eFyM7PM4E324ZbVYsEp1D0xm8hQPr5MwFOT68it5V +ORPAJkwXwL1JM+afspjeGLv0g5bABYzNMNRe+0oqFlPiQeLM8dud5ztJJBPs2q5oUtIV3 i6v6n0T8tbigW5uJuYSBN9Ai9Aud8A0fiTQKGT9wqKDqAT1A9jFaZNWFU8UJvKjRxt/bKe KZm5WyRaTTqnaBF+ikUBUFomAdwVa7R128ROLl9vUf367B7b5R/DVSGlibT3nV2GJM4ybW K+s93oZ7T+WVy/ld6WJFtqHz/TJVdvRdiEL3BjxKOTqEfHRleHDrTPrW7f7w1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGN0w3Sxpz14PB for ; Wed, 18 Feb 2026 16:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37c47 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 16:55:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8aa560491cfa - main - nvme: Fix sim unit number to match nvme device List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aa560491cfad7953c7c089f4847951e867ef47c Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 16:55:12 +0000 Message-Id: <6995eef0.37c47.47ad4495@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8aa560491cfad7953c7c089f4847951e867ef47c commit 8aa560491cfad7953c7c089f4847951e867ef47c Author: Warner Losh AuthorDate: 2026-02-17 21:08:46 +0000 Commit: Warner Losh CommitDate: 2026-02-18 16:40:06 +0000 nvme: Fix sim unit number to match nvme device The CAM sim unit numbner should match the nvme device number. We need this to match unit numbers in some wiring scenarios. For example: hint.nvme.0.at="UEFI:PciRoot(0x3)/Pci(0x1,0x1)/Pci(0x0,0x0)" hint.nvme.1.at="UEFI:PciRoot(0x3)/Pci(0x1,0x2)/Pci(0x0,0x0)" hint.nvme.2.at="UEFI:PciRoot(0x3)/Pci(0x1,0x3)/Pci(0x0,0x0)" hint.nvme.3.at="UEFI:PciRoot(0x3)/Pci(0x1,0x4)/Pci(0x0,0x0)" hint.scbus.33.at="nvme0" hint.nda.0.at="scbus33" hint.scbus.34.at="nvme1" hint.nda.1.at="scbus34" hint.scbus.35.at="nvme2" hint.nda.2.at="scbus35" hint.scbus.36.at="nvme3" hint.nda.3.at="scbus36" If the devices that are nvme0 and nvme3 are the only ones populated, you still want them associated with nda0 and nda3. The nvme_sim device changes meant we were passing the wrong device's unit number to cam_sim_alloc. This fixes the problem. Sponsored by: Netflix --- sys/dev/nvme/nvme_sim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index a59823847c39..f7db4a9ff4fb 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -343,7 +343,7 @@ nvme_sim_attach(device_t dev) sc->s_ctrlr = ctrlr; sc->s_sim = cam_sim_alloc(nvme_sim_action, nvme_sim_poll, - "nvme", sc, device_get_unit(dev), + "nvme", sc, device_get_unit(ctrlr->dev), NULL, max_trans, max_trans, devq); if (sc->s_sim == NULL) { device_printf(dev, "Failed to allocate a sim\n"); From nobody Wed Feb 18 17:47:43 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGP9W2JBMz6SY0j for ; Wed, 18 Feb 2026 17:47: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 4fGP9W1XxMz3QJr for ; Wed, 18 Feb 2026 17:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771436863; 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=VAoVsnDUqC9sc+YZrpKOHsLfw2Jg1Q8aQc3eaem4YMA=; b=rsV4Fk8XGDQybJG0g88n1PqmcXUiThdT4Z+annRLV3N7cIhIugY0dgCnWDfSxB1EH2vqs8 KGvCucYnSSNcNIJLM82IJcTHmPMCkVVC9ZmPRKJnIT/xv7Ms0BwL+uhaq4zxDuC9PXNLa8 OvqbX48z8Q9yj7tggeduoOEr7ZlhLjL8Hij2d9/NPS305AVPfIRL+kBOZtR3yqhy8X7rYE X4SbQo1IUDsxebTLfMBCMKeX9zkxwKmGXrJhcKHd88gs5I+XbazPjrIUGJcYYDbiaUr/Iu 8hXc59ObM51CDjvSgKKHYDg7xr9dKBHeyorRIqT2kODrDj0nJrfZ2uqFwumhJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771436863; a=rsa-sha256; cv=none; b=XTsv1y8+JcgZY0piQ0mf6PBXPrURFdop6CbxwdXMWpp/5panvgfpjGocnJApC+mqeXcMW6 eZNeFXu5mEKa5YfJ08mlOz8O1ugRQtd4f6YUXI9E4bH2N6tOpHtNIB6FIWTsIfrnQIm/f1 +P6yf3M05HGEwgXLX7sWIPNfSWq38Z7w43LW6wlHslH8XoXAWhI07j3QBbf87uPmOzXJYe GTy/zYuUf3ltR2U82CO5Dd5HyOygEXuoM6Rh1bf7cz2xoIS2dNbzpWA7k7auQjTkQdraSe E3kpXOFrDmLpugCs3vtBDKUj3ZAlDSYBl722iwRHYYrxDx7zKRjMk17tJ/FnTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771436863; 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=VAoVsnDUqC9sc+YZrpKOHsLfw2Jg1Q8aQc3eaem4YMA=; b=toKR4icJ0WNGKZ8mCWLn7PBjvVhusUIGsCRiJwjkal9nzWsRHgysW20O/dD2EtkV+Acy+2 EuxRUghpoa8UVKaKs7kfQZhO7zegwxAQywOEYceE7MPN6xBKp4ft7eTc4PEQcCgLYtfk/N t73bUn+g9mrrFndcl2BqQCxL9h1jm+wKttqqyWfyFprh1PtjZ/Ud7I2WGAndWzY53+mZSK 7/apefsU48nWfWjMzknPvilPN4EaHTWbjWCoaZIbV5GkoXZx4cAG6i/i2pLXFAOqpasnKD 7YS27sbkCXMf6XBaN3VAd2CSIvuYLCOS0r+3XRTYbgjBfgOEgbOSg3Ufq+Uh9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGP9W0vqLz157Q for ; Wed, 18 Feb 2026 17:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c4c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 17:47:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 835813c88ab6 - main - devmatch: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 835813c88ab6e44590c2d47e2d66fe153cf9dfc5 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 17:47:43 +0000 Message-Id: <6995fb3f.3c4c3.5a94b85@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=835813c88ab6e44590c2d47e2d66fe153cf9dfc5 commit 835813c88ab6e44590c2d47e2d66fe153cf9dfc5 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:17:45 +0000 Commit: Ed Maste CommitDate: 2026-02-18 17:46:49 +0000 devmatch: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55271 --- sbin/devmatch/devmatch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 4a5a300ca313..62bfc2c521ed 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017 Netflix, Inc. * * Redistribution and use in source and binary forms, with or without From nobody Wed Feb 18 17:47:44 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGP9X5CVdz6SXcj for ; Wed, 18 Feb 2026 17:47: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 4fGP9X23x4z3QLN for ; Wed, 18 Feb 2026 17:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771436864; 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=8k15fa7Dmpl56uHlg3y7wMSqpLA5Rx1jJwIT7xNQv2k=; b=i7ePQsL6AvKmtrJFbwUi6M0UTqCWlt2Qm6kjhPCcRLjvKILHDUSP6wHYqFi3VyOwp9BmRH HwrZ71vjk53GBpgdFiDsD0mOInGXkt9yFW0XMBDsDWvkXRD8YTtPWXqUo4ia4b25OjYN4Q rDryzS7b4P5YlNJ4xgmzoSriUrBGPXYhbC4f5Fyvg2mZ+rBpNaUVDGodpt7LKbTgDi5Yy7 jSGdU0S/hiatvGPuSg9/fgnRkUEXBEoDVwUlsdnaMdG162FYb1rmzWMEG6Br4p7/qPNHsq SwbeyeFjrI3weoavXqmMLIHFIlTopk027K4B43Fl0H1db7NUzHhO+PpH3YF5RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771436864; a=rsa-sha256; cv=none; b=YTla0GRNdY6j1r7aPp4wW1ba8Dq1LIHEYtSwU/GIDALbIaHwFIegJGun/9rVGWzvDby4Lr qp10Af4xOmJXzd9VdDZspL+/n5eMg1CEUsDZ+D3xQ9cYNnqA9Tbna8F5I1zhT7AmovgkE2 BRPlvzcyZfHsIgYFhD7y3AY/PLG72AgXLW6x/mcXVznGlROV9JzUKjr6fvxKAuhp4lk+gI hgTHgNNSgdCw3ud4Arie+U9heFzbeBdcVdnOoIOXvusMCfzDbzq/cfB7aKXsU3SeFNRXR+ U+ubHZHNAYJOxkUHzxF9jMRANT6UWdGBoiHLSaRhspOM957KRBo3g5j4HM9OzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771436864; 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=8k15fa7Dmpl56uHlg3y7wMSqpLA5Rx1jJwIT7xNQv2k=; b=aLN2okXEs7eaxZQHEhARIwV23KA56Kamhw8gU3UyHnu9DpKEMuvPx12qBwmFPZ56CHPyBs abcWmfC+p+fMDLFZ4OGVC3rA2YeX5A4sj4MAhQvX1AoDIKOv7Smbjd6ECnto61mZzlsvIA uU8DKFcatbAZYZCmU0+zcK9uOXjLQqu//l991p3WPLJIT0fWHYTfYN80TNZvpkxonuUAxt t9q0F29UdZW8OJREgSDqVCT/Reth1iZ7MjLDO2IHMVUjlsQXIEqhNwSIidvG/zEFM1BBrn QACnTBL149/XaOnu1P//LuSELSlE0iYMwrkkMCdsXD5nevz3lgaMHUaepLHC1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGP9X1gKLz15Nt for ; Wed, 18 Feb 2026 17:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39470 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 17:47:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: d68522898902 - main - ifconfig: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d685228989020f7bceebdaf6ea79be09305d2954 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 17:47:44 +0000 Message-Id: <6995fb40.39470.7f616217@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d685228989020f7bceebdaf6ea79be09305d2954 commit d685228989020f7bceebdaf6ea79be09305d2954 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:18:34 +0000 Commit: Ed Maste CommitDate: 2026-02-18 17:47:12 +0000 ifconfig: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55272 --- sbin/ifconfig/ifipsec.c | 2 ++ sbin/ifconfig/ifstf.c | 2 ++ sbin/ifconfig/sfp.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sbin/ifconfig/ifipsec.c b/sbin/ifconfig/ifipsec.c index b8ab38d6165a..6d79e2738a34 100644 --- a/sbin/ifconfig/ifipsec.c +++ b/sbin/ifconfig/ifipsec.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Yandex LLC * Copyright (c) 2016 Andrey V. Elsukov * All rights reserved. diff --git a/sbin/ifconfig/ifstf.c b/sbin/ifconfig/ifstf.c index a99592b4801f..6d75bca75b1f 100644 --- a/sbin/ifconfig/ifstf.c +++ b/sbin/ifconfig/ifstf.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright 2013 Ermal Luci * All rights reserved. * diff --git a/sbin/ifconfig/sfp.c b/sbin/ifconfig/sfp.c index 0dc1def751b1..b51393ea750e 100644 --- a/sbin/ifconfig/sfp.c +++ b/sbin/ifconfig/sfp.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Alexander V. Chernikov. All rights reserved. * * Redistribution and use in source and binary forms, with or without From nobody Wed Feb 18 17:53:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGPJX2KLLz6SY9B for ; Wed, 18 Feb 2026 17:53: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 4fGPJX1Q07z3RYP for ; Wed, 18 Feb 2026 17:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771437228; 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=aBXI20LseDp2K4+W9e0okE4viFJkkZhyuIJ2s7aSsMM=; b=gmd4IzG7Ra+wWVHUbUoxv8hGlBUBFHHE5st2zcOMdZCJ5/ZJ19FLTstIb66SRYysPvh0ci i8vcCzj9Awb+tTBAeuWL0/Tp3PoqoJP6hapZxH4Ye29RyAh6YhpGqFl4x60CFwt3b43qYi MRTZtJEL/FI5eqPqCzbpPRZAXCk54F0WXWnEDOKIRgkeHd65PY+zUc+XR8EZQwfia9zPWO I2+6QjxJZNTsrSGDQFaGUydzcAQF4jOCdvlC99+y6oC3TeenAiScIb7UjhR5GFezGDStvb +Y32zU7Hx8kid/N18Qw+ZAEtWMrZzgyS2JgacepEGhID4/qxBgR9fpThHM2S7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771437228; a=rsa-sha256; cv=none; b=XvgmwqOH559IwdFL6Cta44SFtARlMUCJV5gUq1fDwamFyZ1Vy44NQfxsOeHAIZ9b+hlyJw hl6zoPk1Aeus8Cvmh20xylii7UKdIm7bW0V7/9+qNbhhOPvVTYU8N7vGsTyDpGuN6E1Edc /VISQzymO65C4X75R6ZaVKmCKUEdj14DX9cURny28i8ajPt6RDpHOdUJY0dIy1VZ1fOCrT 4ChCi9LuaFPjrSLyoxdanrYF6klZCHMbEMHUWvosY6Fe651+ceRPGn3m5Ksrvon+Doj5GH U7g8gKzBI+/HvxlMw1k9a5DIw0WcPaMEKoZiifvrcimSU3uTalbX2rOkvmCnEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771437228; 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=aBXI20LseDp2K4+W9e0okE4viFJkkZhyuIJ2s7aSsMM=; b=IrX3dKh1FHoEM8hZ2Jn5EdnQyqoHUfFaNi0WxVcU4dA0+PwS0DZ3F0j3K4w0kOLG36W9rj 8mF0cWKegOUsE3ZG1E1Teh+v4KOTI8aB3eZrNxbQEWpByMe9Qz4EZO8VkuVCGYS4bUbzq6 YUr7rrQmrGeR30yrpRl1Jdi9DGMzXVLeVTp7xp+ZCYgnI4n0q+pPiqe4AR3pzRPyCB+x3T Zk9zK+BUQEwXUbxIeCLGycha9HGBYA1gR03n2ey170GmHj1LiUJmbxn7kky97SkXvQmsbR yXkBHFB9//mSojFO3ic1JxXKdBIzMBHq1aJkXbCzgG2APb9v/jo7Iqc57esV1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGPJX0xXZz15kT for ; Wed, 18 Feb 2026 17:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d10b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 17:53:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Alexander Ziaee Subject: git: 59b7f3ed69df - main - devd.conf.5: Fix cross-references to devfs(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59b7f3ed69df1031e11cdaa3a571248487af91ba Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 17:53:48 +0000 Message-Id: <6995fcac.3d10b.3a23ce11@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=59b7f3ed69df1031e11cdaa3a571248487af91ba commit 59b7f3ed69df1031e11cdaa3a571248487af91ba Author: Quentin Thébault AuthorDate: 2026-02-11 07:39:17 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-18 17:51:39 +0000 devd.conf.5: Fix cross-references to devfs(4) Fixes: 1687d77197c0 (man filesystems: move driver pages) MFC after: 3 days Reviewed by: ziaee Sponsored by: Defenso Signed-off-by: Quentin Thébault Closes: https://github.com/freebsd/freebsd-src/pull/2015 --- sbin/devd/devd.conf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index 8df3e910e076..b1fca89991ed 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -246,7 +246,7 @@ The time this event was processed, in seconds since 1970 dot fraction. Device name of parent bus. .It Li cdev Device node path if one is created by the -.Xr devfs 5 +.Xr devfs 4 filesystem. .It Li class Device class. @@ -400,11 +400,11 @@ String containing the temperature of the core that has become too hot. .It Li DEVFS .It Li DEVFS Ta Li CDEV Ta Li CREATE Ta The -.Xr devfs 5 +.Xr devfs 4 node is created. .It Li DEVFS Ta Li CDEV Ta Li DESTROY Ta The -.Xr devfs 5 +.Xr devfs 4 node is destroyed. .El .Pp @@ -913,7 +913,7 @@ has many additional examples. .Sh SEE ALSO .Xr cam 4 , .Xr coretemp 4 , -.Xr devfs 5 , +.Xr devfs 4 , .Xr re_format 7 , .Xr devd 8 .Sh BUGS From nobody Wed Feb 18 17:53:42 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGPJY49Zlz6SY9C; Wed, 18 Feb 2026 17:53:49 +0000 (UTC) (envelope-from rpokala@vdura.com) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "*.ppe-hosted.com", Issuer "Sectigo Public Server Authentication CA OV R36" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGPJY0mpvz3Rbh; Wed, 18 Feb 2026 17:53:49 +0000 (UTC) (envelope-from rpokala@vdura.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vdura.com; h=content-id:content-id:content-transfer-encoding:content-transfer-encoding:content-type:content-type:date:date:from:from:in-reply-to:in-reply-to:message-id:message-id:mime-version:mime-version:references:references:subject:subject:to:to; s=selector-1713644318; bh=5uNMXrgFFeV868hZ6aV5SR7yMV40KfR2sSKu20RY42I=; b=oOUjmKR9/ZBm85eZ4VrcfnKvgpdZl6umWX4DPLmaUeTZdhYmNl7SLGYKRHisnsLuuQW6Ml7ghX4JnujIfAhp03MZDd5LouiDE83vx4jL2vYY/KMN70dOs/mm+CqHQ7QHbkFpuCPhbTX/Go33TL5S3PLVrzm5kWk8/GrCO4mbQmdjfv/540TC0WA2+Spv2RnyLAGbOIwR2lulgu7cR2W/LIzDgjOMLeQsUyQnXV6g8kNRZeulx1OSMuuntHUlSUmn7Vl0Qdz+9fiS9cD94xKhCY5FbyU0DP/BTRJbM2Z3yhAGXKDQFSpz+gSejucC6p7YbQ8PNfvUTUOQgrwu6xxd9g== X-Virus-Scanned: Proofpoint Essentials engine Received: from SA9PR02CU001.outbound.protection.outlook.com (mail-southcentralusazon11023114.outbound.protection.outlook.com [40.93.196.114]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 6F7C4C007A; Wed, 18 Feb 2026 17:53:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RUIk9Lc27BtczzkyltCJynSTjiTOGbH1wpqpT2BDlX0AFrzprZEZm+dccUdM52mRtEgMrnrkYziuSUAFfI5N9i2ncPUw+ENl7ZzwtyseaYuSXpBQCcuEQlTQT+6qLLq6prpFRaWMz215gnhdYb5wO8hYaOQVSBrkxNEVPq+NBolpmxGISEhW+TOLh8aDR87IjzGcVKA/bZ9Lcq/uZ8ErN1nLHVER5PXodkv6lHxb5dMbA69t2pkzrLB/yjTNxiIBNTeuuA3phEI5y3G9UyyXSwy1tJSkoQqCc64lDYVdtMgYa1zfhFSHPc8MZrcQtN8TIX2i/kLEW4GMoGbBqO1UvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5uNMXrgFFeV868hZ6aV5SR7yMV40KfR2sSKu20RY42I=; b=G2zws0VF3gpgz7GTW7HFBCklRfWS6BJ63c/crvS7hwfcLcXfuzkYB87DKDru6T6/wgosQA7rkb5515jyGUBGdyk+sSU5iXERneoIzWlrQdYcT3qcZF/6K4oDd2rSQTV9mGB3xHwzjPIloxJqERQKxUwZv+iRbLTIVJCi2MyGc9odL4SFIwswpKgjqX27V04T84okWzmxGroPHVt61JYxAyqDW8jCc5r3xa2K4EXhkyygtxnjX2EzJUglJ6JYq+JJHsfg3BHJ6sxPNSxTLiAvmm1D0mMo1cCvky8G87hLJ49wrOe9iutReac8a1PWrvXwPoSh8HFWxtQlIRE1m9qOAA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vdura.com; dmarc=pass action=none header.from=vdura.com; dkim=pass header.d=vdura.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vdura.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5uNMXrgFFeV868hZ6aV5SR7yMV40KfR2sSKu20RY42I=; b=ea4tGgeIH6zbCObXvrAPpmY0eRh3AFas4+9cqYgHqgIzGqjpJjZ1jc1O1MPfVC+P0T+tD099xb39ZuFsfbmYQailUtKJAAYzgJMtaHWNR4dbnx7mQ36EbFQqRVItDYkD226HSYKnddnMfc6x5gnfe8tfOBgdU6EoimrTiTvf7hortLJ0uqkYkN5vXSqOFlSRiWBJsEHJZhmSB0W0Q/SK26AHJYLruqosobo6zHiHSqJZ/P2ifNvWR6VxxtdM0/eJQ9Nsuo0sBJWR7F6Keg66MrzOhjQyuLCVzATtfmCDGEM4kf7u7Y7/PD8FLPfBoijDB7BSMVlKiCO9K7VuDM5KGg== Received: from DS0PR22MB4096.namprd22.prod.outlook.com (2603:10b6:8:117::14) by EA2PR22MB4708.namprd22.prod.outlook.com (2603:10b6:303:25a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.14; Wed, 18 Feb 2026 17:53:43 +0000 Received: from DS0PR22MB4096.namprd22.prod.outlook.com ([fe80::7222:1d00:29d0:488b]) by DS0PR22MB4096.namprd22.prod.outlook.com ([fe80::7222:1d00:29d0:488b%4]) with mapi id 15.20.9632.010; Wed, 18 Feb 2026 17:53:43 +0000 From: "Pokala, Ravi" To: Warner Losh , "src-committers@FreeBSD.org" , "dev-commits-src-all@FreeBSD.org" , "dev-commits-src-main@FreeBSD.org" Subject: Re: 8aa560491cfa - main - nvme: Fix sim unit number to match nvme device Thread-Topic: 8aa560491cfa - main - nvme: Fix sim unit number to match nvme device Thread-Index: AQHcoP+EtYjMOH5JiESuDTLkvK9+rQ== Date: Wed, 18 Feb 2026 17:53:42 +0000 Message-ID: <7A1D4F95-6D55-434C-AAF3-BF73462B3AC2@panasas.com> References: <6995eef0.37c47.47ad4495@gitrepo.freebsd.org> In-Reply-To: <6995eef0.37c47.47ad4495@gitrepo.freebsd.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/16.106.26021521 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DS0PR22MB4096:EE_|EA2PR22MB4708:EE_ x-ms-office365-filtering-correlation-id: 81070cfe-5155-4548-64b2-08de6f16a7e9 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|1800799024|366016|376014|13003099007|38070700021; x-microsoft-antispam-message-info: =?utf-8?B?YlB5WFBWOHlvVnVKRktJZ3RiQmZaeXRNd2dIQmUvRE9YRXM1YWFlbkkyZnRH?= =?utf-8?B?c0xmQWZKbklrOXVLWkZOL3JLU1JMc2JFQVZ1L1g4c3k5SHFZS1o0QXdKN2xG?= =?utf-8?B?NzhWRUw5TFZFZ3Mrd3h6SmFwV0liODh3MDVIRnpURjA1S0wwR1FkcmI3bGw5?= =?utf-8?B?bjNCei93ZHBsbUhUQk5FY3hrbnAyVTFlVmFPM2NrZkY0TjFCQ1dGUC9tSG0r?= =?utf-8?B?S2szd2JWYTIzalFiYlNDUkh6RFVRSTZmU0tVR1d6aUtFQVZ2bXNGSlpHQ1po?= =?utf-8?B?ZTRwZHdITnVSdzdwcDl5QnZiUWFtd2RxMWNYWkZNN1F2VnRRZzN5aUxWaVlV?= =?utf-8?B?QzdaenN5ckd3Z1lCYzRjMnI5S3YyOWlTYS9ZemZVakVaNzZYQ05BT0Jidmww?= =?utf-8?B?ZEZaTGlndUgyREJnMlBQU2gvUFRKQlYwdDZmWDQwZUp6eVhIWDd4NnlSSWJK?= =?utf-8?B?bklzZndlTk13WTUrZ1dUeno4TkVJQURYSkxHOWxLSnA2OG9DNzdGbG1QamtB?= =?utf-8?B?TTA5eGh3eStyWG1ZUWwrWjViN3FSaVNJNDV0LzVNMGZwQkpPVkVqRmlzMUdI?= =?utf-8?B?VWxja0JlUjAzMm00MWJNK2hEZHhQL1RQZFJkZHFpU3NHekljYWtKSmg5R08x?= =?utf-8?B?bjA2OWJmaTBWdmhrdnZqZ0Iybit0cTVZYVhHNEsrU0hpWkU2QU5UQU1ZRnVl?= =?utf-8?B?Q0J6a3FUenFZdWpRRHVFQldNYnp2RzZIMm1CWGw0NGxlMXFJNWhmdGFuREhF?= =?utf-8?B?bVZENFBnejQwR3M2NHI0TEhMZ0Q3UTNIdVFuVUQxSzVRblY3dlV3b0RNblFs?= =?utf-8?B?bGpKeDN3Q2tGcnNyaGw2akFUcUcrcG1LMUpCaGlLMlFIUWlja0dKZ2JFODlE?= =?utf-8?B?anhQNkJzT3FvaFFYMXpuRC9qaHlSVlZSUkY1OTFqdkQ1d2Fua0JDYkV3aWVM?= =?utf-8?B?VDBza1lGUTF5dUN3UFArUDZMck5jT3RYR0xaZTJYL2FibHBzcEF3V3ltTzBt?= =?utf-8?B?UEVabWhCdEs2OVY5enltK2ZNd2xzMUwreURmRHIyRzFXYnV4UWQxeFVyVDg2?= =?utf-8?B?OC93bG96Rk45aXZvaVZ5QVU4cG9IU2dwUkNpSDVjM01RSEN3OUVGaFlTV2I1?= =?utf-8?B?bjZIa0lmWCswQklRVG1kKzJLSEJ3ZkhlYkFOaUR4TkRIT0FuUEtwYjJ0azFl?= =?utf-8?B?UUNaYzBTM2ZHb0I1QnlZZE8vY2VpNUNiSUNET0IvVFI4MzZiVy9RZS8rREYy?= =?utf-8?B?Y1YxYktMaUVvL09YYVBvdGRPYkZaWk12Vk4ydDYzOElyaU9YNEEveGJ6c0Zn?= =?utf-8?B?RDNiNHNXK1NZc3lycW41ZUVuaXIvblRRSkI2eEFoNVF2RXBVK2VnMEd4NE0w?= =?utf-8?B?cThBcitXTXdKZzI0cWhlaFJnc2cvbkpqSTFjTFhjdXF1dEo4SGlOZlZTK1pu?= =?utf-8?B?WFVnREhhV1ArMFFyaUphVjN3WndBZ0JrY0szS3JIbnBpaHl6S1EvWXdva3Vz?= =?utf-8?B?MzlvWXA5VXU1SFcyRzZGOWxzcFpUUDhuc2EvaFVYa3I2bE1EYUNTZVJpeEpY?= =?utf-8?B?dlNPS1RRYTBxNDVBM0VwUzl3MTU0eDQ5cittM2hodmVNbmEvNmlBQmNMcUw4?= =?utf-8?B?ak1XUzBvZzVhVFowNnE0QW9nNXFBd1orM3k4VE01aHZOUDJUU2E3YkMzLyto?= =?utf-8?B?M1I1eWJiQ2s0S0FsazlLNnZPZGR1RS80VlhRak9RSHdseU1EVW5yRU4rWUdL?= =?utf-8?B?bDU4V3ZpQ2FiRnM1Q2lMNjlPNTZqOS9vdmtBb3Z2SGtieENzTXVZUXpEWFV1?= =?utf-8?B?b09CRlpHK0ZreVN2TWY2cmlURXQ0TVZVbGNST1VjR2dpWm1PeDluZ0tZc3VR?= =?utf-8?B?aUtORnE3Ulp1aHJSeXJMc2VxS0JVQ1lHUGwxbUhWUmZCQ2FOSVBreVpvNm9V?= =?utf-8?B?cFBMWnBib04zMDYvN2tWK09sZTV6cCtnZmNSSjczb1dncU84RnFLdVYyaUVr?= =?utf-8?B?VnlaNjFTc0Y0cm5NODdiU3ZnRUZqZnFJRkQwU3YxeWh1bkQrWUNDTFBVOEU5?= =?utf-8?B?OWZHcmVtdFI0d0p3cFJMclo5dThsaEpTQWFSbUliN1M0SGpiZ3UrQWVpUm5u?= =?utf-8?B?cHdDRVlnamdRSXhrd1dpYmJTV2RPWEZ6UVdjQzVuazk3THNYRHRtREVnVGpo?= =?utf-8?Q?DAZr4T4OsbuOTWyfq0bGlSo=3D?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR22MB4096.namprd22.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(13003099007)(38070700021);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Q0QvUW9aM3hmeEN6MlMxcnFjOXhNNGVIWVF3QURnNWJJN2JVY3BFUWZDUVZn?= =?utf-8?B?bzZ3UURiZXZuR0xwV1hXZmVEUmNGbTZxZjIwRDJDcHBuVG9SZGJTZitKeitl?= =?utf-8?B?TDVjRW5RZG5QV2V6TVVUdlhwN25ucjFqcWRIeVNYNFE5VFdJVjB2NldtRlRI?= =?utf-8?B?TVlEL3FPZTl5MlVXYnBEeGxRakJiVHBpVmR3VWJaTjNUYkZ5RXZ2anRJalFy?= =?utf-8?B?YnE1SWp0L2ZLLzdsbThvM1BrYVJaVXFzMk1RUVlpZ3l4NVVLVVpldk5KOWx2?= =?utf-8?B?SlM2a3ByOUxkY1NHZVNDczhTaThwMWdwYWx3Z3pXUCs2dHdNb1NrVkd4K2kv?= =?utf-8?B?cThuckxsaEF6SW9LUGc3WngySUFzV3h2U3ZzRTlJbzAyZTVVTVVnZHFyWHVt?= =?utf-8?B?WUVxbzVUYldNRzFERnB5WEN2TzRvOWhka0VoT0xMOHR2Ukh0TzhTY1pXN0Jk?= =?utf-8?B?MVZPY0VDZ1RrM1BRYUtyK3ZGRTAzbTFoaklkemVGK3FZaUViaktsRmp3WGxn?= =?utf-8?B?TzAvUDNndUVFbVhPM3lOeHU3SURJVllBQVhlSm1oUlB4bHFyTWJVb3VBbTFt?= =?utf-8?B?bjBsWC85YjNhamNuT3pncnozMS91NHVncXFJYlJwZU5HemZ1Qm1zSzlVTDlP?= =?utf-8?B?OXBMWTVJZ1h1QXVKczhTZG9EbWNPbU5najdjM2tjSURVS1FHT1pQM1VPZE1Y?= =?utf-8?B?WklWVXNXTkUvWEZLN1dUcFgyalQ0bkZvZWFWWG5mREE5NFkxQjNQekdCNUVG?= =?utf-8?B?K3krTzJIRHhwZnE5WFRRdmtSVkpHNm9aWm9tZ3VVK0c5N3hYRTQ4QUp6ZTNI?= =?utf-8?B?akRUSitueGFYbEw3UWt4SlZwZklCWnRnSXJZT3o3K3dRdDYraTVncUp3SlFr?= =?utf-8?B?NkVaeFBtcEl4L2doRi91YVlLZGp3aGp6bTUrYm0xMHNSTjNLQVdFbGR4b3RP?= =?utf-8?B?Vk1jODFQa2xPcGhuZ3VwR29rUFFqVjMzcG1hbFdDVHN1cFhVYUhZUGtPYm5U?= =?utf-8?B?dFlRNlpUNkNodlQ2R2k2eWpCS2IyOG01SjVjZGRabDh4Q2FhYVBEVVkyUW94?= =?utf-8?B?MGR3a0tIbjNGQ1lpbFlLMEFWbjBYMWE1WGpXOS9jdjdLWmZ6S01aU2h4Y1hx?= =?utf-8?B?L0NzeUlzaFNSTTFmT3RyNkJGdEIxazVGUk1mQlVVRzVwd1I2bmNRNG51dHB4?= =?utf-8?B?dGVTY2tveEJBL29GWDdEc3R2WXpwQWhqb0xVSnJ3SnJ3TWdXREcvK0Y2NFpx?= =?utf-8?B?NzVVMWo2QnM2VGdqcG1RL29laHBCcXFhLzhWRE40U1V0RXVreGdQWTcvMzlm?= =?utf-8?B?aDB5b3hMMmh0RzhLd0prTzdlYms3bE5Cc0hPTjJFUXhFdFFrQ0VXeHZpSStV?= =?utf-8?B?KzR6NCtaaWN4Qk9YUlV3VU0vS3YzWGJWRURNeGxGOWJYQ3Rnb3c3dmZ6MVMw?= =?utf-8?B?SWNjNE1BUDdKcnhWdUpYMVEzZ08yWU1udG9samFZYXdLbllUM1A2K056dURM?= =?utf-8?B?MWVuL1JvMFRPVVNTKzlYSVpLYk4xVExNLzNDczVVZUlUNHpjZ0QxOUp5RUdO?= =?utf-8?B?UlZxYk94S25Jb0RnbG53bDFvOXRBQlhUMUJOWVZjNFN1YTRHWmZoc3lsMlpz?= =?utf-8?B?VHVtRzVJa2dFSEdSbFl0c000ZllEYnJ0VWhMWk1WMHZuVHBrdkRxWmhtaXpT?= =?utf-8?B?QmdzV3Z1aktwVnJ3M0N4VnJQMzRQQ2cxSGw3T3FUVkNLYTI3NFFUNlhvanZt?= =?utf-8?B?cVJhVG56UzRQbHJtTUhFWHdid2hWMTJsN3VXVERDb0FXaDdhdE9IS2pTcWMv?= =?utf-8?B?QkkvZmpSd1Y0MkNuRWxyTEQxbU9CWW5QZk1KWUVEa2gzZk8wQk0wMUVkUHhu?= =?utf-8?B?R2RQL1ZKOXg0Wk9NODBIRzlYbjZYUFRRc2VzSFNxcVlyem9ieUpZVVk0dEdi?= =?utf-8?B?Q2ZYcmxpMjgyVWRZZG1uWUdzZWxnTFlkYUxkL2ZQeDQ0TG9hWU9la1ovY3Ft?= =?utf-8?B?MytuN0tkVG9rRTV1ektYb3Z4VzlHYTZ1NXlUSFJEejVyNTQzdUxteTQ2SG9P?= =?utf-8?B?UXFRenFPRFFpV0s0UC9OenNKaGYzb09wQml1eFlzdEtRYlB1OXQzVmVqVExx?= =?utf-8?B?cVVLQ0ZlYkgzR3lCTXU1amp0d0Y4L1VYeWRLUWJvLzZqeHlINnVGSWxtMU1Z?= =?utf-8?B?bm5LZm55Yi9nY3l2anhhSVlabjgzaWg2cmRNVmtNOFF0L3BJc0hhRU9JLzEy?= =?utf-8?B?enJmSklDQUVsMGh6RDNrRGZzMDVnRFQxalRmNENvTUtwa3ZsWkw2ZHd2NWNP?= =?utf-8?B?T05vVVJ5Y3pZdlBDd09wMlNoVmd5VFZ0ZllCc240VGE0ZFpTekN1Zz09?= Content-Type: text/plain; charset="utf-8" Content-ID: Content-Transfer-Encoding: base64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 X-OriginatorOrg: vdura.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DS0PR22MB4096.namprd22.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81070cfe-5155-4548-64b2-08de6f16a7e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Feb 2026 17:53:42.9827 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: acf01c9d-c699-42af-bdbb-44bf582e60b0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: TxGoKrNDHYpsg3Nu22Bb8TMF/OrHUVaTJ62SgB2+8PfwDB3vgLeW9ibcBf9CXMLdTdL4YBsvmiiGmitJXvThjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: EA2PR22MB4708 X-MDID: 1771437226-vnScViMeyGdD X-PPE-STACK: {"stack":"us5"} X-MDID-O: us5;ut7;1771437226;vnScViMeyGdD;;9a636ff1b90fe7853e2579ac64532934 X-PPE-TRUSTED: V=1;DIR=OUT; 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:13916, ipnet:148.163.129.0/24, country:US] X-Rspamd-Queue-Id: 4fGPJY0mpvz3Rbh X-Spamd-Bar: ---- PiBUaGUgbnZtZV9zaW0gZGV2aWNlIGNoYW5nZXMgbWVhbnQgd2Ugd2VyZSBwYXNzaW5nIHRoZSB3 cm9uZyBkZXZpY2UncyB1bml0IG51bWJlciB0byBjYW1fc2ltX2FsbG9jLiBUaGlzIGZpeGVzIHRo ZSBwcm9ibGVtLg0KDQpXaGljaCBzcGVjaWZpYyAibnZtZV9zaW0gZGV2aWNlIGNoYW5nZXMiIGFy ZSB5b3UgcmVmZXJyaW5nIHRvPyAoRWl0aGVyIGEgZGVzY3JpcHRpb24sIG9yIGEgZGF0ZS1yYW5n ZSwgb3Igc3BlY2lmaWMgaGFzaGVzIHdvdWxkIGFsbCBiZSBmaW5lLikNCg0KVGhhbmtzLA0KDQpS YXZpIChycG9rYWxhQCkNCg0K77u/LS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCkZyb206IDxv d25lci1zcmMtY29tbWl0dGVyc0BmcmVlYnNkLm9yZyA8bWFpbHRvOm93bmVyLXNyYy1jb21taXR0 ZXJzQGZyZWVic2Qub3JnPj4gb24gYmVoYWxmIG9mIFdhcm5lciBMb3NoIDxpbXBARnJlZUJTRC5v cmcgPG1haWx0bzppbXBARnJlZUJTRC5vcmc+Pg0KRGF0ZTogV2VkbmVzZGF5LCBGZWJydWFyeSAx OCwgMjAyNiBhdCAxMTo1NQ0KVG86IDxzcmMtY29tbWl0dGVyc0BGcmVlQlNELm9yZyA8bWFpbHRv OnNyYy1jb21taXR0ZXJzQEZyZWVCU0Qub3JnPj4sIDxkZXYtY29tbWl0cy1zcmMtYWxsQEZyZWVC U0Qub3JnIDxtYWlsdG86ZGV2LWNvbW1pdHMtc3JjLWFsbEBGcmVlQlNELm9yZz4+LCA8ZGV2LWNv bW1pdHMtc3JjLW1haW5ARnJlZUJTRC5vcmcgPG1haWx0bzpkZXYtY29tbWl0cy1zcmMtbWFpbkBG cmVlQlNELm9yZz4+DQpTdWJqZWN0OiBnaXQ6IDhhYTU2MDQ5MWNmYSAtIG1haW4gLSBudm1lOiBG aXggc2ltIHVuaXQgbnVtYmVyIHRvIG1hdGNoIG52bWUgZGV2aWNlDQoNCg0KVGhlIGJyYW5jaCBt YWluIGhhcyBiZWVuIHVwZGF0ZWQgYnkgaW1wOg0KDQoNClVSTDogaHR0cHM6Ly9jZ2l0LkZyZWVC U0Qub3JnL3NyYy9jb21taXQvP2lkPThhYTU2MDQ5MWNmYWQ3OTUzYzdjMDg5ZjQ4NDc5NTFlODY3 ZWY0N2MgPGh0dHBzOi8vY2dpdC5GcmVlQlNELm9yZy9zcmMvY29tbWl0Lz9pZD04YWE1NjA0OTFj ZmFkNzk1M2M3YzA4OWY0ODQ3OTUxZTg2N2VmNDdjPg0KDQoNCmNvbW1pdCA4YWE1NjA0OTFjZmFk Nzk1M2M3YzA4OWY0ODQ3OTUxZTg2N2VmNDdjDQpBdXRob3I6IFdhcm5lciBMb3NoIDxpbXBARnJl ZUJTRC5vcmcgPG1haWx0bzppbXBARnJlZUJTRC5vcmc+Pg0KQXV0aG9yRGF0ZTogMjAyNi0wMi0x NyAyMTowODo0NiArMDAwMA0KQ29tbWl0OiBXYXJuZXIgTG9zaCA8aW1wQEZyZWVCU0Qub3JnIDxt YWlsdG86aW1wQEZyZWVCU0Qub3JnPj4NCkNvbW1pdERhdGU6IDIwMjYtMDItMTggMTY6NDA6MDYg KzAwMDANCg0KDQpudm1lOiBGaXggc2ltIHVuaXQgbnVtYmVyIHRvIG1hdGNoIG52bWUgZGV2aWNl DQoNCg0KVGhlIENBTSBzaW0gdW5pdCBudW1ibmVyIHNob3VsZCBtYXRjaCB0aGUgbnZtZSBkZXZp Y2UgbnVtYmVyLiBXZSBuZWVkDQp0aGlzIHRvIG1hdGNoIHVuaXQgbnVtYmVycyBpbiBzb21lIHdp cmluZyBzY2VuYXJpb3MuIEZvciBleGFtcGxlOg0KDQoNCmhpbnQubnZtZS4wLmF0PSJVRUZJOlBj aVJvb3QoMHgzKS9QY2koMHgxLDB4MSkvUGNpKDB4MCwweDApIg0KaGludC5udm1lLjEuYXQ9IlVF Rkk6UGNpUm9vdCgweDMpL1BjaSgweDEsMHgyKS9QY2koMHgwLDB4MCkiDQpoaW50Lm52bWUuMi5h dD0iVUVGSTpQY2lSb290KDB4MykvUGNpKDB4MSwweDMpL1BjaSgweDAsMHgwKSINCmhpbnQubnZt ZS4zLmF0PSJVRUZJOlBjaVJvb3QoMHgzKS9QY2koMHgxLDB4NCkvUGNpKDB4MCwweDApIg0KaGlu dC5zY2J1cy4zMy5hdD0ibnZtZTAiDQpoaW50Lm5kYS4wLmF0PSJzY2J1czMzIg0KaGludC5zY2J1 cy4zNC5hdD0ibnZtZTEiDQpoaW50Lm5kYS4xLmF0PSJzY2J1czM0Ig0KaGludC5zY2J1cy4zNS5h dD0ibnZtZTIiDQpoaW50Lm5kYS4yLmF0PSJzY2J1czM1Ig0KaGludC5zY2J1cy4zNi5hdD0ibnZt ZTMiDQpoaW50Lm5kYS4zLmF0PSJzY2J1czM2Ig0KDQoNCklmIHRoZSBkZXZpY2VzIHRoYXQgYXJl IG52bWUwIGFuZCBudm1lMyBhcmUgdGhlIG9ubHkgb25lcyBwb3B1bGF0ZWQsIHlvdQ0Kc3RpbGwg d2FudCB0aGVtIGFzc29jaWF0ZWQgd2l0aCBuZGEwIGFuZCBuZGEzLg0KDQoNClRoZSBudm1lX3Np bSBkZXZpY2UgY2hhbmdlcyBtZWFudCB3ZSB3ZXJlIHBhc3NpbmcgdGhlIHdyb25nIGRldmljZSdz DQp1bml0IG51bWJlciB0byBjYW1fc2ltX2FsbG9jLiBUaGlzIGZpeGVzIHRoZSBwcm9ibGVtLg0K DQoNClNwb25zb3JlZCBieTogTmV0ZmxpeA0KLS0tDQpzeXMvZGV2L252bWUvbnZtZV9zaW0uYyB8 IDIgKy0NCjEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQ0KDQoN CmRpZmYgLS1naXQgYS9zeXMvZGV2L252bWUvbnZtZV9zaW0uYyBiL3N5cy9kZXYvbnZtZS9udm1l X3NpbS5jDQppbmRleCBhNTk4MjM4NDdjMzkuLmY3ZGI0YTlmZjRmYiAxMDA2NDQNCi0tLSBhL3N5 cy9kZXYvbnZtZS9udm1lX3NpbS5jDQorKysgYi9zeXMvZGV2L252bWUvbnZtZV9zaW0uYw0KQEAg LTM0Myw3ICszNDMsNyBAQCBudm1lX3NpbV9hdHRhY2goZGV2aWNlX3QgZGV2KQ0Kc2MtPnNfY3Ry bHIgPSBjdHJscjsNCg0KDQpzYy0+c19zaW0gPSBjYW1fc2ltX2FsbG9jKG52bWVfc2ltX2FjdGlv biwgbnZtZV9zaW1fcG9sbCwNCi0gIm52bWUiLCBzYywgZGV2aWNlX2dldF91bml0KGRldiksDQor ICJudm1lIiwgc2MsIGRldmljZV9nZXRfdW5pdChjdHJsci0+ZGV2KSwNCk5VTEwsIG1heF90cmFu cywgbWF4X3RyYW5zLCBkZXZxKTsNCmlmIChzYy0+c19zaW0gPT0gTlVMTCkgew0KZGV2aWNlX3By aW50ZihkZXYsICJGYWlsZWQgdG8gYWxsb2NhdGUgYSBzaW1cbiIpOw0KDQoNCg0KDQoNCg== From nobody Wed Feb 18 18:21:31 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGPwd05D5z6SbGJ for ; Wed, 18 Feb 2026 18:21: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 4fGPwc6dx7z3TsQ for ; Wed, 18 Feb 2026 18:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771438896; 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=4Rna0FHO3jTi37Xr12d7ZW1kL+v0eiwcBCIn5cMF4VU=; b=BxI4tSVKpy+RgtEY9z66RvJwALCcpC0faafqiurulNWTbMYGTgVuZed5UHPJhmzEK+B4FL Kyvvl5ANjviw0QugFewBle6N/vqoeU0pdj/f38JHNckM9EjFyYWxZ0U9ZUePLIHh4AVbls 5xrkfRZvHubxAynEDgMGCko1l2l5WC3Ezg9paqHmq55EgID5G3ix7AeRmowyMvFA9gQdrB 8xoq+7WIfIwugatX3kkXd6nH5ogmfXIUXs0vsbkRHlyC07+9OdMOIH2O7wieSuj5ORA2Ja uhFKpZBgNA+aQOGkQHd8CnRV+vYg81T+seUE4Yxnc4olBf+RRr2Qd7pememoMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771438896; a=rsa-sha256; cv=none; b=TV0yBeePQOx6bvCMsOS/Nsceq9zV31cRATdtBbh2xZUM1oAxRzJinph5ssALd7/g+UkhY1 LGxSlDWUDI+VeF5yB8FmIK0+mVd/0b6Ijr8SrPFzWr5drGrOZVSqc+RI95KhRRNhZnd9ZJ BE1q4Z9urlMQ0QInlY8byATaYrmOuUcqmwh1B46q3SX7ULGzbxLZ/xZN7PjMJuAqXeP4hz JWLPINxYyjT77TipX8VQV5rKdVkfWd0e7Ke3QokIgAuaXrPgg0SZqHCgPLK8XOetmeFKg+ hcKGRAbVFCNhlih5vXDwVsEHOx9Z8WOd9RFWEzex2HPRroRgR0Rh6eZixg3RfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771438896; 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=4Rna0FHO3jTi37Xr12d7ZW1kL+v0eiwcBCIn5cMF4VU=; b=eg5BNJdTY+5A5CQeNlRpsO8g7nRJF1xDixLoGe+QCk/iSdRf2Wc+oyEvCzvTkVzahXLcqN c4qTyeTmxd//u9haOLzp4iFDSnG7PZs3OtP7f2oWx6Mj0jGOQ2g8j93yw9bu7ApNzGU7EH JS06nBIgqWep3QlYlC/SFmHS6ptT2e7jeghIQzdK2ygGep+77YcfFfJ1oYn9bMOeZ5rQQO RBMVSxewCJqRs1NFinWXEhXvB/ZTM7pS6Zb6VcqR2h3MBsyoGIS2a38+eBr+HvobzuWw9x SOjNKMzVf3GZM6iM4SRQYkAAFS3zqkNpfbz1YVUykhBwStm9QEbWAsH5sM+FGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGPwc5wCqz16H8 for ; Wed, 18 Feb 2026 18:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e1b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:21:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 009be0917234 - main - sh.1: Reference editline(7) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 009be09172348c352db5d74f6ece2f4cb47ee193 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:21:31 +0000 Message-Id: <6996032b.3e1b3.43e13997@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=009be09172348c352db5d74f6ece2f4cb47ee193 commit 009be09172348c352db5d74f6ece2f4cb47ee193 Author: Artem Bunichev AuthorDate: 2026-02-18 18:16:38 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-18 18:17:07 +0000 sh.1: Reference editline(7) Key bindings for command line editing are documented in editline(7). MFC after: 3 days Reviewed by: jilles, ziaee Differential Revision: https://reviews.freebsd.org/D54767 --- bin/sh/sh.1 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index dfe5419479a3..63755bbcf8a9 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -41,7 +41,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.Dd February 9, 2026 +.Dd February 17, 2026 .Dt SH 1 .Os .Sh NAME @@ -228,6 +228,8 @@ command line editor (disables the .Fl V option if it has been set; set automatically when interactive on terminals). +See +.Sx Command Line Editing . .It Fl e Li errexit Exit immediately if any untested command fails in non-interactive mode. The exit status of a command is considered to be @@ -337,6 +339,8 @@ Enable the built-in command line editor (disables .Fl E if it has been set). +See +.Sx Command Line Editing . .It Fl v Li verbose The shell writes its input to standard error as it is read. @@ -2064,7 +2068,8 @@ See .Sx Job Control for a list of job ID forms. .It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc -List or alter key bindings for the line editor. +List or alter key bindings for the line editor, +.Xr editline 7 . This command is documented in .Xr editrc 5 . .It Ic break Op Ar num @@ -3049,6 +3054,11 @@ Similarly, the command can be used to enable a subset of .Nm emacs Ns -style command line editing features. +.Pp +Command line editing in +.Nm +is handled by the +.Xr editline 7 . .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -3119,7 +3129,8 @@ will return the argument. .Xr signal 3 , .Xr wctype 3 , .Xr editrc 5 , -.Xr shells 5 +.Xr shells 5 , +.Xr editline 7 .Sh HISTORY A .Nm From nobody Wed Feb 18 18:28:47 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGQ4v6tXqz6SbWN for ; Wed, 18 Feb 2026 18:28: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 4fGQ4v66Csz3VnC for ; Wed, 18 Feb 2026 18:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tqMcS1v3EDxFKYm/pkH5KGFEEEBwQViljEpxP66CH3s=; b=IqiM5SUPMNkiBevJmrj17N4vqGq4xDhfgfVSv3zdSTG190i6i/0OlJ7m6EOpYnQyQw583X sIxLY2cHOGc8sXBpZdI7w0B9V1kVHapGrn7yrprB2BDyCuN3qobR46Du4YZse9UXhtWf2d 0CtOz4Mi8nUMnvrngBkIxygITaIgtB0zUNGX7Qb63Tz7eq5hcokERFjOar2c8+IvI3fl0V Y4igBzaL+rB+dyYX/nktFxPhfWNvvRXcRsvS09/BdV30eTvZ35nwD0GBVBTj7P7SXydfPI xuGS3dPignDEiGqIr0CDl3G624v/Eo2rLwNOYpXE91RfBunC53IEcRutzYd/Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771439327; a=rsa-sha256; cv=none; b=o+h1BMvNGhGGwOoiXpIYiNcRx0MNksNuwOB2BHHQqoVd4IXnSdKI8/gc8EIuKvXWTCJotr ejsIpabivuBpO10VwfAgCAWMGQa5t3D2IXgfZadPJvGmIe3KNpylMLFqIMRc8xg7W6+WdG tFlUWIq5VFA9z5FREYgdEUUQLmUD532poCCc4tkcHIDYBMYxjzZjMGDwHQg7rNsUZmH8hy mP8/e2E5FaSEJXi7/I76xUZdvOwiz5JemuEXiwyGmyoecpH0N4N956mWqOUg08erbF+6Yk nMg+V2HfjTP3oyZYQS8Z9QIVDSsnjj6o4V5PO7tJyieeCSAO3XwMxBN0IG9Oow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tqMcS1v3EDxFKYm/pkH5KGFEEEBwQViljEpxP66CH3s=; b=eW5wLtuRK47Nt44pC74655NQnT1jdNHoX01DA64Er4JGrSrgKVDoKHdJJscFLrn+tZ1ULS RQLj22yrvfbSrNWgQHIqZDlrAW+Lf2MGQTPfe3L8C62qjYfustr4fJ7K5MjG4FwfJbm+40 ydyjp3jgmMoro3F2Kwk0DUs0Vo/e1wjDU0zUfEjXUnsPtcsP0m1i+SmgCKMBWAjCKy6zpc Vwe3yFy34OzYVPvGHxPqDfe5p2Iica270ibQ1nxu0MSaGWpPEQNqWY7ohrZljFQFTqr23d W7noc/5uv8iwRhxS6qw+eTb5rIdXRqIw6b9qeyASpmHINigns+gKIOvhInxg4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQ4v5cYBz16HW for ; Wed, 18 Feb 2026 18:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e1ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:28:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d379432808ed - main - kqueue: Make kn_sfflags unsigned List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d379432808ed286dc051a34138ae250addbc469c Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:28:47 +0000 Message-Id: <699604df.3e1ba.107189f2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d379432808ed286dc051a34138ae250addbc469c commit d379432808ed286dc051a34138ae250addbc469c Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 18:28:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 18:28:29 +0000 kqueue: Make kn_sfflags unsigned This is used to hold a copy of the original fflags, which is unsigned. MFC after: 3 days Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D55348 --- sys/kern/kern_event.c | 2 +- sys/sys/event.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index a1cd409c53d9..e8e670d39d09 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -735,7 +735,7 @@ filt_jail(struct knote *kn, long hint) (NOTE_SECONDS | NOTE_MSECONDS | NOTE_USECONDS | NOTE_NSECONDS) static sbintime_t -timer2sbintime(int64_t data, int flags) +timer2sbintime(int64_t data, unsigned int flags) { int64_t secs; diff --git a/sys/sys/event.h b/sys/sys/event.h index 70d2926d1943..de24c9226e4a 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -316,7 +316,7 @@ struct knote { #define KN_KQUEUE 0x40 /* this knote belongs to a kq */ #define KN_SCAN 0x100 /* flux set in kqueue_scan() */ int kn_influx; - int kn_sfflags; /* saved filter flags */ + unsigned int kn_sfflags; /* saved filter flags */ int64_t kn_sdata; /* saved data field */ union { struct file *p_fp; /* file data pointer */ From nobody Wed Feb 18 18:28:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGQ4x26yFz6SbkN for ; Wed, 18 Feb 2026 18:28: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 4fGQ4w72Z3z3VsZ for ; Wed, 18 Feb 2026 18:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIKUFfA+HVIRuJYTjQituYD9IRQboCT+tojnKGEOm68=; b=fMsFBnepw6Af2X7q+Y1C6wJkWfmb1hMe22IcYi7iyLwwX7mDa1VRCRJ9OHd3lOl0kvwsTQ 7VrFMYi2ZVGDpqGJR08rn6rMhW6ziqW2c0AG9AG4WLDiPSk8nAHc01ynMT4JXHYoWyfr2i sLwzhpAtYogKB2GMBzGWt9y8t17Lm/mXNORaaQ7oCVcex3e2VwzDVRHssCkwmpW8XOphf1 zZxg3kYYpgMcY0p9yCoxNBcO/8dhx6/PPIcjOrWiIqeRoLqPbqKax6WzqDZSjU7Lod/ucw flrd6FVTg0+810q0SiqtpOCeOL+hY4Rq40PyD577oLrobq3jbiqESHHNjg7SwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771439329; a=rsa-sha256; cv=none; b=SArFqGKRX564fkPlMu7xDY+FQuMrwZc+zuaT9i+JVCOhLym8ShjDfM+sty8xRD0Cr7vNw8 6miCPtDlSZWmKbok0ANfMGokqPPv1QNF9qagA0ckkJDchvGNcr8tix6XChmcZ2xTejxnXN M0DhMdbbj79HsJT04RwFXYWsYy5VHPmpiegKsCurNoAdAuK/Qz79en3fRiSnGa+bQql8DJ DYaUooTXa+pOyuv21YTqOJfckTfLlrK7t0FFa+khtp2pIpnkNMSLXWCQIEq529qqDR0eiR UQDWSyDtL3GdS0hraH6JBhXbLyjLZs6ivO30x/1dhPW013FyRQuS2s2OC/Npag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771439329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIKUFfA+HVIRuJYTjQituYD9IRQboCT+tojnKGEOm68=; b=CJgS0UNDESkOajH6JrD6qPjYHuP2McP+n013Hs/nW4HM6n5JvMgSvfutu9SzCkKav74QFr 2GEancZ7yYhqgaYRdmjIRV9EfGkDaaIzEW4eVwe2t66nIXEGTB5sIu/5Y4MOwmzMNS2EDB lek+OEQdu+f0XGTfe/vU6CnfYbmgfJdwkU/zTjmqucDQfBVX9wHx5te1Fi2hMhXw+ezwuD 4JjVXIWVTMKtSOS4wnrqTUTvnfTLEihMjdL/Df6sWiKEEci18bgTWIp62A6wHGCDXtptxz w1tyR7rwz9zIGoKaiIOm3mtWXT7o21t1InUC9kNB4u8YkKGB8DCLkUs+qnSHpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQ4w6X97z16TS for ; Wed, 18 Feb 2026 18:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 405c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:28:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d5404462f691 - main - diff: Drop unnecessary casts, fix none algo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5404462f691230423dc8cc543c6fdc44f34ec31 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:28:48 +0000 Message-Id: <699604e0.405c3.459d8164@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d5404462f691230423dc8cc543c6fdc44f34ec31 commit d5404462f691230423dc8cc543c6fdc44f34ec31 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-18 18:28:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-18 18:28:29 +0000 diff: Drop unnecessary casts, fix none algo MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55349 --- usr.bin/diff/diffreg_new.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index 29882923cd0e..69deae497962 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -56,7 +56,7 @@ static const struct diff_algo_config myers_then_myers_divide; static const struct diff_algo_config patience; static const struct diff_algo_config myers_divide; -static const struct diff_algo_config myers_then_patience = (struct diff_algo_config){ +static const struct diff_algo_config myers_then_patience = { .impl = diff_algo_myers, .permitted_state_size = 1024 * 1024 * sizeof(int), .fallback_algo = &patience, @@ -69,7 +69,7 @@ static const struct diff_algo_config myers_then_myers_divide = .fallback_algo = &myers_divide, }; -static const struct diff_algo_config patience = (struct diff_algo_config){ +static const struct diff_algo_config patience = { .impl = diff_algo_patience, /* After subdivision, do Patience again: */ .inner_algo = &patience, @@ -77,14 +77,14 @@ static const struct diff_algo_config patience = (struct diff_algo_config){ .fallback_algo = &myers_then_myers_divide, }; -static const struct diff_algo_config myers_divide = (struct diff_algo_config){ +static const struct diff_algo_config myers_divide = { .impl = diff_algo_myers_divide, /* When division succeeded, start from the top: */ .inner_algo = &myers_then_myers_divide, /* (fallback_algo = NULL implies diff_algo_none). */ }; -static const struct diff_algo_config no_algo = (struct diff_algo_config){ +static const struct diff_algo_config none = { .impl = diff_algo_none, }; @@ -109,8 +109,9 @@ static const struct diff_config diff_config_patience = { }; /* Directly force Patience as a first divider of the source file. */ -static const struct diff_config diff_config_no_algo = { +static const struct diff_config diff_config_none = { .atomize_func = diff_atomize_text_by_line, + .algo = &none, }; const char * @@ -174,7 +175,7 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) cfg = &diff_config_patience; break; case DIFFREG_ALGO_NONE: - cfg = &diff_config_no_algo; + cfg = &diff_config_none; break; } From nobody Wed Feb 18 18:46:42 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGQTc0tGsz6Scy0 for ; Wed, 18 Feb 2026 18:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGQTZ6lmnz3bV7 for ; Wed, 18 Feb 2026 18:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAaOTbYMRnafF5OTfy6UdKZcvB846cOyPRuxgGM4DGU=; b=fkkqcVyJP3FZdc28eK4gdmn60dNtkDDLNihoI9ApbATb1KyPJqE9JQeTz1X3PNdse6uBS2 X+llgsYY+CnCzkurhYijvCsP7H6DlQSzWzLtfJWIFCKXxaN+ZwASJVHDJTSXFJKNf81PKr 9cCGvrYyCBFGptjfxs88VwPy85K1q9qeZl4EPlsB1hz9uC6Efa9AXRAn9Z5QCJPAebfUOm t0kVkyox3sL2YcX30bsPgatdSASw/brNeTJLHCrttAcXKyHVmiRLFsaQHHndVfY5rzbf37 fXKH6Bs+Z/4MqQtntBPjZ4pH0op9jkc4hJYKLhT9rfWNnPa0aYHBrIhVtRbl+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440403; a=rsa-sha256; cv=none; b=Z4ERb1Biv2dkTTcTdRKPBQPZwFoije+PMkhbxWlVIag6zGGY8MiHCiUcIWcbd4PJH1K4Um r+JTWgWy9bdJw3DZ8fyDRknhZGYu3l19sVQNgdUilGiae6+8/7MvRJBvh2ZzkhO1vRtDaO Gfoo/Lr2Np0LyYkk4VuyUVCoy9YLGOSyqzKSAXOUAyVoN1L1z6rnwtabPXFFi2NdREmhiq kMlOrdduiacxoODOUzazRryYvLABQBhdGiIaZ6BgqEf1UYD6HxjUYh/xLLF9egdU9t9Cz0 0MuHK+ZAGWWRRsrjOlwtX4UQ93LJdzM8lxT/GrAiKImE2Azt+m+UGxmLoRBimg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAaOTbYMRnafF5OTfy6UdKZcvB846cOyPRuxgGM4DGU=; b=f2PK7G+woq/xBdnY7FYXcYwJ0+VmpEnaxPEtYOsiEZwcN/TmnFmsyI4NwJ7a8wd2ISU8xW /imIeJj8JDrc1/8GsSOB6atd8/a9MZW8yfTFJszq1BpO6dS6+OJUVKtOdtU7/qul56oOl/ dWr5A+ivJQ84hH7i5DiulfKfBoaC7LrX6nQa/T+OM/zVzh9KZeHO/E/35Qv+TqloaZ3Vjy gmIqAsDpRQrEAj8+Axjb8eJRbi0qvvw4QCWtiJ7nWrXlVQpN3kkynFxSJHP4bCvePRaZB5 r5/iTi98j2k2nZavryTlysbSROcA+aKCgaapf0sMSrv+SN/UXOVSjhqMSOP9KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQTZ61CWz16wY for ; Wed, 18 Feb 2026 18:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41bfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:46:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 45c1e44779e3 - main - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45c1e44779e3d365f5e31f75546d48ce34e4ee05 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:46:42 +0000 Message-Id: <69960912.41bfe.69fdf95a@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=45c1e44779e3d365f5e31f75546d48ce34e4ee05 commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05 Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Jessica Clarke CommitDate: 2026-02-18 18:45:26 +0000 Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break, which predates the addition of FreeBSD support to OpenZFS. Moreover, 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also defined (alongside __powerpc64__ to disambiguate), which has always had a 64-bit time_t. This code has therefore always been wrong for all PowerPC variants. Fix this by limiting the 32-bit case to just i386, which is the only architecture in FreeBSD to have a 32-bit time_t and not have broken ABI, due to its special legacy compatibility status. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Jessica Clarke Closes #18217 Closes #18218 Reported by: fuz MFC after: 1 day --- sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h index 14b42f2e7087..c72c3ea3648f 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h @@ -51,7 +51,7 @@ extern int hz; typedef longlong_t hrtime_t; -#if defined(__i386__) || defined(__powerpc__) +#ifdef __i386__ #define TIMESPEC_OVERFLOW(ts) \ ((ts)->tv_sec < INT32_MIN || (ts)->tv_sec > INT32_MAX) #else From nobody Wed Feb 18 18:50:34 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGQZ24jktz6Sd4L for ; Wed, 18 Feb 2026 18:50: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 4fGQZ23yqwz3dlH for ; Wed, 18 Feb 2026 18:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wif+Hy7cq/g+PW9C6V1aaxrozi0akI40OROKVx7HTlk=; b=MWB+/s5nKiLq2WHIr6qB1A3gyuAHzV3EN7iu0zcflKfRCzWg/uXDM7sseQcTwBhy4HeC4V O0mNL1OaZcOIRw1uxWYpSz49CqXTVZtc9lfxOAyZ34jOnBoUcdftstKVbIjVfRtAKTRrTe h89nRIHJm7TsgmFWsPgNsAo0TBHSVnuO60ddKHevY9kQ45rPW9TlyWxplRI6hQUPi+unaV 2cUzPD3Y9cOdzmQizXb8Qi47YxVPsyfbuzV0SAxArhYVb5eWll//LvlrzGNhFKzGSzeJbS VfowqTmwMEmjQQP+aZeveOWcnn4u754TClVsQqypwcvaa6mFLsr2JRuBRlCt8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440634; a=rsa-sha256; cv=none; b=U2QNXNAg9vW4T+Ap9VsqnTCMUxR9BGZaCx76rGDUyS/ntmwGTTETPMmZtGKXnG0tsV7Evd IyXMiXbbqhB4+/bfxRqm4STKjV6HCIWxS45Wu3YvXVDS4zttaR8TmlUdqUuqoeBq7sJUJC vZ7z5jPafxmmcBE76pG3fWNHt6Rnrf/9stAHbgpv720wXpp+FkPiYBrPgNjWzza4FGKpIS pcIGELuA6IokTG4n+tgErdTS6gDyyImJuB/oPWOD2f4TO54suwZljeUI+qokNhzVP4yv3I 8lPUP/0Kn6K/clsdegjxleknctIRwxBYTP1cbWx7N3bCsx13RqIZw6DC0mhh2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wif+Hy7cq/g+PW9C6V1aaxrozi0akI40OROKVx7HTlk=; b=QAJGcQxZTqMeI2bI3VuBa+0m1/Ud9PDAByUGqBY2DKRgu7FcQohQPZBO3xiDwr0+I9x/Ex nAttDixATNaM1fcYvKNyriS4vVDx2l5dASs/oRdHxmAQHlmfwRoWuev1So8Jqv69hcQAZG L4ccRlP+zEPmQ3P5wK4E61XCy1k1QrneXztORx3hitcrrqD9epdAKCV3+C4hKBqGZ16Dlp zvIDrlsHUaQ95Glds5V3EYfKtffTCFjIIuJ8sAHOnRnauKi4gEPoiaFLkEL0uS3hAbmpr9 LDJ9f/aPWnp4sPUNDznmnXaDAWRt8tIn4CbEDgUdr+aIyAFYuKgGswiDvzanLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQZ23RJKz16kR for ; Wed, 18 Feb 2026 18:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c27 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:50:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 1e36ee767576 - main - mitigations.7: spell List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e36ee76757662bf6a672ebd7ad77a6dc674853b Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:50:34 +0000 Message-Id: <699609fa.42c27.7186ad46@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=1e36ee76757662bf6a672ebd7ad77a6dc674853b commit 1e36ee76757662bf6a672ebd7ad77a6dc674853b Author: Maxim Konovalov AuthorDate: 2026-02-18 18:50:14 +0000 Commit: Maxim Konovalov CommitDate: 2026-02-18 18:50:14 +0000 mitigations.7: spell --- share/man/man7/mitigations.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index 37a81986e372..c12e57e9a7b1 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -1,5 +1,5 @@ .\"- -.\" SPDX-License-Identifer: BSD-2-Clause +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright © 2023 The FreeBSD Foundation .\" @@ -431,7 +431,7 @@ With particular sequences of instructions whose last ones are mispredicted by speculative execution, it is possible to make appear in an XMM register data previously put in some XMM register by some preceding or concurrent task executing on the same physical core -.Po disabling Simultaneous Muti-Threading +.Po disabling Simultaneous Multi-Threading .Pq SMT is thus not a sufficient protection .Pc . From nobody Wed Feb 18 18:51:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGQZx2g4cz6Sd5V; Wed, 18 Feb 2026 18:51:21 +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 4fGQZx20yGz3f8M; Wed, 18 Feb 2026 18:51:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440681; h=from:from:reply-to:subject: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=XNouyp7w01Ftp11bbWRPaKPQbvP3ADj/Ut5DM4Kw3+o=; b=lah6dvuK+VHBTEXnTISZF7sOVpKw3RDDf+TIoUi6ZRvBGZttDWhX2BBGWuI9HV0o5PA8lm ohkdIyfThEnMFTaqfPgiUxXmJriJNIWBm7GUpPyGAiiwFTe/Vn/yJ92LQIfPDRqpyvEKIw yTVJOv3bjaXAZzxVS38t5c9sDwFeWbJHDx0spWplRbJraocHJlIhUCE467SGn6k0fJBFZT X/zfoWgLTmvUDtu87VS98scjZTUCHWWatq/gi9LOFOzES8zrlbsZNYqIFAjhFiQcuiXOUF kz2VHKJeCwjvNpXjOCcESX40qHNhvxQvIKbMNGO3csH1xb/D9SccEXwO8E6Njw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440681; a=rsa-sha256; cv=none; b=JeqnCPw3nMQGvnKIFBsu/kA8ijlI5BzFtiCYLUZ/6QemfD8VKwhpe7JZlg4Juw2ckvrbO4 /CMB6EicVliqoZddttuG1uuPdS4yE8W09U8aRoEniocsBqYZwJ1YTUGKhL0fPePylsOpUq I+0Q1hedHqVN0+O+lmVi6ZJaYjon4L01gvlSepeErtgJk4UWsVDtNh8TrrLqxm+xKmpUuQ OtIELONIPaubrH0mT8GGcJ7cTPSObsyPLmCPhlWP4jV0/45GZAxlP1eHLD9R24MAxut9uk ZId8T251hqQs7yrL8hVEJF5sKvsObaXgBigaZ+EGFmNC4/IxopXUSIYzglHV7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440681; h=from:from:reply-to:subject: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=XNouyp7w01Ftp11bbWRPaKPQbvP3ADj/Ut5DM4Kw3+o=; b=PaVNthRpC1PSyXiij/kwLAvrINo8lIBDI4XmA7h7ZnEIL2mPisYiipbO5g0dqTXH4V/s4m o2ohSDjmH8PO46uC7fyNtKUWK292/mtbz6phYfNhwZXt4BExRPbQErSHYD6XpJcGogp6ER M2MHg12JztTx6D/OF9+VTpGmT/ke2nUrrSDxSu8UK31P5V18VczuBLw/L9HM+raXPB63Pm +Uyo/0Y4d0kIst6SIc3HjIyWwJp4cu7gz7D0zdbRNpsfAqYBZ0/ZfxYStlGscMSReypBwj pvzT4F7gGRdMtXoc1MZYS1cusEcvCXwycL0VODJ/SO3UONF4g8S6iPwVrzuhaA== Received: from [IPV6:2601:5c0:4202:5670:893d:f408:267e:3b85] (unknown [IPv6:2601:5c0:4202:5670:893d:f408:267e:3b85]) (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 4fGQZw75WgztGB; Wed, 18 Feb 2026 18:51:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <06f7c9c0-a681-4573-8b1d-83b65f825d5b@FreeBSD.org> Date: Wed, 18 Feb 2026 13:51:20 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8e593a1f1432 - main - fortune: fix netstat tip Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <6995eeee.37508.1de1224c@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <6995eeee.37508.1de1224c@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/18/26 11:55, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8e593a1f143203cace2e14bd6629a8ebdf9b47dc > > commit 8e593a1f143203cace2e14bd6629a8ebdf9b47dc > Author: Warner Losh > AuthorDate: 2026-02-10 14:59:58 +0000 > Commit: Warner Losh > CommitDate: 2026-02-18 16:39:28 +0000 > > fortune: fix netstat tip > > netstati 8 reports in bytes per second (averaged over 8 > seconds) rather than bits per second because it reports the total > in bits over the 8 seconds... > > Sponsored by: Netflix Eh, I originally thought this too, but the original hint is right. netstat doesn't report a per-second average, just the delta, so when using '8' it is showing the number of bytes sent/received in the 8 second interval which effectively multiplies the per-second rate by 8, so if it is a constant rate you get the bits-per-second as the output. Relevant code from sidewaysintpr() in if.c: fill_iftot(new); xo_open_instance("stats"); show_stat("lu", 10, "received-packets", new->ift_ip - old->ift_ip, 1, 1); show_stat("lu", 5, "received-errors", new->ift_ie - old->ift_ie, 1, 1); show_stat("lu", 5, "dropped-packets", new->ift_id - old->ift_id, 1, 1); show_stat("lu", 10, "received-bytes", new->ift_ib - old->ift_ib, 1, 0); show_stat("lu", 10, "sent-packets", new->ift_op - old->ift_op, 1, 1); show_stat("lu", 5, "send-errors", new->ift_oe - old->ift_oe, 1, 1); show_stat("lu", 10, "sent-bytes", new->ift_ob - old->ift_ob, 1, 0); show_stat("NRSlu", 5, "collisions", new->ift_co - old->ift_co, 1, 1); if (dflag) show_stat("LSlu", 5, "dropped-packets", new->ift_od - old->ift_od, 1, 1); xo_close_instance("stats"); xo_emit("\n"); xo_flush(); (Note no scaling, just 'new - old') -- John Baldwin From nobody Wed Feb 18 19:18:23 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGRB74wkGz6Sfq7 for ; Wed, 18 Feb 2026 19:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGRB74NP8z3j8P for ; Wed, 18 Feb 2026 19:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771442303; 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=2QENMRAqi2R4Y+6+5Ve81IOAQG4Ik/5Aq1Gy3lEVrRc=; b=LW12/0yLYTzP2iwRQsW84He2eBNV3kp4dW7B3zzIfx79NhD8gEemiEDcbVCQhzLwn/NcBj Ihh2529STxpFEcuuJAYUo4AoH0V5Mr05r/1A274yhMdW5sGmaeh6DlzbIbnPjk9ctX92XV oMMkguKH7AcW9bf48NNvfedO2P1VXTFiF4im1KxQTPCUzwdFKFIlVifnZoGvdTfXsHDJF1 FT5/0aQRCO3ASssJD5VtBfrkHUwGseDcou3oioYuwHvd6EltL5S1+ScO6TwEgLOhP8w4lM k6kkiWfWnv3Lb+xteSa/cb1oCh10GP72nt6ZHnoActyV8aIfLx4+WFsJwaOq0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771442303; a=rsa-sha256; cv=none; b=byWeDe7zjPBUMO1REE1JW8m9Uw11aJOtf3V4zyaEmrOJs7x6KapEgUX1NBg74Y0C7JZHD2 emHVJjbdldbfvlD79ic5rJRlw4uhhowUPUMppeb2CxiRnBTpLuY94SU9UzlIEkcUmTAKn1 fKIyUeKuKKZ3/EBqLaDTapcqV+PirpPIuf4BW5oXyisaPaN+3grrtGZKOXDKG8Vv8OhvwA YF4A/NMBIOKQDPEtH92uHijmgtxijcJHl5Vbv2wDZG1Q2WTCPZTtohWg4QZp6LClAVPink JdZYGTeZ56Z9rshNz5HdU+tRmsUP4S5ofhtLm/PHxW9eTNo8EvxtRNf+/nO2xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771442303; 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=2QENMRAqi2R4Y+6+5Ve81IOAQG4Ik/5Aq1Gy3lEVrRc=; b=V2eaPVEDNYe+d8oy48YHDhJvEezemtix5DJUDiBTsHodwispv8rudWiaIWb21c3syv5zXf xp7XoBHxZFKc0ZZTw+66OpHP0G1oX98GIEDvcAvNM1k4VXftfgRB02IEc+BEwdZiTxsUaW VfEUILBsI8CYvGUEZvm6LP0vr96MPvorUWcOEQEtaM+OYYb07fqGynlDEJv3f0J/VysvqL ym1ye7z1xmKPffE1hnbyZhaGIByRi6VREJsmyKQNF+PL0ZH8AEtKJq87vCU/uidkIDe6yr j08ANRPpKydhEnFME0ZAKcfSzipyJFt55HayymVPjrEzQ8+dJVA4+RH0+ROk2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGRB73z7lz17WV for ; Wed, 18 Feb 2026 19:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44c88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 19:18:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 7e313584ab10 - main - beep: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e313584ab1075195ab735c1452375cf2388b162 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 19:18:23 +0000 Message-Id: <6996107f.44c88.734c5aa@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7e313584ab1075195ab735c1452375cf2388b162 commit 7e313584ab1075195ab735c1452375cf2388b162 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:23:16 +0000 Commit: Ed Maste CommitDate: 2026-02-18 19:17:49 +0000 beep: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.bin/beep/beep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/beep/beep.c b/usr.bin/beep/beep.c index d16ad5b699c3..a6e09fbf61c1 100644 --- a/usr.bin/beep/beep.c +++ b/usr.bin/beep/beep.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2021 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without From nobody Wed Feb 18 19:23:43 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGRJP2KjPz6SgX9 for ; Wed, 18 Feb 2026 19:23: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 4fGRJP13Q4z3k8y for ; Wed, 18 Feb 2026 19:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771442629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e95QVE1pLllDRHfApThFQ4d93gxDSlFjWOCZRtSDcnM=; b=P2J5bo2k6JSEdC9eol2GIk7dtKGK8GUoukOfpZ8FXgq8jX7Yl68o3sveGbU92CwkOQjXL4 SBT6IIrRrZ5lVjIrNeQpM8q1KMttzwb/fIdhb1fqrZUL3CCbf0tzoIlUkXs9mY1t3d7jgS eL6j8pafYYxYh/BS68drtsnG+RIoJK1GLjnOSsD8OSJrjtwoQ0NruRxOQNh+n/3tfkJ8Nu pn5nYrtBtUTy9ydTx2a5VaH/YLVO7E0Layc7u3ooIPKBFCOoqbktJ7/Y+FTJl0JBzXgAXr CdGpXJfEqf4IYZd09l9RqE6nKPNrDj82ayCgJPGAWPHhtEEWbWnGdYA18U1Emw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771442629; a=rsa-sha256; cv=none; b=T6jTfTioAJtcjf/PiSj7K1S6rbiWnzGKbgJu3dZ80GQWWNdr9t+RNbxjnPH9almMOmrlnH ctEMgtFVsnpfsWVM/zaMk018UFJBx+eNDBqlId0h/8hkvXECcfVqPS+49FUCEHu/kDcCvV fLYoNh1kBXyYoWCTQCvauI1bBDSuDDy+VhdbeMLwzTsWS1peRFG0WqiA2RaR/D9M5Uj1JJ XCPcj7ss8EmnE70rkalTEZz8ZT6goXo7KRaS/oemSor3cGS8UJnp4hZaVicAiyrC257jkY Kz0z18zhckX2Vs6d265awHc/O+pNDHnIxcNKogdEKQzZazwR5uFgXVZOElAHPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771442629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e95QVE1pLllDRHfApThFQ4d93gxDSlFjWOCZRtSDcnM=; b=iZySAbdeGdk0qrMrgyYEOfgGzhD6Tck4iZnXvj1NGxsFyDRrtie+m+i0CX2sHsliMrIPBF kuac+GuFFTCZf2cRhSaPdR2/MD3Itovm130uV1z3lKaRH69CVYfEZXiePdstKJYB2Ikt6f WFwPeel3r8CZn+iIp86E9+HVFBu5ybySJJhGC3z1vphU0bKB3rFYpqHg6/X4sb5PWQBeNV lPZN4xmWBT7MEkwbThRwh7OwRQcDs/FC0YoGsx29cC1OI9d0FI4mXKAkB+I7nxoE7/J3Nx IePPF6r+EXwEvcfVWIQ34HHoFbELPsb9lcNZ4RSy52/eifr2UlrkMPqOFp9U0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGRJP0CsMz17lr for ; Wed, 18 Feb 2026 19:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4591c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 19:23:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 07d29f9c177e - main - Correct Identifer typo in SPDX tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07d29f9c177e731e4497bedf5fde09176c90b444 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 19:23:43 +0000 Message-Id: <699611bf.4591c.6f46d4dd@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=07d29f9c177e731e4497bedf5fde09176c90b444 commit 07d29f9c177e731e4497bedf5fde09176c90b444 Author: Ed Maste AuthorDate: 2026-02-18 19:20:12 +0000 Commit: Ed Maste CommitDate: 2026-02-18 19:20:12 +0000 Correct Identifer typo in SPDX tags --- sbin/conscontrol/conscontrol.8 | 2 +- share/man/man4/ahd.4 | 2 +- share/man/man4/smb.4 | 2 +- usr.bin/man/manpath.1 | 2 +- usr.sbin/devinfo/devinfo.8 | 2 +- usr.sbin/kbdcontrol/kbdcontrol.1 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/conscontrol/conscontrol.8 b/sbin/conscontrol/conscontrol.8 index c11a1f7db5d9..dbe60b39ddd9 100644 --- a/sbin/conscontrol/conscontrol.8 +++ b/sbin/conscontrol/conscontrol.8 @@ -1,5 +1,5 @@ .\"- -.\" SPDX-License-Identifer: BSD-2-Clause +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2001 Jonathan Lemon .\" All rights reserved. diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4 index 7fa08c12b5b5..b5347b723fb3 100644 --- a/share/man/man4/ahd.4 +++ b/share/man/man4/ahd.4 @@ -1,5 +1,5 @@ .\" -.\" SPDX-License-Identifer: BSD-3-Clause +.\" SPDX-License-Identifier: BSD-3-Clause .\" .\" Copyright (c) 1995, 1996, 1997, 1998, 2000 .\" Justin T. Gibbs. All rights reserved. diff --git a/share/man/man4/smb.4 b/share/man/man4/smb.4 index e944f1b76b5e..44dff0f77df0 100644 --- a/share/man/man4/smb.4 +++ b/share/man/man4/smb.4 @@ -1,5 +1,5 @@ .\"- -.\" SPDX-License-Identifer: BSD-2-Clause +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 1998, Nicolas Souchu .\" Copyright (c) 2004, Joerg Wunsch diff --git a/usr.bin/man/manpath.1 b/usr.bin/man/manpath.1 index ac9e3b2db5a7..ea01ce23333a 100644 --- a/usr.bin/man/manpath.1 +++ b/usr.bin/man/manpath.1 @@ -1,5 +1,5 @@ .\"- -.\" SPDX-License-Identifer: BSD-2-Clause +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2010 Gordon Tetlow .\" All rights reserved. diff --git a/usr.sbin/devinfo/devinfo.8 b/usr.sbin/devinfo/devinfo.8 index 15a6059c166f..8bf4f9d10e17 100644 --- a/usr.sbin/devinfo/devinfo.8 +++ b/usr.sbin/devinfo/devinfo.8 @@ -1,5 +1,5 @@ .\" -.\" SPDX-License-Identifer: BSD-2-Clause +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2002 Hiten Pandya .\" Copyright (c) 2002 Robert N. M. Watson diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1 index 34126c718ed9..f894faadaa29 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.1 +++ b/usr.sbin/kbdcontrol/kbdcontrol.1 @@ -1,5 +1,5 @@ .\"- -.\" SPDX-License-Identifer: BSD-2-Clause +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" kbdcontrol - syscons or vt keyboard driver configuration utility .\" From nobody Wed Feb 18 19:41:53 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGRjb3QrNz6SjCf for ; Wed, 18 Feb 2026 19:42:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGRjZ47yQz3m0y for ; Wed, 18 Feb 2026 19:42:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-c54f700b5b1so110643a12.0 for ; Wed, 18 Feb 2026 11:42:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771443724; cv=none; d=google.com; s=arc-20240605; b=LkXG6unTjzBMVyYJEL+wIkJOpHlKK/ihj+TbROk1ngI/5W1mOFDQNe4v55ri+wv/nV sVWQkS206VwmbA9fCk2Fjny7V8gSQim0KOxadidvYXhAIEPZTApyx9clt8eY28unvRIM 4gv/pPjAETrwrpiSb/MYmrhJWTSBpemF9qg8feX7QeegHRc0F4ZCYHSuW/iRmZuYUE2R 83SQOVeqA5R2JcIbUEoSWEUvT94c/Cv0D8CCkd+47kZ2v/fV/3pNq+KhSu/vuxddEs9h 7aiTaFMt9ET0qt3USJjK+CI3LGYBc6DWK1QPpvrTWzfmfVAdksYhjZfC5su1gQjfby85 QKSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=dtBh2QJwsg6LBIPxXRD85Oy4l5Cmw9XDc8w8G/peSR0=; fh=I/qZzvm+cXX2ITyl2v+LIo4fr0eJ6wYuKaB96WIPKv8=; b=IJEK7TjES3VBQByK8/jUV6491aLBBaZ+hNvg57BbteFD9PfDYFwmJvVmEVcOAF+wKH QwDcEeGQKtn2mc6GAptp1Aw2gSVRto99Jy+o18VsH0ryw/VblC1Pzl64aGdK9FBkCEuh HTmLYx1ePjGh2cLCL14uMzJYTkEEy1rNmqEBLMMqVCbIn3SFMACnYH5BhJWZm1h592m5 SYP7yGNQ9pb2OQ3bNK1QB7jTdjzp42mqEzTcWnTK7ARQBHNRwoq3fTssua/QQ3ShAQkz run0CTCj91NelioeWjx44ptqfcqBmN2hCDPEXZYLFFCwfId1HCNf03tn3qnNpkZo5xYi bsrA==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1771443724; x=1772048524; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=dtBh2QJwsg6LBIPxXRD85Oy4l5Cmw9XDc8w8G/peSR0=; b=URN+/Gd3mwEM9681P3Ghn9FtqcQggAW0D/X3p2vdTFM007YwdZfCXoLEnaFOuK0vqc ikIu10rnEgcFPxgQuFQvBif1PPy8WrzlGczg7t+P/4bw8giMvPwdruRb01VeMbeLOCvw s0kdb/N++IBOm9qM/QKMgoK+n92AVPkPXDnMytBmTMMrEVhHDezkjP/1GMP2zACHhCY8 JaWJyfX17H4A29WN0Qv9J0qbC3Af5LUCDWBvD6n95Li2QnWcddgGWV8+2Cm/IurwVvUJ XfXFmauWHe62L9f4mx4ARzjQXQeEptUYIX5PCT3+uPWtfbda5Ge2RRNrHZaBAroHRf/9 NxBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771443724; x=1772048524; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dtBh2QJwsg6LBIPxXRD85Oy4l5Cmw9XDc8w8G/peSR0=; b=DwtwhWfAWWpNW8/UZr42XMBkeUmT23U6etMaqu9k1ncNwjXVtRzwIyZV8Q3XwEQE0t zY0qd0ehtIzEWzXhdhzIql1RJzJOF8/I0b8f1noqyLYMy4iGzdYxRQcGP8Xy7+VdW8Bx JWi1KdXZwaT24yu3rqzSJvcZCDqAjCWi9l2WXP7XeXM1yT8I3a0Vf+hEstBP7EM75veh ilDS0CrANwi98VOSiYrLcnYM6u8dtja1iZi8911ahnNNPfpvjWXRDMyHMM4MCvg4ki2i +Qus2H1Owu3DA5bATPhEibvoCBYYCVhxJUiXS18jKekzGp5W0tmgxbgJmE5lQ3SIr7pa HUsw== X-Forwarded-Encrypted: i=1; AJvYcCXAuPCStjSyAnX8GBVxx7gguZkdolxMIPfhmvuSb9SmGKkrwB5bk0mai2cXRjyR2+oP5gcP/84umy8hiCFCSPIEnQSy1A==@freebsd.org X-Gm-Message-State: AOJu0YxJEsHEliCFEozVGzDSV7OoPRx6L8ZoH1rDxcsv2wMziFJDTqSh e6bqGRSdVEbFBc90NYjlv+UTyrzWR6qmIP+4LtadygQcZ5sh2r+pYxJ8aAw3R3o6qEOvgSgdjFG PR/SmWYoK9UvIIhmpQf/0Dy6GLfabZCLidCE74yJgHw== X-Gm-Gg: AZuq6aL+bIk1ilvsiodxkKHo05WLaED7+Jw+rpyYkYlTeFXmW/J+dxQNQuwE88s/CLD osz/wjO8nPhri0+GuDN2XJvVZqwijeRXlzEzbuBW+Kk5RhBYeq5l0aOMx8jWllfUCtkueQjfcTD Uz1HxRwWPEptYy+uUNrd98CX4W5l8Ngnqjzz3415iEs9TzlxG5lBRcEWSFC1Gii3H2csJOtxGXG WgauunI1HhfwE4hJrGg6QzfnNmUgn9ux0FlYXOoVl8UOMJFW1l4VqynJVXb5SASwsWghyCR73tr jw+lvWA1DCR2dQPB2R48iU6S40YgFK//UNEkXRlJSYZoj+Caeldm X-Received: by 2002:a17:90b:1345:b0:343:f509:aa4a with SMTP id 98e67ed59e1d1-358450ebeb4mr14554266a91.36.1771443724189; Wed, 18 Feb 2026 11:42:04 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <6995eeee.37508.1de1224c@gitrepo.freebsd.org> <06f7c9c0-a681-4573-8b1d-83b65f825d5b@FreeBSD.org> In-Reply-To: <06f7c9c0-a681-4573-8b1d-83b65f825d5b@FreeBSD.org> From: Warner Losh Date: Wed, 18 Feb 2026 12:41:53 -0700 X-Gm-Features: AaiRm534rTOj3L-gtOWn8cYZWBUezibaNOso53_PU_csKYmDpfv5tjR_GW3KP0c Message-ID: Subject: Re: git: 8e593a1f1432 - main - fortune: fix netstat tip To: John Baldwin Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000eb8d83064b1e615b" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fGRjZ47yQz3m0y X-Spamd-Bar: ---- --000000000000eb8d83064b1e615b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Feb 18, 2026, 11:51=E2=80=AFAM John Baldwin wrote= : > On 2/18/26 11:55, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D8e593a1f143203cace2e14bd6629a8e= bdf9b47dc > > > > commit 8e593a1f143203cace2e14bd6629a8ebdf9b47dc > > Author: Warner Losh > > AuthorDate: 2026-02-10 14:59:58 +0000 > > Commit: Warner Losh > > CommitDate: 2026-02-18 16:39:28 +0000 > > > > fortune: fix netstat tip > > > > netstati 8 reports in bytes per second (averaged over 8 > > seconds) rather than bits per second because it reports the total > > in bits over the 8 seconds... > > > > Sponsored by: Netflix > > Eh, I originally thought this too, but the original hint is right. netst= at > doesn't report a per-second average, just the delta, so when using '8' it > is showing the number of bytes sent/received in the 8 second interval whi= ch > effectively multiplies the per-second rate by 8, so if it is a constant > rate you get the bits-per-second as the output. > > Relevant code from sidewaysintpr() in if.c: > > fill_iftot(new); > > xo_open_instance("stats"); > show_stat("lu", 10, "received-packets", > new->ift_ip - old->ift_ip, 1, 1); > show_stat("lu", 5, "received-errors", > new->ift_ie - old->ift_ie, 1, 1); > show_stat("lu", 5, "dropped-packets", > new->ift_id - old->ift_id, 1, 1); > show_stat("lu", 10, "received-bytes", > new->ift_ib - old->ift_ib, 1, 0); > show_stat("lu", 10, "sent-packets", > new->ift_op - old->ift_op, 1, 1); > show_stat("lu", 5, "send-errors", > new->ift_oe - old->ift_oe, 1, 1); > show_stat("lu", 10, "sent-bytes", > new->ift_ob - old->ift_ob, 1, 0); > show_stat("NRSlu", 5, "collisions", > new->ift_co - old->ift_co, 1, 1); > if (dflag) > show_stat("LSlu", 5, "dropped-packets", > new->ift_od - old->ift_od, 1, 1); > xo_close_instance("stats"); > xo_emit("\n"); > xo_flush(); > > (Note no scaling, just 'new - old') > Oh. Damn. I'll revert --=20 > John Baldwin > > --000000000000eb8d83064b1e615b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Feb 18, 2026, 11:51=E2= =80=AFAM John Baldwin <jhb@freebsd.or= g> wrote:
On 2/18/26 11:55, = Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D8e593a1f143203cace2e14bd6629a8= ebdf9b47dc
>
> commit 8e593a1f143203cace2e14bd6629a8ebdf9b47dc
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2026-02-10 14:59:58 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2026-02-18 16:39:28 +0000
>
>=C2=A0 =C2=A0 =C2=A0 fortune: fix netstat tip
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 netstati <mumble> 8 reports in bytes per sec= ond (averaged over 8
>=C2=A0 =C2=A0 =C2=A0 seconds) rather than bits per second because it re= ports the total
>=C2=A0 =C2=A0 =C2=A0 in bits over the 8 seconds...
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix

Eh, I originally thought this too, but the original hint is right.=C2=A0 ne= tstat
doesn't report a per-second average, just the delta, so when using '= ;8' it
is showing the number of bytes sent/received in the 8 second interval which=
effectively multiplies the per-second rate by 8, so if it is a constant
rate you get the bits-per-second as the output.

Relevant code from sidewaysintpr() in if.c:

=C2=A0 =C2=A0 =C2=A0 =C2=A0 fill_iftot(new);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 xo_open_instance("stats");
=C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("lu", 10, "received-pa= ckets",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new->ift_ip - old->ift_ip, = 1, 1);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("lu", 5, "received-err= ors",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new->ift_ie - old->ift_ie, = 1, 1);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("lu", 5, "dropped-pack= ets",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new->ift_id - old->ift_id, = 1, 1);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("lu", 10, "received-by= tes",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new->ift_ib - old->ift_ib, = 1, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("lu", 10, "sent-packet= s",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new->ift_op - old->ift_op, = 1, 1);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("lu", 5, "send-errors&= quot;,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new->ift_oe - old->ift_oe, = 1, 1);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("lu", 10, "sent-bytes&= quot;,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new->ift_ob - old->ift_ob, = 1, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("NRSlu", 5, "collision= s",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new->ift_co - old->ift_co, = 1, 1);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (dflag)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 show_stat("LSl= u", 5, "dropped-packets",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 new-&= gt;ift_od - old->ift_od, 1, 1);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 xo_close_instance("stats");
=C2=A0 =C2=A0 =C2=A0 =C2=A0 xo_emit("\n");
=C2=A0 =C2=A0 =C2=A0 =C2=A0 xo_flush();

(Note no scaling, just 'new - old')

Oh. Damn. I'll revert
<= div dir=3D"auto">
--
John Baldwin

--000000000000eb8d83064b1e615b-- From nobody Wed Feb 18 19:44:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGRmN4B0Tz6Sj6x for ; Wed, 18 Feb 2026 19:44: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 4fGRmN3xTzz3mLn for ; Wed, 18 Feb 2026 19:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771443876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xbY8SHLvXqrXUWD4cgB8ZbW6YqlBD6ghF9zk+o9W/x0=; b=sVySedLpILLtDHDasqd8mUadLH9fpuO4YFBiWL2tZh4Yz/pYVHrxFyDjMNcsmQWcrXKbjl hEHf/zIuxDS25TWAHMoyk2EehDzKiZAFZ/ClwgfPQ/+VegjRkwipn6jUSmH6mN82tx8eq3 8m1OhVgly3M/fXb9Qo9OXUXcL6ZTy1gve1l6ys0/V/DUKcHwm4w/gYmMdbocdTKSA+FBFU FB7xA2gLuSh9auwCzZ0GudN2ifUNoSGOo49rvCnK+wvlMWz4GYB4ZLKWQ9FC7qnd4NltoB e0ll5gYOK3Ho7SmQfwTli2eTZ9VxDZm8rEV3YhrHDyBt8GX7X9+WHdcljUWGbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771443876; a=rsa-sha256; cv=none; b=QBORd3hASz6VQX4QyJZEkGjiKxXCgpOp2MEXqydi+/w0b6ST3ZBxlfpVq/RHdWHBuG448w hb0hMWbNrpxlC089GTIYAn0uNfZe4g2Zl56fLzQmymro1p/VkFzXn/sWXvGohN8ro7+fpR nPJj+ZSnuOPDrqD6Wr/T/pqzNhhmcZa2ietwzv9z6QTFHC/30G/sKwPIYwcHEiBZMF5mBK aVk5NPuTSYfbCzrUcU/4GCLLWQXwJMRRqiyrNJ6HsiZstN/GM1pYatnqrgGYU4rTkQJ9rR ayJDg74cCcT5+8qDBlZWHKjKySEEC4DNlj6G/eLbnpC/Thkv6UPhhilWzGltcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771443876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xbY8SHLvXqrXUWD4cgB8ZbW6YqlBD6ghF9zk+o9W/x0=; b=sD9yt4hhXWNqkQD2aopMKHuKXNvJNifemp+cqMfewIE9/+tTwEFz62HX0B7BchmZvsc/H9 ATXhUspbD58LkSd4SlnPJLBjx9i1ZP63l4AY1aQ6qpZRs00vTNkFs8xZFxZ7QpBIwIG/WZ T6SkAYTtodwEbNnPgJipnmXZLrargWyWFiXHNRO591R3BMDc8oOkoVGUZFZcTkuw2n0nEb ObAjf85Z152fZHGFdaz/tgUPF1ZKDlpiWHToftbGLyS/dccy90WIXBW+WhaX1USLOMeAY3 jTHle+WUNiNboMnH0XSQQZOS0i6FpYmJ5loHOKm2+6Tqkd0ALCnQIMJqJ6HABQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGRmN3RZ4z18gg for ; Wed, 18 Feb 2026 19:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 472d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 19:44:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: e1e18cc12e68 - main - if_gre: Add netlink support with tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1e18cc12e68762b641646b203d9ac42d10e3b1f Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 19:44:36 +0000 Message-Id: <699616a4.472d0.d45c789@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=e1e18cc12e68762b641646b203d9ac42d10e3b1f commit e1e18cc12e68762b641646b203d9ac42d10e3b1f Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-18 18:12:35 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-18 19:42:29 +0000 if_gre: Add netlink support with tests Migrate to new if_clone KPI and implement netlink support for gre(4). Also refactor some of the gre specific ioctls. Reviewed by: glebius, zlei Differential Revision: https://reviews.freebsd.org/D54443 --- sys/net/if_gre.c | 473 ++++++++++++++++++++++++++++++++------ sys/net/if_gre.h | 1 + sys/netlink/route/interface.h | 23 ++ tests/sys/netlink/Makefile | 1 + tests/sys/netlink/test_rtnl_gre.c | 173 ++++++++++++++ 5 files changed, 605 insertions(+), 66 deletions(-) diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index ca9c4835daf6..758f25ccb859 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -90,6 +90,12 @@ #include #include +#include +#include +#include +#include +#include + #include #include @@ -100,9 +106,16 @@ MALLOC_DEFINE(M_GRE, grename, "Generic Routing Encapsulation"); static struct sx gre_ioctl_sx; SX_SYSINIT(gre_ioctl_sx, &gre_ioctl_sx, "gre_ioctl"); +#define GRE_LOCK_ASSERT() sx_assert(&gre_ioctl_sx, SA_XLOCKED); -static int gre_clone_create(struct if_clone *, int, caddr_t); -static void gre_clone_destroy(struct ifnet *); +static int gre_clone_create(struct if_clone *, char *, size_t, + struct ifc_data *, struct ifnet **); +static int gre_clone_destroy(struct if_clone *, struct ifnet *, + uint32_t); +static int gre_clone_create_nl(struct if_clone *, char *, size_t, + struct ifc_data_nl *); +static int gre_clone_modify_nl(struct ifnet *, struct ifc_data_nl *); +static void gre_clone_dump_nl(struct ifnet *, struct nl_writer *); VNET_DEFINE_STATIC(struct if_clone *, gre_cloner); #define V_gre_cloner VNET(gre_cloner) @@ -115,6 +128,18 @@ static int gre_ioctl(struct ifnet *, u_long, caddr_t); static int gre_output(struct ifnet *, struct mbuf *, const struct sockaddr *, struct route *); static void gre_delete_tunnel(struct gre_softc *); +static int gre_set_addr_nl(struct gre_softc *, struct nl_pstate *, + struct sockaddr *, struct sockaddr *); + +static int gre_set_flags(struct gre_softc *, uint32_t); +static int gre_set_key(struct gre_softc *, uint32_t); +static int gre_set_udp_sport(struct gre_softc *, uint16_t); +static int gre_setopts(struct gre_softc *, u_long, uint32_t); + +static int gre_set_flags_nl(struct gre_softc *, struct nl_pstate *, uint32_t); +static int gre_set_key_nl(struct gre_softc *, struct nl_pstate *, uint32_t); +static int gre_set_encap_nl(struct gre_softc *, struct nl_pstate *, uint32_t); +static int gre_set_udp_sport_nl(struct gre_softc *, struct nl_pstate *, uint16_t); SYSCTL_DECL(_net_link); static SYSCTL_NODE(_net_link, IFT_TUNNEL, gre, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, @@ -136,12 +161,46 @@ VNET_DEFINE_STATIC(int, max_gre_nesting) = MAX_GRE_NEST; SYSCTL_INT(_net_link_gre, OID_AUTO, max_nesting, CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(max_gre_nesting), 0, "Max nested tunnels"); +struct nl_parsed_gre { + struct sockaddr *ifla_local; + struct sockaddr *ifla_remote; + uint32_t ifla_flags; + uint32_t ifla_okey; + uint32_t ifla_encap_type; + uint16_t ifla_encap_sport; +}; + +#define _OUT(_field) offsetof(struct nl_parsed_gre, _field) +static const struct nlattr_parser nla_p_gre[] = { + { .type = IFLA_GRE_LOCAL, .off = _OUT(ifla_local), .cb = nlattr_get_ip }, + { .type = IFLA_GRE_REMOTE, .off = _OUT(ifla_remote), .cb = nlattr_get_ip }, + { .type = IFLA_GRE_FLAGS, .off = _OUT(ifla_flags), .cb = nlattr_get_uint32 }, + { .type = IFLA_GRE_OKEY, .off = _OUT(ifla_okey), .cb = nlattr_get_uint32 }, + { .type = IFLA_GRE_ENCAP_TYPE, .off = _OUT(ifla_encap_type), .cb = nlattr_get_uint32 }, + { .type = IFLA_GRE_ENCAP_SPORT, .off = _OUT(ifla_encap_sport), .cb = nlattr_get_uint16 }, +}; +#undef _OUT +NL_DECLARE_ATTR_PARSER(gre_modify_parser, nla_p_gre); + +static const struct nlhdr_parser *all_parsers[] = { + &gre_modify_parser, +}; + + static void vnet_gre_init(const void *unused __unused) { - - V_gre_cloner = if_clone_simple(grename, gre_clone_create, - gre_clone_destroy, 0); + struct if_clone_addreq_v2 req = { + .version = 2, + .flags = IFC_F_AUTOUNIT, + .match_f = NULL, + .create_f = gre_clone_create, + .destroy_f = gre_clone_destroy, + .create_nl_f = gre_clone_create_nl, + .modify_nl_f = gre_clone_modify_nl, + .dump_nl_f = gre_clone_dump_nl, + }; + V_gre_cloner = ifc_attach_cloner(grename, (struct if_clone_addreq *)&req); #ifdef INET in_gre_init(); #endif @@ -156,7 +215,7 @@ static void vnet_gre_uninit(const void *unused __unused) { - if_clone_detach(V_gre_cloner); + ifc_detach_cloner(V_gre_cloner); #ifdef INET in_gre_uninit(); #endif @@ -169,7 +228,129 @@ VNET_SYSUNINIT(vnet_gre_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, vnet_gre_uninit, NULL); static int -gre_clone_create(struct if_clone *ifc, int unit, caddr_t params) +gre_clone_create_nl(struct if_clone *ifc, char *name, size_t len, + struct ifc_data_nl *ifd) +{ + struct ifc_data ifd_new = { + .flags = IFC_F_SYSSPACE, + .unit = ifd->unit, + }; + + return (gre_clone_create(ifc, name, len, &ifd_new, &ifd->ifp)); +} + +static int +gre_clone_modify_nl(struct ifnet *ifp, struct ifc_data_nl *ifd) +{ + struct gre_softc *sc = ifp->if_softc; + struct nl_parsed_link *lattrs = ifd->lattrs; + struct nl_pstate *npt = ifd->npt; + struct nl_parsed_gre params; + struct nlattr *attrs = lattrs->ifla_idata; + struct nlattr_bmask bm; + int error = 0; + + if ((attrs == NULL) || + (nl_has_attr(ifd->bm, IFLA_LINKINFO) == 0)) { + error = nl_modify_ifp_generic(ifp, lattrs, ifd->bm, npt); + return (error); + } + + error = priv_check(curthread, PRIV_NET_GRE); + if (error) + return (error); + + /* make sure ignored attributes by nl_parse will not cause panics */ + memset(¶ms, 0, sizeof(params)); + + nl_get_attrs_bmask_raw(NLA_DATA(attrs), NLA_DATA_LEN(attrs), &bm); + if ((error = nl_parse_nested(attrs, &gre_modify_parser, npt, ¶ms)) != 0) + return (error); + + if (nl_has_attr(&bm, IFLA_GRE_LOCAL) && nl_has_attr(&bm, IFLA_GRE_REMOTE)) + error = gre_set_addr_nl(sc, npt, params.ifla_local, params.ifla_remote); + else if (nl_has_attr(&bm, IFLA_GRE_LOCAL) || nl_has_attr(&bm, IFLA_GRE_REMOTE)) { + error = EINVAL; + nlmsg_report_err_msg(npt, "Specify both remote and local address together"); + } + + if (error == 0 && nl_has_attr(&bm, IFLA_GRE_FLAGS)) + error = gre_set_flags_nl(sc, npt, params.ifla_flags); + + if (error == 0 && nl_has_attr(&bm, IFLA_GRE_OKEY)) + error = gre_set_key_nl(sc, npt, params.ifla_okey); + + if (error == 0 && nl_has_attr(&bm, IFLA_GRE_ENCAP_TYPE)) + error = gre_set_encap_nl(sc, npt, params.ifla_encap_type); + + if (error == 0 && nl_has_attr(&bm, IFLA_GRE_ENCAP_SPORT)) + error = gre_set_udp_sport_nl(sc, npt, params.ifla_encap_sport); + + if (error == 0) + error = nl_modify_ifp_generic(ifp, ifd->lattrs, ifd->bm, ifd->npt); + + return (error); +} + +static void +gre_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) +{ + GRE_RLOCK_TRACKER; + struct gre_softc *sc; + struct ifreq ifr; + + nlattr_add_u32(nw, IFLA_LINK, ifp->if_index); + nlattr_add_string(nw, IFLA_IFNAME, ifp->if_xname); + + int off = nlattr_add_nested(nw, IFLA_LINKINFO); + if (off == 0) + return; + + nlattr_add_string(nw, IFLA_INFO_KIND, "gre"); + int off2 = nlattr_add_nested(nw, IFLA_INFO_DATA); + if (off2 == 0) { + nlattr_set_len(nw, off); + return; + } + + sc = ifp->if_softc; + GRE_RLOCK(); + + if (sc->gre_family == AF_INET) { +#ifdef INET + if (in_gre_ioctl(sc, SIOCGIFPSRCADDR, (caddr_t)&ifr) == 0) + nlattr_add_in_addr(nw, IFLA_GRE_LOCAL, + (const struct in_addr *)&ifr.ifr_addr); + if (in_gre_ioctl(sc, SIOCGIFPDSTADDR, (caddr_t)&ifr) == 0) + nlattr_add_in_addr(nw, IFLA_GRE_LOCAL, + (const struct in_addr *)&ifr.ifr_dstaddr); +#endif + } else if (sc->gre_family == AF_INET6) { +#ifdef INET6 + if (in_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&ifr) == 0) + nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL, + (const struct in6_addr *)&ifr.ifr_addr); + if (in_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&ifr) == 0) + nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL, + (const struct in6_addr *)&ifr.ifr_dstaddr); +#endif + } + + nlattr_add_u32(nw, IFLA_GRE_FLAGS, sc->gre_options); + nlattr_add_u32(nw, IFLA_GRE_OKEY, sc->gre_key); + nlattr_add_u32(nw, IFLA_GRE_ENCAP_TYPE, + sc->gre_options & GRE_UDPENCAP ? IFLA_TUNNEL_GRE_UDP : IFLA_TUNNEL_NONE); + nlattr_add_u16(nw, IFLA_GRE_ENCAP_SPORT, sc->gre_port); + + nlattr_set_len(nw, off2); + nlattr_set_len(nw, off); + + GRE_RUNLOCK(); +} + +static int +gre_clone_create(struct if_clone *ifc, char *name, size_t len, + struct ifc_data *ifd, struct ifnet **ifpp) { struct gre_softc *sc; @@ -177,7 +358,7 @@ gre_clone_create(struct if_clone *ifc, int unit, caddr_t params) sc->gre_fibnum = curthread->td_proc->p_fibnum; GRE2IFP(sc) = if_alloc(IFT_TUNNEL); GRE2IFP(sc)->if_softc = sc; - if_initname(GRE2IFP(sc), grename, unit); + if_initname(GRE2IFP(sc), grename, ifd->unit); GRE2IFP(sc)->if_mtu = GREMTU; GRE2IFP(sc)->if_flags = IFF_POINTOPOINT|IFF_MULTICAST; @@ -192,6 +373,8 @@ gre_clone_create(struct if_clone *ifc, int unit, caddr_t params) GRE2IFP(sc)->if_capenable |= IFCAP_LINKSTATE; if_attach(GRE2IFP(sc)); bpfattach(GRE2IFP(sc), DLT_NULL, sizeof(u_int32_t)); + *ifpp = GRE2IFP(sc); + return (0); } @@ -210,8 +393,8 @@ gre_reassign(struct ifnet *ifp, struct vnet *new_vnet __unused, } #endif /* VIMAGE */ -static void -gre_clone_destroy(struct ifnet *ifp) +static int +gre_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) { struct gre_softc *sc; @@ -226,8 +409,103 @@ gre_clone_destroy(struct ifnet *ifp) GRE_WAIT(); if_free(ifp); free(sc, M_GRE); + + return (0); +} + +static int +gre_set_key(struct gre_softc *sc, uint32_t key) +{ + int error = 0; + + GRE_LOCK_ASSERT(); + + if (sc->gre_key == key) + return (0); + error = gre_setopts(sc, GRESKEY, key); + + return (error); +} + +static int +gre_set_flags(struct gre_softc *sc, uint32_t opt) +{ + int error = 0; + + GRE_LOCK_ASSERT(); + + if (opt & ~GRE_OPTMASK) + return (EINVAL); + if (sc->gre_options == opt) + return (0); + error = gre_setopts(sc, GRESOPTS, opt); + + return (error); +} + +static int +gre_set_udp_sport(struct gre_softc *sc, uint16_t port) +{ + int error = 0; + + GRE_LOCK_ASSERT(); + + if (port != 0 && (port < V_ipport_hifirstauto || + port > V_ipport_hilastauto)) + return (EINVAL); + if (sc->gre_port == port) + return (0); + if ((sc->gre_options & GRE_UDPENCAP) == 0) { + /* + * UDP encapsulation is not enabled, thus + * there is no need to reattach softc. + */ + sc->gre_port = port; + return (0); + } + error = gre_setopts(sc, GRESPORT, port); + + return (error); } +static int +gre_setopts(struct gre_softc *sc, u_long cmd, uint32_t opt) +{ + int error = 0; + + GRE_LOCK_ASSERT(); + + switch (sc->gre_family) { +#ifdef INET + case AF_INET: + error = in_gre_setopts(sc, cmd, opt); + break; +#endif +#ifdef INET6 + case AF_INET6: + error = in6_gre_setopts(sc, cmd, opt); + break; +#endif + default: + /* + * Tunnel is not yet configured. + * We can just change any parameters. + */ + if (cmd == GRESKEY) + sc->gre_key = opt; + if (cmd == GRESOPTS) + sc->gre_options = opt; + if (cmd == GRESPORT) + sc->gre_port = opt; + break; + } + /* + * XXX: Do we need to initiate change of interface + * state here? + */ + return (error); +}; + static int gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { @@ -303,61 +581,12 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) if ((error = copyin(ifr_data_get_ptr(ifr), &opt, sizeof(opt))) != 0) break; - if (cmd == GRESKEY) { - if (sc->gre_key == opt) - break; - } else if (cmd == GRESOPTS) { - if (opt & ~GRE_OPTMASK) { - error = EINVAL; - break; - } - if (sc->gre_options == opt) - break; - } else if (cmd == GRESPORT) { - if (opt != 0 && (opt < V_ipport_hifirstauto || - opt > V_ipport_hilastauto)) { - error = EINVAL; - break; - } - if (sc->gre_port == opt) - break; - if ((sc->gre_options & GRE_UDPENCAP) == 0) { - /* - * UDP encapsulation is not enabled, thus - * there is no need to reattach softc. - */ - sc->gre_port = opt; - break; - } - } - switch (sc->gre_family) { -#ifdef INET - case AF_INET: - error = in_gre_setopts(sc, cmd, opt); - break; -#endif -#ifdef INET6 - case AF_INET6: - error = in6_gre_setopts(sc, cmd, opt); - break; -#endif - default: - /* - * Tunnel is not yet configured. - * We can just change any parameters. - */ - if (cmd == GRESKEY) - sc->gre_key = opt; - if (cmd == GRESOPTS) - sc->gre_options = opt; - if (cmd == GRESPORT) - sc->gre_port = opt; - break; - } - /* - * XXX: Do we need to initiate change of interface - * state here? - */ + if (cmd == GRESKEY) + error = gre_set_key(sc, opt); + else if (cmd == GRESOPTS) + error = gre_set_flags(sc, opt); + else if (cmd == GRESPORT) + error = gre_set_udp_sport(sc, opt); break; case GREGKEY: error = copyout(&sc->gre_key, ifr_data_get_ptr(ifr), @@ -539,7 +768,7 @@ gre_input(struct mbuf *m, int off, int proto, void *arg) } if (flags & GRE_FLAGS_KP) { #ifdef notyet - /* + /* * XXX: The current implementation uses the key only for outgoing * packets. But we can check the key value here, or even in the * encapcheck function. @@ -808,12 +1037,124 @@ gre_qflush(struct ifnet *ifp __unused) } +static int +gre_set_addr_nl(struct gre_softc *sc, struct nl_pstate *npt, + struct sockaddr *src, struct sockaddr *dst) +{ + union { + struct in_aliasreq in; + struct in6_aliasreq in6; + } aliasreq; + int error; + + /* XXX: this sanity check runs again in in[6]_gre_ioctl */ + if (src->sa_family != dst->sa_family) + error = EADDRNOTAVAIL; +#ifdef INET + else if (src->sa_family == AF_INET) { + memcpy(&aliasreq.in.ifra_addr, src, sizeof(struct sockaddr_in)); + memcpy(&aliasreq.in.ifra_dstaddr, dst, sizeof(struct sockaddr_in)); + sx_xlock(&gre_ioctl_sx); + error = in_gre_ioctl(sc, SIOCSIFPHYADDR, (caddr_t)&aliasreq.in); + sx_xunlock(&gre_ioctl_sx); +#endif +#ifdef INET6 + } else if (src->sa_family == AF_INET6) { + memcpy(&aliasreq.in6.ifra_addr, src, sizeof(struct sockaddr_in6)); + memcpy(&aliasreq.in6.ifra_dstaddr, dst, sizeof(struct sockaddr_in6)); + sx_xlock(&gre_ioctl_sx); + error = in6_gre_ioctl(sc, SIOCSIFPHYADDR_IN6, (caddr_t)&aliasreq.in6); + sx_xunlock(&gre_ioctl_sx); +#endif + } else + error = EAFNOSUPPORT; + + if (error == EADDRNOTAVAIL) + nlmsg_report_err_msg(npt, "address is invalid"); + if (error == EEXIST) + nlmsg_report_err_msg(npt, "remote and local addresses are the same"); + if (error == EAFNOSUPPORT) + nlmsg_report_err_msg(npt, "address family is not supported"); + + return (error); +} + +static int +gre_set_flags_nl(struct gre_softc *sc, struct nl_pstate *npt, uint32_t opt) +{ + int error = 0; + + sx_xlock(&gre_ioctl_sx); + error = gre_set_flags(sc, opt); + sx_xunlock(&gre_ioctl_sx); + + if (error == EINVAL) + nlmsg_report_err_msg(npt, "gre flags are invalid"); + + return (error); +} + +static int +gre_set_key_nl(struct gre_softc *sc, struct nl_pstate *npt, uint32_t key) +{ + int error = 0; + + sx_xlock(&gre_ioctl_sx); + error = gre_set_key(sc, key); + sx_xunlock(&gre_ioctl_sx); + + if (error == EINVAL) + nlmsg_report_err_msg(npt, "gre key is invalid: %u", key); + + return (error); +} + +static int +gre_set_encap_nl(struct gre_softc *sc, struct nl_pstate *npt, uint32_t type) +{ + uint32_t opt; + int error = 0; + + sx_xlock(&gre_ioctl_sx); + opt = sc->gre_options; + if (type & IFLA_TUNNEL_GRE_UDP) + opt |= GRE_UDPENCAP; + else + opt &= ~GRE_UDPENCAP; + error = gre_set_flags(sc, opt); + sx_xunlock(&gre_ioctl_sx); + + if (error == EEXIST) + nlmsg_report_err_msg(npt, "same gre tunnel exist"); + + return (error); +} + + +static int +gre_set_udp_sport_nl(struct gre_softc *sc, struct nl_pstate *npt, uint16_t port) +{ + int error = 0; + + sx_xlock(&gre_ioctl_sx); + error = gre_set_udp_sport(sc, port); + sx_xunlock(&gre_ioctl_sx); + + if (error == EINVAL) + nlmsg_report_err_msg(npt, "source port is invalid: %u", port); + + return (error); +} + + static int gremodevent(module_t mod, int type, void *data) { switch (type) { case MOD_LOAD: + NL_VERIFY_PARSERS(all_parsers); + break; case MOD_UNLOAD: break; default: diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h index 67e4d88426fb..ae6d18385dfb 100644 --- a/sys/net/if_gre.h +++ b/sys/net/if_gre.h @@ -109,6 +109,7 @@ struct gre_softc { CK_LIST_ENTRY(gre_softc) chain; CK_LIST_ENTRY(gre_softc) srchash; }; + MALLOC_DECLARE(M_GRE); #ifndef GRE_HASH_SIZE diff --git a/sys/netlink/route/interface.h b/sys/netlink/route/interface.h index 667bf2c96151..8b5189d1c588 100644 --- a/sys/netlink/route/interface.h +++ b/sys/netlink/route/interface.h @@ -246,6 +246,15 @@ enum { }; #define IFLA_INFO_MAX (__IFLA_INFO_MAX - 1) +/* Encapsulation Types */ +enum { + IFLA_TUNNEL_NONE, + IFLA_TUNNEL_GRE_UDP, /* GRE UDP Encapsulation */ + __IFLA_TUNNEL_MAX, +}; + +#define IFLA_TUNNEL_MAX (__IFLA_TUNNEL_MAX - 1) + /* IFLA_INFO_DATA vlan attributes */ enum { IFLA_VLAN_UNSPEC, @@ -263,4 +272,18 @@ struct ifla_vlan_flags { uint32_t mask; }; +/* IFLA_INFO_DATA gre attributes */ +enum { + IFLA_GRE_UNSPEC, + IFLA_GRE_LOCAL, + IFLA_GRE_REMOTE, + IFLA_GRE_FLAGS, + IFLA_GRE_OKEY, + IFLA_GRE_ENCAP_TYPE, + IFLA_GRE_ENCAP_SPORT, + __IFLA_GRE_MAX, +}; + +#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1) + #endif diff --git a/tests/sys/netlink/Makefile b/tests/sys/netlink/Makefile index c07ef8663867..43b9db80ee63 100644 --- a/tests/sys/netlink/Makefile +++ b/tests/sys/netlink/Makefile @@ -5,6 +5,7 @@ TESTSDIR= ${TESTSBASE}/sys/netlink ATF_TESTS_C+= netlink_socket ATF_TESTS_C+= test_snl test_snl_generic +ATF_TESTS_C+= test_rtnl_gre ATF_TESTS_PYTEST += test_nl_core.py ATF_TESTS_PYTEST += test_rtnl_iface.py ATF_TESTS_PYTEST += test_rtnl_ifaddr.py diff --git a/tests/sys/netlink/test_rtnl_gre.c b/tests/sys/netlink/test_rtnl_gre.c new file mode 100644 index 000000000000..12ecc8d14230 --- /dev/null +++ b/tests/sys/netlink/test_rtnl_gre.c @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2026 Pouria Mousavizadeh Tehrani + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include "netlink/netlink_snl.h" +#include +#include +#include + +#include + +struct nl_parsed_gre { + struct sockaddr *ifla_local; + struct sockaddr *ifla_remote; + uint32_t ifla_flags; + uint32_t ifla_okey; + uint32_t ifla_encap_type; + uint16_t ifla_encap_sport; +}; + +struct nla_gre_info { + const char *kind; + struct nl_parsed_gre data; +}; + +struct nla_gre_link { + uint32_t ifi_index; + struct nla_gre_info linkinfo; +}; + +#define _OUT(_field) offsetof(struct nl_parsed_gre, _field) +static const struct snl_attr_parser nla_p_gre[] = { + { .type = IFLA_GRE_LOCAL, .off = _OUT(ifla_local), .cb = snl_attr_get_ip }, + { .type = IFLA_GRE_REMOTE, .off = _OUT(ifla_remote), .cb = snl_attr_get_ip }, + { .type = IFLA_GRE_FLAGS, .off = _OUT(ifla_flags), .cb = snl_attr_get_uint32 }, + { .type = IFLA_GRE_OKEY, .off = _OUT(ifla_okey), .cb = snl_attr_get_uint32 }, + { .type = IFLA_GRE_ENCAP_TYPE, .off = _OUT(ifla_encap_type), .cb = snl_attr_get_uint32 }, + { .type = IFLA_GRE_ENCAP_SPORT, .off = _OUT(ifla_encap_sport), .cb = snl_attr_get_uint16 }, +}; +#undef _OUT +SNL_DECLARE_ATTR_PARSER(gre_linkinfo_data_parser, nla_p_gre); + +#define _OUT(_field) offsetof(struct nla_gre_info, _field) +static const struct snl_attr_parser ap_gre_linkinfo[] = { + { .type = IFLA_INFO_KIND, .off = _OUT(kind), .cb = snl_attr_get_string }, + { .type = IFLA_INFO_DATA, .off = _OUT(data), + .arg = &gre_linkinfo_data_parser, .cb = snl_attr_get_nested }, +}; +#undef _OUT +SNL_DECLARE_ATTR_PARSER(gre_linkinfo_parser, ap_gre_linkinfo); + +#define _IN(_field) offsetof(struct ifinfomsg, _field) +#define _OUT(_field) offsetof(struct nla_gre_link, _field) +static const struct snl_attr_parser ap_gre_link[] = { + { .type = IFLA_LINKINFO, .off = _OUT(linkinfo), + .arg = &gre_linkinfo_parser, .cb = snl_attr_get_nested }, +}; + +static const struct snl_field_parser fp_gre_link[] = { + { .off_in = _IN(ifi_index), .off_out = _OUT(ifi_index), .cb = snl_field_get_uint32 }, +}; +#undef _IN +#undef _OUT +SNL_DECLARE_PARSER(gre_parser, struct ifinfomsg, fp_gre_link, ap_gre_link); + +ATF_TC(test_rtnl_gre); +ATF_TC_HEAD(test_rtnl_gre, tc) +{ + atf_tc_set_md_var(tc, "descr", "test gre interface using netlink"); + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(test_rtnl_gre, tc) +{ + struct snl_state ss; + struct snl_writer nw; + struct nlmsghdr *hdr, *rx_hdr; + struct sockaddr_in src, dst; + struct nla_gre_link lattrs = {}; + struct nl_parsed_gre attrs = {}; + struct snl_errmsg_data e = {}; + struct ifinfomsg *ifmsg; + int off, off2; + + ATF_REQUIRE_MSG(snl_init(&ss, NETLINK_ROUTE), "snl_init() failed"); + + /* Create gre interface */ + snl_init_writer(&ss, &nw); + ATF_REQUIRE((hdr = snl_create_msg_request(&nw, RTM_NEWLINK)) != NULL); + hdr->nlmsg_flags |= (NLM_F_CREATE | NLM_F_EXCL | NLM_F_REQUEST | NLM_F_ACK); + snl_reserve_msg_object(&nw, struct ifinfomsg); + + /* Create parameters */ + snl_add_msg_attr_string(&nw, IFLA_IFNAME, "gre10"); + off = snl_add_msg_attr_nested(&nw, IFLA_LINKINFO); + snl_add_msg_attr_string(&nw, IFLA_INFO_KIND, "gre"); + off2 = snl_add_msg_attr_nested(&nw, IFLA_INFO_DATA); + + src.sin_family = AF_INET; + dst.sin_family = AF_INET; + inet_pton(src.sin_family, "127.0.0.1", &src.sin_addr); + inet_pton(dst.sin_family, "127.0.0.2", &dst.sin_addr); + snl_add_msg_attr_ip(&nw, IFLA_GRE_LOCAL, (struct sockaddr *)&src); + snl_add_msg_attr_ip(&nw, IFLA_GRE_REMOTE, (struct sockaddr *)&dst); + snl_add_msg_attr_u32(&nw, IFLA_GRE_FLAGS, (GRE_ENABLE_SEQ | GRE_ENABLE_CSUM)); + snl_add_msg_attr_u32(&nw, IFLA_GRE_OKEY, 123456); + snl_add_msg_attr_u32(&nw, IFLA_GRE_ENCAP_TYPE, IFLA_TUNNEL_GRE_UDP); + snl_add_msg_attr_u16(&nw, IFLA_GRE_ENCAP_SPORT, 50000); + + snl_end_attr_nested(&nw, off2); + snl_end_attr_nested(&nw, off); + + ATF_REQUIRE((hdr = snl_finalize_msg(&nw)) != NULL); + ATF_REQUIRE(snl_send_message(&ss, hdr)); + ATF_REQUIRE((rx_hdr = snl_read_reply(&ss, hdr->nlmsg_seq)) != NULL); + ATF_REQUIRE(snl_parse_errmsg(&ss, rx_hdr, &e)); + ATF_REQUIRE_INTEQ(e.error, 0); + + /* Dump gre interface */ + snl_init_writer(&ss, &nw); + ATF_REQUIRE((hdr = snl_create_msg_request(&nw, RTM_GETLINK)) != NULL); + hdr->nlmsg_flags |= NLM_F_DUMP; + snl_reserve_msg_object(&nw, struct ifinfomsg); + snl_add_msg_attr_string(&nw, IFLA_IFNAME, "gre10"); + off = snl_add_msg_attr_nested(&nw, IFLA_LINKINFO); + snl_add_msg_attr_string(&nw, IFLA_INFO_KIND, "gre"); + snl_end_attr_nested(&nw, off); + + ATF_REQUIRE((hdr = snl_finalize_msg(&nw)) != NULL); + ATF_REQUIRE(snl_send_message(&ss, hdr)); + + /* Check parameters */ + ATF_REQUIRE((rx_hdr = snl_read_reply(&ss, hdr->nlmsg_seq)) != NULL); + ATF_CHECK(snl_parse_nlmsg(&ss, rx_hdr, &gre_parser, &lattrs)); + attrs = lattrs.linkinfo.data; + ATF_CHECK_STREQ(lattrs.linkinfo.kind, "gre"); + ATF_CHECK_INTEQ(attrs.ifla_flags, (GRE_ENABLE_SEQ | GRE_ENABLE_CSUM | GRE_UDPENCAP)); + ATF_CHECK_INTEQ(attrs.ifla_okey, 123456); + ATF_CHECK_INTEQ(attrs.ifla_encap_type, IFLA_TUNNEL_GRE_UDP); + ATF_CHECK_INTEQ(attrs.ifla_encap_sport, 50000); + + /* Delete gre interface */ + snl_init_writer(&ss, &nw); + ATF_REQUIRE((hdr = snl_create_msg_request(&nw, RTM_DELLINK)) != NULL); + hdr->nlmsg_flags |= (NLM_F_ACK | NLM_F_REQUEST); + ATF_REQUIRE((ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg)) != NULL); + ifmsg->ifi_index = lattrs.ifi_index; + ATF_REQUIRE((hdr = snl_finalize_msg(&nw)) != NULL); + ATF_REQUIRE(snl_send_message(&ss, hdr)); + ATF_REQUIRE((rx_hdr = snl_read_reply(&ss, hdr->nlmsg_seq)) != NULL); + ATF_REQUIRE(snl_parse_errmsg(&ss, rx_hdr, &e)); + ATF_REQUIRE_INTEQ(e.error, 0); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, test_rtnl_gre); + + return (atf_no_error()); +} + From nobody Wed Feb 18 22:26:50 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGWMb0PS6z6QSpd for ; Wed, 18 Feb 2026 22:26: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 4fGWMZ58lzz48jk for ; Wed, 18 Feb 2026 22:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771453610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xmUiX3Y5R9YReJ3BYJienQiMV8J4CIp6BiDNnmRcgow=; b=olLn26G4WoxtkoWYhk6orhKEadwoXgizeMNHyhUbl/lWGouu5bJsIcRIdUWGxCEb5XQMbH sKeluAq0mBytKp995km3t6ehTTFaH5YbAekPah1KoImJNCUvVBatN/aVSA+ZplxPkIfCD1 9CZpg1H2bqJsmZs1XkneeMr2UsTXM6n9QP7N5V0pOxRIG4WFRs4DR78gwmX8FWw0560Ls/ 7mIgm8fICrbxg6q5h/lWE2BO0vaJ4yyXi+NSEew723sGx3ScIwOQonQRL7yEjtDZjAO2ul FbHI+0UXmMwxzOfrglzo4we47HM6WxOn5xafKcthDvCkR56HAtBEi843pa/PzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771453610; a=rsa-sha256; cv=none; b=HPV5Vq8zc/Wk8JVQyZVGVSzH4bMO/P+xOmnElJwLd9RJb2livdKd/YrqBoPulrU0BRQMOX QZtX/9F0U4vyZNp9N4j9v40bPndiJPOqJSGI6jGYEGWgFLnbCUqbA9i7TqxY7Be47zhA6F iifBVnGCWxmrFtUFHP7YbMw+IQ3BWd4LUwNetHDwXzLdv5WwdJhFz4i+OX9+qcsC7dR1p4 nZYvj9KiLJuhMnUOT9IyRBdL/8aobOApYT1VuPqb6R+eLSaxzoNVQUtfN540gkGALl2ehF 41Nx60ujaP+tG8y84CHDcnoXMQ5cvSnnETUAbgvxaR7Na8nDsoLYJ/EVTKoLiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771453610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xmUiX3Y5R9YReJ3BYJienQiMV8J4CIp6BiDNnmRcgow=; b=P9Q1pyftlfjAvk8zOaAG1+wcvY23gJSw9Cpy4erBOtU93ZqKC468NsOQGC8DFNCGxwkNPs +MurE7z9jE6zh0QTLnJVZiPp8YhJrmEQLqYxeRaCX2S2DD+dpKdN97uyTgKaP5YWhB3WB8 NMoVKeGuakEiTyyy4zCxo0gjDx5tEWoWI2MKMmH9FCfsQ2le6tBdEg8XPdgIqnp+nh8kYh nDYd2+VtU7cBD3j/gFgfIdq5G4oJ2ci1e6sIizn68wspdtkZIUkNKL1lbGldKZy7grQi/T G2/WGVknlxpS//nFuAQe6Mn39AhcYpGq6OO8MdmKd3bUF++lSVS3hUz0vF3MYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGWMZ3z1qzsZ for ; Wed, 18 Feb 2026 22:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 318ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 22:26:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: d60082f16e4c - main - pf: avoid NULL deref on purged states List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d60082f16e4c91d4b97d8b3b56b39fa348ecfbda Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 22:26:50 +0000 Message-Id: <69963caa.318ee.75b6db61@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d60082f16e4c91d4b97d8b3b56b39fa348ecfbda commit d60082f16e4c91d4b97d8b3b56b39fa348ecfbda Author: Kristof Provost AuthorDate: 2026-02-18 18:23:42 +0000 Commit: Kristof Provost CommitDate: 2026-02-18 20:22:53 +0000 pf: avoid NULL deref on purged states States can be invalidated and still be present in the state table for a while (until the pf_purge thread cleans them up). These states might not have keys set, so we must make sure a state is not purged before we try to access those keys. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index b7c79437584e..90342f045763 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2226,8 +2226,10 @@ pf_find_state(struct pf_pdesc *pd, const struct pf_state_key_cmp *key, /* Look through the other list, in case of AF-TO */ idx = idx == PF_SK_WIRE ? PF_SK_STACK : PF_SK_WIRE; TAILQ_FOREACH(s, &sk->states[idx], key_list[idx]) { - if (s->key[PF_SK_WIRE]->af == s->key[PF_SK_STACK]->af) + if (s->timeout < PFTM_MAX && + s->key[PF_SK_WIRE]->af == s->key[PF_SK_STACK]->af) continue; + if (s->kif == V_pfi_all || s->kif == pd->kif || s->orig_kif == pd->kif) { PF_STATE_LOCK(s); From nobody Thu Feb 19 02:54:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGdJt56jtz6S6QS for ; Thu, 19 Feb 2026 02: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 4fGdJt4VJBz3RGq for ; Thu, 19 Feb 2026 02: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=1771469694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MseofinPBJ2yRLGvQT3AcgiO1EYzUDDmSY8KMjXJAgE=; b=bRBEMQJc30Man/juNfHDM2L2KzFYNsD1rqiQ4yNfR493zFuqdtHAIf9oPqSVhlrPvcxYIG +D7yMFKRPMGkHL3ILYudotoiyphWDCsjkEBO/xOTRPgK5TKYjaTaYTV6xN/sbRhBNpAJjq TY3OpHdBblrzKq8SgZcCrBUFSPw0O2wUU3KmZX+hZWXNNRwzQX/YvqcAM3PxiG377HUnvv wgb0JgDgZCpMZp8446/4wliUQE+VI3MOHaBTcS6l77fTkCLg+jeXDvr5qzaibsYmln/CkX pyo4J79RnemvLzqbd74soYkoG27amMc5gemjMq+3R2ZMkDoChIrnQ/3Z7JTTaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771469694; a=rsa-sha256; cv=none; b=MJ+Z8MWmrzaxvLHr20H08UMoqNbIm1PVfxn4JH0UsalTodGM2EEEFUJ9wm8NoDQQY69fd6 keyv2oJaQTZyx58vv23ef+lc4nK1DuzsS6+PwnjCn5aWG+a2rVGFn+dRNrY0zhy6zsFQdC EB3wk5z9ALLAqSxKiDKt8ZG2LsEvy2Zib3oEt5KUxVwLRTaeKFo1hmGVCBWlA9MScyMJ2f wKYzAh7YWTmLmSNw69x7qlU1REd0LGduZLO2Cz7lEydJsx6a+FuuWDZO/AXWoxFQEaKKrP qMVrVNTPfc08R9GvL5HKLo0q8r0wwrPB9BUbM98AfSA1x9MhbR3AbPaJVQTj6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771469694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MseofinPBJ2yRLGvQT3AcgiO1EYzUDDmSY8KMjXJAgE=; b=sdT4nddLMZE/CVJljeMIH5K02w3Du0NpzjzNxr38AEIxQ7+/uDPQA+dJFaTqkVg9DjBByp 7LW1euz3G7085NktsqAIZk9ebuhu5Yve28IN/LpXc9mVkYKP7wsngEUiZKAs/v9Yx4l1O4 NcWDiFzrDDpMUy7aXaSbMDus1WXAnj6lSJHGmU0yHknJk/W3cR42vGTotSgSmzCElmm18s QOaf1+XsNf4cxjp2kK+khzMCf2hNwybwNoDGmZ9w82EUyxIuYUWcvSvQnlOqbcInG77lye 8ii0oMO5cp8Kfa3m9zBKM7nI/Reky4yEFiiby+FxXI6gpLi7Lp1sf7lrxuny+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 4fGdJt3mLhz7yP for ; Thu, 19 Feb 2026 02:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e435 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 02:54:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 38edf96b1787 - main - tests/ipfw: fix log:bpf test flakyness List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38edf96b1787ce3d8c00e4466348dab891c7a9ea Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 02:54:54 +0000 Message-Id: <69967b7e.1e435.602c8299@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=38edf96b1787ce3d8c00e4466348dab891c7a9ea commit 38edf96b1787ce3d8c00e4466348dab891c7a9ea Author: Gleb Smirnoff AuthorDate: 2026-02-19 02:39:00 +0000 Commit: Gleb Smirnoff CommitDate: 2026-02-19 02:53:16 +0000 tests/ipfw: fix log:bpf test flakyness There were several problems: o Using 'netstat -B' is not a reliable way to make sure that all tcpdumps have attached to bpf(4). The problem is that tcpdump (via libpcap) does several ioctl(2)s after the attach including two BIOCSETF. Each of them flushes the input buffer. So we can see tcpdump attached in 'netstat -B' and start sending packets and the packet will be captured by bpf(4) before BIOCSETF and freed and tcpdump won't read anything. Instead of using netstat(1), use ps(1) and make sure each tcpdump is blocked on the "bpf" wait channel, which guarantees it is done with ioctl(2)s and is now blocked in read(2). o Using 'nc -w 0' sets timeout not only on the connect(2) (as documented) but also on poll(2), which is not documented. There is a race in shell that will make stdin not yet filled by 'echo foo' when nc(1) does poll(2). With zero timeout, this poll(2) will immediately return and nc will exit. o The waiting loop had two errors: using wrong variable name as well as invoking a subshell, that actually can't wait on the pid. o The reading tcpdump was lacking '-q' option, that prevents any protocol interpretations. Sometimes, when random port chosen by nc(1) would match some well-known (to tcpdump) port, the output would differ from the expected. PR: 293241 --- tests/sys/netpfil/ipfw/log.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/sys/netpfil/ipfw/log.sh b/tests/sys/netpfil/ipfw/log.sh index 7df5c69e4219..cde909e25d1e 100755 --- a/tests/sys/netpfil/ipfw/log.sh +++ b/tests/sys/netpfil/ipfw/log.sh @@ -57,31 +57,34 @@ bpf_body() pids="${pids} $!" done - # wait for tcpdumps to attach, include netstat(1) header in ${count} - count=$(( $(echo ${rules} ${auto} | wc -w) + 1)) - while [ $(jexec alcatraz netstat -B | wc -l) -ne ${count} ]; do - sleep 0.01; + # wait for tcpdumps to fully attach and block in bpfread() + for p in ${pids}; do + while [ $(ps -o wchan ${p} | tr "\n" " " | cut -w -f 2) != \ + "bpf" ]; do + sleep 0.01; + done done for p in ${rules} 666; do - echo foo | nc -u 192.0.2.1 10${p} -w 0 + echo foo | nc -u 192.0.2.1 10${p} done for p in ${pids}; do - atf_check -s exit:0 sh -c "wait $pid; exit $?" + wait ${p} + atf_check_equal 0 $? done # statically numbered taps for p in ${rules}; do atf_check -o match:"192.0.2.0.[0-9]+ > 192.0.2.1.10${p}: UDP" \ -e match:"reading from file [a-zA-Z0-9/.]+${p}.pcap" \ - tcpdump -nr ${PWD}/${p}.pcap + tcpdump -qnr ${PWD}/${p}.pcap done # autonumbered tap with 10666 port atf_check -o match:"192.0.2.0.[0-9]+ > 192.0.2.1.10666: UDP" \ -e match:"reading from file [a-zA-Z0-9/.]+${auto}.pcap" \ - tcpdump -nr ${PWD}/${auto}.pcap + tcpdump -qnr ${PWD}/${auto}.pcap } bpf_cleanup() From nobody Thu Feb 19 04:26:53 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGgM16pZ4z6SDWG for ; Thu, 19 Feb 2026 04:26: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 4fGgM14Y58z3Z6P for ; Thu, 19 Feb 2026 04:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771475213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LIr/e6vqkyZMLiq1RRAARE5fYGcOTbdsrXjG0aghtEM=; b=k9UiKqH2q2UVeyd8pOHWebFA1B7i8e65pr78HiSe1nE+PyrlbW6Hg2LB8O631bqy5sGch3 vQ4I5srEUjSRhkb23UGvV//z4q9cCPPfnlKmG6dVOAimdAv0axZu4KhE7siFEyleLVhH5l KchZFdQDCzggaqbRk41DMvCFJGhsjTjRColzyfzvBg0/TTb11hxfRWSIZqGNQwdXwOJDx+ BQEJHUXq/2zGdjfVWGDj1o65QQX4msviHvZHLpKHPbFhA0Pj3zwryOHv3HPWpyCrxrIBVy aj6lEouLlwzrHmJRaUMH5CQ0N+Nh4+rMwDoLfQz17z15dBKGg8LzDukvu96h2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771475213; a=rsa-sha256; cv=none; b=FnBpuUssKcaYX5vBSko56lRe1YYi9udyFHEqdOXJoCAqOHDY5Suml+YJ8Zo7bmkcWJsqnr jKTHrrwPMvEmJcNd95YnVbDdkQLZL5wSWoSAN5Smm8oSuRxRKXm9W+VmCOIu2qItlzuoW4 VsiwjDTx0TcvNdy+KqSdpUssLSOJ3hl32Hp0UMSRQVIam2cIk73PNYbAPT65GEJ2T/Q2TK Thx5yAsQu5l7KYvNLjiE3Mbi77RDXTL6pgQrJjKvLryiG8eVS9Ga9ZVW9pHFKOq0nG3wlx U/A1+tXJOdMSSk2oe9efZCffskniXqLG70E3Fuj/Fs7KlXfq6qIjYDMD75BOFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771475213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LIr/e6vqkyZMLiq1RRAARE5fYGcOTbdsrXjG0aghtEM=; b=hb0L4ahEUTWNVtuVQm2VVyJCrA8c+oEGnIB4ma+KIdgfUYep/Kd1/gSGRb5HLarPKAoBkT MJ7gyD1B0+sxgU5nsoyfSNrYsdXXmmbEc0nYXnUl+BX/KHvXltNSscVpgKP0ajUrkqmSZG MnXaqfXdtFsAWD7oR7ce/yG46IOB/pKadzLxxh8Awgy8CQ306dEFr+3eooAtlBy4KLY51p Jz/veuVQZilNoFGX83cRXitLqOQHRFpkreLY+IN983wKClL2I+mOM0Y2oZJ3KJTwDTf1fM 9TEt3mHTnNn1c5C2Dao9bFFwpMHvBXuERBuxelJ6MRbXV1+Knl1ioVu0nc9GWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGgM144nTzBCt for ; Thu, 19 Feb 2026 04:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26d26 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 04:26:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 59eafd8726e2 - main - netinet6: spell Identifiers in the comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59eafd8726e2be08807650a8f67714124aa75dbd Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 04:26:53 +0000 Message-Id: <6996910d.26d26.77f1d5eb@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=59eafd8726e2be08807650a8f67714124aa75dbd commit 59eafd8726e2be08807650a8f67714124aa75dbd Author: Maxim Konovalov AuthorDate: 2026-02-19 04:26:09 +0000 Commit: Maxim Konovalov CommitDate: 2026-02-19 04:26:09 +0000 netinet6: spell Identifiers in the comment --- sys/netinet6/nd6_rtr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 8f557ba77af5..ba2f025b7db1 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -2294,7 +2294,7 @@ regen: /* * Check if generated address is not inappropriate: * - * - Reserved IPv6 Interface aIdentifers + * - Reserved IPv6 Interface Identifiers * (https://www.iana.org/assignments/ipv6-interface-ids/) */ From nobody Thu Feb 19 05:54:12 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGjHm3V76z6SM9S for ; Thu, 19 Feb 2026 05:54: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 4fGjHm2v8dz3hxV for ; Thu, 19 Feb 2026 05:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771480452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTP497QFFF4EcchaDbKtUQqvT/I/IoW8C9sGjuLGMP8=; b=sFTDW/z+6ziBrR2cGF4E1tVULjQuTYEUK+hlliZ402j7vt2JrAROZsk6o8+s+G+57FM8pX 3F924+2jWKHhJEh8c9NPLK4VQwjSGExOXn+8tJoD8kd9birCAeOTrPuSX9AE8KbeMH8oCz /KwE0vM/FbLt5qWFZ2JNbmqZtghATBhV49heo3Sp0y81+pdGszmJ2ITLyf95quLFRY6HPW 09Wfrce4DO4cgy/Q97Tjghg+SkZ/SHy4SO3U7X87oxmGPrU3xoNsO2IoanlXOzsGbvqLyX wF0LJQvkC1ncnda3M+Pn06aGLyg4U88FWN9sOwg6ys9DGH1KI5FpX8lETMaprQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771480452; a=rsa-sha256; cv=none; b=ARJaD7JCSH/g/IVke9xrsm9KLk+V+uq8w7ZzeYwtuw7MeYekGBHGtxgWg8/ECwr2Tl/v1C TLG0CoY4cr15P5A3WxAYjlohjPrCy8MlJjRGDIlD9vtk/tP/BNrnYwTfijNOG1tffo2vPi Tg3TbCrhmfen0MUL1PODRdBZMi0fWUqRkQ5+MMHF4PpMtJGFFrxihvryFsHOY5lvQYPLG7 4pQ0HyhTcHSG5afG6dS8EUnbG8zTiTQC9kPHHwQHMoBiDv//bOV/dGDuF/RYB6A8l5mkVz cGv01/Qmzykd655j+45jJ5YHKxh10jSE7QLrCSRYIk2ATrNSWVbM6LxVeQeeaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771480452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTP497QFFF4EcchaDbKtUQqvT/I/IoW8C9sGjuLGMP8=; b=NdNaPeOyNcuvapStC74pVYmNEL67jHOof3mRbgEL6awdZFGTOG4dV8STuQO86kwSs1X/e9 SkF0xumsJ6s6NRiLGb7+GCS0AbYvqTgQN3EJiuND+5NO1vKBOATaksmjaRnY0ZE/e1dutg CGKihASetJRZU+xK4dM+lZ5XuCFe/E3PjUNstzE9BuP403QysIlflWZdRT6n1iL8yg1gwU FK68ZsAiJ399Jmn3tWgST0ipdFrQznlVmSsgryplOl33jL2S22EBDzGunDKnDfFnYQrEcD e4o62q+7m1gbJXXHwhe+32HagoOTBeKIrzNwzcs6L9Xz6ifDc3JlfxGfuY7EsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGjHm2DkkzTgF for ; Thu, 19 Feb 2026 05:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37bd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 05:54:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 00e0b7bdb939 - main - Revert "fortune: fix netstat tip" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00e0b7bdb93972590362c5942b489ffed2a2ea20 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 05:54:12 +0000 Message-Id: <6996a584.37bd7.76a64d19@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=00e0b7bdb93972590362c5942b489ffed2a2ea20 commit 00e0b7bdb93972590362c5942b489ffed2a2ea20 Author: Warner Losh AuthorDate: 2026-02-19 05:53:47 +0000 Commit: Warner Losh CommitDate: 2026-02-19 05:53:47 +0000 Revert "fortune: fix netstat tip" This reverts commit 8e593a1f143203cace2e14bd6629a8ebdf9b47dc. I was totally wrong, so just revert and get on with it. Sponsored by: Netflix --- usr.bin/fortune/datfiles/freebsd-tips | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index c73f5d01c520..379f772fea88 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -856,7 +856,7 @@ $ fc-list ':charset=0x1F4A1' $ pkg which /usr/local/share/fonts/noto/NotoColorEmoji.ttf /usr/local/share/fonts/noto/NotoColorEmoji.ttf was installed by package noto-emoji-2.042 % -When netstat reports every 8 seconds, it tells traffic in bytes per second: +When netstat reports every 8 seconds, it tells traffic in bits per second: $ netstat -I bge0 8 % From nobody Thu Feb 19 09:47:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGpSs4qh9z6SgB6 for ; Thu, 19 Feb 2026 09:47: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 4fGpSr6bwsz46c3 for ; Thu, 19 Feb 2026 09:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771494444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2BrD6yO6Yw4P4z2xpbuawWH/fIFVRaVKZDRISgLf/g=; b=hsNrjDxLnDAnImADEGnD+6NMuh13Nfg4M+PTlkkBJIGAHp4uNPYHkk2Y7l+rwIhWSv6BkO zj48+1+enS6OB00sodM9ryxchACN15CrsxtW/HIWY3bjXC+FjjAEqtyt8ADGvxjRDl2GXS 1do5uscnKUtJWyPYu93pu7Mtaf+rDXg6HetJ8NwSBRNBXvaNnlKwXsMnPPq0nq8v0ZLbhs TUeTErZfUgxtWIjvOduuHpiOW6CXpQ1nyZHQXe9VIdOMQLurmT2VEH+dLbSvVugJw6NqJC nvKT22Ycszoby/ym+8/5flRUEksWwO/fhrCIUba1MidWCdUhJpaRCYnckHaL2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771494444; a=rsa-sha256; cv=none; b=sCQb01zzOkeihtkp5KRk4Q8KOB9TkImKGMjVI7yAeNwsdUKn4LGhGFVnHomPL+70MRr3Cy DF1l7fgLsmOecJae4bXcQlUJTRBaq/B60v1jLRpKmnVYnAEZ6Ku+Q0VfpVUaLYN0a4RgOj iQyaUcrunXlRqMMo9BxIMfuyaU7yUVeeR/s52YlPHR3rouVNsrGDcYv8s6v7OKA8bkWggN KGHgAlT8gTRhRe7oZNJU2CJfrWxP9yJMgtQU8z3wY0/5l/cVSRFYS3NMScaPWWE88+vgUE a8ZR7dd1i02gBgxLENaXnM31Bx/dxD+D0cFF4/vWb6zFMsSwxCi6AMnN7ry5BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771494444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2BrD6yO6Yw4P4z2xpbuawWH/fIFVRaVKZDRISgLf/g=; b=AtgwzLMIKyVfUYAZbDB2fENARN1jwHKzQ6gjgnI7HbK9UmpS6RKbsBwIBAIYWdfJcRkLTp jnuSOuuIIZy4wwVBdXb72njblDk40b8SEgOX06EokgfHNewRFxJXXdaxqxAhaeuQ8r0w2v 7EibUkCBm3hNqORJv7uF9isVe5ClkakgeT8WQVRcqGWCg+7x79BcBNk0d34ADQ9sQZWhIB Gi385vudxfflCoWHFhcA+vmeCng6F9ZW5cb7Upa+LT7lnzjlutebU6fWAA+ye4ddf5ruLc JXFHE+kCQeMIaos/fkodbbYr2k8cmT9zw24DQUofrFk8VslW2FY1yDbTP5bBZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGpSr4b59zclB for ; Thu, 19 Feb 2026 09:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dcfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:47:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: f015e48a4a04 - main - ed: convert test suite to ATF/kyua List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f015e48a4a0482787b46e972754619a75475439c Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:47:19 +0000 Message-Id: <6996dc27.1dcfb.62f2f492@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f015e48a4a0482787b46e972754619a75475439c commit f015e48a4a0482787b46e972754619a75475439c Author: Baptiste Daroussin AuthorDate: 2026-02-17 16:14:09 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:46:42 +0000 ed: convert test suite to ATF/kyua MFC After: 1 week --- bin/ed/Makefile | 3 + bin/ed/tests/Makefile | 3 + bin/ed/tests/ed_test.sh | 1782 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1788 insertions(+) diff --git a/bin/ed/Makefile b/bin/ed/Makefile index cad48082f186..07fee7478261 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -6,4 +6,7 @@ SRCS= buf.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/bin/ed/tests/Makefile b/bin/ed/tests/Makefile new file mode 100644 index 000000000000..b75f97bf4d63 --- /dev/null +++ b/bin/ed/tests/Makefile @@ -0,0 +1,3 @@ +ATF_TESTS_SH= ed_test + +.include diff --git a/bin/ed/tests/ed_test.sh b/bin/ed/tests/ed_test.sh new file mode 100755 index 000000000000..c67df8ae9f65 --- /dev/null +++ b/bin/ed/tests/ed_test.sh @@ -0,0 +1,1782 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2025 Baptiste Daroussin + +# Helper: create standard 5-line data file +create_std_data() +{ + cat > "$1" <<'EOF' +line 1 +line 2 +line 3 +line 4 +line5 +EOF +} + +# --------------------------------------------------------------------------- +# Append (a) +# --------------------------------------------------------------------------- +atf_test_case append +append_head() +{ + atf_set "descr" "Test append command (a)" +} + +append_body() +{ + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +0a +hello world +. +2a +hello world! +. +$a +hello world!! +. +w output.txt +CMDS + cat > expected.txt <<'EOF' +hello world +line 1 +hello world! +line 2 +line 3 +line 4 +line5 +hello world!! +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Address parsing (addr) +# --------------------------------------------------------------------------- +atf_test_case address +address_head() +{ + atf_set "descr" "Test complex address parsing" +} +address_body() +{ + cat > input.txt <<'EOF' +line 1 +line 2 +line 3 +line 4 +line5 +1ine6 +line7 +line8 +line9 +EOF + ed -s - <<'CMDS' +H +r input.txt +1 d +1 1 d +1,2,d +1;+ + ,d +1,2;., + 2d +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 2 +line9 +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Change (c) +# --------------------------------------------------------------------------- +atf_test_case change +change_head() +{ + atf_set "descr" "Test change command (c)" +} +change_body() +{ + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +1c +at the top +. +4c +in the middle +. +$c +at the bottom +. +2,3c +between top/middle +. +w output.txt +CMDS + cat > expected.txt <<'EOF' +at the top +between top/middle +in the middle +at the bottom +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Delete (d) +# --------------------------------------------------------------------------- +atf_test_case delete +delete_head() +{ + atf_set "descr" "Test delete command (d)" +} +delete_body() +{ + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +1d +2;+1d +$d +w output.txt +CMDS + printf 'line 2\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Insert (i) +# --------------------------------------------------------------------------- +atf_test_case insert +insert_head() +{ + atf_set "descr" "Test insert command (i)" +} +insert_body() +{ + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +1i +hello world +. +2i +hello world! +. +$i +hello world!! +. +w output.txt +CMDS + cat > expected.txt <<'EOF' +hello world +hello world! +line 1 +line 2 +line 3 +line 4 +hello world!! +line5 +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Join (j) +# --------------------------------------------------------------------------- +atf_test_case join +join_head() +{ + atf_set "descr" "Test join command (j)" +} +join_body() +{ + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +1,1j +2,3j +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 1 +line 2line 3 +line 4 +line5 +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Mark (k) +# --------------------------------------------------------------------------- +atf_test_case mark +mark_head() +{ + atf_set "descr" "Test mark and reference commands (k, ')" +} +mark_body() +{ + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +2ka +1d +'am$ +1ka +0a +hello world +. +'ad +u +'am0 +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 3 +hello world +line 4 +line5 +line 2 +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Move (m) +# --------------------------------------------------------------------------- +atf_test_case move +move_head() +{ + atf_set "descr" "Test move command (m)"; +} +move_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +1,2m$ +1,2m$ +1,2m$ +$m0 +$m0 +2,3m1 +2,3m3 +w output.txt +CMDS + cat > expected.txt <<'EOF' +line5 +line 1 +line 2 +line 3 +line 4 +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Transfer / Copy (t) +# --------------------------------------------------------------------------- +atf_test_case transfer +transfer_head() +{ + atf_set "descr" "Test transfer/copy command (t)"; +} +transfer_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +1t0 +2,3t2 +,t$ +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 1 +line 1 +line 1 +line 2 +line 2 +line 3 +line 4 +line5 +line 1 +line 1 +line 1 +line 2 +line 2 +line 3 +line 4 +line5 +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case transfer_search +transfer_search_head() +{ + atf_set "descr" "Test transfer with address search (t)"; +} +transfer_search_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +t0;/./ +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 1 +line5 +line 2 +line 3 +line 4 +line5 +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Undo (u) +# --------------------------------------------------------------------------- +atf_test_case undo +undo_head() +{ + atf_set "descr" "Test undo command (u)"; +} +undo_body() +{ + + create_std_data input.txt + printf 'dummy\n' > readfile.txt + ed -s - <<'CMDS' +H +r input.txt +1;r readfile.txt +u +a +hello +world +. +g/./s//x/\ +a\ +hello\ +world +u +u +u +a +hello world! +. +u +1,$d +u +2,3d +u +c +hello world!! +. +u +u +-1;.,+1j +u +u +u +.,+1t$ +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 1 +hello +hello world!! +line 2 +line 3 +line 4 +line5 +hello +hello world!! +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Global (g) +# --------------------------------------------------------------------------- +atf_test_case global_move +global_move_head() +{ + atf_set "descr" "Test global command with move (g)"; +} +global_move_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +g/./m0 +g/./s/$/\ +hello world +g/hello /s/lo/p!/\ +a\ +order +w output.txt +CMDS + cat > expected.txt <<'EOF' +line5 +help! world +order +line 4 +help! world +order +line 3 +help! world +order +line 2 +help! world +order +line 1 +help! world +order +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case global_change +global_change_head() +{ + atf_set "descr" "Test global command with change (g)"; +} +global_change_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +g/[2-4]/-1,+1c\ +hello world +w output.txt +CMDS + printf 'hello world\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +atf_test_case global_substitute +global_substitute_head() +{ + atf_set "descr" "Test global with substitute and move (g)"; +} +global_substitute_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +g/./s//x/\ +3m0 +g/./s/e/c/\ +2,3m1 +w output.txt +CMDS + cat > expected.txt <<'EOF' +linc 3 +xine 1 +xine 2 +xinc 4 +xinc5 +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case global_undo +global_undo_head() +{ + atf_set "descr" "Test global with undo (g)"; +} +global_undo_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +g/./s/./x/\ +u\ +s/./y/\ +u\ +s/./z/\ +u +u +0a +hello +. +$a +world +. +w output.txt +CMDS + cat > expected.txt <<'EOF' +hello +zine 1 +line 2 +line 3 +line 4 +line5 +world +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case global_copy +global_copy_head() +{ + atf_set "descr" "Test global with copy (g)"; +} +global_copy_body() +{ + + cat > input.txt <<'EOF' +line 1 +line 2 +line 3 +EOF + ed -s - <<'CMDS' +H +r input.txt +g/./1,3t$\ +1d +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 1 +line 2 +line 3 +line 2 +line 3 +line 1 +line 3 +line 1 +line 2 +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Inverse global (v) +# --------------------------------------------------------------------------- +atf_test_case inverse_global +inverse_global_head() +{ + atf_set "descr" "Test inverse global command (v)"; +} +inverse_global_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +v/[ ]/m0 +v/[ ]/s/$/\ +hello world +v/hello /s/lo/p!/\ +a\ +order +w output.txt +CMDS + cat > expected.txt <<'EOF' +line5 +order +hello world +line 1 +order +line 2 +order +line 3 +order +line 4 +order +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Substitution (s) +# --------------------------------------------------------------------------- +atf_test_case subst_backreference +subst_backreference_head() +{ + atf_set "descr" "Test substitute with backreferences (s)"; +} +subst_backreference_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +s/\([^ ][^ ]*\)/(\1)/g +2s +/3/s +/\(4\)/sr +/\(.\)/srg +%s/i/&e/ +w output.txt +CMDS + cat > expected.txt <<'EOF' +liene 1 +(liene) (2) +(liene) (3) +liene (4) +(()liene5) +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case subst_range +subst_range_head() +{ + atf_set "descr" "Test substitute on range with count and repeat (s)"; +} +subst_range_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +,s/./(&)/3 +s/$/00 +2s//%/g +s/^l +w output.txt +CMDS + cat > expected.txt <<'EOF' +li(n)e 1 +i(n)e 200 +li(n)e 3 +li(n)e 4 +li(n)e500 +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case subst_charclass +subst_charclass_head() +{ + atf_set "descr" "Test substitute with character classes (s)"; +} +subst_charclass_body() +{ + + ed -s - <<'CMDS' +H +a +hello/[]world +. +s/[/]/ / +s/[[:digit:][]/ / +s/[]]/ / +w output.txt +CMDS + printf 'hello world\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Edit (e/E) +# --------------------------------------------------------------------------- +atf_test_case edit_file +edit_file_head() +{ + atf_set "descr" "Test edit file command (E)"; +} +edit_file_body() +{ + + printf 'hello world\n' > input.txt + printf 'E e1_data.txt\n' > e1_data.txt + ed -s - <<'CMDS' +H +r input.txt +E e1_data.txt +w output.txt +CMDS + printf 'E e1_data.txt\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +atf_test_case edit_command +edit_command_head() +{ + atf_set "descr" "Test edit with shell command (E !)"; +} +edit_command_body() +{ + + printf 'E !echo hello world-\n' > input.txt + ed -s - <<'CMDS' +H +r input.txt +E !echo hello world- +w output.txt +CMDS + printf 'hello world-\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +atf_test_case edit_reread +edit_reread_head() +{ + atf_set "descr" "Test edit re-read default file (E)"; +} +edit_reread_body() +{ + + printf 'E !echo hello world-\n' > input.txt + ed -s - <<'CMDS' +H +r input.txt +E +w output.txt +CMDS + printf 'E !echo hello world-\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +atf_test_case edit_lowercase +edit_lowercase_head() +{ + atf_set "descr" "Test lowercase edit re-read (e)"; +} +edit_lowercase_body() +{ + + printf 'E !echo hello world-\n' > input.txt + ed -s - <<'CMDS' +H +r input.txt +e +w output.txt +CMDS + printf 'E !echo hello world-\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Read (r) +# --------------------------------------------------------------------------- +atf_test_case read_command +read_command_head() +{ + atf_set "descr" "Test read with shell command (r !)"; +} +read_command_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +1;r !echo hello world +1 +r !echo hello world +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 1 +hello world +line 2 +line 3 +line 4 +line5 +hello world +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case read_default +read_default_head() +{ + atf_set "descr" "Test read with default filename (r)"; +} +read_default_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +r +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 1 +line 2 +line 3 +line 4 +line5 +line 1 +line 2 +line 3 +line 4 +line5 +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case read_file +read_file_head() +{ + atf_set "descr" "Test read from file (r)"; +} +read_file_body() +{ + + printf 'r r3_data.txt\n' > r3_data.txt + ed -s - <<'CMDS' +H +r r3_data.txt +r r3_data.txt +w output.txt +CMDS + cat > expected.txt <<'EOF' +r r3_data.txt +r r3_data.txt +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Write (w) +# --------------------------------------------------------------------------- +atf_test_case write_pipe +write_pipe_head() +{ + atf_set "descr" "Test write to shell command (w !)"; +} +write_pipe_body() +{ + + create_std_data input.txt + ed -s - <<'CMDS' +H +r input.txt +w !cat >\!.z +r \!.z +w output.txt +CMDS + cat > expected.txt <<'EOF' +line 1 +line 2 +line 3 +line 4 +line5 +line 1 +line 2 +line 3 +line 4 +line5 +EOF + atf_check cmp output.txt expected.txt +} + +# --------------------------------------------------------------------------- +# Quit (q) +# --------------------------------------------------------------------------- +atf_test_case quit +quit_head() +{ + atf_set "descr" "Test quit command (q)"; +} +quit_body() +{ + + ed -s - <<'CMDS' +H +w output.txt +a +hello +. +q +CMDS + atf_check -s exit:0 test ! -s output.txt +} + +# --------------------------------------------------------------------------- +# Shell command (!) +# --------------------------------------------------------------------------- +atf_test_case shell_command +shell_command_head() +{ + atf_set "descr" "Test shell command execution (!)"; +} +shell_command_body() +{ + + ed -s - <<'CMDS' +H +!read one +hello, world +a +okay +. *** 841 LINES SKIPPED *** From nobody Thu Feb 19 10:29:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGqPY6CMmz6Sjwc for ; Thu, 19 Feb 2026 10:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGqPY5MBkz3D3V for ; Thu, 19 Feb 2026 10:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771496977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W1HMHekzcGmA64GBASpd5DEiSUAqiF2KK2283D4U4mg=; b=VjdB9Tx+PQFvoFJfNZo4HVoTo6OeQjKCBTDJeIO2yHOgH9Q8tpY2h3ZeMdCwCsvAHaEdvm MCm8uZgT4v35A9bMjf4ZIvZSiZ9fulJDY8uGaPrRkkXoND0C0Zx+wYutaQ3QfgXRuw/eql tXp6ZdU5c6Rj+dwOdt/rxeghNg/dmIYokZ+lNya2tHyiUFNsf+sLG37c5Zt5A4Jy9WbZU8 PyJLHJWbSGX20WQoEt4dOKL19yImclSRsHMElMNmtmV3vm/HUIyRMmAnUr2biydN1WiXUx E8RsUXya0/CU0hUKCYE4//CHxLK0KS8nLUlVB7zQSO6FX6y7pCA8MzOgaqasFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771496977; a=rsa-sha256; cv=none; b=t0IMQWGOFeA601VSOFXjxBzGlxEMkDy1voJZGHRkvKP/9ahAZ39IzRmpHNmQjahUFnh8Rs q/DhYIvyANba0PDATlQnm7PVFPhDyD9J/Hzy2hoGRmgbtWxk5nu7awZ99Dwm4mmPnlCgpm 6gnBDEDw2f09W/uhzLYnGesK3peC0a1VfrYd70SVHcnf9pC8DcClN9/DAaVZiCrmCcaYxB SP/dpEvmXGMUwqbzzuloi192InQliXjqrX1o1ZD8/t3My31fKxMim2zsh8E5GZptdMFk53 adD6oxK2rvD0dwUlRZDr0Nj0htZFXOIMFiCRWY/CtsR7BSnXcDxq5/kcg8BuXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771496977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W1HMHekzcGmA64GBASpd5DEiSUAqiF2KK2283D4U4mg=; b=w12rzRQrohtP8Ye7v0l4rtqavZYzyMM2+tjR6J/Qt4OUEo3IO4A5fYgBWsvQFBJOJ9lph5 ofuygHh8G8Absm/tYUT/nHJTp3ZeCnPCCi8IbozuhzWF5damENh6dd0oYEtZiWL9vg7YgA Pu81ouPIxRCIq4mWGeRS78Q635J+jVA9fUEcMsnaPEvB4qNFNs70S0b3Wyidac4vq2wIeU T+kyX5xqzGyNFo36Qel7xH0u876f6LBXGUXvsxdx5VANKCBQwsabSmg0QLdRYDMasKJGy4 ze2mP/P99m3jTP0IsImrBTyGGmGiimRQ3uY6sZ0GOdHKZ6hN5vH79cXIVn6FPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGqPY4tjJzf9Y for ; Thu, 19 Feb 2026 10:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24c9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 10:29:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d18aaeff8fd3 - main - vm_page.h: Materialize a spare bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d18aaeff8fd314e79642062d95110ad174bd1882 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 10:29:37 +0000 Message-Id: <6996e611.24c9c.15abff58@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d18aaeff8fd314e79642062d95110ad174bd1882 commit d18aaeff8fd314e79642062d95110ad174bd1882 Author: Olivier Certner AuthorDate: 2026-02-16 12:53:16 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 10:29:02 +0000 vm_page.h: Materialize a spare bit No functional change (intended). MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/vm/vm_page.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 0a143544e907..a091310ffd17 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -487,6 +487,7 @@ vm_page_t PHYS_TO_VM_PAGE(vm_paddr_t pa); #define VM_ALLOC_INTERRUPT 1 #define VM_ALLOC_SYSTEM 2 #define VM_ALLOC_CLASS_MASK 3 +#define VM_ALLOC_AVAIL0 0x0004 #define VM_ALLOC_WAITOK 0x0008 /* (gnp) Sleep and retry */ #define VM_ALLOC_WAITFAIL 0x0010 /* (acgnp) Sleep and return error */ #define VM_ALLOC_WIRED 0x0020 /* (acgnp) Allocate a wired page */ From nobody Thu Feb 19 10:29:38 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGqPb2y1Qz6Sjqw for ; Thu, 19 Feb 2026 10:29: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 4fGqPZ6FyJz3CkQ for ; Thu, 19 Feb 2026 10:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771496978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wJPo+x7PLhIXh6syVG1XHgPNC03LwNRvh33MBFHMBg=; b=GRvM7A3jg1kApqUIjUETPfwX9go981i+5h/x0hfUf6bIMEiXzoBpQJyARHewWNbRRz2O1M wgSUnDmF0MymFRSgwDHf9cHSpzmMwocbeHDkafja8kNUjoYETqUHE4QMxejTzxwk5/bvlM yTr8xaG6w1+VQwjcCmlwerZU/qaWjqgR5wS9y04D/BljjCX+MWR7/AaKmB+7SGRz7GlvM7 Eda8DCgyfd2fcEZl3qOkH6EzyHTXyWCV/ypWsp/DcA18uUBm/4UJUCONeK48NPvBkVS7yv vE49RfczDROSgaR56NyIc3EoHj+owJUG00/Zf6cH8AGxvT9W5shR/pqjvjQuuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771496978; a=rsa-sha256; cv=none; b=Taa7DWL/q8G7VL/UwxKTYZAITYE3xO2ZyRGJqOL3uTxdSSRLJeu12SeFfD28NVWMU9efWg 1fAJ6AsWzCQOgotGaj+AzZKTe6UGLKKgJEruWCjJSjO8RIoQQ04FnaXUColCRtWchL7OoU ++jKwHw36YenXi8p+0BwS2f7o9fQM94c1KHIXJ5dRO7krTbNppwk78aJelr2Azs9a4ecyK 43o9ReeZOs8iQe+15yyhsx1shi+VnB5yPAQlCcWsaQAZlMVYieDOmtNs+Qhn6ZPxGV1van UiSSmN5+wM1ZwcMQK5X1C/2ZYK7EnbKj6l0MlPdPGYxwpG22DcGuKaqgqJIPaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771496978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wJPo+x7PLhIXh6syVG1XHgPNC03LwNRvh33MBFHMBg=; b=gUAhcD6CLlLO3dc9LY2zOcXZy9r8Ca2bPeXbRGWGpekGYEOXmTLs1vnW+qthxsWEIoyaPr ey4gLa/q6tSTOaroESRLeUdPCTnXwVjFUeXpDRsjX9exdWe9rsImCVkeoLcrb/hMT5L9uv T7c6jr/0U4na6+l1gvjUILMEFLOCG3tTV2zlv1ABbVDhKOTTSymGDgztS81ZVIx5nHMIBJ hFyutN+s/PBJjOe9BzuVORfwpjp7hODmisWVTc73FAfjkBLZlLE2GpSrFFlUS6SUY1H4av s7LZoVTHw4ZMalvOCEAkLaBlUbQi1tHIiNGqvWZsIFhxLQAZLVGaFOkaEtikrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGqPZ5jxXzfFs for ; Thu, 19 Feb 2026 10:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 10:29:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 781c9b0a595f - main - acpi: Factor out message printing on failure of AcpiEnterSleepStatePrep() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 781c9b0a595f9af501ad836a120aedba91c13a0b Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 10:29:38 +0000 Message-Id: <6996e612.24f0f.1490cce6@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=781c9b0a595f9af501ad836a120aedba91c13a0b commit 781c9b0a595f9af501ad836a120aedba91c13a0b Author: Olivier Certner AuthorDate: 2026-01-28 16:06:30 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 10:29:07 +0000 acpi: Factor out message printing on failure of AcpiEnterSleepStatePrep() To this end, create a small wrapper, acpi_EnterSleepStatePrep(), which itself prints the failure message. While here, when trying to power down (acpi_shutdown_final()), and AcpiEnterSleepStatePrep() failed, print an additional message more explicit about the power down request having failed. Reviewed by: obiwac MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55225 --- sys/dev/acpica/acpi.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 59ae4624f407..bbcf6ba34666 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2593,6 +2593,23 @@ acpi_fake_objhandler(ACPI_HANDLE h, void *data) { } +/* + * Simple wrapper around AcpiEnterSleepStatePrep() printing diagnostic on error. + */ +static ACPI_STATUS +acpi_EnterSleepStatePrep(device_t acpi_dev, UINT8 SleepState) +{ + ACPI_STATUS status; + + status = AcpiEnterSleepStatePrep(SleepState); + if (ACPI_FAILURE(status)) + device_printf(acpi_dev, + "AcpiEnterSleepStatePrep(%u) failed - %s\n", + SleepState, + AcpiFormatException(status)); + return (status); +} + static void acpi_shutdown_final(void *arg, int howto) { @@ -2606,9 +2623,9 @@ acpi_shutdown_final(void *arg, int howto) * an AP. */ if ((howto & RB_POWEROFF) != 0) { - status = AcpiEnterSleepStatePrep(ACPI_STATE_S5); + status = acpi_EnterSleepStatePrep(sc->acpi_dev, ACPI_STATE_S5); if (ACPI_FAILURE(status)) { - device_printf(sc->acpi_dev, "AcpiEnterSleepStatePrep failed - %s\n", + device_printf(sc->acpi_dev, "Power-off preparation failed! - %s\n", AcpiFormatException(status)); return; } @@ -3659,12 +3676,9 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) slp_state |= ACPI_SS_DEV_SUSPEND; if (stype != POWER_STYPE_SUSPEND_TO_IDLE) { - status = AcpiEnterSleepStatePrep(acpi_sstate); - if (ACPI_FAILURE(status)) { - device_printf(sc->acpi_dev, "AcpiEnterSleepStatePrep failed - %s\n", - AcpiFormatException(status)); + status = acpi_EnterSleepStatePrep(sc->acpi_dev, acpi_sstate); + if (ACPI_FAILURE(status)) goto backout; - } slp_state |= ACPI_SS_SLP_PREP; } From nobody Thu Feb 19 10:29:39 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGqPc23J0z6Sjtn for ; Thu, 19 Feb 2026 10:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGqPb6ycTz3Ckc for ; Thu, 19 Feb 2026 10:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771496980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODpcPsxPoeo53GZVgxsIiDXsEnj77wTQkNvS5EUV3Fc=; b=F1gBgIXEiDuNUe6dlNhOOHgLWQI/q2oMERbJepN/VGOoVD1EY6Kyk5qXokRRyoMmjfBv9V 8C/ExpsfAp+Vjh6aw2g31wP7OBjPndMPIgvsXihdvEy45laEdke7DAzc575ckHUDiQE3Sv Xh+ciD2qPAI/Ok9B1zsQ1tASoAOmmZ9nNeGQR6CMc+csOJ/gd145icsS8pOEJ6N0JRXqLR MJUvdt5oXNpaE7Rzz+A3NBSI9jxMIBCmYkCkjmWIBdMBf4I7NO1EWBl/VcAo+c87dhYMS4 O6v1jzsH/JfkB0XicF3Ub/WmaopvudCDDz5VyPPiQsCwbK5hmvVaJYEJxt3taQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771496980; a=rsa-sha256; cv=none; b=H0K4pBQ3raXVpIzVWt4WQ5pKiOq3DfwBrIlRbnjd+sPGgymQ51KRppJ3K0U64AjDR2vlGi wbfTTbyJkuxlYu+ZSDy+/MIx/27AEEsIdLAuigpzlCXu8aNBvdTesUSrNFxO1J1zBy4iPS UXYpXbf4XrNaPPR+QWYyRlxr/oabSdoAtUrfxSvk0SxNnFmQstkTamkCjGBeLoFD1jitLc gxRJI5VNVuoq8sCGW9duWlKDgxcsfVDU2ZVaa8th1rOJZbd2MhsImtTVUIZyD9xhxHT9bk jO+FWB9pts9ftc6N8pFCJKiZ8ukP/UOW93H3NlxWNFUIy354mZNJP8raYp4XJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771496980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODpcPsxPoeo53GZVgxsIiDXsEnj77wTQkNvS5EUV3Fc=; b=R9CCHVjx/U78tttEUYex3fqi5VjObTc6bgO9YFjVcOZKZJLXRbwHoSWhtTjmyf1r4CqzD5 FGz67AoA34IffFLuna+naRoUSVN9gV+/d31r2f6cwbHxG5HwwrvCZanWvzCMVYuM0Nws2A +LotVLpbNOQF8Oi3xJUk1U1YqBcawbn4oyhtJIDA6agJPn9+YhSlpiTN1HEHtTbNOPQ09Q kZXKFRFwJxRUTOFgdWV1BQ7h+UsH2olJxsRqaaBcCXJVtBFB061XAXx8DqguX9T/q8dHjm T//vrMAeMLfXK5z3GEWDfsaOkbkaapsWAOS/edKpO2VHivd6Y0peos/k/JhVzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGqPb6YQzzdvb for ; Thu, 19 Feb 2026 10:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f15 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 10:29:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ffdfca5982b6 - main - acpi: Factor out the power off code into acpi_poweroff() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffdfca5982b60cb4145a53f965b8c51600d2f323 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 10:29:39 +0000 Message-Id: <6996e613.24f15.74e7371b@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ffdfca5982b60cb4145a53f965b8c51600d2f323 commit ffdfca5982b60cb4145a53f965b8c51600d2f323 Author: Olivier Certner AuthorDate: 2026-01-28 16:40:51 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 10:29:07 +0000 acpi: Factor out the power off code into acpi_poweroff() While here, make it print that we are trying to power off upfront, not really treating differently power off preparation via acpi_EnterSleepStatePrep() and actual power off via AcpiEnterSleepState(), which the user does not care about. While here, capitalize the messages. Reviewed by: obiwac MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55226 --- sys/dev/acpica/acpi.c | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index bbcf6ba34666..f903f265f9fa 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2610,11 +2610,37 @@ acpi_EnterSleepStatePrep(device_t acpi_dev, UINT8 SleepState) return (status); } +/* Return from this function indicates failure. */ +static void +acpi_poweroff(device_t acpi_dev) +{ + register_t intr; + ACPI_STATUS status; + + device_printf(acpi_dev, "Powering system off...\n"); + status = acpi_EnterSleepStatePrep(acpi_dev, ACPI_STATE_S5); + if (ACPI_FAILURE(status)) { + device_printf(acpi_dev, "Power-off preparation failed! - %s\n", + AcpiFormatException(status)); + return; + } + intr = intr_disable(); + status = AcpiEnterSleepState(ACPI_STATE_S5); + if (ACPI_FAILURE(status)) { + intr_restore(intr); + device_printf(acpi_dev, "Power-off failed! - %s\n", + AcpiFormatException(status)); + } else { + DELAY(1000000); + intr_restore(intr); + device_printf(acpi_dev, "Power-off failed! - timeout\n"); + } +} + static void acpi_shutdown_final(void *arg, int howto) { struct acpi_softc *sc = (struct acpi_softc *)arg; - register_t intr; ACPI_STATUS status; /* @@ -2623,24 +2649,7 @@ acpi_shutdown_final(void *arg, int howto) * an AP. */ if ((howto & RB_POWEROFF) != 0) { - status = acpi_EnterSleepStatePrep(sc->acpi_dev, ACPI_STATE_S5); - if (ACPI_FAILURE(status)) { - device_printf(sc->acpi_dev, "Power-off preparation failed! - %s\n", - AcpiFormatException(status)); - return; - } - device_printf(sc->acpi_dev, "Powering system off\n"); - intr = intr_disable(); - status = AcpiEnterSleepState(ACPI_STATE_S5); - if (ACPI_FAILURE(status)) { - intr_restore(intr); - device_printf(sc->acpi_dev, "power-off failed - %s\n", - AcpiFormatException(status)); - } else { - DELAY(1000000); - intr_restore(intr); - device_printf(sc->acpi_dev, "power-off failed - timeout\n"); - } + acpi_poweroff(sc->acpi_dev); } else if ((howto & RB_HALT) == 0 && sc->acpi_handle_reboot) { /* Reboot using the reset register. */ status = AcpiReset(); From nobody Thu Feb 19 11:56:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGsLD3NRHz6QNW0 for ; Thu, 19 Feb 2026 11:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGsLD2PmWz3LvT for ; Thu, 19 Feb 2026 11:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771502212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jb5nSMQvbe6Mo/IkXTqLBJJmCYjo02KNsteNBmNtDVk=; b=QVZktQ49bUJR+0PPNDPl3sSc8R1ZnQL6Xd/ybYaWFW0S6kkQmnymvqPt/KHBjunIqb9E2y Qv6ImxjpTIaiFft4aKeo2JoW5lief6W6v+DZLUaJNciU4jwsxtUJ3x2tZKxjR2ZbmxFA5S PVqJEaSWhss8tooYW0HQxkCi79c9SMj7i415y0eSlhCbUmpXXEDbOKScGXJ5alVSNIOW1f KXA6xJDGLllV08PazKVGOADPoBr0rOLSqJjLy/V3cULoOb9M8BPTICWYEQHJ7WW+A6Ms4X gIXbk1C39RTajXWg5DkQmQnwO3r4EPQraExRV6Ye4usDyAoAdJd9ZpJE337xBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771502212; a=rsa-sha256; cv=none; b=iWzdl0uxFuBhi87ixkOuFZihy6sB3TkH2VvAdHXpGjCP+v9mgS8X2sRga1EnbtdxoWCWMO tI5ZNfpECfBKr/2HT1cWcBrNkMkwuhwoQwNB5qgPAZKWovb0JJzk0qxbw08BLXo91Y5QSO gE6P++nO3KmrbEHRo5uhNqTNij657cohCMWpQXu9e0/gRNsN16/WadgNbQ90RizhI7YKCi 1alEq35LnKs2UHaN8RHVmh91cD+8HTbEDICziw0bUbmyTNMpxZR9FckEL5kDNO62a7trlN dEJX0O1BHKrxH8bw24CmFwEC6qjvVfIkMHZqov13wSvNj+Zlol+rh5sVXoj7lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771502212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jb5nSMQvbe6Mo/IkXTqLBJJmCYjo02KNsteNBmNtDVk=; b=igbx2KI8GXQ7vbTPVm3JC3JhgMidbSKRar9iIgTyQpH1aqJqiiciuH4XeWzu5LnrjC1nhO uHrgqmkNL7o4nJp140+V0pfxTp/PkIb/I0cumoIftvC6qSlf8mZewKJQHM3MhMQBt24eq/ X+T+CG+uJNvjZi2q9VCaZ2PCF7henIQTTQDjwso5mTL9gUhhB1REma5t1NV4CKmzJ1/RIh uBd5fBLpvC2JfW27QEm4Ps1JWmxLqKGN+dprkE80132HiexzaakFnKIdCcfwHpY6e/HfVZ HXr7T8VKxsO6xmkVNn8dJFT92FJcLiZo6FHpkWAtad7oFNlToVl7i6O2ksb+5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGsLD21DnzhVn for ; Thu, 19 Feb 2026 11:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3773e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 11:56:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 9a6e77e3dbc0 - main - ed: add missing test entry in mtree List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a6e77e3dbc0daa7c4a3e816a73bc45d0af27b9e Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 11:56:52 +0000 Message-Id: <6996fa84.3773e.6d090a52@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9a6e77e3dbc0daa7c4a3e816a73bc45d0af27b9e commit 9a6e77e3dbc0daa7c4a3e816a73bc45d0af27b9e Author: Baptiste Daroussin AuthorDate: 2026-02-19 11:56:23 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 11:56:48 +0000 ed: add missing test entry in mtree Reported by: olce --- etc/mtree/BSD.tests.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 1895877c82eb..770f3434ac11 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -31,6 +31,8 @@ .. echo .. + ed + .. expr .. hostname From nobody Thu Feb 19 13:15:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGv4v2X09z6QVy3 for ; Thu, 19 Feb 2026 13:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGv4v1jn7z3cBg for ; Thu, 19 Feb 2026 13:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771506927; 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=eLoD1WS58NXZLpJ4ZJfhZgctboWBTPJdLp94kg+QjVs=; b=GnonXJkM3iKCvaWc53B4YRZdgpllSC9TUopecxzP81m3JbF3OON+erimwoKMu8N4SQ65JK +R2VbIump2sh0N7kSr55gOP6ZtkSm3czFiEW4sDL1FxbBoyIpW/ky66MARquos1s87mZAU f4SnShplI2e6vm4c1EACCoIYYqVobD3c4Hv+0VI5X2JC24+WZsBgmb2okrniQ56Ll5nFHh +1nm1pUlt2P+bDQdIiPmWd9xnn7bAoVf+u/dgfDPKfRe3zlN+FPz7CQSJQbokpSugAqwwS qDYHtDudy7+9W2LoI4GoWwf/NXocMHyNSY9UOzfPXleri2G5XPgpSy/yAUkC2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771506927; a=rsa-sha256; cv=none; b=iM0HXVaolqr//JoeYlYQaoqAgf4pHfwA/Pim7qaJDjtocNYKyWnicEbd1UP0KOsPOPc2hE KBwd5qmEmARUIJENtkjJiXRLO11uPKCkQ7ohMKlpqHLt9D44I4EGt0J1qUkCYd4SOMpL/v j2HX9VA/82soApDWRZzT8Tz6+SWDLxCxFGb0aN1CIiRk53+oeGn+/ERFasoFhYL9/ARdMM zL8RGRvEEuiEpPEN2Q2xQ1ZC8CFTVREI+syL3dOjAjpfXs89c1tXSa21OwLWtXsLFRscMQ 9H9/9csqy5hf1g0dTv2yooM38NJ6pnNHiOSYu4W3fROQ6HoCi8usoqN6o3tVTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771506927; 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=eLoD1WS58NXZLpJ4ZJfhZgctboWBTPJdLp94kg+QjVs=; b=hWZGpfHhasLV0MZPv9Gf/9urFC/4Z4YLAKDdoHrSb5anXXC0EN4+F7Z51r7UUdqxEznsuW V5uB9yHvj8u1LctKBsSxxxuryAbab7KP+d5UBL64eBTJ0PrC6TTdD9oKjSGdJKpP59Ht/C 5c8I0nB+22slAwdKLEHWwOXfpFPNuDj8xF1H34t0gb2QCNuX+GRRaAOxF74w92S3/XkF9m MDMxifceIxxtjlLCK/FsreKmeN0cPaqQEsGUQcmx83mUOL2kvgC+FLD5pl+k+ca9fhECki SBpauq5MyK4Y3FFfCbWRQz4SDLX0ZFsxqy68Df2dNUo1gEv8VN4niOMev7ptnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGv4v1F89zkYZ for ; Thu, 19 Feb 2026 13:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:15:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 971696b22f7a - main - mkimg: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 971696b22f7acc8c45600bb56b972340e9b912e8 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:15:27 +0000 Message-Id: <69970cef.3ed94.e6f6ffd@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=971696b22f7acc8c45600bb56b972340e9b912e8 commit 971696b22f7acc8c45600bb56b972340e9b912e8 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:32:54 +0000 Commit: Ed Maste CommitDate: 2026-02-19 13:15:00 +0000 mkimg: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.bin/mkimg/apm.c | 2 ++ usr.bin/mkimg/bsd.c | 2 ++ usr.bin/mkimg/ebr.c | 2 ++ usr.bin/mkimg/endian.h | 2 ++ usr.bin/mkimg/format.c | 2 ++ usr.bin/mkimg/format.h | 2 ++ usr.bin/mkimg/gpt.c | 2 ++ usr.bin/mkimg/image.c | 2 ++ usr.bin/mkimg/image.h | 2 ++ usr.bin/mkimg/mbr.c | 2 ++ usr.bin/mkimg/mkimg.c | 2 ++ usr.bin/mkimg/mkimg.h | 2 ++ usr.bin/mkimg/qcow.c | 2 ++ usr.bin/mkimg/raw.c | 2 ++ usr.bin/mkimg/scheme.c | 2 ++ usr.bin/mkimg/scheme.h | 2 ++ usr.bin/mkimg/uuid.c | 2 ++ usr.bin/mkimg/vhd.c | 2 ++ usr.bin/mkimg/vhdx.c | 2 ++ usr.bin/mkimg/vmdk.c | 2 ++ 20 files changed, 40 insertions(+) diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c index 259a7533c27c..59776d18bc47 100644 --- a/usr.bin/mkimg/apm.c +++ b/usr.bin/mkimg/apm.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/bsd.c b/usr.bin/mkimg/bsd.c index 17933c01ac07..647e9ab0608c 100644 --- a/usr.bin/mkimg/bsd.c +++ b/usr.bin/mkimg/bsd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/ebr.c b/usr.bin/mkimg/ebr.c index 4d6adbb3b8ba..20ade1ed88d1 100644 --- a/usr.bin/mkimg/ebr.c +++ b/usr.bin/mkimg/ebr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/endian.h b/usr.bin/mkimg/endian.h index e9dc2b44b9b7..98e699bee855 100644 --- a/usr.bin/mkimg/endian.h +++ b/usr.bin/mkimg/endian.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2002 Thomas Moestl * All rights reserved. * diff --git a/usr.bin/mkimg/format.c b/usr.bin/mkimg/format.c index 6730c22ca153..97e580cd8ca2 100644 --- a/usr.bin/mkimg/format.c +++ b/usr.bin/mkimg/format.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/format.h b/usr.bin/mkimg/format.h index 304af4586da8..db1ea764ced2 100644 --- a/usr.bin/mkimg/format.h +++ b/usr.bin/mkimg/format.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index ed3f008c394f..ce817ea10ed2 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/image.c b/usr.bin/mkimg/image.c index 07aaf1a6c0ea..90817206e317 100644 --- a/usr.bin/mkimg/image.c +++ b/usr.bin/mkimg/image.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/image.h b/usr.bin/mkimg/image.h index 53dd3dc2df8a..956fe3f27556 100644 --- a/usr.bin/mkimg/image.h +++ b/usr.bin/mkimg/image.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mbr.c b/usr.bin/mkimg/mbr.c index 7bda01c72e6a..cc5bd51bd7e5 100644 --- a/usr.bin/mkimg/mbr.c +++ b/usr.bin/mkimg/mbr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index 8f3a5d879bbb..c625b49dc29a 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mkimg.h b/usr.bin/mkimg/mkimg.h index aa0ec2a8d944..13ca7aab36fb 100644 --- a/usr.bin/mkimg/mkimg.h +++ b/usr.bin/mkimg/mkimg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/qcow.c b/usr.bin/mkimg/qcow.c index 2dc3e5498420..6e67cbaa0887 100644 --- a/usr.bin/mkimg/qcow.c +++ b/usr.bin/mkimg/qcow.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/raw.c b/usr.bin/mkimg/raw.c index 2de674b908ac..b68c5f06b3c4 100644 --- a/usr.bin/mkimg/raw.c +++ b/usr.bin/mkimg/raw.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c index 85ed94013e8d..80ff456a709f 100644 --- a/usr.bin/mkimg/scheme.c +++ b/usr.bin/mkimg/scheme.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h index 52614255595f..1c234b86d66c 100644 --- a/usr.bin/mkimg/scheme.h +++ b/usr.bin/mkimg/scheme.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/uuid.c b/usr.bin/mkimg/uuid.c index 885a6c36b522..da99c33109e3 100644 --- a/usr.bin/mkimg/uuid.c +++ b/usr.bin/mkimg/uuid.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c index c0fe45ab416e..09d3cfab4dcc 100644 --- a/usr.bin/mkimg/vhd.c +++ b/usr.bin/mkimg/vhd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014, 2015 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/vhdx.c b/usr.bin/mkimg/vhdx.c index e280250bd964..6ecdfe8e13e9 100644 --- a/usr.bin/mkimg/vhdx.c +++ b/usr.bin/mkimg/vhdx.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2020 Oleksandr Tymoshenko * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c index 132eb801387a..79ef256df223 100644 --- a/usr.bin/mkimg/vmdk.c +++ b/usr.bin/mkimg/vmdk.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * From nobody Thu Feb 19 13:28:34 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGvN24Zzjz6RH1D for ; Thu, 19 Feb 2026 13:28: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 4fGvN23Vrkz3fJC for ; Thu, 19 Feb 2026 13:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771507714; 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=8GIiUQZvtzOJQ7j758d6UqLD4oG1mntvEjul3/ORotM=; b=T33nWfU5yN0UPQc+jUibpvS8ZTqsNh3bSCt6ZBmW7gc+V1erFYIPjKdymkP3bVaUqleST/ BGKXa2LjTzUQrnbwBJhrtBKXTbH3SxJ+2Pmh9dIcYChQUCsX4X8kI77ajSHpTLwCgWwt+0 LtuM0T9gaKHnGRT/DWm24b3IN0YhSk/GaN/lHEQJI1mkNyR0jdpCpYbR9Ly1z2NYwnDgIG yHFEBQlvct5/RBD3CneLcbKDzoS8EMjQIiOnZx1C1wkYL/5G+QDKqGvd/fsaa5sIlrxHwU RqIRfAmzFCci3JTeYVdKCWMrgCma7FE+IixhzQ2jIr4OwQY6hZdwKLol2Ryzew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771507714; a=rsa-sha256; cv=none; b=GFKGjHDSZHHeiDanyhSG8O+nojo0r1NxsH8jTkK7sgLVin7OKYdvTKIdGezy13XmLOc/2d n2lTFdrB0NEf+xJL/gyd7ZOiyOc1DzJaADzgs+jAMsJsvBH+IrtG6BYzOgCe8HC6O/u76F cJ9io/VrcjuE2YhK9VpfH6qoHnJeqco8meSCWlrSkYStxt/kZRnDFOg7SCkwV8oD+klug9 /yewLTE9LOWQhKTSiB8YUKw3ppNrmX2FuOkcLA1N18uRLRb27xgrZfSUoQx8EI6oKMeKRR 2q5acIthpzDxx9JEjE7QAfOENAKntJp+pzShP3ZgFosbmosmIkE2deIJZgFjcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771507714; 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=8GIiUQZvtzOJQ7j758d6UqLD4oG1mntvEjul3/ORotM=; b=uQTiT8H5zjY84uo151tYVJhFar5fJ1XH+/rjnJy2PokdJOywaKL2ykHbCNvYbSJDReToKT m/6HTDzH0dEBbk1FfVju9kyp5BFwManUPPR+S5RtcGH3kRgaq2gAs7fUjQD/cEyrYaHw4b y9Px0JUSBU/Gj61h/lfgh07nlt19QTGy0xsoWZKmuL0yizarOcKYFqfTRjQWNxfzCc8ZoX FqOLCpUVbNuiIVLrPGVJh9L28yFIYC/q2VE26A10KxSIhGql3p/0s7i0MpDRLuvtxd5c8l k2WFWsFyFBcsvPbbLU56FDzw6CmnqwnGUJvuUoxww8v6d0CKtgCmFCURpqG1sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGvN22pNFzjyB for ; Thu, 19 Feb 2026 13:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e552 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:28:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 878cee8d9b9b - main - diff: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 878cee8d9b9b4c7c5530b0960306c04b1b691325 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:28:34 +0000 Message-Id: <69971002.3e552.3e699456@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=878cee8d9b9b4c7c5530b0960306c04b1b691325 commit 878cee8d9b9b4c7c5530b0960306c04b1b691325 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:26:19 +0000 Commit: Ed Maste CommitDate: 2026-02-19 13:25:40 +0000 diff: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.bin/diff/diff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index 4bea23db1ab8..fe41e8746f4d 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -1,6 +1,8 @@ /* $OpenBSD: diff.h,v 1.34 2020/11/01 18:16:08 jcs Exp $ */ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * From nobody Thu Feb 19 13:28:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGvN40mNFz6RH5R for ; Thu, 19 Feb 2026 13:28: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 4fGvN35RYhz3fFq for ; Thu, 19 Feb 2026 13:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771507715; 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=Ib8hj6mXnF1WTgFbfu+Ao7WhK9Mfytswv1YTgr9fY3Y=; b=Td4gidf+ba3LL3z0YdHk4FmfMPr4XQ0WrXN+x8Sf9vDegvhNAJ1/imXtoOcXG9+LHDUZjU kF4/8gHctOr5ThCMv8hUM+V7xm5j2FW16JY7sTvsrWnAMpTogswLSjkKq5BV9Z+oFg8Kvy kbTXGoBNKJBc60iCCiRrMOYzpvS7fDGVsbZhniKDAUkdqQp1nvMhjda+F7Mjv4lHkL2fyY 3wt+4LPgdiFROGgE94TNi8wB94MlYgD1icTbiHtDmLG9OW0oo0r670KM6yjfs2ldk0w7kc 9LWVpgpgbZBIQDQ18fLCo6ivdIWrXJvqQsW7ju0sfiq+FDw3g3lDLvkXjNX1+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771507715; a=rsa-sha256; cv=none; b=juoAibFIGlgISqDqZ+UMYPpkx1tzWz63Zrdge7oLk/SIQQf3HGaHK0ijE6mPC8sR3merFn THsiwmRln7nJWS5x+OUbxbJBEETNa+n7G2v6+yS+VNVk0qeEPJPgPqeJz1+e4pdxq/NFeO uW9J08wlCmSRnzhJMu7wBLbjUt7ErAZkel43GcGHMIHVfqvDY69ETEGouiDVR2AawTGDCU FkpnAgX9KMFiKYBogJxDR9LNH5bTKtCXkSShFlx7cfJUZLKheqMPEQItvoouVvsHepy1GE jXonukny4Qk0BjDiA990vU3EccQCM2HTnt6YI2UdIOTaLv/l0AuFVAUnERY9gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771507715; 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=Ib8hj6mXnF1WTgFbfu+Ao7WhK9Mfytswv1YTgr9fY3Y=; b=lr65L8hpvj27g5bht7lfd0XkHDuyCjJzEAhEUierTjnCHnOL4UXYgQkPBgWRAu4cBi4LcN yQ7EW0uKKXN2LM0Wrc3g803IUqKBiU6Z0qq8A63ERxUOc8xEDB+xvyHfeRTCu79uN+31NR qbJ/odDplxj0tInGEQYmMAft2KKtkLQ3NOUIVuM59oW/iRq11/pN++scehg5YQDcW+Srv3 izg3r3k0nJkNZCGGXLdghB1fDElCdvKzwM0JHcKtR+T5SDVBVcB8X31VbJX3BXo++N/SOG +5c0T9LVh3XNBGSGgAmct7UDhBlGLIrijHhNIfMPKJvEoV8k0k2FYh/w4kh4+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 4fGvN33X7gzkyH for ; Thu, 19 Feb 2026 13:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f8bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:28:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 2d1c5f43a2a5 - main - etdump: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d1c5f43a2a5a4d3021530c7048e72f39b2ab8d0 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:28:35 +0000 Message-Id: <69971003.3f8bf.7b04f3ee@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2d1c5f43a2a5a4d3021530c7048e72f39b2ab8d0 commit 2d1c5f43a2a5a4d3021530c7048e72f39b2ab8d0 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:27:55 +0000 Commit: Ed Maste CommitDate: 2026-02-19 13:27:23 +0000 etdump: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.bin/etdump/etdump.c | 2 ++ usr.bin/etdump/etdump.h | 2 ++ usr.bin/etdump/output_shell.c | 2 ++ usr.bin/etdump/output_text.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c index 6c4a256e15f5..dce2d70bf0ec 100644 --- a/usr.bin/etdump/etdump.c +++ b/usr.bin/etdump/etdump.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2018 iXsystems, Inc. * All rights reserved. * diff --git a/usr.bin/etdump/etdump.h b/usr.bin/etdump/etdump.h index c61070d05018..8e4acc13dd77 100644 --- a/usr.bin/etdump/etdump.h +++ b/usr.bin/etdump/etdump.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2018 iXsystems, Inc. * All rights reserved. * diff --git a/usr.bin/etdump/output_shell.c b/usr.bin/etdump/output_shell.c index d709684c02dc..1d5ec4af998b 100644 --- a/usr.bin/etdump/output_shell.c +++ b/usr.bin/etdump/output_shell.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2018 iXsystems, Inc. * All rights reserved. * diff --git a/usr.bin/etdump/output_text.c b/usr.bin/etdump/output_text.c index aafc6d702a54..b538a2097a31 100644 --- a/usr.bin/etdump/output_text.c +++ b/usr.bin/etdump/output_text.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2018 iXsystems, Inc. * All rights reserved. * From nobody Thu Feb 19 13:28:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGvN46XwGz6RH2y for ; Thu, 19 Feb 2026 13:28: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 4fGvN44k3fz3fG2 for ; Thu, 19 Feb 2026 13:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771507716; 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=D25GxtXWYwBNA6YeueJUupvw2ZUXQmLklOjbIDcOFZ8=; b=QNsYCUwNhQlgv5zsH0ft3l/H1HoW6io81DyzGGCoyn4sSPj8gvq6y4NIA4Dn4L1Y3M7VPi 6EBrPEJINmF5OFu4Ezqi4Ql72KPmDgm4gVMXhuWS+VLc0hDeuF5tMBMFNjcZeQRm6ynUAK RvSvFrEYH3U8MXiDlsT35phklxlANR8lbQg585k5aslgHp1eMPufrb9Kn44ISzhgCFdxPe hGzDbe9b1PXSR1JOo/KG0+SKckDZnnTkIQR0jQwa/s1DSSfPHl6KpxFE2ZadzDpofbLBn9 pfdAXVZxUj9CIWeZ9WjUJXCOG4sNxwis4vvUEvP9Nl00E9xwXYurTFFBhyKfjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771507716; a=rsa-sha256; cv=none; b=g6PIq5XVx4wChz7fO3NXDLh8YmPT4E3BKvqAyGLmKxdtUrMgXlkj/7LC+yvXamvyGXJ3U3 HQLM+GzCJ29oA47lmq99aZLDNyRK9B3Nl2umT4WruLd6RA3+jYxqA6+ZllDpiZY7Y0p70e IQ//9X8bj4f7xJY4PgP73/nAOJnHFnNy/XHF1Qr38C0MoBj4itJ++Lng9Lkmu5whCIr9nL Q6cp1Hr8XAQpwK96h0g4/aj5L44iZf2sYsUoxXAUOqEP/cR2zGwQ3EUVb5KgzSIP3puiJ/ mUAILx7TJbAo0Y5mzvB2b/1gpwUj3A1opKc9MCAxcgWzGdw3/MMcaesUP/t6Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771507716; 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=D25GxtXWYwBNA6YeueJUupvw2ZUXQmLklOjbIDcOFZ8=; b=RnwAl9tIEOlBJhdfen7/40CanutsJyR+FAg/TdRuvLnT7k9yT4F+SjSj/WkxEQoJj+VSEw J45dzne+x3Q5E6wuRGt1K/Na/k4nPCxrTOAZ14900cV1Vc474+OI8FpaoF9zuGnaKe+rXA X3a329wo0qNPhnjGC0zCEGHz+22hiHadv8gJ3hZIBtTkvMHjUGLAQLtu2JQncBqJf5mvU/ X8cK7QuDCelvWrLgF6CyeRpc6wzc+rlO8BFPDbMlejzf2HW1PHmtR5WSpMfdFY9rYWXF04 ImDmIcA/DcUhiUmMDzwfrCsm2TmBYzUETPoO1L6u/0PWKDiFkRTQUFPL7ofTkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGvN44GbzzlCT for ; Thu, 19 Feb 2026 13:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ebc3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:28:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: c33076859fa3 - main - resizewin: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c33076859fa319396beb10470ad4101f1c3c5571 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:28:36 +0000 Message-Id: <69971004.3ebc3.711f7c3e@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c33076859fa319396beb10470ad4101f1c3c5571 commit c33076859fa319396beb10470ad4101f1c3c5571 Author: Tuukka Pasanen AuthorDate: 2026-02-16 08:55:27 +0000 Commit: Ed Maste CommitDate: 2026-02-19 13:27:23 +0000 resizewin: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.bin/resizewin/resizewin.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/resizewin/resizewin.c b/usr.bin/resizewin/resizewin.c index c6fefd79624c..89b91c219de8 100644 --- a/usr.bin/resizewin/resizewin.c +++ b/usr.bin/resizewin/resizewin.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * resizewin * * Query terminal for size and inform the kernel From nobody Thu Feb 19 13:28:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGvN56zgdz6RGxk for ; Thu, 19 Feb 2026 13:28: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 4fGvN55QtFz3fG9 for ; Thu, 19 Feb 2026 13:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771507717; 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=fw4zNuDp2hrKwo02UdVR+sZ6Nhy2h4hZlcbuxPs9j5M=; b=UvKPFMgTIjtQPhAfU9UKuqaey8iYARXq0Ck5tqCr4zE1m2cUeRXk7w2VsSX3TgGcfHaMAy +rSx12HGbCnh4bAMe49MBd9yY+2uHALUyGfzdQk/BEvqyzuFJCjSlPu89MbW8/ybNCu65V 6mU90T0Pkzbdif7EMjaCK/ZLXXUqj28iNsq2dYwisYdzl615EjffZYvEbyY1FYS6/QlrPS zbTOSj8ZgDYLlPC3NUzsHA/9jyTA2dSldTUYyCOucqG0Fp5IThg4eJFpWiEKhPG30jppKL NwJrxSSEPMz5zLN5cL07FBIcUAH5JVEnxvMjh0+DcwN53EaqgVC1AyLkZh2mlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771507717; a=rsa-sha256; cv=none; b=V21iMFz53/QDpVwKXdWq1sB3YFVuiqZ90yEzyYN+tvTAtCExYTUy2HMyDPL8foFhS08nhy JNszytJ+b2EvusrusSm+rMHnO8JvdLBtstG4HvH1sXEVXYJYmiMPZipqUMS6B7p16Pq2dY ZaV11v+xMqZOlxAzl2G5vU425C5SRgqfr24sBRl/0Ewl9SCP3KpSn9UMIefAvn6HxjX4FW iT4cQxIL+hVNeMhU51MXheQCu2cSJiv6g8ejQZNmFcIsgw6Q7Q10hWRkiEGeaJAJU6TPfC CBeIYAMuSxOqSQgP89oTLi5QBHJYDxXQd7uzBLEMKNX9tdhnAA5t/F0p5GCXeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771507717; 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=fw4zNuDp2hrKwo02UdVR+sZ6Nhy2h4hZlcbuxPs9j5M=; b=M2ksW9LHLatKfwQojchWnDeDHq1anwk9KY+M13L1jTg8jgJymCF79kT1AV3PMdWRrCbDpe XBfnLfgUdL42CbJk3XLNYxSIr7R1YWFCuGH0sPV0bhMq51lIP6zj+bxFIDrVZke3rNnVF0 gqVEIa6yd7NY1gwqCm2PIfC1wpwsVYM3S+mgXP+MbXC7nxJANsQhFMTowUX7glgrUpfMJW IOfluwDxU72JyZwp0StZPWZMUXcYGUW+UORfiggmeHPq8LPHRJDvFM+wNk6tEMEQXMNIL3 EnOPeGTTFRGfPp6zTFOBqY83deJOjqD3LLjJ/oNmfMSjQjhscUWgavDXDMJfBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGvN552c3zkyJ for ; Thu, 19 Feb 2026 13:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d76c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 13:28:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: f12a0dca86b5 - main - vtfontcvt: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f12a0dca86b529069a940f09aba796dd4e28c66f Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 13:28:37 +0000 Message-Id: <69971005.3d76c.37c670e3@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f12a0dca86b529069a940f09aba796dd4e28c66f commit f12a0dca86b529069a940f09aba796dd4e28c66f Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:01:58 +0000 Commit: Ed Maste CommitDate: 2026-02-19 13:27:23 +0000 vtfontcvt: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.bin/vtfontcvt/vtfontcvt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c index 773072813d8a..1e388ef36276 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2009, 2014 The FreeBSD Foundation * * This software was developed by Ed Schouten under sponsorship from the From nobody Thu Feb 19 14:01:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGw5r4v0pz6RKXc for ; Thu, 19 Feb 2026 14:01: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 4fGw5r45Ytz3lYZ for ; Thu, 19 Feb 2026 14:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771509680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=myChg2rzVbC1dKi9/d18hEJuUefLN4qCZO2pOBOS85c=; b=SBhZ8eFUahLTA3CujuRJeygSA9/L1dKTxxxgU2aJjU8Lh57rli50bL0AJmCdcF92M7a1G9 GzViwbvGlD2HQet4PgRhul6LKjG7EyJnWuNrL5tg7j0f/LjqtRCIzES8EyD056fQkYXdOY OLK5xoLiZf/ddxlhgxAaHvBQtQlUm6T3+6W3WclugIQSA2FSyajfmpgtG4haew0YZozZeu rkGsV0nDCORR7PU5AOd0IuKMmugpWDM481wxEEORFn3tf5eH2hFbTCOUbXYAl7smOUfDHe +jFQ9RgVqB+bJfFOZKqq2xdde70jw0BjmYikXuKEVr8M2Gh7EPRx7Iu9VEoyVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771509680; a=rsa-sha256; cv=none; b=kdZdk+G+1SNmYFkyEYxkZ5aEBzy8EdF8zyKTdlhE8byWFFpfPZuqQzFZ3CVpw3s2LgzRjq 8eZo8zNA5JGxL2v5zZmiQw2I4dpXhQN+tzSLtnYrSNFmE2nrtYURo4fWDeY1m9SDeHDb+i WRQJpCrgZP5PNUHbrTdpzXZ7debk2p2pQuncJh0wdC7HKBv7HHWeFGunHnFBij8oFvl5A2 yPtQHQE96f+1zU6GTksBpPzpSllE1jDhS+qOMVX4jc4TKNhh+/87jtjaUvNRvi0hvrF23m ktNqg6NZk5wSztIh8Iztden90urvcIOWIhmpmj8k6PelZcItAaKkjL6yuPp0iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771509680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=myChg2rzVbC1dKi9/d18hEJuUefLN4qCZO2pOBOS85c=; b=CPFJ8BZOgbWDUCZY+cuTMfwwbnhqLB7O40ZkCjPEGLYhjwxKn3dFk+raNPGoo7Aptx5XQa RhjdxGDhKy9NGRuneGgsEs65wwIPd04VZ5dkzo1XVGvJNXtoCOqAgm3nUePxGSu13OIb5o vuIZRuxsPOF11gz2AD3CHgQqeRqTOjSsTieWvyX4IZADW5Es48CUpCzcynfBaAfh9ImRRn dvHGcrfZY9BBGdFesa1EKJTxqpg9F3BgF/ar/cy//ziQtX+C3NFu/Iyqlg3W5KYAjpKZ/u dTk6a9da6jTISv6HznG9bxnNSG6vCApKtWuDE3fti47RV1YkUevaKlzoHq2lfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGw5r3S1zzlSv for ; Thu, 19 Feb 2026 14:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c80a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 14:01:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 7e8284c6ad95 - main - iommu_gas: Fix assertion. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e8284c6ad95bb7a0fc84d4d945ee98737efdd36 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 14:01:20 +0000 Message-Id: <699717b0.1c80a.69461d10@gitrepo.freebsd.org> The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8284c6ad95bb7a0fc84d4d945ee98737efdd36 commit 7e8284c6ad95bb7a0fc84d4d945ee98737efdd36 Author: Ruslan Bukin AuthorDate: 2026-02-19 13:56:36 +0000 Commit: Ruslan Bukin CommitDate: 2026-02-19 14:00:12 +0000 iommu_gas: Fix assertion. placeholder entry end changed to 0 in f591287756368 ("iommu_gas: make placeholder entry at the start of the GAS zero size") Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55326 --- sys/dev/iommu/iommu_gas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 80e37341b3dc..306649db445f 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -282,7 +282,7 @@ iommu_gas_fini_domain(struct iommu_domain *domain) entry = RB_MIN(iommu_gas_entries_tree, &domain->rb_root); KASSERT(entry->start == 0, ("start entry start %p", domain)); - KASSERT(entry->end == IOMMU_PAGE_SIZE, ("start entry end %p", domain)); + KASSERT(entry->end == 0, ("start entry end %p", domain)); KASSERT(entry->flags == (IOMMU_MAP_ENTRY_PLACE | IOMMU_MAP_ENTRY_UNMAPPED), ("start entry flags %p", domain)); From nobody Thu Feb 19 14:18:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGwV745P9z6RLsR for ; Thu, 19 Feb 2026 14:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGwV71wsQz3mnf for ; Thu, 19 Feb 2026 14:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771510735; 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=m2dHC32DkR8bvj4brwIv42jSKyo0nGJO77FVBYu/x0A=; b=nDde7r1aFRRY8Yc1Ugi85g8E/O69lHoUuCG+FU7ML7xb+/1dwzclCnIXGYFmoDzXGE5TM1 jaHr4T5AUMPRRFO8ME+UsmbfCfmhviyPTq6G+07sODmvMv9l2NhO0fhioikfNgeLj5SLup VFeuLC7AlDeixKmvvBBy9SupuC79i5EIcJwLCPzyWXbl2SSzUMN4rl7mm3bIvS0k6Qk+b/ H8HmBv8LGlnXNFGsqt47lHNNxP1dSuE7qqn3TAlHwElQEg+F6Rgu7SffFkHP8WGpzli05C cyWw1w8xcut9AqFnrldHpE57kKUNlq24LEFaHhNT0v718oDHM4er8JBBke9l+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771510735; a=rsa-sha256; cv=none; b=Pb5X5b/sTUWOrBhU2CQhvY/r3fcnhFdglhGnSWqtzRFeVpbSegix55blh2WEFcsWpg2GMy pyhR4r5hz65bpITOLRndJnnQM8DvnsM025wQ7YeCABFjT72Fcl9KTJpNzrfE4gSmZRgrCG cET15drUpIQMdcOns66TZ3q7fSLPQsPMq5YQqN/yLhRcHe6wUmuZheBKNYkx4rSoJ140hS s5TwepHbWOUDyQqDELi3XSiXQjLFvYrkGZPGDJBqZ4mXK2hVGun6BYJeX/nz5P7HIsKq66 DJn1LG/DkTH0/U7WK+Ty/u3KIcRafshcr4Ag3r8uP3PkyPIO7TFShXTavG+I7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771510735; 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=m2dHC32DkR8bvj4brwIv42jSKyo0nGJO77FVBYu/x0A=; b=fPuAWMwpyWQ/8nBBB2BA9GCR9UEeMvhA5C6CzWsqdARKp4moOw9em/PGLp90/4g/TgAxnZ KAn0MIWaffw4VYJgxZnduJ/HGOom3ZB0B8kaHEe9o+CKEkjfmylGRKO01gXFEsb5DV3wmn qc9onLfktVQhZF7yWY8iRoL3mWIs3njKu7wn8igbYnoqzqQ9IXTxulOfurc0d7Z70bUkoJ 7xDxMqgekW2RyORXBEiOp/bmG/EzvqonpM7NAOb7w2BEkbS+XQOs9aVtS+Ix/YUQJ/Xd7V wIGWDwoA7fLwi3VuA65mH/0vDKvvkcOlkyG/6b7Ky2a1A3Y+kJ01AEknTe1fIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGwV70tdNzltC for ; Thu, 19 Feb 2026 14:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d810 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 14:18:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: ac8189e6de8f - main - ypserv: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac8189e6de8fb5de31d5b662f1d406f27285ac74 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 14:18:55 +0000 Message-Id: <69971bcf.1d810.4274bbf0@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ac8189e6de8fb5de31d5b662f1d406f27285ac74 commit ac8189e6de8fb5de31d5b662f1d406f27285ac74 Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:46:12 +0000 Commit: Ed Maste CommitDate: 2026-02-19 14:08:08 +0000 ypserv: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.sbin/ypserv/common/yplib_host.c | 2 ++ usr.sbin/ypserv/common/yplib_host.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c index 2751c5950d87..a3eb6744f27f 100644 --- a/usr.sbin/ypserv/common/yplib_host.c +++ b/usr.sbin/ypserv/common/yplib_host.c @@ -1,6 +1,8 @@ /* $OpenBSD: yplib_host.c,v 1.18 2015/01/16 06:40:22 deraadt Exp $ */ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1992, 1993 Theo de Raadt * All rights reserved. * diff --git a/usr.sbin/ypserv/common/yplib_host.h b/usr.sbin/ypserv/common/yplib_host.h index eabafae9c1b9..db470dd299e0 100644 --- a/usr.sbin/ypserv/common/yplib_host.h +++ b/usr.sbin/ypserv/common/yplib_host.h @@ -1,6 +1,8 @@ /* $OpenBSD: yplib_host.h,v 1.8 2003/06/02 04:12:38 deraadt Exp $ */ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1992, 1993 Theo de Raadt * All rights reserved. * From nobody Thu Feb 19 14:21:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGwXr50yGz6RM4J for ; Thu, 19 Feb 2026 14:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGwXr3kd4z3npq for ; Thu, 19 Feb 2026 14:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771510876; 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=gYcwbJ/r3V9QZMAtbVMbYSHQwsUNfdi/JmrPgQnnIb4=; b=OOKME4R9cO1rmptpAVGmw+UkuePrS/day6Tyn7l9tzhp/YPEsMg4uANPS5jp7iM9mFFW/8 Pog8S5AhaTIpTb7Jg/Zht8qbtoO0WCnV77wgX9eT9Li9zu/z/1Jii1V6Dsan1F00ts2MHf uS6qlb8wPBhi3GL4gL2rzaoy9xqVUE4cxrkY/rYQOz8/0njm5rBjEXECGoPnXSl8jOr8S8 58I7NJacg/pBSY3jAadlxVo4bgXpK1v9488eynI8sR6aAWIK9ZBUeV47ZcucU8d6WT7Pne e1DH7IkQC392WdWJw+m3NcAZmTI2bhzo1C68dnzBs14tZqvTry2x6KBWcroxeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771510876; a=rsa-sha256; cv=none; b=JfsujmvvUhH5u3VJ5HFhsDPfjQkD0173t8W/4HiezeNbZyVF9g2IOYlqdP4zRAkrTMsspc UZxqeUDz9IQaCbggmeulJ7cv3pf7rbjXpTNSj2kqcZTSgQdvg80NtKmOjeiJcKEoP1498h jsw/1UKRlVxYbnWGKSenkh+ygXaECUcsBryhOwUGo7znkU+CoU+2T6eZLU0rSmY3q/EBUN 0L/bCwVl1zJ1Mp+8FpSUHOCItx1tPQ774DMqG5Pyuod4Bw9803/SMhgi2cj+z+Jg99k/Qt XGSw0XeS9wlNPJ6D5prgRhZJrW4l6YTyMP7D5hfFRoJRucFPH0v0U7oiN9wAGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771510876; 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=gYcwbJ/r3V9QZMAtbVMbYSHQwsUNfdi/JmrPgQnnIb4=; b=L5shZgyjftbqHElFmWjOjs/IB53XUszp8g12IMxtkg1r7mCPdSvirwuflZoxypWhtKrojz 6Q45PY6+fsheUDmufB2SmSdgiD/quYnPNbP+RjbeF//zRBffB2mXMGLRje6Ubd0PsGlxOY m3YvjVFMo4nDwdBlmurq6GTQBZA+bmv/1t/Gc7d5iHTd8e1jZzDIaunTBXBYH0PtggniOk ZnMi4j2IkaU0m9ano1zKg+alHWA+ssjsBicVoolG8GE5XBkAfHE64kZMo9EbsqXMbqbNu3 lnFFcmZJDZ5GlmUdCnrF6pdahJUMHP6sRQQj5hfVl74bXpcVIuhZiJpG2sOzcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGwXr30wNzmRB for ; Thu, 19 Feb 2026 14:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d8c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 14:21:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: ada4dc77577f - main - icmp6: clear csum_flags on mbuf reuse List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ada4dc77577f7162353e8c2916ba5c258b6210f0 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 14:21:16 +0000 Message-Id: <69971c5c.1d8c4.55273d28@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ada4dc77577f7162353e8c2916ba5c258b6210f0 commit ada4dc77577f7162353e8c2916ba5c258b6210f0 Author: Timo Völker AuthorDate: 2026-02-19 14:15:10 +0000 Commit: Michael Tuexen CommitDate: 2026-02-19 14:21:01 +0000 icmp6: clear csum_flags on mbuf reuse When icmp6 sends an ICMPv6 message, it reuses the mbuf of the packet that triggered the ICMPv6 message and prepends an IPv6 and ICMPv6 header. For a locally generated packet with checksum offloading, the mbuf still has csum_flags set indicating that a SCTP/TCP/UDP checksum has to be computed and inserted. Since this not the case anymore, csum_flags need to be cleared. PR: 293227 Reviewed by: kp, zlei, tuexen MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55367 --- sys/netinet6/icmp6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 5b5f7b83623e..7fe18f4a4d2b 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2133,6 +2133,7 @@ icmp6_reflect(struct mbuf *m, size_t off) m->m_flags &= ~(M_BCAST|M_MCAST); m->m_pkthdr.rcvif = NULL; + m->m_pkthdr.csum_flags = 0; ip6_output(m, NULL, NULL, 0, NULL, &outif, NULL); if (outif) icmp6_ifoutstat_inc(outif, type, code); From nobody Thu Feb 19 15:07:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGxZh0WQCz6RQkr for ; Thu, 19 Feb 2026 15:07: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 4fGxZg5Vv4z3snx for ; Thu, 19 Feb 2026 15:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513675; 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=Kiz9PxoYwgGcJLd1lwWgqzua7EWmgYqnzTan0y6ap9Q=; b=IFUK1Zc7ExLZZ2YB34OO0AGvhQRD+XKeDaWtJwAVPQr4ClcfWR/TwHJAqWRLZxsLqACi9P Q2PLHSzdPbhBL2kZRjcrGomV9aKxyX9orWOWHakSBt9KQvn593ikVp8PcS+00rl3o9gyQb Qs4L5xB9QQWh6bwZfcQBhDfu43mf5aemXHfepPAIAHUQG5x6NfYdhsfkOgzPF9sVPVIPW/ VIL5Fr9l14ZcDkFQzrXx/UhfxdxR9xgbMTKF4KKPY0jWlgrs8Yag4OSTo1twS4mj/8n9bp KbOo5gCMeduiRn5ErdC6RdIByNKxWGrGEi2reuKQa5pmq0N8I0aap2vsWbxQ/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771513675; a=rsa-sha256; cv=none; b=QYHF+2m+EW4AnIu3BEd2tZIXK1VfIAE0Ch1ljBq/a2i0lt/QRuqh7CUrEx9Uw/GjwccDPq 0CaUziaLV0ZB6zL3upufqtbL1meAychMOfiZF2vBt+qYAAfCDM4nBQQpUpsSvTa5idZM+1 TngZGc3f4+MDanDZrTmvD5XaYFdvGXgJBTbp1yvv++0mu8W9nSueCmFpdBMVvTwH6mYzbC 5/0xSnyq9x2A0Vw8Yj9y3X6UURGCBcswus/N/7UYOTurawCIni/AaVRqmUzVqOvEQo2Mcp +N6eFS3exFRv52bPZVungHIMvNURiinbFNqX04WzZUzIKwtholZHx+NYpHh8lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513675; 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=Kiz9PxoYwgGcJLd1lwWgqzua7EWmgYqnzTan0y6ap9Q=; b=IzwUEXkyGDi+2zJDU01S7ko4bDfw5bVkZ9k5tPcOy5a/qGTLMGym58gAeizh1N3n3Ayk4U 3QEwVIhMbtVHs2CQ7iF4ZHnLdMnqasfohPjrpvzkV57q1mNVoPLiGlwDN7f4lIERMmynF5 /sJqBVS/BLKVxK5J3/pXx6H2Al7aNn5lqm80p1cciLLvDTaElBXPOKBY1qzVWaw3IW7JWC n+7nNf6P+tunB4htJCwVq96q7AmG+QVHG4PunsFd9CeTSt0v3tqL17evUxt0H0NiLwMlAA iKjd+jnjU8nqkwxfP8U/St3cCJDX9JxC5nGgfNrjrSeHmNkUj+zdqld2rghhHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGxZg4LpWznNm for ; Thu, 19 Feb 2026 15:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22ca1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 15:07:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: d6bec77ad8f8 - main - yppush: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6bec77ad8f80438f10bb3fe7a8bc8e9265e2858 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 15:07:55 +0000 Message-Id: <6997274b.22ca1.13b0230a@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d6bec77ad8f80438f10bb3fe7a8bc8e9265e2858 commit d6bec77ad8f80438f10bb3fe7a8bc8e9265e2858 Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:45:25 +0000 Commit: Ed Maste CommitDate: 2026-02-19 15:06:30 +0000 yppush: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.sbin/yppush/yppush_extern.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/yppush/yppush_extern.h b/usr.sbin/yppush/yppush_extern.h index 9220f0de05a8..3fd8a0114ca7 100644 --- a/usr.sbin/yppush/yppush_extern.h +++ b/usr.sbin/yppush/yppush_extern.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1995 * Bill Paul . All rights reserved. * From nobody Thu Feb 19 15:07:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGxZj0lyHz6RQWs for ; Thu, 19 Feb 2026 15:07: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 4fGxZh5wczz3sgt for ; Thu, 19 Feb 2026 15:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513676; 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=b04eA56LCtM8EtHoewe6pmwOo3QQN1HI+4nB3YLCuJk=; b=u802wl4nj+A/ULmUH7+X24oNKi7m3njoIpYHi34agD5dh2+NS/OOk4lLCIe6gh5dudQu2q wc3XznmqQgNT4CKzjqDX39vDIAAOP6+RJ7E1xPGv0TQfZqoKS7OlgIfYdGp4sWyTsEuQru ASlMnmGUac24MQfcGq7n/Fy6ElmQ9wF3AnFhMoWMkq2XrI2K6mxWC0NrL0zdwI68a8ZEDQ mRxvACDdnSKj7ZCIInzL/5trq2TvLdrc1O7+x8BHtEArPAVmd4cgQSXiwtKSwL4u5ahGVu CtfYV02lOZgBze8J+tNQTcqaErITV4kz3mkstsorOo2kv8ASz4KsCuplXxwCUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771513676; a=rsa-sha256; cv=none; b=MSJeKLyaKW/DXAz6Jw7Yaty3qtkQ0ogxqXin21BgmrWZYyNwtO4thlkazHLj3W7O7aUk7b vETocp0YPNh+Mo8yEevMXZQu89ej72iexyBy+B+gb4zo42v0DRUpc3LVoB0gY/5QuRadC8 G88m9qNbXblo5kW+xrDRMXOEr+2LcQyyFPVyDl/hhHSj3S8C9MmY6pxOy5RxaUjHCIDLbZ s/V5F5CbISH4j5xw7QfrhvsPKLxU11/4q++VvQKP79ZLhjn0w3DCt7BLCb5dEt3QAJ0eVL 27woPjDuXcxEqikZXAWph5E0sdYZaRKzYNA1m/i4cC8wyVqEINb1v6xFQvL5Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513676; 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=b04eA56LCtM8EtHoewe6pmwOo3QQN1HI+4nB3YLCuJk=; b=VqPdw3MajWhs6tLdT9ZtAzERBAHIa3KlcZTciSfYoHj/KabNW5Vf5ia9Ecaxmvef2N5pH/ mtYq/3f6MoOwmkffEXkm5csMLgAf6eDPlPzzMrJYutKRyjRuzSGVXD6GBIFsLknCIKdnOu 5BX2lwDLgmNG01zsnUiCjic1gK2nU8FgFSr5Ku2IgnF0KpEBBW58qdEhbipTADYpCR5oG0 UtlPWYq2CTs0CMHwSxb7Msct8eV7MttYZJe1ZaFl6k94cOAfv8uNcou9xrIA4rrfxq16vt XcqQnHrRSgZi2qWfO6wXUh2k9ST1L7sWHDbjG2egt/Wk1Wkd2gYo3HhQ8Pn5Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGxZh571Wznfb for ; Thu, 19 Feb 2026 15:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21ddd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 15:07:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 6d5a428056b5 - main - virtual_oss: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d5a428056b52c7ce47b01d6af8aaaff6feecfdd Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 15:07:56 +0000 Message-Id: <6997274c.21ddd.4c28c9cc@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6d5a428056b52c7ce47b01d6af8aaaff6feecfdd commit 6d5a428056b52c7ce47b01d6af8aaaff6feecfdd Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:43:58 +0000 Commit: Ed Maste CommitDate: 2026-02-19 15:07:05 +0000 virtual_oss: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.sbin/virtual_oss/virtual_bt_speaker/bt_speaker.c | 2 ++ usr.sbin/virtual_oss/virtual_equalizer/equalizer.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/audio_delay.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/backend.h | 2 ++ usr.sbin/virtual_oss/virtual_oss/compressor.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/ctl.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/eq.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/format.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/httpd.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/int.h | 2 ++ usr.sbin/virtual_oss/virtual_oss/main.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/mul.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/ring.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/virtual_oss.c | 2 ++ usr.sbin/virtual_oss/virtual_oss/virtual_oss.h | 2 ++ usr.sbin/virtual_oss/virtual_oss_cmd/command.c | 2 ++ 16 files changed, 32 insertions(+) diff --git a/usr.sbin/virtual_oss/virtual_bt_speaker/bt_speaker.c b/usr.sbin/virtual_oss/virtual_bt_speaker/bt_speaker.c index 0e406cccca21..f2785fdbce4d 100644 --- a/usr.sbin/virtual_oss/virtual_bt_speaker/bt_speaker.c +++ b/usr.sbin/virtual_oss/virtual_bt_speaker/bt_speaker.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2019 Google LLC, written by Richard Kralovic * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_equalizer/equalizer.c b/usr.sbin/virtual_oss/virtual_equalizer/equalizer.c index d1682186084d..fffb09b8c863 100644 --- a/usr.sbin/virtual_oss/virtual_equalizer/equalizer.c +++ b/usr.sbin/virtual_oss/virtual_equalizer/equalizer.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2019 Google LLC, written by Richard Kralovic * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/audio_delay.c b/usr.sbin/virtual_oss/virtual_oss/audio_delay.c index a69f448354fd..36a5d62ec9ff 100644 --- a/usr.sbin/virtual_oss/virtual_oss/audio_delay.c +++ b/usr.sbin/virtual_oss/virtual_oss/audio_delay.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/backend.h b/usr.sbin/virtual_oss/virtual_oss/backend.h index d7453f3db89e..e002642d2a1d 100644 --- a/usr.sbin/virtual_oss/virtual_oss/backend.h +++ b/usr.sbin/virtual_oss/virtual_oss/backend.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/compressor.c b/usr.sbin/virtual_oss/virtual_oss/compressor.c index 4a92a38eceaa..716a6e2c65b1 100644 --- a/usr.sbin/virtual_oss/virtual_oss/compressor.c +++ b/usr.sbin/virtual_oss/virtual_oss/compressor.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2020 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/ctl.c b/usr.sbin/virtual_oss/virtual_oss/ctl.c index 4a445a59db59..3c77cc70281b 100644 --- a/usr.sbin/virtual_oss/virtual_oss/ctl.c +++ b/usr.sbin/virtual_oss/virtual_oss/ctl.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2012-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/eq.c b/usr.sbin/virtual_oss/virtual_oss/eq.c index a02b48a9f039..1893b30c26bf 100644 --- a/usr.sbin/virtual_oss/virtual_oss/eq.c +++ b/usr.sbin/virtual_oss/virtual_oss/eq.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2021 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/format.c b/usr.sbin/virtual_oss/virtual_oss/format.c index d32d0c726510..a51a54a4cea7 100644 --- a/usr.sbin/virtual_oss/virtual_oss/format.c +++ b/usr.sbin/virtual_oss/virtual_oss/format.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2012-2020 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/httpd.c b/usr.sbin/virtual_oss/virtual_oss/httpd.c index dc5d6036f39d..0a13350a114a 100644 --- a/usr.sbin/virtual_oss/virtual_oss/httpd.c +++ b/usr.sbin/virtual_oss/virtual_oss/httpd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2020 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/int.h b/usr.sbin/virtual_oss/virtual_oss/int.h index 69a943832074..974f1a51f573 100644 --- a/usr.sbin/virtual_oss/virtual_oss/int.h +++ b/usr.sbin/virtual_oss/virtual_oss/int.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2012-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index 28095880c201..6c5ba8112c8b 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2012-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/mul.c b/usr.sbin/virtual_oss/virtual_oss/mul.c index 76cb570eef74..116c112a38e4 100644 --- a/usr.sbin/virtual_oss/virtual_oss/mul.c +++ b/usr.sbin/virtual_oss/virtual_oss/mul.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/ring.c b/usr.sbin/virtual_oss/virtual_oss/ring.c index 3c97bdfc2e84..bc944e5a0878 100644 --- a/usr.sbin/virtual_oss/virtual_oss/ring.c +++ b/usr.sbin/virtual_oss/virtual_oss/ring.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2018 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c index 891653494f06..a663f029ef17 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2012-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.h b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.h index 616de2e1abd0..4375fd51c095 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.h +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2012-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/virtual_oss/virtual_oss_cmd/command.c b/usr.sbin/virtual_oss/virtual_oss_cmd/command.c index 64781992ddfd..6f1491470e54 100644 --- a/usr.sbin/virtual_oss/virtual_oss_cmd/command.c +++ b/usr.sbin/virtual_oss/virtual_oss_cmd/command.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2021-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without From nobody Thu Feb 19 15:10:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf03z16z6RQZy for ; Thu, 19 Feb 2026 15:10: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 4fGxf01SFRz3tbS for ; Thu, 19 Feb 2026 15:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OY4sxJkO0v7cnEntzM/+tlK2qgz+aZjKR1CmFqQb9dI=; b=Q/vKWsvULbzXgVkkAe5BMjF70FEqMIYBGL5Hk2J44rt67g2O+ql7mp3KUTKxVex/MUCW7J unHUk8lXyZJQg9207lva9v14Wql/H2o86BiwYfAo8oGT1hbqYrqR9sgQPKSyE+rAcUVtEL n8zj3w7GUInDK9SzzXQS/ipNPh7laAjy1V83I1H6QRU6E5KENhDvX26TlWeTntLZWy3U0i 82wrSwjfyGjSbb9cdP8AhtDpmeJX8Gut77plM28RtcCKxHMT1IhWN15hcLVWXYSJKo8GW8 mOBU0WizowmrkaeS2dzJSu/s+2kBCQ9dv3OsFWhNNJCOAe2vR1w4TmfLGXZwkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771513848; a=rsa-sha256; cv=none; b=qk+hpE5vN5UopvNSY8VL3nHKkl04eVRk+DKvBXab7Efs8d+rFEZnotwddoCzGKWJ8hOla4 nn24+ksHI5wq8vObNvyAJGRcjGscDS3Kr+ArfWXU2HYLul3np/y+0zdoxPFSl3SsVmrnKi mZYj91P/TfTrhSn4PCs1/2HyDRueok9hKOMLsrNHG4g58WU0ukTsiKmSoBMEog7pbsqCv9 XQAy5cSTz1MJmyOPv6KxugkX3zx+sd2oigKrTTKDGunl0WWKaAJCzy8DRIbHub0v1u3Puy oNTFF4F/uVS26qQbyi8IqYn0bt2tBir3IIblOh7GHR2SO/4AXFhwhW+j1bOrPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OY4sxJkO0v7cnEntzM/+tlK2qgz+aZjKR1CmFqQb9dI=; b=BnlhgrYRwJB03nrUN7SsIfgQ34iQproKZDKYNMtfil3mPtsx1nYlOgDPM4kU4FIiH5aM19 ot/+PVToDcSsHo3as3bUq+jTBEdufYn4It+NDQnNsfC990divufFAozChAjAYyVDb30ZSe Y9+spVGbFrSNpTigrKmj7OgJZHS4WG7bOr+AW5Op0V+OLS1i1Y2LIq/rJyOuS8HrHAVazX 2pEIb+hVj5XaI9yFWXbBIv3OLJkNrzHKOfq6eXg4HK3ets3+bA2hhoETKpZshsp4Cj7Egb OuGvxQhX4TOw1HtaWp5RMsXfg8b/nM3LndJl5IG5IFXQTDfL69tcwdrGbPRwEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf00cgPznY2 for ; Thu, 19 Feb 2026 15:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24083 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 15:10:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 1e1892795764 - main - .github: support all stable branches List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e189279576497498cafad6f8c0a36a377b786a3 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 15:10:48 +0000 Message-Id: <699727f8.24083.2e4ce4d4@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=1e189279576497498cafad6f8c0a36a377b786a3 commit 1e189279576497498cafad6f8c0a36a377b786a3 Author: Brooks Davis AuthorDate: 2026-02-19 14:43:57 +0000 Commit: Brooks Davis CommitDate: 2026-02-19 15:10:32 +0000 .github: support all stable branches If this eventually poses a problem for unsupported branches we can fix them directly. Sponsored by: Innovate UK Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53838 --- .github/workflows/cross-bootstrap-tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index a99c3d31f2f1..d8893a6ecff8 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -2,7 +2,7 @@ name: Cross-build Kernel on: push: - branches: [ main, 'stable/14', 'stable/13' ] + branches: [ main, 'stable/[1-9][0-9]' ] pull_request: branches: [ main ] workflow_dispatch: From nobody Thu Feb 19 15:10:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf14nYjz6RQkY for ; Thu, 19 Feb 2026 15:10: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 4fGxf123Zqz3tQl for ; Thu, 19 Feb 2026 15:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MSJO/3vFMxtD/ejqlsyJ2gtJsIEWjWtGZMeIcuClEAs=; b=Iop1RVt3PLScaihlHVqPJTxSgFpeoFaTWeVOolvsuFlcMa6QXuZlxCortu3HID+P0kLIxM Gr/4uVzZGTDoN412XHFY2jz4gbXWK0IJ/oCyUg81yc3sp4vdw2OOEEE3+tYK2p3mlISff2 Rh95mz6V58jFIV6Fk5w8EJEpNkndCOQAYZFAbsrm5ANYKkwEZVgeSdjMtABc2u7Fu7edWa aUO8eYD6iu5gujAQgzJ7a9mPV8ulfrS8ikb4tmEd/QPLi7Wy0bw8glswPBagpA5GpG2pgp 2f49n7CpgoOjKnQBIQuBcrEcsJTlWUJewyZ/421ycujahDapHx/Vxkei8mHHoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771513849; a=rsa-sha256; cv=none; b=PSZC8GTw95g6V3lWORp9YMVhVlUtR5FrS6tPSfGG9EUwb0nfi/TjEwRmoxomtcO90sPROW WX63GoJnAjaQgY7KvCQmZQFNZ7jfO5tJRw8XNG3NJCxR+gR6XCxsysEwdxGtQZ3I+H/l5A f7VeuMSrDA/xDm+fFD2JEDTx019pX7CGXzyZ18Z5LVFxTgIiOKK2VbW8HcO6erEKYx+ZkD dmc1xurvogn7R5LMnZAnDGBCzziAzikfZ5xRgH3IORKxvNi9spvwa+7Rck2WwNOoVt0IBc 0//YeAQQW4Epii1N0qK81s89AE+DR99+nI8clbR5V872XbQ7KbgrYmB+eyW7xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MSJO/3vFMxtD/ejqlsyJ2gtJsIEWjWtGZMeIcuClEAs=; b=S22Y/mSThyui2PQI4Ua3PMxDQ0z+UNUpIMCaYQFmCZIn+hYxXTNWM+O83ARkW0WSCUR2jq T4pgXZr+L6Cevkq27/t3r0muYZDyv8mjTSbZRBAU13FUUX36V2DVpJKHWMpGa2lpVFgYKf rzON2Ytz1/kJhfDVicP8hnTvqVh4mGncpqsHoaKekEnieKbRzdRwvZW5BC3irXDYs2XaBE JjOqchmJTKv37UdYZkmqbGJgvHMmXtKizZ2ns9inFfpl0lTNnVZ3SrZ6zbzf5L+j8KmuEo aa1Rjb7Ennx/PVPlpdexRnBZFCOVbUAAfIOyC/V49J0CsjCfFGQZ7kaumZ6tcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf11H1Nznfm for ; Thu, 19 Feb 2026 15:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23850 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 15:10:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: cb59eec9ebbf - main - stddef.h: add ptraddr_t List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb59eec9ebbf1ae3a24223431ed1d947674c8c6a Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 15:10:49 +0000 Message-Id: <699727f9.23850.5ca81dc0@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cb59eec9ebbf1ae3a24223431ed1d947674c8c6a commit cb59eec9ebbf1ae3a24223431ed1d947674c8c6a Author: Brooks Davis AuthorDate: 2026-02-19 15:04:51 +0000 Commit: Brooks Davis CommitDate: 2026-02-19 15:10:32 +0000 stddef.h: add ptraddr_t I'd missed that stddef.h is standalone and isn't a copy of sys/stddef.h in my initial merge. Effort: CHERI upstreaming Reviewed by: kib Sponsored by: Innovate UK Fixes: dca634d1544b ("new type: ptraddr_t") Differential Revision: https://reviews.freebsd.org/D55305 --- include/stddef.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/stddef.h b/include/stddef.h index 3ba9a9946b01..978a34affc0a 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -36,6 +36,13 @@ #include #include +#if __BSD_VISIBLE +#ifndef _PTRADDR_T_DECLARED +typedef __ptraddr_t ptraddr_t; +#define _PTRADDR_T_DECLARED +#endif +#endif + #ifndef _PTRDIFF_T_DECLARED typedef __ptrdiff_t ptrdiff_t; #define _PTRDIFF_T_DECLARED From nobody Thu Feb 19 15:10:50 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf26V3qz6RQn6 for ; Thu, 19 Feb 2026 15:10: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 4fGxf232cDz3tfQ for ; Thu, 19 Feb 2026 15:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/IEUUGSHCrtGfjKzuPA4AAe/2dCzGbXTirMnvNyLzfA=; b=HycbFS3+OMlvBRx6+v2nMqTYVaizbabn4DD74AplXQwOagpjpPVsVSJ9IfkJO4HJTUhYqW VYiA40z3nREBR5YKdaOu7SRgLeqlgMRk1wMW9rFXDRMi29VHF1v9Y7/sOph01UB2DTqe8c wuM5Io8DD9r1ci8BTG3ZaAHagX4as8Oed8wnz/Do/2jnnhzh7ogbEaG0NnfLAIAaMyu0kO /ZRxO4MRJHY/UuH448NvPMAOE1U1HMDxsvVvi8GrMlXzqj0BufbhNfqyga6zy5HUZ244fQ LUZL9jB0DLLwM7+4yAPudDHt37dk3ZS1CbvgH2KD28xuRslATayGMqbTtgIXoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771513850; a=rsa-sha256; cv=none; b=XEAwQBUR/YImbTIRH5iUoeP3Kl9hOE6Ig6NFV/RizU6Pxk0Qv5/iMHcB6to2xd3/xTOqU2 VWsssa9thSwMNCQcxLMaUVaFdEAI229R6ms1rGg+5I1vbSRYLFZWPIt8uZt2WdECtgF2H5 ojt6NrECO6gptVdPWumEgfVRkM4Ukv1qfF7hcaw77pLBc0NXvVaj0Q5bvbjg2y7I8+Es7A inJApjW74z0sixYogYOcCASegjSAGTBNZiRbRr8391Q4WviJqsaJJ20lQ5OCy6Cx9gk7pd pPrQN0SDPAxqZNtG+Yh5haH4gbw+JldEiewEMf7rH0Xf4v3WvFCA6p7DEV/rCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/IEUUGSHCrtGfjKzuPA4AAe/2dCzGbXTirMnvNyLzfA=; b=mD8nmOjFVB1ZROIhS1eXI/gim/g+Qu1voqQaNBHfVVZ6wobu2e0oJfA1WY8am1S3rLXM6t KMPnbTiM4OTZ1yH7zzy77uxhLZnM9sXcht2bv8iqyyNBfDXz8CNLcOSXTb/jKFl9Wf0ned KczdhNqpwRxcLZVVaa7DQAgR1JWjXUzFQ/J539jjLIGqQlz2hQ/EuNXoJ/OUMqDJlgNfVV R2nwa8XzwyjuOlYW0yYwrAiI/v6sh5If8ANrkHaCVSjX2fOKXTW2LMIisPKfyoxxBv/A6H hOgP0elvMKt3Qubno8CI3SdaaukXjt/gwwSWZMVndyqzwiNR6VGkM4EibCSw1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf223pzznNs for ; Thu, 19 Feb 2026 15:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 15:10:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 2adc3f0db187 - main - stddef.h: centralize definition of offsetof() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2adc3f0db1877dbe9801e6dacfa9ae8df8879549 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 15:10:50 +0000 Message-Id: <699727fa.235e9.1b8777a6@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=2adc3f0db1877dbe9801e6dacfa9ae8df8879549 commit 2adc3f0db1877dbe9801e6dacfa9ae8df8879549 Author: Brooks Davis AuthorDate: 2026-02-19 15:05:22 +0000 Commit: Brooks Davis CommitDate: 2026-02-19 15:10:32 +0000 stddef.h: centralize definition of offsetof() Move to sys/_offsetof.h and use __builtin_offsetof() instead of __offsetof to avoid reintroducing sys/cdefs.h polution in stddef.h. This has the side effect of allowing sys/stddef.h to be included after stddef.h which can happen in compatability headers. Effort: CHERI upstreaming Sponsored by: DARPA, AFRL Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D55307 --- include/stddef.h | 5 +---- sys/sys/_offsetof.h | 19 +++++++++++++++++++ sys/sys/stddef.h | 3 +-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/stddef.h b/include/stddef.h index 978a34affc0a..9c7f1f147289 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -33,6 +33,7 @@ #define _STDDEF_H_ #include +#include #include #include @@ -68,10 +69,6 @@ typedef __max_align_t max_align_t; #endif #endif -#ifndef offsetof -#define offsetof(type, field) __builtin_offsetof(type, field) -#endif - #if __EXT1_VISIBLE /* ISO/IEC 9899:2011 K.3.3.2 */ #ifndef _RSIZE_T_DEFINED diff --git a/sys/sys/_offsetof.h b/sys/sys/_offsetof.h new file mode 100644 index 000000000000..25982fad774a --- /dev/null +++ b/sys/sys/_offsetof.h @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2026 Capabilities Limited + * + * SPDX-License-Identifier: BSD-2-Clause + * + * This software was developed by SRI International, the University of + * Cambridge Computer Laboratory (Department of Computer Science and + * Technology), and Capabilities Limited under Defense Advanced Research + * Projects Agency / Air Force Research Laboratory (DARPA/AFRL) Contract + * No. FA8750-24-C-B047 ("DEC"). + */ +#ifndef _SYS__OFFSETOF_H_ +#define _SYS__OFFSETOF_H_ + +#ifndef offsetof +#define offsetof(type, field) __builtin_offsetof(type, field) +#endif + +#endif /* _SYS__OFFSETOF_H_ */ diff --git a/sys/sys/stddef.h b/sys/sys/stddef.h index 90186eed7624..911755f71aa8 100644 --- a/sys/sys/stddef.h +++ b/sys/sys/stddef.h @@ -31,6 +31,7 @@ #include #include +#include #include #include @@ -46,6 +47,4 @@ typedef __ptrdiff_t ptrdiff_t; #define _PTRDIFF_T_DECLARED #endif -#define offsetof(type, field) __offsetof(type, field) - #endif /* !_SYS_STDDEF_H_ */ From nobody Thu Feb 19 15:10:51 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf36YTpz6RQn7 for ; Thu, 19 Feb 2026 15:10: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 4fGxf33ddwz3tZ9 for ; Thu, 19 Feb 2026 15:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=shA2Eoa4D4CStE8GN4WdbpiAoLlbCYv2DMDFbwJMQjA=; b=UUCSVIDggbQ29yHiEgP9lJGQ5/QrfI//v4GPm+nBIul0XgMPiwJKw0Js21HebDjChyKQb9 8Ctvio8BA3Jjp+tBXjvbhhsKF9vzt73IKpP8fWJcnVvkG0cHR4k1s0UcFU922K/Sv9OB3K RGLUPFNvbufKDgDgckT60LErbA2AQCfW2WoMdzz2p9cAGu9fC4UAOyO8fMksEtXsFEwAfe oELlMZ6jE3HQRP/UviYTitpJIjSKFFGyY/ouCxJTCq7qtJt8KINVBx3bhCpy/nWS1jMj2M LOXIEcoNrpMHWMeXnJDaRSRZyWfZD8AulcKhNoBTx0yWi5TDtSwg7fLm4PeLsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771513851; a=rsa-sha256; cv=none; b=Aos/aW79+YmYH58VOvIcZ7hn1kBA3nTFpamYAcF+XrkCd7DEdXQ6mCYZnsHOiHpiP1/sQC 17MUThWHTMCynvHTMZ34pSi8KEPHOnhwlPgUewI2fvLjpsnb9ByR3xF+dtMvE8DNHaeGZr Ory02G9wgGOo6zX+jAmt03PNTH9IbBTJzFPvN5zOKboThxsUyAQfDjXwAMDJlJJGyghXKE PayW+stLjF8ejef0j23Ps8qIJvroS5r/Ir8PX+v/YuA8ttxzlxKSMmb+wY9IsIAcab5y30 GH9o2pqPnoE+SDNrhodZ1U+jecF7GY/i0V1nZXHO9QjmDz4tMujiaQJH2GqMtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=shA2Eoa4D4CStE8GN4WdbpiAoLlbCYv2DMDFbwJMQjA=; b=UMUL8hDOHB2m/htYaJB4njFhf3YCRFWhYo5beEcp4i3jM3JHZtmD+DQ12ck7/IUFWltMMD 3p7JutzbFXOUyzXBXIpreexvK/UTqIks58nNwZIH3sKeYxN3dKsakCXGAEM6DM8OPAitzP TB2f398z1qXtVMDZougRAH+EQzICZiex8Z76LRjeYvBbRYOswpbEKpaXqogWk1OHGN85Ab iLhhkGiJ5h2N4RdPQA0c4IZ2ro8nIz04zLppqk2ts2YoWUi61lUC6GY2LkV4N/pPBygQBR WDeyyffKOKZFDomnWdI+UEqDEbgmiToKpWptCjFVzWCFF3OqHYgu8VyiJl90Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf32sVkznjM for ; Thu, 19 Feb 2026 15:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23df9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 15:10:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 89c3ae5fc9cc - main - build: add stddef.h to define ptraddr_t as required List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89c3ae5fc9cc24af940699b7e282fd24763f7ffa Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 15:10:51 +0000 Message-Id: <699727fb.23df9.6867dfbc@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=89c3ae5fc9cc24af940699b7e282fd24763f7ffa commit 89c3ae5fc9cc24af940699b7e282fd24763f7ffa Author: Brooks Davis AuthorDate: 2026-02-19 15:05:50 +0000 Commit: Brooks Davis CommitDate: 2026-02-19 15:10:32 +0000 build: add stddef.h to define ptraddr_t as required Effort: CHERI upstreaming Sponsored by: Innovate UK Reviewed by: kib Co-authored-by: Alfredo Mazzinghi Co-authored-by: Alex Richardson Differential Revision: https://reviews.freebsd.org/D55308 --- tools/build/Makefile | 3 +++ tools/build/stddef.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 1eb539f06607..161b8f635c6d 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -99,6 +99,9 @@ SYSINCS+= stat.h SRCS+= futimens.c utimensat.c .endif +# Define ptraddr_t for bootstrapping +INCS+= stddef.h + _WITH_EXPLICIT_BZERO!= cat ${HOST_INCLUDE_ROOT}/strings.h ${HOST_INCLUDE_ROOT}/string.h | grep -c explicit_bzero || true .if ${_WITH_EXPLICIT_BZERO} == 0 # .PATH: ${SRCTOP}/sys/libkern diff --git a/tools/build/stddef.h b/tools/build/stddef.h new file mode 100644 index 000000000000..77348dd57149 --- /dev/null +++ b/tools/build/stddef.h @@ -0,0 +1,49 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2018-2020 Alex Richardson + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory (Department of Computer Science and + * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the + * DARPA SSITH research programme. + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) + * ("CTSRD"), as part of the DARPA CRASH research programme. + * + * This work was supported by Innovate UK project 105694, "Digital Security by + * Design (DSbD) Technology Platform Prototype". + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#pragma once +#include_next + +#ifndef _PTRADDR_T_DECLARED +#ifdef __PTRADDR_TYPE__ +typedef __PTRADDR_TYPE__ ptraddr_t; +#else +typedef size_t ptraddr_t; +#endif +#define _PTRADDR_T_DECLARED +#endif From nobody Thu Feb 19 15:10:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf52wTZz6RR0R for ; Thu, 19 Feb 2026 15:10: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 4fGxf449y4z3tfm for ; Thu, 19 Feb 2026 15: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=1771513852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oiy2qySMtA6vrP4Boszlni2a6nwc8AG3zEeoeFrw47Y=; b=hVlWraY5yLp2u9Mulo8we65oz/ksjrSlEs6cEG2+NuZiSZHcA25Fb0j9yU5LDC7puPW73M /qQBLWotsvc7TwgpypICc518qqAO5bHWi+VotdDlYfWNdgYDPF2OKJyn9iwMdOROuoZ/J+ t3seOhkN1W2w0J9f0TBnJsAZkTFb8rwblJsErw8R6Q9Mvx9RAUIktXYMenThy93jgGxM9i 11JV441B6J8aWyolM+3slvx1c3A1MrYSwBtZ8BlNwk/orF8YnjKK2WUeKTVANULTFSc18+ GW7pq7gb8p6zptyUhok4jt/y6M9lu1TxGbTUmj2Ku9ItySly+AsR6pd211nNVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771513852; a=rsa-sha256; cv=none; b=xXoZ++Hg3APsQOPFFdFy557BEuN/MBy1ZLEVX6sWXtIRrDBUO1s++dndEo573URE/lCQPZ F4MuBhKd1tn4gjT2p7CMkfs2frLP2H+/Tv8VjFLJxfva3yxsQlPaw0zbbSzES3svfSaOtJ gb71k4jVD7yqwUdbFxOXsUgLytgUlVO01LejA9Qp+w5T7GUjsSTGVslVpBomjgjLcDwzOC PeUY0ZL/M8MbT8Cq34SjxPco0piLr6O4BMloCApKBYf3Wafe3Hec8pnXgYYM3PK5hcx9U+ 4aP27CqGliM+H4eQAVP+zYacMRyH3ow+J1VYPAyFBps8HM3SMb+7MPUPkcvUKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771513852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oiy2qySMtA6vrP4Boszlni2a6nwc8AG3zEeoeFrw47Y=; b=k5O/SJH2VtzPCEvBbYCrwjgBgVnoh1bwtORKsvJCInVqNDCbKT+kwqQhX0qsD2q7qc2N+L HLnOk2Ao/qR8Be/v+xBPU4bDu7TDe1DZKnno2SWm4l0ghL+jUAQzDQ+rHcqO7Gw49y34AK TG/9tybqSnchzQ2MCAXqIRltPZI36yr5pOaZZ7VsAl1s8462eSox8gRHIotIwLnNXhLQ+U lJqOWHWexvuRp3VuGL4dtgdB8B/bRXBYnLjClJcVQwIOwTXAl+M6eSM2Zb21Mg4Fke5xfc 5vpACqXuGEM1oAgLve9DHig9J92rgT3tHjHtx4RSkLWCpBko8DGitSRqgTvPog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGxf43cgZznjN for ; Thu, 19 Feb 2026 15:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e99 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 15:10:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a31127e6dfbf - main - sys/syscallsubr.h: assorted tidying List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a31127e6dfbfd96e512e0a238f4359c90849e3fb Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 15:10:52 +0000 Message-Id: <699727fc.23e99.1dfbd733@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a31127e6dfbfd96e512e0a238f4359c90849e3fb commit a31127e6dfbfd96e512e0a238f4359c90849e3fb Author: Brooks Davis AuthorDate: 2026-02-19 15:06:29 +0000 Commit: Brooks Davis CommitDate: 2026-02-19 15:10:33 +0000 sys/syscallsubr.h: assorted tidying - gc unused struct kevent - sort kern_frmdirat, kern_funlinkat, kern_kexec_load, and kern_kqueue - put user_ functions in their own section Effort: CHERI upstreaming Reviewed by: kib Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D55309 --- sys/sys/syscallsubr.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 35e2b771cbe7..a714ecf9412b 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -45,7 +45,6 @@ enum idtype; struct itimerval; struct image_args; struct jail; -struct kevent; struct kevent_copyops; struct kexec_segment; struct kld_file_stat; @@ -120,16 +119,10 @@ int kern_connectat(struct thread *td, int dirfd, int fd, struct sockaddr *sa); int kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, off_t *outoffp, size_t len, unsigned int flags); -int user_cpuset_getaffinity(struct thread *td, cpulevel_t level, - cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *maskp, - const struct cpuset_copy_cb *cb); int kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *mask); int kern_cpuset_setaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, cpuset_t *maskp); -int user_cpuset_setaffinity(struct thread *td, cpulevel_t level, - cpuwhich_t which, id_t id, size_t cpusetsize, - const cpuset_t *maskp, const struct cpuset_copy_cb *cb); int kern_cpuset_getdomain(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *maskp, int *policyp, const struct cpuset_copy_cb *cb); @@ -175,10 +168,14 @@ int kern_fhstatfs(struct thread *td, fhandle_t fh, struct statfs *buf); int kern_fpathconf(struct thread *td, int fd, int name, long *valuep); int kern_freebsd11_getfsstat(struct thread *td, struct freebsd11_statfs *ubuf, long bufsize, int mode); +int kern_frmdirat(struct thread *td, int dfd, const char *path, int fd, + enum uio_seg pathseg, int flag); int kern_fstat(struct thread *td, int fd, struct stat *sbp); int kern_fstatfs(struct thread *td, int fd, struct statfs *buf); int kern_fsync(struct thread *td, int fd, bool fullsync); int kern_ftruncate(struct thread *td, int fd, off_t length); +int kern_funlinkat(struct thread *td, int dfd, const char *path, int fd, + enum uio_seg pathseg, int flag, ino_t oldinum); int kern_futimes(struct thread *td, int fd, const struct timeval *tptr, enum uio_seg tptrseg); int kern_futimens(struct thread *td, int fd, const struct timespec *tptr, @@ -211,9 +208,9 @@ int kern_kevent_anonymous(struct thread *td, int nevents, int kern_kevent_fp(struct thread *td, struct file *fp, int nchanges, int nevents, struct kevent_copyops *k_ops, const struct timespec *timeout); +int kern_kexec_load(struct thread *td, u_long entry, + u_long nseg, struct kexec_segment *seg, u_long flags); int kern_kill(struct thread *td, pid_t pid, int signum); -int kern_kqueue(struct thread *td, int flags, bool cponfork, - struct filecaps *fcaps); int kern_kldload(struct thread *td, const char *file, int *fileid); int kern_kldstat(struct thread *td, int fileid, struct kld_file_stat *stat); int kern_kldunload(struct thread *td, int fileid, int flags); @@ -226,6 +223,8 @@ int kern_kmq_timedreceive(struct thread *, int, char *, size_t, unsigned int *, const struct timespec *); int kern_kmq_timedsend(struct thread *td, int, const char *, size_t, unsigned int, const struct timespec *); +int kern_kqueue(struct thread *td, int flags, bool cponfork, + struct filecaps *fcaps); int kern_linkat(struct thread *td, int fd1, int fd2, const char *path1, const char *path2, enum uio_seg segflg, int flag); int kern_listen(struct thread *td, int s, int backlog); @@ -307,8 +306,6 @@ 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); -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, struct sched_param *param); int kern_sched_getscheduler(struct thread *td, struct thread *targettd, @@ -388,8 +385,6 @@ int kern_timerfd_settime(struct thread *td, int fd, int flags, const struct itimerspec *new_value, struct itimerspec *old_value); int kern_truncate(struct thread *td, const char *path, enum uio_seg pathseg, off_t length); -int kern_funlinkat(struct thread *td, int dfd, const char *path, int fd, - enum uio_seg pathseg, int flag, ino_t oldinum); int kern_utimesat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, const struct timeval *tptr, enum uio_seg tptrseg); @@ -404,8 +399,13 @@ int kern_writev(struct thread *td, int fd, struct uio *auio); int kern_socketpair(struct thread *td, int domain, int type, int protocol, int *rsv); int kern_unmount(struct thread *td, const char *path, uint64_t flags); -int kern_kexec_load(struct thread *td, u_long entry, - u_long nseg, struct kexec_segment *seg, u_long flags); + +int user_cpuset_getaffinity(struct thread *td, cpulevel_t level, + cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *maskp, + const struct cpuset_copy_cb *cb); +int user_cpuset_setaffinity(struct thread *td, cpulevel_t level, + cpuwhich_t which, id_t id, size_t cpusetsize, + const cpuset_t *maskp, const struct cpuset_copy_cb *cb); /* flags for kern_sigaction */ #define KSA_OSIGSET 0x0001 /* uses osigact_t */ From nobody Thu Feb 19 15:16:41 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGxmn6XrVz6RR9j for ; Thu, 19 Feb 2026 15:16: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 4fGxmn5hvpz3wRc for ; Thu, 19 Feb 2026 15:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771514201; 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=trQCtd9V/v4TqA8VkmF4dzCWq1ePIp2l1uA9p1KI7MA=; b=yj7P6dFv5peDhJbaj/M/DvnWnB/OsbG2eP7W0YqduMz1hk2r6eHlMvNDh5TeQU/IBmPu4o QjyMRhIXKEZ3Na8ifAbOdXi5SYUx3Ln6MN+CFGlKjKhZ6q9vAd5oGXB3QzIRi1iMtuGJ38 O8BjqRaA3DaEfdVP1FIobqlKzuN0NO6GoeG7pb4xVbtMlQHlbGEmAKeYr6VfPYLpHfJYBI zWUIu8AdnVNi85onHYJPYQ10z8iW0ajKHSqagKdwW8mSoEs5EAPa1XlYJVcpdiRs0/wxvc 0tMHRW4P3ILx93kOO4Ut7fISrJR+75Cf0E74Aal7KSfvuX+fVgb6IrE7oDBrqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771514201; a=rsa-sha256; cv=none; b=maK5qnyIOW+P78AY03XVId0s8BlCm1q7pGHe2nry7+cJiorCFM5iTp0FLnYPIucFKz2Jhz m4CBZ4iI6fJXtOfLlAJa5BTiu6YowLy00KBZSjQ0AsMsQSqrEqsEw0s1OHwzuiHw1lcKgb 23EwS+GLgYGfvYzZGNA4y+bgpE6FhsPPx5OPuguBK7UFlhRNkQwhvWmJ0NE9jbqMyoVAUY 3Mz0UhugbIKj/How22YbemH9kkrD0zJ73VvczVkTTTRu2gbtRV3rlQSQ9I6dvrMAi57vJU vwqHW2bPZHzHU72pwxCkMq+CZcAupvBxh0XYcZdOcBjhnxpQz0uRsisNl0bBTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771514201; 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=trQCtd9V/v4TqA8VkmF4dzCWq1ePIp2l1uA9p1KI7MA=; b=nvoXCyvNp7RbQftwqzxIbkrLsBjpmNvqqOS3Cyks3iArcNrGnJN8yZzowrEyoixCF3sBGf 7S8Fo+INr2+JawAP56EeU+Q0XsKnQKnLex53fjObB00T1PjthbJJiJB9wabF46mFpgGlbf mqnj0QqvJEkCrb3XoJCKx4e7gzwUlnCxjNPb7wq7/oJx+wDZa5ktcdMCpFj2ds3QUtF671 MwQxaYJrv7f+U67QIjOqXIEEgANsvUichV1WMXPf8YJdrh/9IVR/KGkl4DOpz1ENZFZK9m 9dpl/nI9QkCvFpu6We3XjE1vE/obHuJzMFd9+Yf9DgE+kOHqCVB6pIZqxf1xZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGxmn4xtHznjf for ; Thu, 19 Feb 2026 15:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 15:16:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 6010b73fa957 - main - makefs: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6010b73fa9574b8e651b08451f30ba9c05f3f894 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 15:16:41 +0000 Message-Id: <69972959.22b57.797730c3@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6010b73fa9574b8e651b08451f30ba9c05f3f894 commit 6010b73fa9574b8e651b08451f30ba9c05f3f894 Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:26:43 +0000 Commit: Ed Maste CommitDate: 2026-02-19 15:16:14 +0000 makefs: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/msdos.c | 2 ++ usr.sbin/makefs/msdos.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c index 3707481a1c47..76c6ec05c71b 100644 --- a/usr.sbin/makefs/msdos.c +++ b/usr.sbin/makefs/msdos.c @@ -1,6 +1,8 @@ /* $NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * diff --git a/usr.sbin/makefs/msdos.h b/usr.sbin/makefs/msdos.h index 376713051d52..80c2d4c39593 100644 --- a/usr.sbin/makefs/msdos.h +++ b/usr.sbin/makefs/msdos.h @@ -1,6 +1,8 @@ /* $NetBSD: msdos.h,v 1.3 2015/10/16 16:40:02 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * From nobody Thu Feb 19 16:25:38 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fGzJL6xnSz6S2hM for ; Thu, 19 Feb 2026 16:25: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 4fGzJL5yqMz46PW for ; Thu, 19 Feb 2026 16:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771518338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vti1P9X3IqxcXDigFcwk5NWPrwSfVq3diRrNCZcE52A=; b=pxrJ1Fw2kgFIthAPWVub8TmMh8gdehvZM5dAntey6iu2abVHSociQmTa4pRM7tiuEvcTm0 lujjoZXiMwD9Pe/oBEaSdMkUatk4ihyRs+1OxhNtznun9C7mmpP8oQXAe+82EDhzMoVcU1 ChaYsz2yhfUy4kKdf8WgcMmpERF3DpR5g4ng0INTUaowDeQRDMkVwXA721UyMIXHTjB4A7 UbDxqZG8NiymUsSaMxaczZFAQvTJUy4AVDyBe4XGWqqA9tve8+JrGJ2osZG1GGxlSQgb84 jcCSc4lCCvTbZI1Sec9TWP12lIK211fDoLj1iuRT9YTUIKJ/03+oJ8C6X6xZAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771518338; a=rsa-sha256; cv=none; b=d/Lg47/XDcnf3YY93GZwKET3+Gt2lFe1IFk7kYiesnST0Ypb4cPD9f3uBaUtkhWpjT1Dz/ taNmyazt905rTBLVCpyBjYKCv9FoRqQvgzQ+9Fsm5StBwg1qM8AQtsqFU3TLWKwPdlFUom FKW0SEIPbMCBtFs8FYMCjiU9tI87pQTjenEAaACg0cWhFnv2pGgHRDy9RHJNsLzbUVjSXr nAKQVd5yA5A4FN8LE3PM2dfrS16CoJCZZ10BZIWMrW9/3ceR5p7XA9m3raG7tmoH1c0Lep 8pO6PaD+huAD90iCzB8CMhgBWDBb/GAIu5/iLUcH/CHR/3JdLZNg96fnivpzow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771518338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vti1P9X3IqxcXDigFcwk5NWPrwSfVq3diRrNCZcE52A=; b=nr+XXMPcpcqYocOZjoghmEKWSYZBPigdnwSkiPgB8Ods39bm0unujQka7L+h/ybvTNz/C5 KpCnsDSmpFjas2sau5CyZLD3xJar/VPnrPe8krGnhQNVPhTNqaX++3Ms/oTUbBhabTkYik RLWVektrvIzaWBpwBgtX++FSY+TgyTUOuqH3Bd2MHZjan4CQDELH7qrpxY01PuKchqFhj6 yXTAooqOYqfSYLL8xRCb5/+UM/Mwez9wU4SkLg/Kz2HID7wDXbLrmWdXHWmC+XQWMt5xY2 FjG88uFoAXezSD+qQ82ZdPUsKGNrZGgIozfJUdJdbArsyMX39HiK7d6bbKjpgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGzJL51jtzqbb for ; Thu, 19 Feb 2026 16:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 327ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 16:25:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: dcbd1fccdc66 - main - types.h: use central definition of offsetof() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcbd1fccdc66ec33f0652be34a1c8bdd5293f90c Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 16:25:38 +0000 Message-Id: <69973982.327ef.1a79d858@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=dcbd1fccdc66ec33f0652be34a1c8bdd5293f90c commit dcbd1fccdc66ec33f0652be34a1c8bdd5293f90c Author: Brooks Davis AuthorDate: 2026-02-19 16:13:57 +0000 Commit: Brooks Davis CommitDate: 2026-02-19 16:25:26 +0000 types.h: use central definition of offsetof() Previously this broke if included after (sys/)stddef.h. Reported by: des Fixes: 2adc3f0db187 ("stddef.h: centralize definition of offsetof()") --- sys/sys/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/types.h b/sys/sys/types.h index 8311c1901b7e..2d1035bda1e5 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -42,6 +42,7 @@ /* Machine type dependent parameters. */ #include #include +#include #include @@ -291,7 +292,6 @@ typedef __uint64_t uoff_t; typedef char vm_memattr_t; /* memory attribute codes */ typedef struct vm_page *vm_page_t; -#define offsetof(type, field) __offsetof(type, field) #endif /* _KERNEL */ #if defined(_KERNEL) || defined(_STANDALONE) From nobody Thu Feb 19 17:16:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH0R167n4z6S6mT for ; Thu, 19 Feb 2026 17:16: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 4fH0R15NXlz3F9D for ; Thu, 19 Feb 2026 17:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HkP4QbSWdKUkoqlbpNl0LkJIRLwgR946hGVeipIWX08=; b=r7oO+quU25oMOmgEpewkB9+nZdmlKQoMDMMUGn9o0NYMKKM3VI/Mg+4IgWyvk0iPOfRnxG 2z5ufhqFWW0rFLO8BRhN15seKG9ZRQO81qLuEL++fCtuXsO561g3N7u7LqRaALDNLORC+s 8GuSGCvHtPfZPyjfTJjB7/3FT3lRG5xS5uURepOvw3HB/hi79K83yT+HaYi98DvsoHg+to zZHX+VQnNTjy1bQZqm0332DbLKZeLqR4si7HbYnjDzki0pc4smS6Hkgntr07cWHo+8JwLG vy511AqF4eo221H9m+P+f/FWV1K7pUVRP90fhqXhdwUWYF67Tw26DmRbuNlrSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771521389; a=rsa-sha256; cv=none; b=v+4wVXs686pcEl+8BfB2iTRXKOzK1UKlx48sZ4XA43NwbMzf2FHFREJgipmeSi+pXQJRsh LuulxKNd0KWpMt/iWqoffGn8UNyiQO91jj3t/EzT7c1bcU3d7eIsvSD6FDpyIwap2Mxbe3 hY2JnewoGbVv0mtHQ8HevGEO93BmmRhOrs8PdHM/D3wqnmemZ2Rl04UYuojE7VZIDVRm4j 2xJ///WOJCc07m5kpyj1RggtWN04mHb+2evWntiPHmSxTTakkkKG8aGnQ7uloF2/jhtjIP +MTnLiVbIpmhKe+nZ4JiPgXWLxHfJ0XLzgSsKQfFyBqttWK/cV5TF+2pPLLKog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HkP4QbSWdKUkoqlbpNl0LkJIRLwgR946hGVeipIWX08=; b=tzE3nbWkIgDwkoU0nzocpPyVCFfoBba/CcjFPQxmNdjkzqc75Le+TEiiBmP2uhh6I2v18o OHMzBgFkGt708Zi+m2WPtvG69qUmsZ6d9vOwHdG61cgDjK2RZ+QR6Lw3ILiGPFcPoPnqeP mBypK6CHNZOcTopqvh56nrL24dOzmVpIzAnM+MwqS1mch+Ui/UxyGQJpW8RHqAdjn5CH4Z TCcAxsnZ0SuD5gMr+kImL6iHt6F6pEIx4zes6bQPsgfkSakaS9i0XsZEnb57mXgk/jFsz1 P2bdL9qMDUBwNLkcoM5t/eKPk9HdVPcIlzD3ISrHGMe9u/L74iyo39X8Qnq/Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH0R14PvCzrPD for ; Thu, 19 Feb 2026 17:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 17:16:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d4c05edd410e - main - vmm: Add privilege checks to vmmctl operations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4c05edd410e7925875c844c0642929410f22053 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 17:16:29 +0000 Message-Id: <6997456d.38d06.65d34377@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d4c05edd410e7925875c844c0642929410f22053 commit d4c05edd410e7925875c844c0642929410f22053 Author: Mark Johnston AuthorDate: 2026-02-19 14:38:29 +0000 Commit: Mark Johnston CommitDate: 2026-02-19 17:16:15 +0000 vmm: Add privilege checks to vmmctl operations In preparation for supporting creation of VMs by unprivileged users, add some restrictions: - Disallow creation of non-transient VMs by unprivileged users. That is, if an unprivileged user creates a VM, the VM must be destroyed automatically once the last fd referencing it is gone. - Disallow destroying VMs created by a different user, unless the caller has the PRIV_VMM_DESTROY privilege. Reviewed by: bnovkov MFC after: 2 months Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54740 --- sys/dev/vmm/vmm_dev.c | 21 +++++++++++++++++++++ sys/sys/priv.h | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 0df21402683d..5d7802f929ae 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -898,6 +898,7 @@ vmmdev_lookup_and_destroy(const char *name, struct ucred *cred) { struct cdev *cdev; struct vmmdev_softc *sc; + int error; sx_xlock(&vmmdev_mtx); sc = vmmdev_lookup(name, cred); @@ -906,6 +907,16 @@ vmmdev_lookup_and_destroy(const char *name, struct ucred *cred) return (EINVAL); } + /* + * Only the creator of a VM or a privileged user can destroy it. + */ + if ((cred->cr_uid != sc->ucred->cr_uid || + cred->cr_prison != sc->ucred->cr_prison) && + (error = priv_check_cred(cred, PRIV_VMM_DESTROY)) != 0) { + sx_xunlock(&vmmdev_mtx); + return (error); + } + /* * Setting 'sc->cdev' to NULL is used to indicate that the VM * is scheduled for destruction. @@ -992,6 +1003,16 @@ vmmdev_create(const char *name, uint32_t flags, struct ucred *cred) return (EEXIST); } + /* + * Unprivileged users can only create VMs that will be automatically + * destroyed when the creating descriptor is closed. + */ + if ((flags & VMMCTL_CREATE_DESTROY_ON_CLOSE) == 0 && + (error = priv_check_cred(cred, PRIV_VMM_CREATE)) != 0) { + sx_xunlock(&vmmdev_mtx); + return (error); + } + if (!chgvmmcnt(cred->cr_ruidinfo, 1, vm_maxvmms)) { sx_xunlock(&vmmdev_mtx); return (ENOMEM); diff --git a/sys/sys/priv.h b/sys/sys/priv.h index 1ad6a4882ffc..e302d9487e64 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -539,11 +539,13 @@ * vmm privileges. */ #define PRIV_VMM_PPTDEV 710 /* Can manipulate ppt devices. */ +#define PRIV_VMM_CREATE 711 /* Can create non-temporal VMs. */ +#define PRIV_VMM_DESTROY 712 /* Can destroy other users' VMs. */ /* * Track end of privilege list. */ -#define _PRIV_HIGHEST 711 +#define _PRIV_HIGHEST 713 /* * Validate that a named privilege is known by the privilege system. Invalid From nobody Thu Feb 19 17:16:30 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH0R30P5Kz6S6x7 for ; Thu, 19 Feb 2026 17:16: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 4fH0R251sWz3FKZ for ; Thu, 19 Feb 2026 17:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aBnXmTCvXK5eOHy+/ecIgda4LV4ze/gqUyDtkDpwdB8=; b=eanbm+ZS3mzwL0+cqph+F1oLv+tv0RcimLkMt9qaXb1bdJkkpBiDWb7s+qNaNg+8woNeT/ gBG8EYHm5oU1jeCC2bCCzT11VJWmG3YVk8O68eOxtYfLWl14XoMGvK5OYe2ksj5BImIgmS 4yhfWBdwgw4zlnFdSjYeuof4GJUOBMhPqiDSEhW28uv1uNej2b7AdZEa5j92XzzStrzWV8 KMjByIHFLL0iQNApBLOxNQLkwSYP9HY1PJwzPmVB3UVeFr1yke2bt3xP8wtjaA9mmv0F54 vY7cCuhBD1BFISXRzwpNh03mfWkqoi5X+g3A7YYedHn2/K9eu9MpQmscBUpwIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771521390; a=rsa-sha256; cv=none; b=PvSqb4jZe/30hJfsUMPuIZJlAPH+UvqGibmGkCW0PnEctEKWaBseD5eHNzxL5mLYBd401M XGugD3+YsHb7/3RVxBSJ86T2AyyT7F50FEDJ3djAIBUfLWSoGmLeG1zRWkLqJ2+zYaJsl9 CUS70Pyt5y1/x2xn8q6Xexd92ZJay1RRfRe7gCvN/hK2VPLJyjTMoOWgra7v3bMwauyl57 gvGwxemtX0KGtWEuxHiABiMuuaDYLe7Jxu0XBuTtb1yIFFZQY65UkjuO6fHAGuptoz6dRF SYLKYKAZo6W+x/leqXswpb7EckM/p4o9FyFAEe04gH2CQWTHm8qyoK0Yjn6DjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aBnXmTCvXK5eOHy+/ecIgda4LV4ze/gqUyDtkDpwdB8=; b=AujVconK4+XNtB4yF/81Mj3vAlEpQN3hGRSIzt0G1q1L5tx825fnI0d71rtsmp1RnxDB3h wVcoZuXh7qvgBpyhWo9fHD1cKAZ6ckvW8W9bTlagGoIsjxmHO9wYTb6DyU+RNCBkAvAFx8 7JMgkRgHAQ/JnJgRo2N/NdHFNoOg3a7Xw6S5H7wl49N0f4VLPgtZfY0qaY5T5biABSLJlU UeiJUSFqDWRs4LO5kVHku5tBeRgtcZGjKF3MI45AVlC29m+J3FXWJiQUQ47WBF7QVGxT5I MAfcJvZRr3Dii3yAdXgU1//9iTxybnTso9zXUerLOK+04nAgUWh5xL2ZBb+OWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH0R24czWzs2H for ; Thu, 19 Feb 2026 17:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38aa5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 17:16:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: af099eaa5ec3 - main - vmm: Enable unprivileged bhyve List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af099eaa5ec3604639807b7c5d3ed5be336e5643 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 17:16:30 +0000 Message-Id: <6997456e.38aa5.1ce21597@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=af099eaa5ec3604639807b7c5d3ed5be336e5643 commit af099eaa5ec3604639807b7c5d3ed5be336e5643 Author: Mark Johnston AuthorDate: 2026-02-19 14:38:46 +0000 Commit: Mark Johnston CommitDate: 2026-02-19 17:16:15 +0000 vmm: Enable unprivileged bhyve - Add the vmm group. - Let /dev/vmmctl belong to the vmm group by default, and give group write permissions. - When creating a VM's device files, make them owned by the creating process' effective UID. Reviewed by: bnovkov MFC after: 2 months Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54741 --- etc/group | 1 + sys/dev/vmm/vmm_dev.c | 10 +++++----- sys/sys/conf.h | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/etc/group b/etc/group index 35df51838ae4..af42fa1bcc11 100644 --- a/etc/group +++ b/etc/group @@ -34,5 +34,6 @@ ntpd:*:123: _ypldap:*:160: hast:*:845: tests:*:977: +vmm:*:978: nogroup:*:65533: nobody:*:65534: diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 5d7802f929ae..0e5477745db5 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -1033,8 +1033,8 @@ vmmdev_create(const char *name, uint32_t flags, struct ucred *cred) make_dev_args_init(&mda); mda.mda_devsw = &vmmdevsw; mda.mda_cr = sc->ucred; - mda.mda_uid = UID_ROOT; - mda.mda_gid = GID_WHEEL; + mda.mda_uid = cred->cr_uid; + mda.mda_gid = GID_VMM; mda.mda_mode = 0600; mda.mda_si_drv1 = sc; mda.mda_flags = MAKEDEV_CHECKNAME | MAKEDEV_WAITOK; @@ -1201,7 +1201,7 @@ vmmdev_init(void) sx_xlock(&vmmdev_mtx); error = make_dev_p(MAKEDEV_CHECKNAME, &vmmctl_cdev, &vmmctlsw, NULL, - UID_ROOT, GID_WHEEL, 0600, "vmmctl"); + UID_ROOT, GID_VMM, 0660, "vmmctl"); if (error == 0) { pr_allow_vmm_flag = prison_add_allow(NULL, "vmm", NULL, "Allow use of vmm in a jail"); @@ -1357,8 +1357,8 @@ devmem_create_cdev(struct vmmdev_softc *sc, int segid, char *devname) make_dev_args_init(&mda); mda.mda_devsw = &devmemsw; mda.mda_cr = sc->ucred; - mda.mda_uid = UID_ROOT; - mda.mda_gid = GID_WHEEL; + mda.mda_uid = sc->ucred->cr_uid; + mda.mda_gid = GID_VMM; mda.mda_mode = 0600; mda.mda_si_drv1 = dsc; mda.mda_flags = MAKEDEV_CHECKNAME | MAKEDEV_WAITOK; diff --git a/sys/sys/conf.h b/sys/sys/conf.h index a830c9d4c622..e5a6be9b891c 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -160,6 +160,7 @@ typedef int dumper_hdr_t(struct dumperinfo *di, struct kerneldumpheader *kdh); #define GID_ID_PRIO 48 #define GID_DIALER 68 #define GID_U2F 116 +#define GID_VMM 978 #define GID_NOGROUP 65533 #define GID_NOBODY 65534 From nobody Thu Feb 19 17:16:31 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH0R40xpnz6S733 for ; Thu, 19 Feb 2026 17:16: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 4fH0R369Y8z3FMn for ; Thu, 19 Feb 2026 17:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GBgzOWNaiToqzlQQ3Xl0kQBVV9VG27OtWIGXRwULBTQ=; b=exzkUI1aNJLEf5ZEIR4+Zqksw2APYCtuK/NUBxABbFl8AoK/21iWUhbHrzBWMWycqnpLgk R5SqtOL7qCUjJd9VGZOEG3nEVUOn2q5fTeB28VPvxZhT/HeDWWhpMaLzKVZV/cTBBzxAuA 17bLbYq1azBfo/8cnQFCCjjOh7WyLs04GvZvaXg1KYcBB+24wK+O2U2Z6S7xCNj3p8CmVd RLrlnPmRyV9X+/X8q7ECuV37S3RhneRw3X0pBc+enr3iUcIwM54XrDqr5IfKtEC9+nmylB PzeA/K5ZppN5KqJHqh5p40Y6oVQ1BbpDY7Ft1X4kMocwVt7kbrhc357kp5k67g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771521391; a=rsa-sha256; cv=none; b=yCu+WZzojGKGfDaRSk3cw/NKvVeoerl4Axlyk8U7HG2whFi/NifQcwBlpPMXMVj51u+402 uA1mca1+uFVqsxdxZRDiWMTeyRFEOTevwT9mvvrWP+webRgxtaygyQXMt1jNpzFN/Tkg0m +cjDSjmYvmcP0YxcnobXzP69JqkX5r/3ALn2Y9BcjLjh65qlX8ZGN1AbeVnlbVGgJwJoQM HiG0BALmzP5pjupMLFIk9VvYxXToGbSV+nThSl+q6JauLvrZDKhQsrfAIaP/XB/widWMF3 l9QvgpFxs8dalf6nb+BAH5Co+cny6MvdCZH9zYdd80RA2v3oImtUqWoRfKbsDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GBgzOWNaiToqzlQQ3Xl0kQBVV9VG27OtWIGXRwULBTQ=; b=DWXhgmOFkzYOtHzhfB248ykTRSMSO5n6cSH1Djzh0Mr8mjpbIFmlmg2z7KATmGnnl5yUZf Vv1fhlbzOtg9IRhVhN1JRNuBAI849QprRbYusH1TXFuX2N4A9qiMBBbxBIMYBoS3pim2ye DOlgJZBkWFZssc++MI+za1NV2+5zI1kRX2WEw3F/ENVsOe3oJxF5iLRz1loz+UHvdE2q/5 yNv7U+Ph/eoWpjKIoZSUWDqgYtidNTE9ZIZxJaCT16OanvSjbD77cmVonW970ymsizWYfu nY9HGiuxHjuA1Yj71+ChKxAJjfw6TNfg163AlN0egolPac9BH5uV1YouEkaOJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH0R35PvHzrqw for ; Thu, 19 Feb 2026 17:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3931b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 17:16:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d26c8ae527bb - main - vmm.4: Add information on VM access control List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d26c8ae527bbf2cc3da98c0857f634f162622752 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 17:16:31 +0000 Message-Id: <6997456f.3931b.6742114e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d26c8ae527bbf2cc3da98c0857f634f162622752 commit d26c8ae527bbf2cc3da98c0857f634f162622752 Author: Mark Johnston AuthorDate: 2026-02-19 14:38:59 +0000 Commit: Mark Johnston CommitDate: 2026-02-19 17:16:15 +0000 vmm.4: Add information on VM access control Add a section to vmm.4 explaining how vmm device file ownership works. MFC after: 2 months Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54742 --- share/man/man4/vmm.4 | 39 +++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/bhyve.8 | 25 ++++++++++++++++++++----- 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/share/man/man4/vmm.4 b/share/man/man4/vmm.4 index 07c40541f404..9c16bff8398a 100644 --- a/share/man/man4/vmm.4 +++ b/share/man/man4/vmm.4 @@ -59,6 +59,29 @@ riscv: The CPUs must implement the H (hypervisor) RISC-V ISA extension. .Pp PCI device passthrough to a virtual machine requires hardware with VT-d support and is available only on amd64. +.Sh ACCESS CONTROL +Only the super-user and processes with write access to the +.Pa /dev/vmmctl +device file may create and destroy virtual machines. +By default, members of the +.Va vmm +group have such access. +Once created, a virtual machine may be destroyed only by that user or +the super-user. +.Pp +Unprivileged users must use +.Dq monitor mode +to run the virtual machine; in this mode, the virtual machine is automatically +destroyed when its device file is closed. +When running +.Xr bhyve 8 , +this mode can be selected by specifying the +.Fl M +flag. +.Pp +Virtual machines can be created in a jail if the jail has the +.Va allow.vmm +flag set. .Sh PCI PASSTHROUGH On amd64 where the hardware supports VT-d, PCI devices can be reserved for use by the hypervisor. @@ -99,6 +122,12 @@ The and .Va pptdevs3 variables can be used for additional entries. +.Pp +In general, PCI passthrough cannot be used when running +.Xr bhyve 8 +as an unprivileged user or in a jail, as this feature requires write +access to +.Pa /dev/pci . .Sh LOADER TUNABLES Tunables can be set at the .Xr loader 8 @@ -109,6 +138,14 @@ prompt before booting the kernel or stored in Maximum number of virtual CPUs. The default is the number of physical CPUs in the system. .El +.Sh FILES +.Bl -tag -width /dev/vmmctl -compact +.It Pa /dev/vmmctl +control interface for creating and destroying virtual machines. +.It Pa /dev/vmm/* +device interface for individual virtual machines. +.It Pa /dev/vmm.io/* +device interface for device memory mapped into virtual machines. .Sh EXAMPLES Reserve three PCI devices for use by the hypervisor: bus 10 slot 0 function 0, bus 6 slot 5 function 0, and bus 6 slot 5 function 1. @@ -143,8 +180,10 @@ back: .Xr bhyve 4 , .Xr loader.conf 5 , .Xr bhyve 8 , +.Xr bhyvectl 8 , .Xr bhyveload 8 , .Xr devctl 8 , +.Xr jail 8 , .Xr kldload 8 .Sh HISTORY .Nm vmm.ko diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 4c73a119b1ed..be906419d74e 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 5, 2026 +.Dd January 23, 2026 .Dt BHYVE 8 .Os .Sh NAME @@ -117,8 +117,23 @@ on arm64 the package provides a U-Boot image that can be used to boot the guest. .Pp .Nm -runs until the guest operating system reboots or an unhandled hypervisor -exit is detected. +runs until the guest operating system reboots (if +.Ql monitor +mode is not enabled) or halts, or an unhandled hypervisor exit is +detected. +.Pp +Generally +.Nm +must be run by the super-user, but users belonging to the +.Va vmm +group can create and run virtual machines as well. +See +.Xr vmm 4 . +When run by an unprivileged user, +.Nm +must have access to any required resources such as disk images or +network devices. +PCI passthrough cannot be used by unprivileged users. .Sh OPTIONS .Bl -tag -width 10n .It Fl a @@ -605,8 +620,8 @@ addressing rules. The .Cm slirp backend can be used to provide a NATed network to the guest. -This backend has poor performance but does not require any network -configuration on the host system. +This backend has limited performance but does not require any network +configuration on the host system and can be used by unprivileged users. It depends on the .Pa net/libslirp port. From nobody Thu Feb 19 17:16:32 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH0R5266Sz6S6tK for ; Thu, 19 Feb 2026 17:16: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 4fH0R46cWfz3FQ8 for ; Thu, 19 Feb 2026 17:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWgM/gvImpstJk6hZOKA79d5SvJNPOVFnFsXwzDICVI=; b=I6PAMtWG6MeRSsrN0wmdvHJebjewpKD0TJe5wHHLmEfrkffoBGY5a1A4FVVNrTow+X21K2 A33SQjrtJGOS8Z4a0dbOwzDbxc6aZmck0pZj3HxAqXkKJ0XDJMXu1K8Z+DEAV7SGmw8lY1 WzAyDpTR28oAYP9kF/QQ+yV6E4hPOKtGAyRbo8CtkUaBIXZFmpZUCwdwkAOrTic0KZPELm wmPTcrVmdVKIRb8lYfpo7G3+GHP6v+z3U32ikpEgLT4Rsbgj+PlF8w6UU0Wgxyx0QQDbxO IF+lRzQsOYiMhIFyqRIhnBZKtykdGF82vHdz7WJcCCWaQEEYp2w2yLmJ6k0N3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771521393; a=rsa-sha256; cv=none; b=GtMhOqesMzDweiQB0UaM1CqXSovVKjKQ4aCw6k4fnMD+glg1gU0bgV412TJVUnJqXcrtYb OCYhOmq1VpJ+GC6JQFJr+oSqk7APaFiucjrwKz5rKyy1qxJQEuIFeddlUcA0XJ+R1X6sQB GelYrPhMonIP76gIYSy796ADHnZBbtheDb9B8WrzXM1HH7mDwX86HoYNm7MK71v37sKTiF snmLLo4ovU7i8W2qG9bRt5E4y7bn5GFssz0fFjWVnvrBxDHuyC8y6B+j44esuvV8Aefu4T QejgYC+2Ts3PvYl0Twna5KgjJH1IFsVVs2wJDY/J748Y4z88Ds3Cwr8VQH6ryg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWgM/gvImpstJk6hZOKA79d5SvJNPOVFnFsXwzDICVI=; b=S4tn3n5n7JeFKd7sHeh9Iq6JwraehbW65gfQS6h/W4xXrHQtj/m72WGAiejS+HPonmE6y/ IKlORemRVfYaGhfakqMGf68yt62r5oH1lH265ng1wRsjF0osaONyD4JheVb/M5mrXzWnki K3aeyajt4RZvM1VKHZEzACfCmLK2+XdQpgxA8lHv0dNbjQxkeV9UYqjbQx1pPMCx3A+CRS LeiMXboa3yYPXTW+mPTojrElK4UnipOWONp51VApBwSUvvo1GxfacaH/1U3zx8+qzG4Au8 lo9SMxpSgJ+oskwI1ttCB2AwMY6ndIHk+XLiyxP/pQX39Lsean8dPO2jwQqQlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH0R468LfzrPG for ; Thu, 19 Feb 2026 17:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39412 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 17:16:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bc7862bc916c - main - vmm: Start using exterror List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc7862bc916c3b81bcdc374e5144ab2f5bf62b19 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 17:16:32 +0000 Message-Id: <69974570.39412.15c313da@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bc7862bc916c3b81bcdc374e5144ab2f5bf62b19 commit bc7862bc916c3b81bcdc374e5144ab2f5bf62b19 Author: Mark Johnston AuthorDate: 2026-02-19 14:39:12 +0000 Commit: Mark Johnston CommitDate: 2026-02-19 17:16:15 +0000 vmm: Start using exterror For now, just describe the error where an unprivileged user attempts to run a VM without DESTROY_ON_CLOSE semantics, i.e., monitor mode. Reviewed by: bnovkov MFC after: 2 months Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54743 --- lib/libc/gen/exterr_cat_filenames.h | 1 + sys/dev/vmm/vmm_dev.c | 5 ++++- sys/sys/exterr_cat.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/exterr_cat_filenames.h b/lib/libc/gen/exterr_cat_filenames.h index d55396a1b286..e45d05e384bd 100644 --- a/lib/libc/gen/exterr_cat_filenames.h +++ b/lib/libc/gen/exterr_cat_filenames.h @@ -2,6 +2,7 @@ * Automatically @generated, use * tools/build/make_libc_exterr_cat_filenames.sh */ + [EXTERR_CAT_VMM] = "dev/vmm/vmm_dev.c", [EXTERR_CAT_FUSE_DEVICE] = "fs/fuse/fuse_device.c", [EXTERR_CAT_FUSE_VFS] = "fs/fuse/fuse_vfsops.c", [EXTERR_CAT_FUSE_VNOPS] = "fs/fuse/fuse_vnops.c", diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 0e5477745db5..ed8e5b2e0777 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -8,6 +8,8 @@ #include #include +#define EXTERR_CATEGORY EXTERR_CAT_VMM +#include #include #include #include @@ -1010,7 +1012,8 @@ vmmdev_create(const char *name, uint32_t flags, struct ucred *cred) if ((flags & VMMCTL_CREATE_DESTROY_ON_CLOSE) == 0 && (error = priv_check_cred(cred, PRIV_VMM_CREATE)) != 0) { sx_xunlock(&vmmdev_mtx); - return (error); + return (EXTERROR(error, + "An unprivileged user must run VMs in monitor mode")); } if (!chgvmmcnt(cred->cr_ruidinfo, 1, vm_maxvmms)) { diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h index 015eb6a1ae76..4f3ff6925242 100644 --- a/sys/sys/exterr_cat.h +++ b/sys/sys/exterr_cat.h @@ -39,6 +39,7 @@ #define EXTERR_CAT_FUSE_DEVICE 14 #define EXTERR_CAT_FORK 15 #define EXTERR_CAT_PROCEXIT 16 +#define EXTERR_CAT_VMM 17 #endif From nobody Thu Feb 19 17:17:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH0Ry5pfdz6S6p6 for ; Thu, 19 Feb 2026 17:17: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 4fH0Ry59Khz3GrM for ; Thu, 19 Feb 2026 17:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kBM1bMDedYtyiM74MxlNHBcle+J6vaQnLNesH375JVU=; b=f6c08ELNRMJ0ydG+vGkgW7dw+qkD9b/C8A2l9VEirpmTiq7c1WCy52/zvXhX77E4byoKNm QiFMITRWmFVncuxwOvVhabRBLJgjMvL3o2TUerhF/YEb7XKX7K4+DoW8N96Og/M8WgI4KB iOy48pUftsAbzmPttPxb9boW/N/iaiXf1zfnlds9j3HpbqKMa/zlBO9xJpVp83EuARqLnE dwkHB+jBe2wUbRipMcnThUm638FKS27gdvCROmyi7+8U1tJ4r54aA0NNJKHSd2AlNBXZs9 lkMFL/qb+Fc1KA9wlRg9yNm7Whik2lqKPN0bWHmjKCkDQh+/OemQbKgv5AqDEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771521438; a=rsa-sha256; cv=none; b=WPo8qJmg52plx72PAFvNdHqSAk0N/PQlVB3xMsUi9UTZ+nnx629+K0FoeCwED/kMt3wx1b GpNCb5ETH5qrE6J1slOCVBWRAgtVs+n6rYqIwtfBwQD1DUlzazy2sud+UcV1jDCFKxBK0+ 5TvR/L0G0kzrjh6usUz2ICYlemI+gyU2PnhXAGlx+6r4jpMIMl6v2MwqjbqlPutY3kZ2qJ sUZshu5csNpmx2YCMNPU05e1TCN4qD9/3jL0S9s69ypOk9jQSUAw40v2xyfNGLKQ+KgchM k2+78h1/8k1VkS5+YsXATdiqTN1TutURXywoDo1ZGooWGdR+S0RUyRVvjEUSNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kBM1bMDedYtyiM74MxlNHBcle+J6vaQnLNesH375JVU=; b=dfmOmrOMFpEWATaRTInjbbqP/iwKLKM6OkPcDIzpJxpRp3CmIT7mX8OCnaq2JnUZpyYSkA LODX2GmiGf8UI9xdgAd+3yhVGUYesNaFL5bwJ99UBHa7OqBBkjJAoaqLmb5GxJeqmp9lye j6NMCkDbMa9OrKqWRYjEWHHmAExmn85ScFvUACqHhZEcLzuJhQ+5zYE5AvhoJWVf/EkWsc BD7Kl7hsqilftdUijYTNWa5H3e1arr3RxyQCNOPKCyVPGdWB6L0U5SmSd9pi+1+5VQ/o/M 7mZ/Uzwkt6o2BCi/8/yteMn4sL5I5YtxaLWF2x4I3iPx7jSx1ZwDWOX+sLmHWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH0Ry4lqHzrbQ for ; Thu, 19 Feb 2026 17:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 391d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 17:17:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 83cf9b52e960 - main - RELNOTES: Document some recent vmm changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83cf9b52e96086f598ed21f0f7830b74f4f4476a Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 17:17:18 +0000 Message-Id: <6997459e.391d6.49a28d1b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=83cf9b52e96086f598ed21f0f7830b74f4f4476a commit 83cf9b52e96086f598ed21f0f7830b74f4f4476a Author: Mark Johnston AuthorDate: 2026-02-19 17:16:59 +0000 Commit: Mark Johnston CommitDate: 2026-02-19 17:16:59 +0000 RELNOTES: Document some recent vmm changes --- RELNOTES | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/RELNOTES b/RELNOTES index 52a2ee77e568..b7a1f8b501a5 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,14 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +af099eaa5ec: + Users belonging to the new vmm group can now create bhyve VMs. See the + vmm(4) man page for details. + +c71354030a2: + Users wishing to use bhyve PCI passthrough in jails must create the + jail with the allow.vmm_ppt option configured. + 4d707825bf62: The pdwait(2) system call was added. It provides wait(2)-like functionality for a process descriptor (see procdesc(4)). From nobody Thu Feb 19 17:21:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH0XS3Y9Xz6S71s for ; Thu, 19 Feb 2026 17:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fH0XR3rgmz3H9b for ; Thu, 19 Feb 2026 17:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1adHyIpTF0/8370BAgcsBtqhipurhXJtqckee7d7UFs=; b=ofbQinC2DpBr9YvR1hBfeo6act5ovcI4tIJC8VPYF9fyDOB5Iw2rc6hl0UJgDF2ijiZfv1 AcrcaTOTmgPU2WucNgsM0gWwSlHMx/hyrjWAX18qfN9KMVjkykmAezxXSbq8De5vbWRy/5 6ZRJttoAoMCkrtPeQcCHcl0chc0ZwOtQNzyBLcVc1SdT33Ye9Z1U4qxbU8/tlKhimH/Mx7 JA5Gl3651L1EYj2VACKkywLdMk4hzVlwRWTszQr7qUm5R/iQ5eGtbBxF8WzGVhu7KYucsE JY1RiJ05uTIfE0oltS8mSHlqzi9SH41+CnkBiq1hL7ozfF2zEnJJmR6Q7jap5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771521671; a=rsa-sha256; cv=none; b=GP4QYdJz9KLJxk/oaGrD4LketEqT35agTKslh9nJophZTpN0bLWcyqai7KXDZkotH1ETQz jNTJFa6+14/FFTCaqT0iHsuSj48C7TspM4kOjD7eJgx/ivPgqF7G5Qxc+N+4BAeYyJCxpO +esEy9XFqBy9ILBqkt/DTgaA4mUDntPVtqPOe2rc82WIYYOs2dUGb9o7I1dTqf7eiQ97dT ir3ORQXC+gFhLHfOmnqmc7XXV4d4coIhzQ4I0nSNZ1ORqTXoTZx0pwTR1x9HpaiOm68RyB odfDtqHm9Esl29DbE6LzUtxCoZ4ttA/6G/NAEPlxV8cBKedKLQaJkbcawxr+Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771521671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1adHyIpTF0/8370BAgcsBtqhipurhXJtqckee7d7UFs=; b=lKENZ3JiknILDh4eQJILjDvBIjf994HMhZ+K1l28evT6LYnYOrGzbUAElCJJ5WVrIxPeyA r1b4SScH2RagchRjnwgN8zPG97crd672N4RzJ9szTY4PBLSuGrg5SlERt3ChD/0TVBgKtI rSolKmT2IUqy1OhxGbuPj3mWCx7U9p2wsPOg0tVuiq9hHzH8VbHBJ2k169RCqD9YK8QTaQ sEaSys3qNQLedw1nw1VtJEXE7a5i6W0PXkxgswd4W9N0Csnul7HEYG7AWRL89HCqQhAY4z A/mw8UMH2OtsRwSZqYTTEgylyx6UGSTiXTXpI8O9IAmeU14Zndx71g0AgshW1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH0XR3MN7zrrH for ; Thu, 19 Feb 2026 17:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 17:21:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3a0c63a7e0e7 - main - vmm.4: Fix width List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a0c63a7e0e7f8bd43b0d6b97a627198297e3bdb Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 17:21:11 +0000 Message-Id: <69974687.38d31.734bf2da@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3a0c63a7e0e7f8bd43b0d6b97a627198297e3bdb commit 3a0c63a7e0e7f8bd43b0d6b97a627198297e3bdb Author: Mark Johnston AuthorDate: 2026-02-19 17:20:17 +0000 Commit: Mark Johnston CommitDate: 2026-02-19 17:20:17 +0000 vmm.4: Fix width Reported by: ziaee Fixes: d26c8ae527bb ("vmm.4: Add information on VM access control") --- share/man/man4/vmm.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/vmm.4 b/share/man/man4/vmm.4 index 9c16bff8398a..6e121cb8ad64 100644 --- a/share/man/man4/vmm.4 +++ b/share/man/man4/vmm.4 @@ -139,7 +139,7 @@ Maximum number of virtual CPUs. The default is the number of physical CPUs in the system. .El .Sh FILES -.Bl -tag -width /dev/vmmctl -compact +.Bl -tag -width /dev/vmm.io/* -compact .It Pa /dev/vmmctl control interface for creating and destroying virtual machines. .It Pa /dev/vmm/* From nobody Thu Feb 19 19:15:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH34K2LQ9z6SHpl for ; Thu, 19 Feb 2026 19:15: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 4fH34K0cJ2z3XWp for ; Thu, 19 Feb 2026 19:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771528529; 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=6QhRxqNbcuhmIQX3vbmQppC17Ojv3TQr33OXqaeqXUs=; b=NNw2rnOW2CG4rL4mvXnXHsiTHCa+saZFuZ/U42TBisPQHyxdzx3qE6qrl754MHoawIvJSV fZi+KSmeMPPKup3yFUOIJdQfsbwFa9rSBQWtp0RtR+vLwEaLrk1Zzq155ztce3G6/84Uq5 Hz13l6mq7mMo6/jPFaxNCjianKFNZp4nJeGrhJkT6F6vXzIPUgmN/ccuiAryUeWtdO1BPs yZWp4lf0MquKhQo3vuqo7nWmHIG2EuM19vLITaHR7Oed2nf+LqXN/xVj4gbm2m3/LDnxqP 9sY2stT6kBBKjBA2WO9B2Eodl74B8Isz+beUTeq7hlZbX83QB+moTTTqNsbaJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771528529; a=rsa-sha256; cv=none; b=mCLoETHwuCsr7sFY9h6nLfqvw1RHfhaLjj/rvwPJbn48Aug+7Fq7vZxifnD35sjqVjIe3G BYI95gd1+K5sQ2VcabkJk945hK+O095m/rAYya0JI6oghsY9wmt+RKXmxMPAK0teV1gXjF ebvqNg6SKc4oeuVhEX34vbFWN0B5XRJkNDW+CXoF4k/99LQeii0nYdjMLgeQ6AukzCt9WT vp9c39+amKlsuE7sKN1ysrFvgmo/av6Qa57ePAfdXfxqFNOupY9DnKmT4BQ0+kpyPCsGNZ spXMTpX0/DWMvbi8aK/OSeSzUj+5kTJ5OnM7L/JxlT5Icj5islkhqmuuOSraYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771528529; 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=6QhRxqNbcuhmIQX3vbmQppC17Ojv3TQr33OXqaeqXUs=; b=FpjVjrxXOdrWpL4FyEs11cVkQeIkgjxk7LSouJ9r/XfOgY/yds1L6OgSPwE79YzgXR3wqQ MQCO/o8nDZQIYmigBw7+qudFjQ9x1czt1DnQ2OJcgwihAj1wsXsaEuiG9ZulboUjzoqUg8 BuEzSIC/TgzrzHO7Kc1Wpj+XrSpjjAnEdCQtfs98SUaN/CbqaIHU1R+OMCqJWUd3hXdrNE SgLBf8KvasPmQU/T7+NmfDrkOJpm0zY/qRhxWQegkDQ4WJE+8tM3WBtjBG6aTAvuhBUDNh +dPYgHVHAG8WBG3opNAjlUK0qyvNOiV5mtNkqulRWujVLvOWiKjaJYUXCWPqyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH34J6n7Wzw4F for ; Thu, 19 Feb 2026 19:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44b08 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:15:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Mark Johnston Subject: git: c8191c3d6139 - main - OptionalObsoleteFiles: Don't mark /usr/lib/debug/boot directory obsolete List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8191c3d613928d8bd6060aa2f7da349b4090cc1 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:15:28 +0000 Message-Id: <69976150.44b08.590c13f2@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c8191c3d613928d8bd6060aa2f7da349b4090cc1 commit c8191c3d613928d8bd6060aa2f7da349b4090cc1 Author: Artem Bunichev AuthorDate: 2026-02-19 19:09:48 +0000 Commit: Mark Johnston CommitDate: 2026-02-19 19:09:56 +0000 OptionalObsoleteFiles: Don't mark /usr/lib/debug/boot directory obsolete The intent of the currect code is to ignore anything under /usr/lib/debug/boot/*. But we also should make sure that /usr/lib/debug/boot directory is also ignored and is not marked obsolete. If we don't do that, `make DBATCH_DELETE_OLD_FILES delete-old` will try to rmdir(1) this directory, which will cause an error, since /usr/lib/debug/boot may have nested directories like kernel/ and modules/. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55077 --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a30ede4c1866..81379ea452bb 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1443,8 +1443,8 @@ OLD_DIRS+=usr/include/fs/cuse .if ${MK_DEBUG_FILES} == no .if exists(${DESTDIR}/usr/lib/debug) -DEBUG_DIRS!=find ${DESTDIR}/usr/lib/debug -mindepth 1 \ - -type d \! -path "${DESTDIR}/usr/lib/debug/boot/*" \ +DEBUG_DIRS!=find -E ${DESTDIR}/usr/lib/debug -mindepth 1 \ + -type d \! -regex "${DESTDIR}/usr/lib/debug/boot(/.*)?" \ | sed -e 's,^${DESTDIR}/,,'; echo DEBUG_FILES!=find ${DESTDIR}/usr/lib/debug \ \! -type d \! -path "${DESTDIR}/usr/lib/debug/boot/*" \! -name "lib*.so*" \ From nobody Thu Feb 19 19:40:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH3df5RG6z6SKY7 for ; Thu, 19 Feb 2026 19: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 4fH3df4t6rz3fJj for ; Thu, 19 Feb 2026 19: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=1771530054; 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=FMkycXJaZW2OrMjAhDlNddEM511f/CDdCwZLbubaQnc=; b=UAsqJQRVfAmnRIM2xFGY7yq61uMqM1M0IEwKt6+KtaN9o8bcgp4O+PFjsvLu/1EODYMLHH 3MXI8FEGaH+Z1kCjtjYIYYDS5F4uVdcIvnl3IKLFTQQHT9/5oTPV+MYJpEP0NxLKQWwQF+ FE+5CoyMtRdmryXjllnl/9CKtm4Dc+u7HzTavX1Wab0jL6VEwYr6KUi1PzM3E+Yr3uLo6n b18nxSZjz610DP4o0lIoma0oiX2ze3L+eDoaqwzFh7EFxVy9+SOWbbA+Mx4Nz6Wy4Z4R9Y 4k7MbkvDoMTE5RmU/wHBUiQDYDxlBcxh+9aU0Cfq904UDxyJePYnqohPwzh9MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771530054; a=rsa-sha256; cv=none; b=Dz43LxVe32Tp9s5Qnr0oL7/LOsmeFVGZH/bE3nULi7ybTLGciEbnhmStyImDAnbwbJN2u6 soBjRHguQwgtutLP9sebzgLYWn2HJNqDg6ZOpxWOtMfC7LUKiWfMGv2oX8kSDjNycwIZ1E iQO0lVpYBt3QU3k4cb8Q3vuxU1OQyl8uluIlfGlwiFCYKUrlzisvw+Y1PdsD2j65iMRxBA P4Ja9isGNLYXM4mhraFY6eUU+maxkOs65eqcfaMzrnHkS2Q8HGT7SCSZlk8U1492zRTPsS 0pmLrVR/d7YVfq1cVf9X2nsN7fvTLqHBe+SCVuVRjM0ttWpehinBOpKHvWP50Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771530054; 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=FMkycXJaZW2OrMjAhDlNddEM511f/CDdCwZLbubaQnc=; b=Ylmsu5b7mlIPU81PUaVUi07yaX/+Fynt3xfPw8SnRffpcJpp0IiCe4xbrq7TXvAowLkMq+ yib0MaDSm3Z5wvORQlIb8Rrbe72FwUDsEStAORcn/pw+3/4MXPh8d5H65Sukgoxd7KCA1W GiG0LdEFlbANwDzDwnfjfOnr+xtm8OI13eB4Qoo1y0b+gonEaFgk1CrDbbSlCMsPVAUAwk hJ44xemJHJ517xmtagZeA1Bi3Khw6jraXx8lURw6Yr37bDRq7u18BRoHJtC/sN7JXXSWF7 ixojfBZ6aEJQTrG3hgfnAfSxiRWnae85YWwN0VKjbFBzJXpSzw+gvUXGGnVnrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3df45RhzwLD for ; Thu, 19 Feb 2026 19:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 454cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:40:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 818971cc403e - main - bhyve: Fix unchecked stream I/O in RFB handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 818971cc403e78d42b77eb6c18a2d2a073e5541f Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:40:54 +0000 Message-Id: <69976746.454cf.28d9030d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=818971cc403e78d42b77eb6c18a2d2a073e5541f commit 818971cc403e78d42b77eb6c18a2d2a073e5541f Author: Hayzam Sherif AuthorDate: 2026-02-19 19:24:02 +0000 Commit: Mark Johnston CommitDate: 2026-02-19 19:24:07 +0000 bhyve: Fix unchecked stream I/O in RFB handler Convert rfb_send_* helpers to return status codes and check their results. Add missing checks for stream_read() and stream_write() returns during the handshake in rfb_handle() to avoid acting on failed I/O. Signed-off-by: Hayzam Sherif Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55343 --- usr.sbin/bhyve/rfb.c | 76 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c index fe6b628f94e2..c6c048d2b140 100644 --- a/usr.sbin/bhyve/rfb.c +++ b/usr.sbin/bhyve/rfb.c @@ -265,7 +265,7 @@ struct rfb_cuttext_msg { uint32_t length; }; -static void +static int rfb_send_server_init_msg(struct rfb_softc *rc, int cfd) { struct bhyvegc_image *gc_image; @@ -289,11 +289,14 @@ rfb_send_server_init_msg(struct rfb_softc *rc, int cfd) sinfo.pixfmt.pad[1] = 0; sinfo.pixfmt.pad[2] = 0; sinfo.namelen = htonl(rc->fbnamelen); - (void)stream_write(cfd, &sinfo, sizeof(sinfo)); - (void)stream_write(cfd, rc->fbname, rc->fbnamelen); + if (stream_write(cfd, &sinfo, sizeof(sinfo)) <= 0) + return (-1); + if (stream_write(cfd, rc->fbname, rc->fbnamelen) <= 0) + return (-1); + return (0); } -static void +static int rfb_send_resize_update_msg(struct rfb_softc *rc, int cfd) { struct rfb_srvr_updt_msg supdt_msg; @@ -303,7 +306,8 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int cfd) supdt_msg.type = 0; supdt_msg.pad = 0; supdt_msg.numrects = htons(1); - stream_write(cfd, &supdt_msg, sizeof(struct rfb_srvr_updt_msg)); + if (stream_write(cfd, &supdt_msg, sizeof(struct rfb_srvr_updt_msg)) <= 0) + return (-1); /* Rectangle header */ srect_hdr.x = htons(0); @@ -311,10 +315,12 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int cfd) srect_hdr.width = htons(rc->width); srect_hdr.height = htons(rc->height); srect_hdr.encoding = htonl(RFB_ENCODING_RESIZE); - stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr)); + if (stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr)) <= 0) + return (-1); + return (0); } -static void +static int rfb_send_extended_keyevent_update_msg(struct rfb_softc *rc, int cfd) { struct rfb_srvr_updt_msg supdt_msg; @@ -324,7 +330,8 @@ rfb_send_extended_keyevent_update_msg(struct rfb_softc *rc, int cfd) supdt_msg.type = 0; supdt_msg.pad = 0; supdt_msg.numrects = htons(1); - stream_write(cfd, &supdt_msg, sizeof(struct rfb_srvr_updt_msg)); + if (stream_write(cfd, &supdt_msg, sizeof(struct rfb_srvr_updt_msg)) <= 0) + return (-1); /* Rectangle header */ srect_hdr.x = htons(0); @@ -332,7 +339,9 @@ rfb_send_extended_keyevent_update_msg(struct rfb_softc *rc, int cfd) srect_hdr.width = htons(rc->width); srect_hdr.height = htons(rc->height); srect_hdr.encoding = htonl(RFB_ENCODING_EXT_KEYEVENT); - stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr)); + if (stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr)) <= 0) + return (-1); + return (0); } static int @@ -728,7 +737,10 @@ rfb_send_screen(struct rfb_softc *rc, int cfd) rc->width = gc_image->width; rc->height = gc_image->height; if (rc->enc_resize_ok) { - rfb_send_resize_update_msg(rc, cfd); + if (rfb_send_resize_update_msg(rc, cfd) < 0) { + retval = -1; + goto done; + } rc->update_all = true; goto done; } @@ -819,7 +831,10 @@ rfb_send_screen(struct rfb_softc *rc, int cfd) goto done; } - rfb_send_update_header(rc, cfd, changes); + if (rfb_send_update_header(rc, cfd, changes) <= 0) { + retval = -1; + goto done; + } /* Go through all cells, and send only changed ones */ crc_p = rc->crc_tmp; @@ -868,7 +883,8 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd) return (-1); if (rc->enc_extkeyevent_ok && (!rc->enc_extkeyevent_send)) { - rfb_send_extended_keyevent_update_msg(rc, cfd); + if (rfb_send_extended_keyevent_update_msg(rc, cfd) < 0) + return (-1); rc->enc_extkeyevent_send = true; } @@ -1045,7 +1061,8 @@ rfb_handle(struct rfb_softc *rc, int cfd) rc->cfd = cfd; /* 1a. Send server version */ - stream_write(cfd, vbuf, strlen(vbuf)); + if (stream_write(cfd, vbuf, strlen(vbuf)) <= 0) + goto done; /* 1b. Read client version */ len = stream_read(cfd, buf, VERSION_LENGTH); @@ -1080,10 +1097,14 @@ rfb_handle(struct rfb_softc *rc, int cfd) case CVERS_3_8: buf[0] = 1; buf[1] = auth_type; - stream_write(cfd, buf, 2); + if (stream_write(cfd, buf, 2) <= 0) + goto done; /* 2b. Read agreed security type */ len = stream_read(cfd, buf, 1); + if (len <= 0) + goto done; + if (buf[0] != auth_type) { /* deny */ sres = htonl(1); @@ -1094,7 +1115,8 @@ rfb_handle(struct rfb_softc *rc, int cfd) case CVERS_3_3: default: be32enc(buf, auth_type); - stream_write(cfd, buf, 4); + if (stream_write(cfd, buf, 4) <= 0) + goto done; break; } @@ -1128,10 +1150,13 @@ rfb_handle(struct rfb_softc *rc, int cfd) /* Initialize a 16-byte random challenge */ arc4random_buf(challenge, sizeof(challenge)); - stream_write(cfd, challenge, AUTH_LENGTH); + if (stream_write(cfd, challenge, AUTH_LENGTH) <= 0) + goto done; /* Receive the 16-byte challenge response */ - stream_read(cfd, buf, AUTH_LENGTH); + len = stream_read(cfd, buf, AUTH_LENGTH); + if (len <= 0) + goto done; memcpy(crypt_expected, challenge, AUTH_LENGTH); @@ -1164,14 +1189,17 @@ rfb_handle(struct rfb_softc *rc, int cfd) case CVERS_3_8: report_and_done: /* 2d. Write back a status */ - stream_write(cfd, &sres, 4); + if (stream_write(cfd, &sres, 4) <= 0) + goto done; if (sres) { /* 3.7 does not want string explaining cause */ if (client_ver == CVERS_3_8) { be32enc(buf, strlen(message)); - stream_write(cfd, buf, 4); - stream_write(cfd, message, strlen(message)); + if (stream_write(cfd, buf, 4) <= 0) + goto done; + if (stream_write(cfd, message, strlen(message)) <= 0) + goto done; } goto done; } @@ -1181,7 +1209,8 @@ report_and_done: /* for VNC auth case send status */ if (auth_type == SECURITY_TYPE_VNC_AUTH) { /* 2d. Write back a status */ - stream_write(cfd, &sres, 4); + if (stream_write(cfd, &sres, 4) <= 0) + goto done; } if (sres) { goto done; @@ -1190,9 +1219,12 @@ report_and_done: } /* 3a. Read client shared-flag byte */ len = stream_read(cfd, buf, 1); + if (len <= 0) + goto done; /* 4a. Write server-init info */ - rfb_send_server_init_msg(rc, cfd); + if (rfb_send_server_init_msg(rc, cfd) < 0) + goto done; if (!rc->zbuf) { rc->zbuf = malloc(RFB_ZLIB_BUFSZ + 16); From nobody Thu Feb 19 21:21:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH5sr6xP8z6ST1N for ; Thu, 19 Feb 2026 21:21: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 4fH5sr3Hl7z3vVw for ; Thu, 19 Feb 2026 21:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771536096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHCpRItvD09aQ/BFwS32dKSZcNV2L5v5sPMY7hVqGoI=; b=xNRKEXWTbWBWGNGg8AHqc36G8xwE2wUe6Bjc7x+CR5fU/KZAtKv/KuS5Mk0O3ZyOz8yk2X SY2L+L5ZDrmsTxPnBAGPDAhDOsLiQeSjZvOTadFWALJdXXZ3p8Odd1JGgz5AW1y612bjM4 yhDDFhIGrMmCsterJt00UUl9CH7JiwadJT22vXZcrfo0pM2bTzWGXIjU+dFn8aKP+muuXr 68arKm+OfDKnom+HCwxMPMMEoklQas2aT7XO1nsgkPGsLztvP4TKjJoawzurTEbvwD97K9 IjdrD5zG2nIsaG9r1BJUToPUNTLZHzIyGPYYf3I4KHwGrvTfbVlcL6LRpTuSTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771536096; a=rsa-sha256; cv=none; b=iP3mQIUq+jReUZQqpxusHWms9kKEbcuchroApARobpXbmOiy1xhYT9gIk7UUK2u0gWCK0d uLyWBujzHMMTJtyKCQy1Ueq1ZVcFD1Ba6FhckUfMvb+N8svo6lHZf4XVT7nc9OPUQeTeqT HK+b0H5qOHNTqhcHVdAIONA2tznNR8dZyEMjJUr3LVmuJlXE1uMf7rR7rlg/MMGlC6mgaq LILToIxxw2o/41hBbztfndOF2N3F9jqfoDLFXUbRc+ZTvT7wKKyihPv8+9nw9saSpKGRTF NZzpq1TcFrXmQNsg6Bi+sIx1kga8PttJX3/zOavnIh80lqYq+pSPehJOKSloPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771536096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHCpRItvD09aQ/BFwS32dKSZcNV2L5v5sPMY7hVqGoI=; b=yKKu8VMC14nyowxA4AwQaR08Un8O+i7h0FEhaVgGSxNaotDGPKSYWgUoUXT7rtFwHOdcyh z49Zz1jW1YFyJpLBdTRD4w+8y2rE9DvNisdtPiCrt8Oey+bdcS7iebrgp2M1+NNGMDY0QT oFCNVCDkPj+Ll+KHVngXqvPOuFxx3J+n+IiJ3KYaal08Y6VYM43PymfwfuiSYJ4GFIemMp oRw+nnuKawrZBRlJUg8gguF99r+FKaATJPSnPlsfDFyhaojz15YXpb1/H1NQB2QRo4EAzx 5uEqMeO7XpkkPoGg3VLTrKhgo+WBMUEKEdbKX35JIIjPPuGdKEmjc94Kay7rEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH5sr2SPfz10Jl for ; Thu, 19 Feb 2026 21:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 21:21:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: c721ceeb3ef0 - main - syslogd/tests: use kern.features to detect INET support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c721ceeb3ef0b29d06e6c3c634579f3bc85cc28b Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 21:21:36 +0000 Message-Id: <69977ee0.228d8.405ddb96@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c721ceeb3ef0b29d06e6c3c634579f3bc85cc28b commit c721ceeb3ef0b29d06e6c3c634579f3bc85cc28b Author: Siva Mahadevan AuthorDate: 2026-02-19 20:53:26 +0000 Commit: Siva Mahadevan CommitDate: 2026-02-19 20:53:26 +0000 syslogd/tests: use kern.features to detect INET support This fixes INET feature detection with kernel configs that do not include the kern.conftxt sysctl, such as riscv64 currently[0]. [0] https://ci.freebsd.org/view/Test/job/FreeBSD-main-riscv64-test/16514/testReport/usr.sbin.syslogd/syslogd_forwarded_format_test/O_flag_bsd_forwarded_legacy/ Reviewed by: markj Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55383 --- usr.sbin/syslogd/tests/syslogd_format_test_common.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh index 99623015c15d..ea32561ccbb3 100644 --- a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh @@ -48,9 +48,8 @@ local_privsocket_filename() confirm_INET_support_or_skip() { - if ! sysctl kern.conftxt | grep -qw INET; then + test "$(sysctl -inq kern.features.inet)" = 1 || \ atf_skip "Running kernel does not support INET" - fi } set_common_atf_metadata() From nobody Thu Feb 19 21:21:35 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH5sw4bY0z6STBc for ; Thu, 19 Feb 2026 21:21: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 4fH5sw2Qtnz3vSh for ; Thu, 19 Feb 2026 21:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771536100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KEBsQ6cblR+BCPDhqYGRaIFrWHiDamMvVnfJVExAj8=; b=Ru0V6Z8fsV6COIiwZJ2gdwhqKX6tu9anxg5o75mWbU+0XT3cBGtV8sukmiod2DZkMtEhJV wdG5JY1d1WBUzBBVo+wPF+hAnEOTCVYgc5XRg5LeK0BD/wecjmpHwMC0Bqh++pFNPrRofD WDPQG4HOHkN7e8FAXkams1qlpbOAnSpsknopw5tWAK33PyGuxEJYLo0XejkC5bNADOtVDH D5+NLXuMdMMxcCcCtdPLjpMhwEJap5vh1Q1MDnxtzjOldIpuck9ttaBSntAuMEpOdCDpHU FXqIx1/KbhmeAB95VJeHyt9OOwQMBXjcVqNLjfPscqR81SWTqnvYhBP/tuuVlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771536100; a=rsa-sha256; cv=none; b=v4sni6BuRu6i4s+4hjjWNH3wRvKpKCW0QmTbgG+ymQuZ1HP3WPGW94eARk/q+L6WyvjElv L7y1L+YxE5Nb9R2R6FMzf0BV8A5JslCCklj/R+Y3U7n1ywclS36jf/FJvOsln9vNgHlWw2 WS32VzINyhYFtv9K8XaGFhXHbvrj/lHINFAEUsLGvx1IJ7W3DkPDdYFQ0OXLsiTnS0yEgT xnUH9Vk8vc9fNzTV6ajfklNfiIbwP5PnQhperyuUzgA1JFhTc0To3zaeryBhc1cIMXzxDb tQVRLRGtcRPNyiWyebiXecpZdvs9tG1GpZNfURW1dvSQu8TW714KYsPKeAiWdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771536100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KEBsQ6cblR+BCPDhqYGRaIFrWHiDamMvVnfJVExAj8=; b=FlyjRlHEwqX7NPIMIZW7sk5qVd1Wt+s2xISNf1qtHPRaz8aVNWo9cti6n84l01Bky33r+/ 0YEumwyxF6DojQeeoG7YdhBL8cc6IyeXfPyM8V2Cie4nAdg3ZEh4zv6TNTt5U2XznNv5SB M0FYMQ0wKrbirwvaUBZXfTLm9h7B2iI0ItYL4LiCm2rI212LQY3XVdbn8NZWAU9Wg2l7So VYb2C6zOwHC2lwGAu2QPbxyxyrnT0x1sgRPvXEgEylw2LUUSeiILr6g6raMlc8RZiPY+0F oKXeByd/kfIBLsHZ25Jc7StWaXA5zHBgmW5NE5HM9tHrrTW90PPubXmylzAFow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH5sw1x7hzyWH for ; Thu, 19 Feb 2026 21:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fd4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 21:21:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 1e649491b856 - main - riscv: GENERIC: enable KERN_TLS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e649491b8567151270095fda3bce8faea394952 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 21:21:35 +0000 Message-Id: <69977edf.1fd4b.39eeae31@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=1e649491b8567151270095fda3bce8faea394952 commit 1e649491b8567151270095fda3bce8faea394952 Author: Siva Mahadevan AuthorDate: 2026-02-19 17:37:44 +0000 Commit: Siva Mahadevan CommitDate: 2026-02-19 20:10:02 +0000 riscv: GENERIC: enable KERN_TLS This unskips 585 sys/kern/ktls_test testcases[0] in CI. All 585 tests currently pass. [0] https://ci.freebsd.org/view/Test/job/FreeBSD-main-riscv64-test/16514/testReport/sys.kern/ Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55376 --- sys/riscv/conf/GENERIC | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 7a2c88c0b4cb..56fcace269e5 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -36,6 +36,7 @@ options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging options TCP_RFC7413 # TCP Fast Open options SCTP_SUPPORT # Allow kldload of SCTP +options KERN_TLS # TLS transmit & receive offload options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists From nobody Thu Feb 19 22:43:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fH7gp5kGMz6Sb3P for ; Thu, 19 Feb 2026 22:43: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 4fH7gp5CNqz47qV for ; Thu, 19 Feb 2026 22:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771540982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9c+JXiKS0GBauny/ARmlqh1PJjYNNsLWz+mYYauWYRo=; b=VwTQGf6Zo7jqdGxRehqbnL1dV6BDw2BTX2YtEhaYmJrwSj6ny7CzECdxc/OiRpjeEMvBeA uydzO6jsLjSLhaMShGeUWl/422nA4Za6/QPl9tbE2FHPF+sLPLrgJLfkv/Qyd+oG+sZChC +xajruHt9Gu14huS69ydpb/Ww7ffSyjwFjVHDatqx2IRFZ5Ln9/I/KwKt85zhf/fsxxXyl YAyfZgHkie95KVs48ir/qos2808YAqnv8b9/vN+zkVTbI53/zRmjv/z4ZSvNv98Px2kS4m wlicIEujPtvyczBAkXCo7/komAirPAX2SFauPPUXlsAuWugUDPornh0FDt3CVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771540982; a=rsa-sha256; cv=none; b=Nik47xj+inkKVe/zyY5cYhw26J5IUG/qYPDrKkkBHZTtgx5LhHvCnUVl5Agsoa1HTqxSv1 FNDDjk/4/sWel0avUgvN+H5gv054ZW+iRPMZuzCJRz9tUP477D/Ds8L5iTEWxQIO4li+Fb GpAWht2MN5TiV/+bWoLBvVukbuGY4E5sgKCKW41lc5pF4vUqEzFiE7zO6BfRFYsTr4x4oF IFASVgadZyNTbKdHlRuEIRrjvdN9ODefm29hlVf4H3rvEWZriXTTrAIl5uaphkPmUiGg+4 Szqk7tg3e3Mdi/QAl9hv/MXGLe9HKWo6wqlL9PVMTzEZ9Vzj9Z5F7nLHACRXSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771540982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9c+JXiKS0GBauny/ARmlqh1PJjYNNsLWz+mYYauWYRo=; b=EzIIYhrVyF8EPpaYus8lBVpxIIi5vpCheXvPnVgZRS7r11MJCRDF14ezqAuphSwspgkvut sBDMYp0oGsXiSpNBUw/hHUFWcwHfz9Rz0YiyeHcagYkHzgtes5vwkNzPRct8qY5E7mTYDS NZ4njxH8bc1lvBxh8iq9h6r/W+TWtDsn4HU4vNeecttdu0MdhxfHh2HbDKHxPZBeXeEFIN Qje+TTYe1NpDoGpEdAx+7NLECpyEfLcePDmjDOFwobawCDUhoU6JkNm4qQEQYN0EabjvvZ JasEZqxOXsUGmDBFib0p3SZVYvTEsCb0ut+PfxndtMlmm8tjyPJV42PMBQ9Dpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH7gp4mm2z11rT for ; Thu, 19 Feb 2026 22:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27a7f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 22:43:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 10d5404adb11 - main - bhyve: fix USB mouse requests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10d5404adb11773969a600428d1abeb4308d98aa Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 22:43:02 +0000 Message-Id: <699791f6.27a7f.2efd3a0@gitrepo.freebsd.org> The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=10d5404adb11773969a600428d1abeb4308d98aa commit 10d5404adb11773969a600428d1abeb4308d98aa Author: Chuck Tuffli AuthorDate: 2026-02-19 22:27:49 +0000 Commit: Chuck Tuffli CommitDate: 2026-02-19 22:27:49 +0000 bhyve: fix USB mouse requests USB HCI requests may not include HCI transfer block structures (i.e., xfer->data[] == NULL), but in several places, the USB mouse emulation code assumes one will exist. This can lead to a NULL pointer dereference and a SEGV in the bhyve process as observed via experiments with an Ubuntu guest and PyUSB code. Note that many of the cases processing other request types already checked for data == NULL. While in the neighborhood, fix a typo in the loop iterating over the usb_data_xfer_block array which used the wrong variable to check for valid data (idx vs. i). Reported by: danmcd@edgecast.io Obtained from: SmartOS MFC after: 1 week Relnotes: yes Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54661 --- usr.sbin/bhyve/usb_mouse.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c index 5caad886e082..6c0b051c67f2 100644 --- a/usr.sbin/bhyve/usb_mouse.c +++ b/usr.sbin/bhyve/usb_mouse.c @@ -343,7 +343,7 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) idx = xfer->head; for (i = 0; i < xfer->ndata; i++) { xfer->data[idx].bdone = 0; - if (data == NULL && USB_DATA_OK(xfer,i)) { + if (data == NULL && USB_DATA_OK(xfer, idx)) { data = &xfer->data[idx]; udata = data->buf; } @@ -529,7 +529,9 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) case UREQ(UR_GET_STATUS, UT_READ_DEVICE): DPRINTF(("umouse: (UR_GET_STATUS, UT_READ_DEVICE)")); - if (data != NULL && len > 1) { + if (data == NULL) + break; + if (len > 1) { if (sc->hid.feature == UF_DEVICE_REMOTE_WAKEUP) USETW(udata, UDS_REMOTE_WAKEUP); else @@ -538,18 +540,20 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) data->bdone += 2; } - eshort = data != NULL && data->blen > 0; + eshort = data->blen > 0; break; case UREQ(UR_GET_STATUS, UT_READ_INTERFACE): case UREQ(UR_GET_STATUS, UT_READ_ENDPOINT): DPRINTF(("umouse: (UR_GET_STATUS, UT_READ_INTERFACE)")); - if (data != NULL && len > 1) { + if (data == NULL) + break; + if (len > 1) { USETW(udata, 0); data->blen = len - 2; data->bdone += 2; } - eshort = data != NULL && data->blen > 0; + eshort = data->blen > 0; break; case UREQ(UR_SET_ADDRESS, UT_WRITE_DEVICE): @@ -629,21 +633,25 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) break; case UREQ(UMOUSE_GET_IDLE, UT_READ_CLASS_INTERFACE): - if (data != NULL && len > 0) { + if (data == NULL) + break; + if (len > 0) { *udata = sc->hid.idle; data->blen = len - 1; data->bdone += 1; } - eshort = data != NULL && data->blen > 0; + eshort = data->blen > 0; break; case UREQ(UMOUSE_GET_PROTOCOL, UT_READ_CLASS_INTERFACE): - if (data != NULL && len > 0) { + if (data == NULL) + break; + if (len > 0) { *udata = sc->hid.protocol; data->blen = len - 1; data->bdone += 1; } - eshort = data != NULL && data->blen > 0; + eshort = data->blen > 0; break; case UREQ(UMOUSE_SET_REPORT, UT_WRITE_CLASS_INTERFACE): From nobody Fri Feb 20 06:05:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHKTx0Yh3z6SFBk for ; Fri, 20 Feb 2026 06:05: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 4fHKTw6yxWz3g6X for ; Fri, 20 Feb 2026 06:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771567509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RnwJQmoac/xA2qqPMUl4DIHE/+R6XYddPgOFTBG/r1g=; b=H4LTJDhEUEYGsGAz/VKlFhyjWB+6vK/GASRGnhnaMTy0jvs1UFarlt+49RYCWRK8DVruft qnLH5u20Js8KDTthZpVORKy3tF3tGaFzhdpWog163Iq3Wzs9o9T+I87DtOMpgHAhvmi7+q ZWjSwEoR3QJ4IhTPUiUU8SQRIfa2KJFv97TarkyJDHg1VzEDJKB3rU8/rTpcnR557BmQFT vP6IW23k5cwUQT/tnIReYKmJ3VFn2CyETIGS0l/47Hzn41ZgXrrCOVWdOw6nGyYywjH77c 4Fts1w5velabMMB0Vax9zaieM1mpHv/inoWngsIa9wqgX34sjACeu8BIUpx6wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771567509; a=rsa-sha256; cv=none; b=eeordMTGDbOL5peO2HThr3NDnA86Y7uYUjJg3fI3MIZ3kMrnRMxNUqd7X+dvmYmczx5Q9D BVKVaIcKQu1vTH1sZabuHmAmLuYJzF+/RJpogCXoQCvCtfwJrWKBDwWYcHZmdOVWms5CGR Zoebt70Te4dW43nP+t+Pc0zRQojPCZPzk0ssrN0QGekJ+h2A4NRBflRrOJeJcFiH3C89q7 Ti52BhlJSM3872Uz5pqyuo0eCa8F53BiUuFwJa0eJmKpleDMWENykOLYwoo60xrH69eqFs aLelwHLC1Fl8MSlUGswgJ3Q7TbkbYQFFRSd91eGlouwGAAlNIlN4f9bb5GyA7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771567509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RnwJQmoac/xA2qqPMUl4DIHE/+R6XYddPgOFTBG/r1g=; b=HM0/eoFBtaPCcYGdizvXQE1AoZNxpUHAwU85/xtrJ6vn67qF8tYgBJfvWoHd2/lcUi20uA SLTXNHzNTFsN2YHnRzdqx1uPYYFHsBuxk1QNzSExyn8fepuskGaIG9M6E5s3rol+j1gLWh QmvjWJwug9VmcrG7VBiwOpXyC/0uqYtFoWv2/AQ611F0PJzhM34xRneRf73wRDMb9KOXnn g9U/YsLAemRkwDJYFK5mvpMYrtcOL9hsFZ46RNQNu5WGEkqI2/cDqxU7iTC+EWlSV/jH0M CCVrzBI6mVelhZlrRm15uBOY9Q6EMDj+gi+01psXC3VFDdpcyZ7ZJTyzxWhQfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHKTw6JZbzlC for ; Fri, 20 Feb 2026 06:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37df3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 06:05:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 7b862cf8a252 - main - asmc: use `ASMC_FAN_FUNCS2` with the Macmini4,1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b862cf8a252d80ab1fb90fa5371fd8462c7c16f Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 06:05:08 +0000 Message-Id: <6997f994.37df3.2b87d734@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7b862cf8a252d80ab1fb90fa5371fd8462c7c16f commit 7b862cf8a252d80ab1fb90fa5371fd8462c7c16f Author: Enji Cooper AuthorDate: 2026-02-20 05:43:37 +0000 Commit: Enji Cooper CommitDate: 2026-02-20 06:04:25 +0000 asmc: use `ASMC_FAN_FUNCS2` with the Macmini4,1 The Macmini4,1 model does not have "fansafespeed" support. This issue typically manifests with messages like so: ``` asmc0: asmc_key_read for key F0Sf failed 10 times, giving up ``` Swap out `ASMC_FAN_FUNCS` with `ASMC_FAN_FUNCS2` to explicitly drop "fansafespeed" checks in the driver for the model as it doesn't support that hardware feature. MFC after: 1 week Reported by: @probonopd Closes: https://github.com/helloSystem/ISO/issues/357 --- sys/dev/asmc/asmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index ef924ba8ba76..ed56561c07ac 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -325,7 +325,7 @@ static const struct asmc_model asmc_models[] = { { "Macmini4,1", "Apple SMC Mac mini 4,1 (Mid-2010)", ASMC_SMS_FUNCS_DISABLED, - ASMC_FAN_FUNCS, + ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MM41_TEMPS, ASMC_MM41_TEMPNAMES, ASMC_MM41_TEMPDESCS }, From nobody Fri Feb 20 06:27:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHKzS6Fl8z6SGtN for ; Fri, 20 Feb 2026 06:27: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 4fHKzS5bDnz3hnn for ; Fri, 20 Feb 2026 06:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771568836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6SKmQJs7Fv1Yh6DZnJvANgMs5Iq9uOXvImtz4bNdU8=; b=qTV7C9agxMn7jwpwm3BtnfLAt9o6VsVAunj68qOixSlw4UgZld1NPhpkZDsCfqFSUdKqn5 VHIkZ0+hyG1aL8NQ0NOg3R3Zig6NLRjoro6PBWY5M7QqCokft3LcEz52qE9FHygzN/6ANJ 42QAeeSUbYTK6ikUWaoQmlx+phy7FP7QwJm7Ov8tfY2ZrTw0ccvLxEHzuRxDJT6rEbZzu+ pNCythhLrLQ3iwtoss2tne3YcuRd3lXrlzw5EuyK508cY/M1a6Tx99HlLUd7gZloSHMOnO s7pi9VAKe3+42pgthM9NILBTscp3htD17qpgBy7ETq8GeNS0kEqn3+dpaqjtKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771568836; a=rsa-sha256; cv=none; b=VrlPr3l86DGwIPIWvX1eXm78uLiUDF9CS7L6cO8nB0bHnpa4eVdoWKWQO/udC3efUViOML USLjoRf3v2MVZyQ1qnaRL1IZ8+NuTze2xcKpfuY7VDBkzmaTTz564Cx4rv3xqi2GbQ+WYI AuGtWB+goaCMKtv5YbSfpyl7yG3uHeG5WMyuKAMtcUABrq2d8tKlZpkbBpbgZeQU9iQMID Hj4lcDM8RMYfxim8ZUM1ic1Gm1sQBprruT1i3ZW77TNBcd2Vumy8lCbdRt6rVgOU2cSv7o mc8UQbHIeXwlzWkVO9qv6aXTZZd3Bx3U3i0EjP9IdEWgVK/TIHxofV3GFszu8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771568836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6SKmQJs7Fv1Yh6DZnJvANgMs5Iq9uOXvImtz4bNdU8=; b=FVWxGc1UtIUZ776m/avY6pQuOTcxcSgDtvQ8vVfuu5BNXnGL8m+xthIRHr4jWecdQm67ek QRZFQv4rC1u1UIyBOzmxp9/rpocI/ZByD8K2jmvUIaG4siGVvSTwsV0eMCb63X10U2kfx3 130SOD1GxNrIgWPpi8vf8z/j1HcyyFpADXiM3UZciKCK0Tjwnj6NaSEU5Au2pALH7pL6vP hkolipBNqshLmnBLPDNM60ILoVZ7xp5MAkGpkcsxWKk+IX/BtXbR9Y7bVkQsqR1DQAFP1M 5/C6sQSLthYmH5M1MHb6JkoaMkd6zaHrvzIxyZQdYqh+AvpX2e3nx714iOppWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHKzS56CDz1lD for ; Fri, 20 Feb 2026 06:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b706 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 06:27:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 90edc16166a6 - main - asmc: use symbolic names with the MacPro3,1 model List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90edc16166a6fef03d2384247d07d64656f03309 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 06:27:16 +0000 Message-Id: <6997fec4.3b706.5db52449@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=90edc16166a6fef03d2384247d07d64656f03309 commit 90edc16166a6fef03d2384247d07d64656f03309 Author: Enji Cooper AuthorDate: 2026-02-20 06:24:38 +0000 Commit: Enji Cooper CommitDate: 2026-02-20 06:25:00 +0000 asmc: use symbolic names with the MacPro3,1 model Use `ASMC_LIGHT_FUNCS_DISABLED` and `ASMC_SMS_FUNCS_DISABLED` instead of the unrolled versions of the macros. This makes it easier to adjust the underlying macros/fields for `struct asmc_model`. No functional change intended. MFC after: 1 week --- sys/dev/asmc/asmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index ed56561c07ac..880da33ad9f3 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -398,9 +398,9 @@ static const struct asmc_model asmc_models[] = { /* Idem for the Mac Pro (Early 2008) */ { "MacPro3,1", "Apple SMC Mac Pro (Early 2008)", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP31_TEMPS, ASMC_MP31_TEMPNAMES, ASMC_MP31_TEMPDESCS }, From nobody Fri Feb 20 06:35:44 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHL9F0CyDz6SGhZ for ; Fri, 20 Feb 2026 06:35: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 4fHL9D6GWwz3kJC for ; Fri, 20 Feb 2026 06:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771569344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQ9pesFe/Ao465AzA673O2Sf6/X5V7T2jdWFIR6lnMI=; b=Jhs8o78ztNu96i/xZXdLPWML5HcrDKHZC9irj1Sdk17e50aFgpBLE4aiFbvvKk9STsjvhK rVBwduP7GY71oyMqC5jaGkFkgdgCDFFcxFVlBc8jDux7TS72oUMkuTSP5t1lH3CPAEfX5g kRB4gMU3Dx6gk44f2SlHd0fi9Ti9A6uuxEOLTvLPSa2g19Tk0iCOj6OK0nMQqS6a48fKMs uVtLus28DmWK2eDH7P3D30FG17P9hU+VzOPholtJ5Ap1hyqZRVfwOdU8A/mTFj5175YVoL SzJiFnYqJhU8DZd/BMl2wy4WKXU4hmFEfFSOhgFV7TFQRjaINLZaaly3fdItUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771569344; a=rsa-sha256; cv=none; b=Kof6gZQV3t32fbPTDEUECgqq0aWsiYqN8bqOXt/LAb76CPWcltSfC5IG++EnxvFtZ2wgre OVH5Sg1LpuYdkzY5ZnrRZrNMNPBqokbv3EQA4XMoyjKMmdXOve1+BDmd+8lcUBG4eAefi2 eRUfjOofyTVr48FpTkH17tdUYHeSyz2lEy9rezZ+xHuX2BpQfwaHKF7EHCtySEmmDP9DeG 8EHmPYaaFDMwL6RV528ZQHIiFAXNbufWGTyeB0okkBzV1ktVbycOL8hVFYG4jxF/M/MDQ9 t7lErRav9B9eJaQXMm7kjfK4nTPsUT8vq7DLlSzHneIZ9t5/TkHOXZ3pkWnPVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771569344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQ9pesFe/Ao465AzA673O2Sf6/X5V7T2jdWFIR6lnMI=; b=bk3FnMKGH4F2Liieu5f+ILWppFR3a8lyNFLPE+/k4ccXIz3yjiCYXOrHBLV7QMXBai6wam Bv3pnHWr00hPQXzVEhBM/B1um72J4csRsMBfyDhv4vRqKjE0TvcOcysUBHI0y0hktUjLPn QfcQ3eVp5DdtuR8zhtkipERAxarVJFtm0BvYIeGObKYR5ioQX6fbifAePEK4ArgEKNQocX vFu940GgoSBs/8V4leAoWLvi9PF2bCjHfgciR+DkBGkZBcxW/N1Z7emt7k/SRg6kJrkiVQ aFMUhOQNmeC6T9/QFsW5pBZZtagxIn6uB3Iu5M4F/oSVQEKxRBGjZH+cvCiYyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHL9D5QBpz1wC for ; Fri, 20 Feb 2026 06:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 06:35:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: ef1cde51032d - main - chore: asmc: use designated initializers in macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef1cde51032d395492caae302fedf183c58a482b Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 06:35:44 +0000 Message-Id: <699800c0.3cc96.15c4d8c7@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=ef1cde51032d395492caae302fedf183c58a482b commit ef1cde51032d395492caae302fedf183c58a482b Author: Enji Cooper AuthorDate: 2026-02-20 06:31:21 +0000 Commit: Enji Cooper CommitDate: 2026-02-20 06:35:16 +0000 chore: asmc: use designated initializers in macros This code cleanup makes it easier for human readers to understand what each of the fields actually represents, as well as makes it easier to modify what the macros actually do under the covers, without introducing potential human errors. No functional change intended. MFC after: 1 week --- sys/dev/asmc/asmc.c | 61 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 880da33ad9f3..b5cf123bd99f 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -134,31 +134,46 @@ struct asmc_model { static const struct asmc_model *asmc_match(device_t dev); -#define ASMC_SMS_FUNCS asmc_mb_sysctl_sms_x, asmc_mb_sysctl_sms_y, \ - asmc_mb_sysctl_sms_z - -#define ASMC_SMS_FUNCS_DISABLED NULL, NULL, NULL - -#define ASMC_FAN_FUNCS asmc_mb_sysctl_fanid, asmc_mb_sysctl_fanspeed, asmc_mb_sysctl_fansafespeed, \ - asmc_mb_sysctl_fanminspeed, \ - asmc_mb_sysctl_fanmaxspeed, \ - asmc_mb_sysctl_fantargetspeed - -#define ASMC_FAN_FUNCS2 asmc_mb_sysctl_fanid, asmc_mb_sysctl_fanspeed, NULL, \ - asmc_mb_sysctl_fanminspeed, \ - asmc_mb_sysctl_fanmaxspeed, \ - asmc_mb_sysctl_fantargetspeed - -#define ASMC_LIGHT_FUNCS asmc_mbp_sysctl_light_left, \ - asmc_mbp_sysctl_light_right, \ - asmc_mbp_sysctl_light_control +#define ASMC_SMS_FUNCS \ + .smc_sms_x = asmc_mb_sysctl_sms_x, \ + .smc_sms_y = asmc_mb_sysctl_sms_y, \ + .smc_sms_z = asmc_mb_sysctl_sms_z + +#define ASMC_SMS_FUNCS_DISABLED \ + .smc_sms_x = NULL, \ + .smc_sms_y = NULL, \ + .smc_sms_z = NULL + +#define ASMC_FAN_FUNCS \ + .smc_fan_id = asmc_mb_sysctl_fanid, \ + .smc_fan_speed = asmc_mb_sysctl_fanspeed, \ + .smc_fan_safespeed = asmc_mb_sysctl_fansafespeed, \ + .smc_fan_minspeed = asmc_mb_sysctl_fanminspeed, \ + .smc_fan_maxspeed = asmc_mb_sysctl_fanmaxspeed, \ + .smc_fan_targetspeed = asmc_mb_sysctl_fantargetspeed + +#define ASMC_FAN_FUNCS2 \ + .smc_fan_id = asmc_mb_sysctl_fanid, \ + .smc_fan_speed = asmc_mb_sysctl_fanspeed, \ + .smc_fan_safespeed = NULL, \ + .smc_fan_minspeed = asmc_mb_sysctl_fanminspeed, \ + .smc_fan_maxspeed = asmc_mb_sysctl_fanmaxspeed, \ + .smc_fan_targetspeed = asmc_mb_sysctl_fantargetspeed + +#define ASMC_LIGHT_FUNCS \ + .smc_light_left = asmc_mbp_sysctl_light_left, \ + .smc_light_right = asmc_mbp_sysctl_light_right, \ + .smc_light_control = asmc_mbp_sysctl_light_control #define ASMC_LIGHT_FUNCS_10BYTE \ - asmc_mbp_sysctl_light_left_10byte, \ - NULL, \ - asmc_mbp_sysctl_light_control - -#define ASMC_LIGHT_FUNCS_DISABLED NULL, NULL, NULL + .smc_light_left = asmc_mbp_sysctl_light_left_10byte, \ + .smc_light_right = NULL, \ + .smc_light_control = asmc_mbp_sysctl_light_control + +#define ASMC_LIGHT_FUNCS_DISABLED \ + .smc_light_left = NULL, \ + .smc_light_right = NULL, \ + .smc_light_control = NULL static const struct asmc_model asmc_models[] = { { From nobody Fri Feb 20 09:21:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHPrS6fd5z6SVsm for ; Fri, 20 Feb 2026 09: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 4fHPrS62kfz40Tf for ; Fri, 20 Feb 2026 09: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=1771579288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Vz82Axk3FvIn4a9yrYC4G1iweSFwDOaT9A+EhyAnew=; b=ayw+ZS71IukaiNqUdB9tg2sKGUQOcYdo2gwQUU29G7YtLwQE33PotPEvv+XIgJ5u1f5elz Ign04omnUrL4vU/W50f5/mBXvI++sjLeMvuxRsEAQQHegS7xAHJby1PJYZNh0ts7ElvPFu o47WR0HfExxOOLJKjhvlN5L+oXiKsct4sv21e0frdU9dSy7AZmZ0+9QzbWEVREjObcNfWY 3Zgvu5SoavLim45z+PfVz6FujlEyQnAnr5UD/g082zXc9wcDN89AsRVvWNX1QbeKYrXpiU 18nzVIz8uifCC3fwW6w8MuGtqVOE9NE0keMAlrTT71xdQql4+C5otGOl1IhZrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771579288; a=rsa-sha256; cv=none; b=ik+B9L5NguhTDZx8SvD3YcWCGcwvMBKVjS2vf/AYX3kyd1/t1XYkxd0fOmPaoQQYnr61Zm t5JaLiMtv06xGJUuI8GrTZtiMcUlFxpiqDgarkkkdYdQJD1CBrHxSyrCH9kZXxfJn4MWOU u53ATpCklswPZ2DraJsjhtYiHtamAcxRdFEcIZQUtP3LFIZKet7cYykVfL6g+7H0f3SvbI /OITT5NWbDUhGtglVlo/sjzvnrKBaQsK7KJBZ63cGyUi+ENpZ2j3djRCLH0k7gRpFR4/Em mvjFwZkbJ06zo9XsDBFw2UabegOD4r+UCXGOvVqVMiDuUmvttf10WL8LvtbiKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771579288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Vz82Axk3FvIn4a9yrYC4G1iweSFwDOaT9A+EhyAnew=; b=t+5G4lTBVl/Jef/zpSnH5q41ZiSgbMwXC6Pi/gD5RLINHpDDWbm/gyyKuzz7zXrabUkLPp bI7/YYIRgy/mkO3DckV/N3w/sozz39QzflcncQ/7ZYvuZPJ4PLwbiPr1demPGJ2B38W1wq 70h5EjG0upl2KtLdPe92JYzf6YSBm2fsVFDJ2efk6r/eigXxcMLR/y2mLr5cwNAkFraL/k WZoA2fmc/3i1lBFb/tweaAZQEem6ERQoCoazQqtWXhoBeVK7J1Dt4g/eByAl6Kws5I8tFC bTNs5cDFVgDm+rYiAErjI9kBkKRUL5q5GSRW/knHVmouLUf0cZXvXA4IikLBoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHPrS5dskz61k for ; Fri, 20 Feb 2026 09:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e278 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 09:21:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 1635ba90615a - main - gre tests: Add required_kmods to gre netlink test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1635ba90615a5d9342604d495b71ac5380030b36 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 09:21:28 +0000 Message-Id: <69982798.1e278.7d6843e6@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=1635ba90615a5d9342604d495b71ac5380030b36 commit 1635ba90615a5d9342604d495b71ac5380030b36 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-20 07:50:20 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-20 07:50:20 +0000 gre tests: Add required_kmods to gre netlink test Fixes: e1e18cc12e68 Differential Revision: https://reviews.freebsd.org/D54443 --- tests/sys/netlink/test_rtnl_gre.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/netlink/test_rtnl_gre.c b/tests/sys/netlink/test_rtnl_gre.c index 12ecc8d14230..271723d6c50c 100644 --- a/tests/sys/netlink/test_rtnl_gre.c +++ b/tests/sys/netlink/test_rtnl_gre.c @@ -80,6 +80,7 @@ ATF_TC_HEAD(test_rtnl_gre, tc) { atf_tc_set_md_var(tc, "descr", "test gre interface using netlink"); atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "netlink if_gre"); } ATF_TC_BODY(test_rtnl_gre, tc) From nobody Fri Feb 20 10:13:25 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0P5HNpz6SZ7G for ; Fri, 20 Feb 2026 10:13: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 4fHR0P3rrMz442N for ; Fri, 20 Feb 2026 10:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXRNRWzD5v08WFhnGddPgxhEV0APEwJKDfRvOFfGvSw=; b=A9cPk8dnkwNP1r3YXBzECFqtk3zEiCz6p4X1fzNnFH6B5PB07d20YoZ0ICGqdKP6YaWRMN L1T+O3rT0vnbRn/20by/3xRhbCK6LyaSjXGrxGhXUeLQokbluJ2h5nIdOfkAqk8GpFCJjA FyiRFrCW12MtyUcy13B8CHVwHpNkQe3/ZAwWUkzlUNSy9jY8KgpbgDTuzHpwYoGe7SMK/4 BvtrX/k5wNVg6PW/AbMOFP7UUJyKwI2JUKTEZKt+XSIskJjOhW19C18CFUALhnosSsoKN/ gK40c+0o+cA1DKS8ws6aA7SmD50m39XNs0erNo1SGkB7t7QQ8Jvzp44GJgUQpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771582405; a=rsa-sha256; cv=none; b=EaDNdhSqqkVgBqTZzvwBm852zIGXFzg9FIVcvF4HSvkkDgBUcawvAhzoX85KhzqG38h3GE Rln0SI0hCSfwB7Se3FK8sYBD/9mdTGPgTVcHlyq50SU5/eByLDIlEbb5U8a2d3i3hCv/lS 6nFPYgfdkNorMddh2CBgW02X5NAwrpAx7gLmMnpMaaGLYdifr++ElervhptnmWXgJ0jS9V niduS4cmiSH+HN9o58zNtI2GADysWYiOs9GbrK8OyIbZqLhrQB/F+xeR5tkdagsXxqjGlX tGxwXg22+t22WJBHWk3H9nkYi2jfOInS83ubgrd7jH0prxUzOpBCyF4cI/KlTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXRNRWzD5v08WFhnGddPgxhEV0APEwJKDfRvOFfGvSw=; b=GUYVhM0lHmQYHthWernn0GVkR55T0prBO5gWHhfRwXfew8MWLzfdubktlYsQgf0CLYoSrB mDEQABmMpnzWmgjDlrx1YcFss31kaZ7RUxB3ofJLn5jNPgWLuhlrjlojX7EvSQbsyhy07s ruLAVlJXPAa5Zt9u3D4lAQhWNJfuwz1v1V3wEGvWsNNk3KIACewHuD0Pffr6cuCMuSjMO9 urzvlNHCfmj3kk0j4Bu9cif26afooCWMOw/vTlnBRxYg6KfvlwjyVAC11N0Pz6gonDHh9O fYidBTtg5pwFuqqIW0dGlh+St7LHWfBqJyJhgpIQNIUL1funBQyJLE93ZgXBVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0P36J3z7r0 for ; Fri, 20 Feb 2026 10:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ae6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 10:13:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: b69a396de211 - main - hwpstate_amd(4): CPPC: Allow attaching even if CAPABILITY_1 cannot be read List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b69a396de211feb1dcfe6a7e95d1b23ae53f916a Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 10:13:25 +0000 Message-Id: <699833c5.23ae6.70f7062d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b69a396de211feb1dcfe6a7e95d1b23ae53f916a commit b69a396de211feb1dcfe6a7e95d1b23ae53f916a Author: Olivier Certner AuthorDate: 2026-02-09 17:19:51 +0000 Commit: Olivier Certner CommitDate: 2026-02-20 10:12:53 +0000 hwpstate_amd(4): CPPC: Allow attaching even if CAPABILITY_1 cannot be read If that MSR cannot be read, we fallback to defaults specified by the ACPI specification, as we are already doing when the minimum and maximum values in there look bogus. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55252 --- sys/x86/cpufreq/hwpstate_amd.c | 45 ++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index bbb8f5b864f8..72fe6dbf6014 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -772,7 +772,10 @@ enable_cppc_cb(void *args) uint64_t lowest_perf, highest_perf; int error; - /* We proceed sequentially, so we'll clear out errors on progress. */ + /* + * We proceed mostly sequentially, so we'll clear out errors on + * progress. + */ data->res = HWP_ERROR_CPPC_ENABLE | HWP_ERROR_CPPC_CAPS | HWP_ERROR_CPPC_REQUEST | HWP_ERROR_CPPC_REQUEST_WRITE; @@ -784,9 +787,9 @@ enable_cppc_cb(void *args) data->res &= ~HWP_ERROR_CPPC_ENABLE; error = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &data->caps); - if (error != 0) - return; - data->res &= ~HWP_ERROR_CPPC_CAPS; + /* We can do away without CAPABILITY_1, so just continue on error. */ + if (error == 0) + data->res &= ~HWP_ERROR_CPPC_CAPS; error = get_cppc_request(sc); if (error != 0) @@ -804,20 +807,28 @@ enable_cppc_cb(void *args) /* Enable autonomous mode by setting desired performance to 0. */ SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); /* - * When MSR_AMD_CPPC_CAPS_1 stays at its reset value (0) before CPPC - * activation (not supposed to happen, but happens in the field), we use - * reasonable default values that are explicitly described by the ACPI - * spec (all 0s for the minimum value, all 1s for the maximum one). - * Going further, we actually do the same as long as the minimum and - * maximum performance levels are not sorted or are equal (in which case - * CPPC is not supposed to make sense at all), which covers the reset - * value case. + * Assuming reading MSR_AMD_CPPC_CAPS_1 succeeded, if it stays at its + * reset value (0) before CPPC activation (not supposed to happen, but + * happens in the field), we use reasonable default values that are + * explicitly described by the ACPI spec (all 0s for the minimum value, + * all 1s for the maximum one). Going further, we actually do the same + * as long as the minimum and maximum performance levels are not sorted + * or are equal (in which case CPPC is not supposed to make sense at + * all), which covers the reset value case. And we also fallback to + * these if MSR_AMD_CPPC_CAPS_1 could not be read at all. */ - lowest_perf = BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, data->caps); - highest_perf = BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, data->caps); - if (lowest_perf >= highest_perf) { - lowest_perf = 0; - highest_perf = -1; + lowest_perf = 0; + highest_perf = -1; + if (!hwp_has_error(data->res, HWP_ERROR_CPPC_CAPS)) { + const uint64_t lowest_cand = + BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, data->caps); + const uint64_t highest_cand = + BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, data->caps); + + if (lowest_cand < highest_cand) { + lowest_perf = lowest_cand; + highest_perf = highest_cand; + } } SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_MIN_PERF_BITS, lowest_perf); From nobody Fri Feb 20 10:13:26 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0R18NBz6SZ7H for ; Fri, 20 Feb 2026 10:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHR0Q58tbz442V for ; Fri, 20 Feb 2026 10:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NX7iQZqc3Z5t2Ket1EfOzAwtPmFOaMW2Un2HRP0h0gM=; b=hEjZv79L0OfGSBEDhNaKOwzTyv+fB7rEYQPOvYWE47MXRvKppvCpOp6HOOl3IGwvVVx9qK 1+yRVtE8Gw9QwyViLsBwum73GSmOofnjhsU1N+lj+YncsTcX4XPJjtOJD2uCiTYMX1ld/J zkna06uoYRg2nxFsQ4lUwA+fVQC1KeBqkaUtu05AO2p/kXaCBgclGCRm7BB5R1YN+25LI0 BjS3W4kEu6ywVM2Mi5YHhyYSWD1be2MH+6kTF1568NEvzvJwCqO88STabI2a0nOUg9gM4q KXE8nvJz++h+uMYMG0nOpTvqH2uljxgkJ/wTa6WG51OrGR7ETNoG69TBgB7YOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771582406; a=rsa-sha256; cv=none; b=tAGUcnbxV2rpgeyXcQr5rEBs62N9fwvGNar39b7BHpyqdv2N9QCpV0GQkfCUJ3b4t7HvyR CZu9NGCE3z6LzVZszcTEJMlwv1oi6g9xp44S6l1T67Ylyl9Aup+ajOuyzD1+ToLucG2rST Y7FqLnnm7G1oYzBGzq+IY8Ax7Nr6eDq5yZVudZzkTKontYLIdN6Ex+eevnM34aMkxI1XVk KVUvYxch2Gx8VvImMK6XnQEPxtNtYtcd97kOF8qPMsk9oFO1CsDFV3vXO3PGWOuwDoAvjY iBwYChzW5K7N3h2EcZlzAXWFqne9wjW+Xis2xVHjTSxqJFvGdXhvnwy02ssiwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NX7iQZqc3Z5t2Ket1EfOzAwtPmFOaMW2Un2HRP0h0gM=; b=Ct5HJjnU6v7v+ivDswuytuZlFwAVd7CuUNIeguBEd5YEyrg6MtolYutMy9ZmDil8l4j6zX fSrEnGAXl0CKQtL0Fv3RZBIOX1lVXAGdSVsbLvWmVY/3UxhBPfyfbvpf6KuoYqCEGt2ccm 69271XsP7+CKIvkG6wO2+xeFskoXZc+D8gkHE+HHT12mQ1s9uwgBFkgRcI+OxSxG7wHe/Z Cvhc6ngcV63guvFQZRt9E20TUDXXYdZEDgxy/PRGRc2n7lT0GYNzJPyGlm5DQKPO0gvalV bOEKfoEPIYJRGlZvFuATLSIWByoRj+Q6O9o3p/m187706wB3hf7Q0L36nGgG1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0Q3wpbz85v for ; Fri, 20 Feb 2026 10:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 10:13:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 80d32a6b1d73 - main - hwpstate_amd(4): CPPC: Switch the default to maximum performance List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80d32a6b1d73e0c81303417fa280ac74ef1f417a Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 10:13:26 +0000 Message-Id: <699833c6.217e1.1d5ae896@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=80d32a6b1d73e0c81303417fa280ac74ef1f417a commit 80d32a6b1d73e0c81303417fa280ac74ef1f417a Author: Olivier Certner AuthorDate: 2026-02-09 17:45:07 +0000 Commit: Olivier Certner CommitDate: 2026-02-20 10:12:53 +0000 hwpstate_amd(4): CPPC: Switch the default to maximum performance Set controls to maximum performance to avoid regressions now that CPPC is activated by default and to match what the P-state support does. Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55253 --- sys/x86/cpufreq/hwpstate_amd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 72fe6dbf6014..a1586f58166a 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -798,14 +798,6 @@ enable_cppc_cb(void *args) data->init_request = sc->cppc.request; data->request = sc->cppc.request; - /* - * In Intel's reference manual, the default value of EPP is 0x80u which - * is the balanced mode. For consistency, we set the same value in AMD's - * CPPC driver. - */ - SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_EPP_BITS, 0x80); - /* Enable autonomous mode by setting desired performance to 0. */ - SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); /* * Assuming reading MSR_AMD_CPPC_CAPS_1 succeeded, if it stays at its * reset value (0) before CPPC activation (not supposed to happen, but @@ -834,6 +826,16 @@ enable_cppc_cb(void *args) lowest_perf); SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_MAX_PERF_BITS, highest_perf); + /* + * Set controls to maximum performance to avoid regressions now that + * CPPC is activated by default and to match what the P-state support + * does. + */ + SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_EPP_BITS, 0); + /* 0 in "Desired Performance" is autonomous mode. */ + MPASS(highest_perf != 0); + SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_DES_PERF_BITS, + highest_perf); error = wrmsr_safe(MSR_AMD_CPPC_REQUEST, data->request); if (error != 0) From nobody Fri Feb 20 10:13:28 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0T10xBz6SZPc for ; Fri, 20 Feb 2026 10:13: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 4fHR0S64mFz44K4 for ; Fri, 20 Feb 2026 10:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P+Y9YOORVtvrn1lCTEtnqrXBYqUF43fZNXiTfCkejR4=; b=hh1DSoImy611QMY8rN47nbzaIAPHfgsELsa0ciAcpArr7pRm0tzJG4gEYrThKcw2XGU3Fx JjTyvq/xEBgjRO25GAEaWTzBtuo/g1pDYbF11AiwndA9fs0XnJ77bETgr69GU590aHCxIB lLxpbHVrK8mR6tNJ2e2qD7xtrRdwbt2jL86nClc0Y+1eqraNn6FTHrgNihynWw6PeIB9B4 +ZgHfOHhNX5QnrWkgNB3aFaUxFZqiLw+pixQKc4qsDtTdoJGDjKChTprCK9hnMhE5la9A9 Uv5WMkuK0lx4yvr6BjZVFIM2LtUIDVH7F24ZDCgIEnsOQf8l5hYMPy06DxUQhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771582408; a=rsa-sha256; cv=none; b=WJZIGEmrhQ8wwOA9YfQKJteL7O2vwUbA2lryRaBehPlJlW7642gfI/B8YgxSfl+kFxOhlr 55EfFkTggDfmrcyVaOg5WKdSBNzG5xHuX/0tNW7CxJA3Uo1mm9JUoGNWMA+ZQ75s3zfGc8 AwYnHn6oGeQBne/GItvWsJxSdB9RtIcOpv8RrAnpeMmTObbNxPFWvSDyLeSibV5CP9KVTm qQgNzuu8HIAcKbLmABww6/9J2SV+r0NzAd7Da8Q4xXhtPG4X1EcHE1nZsX0P7tU6NFy1yL v4pp2I3GFgaN+FM//uWum902yEMk/Q8lsYpwRG8y5PkDMoktwcNXP70YadaO2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P+Y9YOORVtvrn1lCTEtnqrXBYqUF43fZNXiTfCkejR4=; b=OgXeBsHHwSyhKu0Wk9cYBQ3QjLSXinFYLDQ/otw7lEp0gXzrXCPDKxu3K8G9nqJbqQpjfm JBwjkN6H1xTB5I9DwupDULfzHNuh3CF9eaIeIEB7QksgVP4kNaIL8GgQfU9877vajPR3cp dAnD2hpWD+NUBHuvkXOWe9b6PooboA9taqVxzW2GJn4ToOiYFUxacNgT885zLbv6Y5HqPh 3VQ9ne1xbq5a6ekhZe+/FCpr0Egx2bQRDcEF+mH7cZOMdUzj2ELNOvr0xyaiH2dpAOGn9/ +GsUUYvv0ZSesSCSXhZqjhb2baVOrRhxAJbMzqzWGlDSVG8XIYWGvzh6adiguw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0S5bDqz7gy for ; Fri, 20 Feb 2026 10:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 10:13:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f1b93fc50f01 - main - hwpstate_amd(4): Fix punctuation in 'desired_performance' knob's description List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1b93fc50f019c122636d6f8780f109d7be26862 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 10:13:28 +0000 Message-Id: <699833c8.217e7.41f6ed56@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f1b93fc50f019c122636d6f8780f109d7be26862 commit f1b93fc50f019c122636d6f8780f109d7be26862 Author: Olivier Certner AuthorDate: 2026-02-20 09:17:24 +0000 Commit: Olivier Certner CommitDate: 2026-02-20 10:12:54 +0000 hwpstate_amd(4): Fix punctuation in 'desired_performance' knob's description To be consistent with that of the others. No functional change. Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index a1586f58166a..2649fcc5779f 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -1040,7 +1040,7 @@ hwpstate_attach(device_t dev) CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, AMD_CPPC_REQUEST_DES_PERF_BITS, sysctl_cppc_request_field_handler, "IU", - "Desired performance level (from 0 to 255, " + "Desired performance level (from 0 to 255; " "0 enables autonomous mode, otherwise value should be " "between 'minimum_performance' and 'maximum_performance' " "inclusive)"); From nobody Fri Feb 20 10:13:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0S1qrxz6SZ7K for ; Fri, 20 Feb 2026 10:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHR0R5HZjz44Rl for ; Fri, 20 Feb 2026 10:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STJXXtEcyO8R6CbZzBrBhJyJjOxpbGDnbbhCR1Zaf1A=; b=JLgwIQ0i2K1fzBTVv6BPd2b2Y5Uvkxbuh4FEnhE3GDoFoxVHF7yJv5C1FIwc8odOi3ORgk AU6toAxfE3x9UeAKhno30KdosLhjDe3Bu6fgAJeV6EXeKR0PionN3PlOPLcFiPy4VXfv+Q Ed0mll7zETgeh1dSyYvxfaW/hBej4NZsiM9JEMVlJddwMQfZhnD1jY6QXs7gWNTzsB43/c ZADhvzD2D+Fjt2w5Xc/tKFOOUr9qwMLY1sPC0+YuXFeNg+rr8oxOG4BaOsb561Cywy8YTG LsyQNNNl81pM7Ub5sJttY5rcqaYAyTrGsTstvPk2RY0DjQb3TAYTXXZRu5cPZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771582407; a=rsa-sha256; cv=none; b=MfPyV4h35+H6dy16mumnQvcdmx7iAKTiFvryNODe7/EGPSPXXUk28aEAC0bRbwjK8Ky8gj FWMJwPNTehok4a44DfrnibAUzBlZqCe0klxyXDmYw//KdkNTVzLkioadOe2r/3qfkgjcne /sNNXuMlJYoTrFR0i5RlYKDJuC/yyELZp8dmmuydkme2jl7gZY4A/dbUdmgUSQheAD027t MohT3ViI5XLO4gEY0l4ivcK137k7BTHO2VI3dN1M7C8lSSQyVUj0YMHWHdyezY5fUPFqcK LOG1RPreqhc9sJIHuHtMcyP4Naz2HpOU7tgHlP/+xjSonPMVQ9VBoqtnXlt+fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STJXXtEcyO8R6CbZzBrBhJyJjOxpbGDnbbhCR1Zaf1A=; b=JPw/Z+2/ipC+5XoAkiZ6Sal4xjbZPPqCPPp94PTQP26MMr6J6ZGXo1pmKn0mTlxEyQvp57 0D6o2tzWEIc7KX/QuEjI0TcB+2+lH0WptsSEGzs7OOd0XGcIiSzmhz+D2G8Xky8lilWNwZ 4gPc7wlRocP9ZDprnjGF/ZFzVDDvXhK3z8rG0KjZyjZMcuUebtfoddEJfVcjYazSXj3fkW M+SK313Q0ziRny+mGaYQYHwpH4bcU9wr1K78v04AOLRgKw5/+DhN4p0h9c+C+ywK2AY3en 9YyQFv18BnQb0ANiUcX8KOtjCEisWk77+iHbjimsJwz+FsEJ+7iJ2qc3yJiUgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0R4lKcz7gw for ; Fri, 20 Feb 2026 10:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23d3d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 10:13:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 953b9164c3d9 - main - cpufreq(4): cpufreq_levels_sysctl(): Remove always false NULL test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 953b9164c3d93e820a53b4fdebbde7fabb7b7644 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 10:13:27 +0000 Message-Id: <699833c7.23d3d.e4a9f9f@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=953b9164c3d93e820a53b4fdebbde7fabb7b7644 commit 953b9164c3d93e820a53b4fdebbde7fabb7b7644 Author: Olivier Certner AuthorDate: 2026-02-12 12:33:46 +0000 Commit: Olivier Certner CommitDate: 2026-02-20 10:12:53 +0000 cpufreq(4): cpufreq_levels_sysctl(): Remove always false NULL test 'sc->levels_buf' is initialized with malloc(M_WAITOK), so can never be NULL. Another sysctl handler function (cpufreq_curr_sysctl()) already relies on that. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/kern/kern_cpu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c index 1fb3d8002c7f..03d2d38e1749 100644 --- a/sys/kern/kern_cpu.c +++ b/sys/kern/kern_cpu.c @@ -1002,16 +1002,12 @@ cpufreq_levels_sysctl(SYSCTL_HANDLER_ARGS) struct sbuf sb; int count, error, i; - sc = oidp->oid_arg1; sbuf_new(&sb, NULL, 128, SBUF_AUTOEXTEND); /* Get settings from the device and generate the output string. */ - count = CF_MAX_LEVELS; + sc = oidp->oid_arg1; levels = sc->levels_buf; - if (levels == NULL) { - sbuf_delete(&sb); - return (ENOMEM); - } + count = CF_MAX_LEVELS; error = CPUFREQ_LEVELS(sc->dev, levels, &count); if (error) { if (error == E2BIG) From nobody Fri Feb 20 10:13:24 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0T3lc2z6SZ2y for ; Fri, 20 Feb 2026 10:13: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 4fHR0N2tC9z44RY for ; Fri, 20 Feb 2026 10:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MT8t/IWWBjoWJaWaUHuElYqTxI9V1VzFji3ALAeOuhI=; b=BWnbeqtkLj5ApypK2LnSCQA6AztNgaZvabVuGueULAAoC9B0c8mgGuTVH/UH27mwIMOmRa e3bGibVsgSwiZajTjKZMirLSYgwtsoQo0EghqvfUE2/McHX3X2lpuT5cJm0vkbN10Fx7GS wjzIXQvysTldPJOFP1DZ/phdF/F5mO3KE1TW4I830sO05l6kANjlSUtrDG3h+RMa1psw05 UKBMtkrGTmWtFWIIDAb/83oPa8U7rjGEMnhJRCxst7BDPHZVugOnE2+veopbCthwTqmdZD 45xJHOQftY/BNfmbfdfiRjPXXhuaQwzyj10Zk6kdo+LWUO/rnm3NKUnpGDyHIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771582404; a=rsa-sha256; cv=none; b=K2Q21eFR0Svn10zSzwek2NqAXQbQG0VLCtEwSzGGQWq/i9Jhi6oDuvJc8nI1B8XJfxJsog ++AuGVSPqNZuiYTzHpznupU5K+588u2rL799RBv4R+MYBxCN8RixAsV8zWvxXekd0hBo2m q4cSWtMZYkaccrvkpQKUso3Z2LgLBOWDHcSzOMFmm6E/IzYU6VnjTpN3eQUYAkF0hpsEGm sMCU7filmko7wzvpgeaYkHjkjmYr9PFEHmTraLPW2BJYZZGfxSE8ovLs4WjueU73ZbwWEB nXFulKjRv+B1sZdMtibcxzCMgGcu2vZhJQRhzsDeJdfxYbV/kEObnEe6B866ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771582404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MT8t/IWWBjoWJaWaUHuElYqTxI9V1VzFji3ALAeOuhI=; b=eidEBrNHM/5FeHiVunilDTYhorM8RwDkovBzknDzYUICABFqqc/hfh/Xbwt5+wHFeId8N0 7Ut9+Mo+7JVKE/s64zdIgxhlSi7O31faJnBSYbIY1KK+8Tz+gv6LTqvJDcf1mrbE0rD26B p2FmLP0ev1a/ynB3Ug0JYej/nVIctng04L1sBEDJQhIWDcIEI63Usn+1woOILL9WMHy3z3 juQOKGLV56UOanMw96vHiNgv9WeepGsNWrh6WrC4EHD6agqdoQH1LDw14+x5NcszEbh9bc NbgSKsynX0mPTw3KDwE9U7R+fs+DN1Lw580BAgc6CkQ0UXc6p/VWhVdUS/nIdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHR0N2Hwsz7sc for ; Fri, 20 Feb 2026 10:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22bd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 10:13:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7f36d7a9505a - main - hwpstate_amd(4): Consistency of cached CPPC_REQUEST value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f36d7a9505ab21f67ed806b18fbbe365043ed50 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 10:13:24 +0000 Message-Id: <699833c4.22bd3.31fcb79a@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7f36d7a9505ab21f67ed806b18fbbe365043ed50 commit 7f36d7a9505ab21f67ed806b18fbbe365043ed50 Author: Olivier Certner AuthorDate: 2026-02-09 16:21:57 +0000 Commit: Olivier Certner CommitDate: 2026-02-20 10:12:48 +0000 hwpstate_amd(4): Consistency of cached CPPC_REQUEST value If writing to the CPPC_REQUEST MSR fails, make sure we do not set the softc's 'cppc.request' field to the intended new value. Both set_cppc_request_cb() and enable_cppc_cb() were changed to this effect. In case enable_cppc_cb() could not read CPPC_REQUEST, mark that through a new softc flag, HWPFL_CPPC_REQUEST_NOT_READ, so that we do not keep and use a wrong value when the content of CPPC_REQUEST is read/written through sysctl(9) knobs, but instead retry reading the MSR (this is the purpose of the new get_cppc_request() sub-function). When setting CPPC_REQUEST has failed, distinguish the case where it could not be read at all from the case where it could not be written, by respectively returning EIO and EOPNOTSUPP in these cases. The previous return value of EFAULT was confusing as sysctl(3) documents it as happening if the passed arguments are invalid. While here, add some herald comment before sysctl_cppc_dump_handler() clarifying that the intent of this function is to always query the hardware directly, bypassing any cached value in the softc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55251 --- sys/x86/cpufreq/hwpstate_amd.c | 139 ++++++++++++++++++++++++++++++++--------- 1 file changed, 108 insertions(+), 31 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 7e845e172620..bbb8f5b864f8 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -149,7 +149,8 @@ struct hwpstate_setting { int pstate_id; /* P-State id */ }; -#define HWPFL_USE_CPPC (1 << 0) +#define HWPFL_USE_CPPC (1 << 0) +#define HWPFL_CPPC_REQUEST_NOT_READ (1 << 1) /* * Atomicity is achieved by only modifying a given softc on its associated CPU @@ -321,6 +322,9 @@ get_cppc_regs_cb(void *args) data->res |= HWP_ERROR_CPPC_REQUEST; } +/* + * Debug: Read all MSRs (bypassing the softc) and dump them. + */ static int sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) { @@ -364,26 +368,58 @@ sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) return (error); } +/* + * Read CPPC_REQUEST's value in the softc, if not already present. + */ +static int +get_cppc_request(struct hwpstate_softc *const sc) +{ + uint64_t val; + int error; + + check_cppc_in_use(sc, __func__); + + if ((sc->flags & HWPFL_CPPC_REQUEST_NOT_READ) != 0) { + error = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &val); + if (error != 0) + return (EIO); + sc->flags &= ~HWPFL_CPPC_REQUEST_NOT_READ; + sc->cppc.request = val; + } + + return (0); +} struct set_cppc_request_cb { struct hwpstate_softc *sc; uint64_t request; uint64_t mask; - int res; /* 0 or HWP_ERROR_CPPC_REQUEST_WRITE */ + int res; /* 0 or HWP_ERROR_CPPC_REQUEST* */ }; static void set_cppc_request_cb(void *args) { struct set_cppc_request_cb *const data = args; - uint64_t *const req = &data->sc->cppc.request; + uint64_t *const sc_req = &data->sc->cppc.request; + uint64_t new_req; int error; - *req &= ~data->mask; - *req |= data->request & data->mask; + /* We proceed sequentially, so we'll clear out errors on progress. */ + data->res = HWP_ERROR_CPPC_REQUEST | HWP_ERROR_CPPC_REQUEST_WRITE; - error = wrmsr_safe(MSR_AMD_CPPC_REQUEST, *req); - data->res = error == 0 ? 0 : HWP_ERROR_CPPC_REQUEST_WRITE; + error = get_cppc_request(data->sc); + if (error != 0) + return; + data->res &= ~HWP_ERROR_CPPC_REQUEST; + + new_req = (*sc_req & ~data->mask) | (data->request & data->mask); + + error = wrmsr_safe(MSR_AMD_CPPC_REQUEST, new_req); + if (error != 0) + return; + data->res &= ~HWP_ERROR_CPPC_REQUEST_WRITE; + *sc_req = new_req; } static inline void @@ -396,6 +432,21 @@ set_cppc_request_send_one(struct set_cppc_request_cb *const data, device_t dev) set_cppc_request_cb, smp_no_rendezvous_barrier, data); } +static inline void +set_cppc_request_update_error(const struct set_cppc_request_cb *const data, + int *const error) +{ + /* A read error has precedence on a write error. */ + if (hwp_has_error(data->res, HWP_ERROR_CPPC_REQUEST)) + *error = EIO; + else if (hwp_has_error(data->res, HWP_ERROR_CPPC_REQUEST_WRITE) && + *error != EIO) + *error = EOPNOTSUPP; + else if (data->res != 0) + /* Fallback case (normally not needed; defensive). */ + *error = EFAULT; +} + static int set_cppc_request(device_t hwp_dev, uint64_t request, uint64_t mask) { @@ -404,29 +455,35 @@ set_cppc_request(device_t hwp_dev, uint64_t request, uint64_t mask) .mask = mask, /* 'sc' filled by set_cppc_request_send_one(). */ }; - int error; + int error = 0; if (hwpstate_pkg_ctrl_enable) { const devclass_t dc = devclass_find(HWP_AMD_CLASSNAME); const int units = devclass_get_maxunit(dc); - error = 0; for (int i = 0; i < units; ++i) { const device_t dev = devclass_get_device(dc, i); set_cppc_request_send_one(&data, dev); - if (data.res != 0) - /* Note the error, but continue. */ - error = EFAULT; + /* Note errors, but always continue. */ + set_cppc_request_update_error(&data, &error); } } else { set_cppc_request_send_one(&data, hwp_dev); - error = data.res != 0 ? EFAULT : 0; + set_cppc_request_update_error(&data, &error); } return (error); } +static void +get_cppc_request_cb(void *args) +{ + struct hwpstate_softc *const sc = args; + + (void)get_cppc_request(sc); +} + static int sysctl_cppc_request_field_handler(SYSCTL_HANDLER_ARGS) { @@ -439,6 +496,16 @@ sysctl_cppc_request_field_handler(SYSCTL_HANDLER_ARGS) /* Sysctl knob does not exist if HWPFL_USE_CPPC is not set. */ check_cppc_in_use(sc, __func__); + if ((sc->flags & HWPFL_CPPC_REQUEST_NOT_READ) != 0) { + const u_int cpuid = cpu_get_pcpu(dev)->pc_cpuid; + + smp_rendezvous_cpu(cpuid, smp_no_rendezvous_barrier, + get_cppc_request_cb, smp_no_rendezvous_barrier, sc); + + if ((sc->flags & HWPFL_CPPC_REQUEST_NOT_READ) != 0) + return (EIO); + } + val = BITS_VALUE(arg2, sc->cppc.request); error = sysctl_handle_int(oidp, &val, 0, req); @@ -709,6 +776,8 @@ enable_cppc_cb(void *args) data->res = HWP_ERROR_CPPC_ENABLE | HWP_ERROR_CPPC_CAPS | HWP_ERROR_CPPC_REQUEST | HWP_ERROR_CPPC_REQUEST_WRITE; + sc->flags |= HWPFL_CPPC_REQUEST_NOT_READ; + error = wrmsr_safe(MSR_AMD_CPPC_ENABLE, 1); if (error != 0) return; @@ -719,23 +788,21 @@ enable_cppc_cb(void *args) return; data->res &= ~HWP_ERROR_CPPC_CAPS; - error = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &sc->cppc.request); + error = get_cppc_request(sc); if (error != 0) return; data->res &= ~HWP_ERROR_CPPC_REQUEST; - /* The CPPC_REQUEST value before we tweak it. */ data->init_request = sc->cppc.request; + data->request = sc->cppc.request; /* * In Intel's reference manual, the default value of EPP is 0x80u which * is the balanced mode. For consistency, we set the same value in AMD's * CPPC driver. */ - SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_EPP_BITS, 0x80); - + SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_EPP_BITS, 0x80); /* Enable autonomous mode by setting desired performance to 0. */ - SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); - + SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); /* * When MSR_AMD_CPPC_CAPS_1 stays at its reset value (0) before CPPC * activation (not supposed to happen, but happens in the field), we use @@ -752,16 +819,16 @@ enable_cppc_cb(void *args) lowest_perf = 0; highest_perf = -1; } - SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_MIN_PERF_BITS, + SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_MIN_PERF_BITS, lowest_perf); - SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_MAX_PERF_BITS, + SET_BITS_VALUE(data->request, AMD_CPPC_REQUEST_MAX_PERF_BITS, highest_perf); - error = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->cppc.request); + error = wrmsr_safe(MSR_AMD_CPPC_REQUEST, data->request); if (error != 0) return; data->res &= ~HWP_ERROR_CPPC_REQUEST_WRITE; - data->request = sc->cppc.request; + sc->cppc.request = data->request; } static int @@ -784,9 +851,10 @@ enable_cppc(struct hwpstate_softc *sc) device_printf(dev, "CPU%u: CPPC enabled.\n", cpuid); /* - * Now that we have enabled CPPC, we can't go back, so we'll attach even - * in case of further malfunction, allowing the user to retry setting - * CPPC_REQUEST via the sysctl knobs. + * Now that we have enabled CPPC, we can't go back (hardware does not + * support doing so), so we'll attach even in case of further + * malfunction, allowing the user to retry retrieving/setting MSRs via + * the sysctl knobs. */ sb = sbuf_new(&sbs, NULL, 0, SBUF_AUTOEXTEND); @@ -802,11 +870,20 @@ enable_cppc(struct hwpstate_softc *sc) print_cppc_no_request(sb); else if (hwpstate_verbose) print_cppc_request(sb, data.init_request); - if (hwp_has_error(data.res, HWP_ERROR_CPPC_REQUEST_WRITE)) - device_printf(dev, "CPU%u: Could not write into " - MSR_AMD_CPPC_REQUEST_NAME "!\n", - cpuid); - else if (hwpstate_verbose) { + if (hwp_has_error(data.res, HWP_ERROR_CPPC_REQUEST_WRITE)) { + const bool request_read = !hwp_has_error(data.res, + HWP_ERROR_CPPC_REQUEST); + + /* This is printed first, as it is not printed into 'sb'. */ + device_printf(dev, "CPU%u: %s not write into " + MSR_AMD_CPPC_REQUEST_NAME "!\n", cpuid, + request_read ? "Could" : "Did"); + if (request_read) { + sbuf_printf(sb, "CPU%u: Failed when trying to set:", + cpuid); + print_cppc_request(sb, data.request); + } + } else if (hwpstate_verbose) { sbuf_printf(sb, "CPU%u: Tweaked MSR values:\n", cpuid); print_cppc_request(sb, data.request); } From nobody Fri Feb 20 10:38:58 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHRZ34QMCz6Sbx5; Fri, 20 Feb 2026 10:39:07 +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 4fHRZ33g1Mz47C2; Fri, 20 Feb 2026 10:39:07 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771583947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=hJh4Df+bug5TKDzlTuWvDmfE+bLVGbDLs9AEFVMecEo=; b=ESp53LwXzmoBNXjqbnGypl5ryiqkzZzQ3NH7e0oWPbE5WeyAOltgZY2a+BWGoB3fJ6vN5G coT5P6mkZzoScjdXDNSa3BlTUn2GUIJr7GdeA7bBMdml2044eukxHmnciQ2tjnomIyn6jY Yk+CaAK2UcO4xl6llERlWJhPWfgbH/rxWAOsDkqAz1cYAkGVZ5VyBWY36ovXOAeGgMsUrw Rl5Ivo2wZKERXzwRjTPbv+KGJuSuAs6jXJFI3ExLrAA2G6HTz02JYXtp6C2Q2SY03/n0Pz yaz1OAwjAyfN6PEmKQbHuT3FiscXwC5+qTL37cL8hJ/bJN1lEhUKtaWLR2iTtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771583947; a=rsa-sha256; cv=none; b=BJOsqtXB5NYf3RUxeoq5vKfLpSuXslcEDry3CFwLaO/b9gX4cDYcI7xiTPDb3BeD/hpfXo Z+zBY2NfYVCGYjl8MnIUtZib5BSNMSyggBP/8SXDauf3VpxkHcCiTKwkKr7R2yiOboFKLD 3386t/qrPnaxjaq4NRrrlpNhMKlVr12D4/GnJNw3V821QFliRuPrUgDhG5RsZumVAvC5jh bLnpTwCIBDbN4+Hmg6DARMLbJMxL/yxvEM4AwXhVsHb+hPW3zujK8bgYoa6uWhUHL5kbt2 Yvzyg5lY4Tu56mWg9dgt6D10eb6hICNmMvCKasduPpp35qsi7tFAMoTboiRS6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771583947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=hJh4Df+bug5TKDzlTuWvDmfE+bLVGbDLs9AEFVMecEo=; b=x16apPYkoq1Nhz8lUNULVnuE/1ryneVu/raxjwMdTkmD4HkJEw5NwQhxEaTJCGlZ3xq3t8 K4ZP/osMMlFUZb8PdTNBNKR3aczqoPdx09Mw6yc+6fLF6cwsOCKm6X4gJT/f2jrpDJIUmw gRX/dJT+9clfok9LdD1pqKWNFV9FCDBRMckB0NCaPX936Gp+pgafzduW0u31kFFOIejt+r cwJBywY8Cc5ToDpB5yv9LiFZ5rGV6j0OOg9H6jkgMTGv/H853WNc0ZsEvyyuhYlmtPl0ha auC6Lv+Ie6lWxQQBZoVF0Zw502lfeZuGwlnz2oJliYFo/tpTHTUd8g80Gz+veg== 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 4fHRZ24QrPzpYx; Fri, 20 Feb 2026 10:39:06 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, src-committers@freebsd.org Subject: Re: git: 80d32a6b1d73 - main - hwpstate_amd(4): CPPC: Switch the default to maximum performance Date: Fri, 20 Feb 2026 11:38:58 +0100 Message-ID: <2526843.bDOn7JOVgO@ravel> In-Reply-To: <699833c6.217e1.1d5ae896@gitrepo.freebsd.org> References: <699833c6.217e1.1d5ae896@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart6112671.8T7jmnknE8"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart6112671.8T7jmnknE8 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner Date: Fri, 20 Feb 2026 11:38:58 +0100 Message-ID: <2526843.bDOn7JOVgO@ravel> In-Reply-To: <699833c6.217e1.1d5ae896@gitrepo.freebsd.org> References: <699833c6.217e1.1d5ae896@gitrepo.freebsd.org> MIME-Version: 1.0 > The branch main has been updated by olce: > > URL: https://cgit.FreeBSD.org/src/commit/?id=80d32a6b1d73e0c81303417fa280ac74ef1f417a > > commit 80d32a6b1d73e0c81303417fa280ac74ef1f417a > Author: Olivier Certner > AuthorDate: 2026-02-09 17:45:07 +0000 > Commit: Olivier Certner > CommitDate: 2026-02-20 10:12:53 +0000 > > hwpstate_amd(4): CPPC: Switch the default to maximum performance > > Set controls to maximum performance to avoid regressions now that CPPC > is activated by default and to match what the P-state support does. > > Relnotes: yes > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D55253 > --- > sys/x86/cpufreq/hwpstate_amd.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) Sorry, forgot two tags here: PR: 292615 Tested by: cracauer (lent me a machine) Thanks. -- Olivier Certner --nextPart6112671.8T7jmnknE8 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmmYOcIACgkQjKEwQJce JifiIw//bauJulJnUisi6BZMqPO39rSXz1mSq/URf1tR6EIDHUTJ53Tyj+IGfVKa gym12gAsmN/AdoIc+78ywdWPzhQ8q03wyPduwChfLyWZym8TaN40foNQfJ+ykmPS TOxAE78b4YBg7R9OfUMGVWgwj1F/MeBH2NU/Xp+QMRFX9Wcf/6IuuSkm7uoPOFan 4tn3lUjW3XNWNAAz7kbkYxSUovnLDNhO05LIXAxUbN7BbCfL8wjXhpRAViCEZ9or /hT3mSEd6qLEgKLc6RIR2Q30o68NSSzr61grt+x6svfMPXqJNRnevJuQFjtpvxuV PbQdXrppggLvIF9HQC2207mGooPLRtkSdvgWxrf7R+UYxVaOTNaZjlwxKTnHtlk6 xJ6mO2gcbHQYjD3gXYuqvke5KZuX9MDsK9htR57tv6Bcv0LsvVRFDjHTAVBIkLiV B8Ezb9VpM/O4of/YW0XS0nm8bBCyEZxpSRtPR80xuvyXVzVTvKARFAltNqCYmG+y tgSyaac+0uQibL6Y0aL9FGdRAUpwTW+AZzyMQYDU4v/ZdhE+QbMqKZ3l7ChowVA0 A7BW0+crHvb/DfnejTIK6PkykDTPQLOolNQeztxLBNTiHj0XZQUy/KCcXKS9GeXV QPsPE6naBBnd8fVO/95/OxzQRq1VAjfqTJaei4dbS1A2b+LbozM= =Hxo9 -----END PGP SIGNATURE----- --nextPart6112671.8T7jmnknE8-- From nobody Fri Feb 20 14:06:47 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHX9g42j6z6SPc7 for ; Fri, 20 Feb 2026 14:06: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 4fHX9g3Xh5z3RTs for ; Fri, 20 Feb 2026 14:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771596407; 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=r8jiFcoFDG/QQEeHJiR8S6hDVgvfCKyQvMXOQjJ88dg=; b=GtLPBSZIm//ywCY+cSSxEbg9jh51MHDNz446tSW/ir/Wfo7xJ8nJyxHXuAaXCg6xLPBdxE 4D+fQN2OcnEBdSpIMWF/B7PBW01cymgqtXy/RYEINQELesm9/SUBlx8WYewtXtZJ3JVw6f IJ/pUHEQMOuFKnPYmZ38dPOsMQJBUxQvH7sG2lqjw2yH1e25HoMlpVbE0UpVDvBwNroKsI 5Vkwsg9tCoITBWmOY9+GekfTQtwLf7qBMOUJK7Eofkr2dlJhYZgF/YYjafEgCzo6Xobs62 px9QH7TpFOjaVmJ15muk7p/gCZ0VbhpbUyUv89g3pxpRv3lTm7xqesCdBIosvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771596407; a=rsa-sha256; cv=none; b=cXLhYFrclwVSuYkKq1hmoyAtG5YcgJY2G6uRQGT5gLc0x596cZ5DkQe7nZ19dzdGhQI67e WbDoIFAFv23+Ilug/gh1MWCtT1wINlrofOaHODpDHL7ouixTM5l7A24oGOHnLaARzszpvZ bVF8bznO5ygal3SX2RwdBTet9cLqP1xbb6nZfH7VLKIXVyRj4sSUD9bQynAyBhip655RHl 1V1hxBkv+5l0RpwnGMZ5934T1w4HRXURB0VCX68CeQvwyws/hMnZvXNN9jR8axHRrFDL1k hEHBZ0+iAf+plOT8d5+bNM3JepYmu73inq5DxUYRKuMUFET8tCnCZbKiv6nULw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771596407; 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=r8jiFcoFDG/QQEeHJiR8S6hDVgvfCKyQvMXOQjJ88dg=; b=aqb85iqzxlD/m/7iiSOD56pxk1qdfrVFRiHMAXvMY5DBZuuo/180MFfO3O8Gk5s4WhnHQB BPCWRG36GONpyj/bHQif212CarP+bw0VWBs40kLmcmB4X3mfdBq7tvZbfgwBNZFguTz4zJ O1GknJg7YJPt2qLS6JoeKMt9zhZSzDE+DVkhWVzdJJTnHLtwD2mdRG2akLjcD2loTGxGXZ J//yVzd0R2XpPageS7itpRhfUn/i6tBH94POQoJpLxlZk4bHwCQcoK21dD2rKHh6WiAloc IT10R4cQG4cp6piJ1hp+ADZNMEtbC8J9jlP+cZKWdrBKcVOwxmqAFtLkdUkSNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHX9g2cXCzX1Q for ; Fri, 20 Feb 2026 14:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c149 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 14:06:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 836ac989933b - main - fstyp: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 836ac989933bcd5b662979bfdec429a201c123a6 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 14:06:47 +0000 Message-Id: <69986a77.1c149.2d211d21@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=836ac989933bcd5b662979bfdec429a201c123a6 commit 836ac989933bcd5b662979bfdec429a201c123a6 Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:22:39 +0000 Commit: Ed Maste CommitDate: 2026-02-20 14:04:34 +0000 fstyp: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.sbin/fstyp/apfs.c | 2 ++ usr.sbin/fstyp/cd9660.c | 2 ++ usr.sbin/fstyp/exfat.c | 2 ++ usr.sbin/fstyp/ext2fs.c | 2 ++ usr.sbin/fstyp/fstyp.c | 2 ++ usr.sbin/fstyp/fstyp.h | 2 ++ usr.sbin/fstyp/geli.c | 2 ++ usr.sbin/fstyp/hammer.c | 2 ++ usr.sbin/fstyp/hammer2.c | 2 ++ usr.sbin/fstyp/hammer2_disk.h | 2 ++ usr.sbin/fstyp/hammer_disk.h | 2 ++ usr.sbin/fstyp/hfsplus.c | 2 ++ usr.sbin/fstyp/msdosfs.c | 2 ++ usr.sbin/fstyp/msdosfs.h | 2 ++ usr.sbin/fstyp/ntfs.c | 2 ++ usr.sbin/fstyp/ufs.c | 2 ++ usr.sbin/fstyp/zfs.c | 2 ++ 17 files changed, 34 insertions(+) diff --git a/usr.sbin/fstyp/apfs.c b/usr.sbin/fstyp/apfs.c index aeb459a1c3af..809e6fab6914 100644 --- a/usr.sbin/fstyp/apfs.c +++ b/usr.sbin/fstyp/apfs.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2019 Conrad Meyer . All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/fstyp/cd9660.c b/usr.sbin/fstyp/cd9660.c index e981a5978dd4..73a18b16edea 100644 --- a/usr.sbin/fstyp/cd9660.c +++ b/usr.sbin/fstyp/cd9660.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2004 Pawel Jakub Dawidek * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/exfat.c b/usr.sbin/fstyp/exfat.c index 8f8393b861fb..bb3d0eabed75 100644 --- a/usr.sbin/fstyp/exfat.c +++ b/usr.sbin/fstyp/exfat.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017 Conrad Meyer * All rights reserved. * diff --git a/usr.sbin/fstyp/ext2fs.c b/usr.sbin/fstyp/ext2fs.c index d7110f6896ce..90af4f986ee4 100644 --- a/usr.sbin/fstyp/ext2fs.c +++ b/usr.sbin/fstyp/ext2fs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2005 Stanislav Sedov * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/fstyp.c b/usr.sbin/fstyp/fstyp.c index dd06df33bbe2..853fdd839713 100644 --- a/usr.sbin/fstyp/fstyp.c +++ b/usr.sbin/fstyp/fstyp.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 The FreeBSD Foundation * * This software was developed by Edward Tomasz Napierala under sponsorship diff --git a/usr.sbin/fstyp/fstyp.h b/usr.sbin/fstyp/fstyp.h index d87cac456379..322f117dd29f 100644 --- a/usr.sbin/fstyp/fstyp.h +++ b/usr.sbin/fstyp/fstyp.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 The FreeBSD Foundation * * This software was developed by Edward Tomasz Napierala under sponsorship diff --git a/usr.sbin/fstyp/geli.c b/usr.sbin/fstyp/geli.c index 17d1faf8407f..aa4c1bc2c955 100644 --- a/usr.sbin/fstyp/geli.c +++ b/usr.sbin/fstyp/geli.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Allan Jude * All rights reserved. * diff --git a/usr.sbin/fstyp/hammer.c b/usr.sbin/fstyp/hammer.c index 45aee42fb53a..2785e42c9998 100644 --- a/usr.sbin/fstyp/hammer.c +++ b/usr.sbin/fstyp/hammer.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016-2019 The DragonFly Project * Copyright (c) 2016-2019 Tomohiro Kusumi * All rights reserved. diff --git a/usr.sbin/fstyp/hammer2.c b/usr.sbin/fstyp/hammer2.c index aeb29762fb6b..dfc4ef842cf1 100644 --- a/usr.sbin/fstyp/hammer2.c +++ b/usr.sbin/fstyp/hammer2.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017-2019 The DragonFly Project * Copyright (c) 2017-2019 Tomohiro Kusumi * All rights reserved. diff --git a/usr.sbin/fstyp/hammer2_disk.h b/usr.sbin/fstyp/hammer2_disk.h index 6efefe9a2495..5de82e205ffc 100644 --- a/usr.sbin/fstyp/hammer2_disk.h +++ b/usr.sbin/fstyp/hammer2_disk.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2011-2018 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project diff --git a/usr.sbin/fstyp/hammer_disk.h b/usr.sbin/fstyp/hammer_disk.h index 4b5182d7e868..87ecfab0cf09 100644 --- a/usr.sbin/fstyp/hammer_disk.h +++ b/usr.sbin/fstyp/hammer_disk.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2007 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project diff --git a/usr.sbin/fstyp/hfsplus.c b/usr.sbin/fstyp/hfsplus.c index bdeaaa3b397c..580f8974fec1 100644 --- a/usr.sbin/fstyp/hfsplus.c +++ b/usr.sbin/fstyp/hfsplus.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2019 Conrad Meyer . All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/fstyp/msdosfs.c b/usr.sbin/fstyp/msdosfs.c index cd0a67243a15..16db364ed430 100644 --- a/usr.sbin/fstyp/msdosfs.c +++ b/usr.sbin/fstyp/msdosfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2004 Pawel Jakub Dawidek * Copyright (c) 2006 Tobias Reifenberger * Copyright (c) 2014 The FreeBSD Foundation diff --git a/usr.sbin/fstyp/msdosfs.h b/usr.sbin/fstyp/msdosfs.h index 91fe5967cd03..8c83c9862f84 100644 --- a/usr.sbin/fstyp/msdosfs.h +++ b/usr.sbin/fstyp/msdosfs.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2006 Tobias Reifenberger * All rights reserved. * diff --git a/usr.sbin/fstyp/ntfs.c b/usr.sbin/fstyp/ntfs.c index be8095d5ee27..28a635097315 100644 --- a/usr.sbin/fstyp/ntfs.c +++ b/usr.sbin/fstyp/ntfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2005 Takanori Watanabe * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/ufs.c b/usr.sbin/fstyp/ufs.c index 5133febbf065..4e676faae493 100644 --- a/usr.sbin/fstyp/ufs.c +++ b/usr.sbin/fstyp/ufs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2002, 2003 Gordon Tetlow * Copyright (c) 2006 Pawel Jakub Dawidek * Copyright (c) 2014 The FreeBSD Foundation diff --git a/usr.sbin/fstyp/zfs.c b/usr.sbin/fstyp/zfs.c index 6fde88c79524..0e54c8260c96 100644 --- a/usr.sbin/fstyp/zfs.c +++ b/usr.sbin/fstyp/zfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Allan Jude * Copyright (c) 2015 Xin LI * From nobody Fri Feb 20 15:29:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHZ0x0hrDz6SVj1 for ; Fri, 20 Feb 2026 15:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHZ0w6wgXz3cvd for ; Fri, 20 Feb 2026 15:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771601361; 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=DMU8dfTKhz+KtpEMdox0fDKV6mcMkODjdUAoR36QYWU=; b=rsYZ/rWXQGumNDyODKYQXmjB0HdJ1VY6ZLBY8qyZ2X7/+fJEPeLLfbEAfQYJks6yzw0meo znc9RTUUF+qtukhXJ2tF6SWqCrNAkBMdUJ95rv49TIe/b5tP2FzmpXhmenKdErA1b9TQmC AwCXEVRUIqOQPeBh60C++YterhiOub0/qIBP9XqDNI71C/6ySE4F/D9gKPH/CP/F2CvYSD Y0Zalsegf8xdaCCteqQ3/Q9ckSbxgrtC+FisXJW72+8Gdgivky3xl3i0i/EuDHjh40SYVi BLXan/o4/4OJ2xqTust8ugZDXyV3dfk+XXPMmpXXoMPcvnPj7HuIWv1yC6G2kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771601361; a=rsa-sha256; cv=none; b=M79wcFMDdK2YnYEwB4diWS5ePL7g4dKvPNVExazuWvFT9n9MyVyp8U1DkWSq0A9FcUL0xz dE5SFw7bDeqjlYk9toQm6OTqc1y5wLB65LGc/n4rJ+CrsbHkAKzlflkTXnGs7Eby62oy8n bTmpWE4pYXoL34U5qENfOLTA9etP3hVKxBq5M1AuZyluu8qvDx2rcXH/yrfQY5rtmZUn2z 1bDi209IIsbICqlfT+d1g1q2hG9DeYRfrCbb9ADorFQZ7eMREV81bYVViR3fjiRAcFGOtl Q4jmfVf/ErRoGZCUJB4pTE2+Zmu6+JFhdl8SDQ39t0mCuXBN777rER5HAEbP3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771601361; 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=DMU8dfTKhz+KtpEMdox0fDKV6mcMkODjdUAoR36QYWU=; b=enWE4kvW0iNSK/jjSwDmMB5Go0mrb8ES08Nj0o0rHZLZs6SJBZzmFrWb0rVCI2YR1TKClW W3LPbxGKQZZ5p4emI83F4uwLEIOd4LQ7qlmcHkEenWT3Aez11wdGJ9h+kUCpGO0d1vrquj 716EX3B7vc5n19mZ8qy0VbdbIpuqlInCVJI11PUqtTqO8dYQ9lnZrahiqPrgLVsH7BDUgF YQher0KxoJ5qDeuUD0igNGeqjkdadAwBejvxgr1boXeqvYXhupFrQa9VjJmLWefEvm0Xi8 qB3DIF+Mh40mjCSrErkq90aeN9Pi+acVFF04lmfJKGTsVKKZYlyRJRXHNxaIFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHZ0w5zSKzZTX for ; Fri, 20 Feb 2026 15:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25700 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 15:29:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Aaron LI From: Ed Maste Subject: git: 89d7b30c652c - main - i386,amd64: Explicitly set ECX=0 in do_cpuid() to be future-proof List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89d7b30c652c98ea12abc5eb9424464cbfb45953 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 15:29:20 +0000 Message-Id: <69987dd0.25700.5b173030@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=89d7b30c652c98ea12abc5eb9424464cbfb45953 commit 89d7b30c652c98ea12abc5eb9424464cbfb45953 Author: Aaron LI AuthorDate: 2026-02-16 04:00:12 +0000 Commit: Ed Maste CommitDate: 2026-02-20 15:26:20 +0000 i386,amd64: Explicitly set ECX=0 in do_cpuid() to be future-proof In principle, do_cpuid() should only be used for CPUID leaves without sub-leaves. Even accessing sub-leaf zero (ECX=0), one must use cpuid_count(ax, 0) rather than cpuid(ax). However, one might assume do_cpuid(ax) is equivalent to cpuid_count(ax, 0), but the old do_cpuid() did not initialize ECX before executing the CPUID instruction. If ECX contained a non-zero value, the instruction could return unexpected results, potentially leading to subtle and hard-to-debug issues, especially in ported code. To be future-proof and to help port code, adjust do_cpuid(ax) to be cpuid_count(ax, 0) to explicitly set ECX=0. It's believed that this change does not fix any real bugs in FreeBSD. See also the DragonFly commit: https://github.com/DragonFlyBSD/DragonFlyBSD/commit/0087a1d163488a57787a9a6431dd94070b1988d4 Signed-off-by: Aaron LI Reviewed by: kib Pull Request: https://github.com/freebsd/freebsd-src/pull/2027 --- sys/amd64/include/cpufunc.h | 10 ++++------ sys/i386/include/cpufunc.h | 24 +++++------------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index 9a4c82275a99..e52c55dc80f0 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -100,19 +100,17 @@ disable_intr(void) } static __inline void -do_cpuid(u_int ax, u_int *p) +cpuid_count(u_int ax, u_int cx, u_int *p) { __asm __volatile("cpuid" : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); + : "0" (ax), "c" (cx)); } static __inline void -cpuid_count(u_int ax, u_int cx, u_int *p) +do_cpuid(u_int ax, u_int *p) { - __asm __volatile("cpuid" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax), "c" (cx)); + cpuid_count(ax, 0, p); } static __inline void diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index b200588b0739..5ee516656d72 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -91,14 +91,6 @@ disable_intr(void) } #ifdef _KERNEL -static __inline void -do_cpuid(u_int ax, u_int *p) -{ - __asm __volatile("cpuid" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -} - static __inline void cpuid_count(u_int ax, u_int cx, u_int *p) { @@ -108,7 +100,7 @@ cpuid_count(u_int ax, u_int cx, u_int *p) } #else static __inline void -do_cpuid(u_int ax, u_int *p) +cpuid_count(u_int ax, u_int cx, u_int *p) { __asm __volatile( "pushl\t%%ebx\n\t" @@ -116,21 +108,15 @@ do_cpuid(u_int ax, u_int *p) "movl\t%%ebx,%1\n\t" "popl\t%%ebx" : "=a" (p[0]), "=DS" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); + : "0" (ax), "c" (cx)); } +#endif static __inline void -cpuid_count(u_int ax, u_int cx, u_int *p) +do_cpuid(u_int ax, u_int *p) { - __asm __volatile( - "pushl\t%%ebx\n\t" - "cpuid\n\t" - "movl\t%%ebx,%1\n\t" - "popl\t%%ebx" - : "=a" (p[0]), "=DS" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax), "c" (cx)); + cpuid_count(ax, 0, p); } -#endif static __inline void enable_intr(void) From nobody Fri Feb 20 15:35:23 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHZ7v49VDz6SWDG for ; Fri, 20 Feb 2026 15:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHZ7v1Jblz3dh8 for ; Fri, 20 Feb 2026 15:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771601723; 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=fXDOlKF1+06Cku9yibpOUoWuZL5yoygFqiDBHYAJO8M=; b=hD4VfLndkXO2b/YNRTqq+45ZBrSbmo2Ivt/yHevGR90AFpyeHcAB1RPEufeNHmeItL4Pj7 r0ENk1ijvV804ABuoBnutOJFPi1Akv1CJiKl+ZRTj/CX5dTZiyN6QrhA8/XhoUyjcumGB1 41RWgukFdSkIu432ho46/46IH/+LiEVb4y/fU26NgCiI5AvBtegIT2nYEeZJ5UfNJPFdR2 0BLLBBJXU4OXqTxRNwsHUU4E9B0iqns1JH2TbqlZKyMlpYYEHTNx7D2wPSMjku62J76z+N GdTkj3QQ8qX8TvmlurK5AzNFlhZf7plUxDsaDhdU9fcrJemur1ojBmtxZx/0og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771601723; a=rsa-sha256; cv=none; b=Ih3TWa5eJU6JdswYvJX6IgWfWwKANAIxpgySTkrOHBIAqDrkCmDrSSN+dTZ8/Zsfgg7Oxv Iv0JtTjmeiYEMRt8CCCppqUz02bhbtAruSd1Xzc5x+GcLNjUX/C92MQTeJFRQgGp17GwdI 8lQ0wmR3dA4JbSuHpceb3FZWgdCV80HKeo6xlFTid5ABkSWJkEidVr4mlzAuon99983xTM qqwKDHy1pgWOCpIOLsWhLOlPs6PE0eVX/V3+Rpj43QMZzyd2yi3DEdkx5EI1Ai/ykoVhSu lJRMu+5PjLq6Y44O3ZA9Z+YSp81uwg3hw3jebJb0JbAlXfWiLtkctK7y31zfmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771601723; 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=fXDOlKF1+06Cku9yibpOUoWuZL5yoygFqiDBHYAJO8M=; b=a8rh7+Wgv/BvOUT2SdFzajjnDR6AtpFMgUQhzttKvZniGyeYXuEJUJjYmFgnrM7GRnP4Tq 7+WjPseH66V5LLb5tR2eyS3M9VKSg2wGQ5Yu+oD78j7Uk9v7vb8zt3v6oBHnlc5jxElTHV 8HV9KBNjoI0C3Pulni49EFny5oxBV3B5VKXs+RUJVHjq28Vrsl2HIx560x7i2ntwSBVp6z 9Iq2Pl5yLXOrXZhRhJyk/uBZfP8kGw6eiFu0xIzKeuOonKFU1ChdJIw4DMsnAdJv06S12n gjHpJsZ/fLq8sChEbTXqtSolQijC3XcSMUCyUBvVbtZCMVzt1J1sqUSVdm+Frg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHZ7v0FDLzb5Y for ; Fri, 20 Feb 2026 15:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26199 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 15:35:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 499d0f04f55e - main - bhyve: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 499d0f04f55e52327d624d27ead3a0d16e3b465a Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 15:35:23 +0000 Message-Id: <69987f3b.26199.153f2c96@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=499d0f04f55e52327d624d27ead3a0d16e3b465a commit 499d0f04f55e52327d624d27ead3a0d16e3b465a Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:02:51 +0000 Commit: Ed Maste CommitDate: 2026-02-20 15:34:50 +0000 bhyve: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- usr.sbin/bhyve/amd64/atkbdc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/bhyve/amd64/atkbdc.h b/usr.sbin/bhyve/amd64/atkbdc.h index 05d28d819120..b1270e39973c 100644 --- a/usr.sbin/bhyve/amd64/atkbdc.h +++ b/usr.sbin/bhyve/amd64/atkbdc.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Tycho Nightingale * All rights reserved. * From nobody Fri Feb 20 16:41:34 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHbcW4NZNz6Sc83 for ; Fri, 20 Feb 2026 16:41:47 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) (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 4fHbcW019fz3nYK for ; Fri, 20 Feb 2026 16:41:47 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=ZvqAq8pZ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::62b as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2a79ded11a2so15063785ad.3 for ; Fri, 20 Feb 2026 08:41:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771605706; x=1772210506; 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=rcdHjimkVlkpSV+C5MHi2fWsGop/oUgE/EFJdwBAzbg=; b=ZvqAq8pZTDaYJ2uA7S9hOI29qvq+cj1AKqP+ft87uhGqkb0hTtWSAezomcCfiAmK3b gnaypsELYFMzdUQ9LTiq87/qbK9PT+8oSSW2nhMp3fUQFeE1wuYgt664qgwAQ5KPHBBd 9JoZl0j6hE0lnqcfAStqNhwFDwN4pjikjbQA8KXzaIezy0l8yltHz6Xaab1H0U5UIGmZ LnPkqRQB7cbH0puSg8E5Q5NXtFqerEcAtvkclAIZvqkSwAjvjTFZUyalEKs/2/hxuh5Q BtMRzhOEzyDHXHcNiQIBgC8Ww+4tteD7exwUlNkiz5psDoKBOhILWYgtECFsoWOO2UFK /Rlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771605706; x=1772210506; 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=rcdHjimkVlkpSV+C5MHi2fWsGop/oUgE/EFJdwBAzbg=; b=EL+vk1JpaG7z/2VI3gvZ1FD3RrL631juav/zinMNuWwIk0rWxbnoF7b7hEOG2NQvId FgWIajW0bSwvcJMC1X05umW/rs9h/p8YhnojD0sQhzGP1rLvwz6GZ53GqUX4Q0cXAw7L 7uWIIdl1kiEcuSYozGQlcQWia0TIb7LStE0TRrzf9IdpHL81h5DiAFEsOiycCyJUZSXE 6jNIyQxJ+G7B3N7D2ERPl0pBcYjiW82Wn05C0EtKoATrO+A4x1SKq+sXoKL+LZRKLr24 2wiIDFAnEWHaCCEZqHngtnHji97DapSuxtLoHznEmbRevhZ12UxgF4Kes+AQkD9R4gKQ 9u1Q== X-Forwarded-Encrypted: i=1; AJvYcCU/puz5LF8D2yOdr7tSkxmtuM4h3XiqaEOX0GkRSPSIxvAU2PYlNqaBfGx3nANdMlLHP83RP1IVtsInn0eT7KxvxAKwBA==@freebsd.org X-Gm-Message-State: AOJu0YwhSq36nInj6BBBjhlzxnvjVhG79KY1EicHljTfAs8XCaxXZgBJ l8GTEOrytSYY4eW6ivFXa37+CSzBjS/2Gw3a4rfhVu4PK/n9lWCanH5YG+zFEFz8 X-Gm-Gg: AZuq6aLqlTcCVBPzhuuGD/tE3Xz08wY8n7h5GwQ0leUz2E6TNbN2fmLiCrirY4Zv49E FH1LDNnm6yoSl8EEM7CQuuWHjouhWthwk+u6AijAdB+s8NVr6l4KRvXY79NvWcYLkNY6bl7YLtw YgkgaUvX2M5jHw/dLa4OuiVVvN8oqUsPjiVo9uXYpkQjBkdSUUUEXcYFrVmhrxiUGFSCTASAUz6 QcDs4JntDkh/bU58eF30dW+oB+8UkFpkv0nb2exAzYipgdS3N4z8o+kjgv/QtO4vdCEEMh1iqrA PjGkfV65tKNyQ9qY//51z0c3JOk47qUJY5PG8Cl+HiX3MxXVhzhwAaU80kl26VHYLQHEJhagFH7 ZMYu7wMC8YPX9VkXviNEVaYH1r7jsv/i9uan1V4J8bYZ3ZahaKL+aZsw+nM1cJdLr7SDaDG3MUb UmeMTdqqXNn74rDQYgocW0RkrhT9AldDsehjn2UgG/Qg== X-Received: by 2002:a17:903:1105:b0:29e:bf76:2d91 with SMTP id d9443c01a7336-2ad74539cf8mr1315675ad.42.1771605705973; Fri, 20 Feb 2026 08:41:45 -0800 (PST) Received: from smtpclient.apple ([176.100.43.172]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3589d80cc18sm3916489a91.3.2026.02.20.08.41.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Feb 2026 08:41:45 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_4A7B7DDD-44BA-4257-AF30-E7D8EE0D81D9"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.3\)) Subject: Re: git: e1e18cc12e68 - main - if_gre: Add netlink support with tests From: "Enji Cooper (yaneurabeya)" In-Reply-To: <699616a4.472d0.d45c789@gitrepo.freebsd.org> Date: Fri, 20 Feb 2026 08:41:34 -0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <699616a4.472d0.d45c789@gitrepo.freebsd.org> To: Pouria Mousavizadeh Tehrani X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Spamd-Result: default: False [-5.59 / 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.994]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MV_CASE(0.50)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; RCVD_TLS_LAST(0.00)[]; ARC_NA(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)[]; HAS_ATTACHMENT(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCPT_COUNT_THREE(0.00)[4]; 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-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::62b:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4fHbcW019fz3nYK X-Spamd-Bar: ----- --Apple-Mail=_4A7B7DDD-44BA-4257-AF30-E7D8EE0D81D9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 18, 2026, at 11:44=E2=80=AFAM, Pouria Mousavizadeh Tehrani = wrote: >=20 > The branch main has been updated by pouria: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3De1e18cc12e68762b641646b203d9ac42= d10e3b1f >=20 > commit e1e18cc12e68762b641646b203d9ac42d10e3b1f > Author: Pouria Mousavizadeh Tehrani > AuthorDate: 2026-02-18 18:12:35 +0000 > Commit: Pouria Mousavizadeh Tehrani > CommitDate: 2026-02-18 19:42:29 +0000 >=20 > if_gre: Add netlink support with tests >=20 > Migrate to new if_clone KPI and implement netlink support > for gre(4). Also refactor some of the gre specific ioctls. >=20 > Reviewed by: glebius, zlei > Differential Revision: https://reviews.freebsd.org/D54443 Hi pouria! The Jenkins gcc12 job is failing after this commit: = https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc14_build/2933/ . Cheers, -Enji --Apple-Mail=_4A7B7DDD-44BA-4257-AF30-E7D8EE0D81D9 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----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmYjr4ACgkQGpE5DjPs NJiuOA/9Gan3sIwL0t6vnPUBd9NIgnbptmVL+WkGeychsnqaRwpJ0zRbs0yaGKtq IRYe7o4FAbglvpsE/q9Y0A8p4bW19cmHXaNHtCOWmoll8sP+iIBxqSSvHc4Jirsl UecEpxIFJ5o+5Bq9hAaQHeciUVxQb7+kzKOTAtw9/RawSS8Bk7mhghYmnUjAoeee y6SCxWjhMEvXLqw1VAraDTaEaG2Db0+adWlvnhMod/X1YC1TNZw0lhKOvhKZwoNG Q6LNWwwDMAi0HKJ9tjM/tyFpjeKtP/Fs9K1YLXxafqdzlvWuDjRAcnHvvvjM0LBQ jftSC8AYQ5vcld6S90b7CK6vikpTotuq2u5ieGJNZosMXQgh7wBaUCTu5G7IcqoX B88ayRSGMBQT2lZB0raPCFwCbmPlO5xR9KoQm/cOpBwLRWVdZz2k+qJAp+0LgBqc wXhK2y9Gr2hQfrVD84eVag+qWnaokZlhipAXG6xUDLrFNkRz6Ga8IkuVzWfHSey0 3J8h8ekN8n853Qxlb3aabqzvOuc86b9/9W7dgKuVRGXD3uBH5CMTgS9mFy/ru7+o xKn8a5iRidy6VGgd5U2DsC6vwBtCQa3C9aS9P3tKcZVkBD+s5GLFiY5mT29PDBiU zZZ7YeR2agCMEZs+U1dPvw6mop9qAzpZWz2FtPwpbcRRAKpF4xs= =IRRO -----END PGP SIGNATURE----- --Apple-Mail=_4A7B7DDD-44BA-4257-AF30-E7D8EE0D81D9-- From nobody Fri Feb 20 16:54:33 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHbvG4Kt6z6Sd50 for ; Fri, 20 Feb 2026 16:54: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 4fHbvF66jqz3qDH for ; Fri, 20 Feb 2026 16:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771606473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1PYQOf4oH0SIO3I2HK888UeYJCGFvA2i+0JmBAwljvI=; b=tgUrSsMYe9l3+JoKb5zPc7ePEmGhM6nyaFKmRCCeEd+Jw8ziwmc9YvQ6WrKljkq8TjFsKL An4ljG590gWia5zz43hDeAYGwiXJalNy2tJkLj14uZS2brjl0HLy8qkxzW80UtRzKdgyY+ sVNR0LTrButp12Gt2UWzc3MJO/kG9oJUwztNgI5anFNMi5Z4t3uq9n/NV/OB11ttEWSbwK KO9wy1AuEsd2jJdTU9BwhTa6M5DlHvR5h/gQrc/Abv4iXJFG7G+ooZ7T/5h4Qomd+2HbXZ YC1N0XV+odzLRlu7v7qHIhHhrAF+M6hGzFJsUNXMxFLBCC67m3Gz33LkPKn//A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771606473; a=rsa-sha256; cv=none; b=c+6Tg5vswWaDNbPihwiKhrwn7Qa3Ew5vjfsc//s02Xc76bOuDzWjddOpUrO12yI1X+yT9I Jaou7PwBbkrHAqglRs9iA9lTQnfWszFwlPzNe/c29xWTNyhEx5OKAZwxQOLwd82hqm5t6m OGOPwPNZBckjzIufi0vEBMLqGtRFGpXt13kgBs7slY3Ke4nRuA1tp6b3t1j+9Sypk2xeQG uCu0m8d1S2MQ4+28EdP69UvvTb1tzqM5LFl+wxNbC8fynk5vcSoOZLMc/z4zCg4+b2tSmj C9oNeUBoS7+KV+IBWZPojyNTr/f/KKB+G9iJGkdblJKGuGijm/pUlqIMtpUHrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771606473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1PYQOf4oH0SIO3I2HK888UeYJCGFvA2i+0JmBAwljvI=; b=srNtpzJw+vDdEu056MU3HSpciXaJktEPGHyxroVLbbjhja7F7CICKHyGNCLt1ljCbf/riD dwYgkgZS4zAKTxWGIP8dcslke74iynR8ABq47mUswml5BjG/t7B+ioIJJ/ZAJuNOd9NZDa ltdDEHAFWOQQQ1uW6Nxndq8NdzQze2lkININ4LQ/BVwznKYtFeEbLVIkoBdgcGgBsnOinF xQsyWP5HQhWEVX8umWkDvGKG3qC0IBSN04E8qXI3FeljjTZu99TQPtsF2/aiRqPLHpTUiT 5sNKEkpELeN+irhdEn/B2CYABUToMW2mQ7ZnaadBQ597gIFQW49n6xmj5Mp/FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHbvF5NK5zd2p for ; Fri, 20 Feb 2026 16:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36769 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 16:54:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 49fa0079cfc8 - main - gre tests: Fix gcc warnings on gre netlink tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49fa0079cfc850917723e2163c51622eb5462429 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 16:54:33 +0000 Message-Id: <699891c9.36769.8885110@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=49fa0079cfc850917723e2163c51622eb5462429 commit 49fa0079cfc850917723e2163c51622eb5462429 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-20 16:45:13 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-20 16:45:13 +0000 gre tests: Fix gcc warnings on gre netlink tests Avoid using `snl_add_msg_attr_ip` for now and directly use `snl_add_msg_attr_ip4` to silence gcc warnings. Fixes: e1e18cc12e68 Differential Revision: https://reviews.freebsd.org/D54443 --- tests/sys/netlink/test_rtnl_gre.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/sys/netlink/test_rtnl_gre.c b/tests/sys/netlink/test_rtnl_gre.c index 271723d6c50c..719c12547477 100644 --- a/tests/sys/netlink/test_rtnl_gre.c +++ b/tests/sys/netlink/test_rtnl_gre.c @@ -88,7 +88,7 @@ ATF_TC_BODY(test_rtnl_gre, tc) struct snl_state ss; struct snl_writer nw; struct nlmsghdr *hdr, *rx_hdr; - struct sockaddr_in src, dst; + struct in_addr src, dst; struct nla_gre_link lattrs = {}; struct nl_parsed_gre attrs = {}; struct snl_errmsg_data e = {}; @@ -109,12 +109,10 @@ ATF_TC_BODY(test_rtnl_gre, tc) snl_add_msg_attr_string(&nw, IFLA_INFO_KIND, "gre"); off2 = snl_add_msg_attr_nested(&nw, IFLA_INFO_DATA); - src.sin_family = AF_INET; - dst.sin_family = AF_INET; - inet_pton(src.sin_family, "127.0.0.1", &src.sin_addr); - inet_pton(dst.sin_family, "127.0.0.2", &dst.sin_addr); - snl_add_msg_attr_ip(&nw, IFLA_GRE_LOCAL, (struct sockaddr *)&src); - snl_add_msg_attr_ip(&nw, IFLA_GRE_REMOTE, (struct sockaddr *)&dst); + inet_pton(AF_INET, "127.0.0.1", &src); + inet_pton(AF_INET, "127.0.0.2", &dst); + snl_add_msg_attr_ip4(&nw, IFLA_GRE_LOCAL, &src); + snl_add_msg_attr_ip4(&nw, IFLA_GRE_REMOTE, &dst); snl_add_msg_attr_u32(&nw, IFLA_GRE_FLAGS, (GRE_ENABLE_SEQ | GRE_ENABLE_CSUM)); snl_add_msg_attr_u32(&nw, IFLA_GRE_OKEY, 123456); snl_add_msg_attr_u32(&nw, IFLA_GRE_ENCAP_TYPE, IFLA_TUNNEL_GRE_UDP); From nobody Fri Feb 20 17:46:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHd2w5s75z6SjG7 for ; Fri, 20 Feb 2026 17:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHd2w57pnz43R7 for ; Fri, 20 Feb 2026 17:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771609576; 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=LpgF60mDOp6Af5HPaVqfTvt6Hat5Ze2iDLnslvX1N3s=; b=yGlgIWjYyExEkS2lwk91hu8Opn6EtldGXE6DUPakngdRTWB9WEnTznQRVrPXaH+9/9I35b /pnGRj0ToLjGC95nuvuDjlGJ/Z3m1sUuACm/lUfN0FbR6PQOygqAQrshD7Tdod5ckvw6/B jgTVyUkxz9g/4U0j6xrEgkeKdBBmxLE/xgPSIStkpSmuKUtWI+Q0jSsFv3PqODFt9Vqn+M 8AYwL1s9ngKAmmzccUJK4tjCNgxZWFbmcOZzo7in4e7pRWh9hBmSPNNzEksd1O+JpaqQgC Pz10wo/eFyWGVI02rJajwc8YCpAG7wE/JajWv7c/NTMSKqEdxJarYINc5N/98w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771609576; a=rsa-sha256; cv=none; b=uPbUvo2Lfh35PHb/IUyY3GKeqtJQYNeN3ZAt/INMrBV/sT9+kp4nuMVVnK9f+5ABoTUfel xjJYIhjmtTWLJHNfdFwnnYI2G/Qz2YYW3OPc/qiol+E2qbNiGgJQIFHZMiGujRj99hEN/t OqKhGdvurak0MsbAeLAfml+KHP5V+faiUwO88X3SMft5ZGK74y+3g1UhdC5ANB4nA75+xy Ce012QJTxNCax/hA58nkOspz5MUc+zixqquUhh6URUnAMtNWFeCBdoum1c4LS/h7oeSbHt Lg/rrhNHHIVozGI1a/u0IsNa19m52rtkIePZ57rSHNy2fwROmNj4+19tsHcztA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771609576; 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=LpgF60mDOp6Af5HPaVqfTvt6Hat5Ze2iDLnslvX1N3s=; b=em1yR0DteyBfqSkHpzSMnhifSC/8RTLT+/5m3CUiR/iTUJjBriFUfaSsTwxKjlOBA1aR2b 1iIldJVWBs51l8skQkl9pTQruU+RqL7ByWRmkrF+07QioWoTpL2zseE9/OheE+GhXJ8olU pQuHuaCL6AAhcVoj451zLNHhVRnPZcGOB9EwPamupTV3rXPVRWAowsuOo3qVmWv4rejApe hvMIM8kKToV/14SMso++qcVPrg4gwgw/h+407wRLgiTQQJbhamkid3TCQukS9VW2Scq7QG WC/uNPC1VwnSjnLU+Wpy2YUoOtj+7BSKvV3VAe90WRNJRQxM8bPvRivH/UAI1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHd2w4ctpzf8H for ; Fri, 20 Feb 2026 17:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b3da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 17:46:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christos Longros From: Alexander Ziaee Subject: git: 102fed041d7f - main - src.conf.5: Fix "incompatibility" typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 102fed041d7f9aec6b962e215f53347a7e5d1a20 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 17:46:11 +0000 Message-Id: <69989de3.3b3da.401836cd@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=102fed041d7f9aec6b962e215f53347a7e5d1a20 commit 102fed041d7f9aec6b962e215f53347a7e5d1a20 Author: Christos Longros AuthorDate: 2026-02-19 19:37:47 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-20 17:20:31 +0000 src.conf.5: Fix "incompatibility" typo MFC after: 3 days Reviewed by: ziaee Signed-off-by: Christos Longros Closes: https://github.com/freebsd/freebsd-src/pull/2035 --- share/man/man5/src.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index a08636c24c2b..f478eb6029a7 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -2002,7 +2002,7 @@ Build the base system or kernel with stack variables initialized to zero on function entry. This value is converted to .Li none -for amd64 kernel builds due to incompatability with ifunc memset. +for amd64 kernel builds due to incompatibility with ifunc memset. .El .It Va LIBC_MALLOC Specify the From nobody Fri Feb 20 20:40:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHhvQ6Q2nz6Sx6h for ; Fri, 20 Feb 2026 20:40: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 4fHhvQ5h6Bz3ZgD for ; Fri, 20 Feb 2026 20:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771620002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ioUueBqM4JLm2rwe339vGmYUkUhH/bQW7SP/ReDobM=; b=Xck0+dTyzLxToXgWi8RMhzvDGIV8qlaK1i6f0/2zCKIshbF6aq4cs5BzV3VOQGd4JFghLn OwK8+1ao7l/Or8WrRU6Vviayf2iW3ef55BNrBx+afCEx9SyEt9Q4rTFQcw38JBsvOZSPJ1 ccHOn8N/7LhyjbyiMbyuSVeegPn9mFIUaRnznuIVzwyiYQ3Ih9g0YJgAQx8W0PEEDHerYj 8tctlM2n8npaf8id61o4mfyge+71gDJLjRoeD0OVbxV39eYgiQtS5Oxa3Q320asw2x0/BR ErTFYmu6je76Iki9LaKCRsMKNiyJPc1Y4q4mrhff6tYXwgWttVvCnphtBEz0YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771620002; a=rsa-sha256; cv=none; b=dwEXFWZw3UK2YXDBIIU/eohFKv4uuMDVBHTzfisRyw1iu7i4+vGZCwMKvGa+uS1SjaxDmm GVefDeSlxnE+H/DTRMj80l9E1lXw/FLG+rNVdeXZNjkQLC8cK2dc9tc//Sqwf48wySRw9T PFVNWl1XjNQdN2ED8x5iM2TuuOKZcCEbNyaTRn410CbF7Ltk/eu5pkcL+i6oOPkyTBBw58 d1T9x2+ejxgNDyMAOnqphJ8EA0WqhELtrEZZ6A26ZSfUdK1rqVqX5mAXsp6H/RNbJ0oBxI xpSmFd/A/hqk7XJCKR8HrCZExIYuqi84tPpwG8oxxoPFDqANulFjPch2myroVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771620002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ioUueBqM4JLm2rwe339vGmYUkUhH/bQW7SP/ReDobM=; b=MPbCU/wCyr4XK0ai1gac/Iw81EuYE75Uy0hzauCuCMpgL70hVQNy+hBsA+Hyfz5ZpCEpO0 kEgVT7FzDL4/z/eSrDEzht9L26EJ8FWDGJyqgZYlu5n6n51gfSrFbbIYXrx/tCFQF19YzS rKufPzKbgzVXJc7tKWiI/O/XpWjzQYhPtpT6HNyGphcWoaWualPTKA2/nOMf5z1K69VqAG GIzoWTnAdEap2HYx+v+78siDAD0vUTogwRISeqy6tJIpFlOhnqBNyQbmNSz21FUW8rsTBz pKUBWqh9tWIoCRHw/fLxv60VW89aQrUaSX9dDmccdlxp6Hsxcx8vn0EksmySbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHhvQ4zDMzkLl for ; Fri, 20 Feb 2026 20:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e0a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 20:40:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0788e7c40ddb - main - ctld: Honor the default maximum I/O queue size for NVMeoF controllers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0788e7c40ddbeedfd9713842440a8db2a8f7ea2f Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 20:40:02 +0000 Message-Id: <6998c6a2.1e0a0.1aeff8ce@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0788e7c40ddbeedfd9713842440a8db2a8f7ea2f commit 0788e7c40ddbeedfd9713842440a8db2a8f7ea2f Author: John Baldwin AuthorDate: 2026-02-20 18:56:00 +0000 Commit: John Baldwin CommitDate: 2026-02-20 20:38:18 +0000 ctld: Honor the default maximum I/O queue size for NVMeoF controllers exports a constant to set the default maximum I/O queue size which is used by ctl(4) if an explicit size is not set. This value was chosen to match Linux's default, but it also avoids excessive resource usage for I/O queues. ctld was using the absolute maxium size as the default instead. Sponsored by: Chelsio Communications --- usr.sbin/ctld/nvmf.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.sbin/ctld/nvmf.cc b/usr.sbin/ctld/nvmf.cc index eb116903f5c1..e1ecf8ccc552 100644 --- a/usr.sbin/ctld/nvmf.cc +++ b/usr.sbin/ctld/nvmf.cc @@ -165,7 +165,7 @@ nvmf_portal::prepare() "max_admin_qsize", NVME_MAX_ADMIN_ENTRIES, NVME_MIN_ADMIN_ENTRIES, NVME_MAX_ADMIN_ENTRIES); p_aparams.max_io_qsize = parse_number(nvl.get(), "max_io_qsize", - NVME_MAX_IO_ENTRIES, NVME_MIN_IO_ENTRIES, + NVMF_MAX_IO_ENTRIES, NVME_MIN_IO_ENTRIES, NVME_MAX_IO_ENTRIES); p_aparams.tcp.pda = 0; break; @@ -334,9 +334,6 @@ nvmf_port::kernel_create_port() nvlist_add_string(nvl.get(), "ctld_transport_group_name", pg->name()); nvlist_add_stringf(nvl.get(), "portid", "%u", pg->tag()); - if (!nvlist_exists_string(nvl.get(), "max_io_qsize")) - nvlist_add_stringf(nvl.get(), "max_io_qsize", "%u", - NVME_MAX_IO_ENTRIES); return ctl_create_port("nvmf", nvl.get(), &p_ctl_port); } From nobody Fri Feb 20 20:40:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHhvS1T0gz6Swx4 for ; Fri, 20 Feb 2026 20:40: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 4fHhvR5tf9z3ZlF for ; Fri, 20 Feb 2026 20:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771620003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiC9yyx0MqbXuVtglOvF3XY/5AafBCcxnkgQabM3CfI=; b=F2YmDoIacpqSbPKkaoDqyRs1hef06EP/HP7ZIBJPnttE/nSnzb1G7ixk02rcZ8dUXgj2zW NFTHNsr+pNxIxVSh7UA+qMD/A1HNFr5I6Ip08iHMsGB3qDdxKAuSN8yMliwA5o+6cpF4PV bQr+jyh7npFTW29a4IOvW7Bcgxep8lNoy7ALGvS0E1dBRIytu6wz7XoAj3rAUG+bfVOVHL S40XcxNutOseI7Cq3hcreVsojvuj+hBKPdtI+lBRP6EU9Sd85mOxFEkXEJAtGOqVL0eJcN pklsOnE/cXizGq/grsmCHMpKHQ6h8ZYrCdcEgt7f7QFUAuWwlK2d7WGF80r8AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771620003; a=rsa-sha256; cv=none; b=isuoSYgXmssguIAP6FBP19lgAsKVakqMX8RwqVIJyl4ZXo2DzbZNinnySr1DSPx1M2x8ch TQ58fl3HS3lkQTwiBCO97dSEI7JgASt+LkTd0uLZC9+Ch4B+iMma5sNnJ8nzwSQCtROjCU twr11IXEArp7A/sy+HYaHancAGxEUG8pUe1MZ2UauDov0txq52DQ35xCzaUZg/zMKbiqVX Z2h2kLAhIxMTD8pm/KCDveogthknbYij45jxC01PABRas3gZIYMasaWSqh8wIAIRscXqiy SseBWbUdJ/A43NaUPbicQKrhRrP2J0gRdraKvQLO2itY2aFuym5ftIHJLq2dbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771620003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiC9yyx0MqbXuVtglOvF3XY/5AafBCcxnkgQabM3CfI=; b=Dj3mDN+TqwsCSJ90q44VZH7+OsVy+NYSOiAvr+Lk+5m0K6qP42Q43gdULONSGL4tLfv+On ot1/6GedgdLJPK2+p4eeD6EIiYdlpbKpopek3hYGbkqyBgohJl1EroL1wrTry7lKWaPPYA rRprEi9mITIzb2V3TcJ1abEPzgilfcWi8Qfx9u41AHUNM+Hg9DUM0LWyuKHxQ5DuKfr+nw 1MnCKb/V0BUDvzlDUnNK7svX+CZs4Z11zY+HnS4PaaZkrQfQrvqR+yn7gRZWPBmQ/ZTMcG LmzquT+u5+CNW7pCfKjO5pVuywbWzFlh6hnVKSoqFWTVT2RF7vZ5uNmizMz85A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHhvR5LTPzkLm for ; Fri, 20 Feb 2026 20:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e405 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 20:40:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1602f0013bdd - main - nvmf: Limit the default I/O queue size to 128 entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1602f0013bddc7b59b0b8de94c0e6cd742ffc9be Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 20:40:03 +0000 Message-Id: <6998c6a3.1e405.4c3687de@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1602f0013bddc7b59b0b8de94c0e6cd742ffc9be commit 1602f0013bddc7b59b0b8de94c0e6cd742ffc9be Author: John Baldwin AuthorDate: 2026-02-20 19:21:18 +0000 Commit: John Baldwin CommitDate: 2026-02-20 20:39:02 +0000 nvmf: Limit the default I/O queue size to 128 entries Previously the size defaulted to the maximum supported size reported by the remote host. The value of 128 matches the default on Linux and avoids excessive resource usage for I/O queues. Sponsored by: Chelsio Communications --- sbin/nvmecontrol/fabrics.c | 2 +- sbin/nvmecontrol/nvmecontrol.8 | 6 +++--- sys/dev/nvmf/nvmf.h | 3 ++- tools/tools/nvmf/nvmfdd/nvmfdd.c | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sbin/nvmecontrol/fabrics.c b/sbin/nvmecontrol/fabrics.c index 5fdbf68127d4..b120118cf022 100644 --- a/sbin/nvmecontrol/fabrics.c +++ b/sbin/nvmecontrol/fabrics.c @@ -485,7 +485,7 @@ connect_nvm_queues(const struct nvmf_association_params *aparams, /* Validate I/O queue size. */ memset(io, 0, sizeof(*io) * num_io_queues); if (queue_size == 0) - queue_size = (u_int)mqes + 1; + queue_size = MIN(NVMF_DEFAULT_IO_ENTRIES, (u_int)mqes + 1); else if (queue_size > (u_int)mqes + 1) { warnx("I/O queue size exceeds controller maximum (%u)", mqes + 1); diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index 61574715a26c..2e666f5259ff 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -33,7 +33,7 @@ .\" .\" Author: Jim Harris .\" -.Dd January 31, 2026 +.Dd February 20, 2026 .Dt NVMECONTROL 8 .Os .Sh NAME @@ -828,8 +828,8 @@ NVMe Qualified Name to use for this host. By default an NQN is auto-generated from the current host's UUID. .It Fl Q Ar entries Number of entries in each I/O queue. -By default the maximum queue size reported by the MQES field -of the remote host's CAP property is used. +The default is the minimum of 128 or the maximum queue size reported +by the MQES field of the remote host's CAP property. .El .Ss connect-all Query the Discovery Controller at diff --git a/sys/dev/nvmf/nvmf.h b/sys/dev/nvmf/nvmf.h index 9b2b4c1dea40..e53eecca156e 100644 --- a/sys/dev/nvmf/nvmf.h +++ b/sys/dev/nvmf/nvmf.h @@ -27,11 +27,12 @@ #define NVMF_NN (1024) /* - * Default timeouts for Fabrics hosts. These match values used by + * Default settings for Fabrics hosts. These match values used by * Linux. */ #define NVMF_DEFAULT_RECONNECT_DELAY 10 #define NVMF_DEFAULT_CONTROLLER_LOSS 600 +#define NVMF_DEFAULT_IO_ENTRIES 128 /* * (data, size) is the userspace buffer for a packed nvlist. diff --git a/tools/tools/nvmf/nvmfdd/nvmfdd.c b/tools/tools/nvmf/nvmfdd/nvmfdd.c index 0f181682aac2..9cc426c3ede9 100644 --- a/tools/tools/nvmf/nvmfdd/nvmfdd.c +++ b/tools/tools/nvmf/nvmfdd/nvmfdd.c @@ -474,7 +474,8 @@ main(int ac, char **av) memset(&qparams, 0, sizeof(qparams)); tcp_qpair_params(&qparams, false, address, port); - io = nvmf_connect(na, &qparams, 1, info.mqes + 1, hostid, + io = nvmf_connect(na, &qparams, 1, + MIN(NVMF_DEFAULT_IO_ENTRIES, info.mqes + 1), hostid, nvmf_cntlid(admin), av[2], hostnqn, 0); if (io == NULL) { warn("Failed to create I/O queue: %s", From nobody Fri Feb 20 21:24:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHjth160yz6T17F for ; Fri, 20 Feb 2026 21:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHjth0RYnz3hb5 for ; Fri, 20 Feb 2026 21:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771622668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CB2TVkaH/8posTH25aI6NwWXn12NIQVWTIXu0da4XEk=; b=WPMNeQ3MRs+PgG8cC/NWcrKgIa0OS1On7w4K2Z+wXYQS/R9KUxzcSm1AZ3B/uobIK55fPU ox1ElxBRIa/GHMHOHe4c0QfiPoRoGAPMv+TyNaeVjLaMTsyINJ7G2/Jht9oUOhrI8wwyoA zVSwUsPOJ73iNo6bT0rFkEfnd3RFwaW+yadpdgstF0Zn5UOJCr9evyBJJaA/AZjDy3SFhp RH0VtHa0EWVGDQJHczRVHch07dMpt/dSLYPxleQC5Y3BXuSnmP/8mwd45McJJwBe05V6RH IOF5yQ1swU9rEOLwf1NKLtIh+NJdniFaqH6s1wmYEldjZLPf6i6c4llYg01dig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771622668; a=rsa-sha256; cv=none; b=nq/cJ8MXoo7oC4ffRAbNWmYxffk7YUCyX3CiCC+VURBbbG+A/9LC3GS7C4nYHIGxzz4eiD VCYJtcdCsY2lV7HGVIC7V6FtA2ddcUxiDW9ocpZVnGIHoWKuq8RS5TMoKu330dsXbh+9sD hUYN/OigCd8z4Q3qZNaAaMc/ka2tMEUuv8IbOX1rB3LWQWPDGU2VOyeSOaYPy5+SyAcIsU 9B9nWL2Ada19WKHosoH/bbLdRXKgl+gyd6Hcq5+ka13CI2xFM8DuTLLAbG9uVnP3nkW27t Udk547FnXdyfm9vEs9xIrgZwoNBG4VqxI0G92lNB7Y9mAW2yAmv13zzlgG/6tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771622668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CB2TVkaH/8posTH25aI6NwWXn12NIQVWTIXu0da4XEk=; b=l7uqTYzUHFlt7/E2j0PJK36FEzdh5AIeLrWb3b+hnfzYDsyjXAD2H2kCU7kIiWUWSzuhiP 9O7rNGCm6oSisUfexw5szkIl2j+hv8c2dN4dF0vBDZ0tzLQyBhkuk2zJwHb4aIN5oL+WKf lusleGUxenUNYWPasIXeurKq7BKmqlQSanCzobi1bjzomLe03PTht3pCLYwZpRUqCjQ/eR 6hQ8QCeFg9vkr8Gk0VnGS/qY96mFx7bBerwus/z/sMNTZBltsce7CNaqe2Z3bkae+SYjGF uMo32m8G1mElTg1LRD7w7X1PtKS3T0xDH/StpkmihfmepQvGnji5Xd2jGG6ysA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHjtg6PBJzlpF for ; Fri, 20 Feb 2026 21:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 226c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 21:24:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e1886559ea47 - main - tcp: improve validation of received TCP over UDP packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1886559ea477add82a0a86cddf728f6778f1603 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 21:24:27 +0000 Message-Id: <6998d10b.226c0.487f16ef@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e1886559ea477add82a0a86cddf728f6778f1603 commit e1886559ea477add82a0a86cddf728f6778f1603 Author: Michael Tuexen AuthorDate: 2026-02-20 21:21:37 +0000 Commit: Michael Tuexen CommitDate: 2026-02-20 21:21:37 +0000 tcp: improve validation of received TCP over UDP packets Reviewed by: glebius, pouria MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55410 --- sys/netinet/tcp_subr.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 6b0aa76527f4..6a6eef32e777 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -575,7 +575,7 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, #endif struct udphdr *uh; struct tcphdr *th; - int thlen; + int len, thlen; uint16_t port; TCPSTAT_INC(tcps_tunneled_pkts); @@ -619,15 +619,27 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, switch (iph->ip_v) { #ifdef INET case IPVERSION: - iph->ip_len = htons(ntohs(iph->ip_len) - sizeof(struct udphdr)); - tcp_input_with_port(&m, &off, IPPROTO_TCP, port); + len = ntohs(iph->ip_len) - sizeof(struct udphdr); + if (len != m->m_pkthdr.len) { + TCPSTAT_INC(tcps_tunneled_errs); + goto out; + } else { + iph->ip_len = htons(len); + tcp_input_with_port(&m, &off, IPPROTO_TCP, port); + } break; #endif #ifdef INET6 case IPV6_VERSION >> 4: ip6 = mtod(m, struct ip6_hdr *); - ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) - sizeof(struct udphdr)); - tcp6_input_with_port(&m, &off, IPPROTO_TCP, port); + len = ntohs(ip6->ip6_plen) - sizeof(struct udphdr); + if (len + sizeof(struct ip6_hdr) != m->m_pkthdr.len) { + TCPSTAT_INC(tcps_tunneled_errs); + goto out; + } else { + ip6->ip6_plen = htons(len); + tcp6_input_with_port(&m, &off, IPPROTO_TCP, port); + } break; #endif default: From nobody Fri Feb 20 22:48:44 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHllx4dGxz6T6XJ for ; Fri, 20 Feb 2026 22:48: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 4fHllx2CZsz3rZ4 for ; Fri, 20 Feb 2026 22:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771627725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6PUNZKcICwkz/q9TFrasCk6uu9gCRMKhWgj/KyitXA=; b=ZRQu/fKDwZ7q0/YQeeTvzhVbRl2dLRLozrFS3W1sm3707a16FbNVxN4FDp7N4oexBudMbm xSyCoYZ/fuxoBEuFEsnzuGLnwnd8b5woF14YzMdYg06et8PhOZhnHtmCtNlZYEB67gAtrW RvhJS1fYjmUByS5JZHzP/VgueOlWaFLONKd9ny5KDRKC5fxWaJajJDgZsTy9zghLxeGiPR Yt9j84GhKL29btrKvQC9mI666ice5uoy6VXcw8Cs4y2RD5Gd60g5Q4sTdoe0JGjkCjmZ1v FMWz8CIuBndUy7j5qYUGxHrqbRdDeG3ofN3QRhuUtmNU71qJHuh1ezfARTlmmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771627725; a=rsa-sha256; cv=none; b=HZErmK3MtmL6fFj7G7Ie0fPfICVdb4SNo2Is+XSZqKU//VlGRzhmwVoDgj+u60bNG4EEgx sqYNq/hEBpEKlDj3VLd5dBKCZaPt6Rmtrax26F2r0Bfd5WUEFpLbN99ShxWAoJT2bl8ibc aQgG0vhqoyiDk+qvgSaBgyOmecMmxJAwFOpd019rPzMmmYWW30lynmimVPb9nJUP5adb+S Mq2tdGr19n5dCgxYRgDmsK1yHY9srV1FJrYMqDo+Z3eeWjUQF/pL2mknlpGfKTrvXrsDRT OY36hGqbnPIXrMBm8PSveRd2bu3r2O66dPOBqyrF4Pu8pASr8W7hwXOWCjXgUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771627725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6PUNZKcICwkz/q9TFrasCk6uu9gCRMKhWgj/KyitXA=; b=vRqiF53iOfcHQB8Pf/E7lfZwOtq2SIKdXfP7B5q8obTKRoqjwU5XddY0iRTGhsaGf1lE/t Vp2rWj+U5dtmY6VfgkkqYno57cryBpdACfeRK6gy43I5pcCo9isbrPFrYMFGlHA2Wiee7C sJOfioy4ddBSFhaRUiJKhaOdY11nNgUQ11tdrLjzIwZLycfrdkbGg5ww/RlwxJi3ly3o1A x3+wUYUE2m+O9fGrKNsPJMvxGy9m8/5iAg71ijpectYPRp9NvYEh1JOVbBwpYlThRzJl11 /iPDx8hEct790Y3dUALEaguvHdMr0DdZWiyE7voIJuavP8nCxUF25dLjorphbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHllx0bpbzn6n for ; Fri, 20 Feb 2026 22:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32d8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 22:48:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: d1f1402dff63 - main - libnetbsd: import `__CTASSERT(..)` macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08 Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 22:48:44 +0000 Message-Id: <6998e4cc.32d8e.74c069d@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08 commit d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08 Author: Enji Cooper AuthorDate: 2026-02-20 20:24:46 +0000 Commit: Enji Cooper CommitDate: 2026-02-20 22:45:06 +0000 libnetbsd: import `__CTASSERT(..)` macros These compile-time assert macros are similar to `Static_assert` on FreeBSD. These macros are in use in newer versions of `contrib/netbsd-tests`. Obtained from: https://github.com/NetBSD/src (c26cc77b3a0b26b95a2) MFC after: 1 week --- lib/libnetbsd/sys/cdefs.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h index fcc3cc6f15be..78c80735ad01 100644 --- a/lib/libnetbsd/sys/cdefs.h +++ b/lib/libnetbsd/sys/cdefs.h @@ -54,6 +54,22 @@ #define ___STRING(x) __STRING(x) #define ___CONCAT(x,y) __CONCAT(x,y) +/* + * Compile Time Assertion. + */ +#ifdef __COUNTER__ +#define __CTASSERT(x) __CTASSERT0(x, __ctassert, __COUNTER__) +#else +#define __CTASSERT(x) __CTASSERT99(x, __INCLUDE_LEVEL__, __LINE__) +#define __CTASSERT99(x, a, b) __CTASSERT0(x, __CONCAT(__ctassert,a), \ + __CONCAT(_,b)) +#endif +#define __CTASSERT0(x, y, z) __CTASSERT1(x, y, z) +#define __CTASSERT1(x, y, z) \ + struct y ## z ## _struct { \ + unsigned int y ## z : /*CONSTCOND*/(x) ? 1 : -1; \ + } + /* * The following macro is used to remove const cast-away warnings * from gcc -Wcast-qual; it should be used with caution because it From nobody Sat Feb 21 01:18:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHq58351bz6TJNx for ; Sat, 21 Feb 2026 01:18: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 4fHq581sWZz47SW for ; Sat, 21 Feb 2026 01:18:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771636732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFjfybVrICRJa5djjpUX0ZrrjEVGj37WcYSKwxtrzbs=; b=YzreiY0mKuq4hNHELSQ5F/k65wr+E1krTRV1ULzzoG/F0bpzf5Eq25oWQTWM2d4GycFWAI R95eYFEvJgdqYklGzvUmm6us6OZiK76eJVqNQ5uo8yxnAWCaQ+4ndJz5ysaVxmyvFK3YaN 7Xa+tfs3Gal0vw8wvKiGyXK1tkNVmwFFld2EMESjC3MKePlTmh7KdhZ3O47nzFRO0LODzv tQPtdgmKQggBfa6FasFJga663xQrf9jOWWuU1wRtmxQuWmB36wkwudrgS3okORBBAjlXg+ S4EUwvHdU0/pC17l+HnHMI4e745j5a85qLv6aKNVN0hL9vnfXOeJD2bhawtENw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771636732; a=rsa-sha256; cv=none; b=cNMMpn3nQfivA8IZTRkeSqEhdJLb8Cp6SIFFpgTL8D6AbP5y2/SJSHXOWN+aHpw+Dju92j I1elDGt5uRbwoXMABO8J+yZb9KIcJWFlfA9BYq0AtnEkuvdcIMTVTWToUnQZON1M4FKWcT sLRcKNJqcFoZw0KUrNxa/K57fcsjE6GMUgx6hP5U29rukiE9KIcAeKSZaPmtU/cG1Iw+fJ fxtN5wME3Z3paRsotP8ir17qLPfaGoOVdEcESWGcJB7xqMtO4gV/5uz14CPx6M21h1HIdC v3XcGOaK98nqivYR4+AM6gw7BKNFuubPGHkz51+WFOzqB68bfQX2StwhRpR0Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771636732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFjfybVrICRJa5djjpUX0ZrrjEVGj37WcYSKwxtrzbs=; b=gGFdXTf2rUcx2VEaXJk0K4x9fWIk/wlweEwkQKDGBRxIs4kBbcWx3qCvrlivN5IEOlXyKo YXlRMveRzAPBrvs1gbRT28VESfBCjhicOMGhM2o9Gpun0cLRkCgFj9hLy6FCxRhI6w6pTh JI65kKGjPjtKd3KLolQFEtVoaboC06Gm3cyhFSx7IBkVaU6Q9iEm2Vb/g5/hOVFLcd2gb4 LLGpGUEg2j+QJGZcEEFkp8eKfDJY4o+lZdxF3Ms3QSiythuq4GnUA2dv1CBd9NQZrXuPJS Ys+PzxB0Sph9TtzGBLVxCVhgpy36aR+bVl5eheVfG7qozOs0YyknkfPTkiP1+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 4fHq581QlWzsFh for ; Sat, 21 Feb 2026 01:18:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 401ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 01:18: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: afbdcd402bb4 - main - libfetch: Fail hard if interrupted while connecting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afbdcd402bb439bd3d487baaad63b68e95929265 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 01:18:52 +0000 Message-Id: <699907fc.401ed.6287cffc@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=afbdcd402bb439bd3d487baaad63b68e95929265 commit afbdcd402bb439bd3d487baaad63b68e95929265 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-21 01:18:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 01:18:15 +0000 libfetch: Fail hard if interrupted while connecting This fixes an issue where the first address that DNS returns is blocked by a packet filter, so we hang for a while, then the user hits Ctrl-C, interrupting connect(2), whereupon we move on to the next address, get a connection, request the file, and return to fetch(1), which sees that SIGINT was caught and bails. Note that we make no attempt to enforce fetchTimeout in the connection phase, and never have. It's feasible, but non-trivial, so we'll leave it as an exercise for future us. PR: 293312 MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55406 --- lib/libfetch/common.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 825b1960208c..b3250940becc 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -651,7 +651,13 @@ fetch_connect(const char *host, int port, int af, int verbose) goto syserr; } /* attempt to connect to server address */ - if ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) == 0) + while ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) < 0) { + if (errno == EINTR && fetchRestartCalls) + continue; + break; + } + /* success? */ + if (err == 0) break; /* clean up before next attempt */ close(sd); From nobody Sat Feb 21 01:18:53 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHq5961yxz6TJLh for ; Sat, 21 Feb 2026 01:18: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 4fHq592yPFz47Vf for ; Sat, 21 Feb 2026 01:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771636733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9G8cE5bkTo7irF6yy2Hf/95BW68plBz/MQit2TBoTEg=; b=DzX1rO0hzlVSNIuMSu3MZzApMJCj5pqut99tFPsqO9lTzk+DXAuftWfk5qHjGNDK90Vlzd Kv8RpJmKOGQ+0zQaaXDVjZdKOoVMyHwkYl0lRC98yoCFeN2Enod1j0VZndnzYO9neOcUmG ZPfEB3bP73Lp4BaqONVgC4G6uDuYswTPGiR9WRo5h8MnbaPVSXhoolJkm0dEVLUbS8E3Jw FwiqmOi7aMD/QAmxlLRSVCDE5GW6n/nZee9G26Aykx38fIQmv1VpsoN0dW1am/ltjym14Y 0dQ9DAFHvVhEJ4KixpXKJe5vmHF6dTlvGEf7BFyAeSwqP+QcYNjQ9cqDlwEJdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771636733; a=rsa-sha256; cv=none; b=AeWr7puGFZ5vJ4jDIAyMldAM6x+oK1krg94ncEH8PGm6lCKmsUYNtW+wGh3me0fx6g14kH Ti//2DjuekNgIV4zfYOS9lO+ZU0I1tm1CRrEjdbWfZC/9F3IZBbe8XDe4CGI+B8TIuwCrW YjtHrA/zW7YSzSF1iNQ7O0jtg2GzqVULAn8dv0LIPAZixZn8fHz5VOtQ6r4chShq85TH+N ZJ5B/Md3GKDP6qouELrjNV7NOKA535k+NUq/bckBjxAxVXB1QjacZ293xJkfTu/7+XCMm/ YoH3TJDuy1hko0IVyZtrnd8FOf+lKWRst8/wDsqbm09Hq89xApdonh5C/3FKCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771636733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9G8cE5bkTo7irF6yy2Hf/95BW68plBz/MQit2TBoTEg=; b=pOh7RYWy7u2Obh+OIHHlLc63bWov7YvAsAR7NaIyMg8b8f7AlJF1qU0By8hFYT1jFduDBQ OMmmAcITIVDz2q/4HSM9zTGiHhEbOqHZF0BHquZ7OiEdaBzljXDajbb+9dF1zti+NXFB4u uiWU+unPkEP9H+jXhb2DLmwRLg1H+/zJ1ePBn7TkpgNyNCPtCLc2blfyWm0y1G5wGP3ijS y/JQ0H8JvVaNhYxNr2Kt+6oBRsWNMMSNSY2WB+wKREPG6c/TioxVpEn8nE44GH0ltRvx9t Vyc5wMvGYBR0POHzy8DoIvTqauDVH68C/56gKwVCiRH+jAHDwsTVnJIfdgo1yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHq592HCqzsL8 for ; Sat, 21 Feb 2026 01:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 401f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 01:18:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b5d570e711da - main - libfetch: Gracefully skip unsupported protocols List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5d570e711da1dad303312bebaf1bd2fb720f0dc Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 01:18:53 +0000 Message-Id: <699907fd.401f1.7d4d5cfa@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b5d570e711da1dad303312bebaf1bd2fb720f0dc commit b5d570e711da1dad303312bebaf1bd2fb720f0dc Author: Dag-Erling Smørgrav AuthorDate: 2026-02-21 01:18:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 01:18:18 +0000 libfetch: Gracefully skip unsupported protocols If socket() fails because the address family or protocol is unsupported, just continue with the next address. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55407 --- lib/libfetch/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index b3250940becc..88b5e5a2f096 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -637,8 +637,12 @@ fetch_connect(const char *host, int port, int af, int verbose) /* try each server address in turn */ for (err = 0, sai = sais; sai != NULL; sai = sai->ai_next) { /* open socket */ - if ((sd = socket(sai->ai_family, SOCK_STREAM, 0)) < 0) + if ((sd = socket(sai->ai_family, SOCK_STREAM, 0)) < 0) { + err = -1; + if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) + continue; goto syserr; + } /* attempt to bind to client address */ for (err = 0, cai = cais; cai != NULL; cai = cai->ai_next) { if (cai->ai_family != sai->ai_family) From nobody Sat Feb 21 01:18:51 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHq5D1l9Bz6TJTN for ; Sat, 21 Feb 2026 01:18: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 4fHq5D15wlz47Hy for ; Sat, 21 Feb 2026 01:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771636736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6w6X9yvzdKkiuiPAgmjVtppIN/cxPg9+/IdWmO9xPS0=; b=d9VvAj86C852oACyoq41RvNk3IoG5X1tp6EeQXYh6WOi3HDSIQxFSwcc9EIbhmwY5L32fC HkBviK+TFCwZs8IIiCj/kKkkJ0XDt4XeerKyfYAzkf4a8KPq4CYhqjekhPbQIVg5Z3GWlW XST2dz87UkLFZh3PKbYstRK9wYx/rGADKt/joEuQ5gRYykB7BDW1bgFFLeEzmN6dbg7l8v Sk/vCQUrVWM8C+I/gst1wEQfbXOyuIyP3p08perVAgMkw33WqXbJ8Djj50XWsHZnoENsBF 611F6N0K1H8aq8DXvncDY2z9I439LSFl4fNohVpm3BVUbBjnqspNnyeaH1p04g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771636736; a=rsa-sha256; cv=none; b=wD0Jb/UcFkdd0ZE6YjjvdLPsOJrzRjQ6u+/os9a20Kt5WibZA+g+KJKECihLQFnKF4m4+b thSKn6baFs0K8pZEZ18k3C0pYWqv26SGBHVdmw29ODSZRRasJBux/n8WYTAJ489YL+mO5U g2GNiTB8V9geg6s+WpqCmtJoilvU4SB7Ug4RZzj8qtAd2+Zz+VjWORW9bM/o/H8qO0raEy bfoN/FGzTajszLrwzPku4oNP4uBjyRHb3w0y1mhOsBEgw4+KULkJGnXX8vMkZaefNxBW9q 9ujH5KEB93QlLxZMpOHKAxj2X/nYqBNifnvbMT50BlkcvNIoVlec2tC5SjTkHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771636736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6w6X9yvzdKkiuiPAgmjVtppIN/cxPg9+/IdWmO9xPS0=; b=bkeRgbzzJyogXuvuSlbcgrkDB9YCzPFAfggXK2IVFWAZo5aJ3shqKF+pPeyAJ8fQvq9a1o iRSOOGAWGLpWKVnXFLJzP0tZpALohOjK3XBa8tSVpv4uTtWqoEWQujcL+oZgao4HGbTPgk gkXzJEYt/rZ0DZm6Ok+LQmdyEn/h+Ox9a2ypr9+eEqbXoDq+/4F1s6zemmcMTkd+8RkGYR 6yA01i8BmYKpwRevDcLAFnSzA3TSzyyJ3VPNw1dTT86IYvO3BYp9pbIvjwrll8Xfv/wq36 i3tWu2q6tNd15isDDQLnOE+BmeCjk4AWAlCgnAnqFymTDZAu/ZAFdeRq+thj3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHq5D0ZyjzsFj for ; Sat, 21 Feb 2026 01:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 416af by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 01: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: 1b7c4d29fdfc - main - libfetch: Clean up fetch_info usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b7c4d29fdfc975facdc43f6da50947cf3bb8e4a Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 01:18:51 +0000 Message-Id: <699907fb.416af.558ad9db@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1b7c4d29fdfc975facdc43f6da50947cf3bb8e4a commit 1b7c4d29fdfc975facdc43f6da50947cf3bb8e4a Author: Dag-Erling Smørgrav AuthorDate: 2026-02-21 01:18:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 01:18:11 +0000 libfetch: Clean up fetch_info usage * Provide a wrapper for the common if (verbose) fetch_info(...) idiom. * Replace remaining instances of fprintf(stderr, ...) with fetch_info(). * Fix a few style nits. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55405 --- lib/libfetch/common.c | 88 ++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 54 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 75cb4320ad99..825b1960208c 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -229,12 +229,16 @@ void fetch_info(const char *fmt, ...) { va_list ap; + int serrno = errno; va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); fputc('\n', stderr); + errno = serrno; } +#define fetch_verbose(...) \ + do { if (verbose) fetch_info(__VA_ARGS__); } while (0) /*** Network-related utility functions ***************************************/ @@ -302,7 +306,6 @@ fetch_reopen(int sd) conn_t * fetch_ref(conn_t *conn) { - ++conn->ref; return (conn); } @@ -417,8 +420,7 @@ fetch_socks5_init(conn_t *conn, const char *host, int port, int verbose) unsigned char *ptr; int ret = 1; - if (verbose) - fetch_info("Initializing SOCKS5 connection: %s:%d", host, port); + fetch_verbose("Initializing SOCKS5 connection: %s:%d", host, port); /* Connection initialization */ ptr = buf; @@ -486,7 +488,7 @@ fetch_socks5_init(conn_t *conn, const char *host, int port, int verbose) goto fail; } - switch(*ptr++) { + switch (*ptr++) { case SOCKS_SUCCESS: break; case SOCKS_GENERAL_FAILURE: @@ -564,10 +566,8 @@ fetch_socks5_getenv(char **host, int *port) *host = strndup(socks5env, ext - socks5env); } - if (*host == NULL) { - fprintf(stderr, "Failure to allocate memory, exiting.\n"); + if (*host == NULL) return (-1); - } if (ext == NULL) { *port = 1080; /* Default port as defined in RFC1928 */ } else { @@ -613,26 +613,21 @@ fetch_connect(const char *host, int port, int af, int verbose) /* Not using SOCKS5 proxy */ if (sockshost == NULL) { /* resolve server address */ - if (verbose) - fetch_info("resolving server address: %s:%d", host, - port); + fetch_verbose("resolving server address: %s:%d", host, port); if ((sais = fetch_resolve(host, port, af)) == NULL) goto fail; /* resolve client address */ bindaddr = getenv("FETCH_BIND_ADDRESS"); if (bindaddr != NULL && *bindaddr != '\0') { - if (verbose) - fetch_info("resolving client address: %s", - bindaddr); + fetch_verbose("resolving client address: %s", bindaddr); if ((cais = fetch_resolve(bindaddr, 0, af)) == NULL) goto fail; } } else { /* resolve socks5 proxy address */ - if (verbose) - fetch_info("resolving SOCKS5 server address: %s:%d", - sockshost, socksport); + fetch_verbose("resolving SOCKS5 server address: %s:%d", + sockshost, socksport); if ((sais = fetch_resolve(sockshost, socksport, af)) == NULL) { socks5_seterr(SOCKS5_ERR_BAD_HOST); goto fail; @@ -652,8 +647,7 @@ fetch_connect(const char *host, int port, int af, int verbose) break; } if (err != 0) { - if (verbose) - fetch_info("failed to bind to %s", bindaddr); + fetch_verbose("failed to bind to %s", bindaddr); goto syserr; } /* attempt to connect to server address */ @@ -668,10 +662,8 @@ fetch_connect(const char *host, int port, int af, int verbose) fetch_info("failed to connect to %s:%d", host, port); goto syserr; } else if (sockshost != NULL) { - if (verbose) - fetch_info( - "failed to connect to SOCKS5 server %s:%d", - sockshost, socksport); + fetch_verbose("failed to connect to SOCKS5 server %s:%d", + sockshost, socksport); socks5_seterr(SOCKS5_ERR_CONN_REFUSED); goto fail; } @@ -1053,8 +1045,7 @@ fetch_ssl_setup_transport_layer(SSL_CTX *ctx, int verbose) ssl_ctx_options |= SSL_OP_NO_TLSv1_2; if (getenv("SSL_NO_TLS1_3") != NULL) ssl_ctx_options |= SSL_OP_NO_TLSv1_3; - if (verbose) - fetch_info("SSL options: %lx", ssl_ctx_options); + fetch_verbose("SSL options: %lx", ssl_ctx_options); SSL_CTX_set_options(ctx, ssl_ctx_options); } @@ -1092,16 +1083,14 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose) else SSL_CTX_set_default_verify_paths(ctx); if ((crl_file = getenv("SSL_CRL_FILE")) != NULL) { - if (verbose) - fetch_info("Using CRL file: %s", crl_file); + fetch_verbose("Using CRL file: %s", crl_file); crl_store = SSL_CTX_get_cert_store(ctx); crl_lookup = X509_STORE_add_lookup(crl_store, X509_LOOKUP_file()); if (crl_lookup == NULL || !X509_load_crl_file(crl_lookup, crl_file, X509_FILETYPE_PEM)) { - fprintf(stderr, - "Could not load CRL file %s\n", + fetch_info("Could not load CRL file %s", crl_file); return (0); } @@ -1124,23 +1113,17 @@ fetch_ssl_setup_client_certificate(SSL_CTX *ctx, int verbose) if ((client_cert_file = getenv("SSL_CLIENT_CERT_FILE")) != NULL) { client_key_file = getenv("SSL_CLIENT_KEY_FILE") != NULL ? getenv("SSL_CLIENT_KEY_FILE") : client_cert_file; - if (verbose) { - fetch_info("Using client cert file: %s", - client_cert_file); - fetch_info("Using client key file: %s", - client_key_file); - } + fetch_verbose("Using client cert file: %s", client_cert_file); + fetch_verbose("Using client key file: %s", client_key_file); if (SSL_CTX_use_certificate_chain_file(ctx, client_cert_file) != 1) { - fprintf(stderr, - "Could not load client certificate %s\n", + fetch_info("Could not load client certificate %s", client_cert_file); return (0); } if (SSL_CTX_use_PrivateKey_file(ctx, client_key_file, SSL_FILETYPE_PEM) != 1) { - fprintf(stderr, - "Could not load client key %s\n", + fetch_info("Could not load client key %s", client_key_file); return (0); } @@ -1165,7 +1148,7 @@ fetch_ssl_cb_verify_crt(int verified, X509_STORE_CTX *ctx) if ((crt = X509_STORE_CTX_get_current_cert(ctx)) != NULL && (name = X509_get_subject_name(crt)) != NULL) str = X509_NAME_oneline(name, 0, 0); - fprintf(stderr, "Certificate verification failed for %s\n", + fetch_info("Certificate verification failed for %s", str != NULL ? str : "no relevant certificate"); OPENSSL_free(str); } @@ -1186,7 +1169,7 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) char *str; if ((conn->ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL) { - fprintf(stderr, "SSL context creation failed\n"); + fetch_info("SSL context creation failed"); ERR_print_errors_fp(stderr); return (-1); } @@ -1200,17 +1183,15 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) conn->ssl = SSL_new(conn->ssl_ctx); if (conn->ssl == NULL) { - fprintf(stderr, "SSL connection creation failed\n"); + fetch_info("SSL connection creation failed"); ERR_print_errors_fp(stderr); return (-1); } SSL_set_fd(conn->ssl, conn->sd); #if !defined(OPENSSL_NO_TLSEXT) - if (!SSL_set_tlsext_host_name(conn->ssl, - __DECONST(struct url *, URL)->host)) { - fprintf(stderr, - "TLS server name indication extension failed for host %s\n", + if (!SSL_set_tlsext_host_name(conn->ssl, __DECONST(char *, URL->host))) { + fetch_info("Failed to set TLS server name indication for host %s", URL->host); return (-1); } @@ -1226,16 +1207,14 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) conn->ssl_cert = SSL_get_peer_certificate(conn->ssl); if (conn->ssl_cert == NULL) { - fprintf(stderr, "No server SSL certificate\n"); + fetch_info("No server SSL certificate"); return (-1); } if (getenv("SSL_NO_VERIFY_HOSTNAME") == NULL) { - if (verbose) - fetch_info("Verify hostname"); + fetch_verbose("Verify hostname"); if (!fetch_ssl_verify_hname(conn->ssl_cert, URL->host)) { - fprintf(stderr, - "SSL certificate subject doesn't match host %s\n", + fetch_info("SSL certificate subject does not match host %s", URL->host); return (-1); } @@ -1259,7 +1238,7 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) (void)conn; (void)verbose; (void)URL; - fprintf(stderr, "SSL support disabled\n"); + fetch_info("SSL support disabled"); return (-1); #endif } @@ -1297,10 +1276,11 @@ fetch_socket_read(int sd, char *buf, size_t len) rlen = read(sd, buf, len); if (rlen < 0) { - if (errno == EAGAIN || (errno == EINTR && fetchRestartCalls)) + if (errno == EAGAIN || (errno == EINTR && fetchRestartCalls)) { return (FETCH_READ_WAIT); - else + } else { return (FETCH_READ_ERROR); + } } return (rlen); } @@ -1442,7 +1422,7 @@ fetch_write(conn_t *conn, const char *buf, size_t len) iov.iov_base = __DECONST(char *, buf); iov.iov_len = len; - return fetch_writev(conn, &iov, 1); + return (fetch_writev(conn, &iov, 1)); } /* From nobody Sat Feb 21 05:32:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHwjN6nv6z6QSJS for ; Sat, 21 Feb 2026 05:32: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 4fHwjN69LFz3WHS for ; Sat, 21 Feb 2026 05:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771651928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qkPRl73sfSGbOLgv7gG7jzU9I4X8Z1DtASZxcG86GEk=; b=yir/h0VihT603h9kpp/y60SOk56EsBag0Cpv7B4QIJ8jUlwkhvo+Hjc5blEKVYlun1Mcvu LMThco0RwYlkm7KJNtZkRB+M4tjAEGmKtoJvwBDb4SY1XWC4jVUgwyZiTjLIwP+/b+cTej sd9RZPjNqUGXYKTSn2UYU++mzaqrH56VLm9y3xiSVazHeeYkcsJrvgR6/n7dvbsMOrieJ4 sfc3PTEcH4Sa/Q7SCVTeRjh9JDbQA3OPAaLRmaffoFuCxaKFoaOIHgN3SaAQyNIuPl6QgU vznPcOFq7CdSHzMp8ROXC/RyqRxeNU62v3+Ugf/Tl92crz4kNhceFUjagyrgFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771651928; a=rsa-sha256; cv=none; b=nUmGsC9sNtttXLHdnu+tiS25djwCG+Kq/eAuRBbQqkSuXmv9m6GX+pSv8G8ssymLqLrAOS CdCQmNeGpAKYxKCGd5BP27/5tkTi/ee/FzDA8omFRJwzTczS5qeOH3f/kLJADGmg+avtVb 60vcNEmfYyGTesJj8dkCqE59pdxwb+WN4rliiPnaoEk5wokz0hLjoaTdQihoRNXowFV/XS KwK1jlk2FtXE6p2IY5nwcBVgj+8dv145P1TCE/ZZtIJyl1c7r9wDhV59/Q+1rizERX9DFr YQdUvfysu+C/Hdb1mF2Ju2kNAmI4Q/lCBrR45vDqT6ascfy0MFBzSJayUfsi1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771651928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qkPRl73sfSGbOLgv7gG7jzU9I4X8Z1DtASZxcG86GEk=; b=aX9rvkAZXGHL/10iRzEZbNw838iI07sQL/wEKuPDhhD8NI3SxxgrAwhXpbXsTdrDf78F9U P8KRS2rQlljFQwz99FHRzqJpA19UOAfL9XuFlOeiaC9EgNlw944D9GJPFI3Wije2CI4x2r 8pkGVtHi503IcnbBd6Ft0TT0SXKcGc+YO0o6fb+34kvheV9giXD3947ykg0XdU/uGSjA36 w83Uz+qzbzjFC7/j4P1ynoPin0InDAtyOjMyj9folbOpS7ctlzhePKj1q/pedo13cG5dxL MtewtxwcYdqWwhR7yiBc4UB15Iwd5S2iY7fH1WDeC7k10PhD+z6nJOyzJKEg7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHwjN5Bw0z11RY for ; Sat, 21 Feb 2026 05:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 360fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 05:32:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: e20e26e4e271 - main - asmc: code style modernization and minor cleanups List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e20e26e4e271ecb74e40d9a95ed3112ceaf9604f Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 05:32:03 +0000 Message-Id: <69994353.360fa.1538ebcc@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e20e26e4e271ecb74e40d9a95ed3112ceaf9604f commit e20e26e4e271ecb74e40d9a95ed3112ceaf9604f Author: Enji Cooper AuthorDate: 2026-02-20 03:51:13 +0000 Commit: Enji Cooper CommitDate: 2026-02-21 05:29:36 +0000 asmc: code style modernization and minor cleanups - Allow `ASMC_DEBUG` to be treated as a variadic macro. - Add ellipses around `sizeof(..)` calls. - Reindent some of the lines to better follow style(9) with line wrapping. A number of other clang-format changes were not taken as they are not compatible with style(9). MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55394 --- sys/dev/asmc/asmc.c | 106 +++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 59 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index b5cf123bd99f..bff214c084c5 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -549,9 +549,9 @@ static driver_t asmc_driver = { #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASMC") #ifdef ASMC_DEBUG -#define ASMC_DPRINTF(str) device_printf(dev, str) +#define ASMC_DPRINTF(str, ...) device_printf(dev, str, ##__VA_ARGS__) #else -#define ASMC_DPRINTF(str) +#define ASMC_DPRINTF(str, ...) #endif /* NB: can't be const */ @@ -645,57 +645,50 @@ asmc_attach(device_t dev) name[0] = '0' + j; name[1] = 0; sc->sc_fan_tree[i] = SYSCTL_ADD_NODE(sysctlctx, - SYSCTL_CHILDREN(sc->sc_fan_tree[0]), - OID_AUTO, name, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, - "Fan Subtree"); + SYSCTL_CHILDREN(sc->sc_fan_tree[0]), OID_AUTO, name, + CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Fan Subtree"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "id", - CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, j, model->smc_fan_id, "I", - "Fan ID"); + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, + model->smc_fan_id, "I", "Fan ID"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "speed", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, j, model->smc_fan_speed, "I", - "Fan speed in RPM"); + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, + model->smc_fan_speed, "I", "Fan speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "safespeed", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, j, model->smc_fan_safespeed, "I", - "Fan safe speed in RPM"); + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, + model->smc_fan_safespeed, "I", "Fan safe speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "minspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, - dev, j, model->smc_fan_minspeed, "I", - "Fan minimum speed in RPM"); + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, + model->smc_fan_minspeed, "I", "Fan minimum speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "maxspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, - dev, j, model->smc_fan_maxspeed, "I", - "Fan maximum speed in RPM"); + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, + model->smc_fan_maxspeed, "I", "Fan maximum speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "targetspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, - dev, j, model->smc_fan_targetspeed, "I", - "Fan target speed in RPM"); + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, + model->smc_fan_targetspeed, "I", "Fan target speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "manual", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, - dev, j, asmc_mb_sysctl_fanmanual, "I", + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, + asmc_mb_sysctl_fanmanual, "I", "Fan manual mode (0=auto, 1=manual)"); } @@ -710,8 +703,8 @@ asmc_attach(device_t dev) SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_temp_tree), OID_AUTO, model->smc_tempnames[i], - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, i, asmc_temp_sysctl, "I", + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, i, + asmc_temp_sysctl, "I", model->smc_tempdescs[i]); } @@ -734,16 +727,15 @@ asmc_attach(device_t dev) SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_light_tree), OID_AUTO, "right", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, 0, model->smc_light_right, "I", + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, 0, + model->smc_light_right, "I", "Keyboard backlight right sensor"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_light_tree), OID_AUTO, "control", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY | - CTLFLAG_MPSAFE, dev, 0, - model->smc_light_control, "I", + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, + dev, 0, model->smc_light_control, "I", "Keyboard backlight brightness control"); } @@ -806,11 +798,8 @@ asmc_attach(device_t dev) goto err2; } - ret = bus_setup_intr(dev, sc->sc_irq, - INTR_TYPE_MISC | INTR_MPSAFE, - asmc_sms_intrfast, NULL, - dev, &sc->sc_cookie); - + ret = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC | INTR_MPSAFE, + asmc_sms_intrfast, NULL, dev, &sc->sc_cookie); if (ret) { device_printf(dev, "unable to setup SMS IRQ\n"); goto err1; @@ -858,7 +847,7 @@ asmc_resume(device_t dev) buf[0] = light_control; buf[1] = 0x00; - asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof buf); + asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof(buf)); return (0); } @@ -959,8 +948,9 @@ out: nosms: sc->sc_nfan = asmc_fan_count(dev); if (sc->sc_nfan > ASMC_MAXFANS) { - device_printf(dev, "more than %d fans were detected. Please " - "report this.\n", ASMC_MAXFANS); + device_printf(dev, + "more than %d fans were detected. Please report this.\n", + ASMC_MAXFANS); sc->sc_nfan = ASMC_MAXFANS; } @@ -1020,12 +1010,9 @@ asmc_wait(device_t dev, uint8_t val) #ifdef ASMC_DEBUG sc = device_get_softc(dev); -#endif - val = val & ASMC_STATUS_MASK; -#ifdef ASMC_DEBUG - device_printf(dev, "%s failed: 0x%x, 0x%x\n", __func__, val, - ASMC_CMDPORT_READ(sc)); + device_printf(dev, "%s failed: 0x%x, 0x%x\n", __func__, + val & ASMC_STATUS_MASK, ASMC_CMDPORT_READ(sc)); #endif return (1); } @@ -1166,16 +1153,17 @@ out: type[5] = 0; if (maxlen > sizeof(v)) { device_printf(dev, - "WARNING: cropping maxlen from %d to %zu\n", - maxlen, sizeof(v)); + "WARNING: cropping maxlen from %d to %zu\n", maxlen, + sizeof(v)); maxlen = sizeof(v); } for (i = 0; i < sizeof(v); i++) { v[i] = 0; } asmc_key_read(dev, key, v, maxlen); - snprintf(buf, sizeof(buf), "key %d is: %s, type %s " - "(len %d), data", number, key, type, maxlen); + snprintf(buf, sizeof(buf), + "key %d is: %s, type %s (len %d), data", + number, key, type, maxlen); for (i = 0; i < maxlen; i++) { snprintf(buf2, sizeof(buf2), " %02x", v[i]); strlcat(buf, buf2, sizeof(buf)); @@ -1239,7 +1227,7 @@ asmc_fan_count(device_t dev) { uint8_t buf[1]; - if (asmc_key_read(dev, ASMC_KEY_FANCOUNT, buf, sizeof buf) != 0) + if (asmc_key_read(dev, ASMC_KEY_FANCOUNT, buf, sizeof(buf)) != 0) return (-1); return (buf[0]); @@ -1253,7 +1241,7 @@ asmc_fan_getvalue(device_t dev, const char *key, int fan) char fankey[5]; snprintf(fankey, sizeof(fankey), key, fan); - if (asmc_key_read(dev, fankey, buf, sizeof buf) != 0) + if (asmc_key_read(dev, fankey, buf, sizeof(buf)) != 0) return (-1); speed = (buf[0] << 6) | (buf[1] >> 2); @@ -1287,7 +1275,7 @@ asmc_fan_setvalue(device_t dev, const char *key, int fan, int speed) buf[1] = speed; snprintf(fankey, sizeof(fankey), key, fan); - if (asmc_key_write(dev, fankey, buf, sizeof buf) < 0) + if (asmc_key_write(dev, fankey, buf, sizeof(buf)) < 0) return (-1); return (0); @@ -1455,7 +1443,7 @@ asmc_temp_getvalue(device_t dev, const char *key) /* * Check for invalid temperatures. */ - if (asmc_key_read(dev, key, buf, sizeof buf) != 0) + if (asmc_key_read(dev, key, buf, sizeof(buf)) != 0) return (-1); return (buf[0]); @@ -1488,12 +1476,12 @@ asmc_sms_read(device_t dev, const char *key, int16_t *val) case 'X': case 'Y': case 'Z': - error = asmc_key_read(dev, key, buf, sizeof buf); + error = asmc_key_read(dev, key, buf, sizeof(buf)); break; default: device_printf(dev, "%s called with invalid argument %s\n", __func__, key); - error = 1; + error = EINVAL; goto out; } *val = ((int16_t)buf[0] << 8) | buf[1]; @@ -1638,7 +1626,7 @@ asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS) int error; int32_t v; - asmc_key_read(dev, ASMC_KEY_LIGHTLEFT, buf, sizeof buf); + asmc_key_read(dev, ASMC_KEY_LIGHTLEFT, buf, sizeof(buf)); v = buf[2]; error = sysctl_handle_int(oidp, &v, 0, req); @@ -1653,7 +1641,7 @@ asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS) int error; int32_t v; - asmc_key_read(dev, ASMC_KEY_LIGHTRIGHT, buf, sizeof buf); + asmc_key_read(dev, ASMC_KEY_LIGHTRIGHT, buf, sizeof(buf)); v = buf[2]; error = sysctl_handle_int(oidp, &v, 0, req); @@ -1677,7 +1665,7 @@ asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS) light_control = v; buf[0] = light_control; buf[1] = 0x00; - asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof buf); + asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof(buf)); } return (error); } @@ -1690,7 +1678,7 @@ asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS) int error; uint32_t v; - asmc_key_read(dev, ASMC_KEY_LIGHTLEFT, buf, sizeof buf); + asmc_key_read(dev, ASMC_KEY_LIGHTLEFT, buf, sizeof(buf)); /* * This seems to be a 32 bit big endian value from buf[6] -> buf[9]. From nobody Sat Feb 21 05:34:17 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHwls3mjrz6QSNB for ; Sat, 21 Feb 2026 05:34: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 4fHwls2g8Bz3XBX for ; Sat, 21 Feb 2026 05:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771652057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+NUvxJify+lfR3BOkrYu6yl3zo+R/yEiQOKV+YogmI=; b=fpRRerbUccbbN89VQxPMQL+hNvaZAy6kIysM6uHI7INqj+ud6gK+iGnfcD86gc+q1ccNFQ PQA2j34/0LfFuLiM6sbxpjoObsikqUCDto4kTAl6VoEZGRAx1nv08KMrW3gPoabyxCEpmh eIOfxWP+hX/qVAAFPuAbeKOHMcxLnGnj7yeLKBGSBEgr4N/INwFhRIaLGMPS6SHu6WUpwS hPm57mroDtXzqwZPxeQ9LVjnBPpEZMcRsf/xS9d20jFWdS87gol1PSH6NGDBV49GcbECFg vx4VIgvRzF5on0o5VUDSqrFvX2CyK75bhdUUCIERn00ZSvskT9ZQuOTLbXVdsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771652057; a=rsa-sha256; cv=none; b=pcWYYI5GQ0A1t89MPh4pAn2Q52kXcXc6KveqdQYON7usNx544nJO29nEoBdC+nLofzyW1e qQZFr9bXkoP1CXPittTRVtYmsaqFKCWSjWJQLlN98CnGwJqIYKZL+SqQ0bgC76TEAOX0h/ jBlTTGipUW7gbp+qb12BSZ0SOmQY7E168KTBxDtfK62U3CCNScvcBAGEWKNz6+/0yUrPsa Q4fQoa5Qneu9GZOkbj4KJPNcUty/jJ0G0N6+0/zWWvx/OmbKQIup296PVU3yDp21ty8FKE Nfc+sTiH69AFjYhaRG3tTD//53DbuOnVziNpr30QReyBOqW1ZHgyxER7Tkto8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771652057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+NUvxJify+lfR3BOkrYu6yl3zo+R/yEiQOKV+YogmI=; b=LlfPYxIGL0sp/BbhGpgl1vyRQeZ9CO++lFNzdkzThoM9iyJgiiDYKl/gEk2uxLFzVPN3Rf 4KJKCpFasUGOPaYrOyR+2s92oRBoOxowR/waFeT7/OpiGKO+Y1/UdRIxNS0+nj5EC8BZ1s u8EhMhb7KmwwC0ba8J8kfDvdF/AuAvawgy5AJ3qJUqthjGdC1BbkjNF9gEJbM7AhSTmCxn OreHK9r/415NujXslrz/x4CdlcspbaRRBmPYEBnhVhRAPOAUCsywUzlDETOv6AJt8ZrfpK Vh7RTxOqx+m909fNBpTHMuYUP6BWf02MFhpkjZz2JGzmaW83Nqh69/PFvbrrTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHwls2GXjz10w2 for ; Sat, 21 Feb 2026 05:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34622 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 05:34:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: e2abec625bf0 - main - MFV: less v692. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2abec625bf07c054f7ac2df2402d6c454113df8 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 05:34:17 +0000 Message-Id: <699943d9.34622.4e1ac330@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=e2abec625bf07c054f7ac2df2402d6c454113df8 commit e2abec625bf07c054f7ac2df2402d6c454113df8 Merge: e20e26e4e271 4be8b0bdecb3 Author: Xin LI AuthorDate: 2026-02-21 05:33:50 +0000 Commit: Xin LI CommitDate: 2026-02-21 05:33:50 +0000 MFV: less v692. contrib/less/LICENSE | 2 +- contrib/less/NEWS | 21 ++++++++++++++ contrib/less/brac.c | 2 +- contrib/less/ch.c | 2 +- contrib/less/charset.c | 17 ++++++++--- contrib/less/charset.h | 2 +- contrib/less/cmd.h | 4 ++- contrib/less/cmdbuf.c | 2 +- contrib/less/command.c | 2 +- contrib/less/cvt.c | 2 +- contrib/less/decode.c | 16 +++++++---- contrib/less/edit.c | 2 +- contrib/less/evar.c | 2 +- contrib/less/filename.c | 7 +++-- contrib/less/forwback.c | 2 +- contrib/less/help.c | 6 ++-- contrib/less/ifile.c | 2 +- contrib/less/input.c | 2 +- contrib/less/jump.c | 2 +- contrib/less/lang.h | 2 +- contrib/less/less.h | 2 +- contrib/less/less.hlp | 4 +-- contrib/less/less.nro | 14 ++++----- contrib/less/lessecho.c | 2 +- contrib/less/lessecho.nro | 2 +- contrib/less/lesskey.c | 2 +- contrib/less/lesskey.h | 2 +- contrib/less/lesskey.nro | 68 +++++++++++++++++++++++++++++++------------- contrib/less/lesskey_parse.c | 11 ++++++- contrib/less/lglob.h | 2 +- contrib/less/line.c | 2 +- contrib/less/linenum.c | 2 +- contrib/less/lsystem.c | 2 +- contrib/less/main.c | 2 +- contrib/less/mark.c | 2 +- contrib/less/optfunc.c | 4 +-- contrib/less/option.c | 8 +++--- contrib/less/option.h | 3 +- contrib/less/opttbl.c | 4 +-- contrib/less/os.c | 2 +- contrib/less/output.c | 2 +- contrib/less/pattern.c | 2 +- contrib/less/pattern.h | 2 +- contrib/less/pckeys.h | 4 ++- contrib/less/position.c | 2 +- contrib/less/position.h | 2 +- contrib/less/prompt.c | 2 +- contrib/less/screen.c | 41 +++++++++++++++++++++++--- contrib/less/scrsize.c | 2 +- contrib/less/search.c | 2 +- contrib/less/signal.c | 2 +- contrib/less/tags.c | 2 +- contrib/less/ttyin.c | 2 +- contrib/less/version.c | 8 ++++-- contrib/less/xbuf.c | 9 ++++++ contrib/less/xbuf.h | 9 ++++++ 56 files changed, 233 insertions(+), 99 deletions(-) diff --cc contrib/less/command.c index 4784cf45daa6,000000000000..1bb8d006f8ec mode 100644,000000..100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@@ -1,2365 -1,0 +1,2365 @@@ +/* - * Copyright (C) 1984-2025 Mark Nudelman ++ * Copyright (C) 1984-2026 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ + + +/* + * User-level command processor. + */ + +#include "less.h" +#if MSDOS_COMPILER==WIN32C +#include +#endif +#include "position.h" +#include "option.h" +#include "cmd.h" + +extern int erase_char, erase2_char, kill_char; +extern int sigs; +extern int quit_if_one_screen; +extern int one_screen; +extern int sc_width; +extern int sc_height; +extern char *kent; +extern int swindow; +extern int jump_sline; +extern lbool quitting; +extern int wscroll; +extern int top_scroll; +extern lbool ignore_eoi; +extern int hshift; +extern int bs_mode; +extern int proc_backspace; +extern int show_attn; +extern int less_is_more; +extern int chopline; +extern POSITION highest_hilite; +extern char *every_first_cmd; +extern char version[]; +extern struct scrpos initial_scrpos; +extern IFILE curr_ifile; +extern void *ml_search; +extern void *ml_examine; +extern int wheel_lines; +extern int def_search_type; +extern lbool search_wrapped; +extern int no_paste; +extern lbool pasting; +extern int no_edit_warn; +extern POSITION soft_eof; +extern POSITION search_incr_start; +extern char *first_cmd_at_prompt; +#if SHELL_ESCAPE || PIPEC +extern void *ml_shell; +#endif +#if EDITOR +extern constant char *editproto; +#endif +#if OSC8_LINK +extern char *osc8_uri; +#endif +extern int shift_count; +extern int forw_prompt; +extern int incr_search; +extern int full_screen; +#if MSDOS_COMPILER==WIN32C +extern int utf_mode; +extern unsigned less_acp; +#endif + +#if SHELL_ESCAPE +static char *shellcmd = NULL; /* For holding last shell command for "!!" */ +#endif +static int mca; /* The multicharacter command (action) */ +static int search_type; /* The previous type of search */ +static int last_search_type; /* Type of last executed search */ +static LINENUM number; /* The number typed by the user */ +static long fraction; /* The fractional part of the number */ +static struct loption *curropt; +static lbool opt_lower; +static int optflag; +static lbool optgetname; +static POSITION bottompos; +static int save_hshift; +static int save_bs_mode; +static int save_proc_backspace; +static int screen_trashed_value = 0; +static lbool literal_char = FALSE; +static lbool ignoring_input = FALSE; +static struct scrpos search_incr_pos = { NULL_POSITION, 0 }; +static int search_incr_hshift; +#if HAVE_TIME +static time_type ignoring_input_time; +#endif +#if PIPEC +static char pipec; +#endif + +/* Stack of ungotten chars (via ungetcc) */ +struct ungot { + struct ungot *ug_next; + char ug_char; + lbool ug_end_command; +}; +static struct ungot* ungot = NULL; + +static void multi_search(constant char *pattern, int n, int silent); + +/* + * Move the cursor to start of prompt line before executing a command. + * This looks nicer if the command takes a long time before + * updating the screen. + */ +public void cmd_exec(void) +{ + clear_attn(); + clear_bot(); + flush(); +} + +/* + * Indicate we are reading a multi-character command. + */ +static void set_mca(int action) +{ + mca = action; + clear_bot(); + clear_cmd(); +} + +/* + * Indicate we are not reading a multi-character command. + */ +static void clear_mca(void) +{ + if (mca == 0) + return; + mca = 0; +} + +/* + * Set up the display to start a new multi-character command. + */ +static void start_mca(int action, constant char *prompt, void *mlist, int cmdflags) +{ + set_mca(action); + cmd_putstr(prompt); + set_mlist(mlist, cmdflags); +} + +public lbool in_mca(void) +{ + return (mca != 0 && mca != A_PREFIX); +} + +/* + * Set up the display to start a new search command. + */ +static void mca_search1(void) +{ + int i; + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + set_mca(A_FILTER); + else +#endif + if (search_type & SRCH_FORW) + set_mca(A_F_SEARCH); + else + set_mca(A_B_SEARCH); + + if (search_type & SRCH_NO_MATCH) + cmd_putstr("Non-match "); + if (search_type & SRCH_FIRST_FILE) + cmd_putstr("First-file "); + if (search_type & SRCH_PAST_EOF) + cmd_putstr("EOF-ignore "); + if (search_type & SRCH_NO_MOVE) + cmd_putstr("Keep-pos "); + if (search_type & SRCH_NO_REGEX) + cmd_putstr("Regex-off "); + if (search_type & SRCH_WRAP) + cmd_putstr("Wrap "); + for (i = 1; i <= NUM_SEARCH_COLORS; i++) + { + if (search_type & SRCH_SUBSEARCH(i)) + { + char buf[INT_STRLEN_BOUND(int)+8]; + SNPRINTF1(buf, sizeof(buf), "Sub-%d ", i); + cmd_putstr(buf); + } + } + if (literal_char) + cmd_putstr("Lit "); + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + cmd_putstr("&/"); + else +#endif + if (search_type & SRCH_FORW) + cmd_putstr("/"); + else + cmd_putstr("?"); + forw_prompt = 0; +} + +static void mca_search(void) +{ + if (incr_search) + { + /* Remember where the incremental search started. */ + get_scrpos(&search_incr_pos, TOP); + search_incr_start = search_pos(search_type); + search_incr_hshift = hshift; + } + mca_search1(); + set_mlist(ml_search, 0); +} + +/* + * Set up the display to start a new toggle-option command. + */ +static void mca_opt_toggle(void) +{ + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + constant char *dash = (flag == OPT_NO_TOGGLE) ? "_" : "-"; + + set_mca(A_OPT_TOGGLE); + cmd_putstr(dash); + if (optgetname) + cmd_putstr(dash); + if (no_prompt) + cmd_putstr("(P)"); + switch (flag) + { + case OPT_UNSET: + cmd_putstr("+"); + break; + case OPT_SET: + cmd_putstr("!"); + break; + } + forw_prompt = 0; + set_mlist(NULL, CF_OPTION); +} + +/* + * Execute a multicharacter command. + */ +static void exec_mca(void) +{ + constant char *cbuf; + + cmd_exec(); + cbuf = get_cmdbuf(); + if (cbuf == NULL) + return; + + switch (mca) + { + case A_F_SEARCH: + case A_B_SEARCH: + multi_search(cbuf, (int) number, 0); + break; +#if HILITE_SEARCH + case A_FILTER: + search_type ^= SRCH_NO_MATCH; + set_filter_pattern(cbuf, search_type); + soft_eof = NULL_POSITION; + break; +#endif + case A_FIRSTCMD: + /* + * Skip leading spaces or + signs in the string. + */ + while (*cbuf == '+' || *cbuf == ' ') + cbuf++; + if (every_first_cmd != NULL) + free(every_first_cmd); + if (*cbuf == '\0') + every_first_cmd = NULL; + else + every_first_cmd = save(cbuf); + break; + case A_OPT_TOGGLE: + toggle_option(curropt, opt_lower, cbuf, optflag); + curropt = NULL; + break; + case A_F_BRACKET: + match_brac(cbuf[0], cbuf[1], 1, (int) number); + break; + case A_B_BRACKET: + match_brac(cbuf[1], cbuf[0], 0, (int) number); + break; +#if EXAMINE + case A_EXAMINE: { + char *p; + if (!secure_allow(SF_EXAMINE)) + break; + p = save(cbuf); + edit_list(p); + free(p); +#if TAGS + /* If tag structure is loaded then clean it up. */ + cleantags(); +#endif + break; } +#endif +#if SHELL_ESCAPE + case A_SHELL: { + /* + * !! just uses whatever is in shellcmd. + * Otherwise, copy cmdbuf to shellcmd, + * expanding any special characters ("%" or "#"). + */ + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "!done"; + if (done_msg == NULL) + ++cbuf; + if (*cbuf != '!') + { + if (shellcmd != NULL) + free(shellcmd); + shellcmd = fexpand(cbuf); + } + if (!secure_allow(SF_SHELL)) + break; + if (shellcmd == NULL) + shellcmd = ""; + lsystem(shellcmd, done_msg); + break; } + case A_PSHELL: { + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "#done"; + if (done_msg == NULL) + ++cbuf; + if (!secure_allow(SF_SHELL)) + break; + lsystem(pr_expand(cbuf), done_msg); + break; } +#endif +#if PIPEC + case A_PIPE: { + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "|done"; + if (done_msg == NULL) + ++cbuf; + if (!secure_allow(SF_PIPE)) + break; + (void) pipe_mark(pipec, cbuf); + if (done_msg != NULL) + error(done_msg, NULL_PARG); + break; } +#endif + } +} + +/* + * Is a character an erase or kill char? + */ +static lbool is_erase_char(char c) +{ + return (c == erase_char || c == erase2_char || c == kill_char); +} + +/* + * Is a character a carriage return or newline? + */ +static lbool is_newline_char(char c) +{ + return (c == '\n' || c == '\r'); +} + +/* + * Handle the first char of an option (after the initial dash). + */ +static int mca_opt_first_char(char c) +{ + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + if (flag == OPT_NO_TOGGLE) + { + switch (c) + { + case '_': + /* "__" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } else + { + switch (c) + { + case '+': + /* "-+" = UNSET. */ + optflag = no_prompt | ((flag == OPT_UNSET) ? + OPT_TOGGLE : OPT_UNSET); + mca_opt_toggle(); + return (MCA_MORE); + case '!': + /* "-!" = SET */ + optflag = no_prompt | ((flag == OPT_SET) ? + OPT_TOGGLE : OPT_SET); + mca_opt_toggle(); + return (MCA_MORE); + case CONTROL('P'): + optflag ^= OPT_NO_PROMPT; + mca_opt_toggle(); + return (MCA_MORE); + case '-': + /* "--" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } + /* Char was not handled here. */ + return (NO_MCA); +} + +/* + * Add a char to a long option name. + * See if we've got a match for an option name yet. + * If so, display the complete name and stop + * accepting chars until user hits RETURN. + */ +static int mca_opt_nonfirst_char(char c) +{ + constant char *p; + constant char *oname; + lbool ambig; + struct loption *was_curropt; + + if (curropt != NULL) + { + /* Already have a match for the name. */ + if (is_erase_char(c)) + return (MCA_DONE); + /* {{ Checking for TAB here is ugly. + * Also doesn't extend well -- can't do BACKTAB this way + * because it's a multichar sequence. }} */ + if (c != '\t') + return (MCA_MORE); + } + /* + * Add char to cmd buffer and try to match + * the option name. + */ + if (cmd_char(c) == CC_QUIT) + return (MCA_DONE); + p = get_cmdbuf(); + if (p == NULL || p[0] == '\0') + return (MCA_MORE); + opt_lower = ASCII_IS_LOWER(p[0]); + was_curropt = curropt; + curropt = findopt_name(&p, &oname, &ambig); + if (curropt != NULL) + { + if (was_curropt == NULL) + { + /* + * Got a match. + * Remember the option and + * display the full option name. + */ + cmd_reset(); + mca_opt_toggle(); + cmd_setstring(oname, !opt_lower); + } + } else if (!ambig) + { + lbell(); + } + return (MCA_MORE); +} + +/* + * Handle a char of an option toggle command. + */ +static int mca_opt_char(char c) +{ + PARG parg; + + /* + * This may be a short option (single char), + * or one char of a long option name, + * or one char of the option parameter. + */ + if (curropt == NULL && cmdbuf_empty()) + { + int ret = mca_opt_first_char(c); + if (ret != NO_MCA) + return (ret); + } + if (optgetname) + { + /* We're getting a long option name. */ + if (!is_newline_char(c) && c != '=') + return (mca_opt_nonfirst_char(c)); + if (curropt == NULL) + { + parg.p_string = get_cmdbuf(); + if (parg.p_string == NULL) + return (MCA_MORE); + error("There is no --%s option", &parg); + return (MCA_DONE); + } + optgetname = FALSE; + cmd_reset(); + } else + { + if (is_erase_char(c)) + return (NO_MCA); + if (curropt != NULL) + /* We're getting the option parameter. */ + return (NO_MCA); + curropt = findopt(c); + if (curropt == NULL) + { + parg.p_string = propt(c); + error("There is no %s option", &parg); + return (MCA_DONE); + } + opt_lower = ASCII_IS_LOWER(c); + } + /* + * If the option which was entered does not take a + * parameter, toggle the option immediately, + * so user doesn't have to hit RETURN. + */ + if ((optflag & ~OPT_NO_PROMPT) != OPT_TOGGLE || + !opt_has_param(curropt)) + { + toggle_option(curropt, opt_lower, "", optflag); + return (MCA_DONE); + } + /* + * Display a prompt appropriate for the option parameter. + */ + start_mca(A_OPT_TOGGLE, opt_prompt(curropt), NULL, CF_OPTION); + return (MCA_MORE); +} + +/* + * Normalize search type. + */ +public int norm_search_type(int st) +{ + /* WRAP and PAST_EOF are mutually exclusive. */ + if ((st & (SRCH_PAST_EOF|SRCH_WRAP)) == (SRCH_PAST_EOF|SRCH_WRAP)) + st ^= SRCH_PAST_EOF; + return st; +} + +/* + * Handle a char of a search command. + */ +static int mca_search_char(char c) +{ + int flag = 0; + + /* + * Certain characters as the first char of + * the pattern have special meaning: + * ! Toggle the NO_MATCH flag + * * Toggle the PAST_EOF flag + * @ Toggle the FIRST_FILE flag + */ + if (!cmdbuf_empty() || literal_char) + { + lbool was_literal_char = literal_char; + literal_char = FALSE; + if (was_literal_char) + mca_search1(); + return (NO_MCA); + } + + switch (c) + { + case '*': + if (less_is_more) + break; + case CONTROL('E'): /* ignore END of file */ + if (mca != A_FILTER) + flag = SRCH_PAST_EOF; + search_type &= ~SRCH_WRAP; + break; + case '@': + if (less_is_more) + break; + case CONTROL('F'): /* FIRST file */ + if (mca != A_FILTER) + flag = SRCH_FIRST_FILE; + break; + case CONTROL('K'): /* KEEP position */ + if (mca != A_FILTER) + flag = SRCH_NO_MOVE; + break; + case CONTROL('S'): { /* SUBSEARCH */ + char buf[INT_STRLEN_BOUND(int)+24]; + SNPRINTF1(buf, sizeof(buf), "Sub-pattern (1-%d):", NUM_SEARCH_COLORS); + clear_bot(); + cmd_putstr(buf); + flush(); + c = getcc(); + if (c >= '1' && c <= '0'+NUM_SEARCH_COLORS) + flag = SRCH_SUBSEARCH(c-'0'); + else + flag = -1; /* calls mca_search() below to repaint */ + break; } + case CONTROL('W'): /* WRAP around */ + if (mca != A_FILTER) + flag = SRCH_WRAP; + break; + case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */ + flag = SRCH_NO_REGEX; + break; + case CONTROL('N'): /* NOT match */ + case '!': + flag = SRCH_NO_MATCH; + break; + case CONTROL('L'): + literal_char = TRUE; + flag = -1; + break; + } + + if (flag != 0) + { + if (flag != -1) + search_type = norm_search_type(search_type ^ flag); + mca_search(); + return (MCA_MORE); + } + return (NO_MCA); +} + +/* + * Jump back to the starting position of an incremental search. + */ +static void jump_search_incr_pos(void) +{ + if (search_incr_pos.pos == NULL_POSITION) + return; + hshift = search_incr_hshift; + jump_loc(search_incr_pos.pos, search_incr_pos.ln); +} + +/* + * Handle a character of a multi-character command. + */ +static int mca_char(char c) +{ + int ret; + + switch (mca) + { + case 0: + /* + * We're not in a multicharacter command. + */ + return (NO_MCA); + + case A_PREFIX: + /* + * In the prefix of a command. + * This not considered a multichar command + * (even tho it uses cmdbuf, etc.). + * It is handled in the commands() switch. + */ + return (NO_MCA); + + case A_DIGIT: + /* + * Entering digits of a number. + * Terminated by a non-digit. + */ + if ((c >= '0' && c <= '9') || c == '.') + break; + switch (editchar(c, ECF_PEEK|ECF_NOHISTORY|ECF_NOCOMPLETE|ECF_NORIGHTLEFT)) + { + case A_NOACTION: + /* + * Ignore this char and get another one. + */ + return (MCA_MORE); + case A_INVALID: + /* + * Not part of the number. + * End the number and treat this char + * as a normal command character. + */ + number = cmd_int(&fraction); + clear_mca(); + cmd_accept(); + return (NO_MCA); + } + break; + + case A_OPT_TOGGLE: + ret = mca_opt_char(c); + if (ret != NO_MCA) + return (ret); + break; + + case A_F_SEARCH: + case A_B_SEARCH: + case A_FILTER: + ret = mca_search_char(c); + if (ret != NO_MCA) + return (ret); + break; + + default: + /* Other multicharacter command. */ + break; + } + + /* + * The multichar command is terminated by a newline. + */ + if (is_newline_char(c)) + { + if (pasting && no_paste) + { + /* Ignore pasted input after (and including) the first newline */ + start_ignoring_input(); + return (MCA_MORE); + } + /* Execute the command. */ + exec_mca(); + return (MCA_DONE); + } + + /* + * Append the char to the command buffer. + */ + if (cmd_char(c) == CC_QUIT) + /* + * Abort the multi-char command. + */ + return (MCA_DONE); + + switch (mca) + { + case A_F_BRACKET: + case A_B_BRACKET: + if (len_cmdbuf() >= 2) + { + /* + * Special case for the bracket-matching commands. + * Execute the command after getting exactly two + * characters from the user. + */ + exec_mca(); + return (MCA_DONE); + } + break; + case A_F_SEARCH: + case A_B_SEARCH: + if (incr_search) + { + /* Incremental search: do a search after every input char. */ + int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP|SRCH_SUBSEARCH_ALL)); + ssize_t save_updown; + constant char *pattern = get_cmdbuf(); + if (pattern == NULL) + return (MCA_MORE); + /* Defer searching if more chars of the pattern are available. */ + if (ttyin_ready()) + return (MCA_MORE); + /* + * Must save updown_match because mca_search + * reinits it. That breaks history scrolling. + * {{ This is ugly. mca_search probably shouldn't call set_mlist. }} + */ + save_updown = save_updown_match(); + cmd_exec(); + if (*pattern == '\0') + { + /* User has backspaced to an empty pattern. */ + undo_search(TRUE); + jump_search_incr_pos(); + } else + { + if (search(st | SRCH_INCR, pattern, 1) != 0) + { + /* No match, invalid pattern, etc. */ + undo_search(TRUE); + jump_search_incr_pos(); + } + } + /* Redraw the search prompt and search string. */ + if (is_screen_trashed() || !full_screen) + { + lclear(); + repaint(); + } + mca_search1(); + restore_updown_match(save_updown); + cmd_repaint(NULL); + } + break; + } + + /* + * Need another character. + */ + return (MCA_MORE); +} + +/* + * Discard any buffered file data. + */ +static void clear_buffers(void) +{ + if (!(ch_getflags() & CH_CANSEEK)) + return; + ch_flush(); + clr_linenum(); +#if HILITE_SEARCH + clr_hilite(); +#endif + set_line_contig_pos(NULL_POSITION); +} + +public void screen_trashed_num(int trashed) +{ + screen_trashed_value = trashed; +} + +public void screen_trashed(void) +{ + screen_trashed_num(1); +} + +public int is_screen_trashed(void) +{ + return screen_trashed_value; +} + +/* + * Make sure the screen is displayed. + */ +static void make_display(void) +{ + /* + * If not full_screen, we can't rely on scrolling to fill the screen. + * We need to clear and repaint screen before any change. + */ + if (!full_screen && !(quit_if_one_screen && one_screen)) + lclear(); + /* + * If nothing is displayed yet, display starting from initial_scrpos. + */ + if (empty_screen()) + { + if (initial_scrpos.pos == NULL_POSITION) + jump_loc(ch_zero(), 1); + else + jump_loc(initial_scrpos.pos, initial_scrpos.ln); + } else if (is_screen_trashed() || !full_screen) + { + int save_top_scroll = top_scroll; + lbool save_ignore_eoi = ignore_eoi; + top_scroll = 1; + ignore_eoi = FALSE; + if (is_screen_trashed() == 2) + { + /* Special case used by ignore_eoi: re-open the input file + * and jump to the end of the file. */ + reopen_curr_ifile(); + jump_forw(); + } + repaint(); + top_scroll = save_top_scroll; + ignore_eoi = save_ignore_eoi; + } +} + +/* + * Display the appropriate prompt. + */ +static void prompt(void) +{ + constant char *p; + + if (ungot != NULL && !ungot->ug_end_command) + { + /* + * No prompt necessary if commands are from + * ungotten chars rather than from the user. + */ + return; + } + + /* + * Make sure the screen is displayed. + */ + make_display(); + bottompos = position(BOTTOM_PLUS_ONE); + + /* *** 2436 LINES SKIPPED *** From nobody Sat Feb 21 05:45:41 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHx3K2HZ3z6QTXk; Sat, 21 Feb 2026 05:47:41 +0000 (UTC) (envelope-from ivy@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 4fHx3K1QRCz3YJk; Sat, 21 Feb 2026 05:47:41 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771652861; 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=Xmckm6MeDZqR3V+m2/3doLO8AbUzjmUPyx6Pmpj4Hmo=; b=WRlppeW77yQM1QpD/gE3k5Jg6iGP0siwWu35WDUQDrB9MVZOdVD/nO+TC+W5zZEeqCp9aL akDCgESKMBZmQx7e092GG7Ehg7/Q5nRl3opEAIGSiEXlvtpwCTUBX+ivwObSeCgUy/6J9I l9irsMxaU4dhDC6n4nzrY1rM2/mmIlx6d+Epe6X3tqyOFy76BOJJ1TDEm1dNNst8VmHz80 8x3PmDIaDvKsSQalZ2GFHoOckssPZUN4ucmBx+YfOqS7MoAVnyFz+OUF4YNpe7S7HD0gQh hNmGbRp+3vdisePlPJ3HQ8G/GY5IWGDtFGvQJyiDyzZybBxH1+zIstcoIEnFHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771652861; a=rsa-sha256; cv=none; b=OTOLNIJUsoT2UngeRfek7dCR6UMpMvQzZGHzqqk/TmE29iAcpFyBZKOlkypeL73+XIPzzS jIndTXLuYwj2dvE/IVOYTBGvWNynSSGDGcPRrjzsgu1r2pv7OAHQzjJoC27cpEmL3Lymja Yl9flHT4k56EmXLLAF2dt+ubyluQFTMt/KX1LqsoH8g2Hndli9P25Om6adMI3c57xqhqjq k7VRNzLZpBW1i5ldoHfimRLt0+h/+LbjHjj1XD6n3j+Qw7pWUvOM53/q5aEEF9VljPyPHr 29J/R9bTlA7gl9fp0nLfEoHFXt2klKUTIH9F2bl5qspZvIP5q6+MvOWaaTJUQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771652861; 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=Xmckm6MeDZqR3V+m2/3doLO8AbUzjmUPyx6Pmpj4Hmo=; b=O098oT4vXA/s42wn97bYG4kNyBDPf901lPi4l7AezPP5+s8NXYghhoZ4qU/SJuEPCiKddL tVFgqmNE8iMaoDHaI1UXhHlxJmN6x/H4viIeV993b89jwKMns6MJ3+Sqs+Hp/jpUrDhgdV lQPe51J9O1k658m4zH9OsMzS5i9KrOXnyP01JEGm0VFlse1L+LyBTTkUHHKvItnab6mSZZ PRK0fqm94ydJSrJ4tRDWWqmeyVhC5d1fmA5/RfVoFYrFyjmrkZmXtqxsXiqgnli3/tWXd+ QOtf+yPjcz3XbeFzjAa+VhyevhP8O3aNpbb98iFCHvUpYJom756fDZ9k7YC49Q== Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.3 with cipher TLS_AES_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: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fHx3J4qfhzfF; Sat, 21 Feb 2026 05:47:40 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Sat, 21 Feb 2026 05:45:41 +0000 From: Lexi Winter To: Xin LI Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e2abec625bf0 - main - MFV: less v692. Message-ID: Mail-Followup-To: Xin LI , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <699943d9.34622.4e1ac330@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="rQwtubHSck7sOvCR" Content-Disposition: inline In-Reply-To: <699943d9.34622.4e1ac330@gitrepo.freebsd.org> --rQwtubHSck7sOvCR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xin LI wrote in <699943d9.34622.4e1ac330@gitrepo.freebsd.org>: > MFV: less v692. thank you! --rQwtubHSck7sOvCR Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaZlGgQAKCRD1nT63mIK/ YM7uAP4/fz7rfVe8UZYNE7JuJjlkWyelmJfXSMVcX4tCYLUKwAD/TQz92w247e2k Pfv1rSOdjUYg47qovGa66JZv6WBa/Ag= =8dGa -----END PGP SIGNATURE----- --rQwtubHSck7sOvCR-- From nobody Sat Feb 21 08:43:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ0xg5GQrz6SDFt for ; Sat, 21 Feb 2026 08:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJ0xg4Whbz3tLN for ; Sat, 21 Feb 2026 08:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771663383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JZ8vxnVTedkGoSR6TD+/1T70Hk+Xrumqkld9km1uUJE=; b=tGt7hk+aIGlrnAgYQUN3aCprY/szQOygztxsS7OcrEWlsqPjj1D7qkQNrwYMll0H0FEo80 JwOtVc7cUrbdvbSN0ZSWA4cdPHOq7B7v3/88KlyG2xf+ei1kMXXkZ7f3K+/fpYINlwrayF eaFs7c5xrQRUSnMe0GmoPAGBtod2a1U31ktl6/xlClHmyTeWw8RrxygkqVKENs0q1kxQ/T eqmcrlecGw9Y1LQLTbKzHwf8WQgnEOzr3K41CF64Ot+q2l8k8Er49cVBFO1fUb47w4jn3k bknFrMjC6yAbuzkrE0u6fZ9ddP+Xme1f8A6ez00DHYJ9++UrR5daeRJaBS3wcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771663383; a=rsa-sha256; cv=none; b=OD9R65LozTCTodpNvpRPVms2ACrbPf3SO5E84blfRl9mgeJfOYH49n1HKB2TI3L1SBa1ZU hl1m5rf0mrMGj5zEvMiuP+JgHnCHl151dA1cDAYxCmQlk1ggSclIoegXXbWfppOR25BpU2 N06h98vumsHgrAxUkBa1GYJqZZP5GH8WyP31yQxkNK6RWCCd8FaDwOYeKDNmqH6N9OpA3S nzM7qQ9lQ3qwFDe2WdksS812KYESyigh3Y9g+hTaOwnMjMScPL/GGnHcNWsmhosVtnWnn+ sHBvbeW1yRvUPPbh2VGe0cf8INw7DiG16FFJ9ZNAV4CvVwVffj+I0nB34oNGLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771663383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JZ8vxnVTedkGoSR6TD+/1T70Hk+Xrumqkld9km1uUJE=; b=WJa5A/6AW/wIAjv+YMNS2SBBIUMagQkpWug/2gCh1IhqNx0OxuNqOnPjody0TzW1fbBXOD mr5d73CdgisxGsrklTwB+2t8HnseUTM5zZFQEjalE9biL2uRQY7J3Izr3WflmN4eOKnaEr F8IDAN4Xha/zmoNaNbA4EvDCckZcRTOj00txU17wzcBFhfjowG9U/gUM4uBcyt1sAfXCDz 4nG8Dvza8+M9y4G+2AY3AY18EpiyFSYvTcYqWsLOfN6qLFcKYes8uggBaRAViPoWL2tYD2 JEiaDuyRSQ+xC8NPnhswwwY/2BOiYjMotYQ3sgHTE8RW/YZ7sxQo8gHA5C7f2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ0xg3yhBz165k for ; Sat, 21 Feb 2026 08:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 479d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 08:43:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: 503374af390e - main - fix typo in efi/loader/arch/amd64/trap.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 503374af390eb84ec72167ab0be4751b2fe0a446 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 08:43:03 +0000 Message-Id: <69997017.479d7.61082d64@gitrepo.freebsd.org> The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=503374af390eb84ec72167ab0be4751b2fe0a446 commit 503374af390eb84ec72167ab0be4751b2fe0a446 Author: Toomas Soome AuthorDate: 2026-02-21 08:40:48 +0000 Commit: Toomas Soome CommitDate: 2026-02-21 08:40:48 +0000 fix typo in efi/loader/arch/amd64/trap.c Rename grap_faults to grab_faults Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55177 --- stand/efi/loader/arch/amd64/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index f79d74bf0322..671321be3628 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -418,7 +418,7 @@ command_grab_faults(int argc, char *argv[]) printf("failed\n"); return (CMD_OK); } -COMMAND_SET(grap_faults, "grab_faults", "grab faults", command_grab_faults); +COMMAND_SET(grab_faults, "grab_faults", "grab faults", command_grab_faults); static int command_ungrab_faults(int argc, char *argv[]) From nobody Sat Feb 21 08:56:24 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ1F50tpxz6SFjq for ; Sat, 21 Feb 2026 08:56: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 4fJ1F45zFdz3v90 for ; Sat, 21 Feb 2026 08:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771664184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDpR0reGvo2BRaR7OdEhwmJu1uZ9gAsc5X/lQUZMnw8=; b=QOCE47Ywf2VADEWU2csFNaUqW6UnrBltN9UqamwoF5HzYS3sm53LvwcdY8CVCCVSQUVG7f zu8OBMD/aq8DKocJoGOyQoohTFuyWfOWdVz84BNsNpWkLSghDrBKSJfTLLgNTFw6+lFmru 62wCB4ythvkJkP72t6Huen7XlJZrA3PB+ICnohJXuJI0/OKQoW4b8fdxASSdpqZDUOjb/4 2WIB8oVq+7Vz15TwqHoEe0GDVvSsPnRonVRkjSDqGkpcei0F08Vwkp9kYjh7za8gPye4aY MpOuNqFDcBTDGqG1YWTseH2ywx+5pDFCQvO3NlXxCWe781PhJjNxO27eTxUV2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771664184; a=rsa-sha256; cv=none; b=ydXWpbLGBS8+hCgbpfPZRiCM2LjDP9fUsajr7Mu3hwgwcc/LEwk2mkQOP9uDpSOR0De5G8 xU3Let6Y05BkgiWPBFDaX+0cSA/M5eRS3ASzCSbZrJiQYc3s+/QGTzMWsJrfg3UX9+gsui AqZGVUBPEyAxgSLRLBih4375tF6JBUGQqS2WZl5AxJ3/5N05O8wKlvPYmHMyoE3rj1oP6X mlN1fa0acinTRlQQ52IbSFQ9JpwUchWgiDmxbFMXBvIgbHsaeuiTIVn70FA+1lPhMYAaQ6 yeSmkYtX9CYV1EnxaVtej6cWm/Z8LmL+QWpkHF8Bi9NflEZ9lfP0Cwrw5kRJHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771664184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDpR0reGvo2BRaR7OdEhwmJu1uZ9gAsc5X/lQUZMnw8=; b=SecjJHbe1RY1uyFaZv+/B+68DY+P1mD4a+BAKG6XPf0FXBzSQ372fvc15pF7r9oKT4/Ceb sYalNqHziykQFknHS8z/n47cDcI2HaegcE0iXdO6H+4OBdObM4ZRBxGpC9Ygk4xQfyFkwc HNnv1sl71M36SSpOQjbyr1A3gcHuCCN9zYwOVNwnUNEy/vBNUoO2BR8br+ozm2Wni+8FYt Gw98gPUjAuln6yDEtNXSvEf5E/3Bpp4r9N330rQ/DTsY/wDMVI9OrvWDlmg3BTpHRl3IcC j/lmiz8Fg1HbLAtH9+oUdurZBh0lhjzal+vgjn+TitQ7YQVdCQeBN19MFN5fGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ1F44w5sz16N5 for ; Sat, 21 Feb 2026 08:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 197a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 08:56:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: dc11af08a498 - main - loader.efi: tss_pa setup seems to be flawed in trap.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc11af08a4983237a90c3500ecf500ed41b0802b Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 08:56:24 +0000 Message-Id: <69997338.197a5.3c46ed07@gitrepo.freebsd.org> The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=dc11af08a4983237a90c3500ecf500ed41b0802b commit dc11af08a4983237a90c3500ecf500ed41b0802b Author: Toomas Soome AuthorDate: 2026-02-21 08:49:34 +0000 Commit: Toomas Soome CommitDate: 2026-02-21 08:49:34 +0000 loader.efi: tss_pa setup seems to be flawed in trap.c since sd_lobase is 24 bits, we would need to shift 24 bits, not 16. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55178 --- stand/efi/loader/arch/amd64/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index 671321be3628..97e78ecccf22 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -329,7 +329,7 @@ efi_redirect_exceptions(void) free_tables(); return (0); } - tss_pa = tss_desc->sd_lobase + (tss_desc->sd_hibase << 16); + tss_pa = tss_desc->sd_lobase + (tss_desc->sd_hibase << 24); tss = (struct amd64tss *)tss_pa; tss_desc->sd_type = SDT_SYSTSS; /* unbusy */ } From nobody Sat Feb 21 10:07:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2qc5rPRz6SLj4 for ; Sat, 21 Feb 2026 10:07: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 4fJ2qc3c3hz469t for ; Sat, 21 Feb 2026 10:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771668476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e5tp41N4RfI6lV3jJmOGM1lNqnfvqr8XkXXlyg+7rV0=; b=sDwp7c/WthYkRdk5iUS+DCALUKbeKD18iiRY1+JsodiOdPP7H4mqk3bfFguwwOyh17bShz VPuZt4mMYPyWfjzPmO+oova4NG0sDfKC78ujOCU8677wEMCDOqRcMjaMW9Ymi20048+xg+ g3Fgppth7RM8rHWmTiHHid3ntz0sDRmtHAV58UzyW9cuYHl4fHzcTHfioFFhlMxs82Pm1J UmQVdmIYkrvf4ida6kyUPhUeF5MVUUx6KcRG0lteokGU8g+TgipcZZY4UwqmSdB13lVJyi inaC/OOjxxoqdev+xMyt/WRdZ1MyiuAgQXB3EzEiHr4E8Xl4kGySGvARfxc8Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771668476; a=rsa-sha256; cv=none; b=PBRSe76xccroznid+hQU/TRW6KPNQpFwVQRFVQCeFH5Vtoh/Wb+eE3WTVp3h1u+YRFJ1Ws tX+ixkokG4UCPgQaNtZQdwrOPnfqsGXKncTXsLRcjwyhHDKmI3DbEtlEAbuOgURULQJumF OLtyzxyBtN/L4HeLtyIh9FRNLO1jhXRj8osJaVQccCHB6Pd34jPXXv4sT2QwQG8Uc3S25q vBApmRo3BgjXD++Pi5UgCU/FPa6RywyWzB4Za37x+AyGN/9dO2lDKFFjgtL9aci5hSg+B6 01cXXKGI/SUSp+UQoE9X7IpFcdMSFt+zq3UdqH2lVb/c4Yr5rDU2aNaGLjInbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771668476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e5tp41N4RfI6lV3jJmOGM1lNqnfvqr8XkXXlyg+7rV0=; b=j4c5+ko0NMWksKxS5u0mOdn4d0n6FRgPteBbnMEqShuI1QsANrmOXKOHPb2PIYM/Yh/MYV aSDBsvU+HLr2j8rHHNqk/X9Uns7g4VNL6RSuQvBJbu6K0iCK/14WqqIkWozLUVmR+oDD7+ juU75DVW7sLuV0x+E3/Yr4i4T7QeX2imXzvI6q1TI7FLyUNfDMITRpLdHJb8YwMjw4ybf4 2WMK8D1jG2HdbqCf8IW1wViqfD5qQ9+BPqPGuoVSHcN0l125X1qStB7Qfc22TkpXrORaKR aMkmHMlRToz2oJRSCC74JHtV8b6P5SUGUXLgveL4sx3qUePexh9kZ0zbr6VuLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2qc2fn9z17st for ; Sat, 21 Feb 2026 10:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2172a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 10:07:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: be140717a0a4 - main - procctl(PROC_REAP_KILL): use pgrp pg_killsx sx to sync with fork List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be140717a0a4bbfa7176d334c36364d34a0b1bc5 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 10:07:56 +0000 Message-Id: <699983fc.2172a.3cf7cab0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be140717a0a4bbfa7176d334c36364d34a0b1bc5 commit be140717a0a4bbfa7176d334c36364d34a0b1bc5 Author: Konstantin Belousov AuthorDate: 2026-02-15 11:05:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:45:47 +0000 procctl(PROC_REAP_KILL): use pgrp pg_killsx sx to sync with fork PROC_REAP_KILL must guarantee that all reaper descendants are signalled. In particular, it must ensure that forked but not yet fully linked descendants cannot escape killing. Currently, proc_reap() fullfils the guarantee by single-threading stopping the target process, which moves the target to the userspace boundary, so the target cannot fork while the signal is sent. Single-threading has undesirable effect of sometimes terminating sleeps with EINTR. Since the time that the bug with PROC_REAP_KILL was fixed, we grow the pg_killsx mechanism that is similarly used by the process group signalling to ensure that no member of the process group escapes. Reuse pg_killsx for PROC_REAP_KILL as well. Besides the functional change of no longer causing spurious EINTR, not single-threading the target means that we no longer need to delegate the work to the taskqueue. PR: 290844 Reported by: bdrewery Reviewed by: des, markj Tested by: des, pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55288 --- sys/kern/kern_procctl.c | 142 +++++++++++++++++++----------------------------- 1 file changed, 56 insertions(+), 86 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 96365e192d3c..04c47d086677 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include @@ -256,68 +255,73 @@ struct reap_kill_proc_work { ksiginfo_t *ksi; struct procctl_reaper_kill *rk; int *error; - struct task t; }; static void reap_kill_proc_locked(struct reap_kill_proc_work *w) { - int error1; - bool need_stop; + int error; PROC_LOCK_ASSERT(w->target, MA_OWNED); PROC_ASSERT_HELD(w->target); - error1 = cr_cansignal(w->cr, w->target, w->rk->rk_sig); - if (error1 != 0) { + error = cr_cansignal(w->cr, w->target, w->rk->rk_sig); + if (error != 0) { if (*w->error == ESRCH) { w->rk->rk_fpid = w->target->p_pid; - *w->error = error1; + *w->error = error; } return; } - /* - * The need_stop indicates if the target process needs to be - * suspended before being signalled. This is needed when we - * guarantee that all processes in subtree are signalled, - * avoiding the race with some process not yet fully linked - * into all structures during fork, ignored by iterator, and - * then escaping signalling. - * - * The thread cannot usefully stop itself anyway, and if other - * thread of the current process forks while the current - * thread signals the whole subtree, it is an application - * race. - */ - if ((w->target->p_flag & (P_KPROC | P_SYSTEM | P_STOPPED)) == 0) - need_stop = thread_single(w->target, SINGLE_ALLPROC) == 0; - else - need_stop = false; - (void)pksignal(w->target, w->rk->rk_sig, w->ksi); w->rk->rk_killed++; - *w->error = error1; - - if (need_stop) - thread_single_end(w->target, SINGLE_ALLPROC); + *w->error = error; } static void -reap_kill_proc_work(void *arg, int pending __unused) +reap_kill_proc(struct reap_kill_proc_work *w) { - struct reap_kill_proc_work *w; - - w = arg; - PROC_LOCK(w->target); - if ((w->target->p_flag2 & P2_WEXIT) == 0) - reap_kill_proc_locked(w); - PROC_UNLOCK(w->target); - - sx_xlock(&proctree_lock); - w->target = NULL; - wakeup(&w->target); - sx_xunlock(&proctree_lock); + struct pgrp *pgrp; + int xlocked; + + sx_assert(&proctree_lock, SX_LOCKED); + xlocked = sx_xlocked(&proctree_lock); + PROC_LOCK_ASSERT(w->target, MA_OWNED); + PROC_ASSERT_HELD(w->target); + + /* Sync with forks. */ + for (;;) { + /* + * Short-circuit handling of the exiting process, do + * not wait for it to single-thread (hold prevents it + * from exiting further). This avoids + * locking pg_killsx for it, and reduces the + * proctree_lock contention. + */ + if ((w->target->p_flag2 & P2_WEXIT) != 0) + return; + + pgrp = w->target->p_pgrp; + if (pgrp == NULL || sx_try_xlock(&pgrp->pg_killsx)) + break; + + PROC_UNLOCK(w->target); + sx_unlock(&proctree_lock); + /* This is safe because pgrp zone is nofree. */ + sx_xlock(&pgrp->pg_killsx); + sx_xunlock(&pgrp->pg_killsx); + if (xlocked) + sx_xlock(&proctree_lock); + else + sx_slock(&proctree_lock); + PROC_LOCK(w->target); + } + + reap_kill_proc_locked(w); + + if (pgrp != NULL) + sx_xunlock(&pgrp->pg_killsx); } struct reap_kill_tracker { @@ -388,8 +392,7 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, struct reap_kill_tracker_head tracker; struct reap_kill_tracker *t; struct proc *p2; - int r, xlocked; - bool res, st; + bool res; res = false; TAILQ_INIT(&tracker); @@ -432,53 +435,21 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, (P2_REAPKILLED | P2_WEXIT)) != 0) continue; - if (p2 == td->td_proc) { - if ((p2->p_flag & P_HADTHREADS) != 0 && - (p2->p_flag2 & P2_WEXIT) == 0) { - xlocked = sx_xlocked(&proctree_lock); - sx_unlock(&proctree_lock); - st = true; - } else { - st = false; - } - PROC_LOCK(p2); + PROC_LOCK(p2); + if ((p2->p_flag2 & P2_WEXIT) == 0) { + _PHOLD(p2); + /* * sapblk ensures that only one thread * in the system sets this flag. */ p2->p_flag2 |= P2_REAPKILLED; - if (st) - r = thread_single(p2, SINGLE_NO_EXIT); - (void)pksignal(p2, w->rk->rk_sig, w->ksi); - w->rk->rk_killed++; - if (st && r == 0) - thread_single_end(p2, SINGLE_NO_EXIT); - PROC_UNLOCK(p2); - if (st) { - if (xlocked) - sx_xlock(&proctree_lock); - else - sx_slock(&proctree_lock); - } - } else { - PROC_LOCK(p2); - if ((p2->p_flag2 & P2_WEXIT) == 0) { - _PHOLD(p2); - p2->p_flag2 |= P2_REAPKILLED; - PROC_UNLOCK(p2); - w->target = p2; - taskqueue_enqueue(taskqueue_thread, - &w->t); - while (w->target != NULL) { - sx_sleep(&w->target, - &proctree_lock, PWAIT, - "reapst", 0); - } - PROC_LOCK(p2); - _PRELE(p2); - } - PROC_UNLOCK(p2); + + w->target = p2; + reap_kill_proc(w); + _PRELE(p2); } + PROC_UNLOCK(p2); res = true; } reap_kill_sched_free(t); @@ -572,7 +543,6 @@ reap_kill(struct thread *td, struct proc *p, void *data) w.ksi = &ksi; w.rk = rk; w.error = &error; - TASK_INIT(&w.t, 0, reap_kill_proc_work, &w); reap_kill_subtree(td, p, reaper, &w); crfree(w.cr); } From nobody Sat Feb 21 10:07:57 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2qd6GkZz6SMC6 for ; Sat, 21 Feb 2026 10:07: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 4fJ2qd3vVGz464r for ; Sat, 21 Feb 2026 10:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771668477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nY3nooff7E0G8adGASd2J1aKb/+KjhXrO41DN5dsWOM=; b=kqkkAz/BHm4UDi0R4+eaj0SZbu1lXG97PuWDdFNa92je++2B37HL5xrMhee1k5cHhCdMu2 UKnudWcyUc3j6ka1liM2IiHw9iBJhjtebAdXmAaNcDXx23EiV8Wz/Rz2QltvMeuRNzuVEP HRPBa4tLQrgHcdjfehTzxIbMmI8vMlY93yvZoydq8p/EqxV6Q0TiB/8S/OosH9PHSAkVu4 jChLVWAstj4s1d9XvOF7U3EuA9g7y0fgFKpc3NQfAW/YTEWli268yk+fsaiVWS5JU7rjPi 6TYlggA5jiCOieJDB7X6clZ+d3kKTUELQkWsiF5SRjT3ar3WYtE6KL0wFs+S0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771668477; a=rsa-sha256; cv=none; b=Dkc/kvmNCTFQUNKbvimGIEVoSFNyk8zjOHuTHfKPel7lBn0dEVjwcU+b7FnZdV5spmGXKf XQmc5Jt5ITxhRgTdJOjuYbSPazSjyhA1RCWV1loewZs1Q8b4bk+iqAoAlzV2qQnuFm7bp8 KBo+V53M0dRvHomMJoAOjlQdaO+9Q/zYBaHe5B2qUycLKj/NNUUbCncSO7VjJH+aK4gnLV TiaQjS4ZVtqAylTg9TSMRn6znUYGvuE6pdgHdf4i5bfYl9DjqYS9AYpAe4cXvGXjylowV2 CcKTiSPi+tnRQdFasmhjOVLkl0CjXC/OwgeqChSlThobrKPOJMsxiqHhaSwIWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771668477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nY3nooff7E0G8adGASd2J1aKb/+KjhXrO41DN5dsWOM=; b=hYa/aPla9LW7lnKKY6gy7Wu8XQoir1nCvD3T06t0EoSWdRyNUvmS0EoQHGewFbPTmQAg0g Exz7Z2mQb6QtZE+Ha6Qo351PUM9WTtKDBZnEesYq4onPKAoPb6b4jjn5XNE6Khn1cTd7cO g1MiGaD//BS9OKcbRlWUDXl+RjYLS9LdaI/YXHtqTdVwYXqd6tP3SIT4OWIInhvomc68tw njOrfoylH1QqnFiilviRBwTzsNJSM/oHDQmlAviOxnDvkk1XV68gfxBQ3ORFoeMEvt1OKa ZVlCmKR9b+rGznBD7twoHxl014goweny3c8XTY6X2iN4OeTquCztePQI73PzBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2qd3TBHz181t for ; Sat, 21 Feb 2026 10:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2076b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 10:07:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0e67c3f675ea - main - reap_kill_subtree_once(): reap_kill_proc_work() might drop proctree_lock List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e67c3f675eab3a9c00b76e3886ace7700ef1bd4 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 10:07:57 +0000 Message-Id: <699983fd.2076b.528797b0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0e67c3f675eab3a9c00b76e3886ace7700ef1bd4 commit 0e67c3f675eab3a9c00b76e3886ace7700ef1bd4 Author: Konstantin Belousov AuthorDate: 2026-02-16 15:20:02 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:45:47 +0000 reap_kill_subtree_once(): reap_kill_proc_work() might drop proctree_lock Due to this, restart the iteration over the p_reapsiblings if the lock was dropped. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55288 --- sys/kern/kern_procctl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 04c47d086677..30ab37d56877 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -280,7 +280,7 @@ reap_kill_proc_locked(struct reap_kill_proc_work *w) } static void -reap_kill_proc(struct reap_kill_proc_work *w) +reap_kill_proc(struct reap_kill_proc_work *w, bool *proctree_dropped) { struct pgrp *pgrp; int xlocked; @@ -311,6 +311,7 @@ reap_kill_proc(struct reap_kill_proc_work *w) /* This is safe because pgrp zone is nofree. */ sx_xlock(&pgrp->pg_killsx); sx_xunlock(&pgrp->pg_killsx); + *proctree_dropped = true; if (xlocked) sx_xlock(&proctree_lock); else @@ -392,7 +393,7 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, struct reap_kill_tracker_head tracker; struct reap_kill_tracker *t; struct proc *p2; - bool res; + bool proctree_dropped, res; res = false; TAILQ_INIT(&tracker); @@ -400,6 +401,7 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, while ((t = TAILQ_FIRST(&tracker)) != NULL) { TAILQ_REMOVE(&tracker, t, link); +again: /* * Since reap_kill_proc() drops proctree_lock sx, it * is possible that the tracked reaper is no longer. @@ -435,6 +437,7 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, (P2_REAPKILLED | P2_WEXIT)) != 0) continue; + proctree_dropped = false; PROC_LOCK(p2); if ((p2->p_flag2 & P2_WEXIT) == 0) { _PHOLD(p2); @@ -446,11 +449,13 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, p2->p_flag2 |= P2_REAPKILLED; w->target = p2; - reap_kill_proc(w); + reap_kill_proc(w, &proctree_dropped); _PRELE(p2); } PROC_UNLOCK(p2); res = true; + if (proctree_dropped) + goto again; } reap_kill_sched_free(t); } From nobody Sat Feb 21 10:07:58 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2qg1nkyz6SM4h for ; Sat, 21 Feb 2026 10:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJ2qf55Slz4651 for ; Sat, 21 Feb 2026 10:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771668478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cz82A4iQqmxfzLd0Si16a67dsEEawBH/ktao5heE21M=; b=TxuzWVys0EGK0zgsaihh3w6BFcEKujY6ovCLdvanEokze0COLDZpBrUTLrpCDIvaW8KAsP S/KE7ZhPcLvk1rMoXjUSRw95KV0XJGpZ4v6TS2I+tl/7Er9JuEE15xCL6xyPZcMOS9pLnM mzDS20nEa2OLlNh9LA1uCTBaEk1ZMsjUKS0HgZg+t9uxOsoIcdLuaPVsEd61qZd3c7YN24 /GjBxei+rCQuj6mMAJ+3sVDaBORCxnVw9d7nqYLZuJuLUlvPg4T1SJkS0c0YbXWc5/qqCG lesPbKngnXSj1cxTP3Ep1ZMcqaDY+3tadORxTe28QRNgD8JUXi1824Ux+dLDvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771668478; a=rsa-sha256; cv=none; b=cYErOYkli+povHweapwVMQK3b64m/eRxqtmvW+a1hr6dAiioECgnloUTe1tDpSR7x1VWrD 1oTkKPWl7F2WUox9ZvpJBvoOXVdgTQMSu7VAq1fygOZ8ElubhTdTjl3TOqNBBs0t5hV1nV EBWpLAcKQpYqBsfUyO7vZRmLteB2WqLCWsQh3eFFETqA73yiucVB/vKC5HvOQBGkqiYY7x 2TqkRnVcsBmvOXlBBEOfcj471liNR3dqWtQOxjq58KUJO4tf3jp3bnCJaxYDyIeZCgrKK0 l5THG/21SRQIJ5+jXcsVN3br1qF9oxyHidjjgAm3l7r24/uDZtgqJDeon91yMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771668478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cz82A4iQqmxfzLd0Si16a67dsEEawBH/ktao5heE21M=; b=jv+lcgaXwZHWmqnIY/kX8ZNcbFXZaaynh/eGyGqhw47NRRqx2XUlPoBeVeRAymab70uRen h4z2fLtg4LjIAOxZNlFMxkcE8Qr+pc3b0oS+EggZap8bGqdbt9NrCA54f2oVH25hj6684E hEvAR3++coiZdsUj28Vl/Vcy0KvgtPNePPmCr8mMVHdoGwn8fGhN0gwK4DYDxeJhM+kAj0 98YOIanneP0rBb/ANmwsBYmsM9sXSLAXH5++/scCa/CAImFAowbFvzNYPK91JwRjK9jgO2 dJTvkrsE7cxoTC7+tc+5d9bwBfFszUHflha5pCMwPL3dzihBxRLXnUKCfhHWkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ2qf4J5Xz181v for ; Sat, 21 Feb 2026 10:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 10:07:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5c8af592f69a - main - procctl(PROC_REAP_KILL): align error reporting with pgkill(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c8af592f69a31da94c45722dcd74afcf0ab375e Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 10:07:58 +0000 Message-Id: <699983fe.22b78.54794e37@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5c8af592f69a31da94c45722dcd74afcf0ab375e commit 5c8af592f69a31da94c45722dcd74afcf0ab375e Author: Konstantin Belousov AuthorDate: 2026-02-18 08:22:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 09:45:47 +0000 procctl(PROC_REAP_KILL): align error reporting with pgkill(2) ESRCH from cr_cansignal() means that the target process should be not visible to the initiator. So do not report pids with ESRCH result. Noted by: markj Reviewed by: markj, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55341 --- sys/kern/kern_procctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 30ab37d56877..b1539c5cec4f 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -267,7 +267,11 @@ reap_kill_proc_locked(struct reap_kill_proc_work *w) error = cr_cansignal(w->cr, w->target, w->rk->rk_sig); if (error != 0) { - if (*w->error == ESRCH) { + /* + * Hide ESRCH errors to ensure that this function + * cannot be used as an oracle for process visibility. + */ + if (error != ESRCH && *w->error == 0) { w->rk->rk_fpid = w->target->p_pid; *w->error = error; } From nobody Sat Feb 21 11:37:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ4pX2mvKz6STks for ; Sat, 21 Feb 2026 11:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJ4pX0GPjz3JrB for ; Sat, 21 Feb 2026 11:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771673828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a5hxo0lqTEdZJLIv6XSwqL/XTD+rlWepCQ+IV7gM8u8=; b=csnuOFFzEbbnbRID5dUYqNW8l7o6D1ZHvQyaVNBsnEGAiP94Bu0qOkXRL/IPil2RAdzrnK 2y3o6zznNBHzXjJ0odU4LgTVLu3C8QxPIsOgdoKG+RHPDoGewEPyLreQVVCsY7v5CroImc NtEJgw7x29BAH1fLo3S7uS7TjP5jWeSz3rQQMqK16Vlp7RUxxQTNkdAiB2sfmJHv4qA9fh KHocRW2sKtuKEH817z1ciIN/8Wcu7gXOIKt2k90C+XODhDKCJsSKL2l6L+FRCz38b+EGrj 1yuwUfz2rs1Vz0PbnAlxgJ9XISN3jPisk1vKpeiIRG3RidoM7kizPj/vnWPuhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771673828; a=rsa-sha256; cv=none; b=DxzSUHMAwNUucyyilLOQI960X1XnJc/zM4zxueUhf/Zker2A60xY3q3HcoCIJM5yizyUc/ Itaf3QjVq6/fZGz226SaENmF5QRv3uP8r3ZoXvU/D9F3O7BFOHZK743ykxt/cjVAIW07Wz E2h0hAKmNJ5DPfRGGAv0kBbQ7Lh5ZsuDRPJPg7I8bZ86eRERYFX6Tm066SqEahBk+CbnbD 0zrgDn4MHBAmUxeLi2ZatLwJJjKepi39KuHHSjlfPUiqQuPJPhOMZ5eZc+5hJ0LMZTSyL7 3ABFeCdQ6yPxiIb1SpIxGZl3o+3iJjMsPBM66CdrrkJ8tUJI0hcL3c0xAkkrbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771673828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a5hxo0lqTEdZJLIv6XSwqL/XTD+rlWepCQ+IV7gM8u8=; b=ddr2nTqduzuHp2mjWOZ1JOIJ8EUIhHUguZJpOvHWCmTR42LDqTDxXDMN8zN4VG4l7/ajO5 snAq/hX3Zf+z0KzG+R3jbaPCSwYHFJHwakqEkbYCza9qYWvj3I0ru1WU3KQbz85EUiMXvT ZOK9L0EfuyGo8X98AL26er/cohYRs2o+mTixFvOezes28kRVJraP8teW1UPmpx5PyAxIhs T4l4uLQzdCGcichGTwEciEjwn3ObBRGRv4rrEGjDJ1S4EAzsOa2ZAy2iWG527BTaxRB+W3 0bsMUJck+14FzrXdKjZuq5N84leWPrG5vnBCqY7qOzD0CyXhWUgEYYwe+sSM1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ4pW6tGBz1C0M for ; Sat, 21 Feb 2026 11:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 11:37:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3deae7b78674 - main - sound: Detect unsupported formats List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3deae7b786743193531f4e69527e789de52644c5 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 11:37:07 +0000 Message-Id: <699998e3.33f29.6e57e469@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3deae7b786743193531f4e69527e789de52644c5 commit 3deae7b786743193531f4e69527e789de52644c5 Author: Christos Margiolis AuthorDate: 2026-02-21 11:36:58 +0000 Commit: Christos Margiolis CommitDate: 2026-02-21 11:36:58 +0000 sound: Detect unsupported formats This way we can avoid edge-cases like 8af6aee96ed609456900c6dd92dafabac5e89c0a ("virtual_oss(8): Remove floating point formats from preference list"). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D55403 --- sys/dev/sound/pcm/channel.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 011dc1427c2e..b74f76fd21ca 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -2092,9 +2092,23 @@ chn_setspeed(struct pcm_channel *c, uint32_t speed) int chn_setformat(struct pcm_channel *c, uint32_t format) { - uint32_t oldformat, oldspeed; + uint32_t oldformat, oldspeed, x; int ret; + /* + * Detect unsupported formats. This checks if the format is supported + * in the first place, and that no more than 1 format is specified at + * the same time. + */ + x = format & AFMT_CONVERTIBLE; + if ((x & (x - 1)) != 0) { + if (snd_verbose > 3) { + device_printf(c->dev, "%s(): Unsupported format: " + "0x%08x\n", __func__, format); + } + return (EINVAL); + } + /* XXX force stereo */ if ((format & AFMT_PASSTHROUGH) && AFMT_CHANNEL(format) < 2) { format = SND_FORMAT(format, AFMT_PASSTHROUGH_CHANNEL, From nobody Sat Feb 21 15:23:08 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ9qJ6Bqhz6SnKr for ; Sat, 21 Feb 2026 15:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJ9qJ5L0lz3hPp for ; Sat, 21 Feb 2026 15:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771687388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AwFFxGlHH4E2YkZtwg8djZifAS9h1mZUPlhDIr9j+0I=; b=mMtHC/t878moV5c4TzNXdaLp771T0emh3E4mm+D8SFdijq4UCvhYUSps9167YI4Di31dwM z7a0pxZv4BVXmSIXQAT8TQj6El4690U13MX8+vUWKuSDrxn4U4T2e+sHwqkDFa818Skfnx JCG5iKEO8qQKBKRUN1eO/x4nqAiN8QijciYGyeaKWxYemsdrF9ULhHvY/VHkC8SuoJ6eal 0OOTB57gAHfKjADTM/jt8nVD50v+ddZ7f43HEdD+qO+pw/j+91ib437xl7oFmW4ym3z9GI uf7FpdL2PWCyfUKgwMZANU/cGSeTELkR1m0/HjRlzl56B1HGYqhEbsPoZeLfTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771687388; a=rsa-sha256; cv=none; b=RMsJFpxOtBaizVyc43i7107WrKG1vzYMTqN8Tg100xIyPnnC8ot7Co1U55MaFWcD2TrAkX jV84Fme3YU1NbtJg7zNIATLNUbYunGs19t7MY3jbU8/e8uPfHxr7GITXxBsBkkQ7A+YQXi VoF6fbKVqretQ1297rbQ1CcjuCjDvBaaekptfIx11+nHcAIxG0bVH6iJYyVWDJw0YVrzXx ZRBU6q537L910c6zfSm0hSBGW408UatHEYTG/bJqVJ6mbgPirhiPVC4WEDwyaW7RLwWwOP 6CBNwngSogmrpWEprO7/QPJbl1jqLvuiBouZnUgR4VJQOrencRn0g54AJBBHlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771687388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AwFFxGlHH4E2YkZtwg8djZifAS9h1mZUPlhDIr9j+0I=; b=Tld2aXGw52IAwau0VXvgf/24kiwnGIXwBgXtUnqniDNH99VqjzvPe/pnMrQ81rOn9Olde6 qBbzzBJ5xelC7TcDo76SNf3vIl9Ftme3wPWIGelX7Qj6Hg2/ejltC13ysiXhT7GTmtiu/t uSxqD9shPb8u1nY7Z79HXJd+JLwGaJlRztAAWrGI8FlY9VmVYdfBizP/pcNYqX2tdr/GSH g65YQLyP1Tr2zFvMrJ2aEFMa6113HI77Ho8rutII89L/1ave/EQDLtCc9B+ElEijwNhae4 sNTOcBuupRtP526R6it0Y8LyBYCOx3Rvj4lgJ6+a4aqE4bQgn+dcrVKfkC1pug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ9qJ4kMTz1J39 for ; Sat, 21 Feb 2026 15:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24995 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 15:23:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: f2186bbd63fc - main - loader.efi: free_tables() appears to free tss_pa twice. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2186bbd63fc4185a42740dfee8c403e3d9b2ae9 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 15:23:08 +0000 Message-Id: <6999cddc.24995.50f03168@gitrepo.freebsd.org> The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=f2186bbd63fc4185a42740dfee8c403e3d9b2ae9 commit f2186bbd63fc4185a42740dfee8c403e3d9b2ae9 Author: Toomas Soome AuthorDate: 2026-02-21 15:20:54 +0000 Commit: Toomas Soome CommitDate: 2026-02-21 15:20:54 +0000 loader.efi: free_tables() appears to free tss_pa twice. we check and reset loader_gdt_pa, but use FreePages(tss_pa). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55179 --- stand/efi/loader/arch/amd64/trap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index 97e78ecccf22..ffd84db40a3a 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -74,6 +74,7 @@ static uint32_t tss_fw_seg; /* Fw TSS segment */ static uint32_t loader_tss; /* Loader TSS segment */ static struct region_descriptor fw_gdt; /* Descriptor of pristine GDT */ static EFI_PHYSICAL_ADDRESS loader_gdt_pa; /* Address of loader shadow GDT */ +static UINTN loader_gdt_pa_size; struct frame { struct frame *fr_savfp; @@ -194,7 +195,7 @@ free_tables(void) tss_pa = 0; } if (loader_gdt_pa != 0) { - BS->FreePages(tss_pa, 2); + BS->FreePages(loader_gdt_pa, loader_gdt_pa_size); loader_gdt_pa = 0; } ist = 0; @@ -294,13 +295,13 @@ efi_redirect_exceptions(void) loader_gdt.rd_limit = roundup2(fw_gdt.rd_limit + sizeof(struct system_segment_descriptor), sizeof(struct system_segment_descriptor)) - 1; + loader_gdt_pa_size = + EFI_SIZE_TO_PAGES(loader_gdt.rd_limit); i = (loader_gdt.rd_limit + 1 - sizeof(struct system_segment_descriptor)) / sizeof(struct system_segment_descriptor) * 2; status = BS->AllocatePages(AllocateAnyPages, - EfiLoaderData, - EFI_SIZE_TO_PAGES(loader_gdt.rd_limit), - &loader_gdt_pa); + EfiLoaderData, loader_gdt_pa_size, &loader_gdt_pa); if (EFI_ERROR(status)) { printf("efi_setup_tss: AllocatePages gdt error " "%lu\n", DECODE_ERROR(status)); From nobody Sat Feb 21 15:29:25 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ9yf5B3wz6Snn6 for ; Sat, 21 Feb 2026 15:29: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 4fJ9yf4SWPz3kHF for ; Sat, 21 Feb 2026 15:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771687770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4WEgs/3bhuVpHfLRfOBvfBg+qUyJuEUJJB5fhbtls4=; b=NfHsR+sXi9XcWQ+X23vHhLF5kGAyY9/vXRc88cmoadXw+oA9OkGI/1IYtPvgDoIrln6akO kBOzpl6HCDAHXN1rhiLVwl8tk9uCYhO/J/g6OtQh1iJNA0m2H/veciu1emD68C7Cm6h1gN LIM0MVU6QTHKRN5MGEnPhgZSbP3oOhG7l88GxXwgzk3GsgO26Bi0jhy82TuTHjgsiu6pfK eCZtofHDsRtEK6ciH85q/dBBR1QFF3MebJ5ClPv468lIHcrXHeZconnsMQXfzm5/A8zMrH ioAl9rN3FImyIW3dKKFVOeztXCofO/tKGJTmZh26peh8drx0Ms3CLxae8f7ajQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771687770; a=rsa-sha256; cv=none; b=g6sg6FV2tzfXg9yIdkWZXj5iRgqW5hWuGNE2dAFD8FzjhmrnWrPLPalzuuQ/moX61pkUE8 YrOTa3k6zyBDQnLL4jX4eFZzJVeoPQ0mtHRPuj3JlxP030qZixqokOvNi1ZPdKkN8EOXSD FalZMlw4CzgN2Bk/72aLICfecV2hhpLM0EM29KdUjo8FVxIV5jJv74L/qtvmKyZ9GMQGMM aOxXyvoVfX5/nxQ4mjPvYmRJYMwkKAwrSWjKIL4AnPq48a0+4uwPKPwniJBGvoVcaWLbDB IVQs2ibI4SSpZnO8kTzcQVxb/pyFwG2Do1ohfqlGIFSvYGX9joDjwTKfNdX5jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771687770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4WEgs/3bhuVpHfLRfOBvfBg+qUyJuEUJJB5fhbtls4=; b=NbfpKhIAnrGPN7g25UTLgMw1BdD+rka0Uz+tRlse/i3qh6Bahz3oYIskD+k4wzeLna/87W FDBzFBM6/wwNMGbDV6FzLmjhKsR2oq/Gql1mmRPERwBLe5i+gmdNM33gJoYUy6CpI+c3LN 7/xLhyi+fJkycq/tAPzC+JfvlZq06/RV6eeR2nn+FXSQGo6WnJBb+/owHNLHf6QKzlsJOo zq5YsSQRfDHI6cblfII31X7ZQkjy2SURShU2tc7pTsdiIW8ZrINZJc5a1JIkNw8Qr+8GqX 1wvvxAAvfa6vLgbT+V7LlxoT1GCq/NcYlY+7DNNaOUuYJ2HwduYoAlE+KgoXKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ9yf419sz1J0S for ; Sat, 21 Feb 2026 15:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25502 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 15:29:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: 23605a8e5124 - main - loader.efi: efi_redirect_exceptions does use uninitialized pointer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23605a8e5124dcbd27aa3a8bfbca20ee2b179361 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 15:29:25 +0000 Message-Id: <6999cf55.25502.73c8df56@gitrepo.freebsd.org> The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=23605a8e5124dcbd27aa3a8bfbca20ee2b179361 commit 23605a8e5124dcbd27aa3a8bfbca20ee2b179361 Author: Toomas Soome AuthorDate: 2026-02-21 15:27:35 +0000 Commit: Toomas Soome CommitDate: 2026-02-21 15:27:35 +0000 loader.efi: efi_redirect_exceptions does use uninitialized pointer loader_idt.rd_base is not set when we are attempting to bcopy(), resulting to data stored to page 0 and therefore corrupting it. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55180 --- stand/efi/loader/arch/amd64/trap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index ffd84db40a3a..3fe86f7b1924 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -266,6 +266,7 @@ efi_redirect_exceptions(void) return (0); } loader_idt.rd_limit = fw_idt.rd_limit; + loader_idt.rd_base = lidt_pa; bcopy((void *)fw_idt.rd_base, (void *)loader_idt.rd_base, loader_idt.rd_limit); bzero(ist_use_table, sizeof(ist_use_table)); From nobody Sat Feb 21 15:30:32 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJ9zs0kd4z6Snvt for ; Sat, 21 Feb 2026 15:30: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 4fJ9zr6rYWz3kJ0 for ; Sat, 21 Feb 2026 15:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771687833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=64Hjr8QwBtVon6Ent5Eoztf4ib2fT3ZkmlvUmPho+8k=; b=pZkCDcomhUXaVoDNa2Fm5PDZtRpGTEvZsI2Keb6NsSv8YPj5IqqA7ncBK652or4eyllvD6 xYJ8EkJ3aIdSnJVwkW8z93C2/bBN3W+9uhDPI15RJfcPSaYepgkihPZ8PXhaGPEzKJntND iJJIwZTCfcii5/r4DdJth2mpT/rU10ojJ+KAfNbw4uUTCXnYzdpkNMeFIG1IFbikKA7tjv 5WOblyJrQYSFcGwZtjPSSdFAbNAaCsiUc38kPEKeQ1e4b8E3x7It4opWVmHUD5UdbOyofl 2r1hBxxexDujxd07K5UlMmne3xBxG/srskzStpPrRSiYMnRpMTlXeHtrnlHDJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771687833; a=rsa-sha256; cv=none; b=u+Sf95Kw+k6I9JA0ak5lIyOqX6bZtoo/NTDrophxl2xkIDGs8Be/YxHnJy7V0maTvMTUAf M9VIXCmUNLjK58PMpF5xMqbP78r+/2dJtLVDguLmXU+Ohj57Hy/W2ZzlNH31rxb7tRlvJI byHAciqpIFYY4Bw8hxCINC9x81xDveSMgSdRVc5zY6m8ty8cMrn24qcT0x/7BzIu99ZQXT Oa6f7+34+BlRsL1ihEaub7L4xA3b+Raaob/C8cQE6XGKRSGMjuu+spF1N8puDc5gdy2Ch8 cWAr/Lu6Q/DD/HFMKy/3SxvtKiFMMlFiTNR8mSbWOW6dYpcSQKAk65sTF8m67A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771687833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=64Hjr8QwBtVon6Ent5Eoztf4ib2fT3ZkmlvUmPho+8k=; b=aU+Hq0Ed6mCIejBVpiPQb5SDOyZlCTkTI5TJ6Oc89M1ZNbtgwZsySdHMtEHTMcWlrwuGfc 8k1yV/1+dPNmVfn4nZR8+erihX7HR3l9FNShvsxWHC7hpBsGe7KHsLOW95W1n+bi1iPXOK uVXeBvQjzDTAtjRCuBOdx5M2BpWVGVFax85s6pfJvbzYhVt+7X0JtJz1lFXKMZodrzqeRU 6oltLD/7LBRyRY4Fp6ziYJhtjOudww/NruhKXz2vljtxucFlkR/wJzFQ+maIv+r+IO/uQw vdgxJbjTt3SEQJrsC//VN2dZKiL7wRTfJMR5yWXBWer8vYfle3UH8DXzoy9HsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJ9zr66QJz1JHj for ; Sat, 21 Feb 2026 15:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23971 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 15:30:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 80950a079b20 - main - CONTRIBUTING.md: Github to Phabricator move adivce List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80950a079b20ed59616525fbca8ccaf3b6afcebc Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 15:30:32 +0000 Message-Id: <6999cf98.23971.471f0108@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=80950a079b20ed59616525fbca8ccaf3b6afcebc commit 80950a079b20ed59616525fbca8ccaf3b6afcebc Author: Warner Losh AuthorDate: 2026-02-21 15:28:21 +0000 Commit: Warner Losh CommitDate: 2026-02-21 15:30:26 +0000 CONTRIBUTING.md: Github to Phabricator move adivce When moving from Github to Phabricator, request that the original github pull request be closed with the URL of the Phab. This cuts down on clutter and helps us track things better. Sponsored by: Netflix --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4d33ec6612cf..2bfde5fb2e40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,9 @@ changes where the contributor already has a GitHub account. A change should be submitted by only one method. For example, please do not open a GitHub pull request and create a Phabricator review for the same change -(unless explicitly requested to do so by a FreeBSD committer). +(unless explicitly requested to do so by a FreeBSD committer). If asked to move +from Github to Phabricator, please close the Github pull request adding the URL +of the Phabricator review as a comment. ## GitHub Pull Requests From nobody Sat Feb 21 16:04:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJBlP2Nq8z6SrNX; Sat, 21 Feb 2026 16:04:49 +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 4fJBlP1pK7z3pHL; Sat, 21 Feb 2026 16:04:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771689889; h=from:from:reply-to:subject: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=OctlJEhGBZ/eA9KUzidL6tmf5B3tTo8IFmElIHpZ2dU=; b=m1gaMHySECXyNCxnaPtz/ne7ZK0jhGEeHM6rXPW6HEUNNRSWHSuZOQKCXk7WqXgesuYOZX WLFkeaLOiELj/C1MsdacogQ8G1MTFvegWQ56FkNSMxOwKzI77mYk8/LFbnUblHhM9JQ+3t pvooiFgcBEirv9AGqn8bQ4/y6sr9PRd0C9aY4CHEMZ/mMnt4eMT/F0IbqAdaHx94tvWoFm wF+YBsbskTS006Xb88nZcxAYWjWvwAU100Obm2p7hC8NlPXyrR3jUJ0X8Ve2AeeSoLNbVV R9ZHrAG/r204JHIo1cZPedpOc3iAa+EimllzFcFLEwDnrRAxZ7fgNX2bvErr7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771689889; a=rsa-sha256; cv=none; b=ljq9OBV9gb1YEJv4AuNT9Wubj+7WtBdKqQaBykWSBBpVcYQnkdD+jQ5F3raijc7OHkKU3m 7T1qr+KaHYAH12IjQ5qzh9hT8AyDUuvlXE1EEK4Jtzpv2YswRqACHpSaOCx/kL+Db8a6EI Q8YraMFQz5sbgKukknQxDq+stz7aLePuaXGP94NHWkWcno0bRbLy59Th2y83EKa9HLJyz3 suvtEbahWOpNo030w6IMTL/d7/1Ev+yx7/ko0WYmaoH6M91cTH+YeCPK2MSg2pWg2Q+Zl9 L182EnCRXAJXtL2gDedu/S7v5kUHqz1vPWZ51a/KhwKhAeQrPZkacHSEk+bc1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771689889; h=from:from:reply-to:subject: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=OctlJEhGBZ/eA9KUzidL6tmf5B3tTo8IFmElIHpZ2dU=; b=UbdkXvXFISZaI73a8JFX5xb/QRoOTe89A+7UTaNZ1TAaY/7+W53pX1oUFqiJfqEdxiYdPz r2+fKmPTkvtdJOZsw/itZJnIA7zeveK8BWSwwyL/+uUZ4u/1ELugSr1Z8lsyupIudOard0 T2r6quQtZsw42X1VIG9pdYzn6EWZJjyCVFCSBdUP3gnKnG0jd4aMilwu6d5fzQM4vwnKUa 2wDgDVeJjd10OqwSyNPX6xw7Pzp52quWIAjps8ymv7hLqfZM9VRHYh6leDm6uV9tDXjNt6 2W/4cgy77OpSTZTdkG+GNodqpEGAMsZE5hVe1KT8Gg+WtY4Wz5l9LI5KxFqhTg== Received: from [IPV6:2601:5c0:4202:5670:8d66:93ba:3cb8:87c] (unknown [IPv6:2601:5c0:4202:5670:8d66:93ba:3cb8:87c]) (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 4fJBlN6spKzDnM; Sat, 21 Feb 2026 16:04:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Sat, 21 Feb 2026 11:04:48 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: d1f1402dff63 - main - libnetbsd: import `__CTASSERT(..)` macros Content-Language: en-US To: Enji Cooper , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <6998e4cc.32d8e.74c069d@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <6998e4cc.32d8e.74c069d@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/20/26 17:48, Enji Cooper wrote: > The branch main has been updated by ngie: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08 > > commit d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08 > Author: Enji Cooper > AuthorDate: 2026-02-20 20:24:46 +0000 > Commit: Enji Cooper > CommitDate: 2026-02-20 22:45:06 +0000 > > libnetbsd: import `__CTASSERT(..)` macros > > These compile-time assert macros are similar to `Static_assert` on FreeBSD. > > These macros are in use in newer versions of `contrib/netbsd-tests`. FYI, _Static_assert is not a FreeBSD-ism, it's part of C11. Our old CTASSERT is a FreeBSD-ism that this extends, but really, these should be implemented in terms of _Static_assert when possible. Something like: #if is_c11 #define __CTASSERT(x) __Static_assert(x) #else /* all the rest */ #endif If __CTASSERT0 is used directly anywhere, you could emulate it via something like #define __CTASSERT0(x, y, z) __Static_assert(x, __STRING(y) "_" __STRING(z)) (Note that we build all of userspace as C17 by default in 15.0 and later.) -- John Baldwin From nobody Sat Feb 21 16:29:09 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJCHT4W1dz6SsTj for ; Sat, 21 Feb 2026 16:29: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 4fJCHT3rcFz3sSR for ; Sat, 21 Feb 2026 16:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771691349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwlZl66se+k3tr8afqj+Ot3l+C+nvz4I1FsLRtZMe2E=; b=bh3eIY0hl6dUL8oWFPkTWFdrHZVrGmEDfWVNSy3mHaorDqOgsxyysFQoaPQEa3BY/85dkU gppW7jmvJzsPVwkNg1PLzsbIY+uC6BtKi41aLNdP80vCLOC09cacepx1UOsy4SsUlI0Y2K s4N9+SZdbAIN6wce496tm+80tkY7D4JAmxNmPFc9flTnNaJ+COPxJL5X29fXKMN8C0Cupt gUlEkU8iPj+1ZksOA6WMr4+GWvkToERooOoFJgKrg7vaH74qFOXlulTjdQlYyPkrAjHmUy gtb7nOkcIaSEcnoOQ4UeC7wBHFkcpvegzqZa/52IPURIfp6RW89apEVyhRuQkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771691349; a=rsa-sha256; cv=none; b=W1vothrYek4iHltv6Y9bNEWOBim55tIJYWjgqllMxy2+rdzVNpZbA3V+1Ill/B7BjJamoP gb3VooGwLsV9Qs80IFV/wvO5WNRByyal8MK2Iq6Q5e8SlTIqTam1bHWpTfMBq1Zguo+uQ/ /SW/WkzuIa8ylDdd0SSTdiak1iU+jwrt3BlF2h0uAwHpGBIrU9KBKcPljqAZ+uHL/85d1z r8qeaaIgE5bFCIArUQbn0N7JEdvWr64NSDvCkeFTSfKw1KhfGMVN3O37RYd+kw+1ZpRzYd x/7rKRz3zJxPqYAGBiCUyZfyit7SGtBZWjA6y2/WxXsRk6U18q01s83CxcL/tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771691349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwlZl66se+k3tr8afqj+Ot3l+C+nvz4I1FsLRtZMe2E=; b=TtpCpacUQkSum7wgFbM96DVVkZ35w1MgpehQ9jQ4fW/R+K4YyM94z7MVEPacCExb2z6XQ8 dKzJftYeZfqvpV0xqJFCgLxc5Qa+pIrbzf6elEdD/Lc+T3lyQwbfeA7TO/u/tZd4NHFImA sT9Nrl39FiRf3Hq1A7le4bxo2c/bhQDOtusGzX1TWrVtVGljvCn2Gn5CY3I0X1qhdUI5en gPly8fOOHLzK8HfID/JdqUUcUVO+gzZXlbsfjDpLDq4bRLkS+CuUuryCo9xfdc7e5wV95Y NEsOqevqe/xWS6cejyoZ1/I8gnMnj02XRr1BJxl3IIsM/9CUhDNxvhndyzCGoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJCHT3JH2z1LKQ for ; Sat, 21 Feb 2026 16:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32582 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 16:29:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0fa6ce255661 - main - sysctl: Avoid calling priv_check() unnecessarily List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fa6ce255661acc984a45deaf2d710149b957ce6 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 16:29:09 +0000 Message-Id: <6999dd55.32582.5e35ef21@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0fa6ce255661acc984a45deaf2d710149b957ce6 commit 0fa6ce255661acc984a45deaf2d710149b957ce6 Author: Mark Johnston AuthorDate: 2026-02-21 16:16:32 +0000 Commit: Mark Johnston CommitDate: 2026-02-21 16:16:32 +0000 sysctl: Avoid calling priv_check() unnecessarily After commit 7d1d9cc440f80 we only serialize large sysctl requests for non-root users, but we should avoid calling priv_check() unless the request actually is large, as that's not the common case. In particular, priv_check() might not be cheap to evaluate if MAC hooks are installed. Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55377 --- sys/kern/kern_sysctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index be0acb0a4a55..4adbd71fae24 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -2573,8 +2573,8 @@ userland_sysctl(struct thread *td, int *name, u_int namelen, void *old, ktrsysctl(name, namelen); #endif memlocked = false; - if (priv_check(td, PRIV_SYSCTL_MEMLOCK) != 0 && - req.oldptr != NULL && req.oldlen > 4 * PAGE_SIZE) { + if (req.oldptr != NULL && req.oldlen > 4 * PAGE_SIZE && + priv_check(td, PRIV_SYSCTL_MEMLOCK) != 0) { memlocked = true; sx_xlock(&sysctlmemlock); } From nobody Sat Feb 21 16:29:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJCHV70MHz6SsZc for ; Sat, 21 Feb 2026 16:29: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 4fJCHV4Ympz3sMx for ; Sat, 21 Feb 2026 16:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771691350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1oL/U8Ay1p1HSiFR1iWnl6o14yTi4EPBCglU+1p6oGQ=; b=ws61cNL72uoxjddI7V59ln7amImhN/fYu2S3tZteneLIuf8P2fhqHxSbZuruK6bkNE31w5 fEfHIManYvrroKgNK0Vvy6k1I6va6nkSH7dEWpW8u18y5SNnwkVcLvjk3AY4rCJKWo7nMB ei3Sfe8l4RUZ4f5/G/2vq1pkHitq6M33P4DJD951KxoR/b6uM/mxDzjtO4WxkpbFmmvC8x AIdtEEz3BpZ7WLf4ldR+B5IEy3vQdeCqrj5Wd6X9q58iqoWqBKOiLX0NlSCZdCvp7NsKMR MhH9NsAKMYOQuF5ZDnQsoajFpKxSvfRSF2Hg6OFlHRM5kP1Ra002/XSYcstERw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771691350; a=rsa-sha256; cv=none; b=grxL1Wh/UubgOLF8yeqEJGcS1e6E0mSVUVjT1faPOQYBBDP8d72/laLmfRXFtb6xW2juld ciD/nQ4uzqLH0kJvvrW9hdNzF6qmGA2Awhe3HMOrPHMD/ZDRVIQshGD2dRLPVK+Ej2/I1o pcXCdDRBZV65EGofJAxzWEabgf2K/hmfyIsrbJZTyzrfoa/Wo0QSfVsDtohlXmoZnSjrP0 TsJGxOeylKAzNQotMRtiaGPJ2+CB7CC8f8XXcKr40Bfe71pJoW2GvssKCKTzFdJPpjjbr2 324HGTtXJJ6KQu3s2Lm0irvFyleGo9InVsdNPSU8a1YctULkbHnfMxcVFCQnvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771691350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1oL/U8Ay1p1HSiFR1iWnl6o14yTi4EPBCglU+1p6oGQ=; b=V5M33ZsQa4rr1MZAb/QwE1wRXx2AxHbXSzjP2nWNBGT4S45RZy5b0XlIXe8PxhCxYtNaFo 5EcpX5FdTG299qAj2pTBKNPQCSqOcOEdkJW/qOPxxJzMtq1a+0+LN+IJ7swsqLPf6HAPhj EckEZNNWMMo2hllt349sctUjj5f0dt9iooqCzTcKJZQV9kwfsFcrYEUxjwx29M59Db8tEm oNqm2QBMAQhJB7eP8dGnjWo4/3LZKmwSQ9tx4A5l7fnNm1sB3So7bgWWTqC6/m7EQJAlaz 9n79CQ45diB30RwEu6A3r/NRs87/knhoUPBBd3lJz2ETMy8MUC7//bddpBNbGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJCHV46VRz1LKR for ; Sat, 21 Feb 2026 16:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31de2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 16:29:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fa77660a3ccb - main - pipe: Avoid unnecessary priv_check() calls in pipespace_new() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa77660a3ccbd5f30e88093703b0f93892ef35d7 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 16:29:10 +0000 Message-Id: <6999dd56.31de2.20b92c19@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fa77660a3ccbd5f30e88093703b0f93892ef35d7 commit fa77660a3ccbd5f30e88093703b0f93892ef35d7 Author: Mark Johnston AuthorDate: 2026-02-21 16:28:49 +0000 Commit: Mark Johnston CommitDate: 2026-02-21 16:28:49 +0000 pipe: Avoid unnecessary priv_check() calls in pipespace_new() Running out of pipe map KVA is a rare case, so reorder checks accordingly, presuming that calling priv_check() is more expensive than the calculation. In particular, priv_check() might not be cheap to evaluate if MAC hooks are installed. Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55378 --- sys/kern/sys_pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 6531cea31423..e928de1cd776 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -592,8 +592,8 @@ retry: } vm_map_lock(pipe_map); - if (priv_check(curthread, PRIV_PIPEBUF) != 0 && maxpipekva / 100 * - (100 - pipebuf_reserv) < amountpipekva + size) { + if (maxpipekva / 100 * (100 - pipebuf_reserv) < amountpipekva + size && + priv_check(curthread, PRIV_PIPEBUF) != 0) { vm_map_unlock(pipe_map); chgpipecnt(cpipe->pipe_pair->pp_owner->cr_ruidinfo, -size, 0); if (cpipe->pipe_buffer.buffer == NULL && From nobody Sat Feb 21 17:53:14 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJF8t2Mffz6Sytt for ; Sat, 21 Feb 2026 17:53:34 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (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 4fJF8t1dLHz42y7 for ; Sat, 21 Feb 2026 17:53:34 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x443.google.com with SMTP id d2e1a72fcca58-824a3509a12so1696803b3a.2 for ; Sat, 21 Feb 2026 09:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771696406; x=1772301206; darn=freebsd.org; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=dcalczmICKkjVg9aKXXqz8X5bbnsxdtacOPYkw6BO7A=; b=Ul3Hg/EgO7Dszadgfv98qedaFxqhCF5Yjya+mz8gYWKTSDc8Un6DOuYr7ud4rt7SmS hehdq2eHV7AZFgnYJVXNcJ35r6SNWO+kEpGs/pesM+0I0oJ8EDsvp+3DFfk45NxkliJl R/chLAP7FvSRHZCJcyB7QiY6Wi8GBwSiinZWljkXHfpziZXRgjmKbzQEqASuFI2mwgkV 1ZVRS7HeceBzukSnDaZZ/9MrHXA6YT3GIZhm/jbriD8M99FPjRDXxG1aXTqWZIMTjfCw WuG/JYKx5FaeCbjPLIA5ZU0FHcSqGlQxxGEaIiUVqkjZIJmK8yhe2XSeTTiHL4PtFuIj Cb9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771696406; x=1772301206; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dcalczmICKkjVg9aKXXqz8X5bbnsxdtacOPYkw6BO7A=; b=rV7qXLl60Jpds8Rr/A2i9XuJYSjms9a7U5tYjXVLAKthdQLP2Jit++ka3NfQPUplEM wZLdiNxgRqQro4i9hfU8CsH/mI6gSVF+sZfGVd2diX4kbkan/lS1rqvZKT2gSAwsQGWD 8yWIk2rLc8S9QF+B7Q0XJWLo29LihiFS1SEWm6CZnUK/Qos2dL9yaSLtNODD1Ow2lQlD Ff/iUZGHiwCRa6jyc5MFwNzjdZypV0xOV9gF9jqC51qC/yjuHyqYX55m+k3r5MZFkOx8 iwER9XCrzj0pUTyv/HPCjqEaqRpDAnIsEzF0Fb99N2xcRTD5nvARZ/660N7ix86iIUFr m+Ag== X-Forwarded-Encrypted: i=1; AJvYcCVyw1odXVI1WysvMwfExr+bcpKq2IASeoabh0OJ124vTtXJhOK09N3myRGYzyXQoxEBeLY8w8rVoIArMbHanJw01eT6Bw==@freebsd.org X-Gm-Message-State: AOJu0YzwPQUlPlmpMX5xNqvvPq/rVuRnI918q7xeoTrUzxz97e3aOlc4 UipxSkbCDuFEL/n4w17VZMG9BTQX6QIrto7VXxdVz/y3Srp15UF0FXR1 X-Gm-Gg: AZuq6aJNrs5fZQsaq6nC+rx+dnIRjQHn/jFZVp/31wEquuv4SVZbmXjVO500edZh1B2 uh6lTomFBEc6peBhMianErhJuHL7sLUSROCCDGjJyTAA2gjcBvdFnHAN7eJOm8h+fp68QXBZyDA SeNpvhQ2X5lCBacpNVVjZJnV7YM/4UmF7pVaOcX+78yrDMzPM83zQVO/XMieJgm+JDP5EIe1S+y hfqY1DK4BmiqvGwOjvpUS//itPkfyg2eNHOJXqvZCVYMTMShLYY5BjZHViUlmvx8qHokqdD72Uc TGLHuJuGuxoayxWrBL7m1eq2MuxqPjjp1/nZhlbDnmjRIKF5r5LugiUdIFq7xQVSPHayipB5hFS 4eHbx28AFrhvBqECiYMgisLNFZTbS5hQ+RfD9vJM3aUyAMG8U1r2QAObDYoYdTIMdOFHlXJck4w spKVc7QooRLauO1QigpWA1uKQMXYyVLRI9wzG8qfyshQ== X-Received: by 2002:a05:6a00:4186:b0:823:1475:85a4 with SMTP id d2e1a72fcca58-826da9037afmr2552029b3a.24.1771696406049; Sat, 21 Feb 2026 09:53:26 -0800 (PST) Received: from smtpclient.apple ([176.100.43.124]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-826dd64111csm2509384b3a.6.2026.02.21.09.53.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Feb 2026 09:53:25 -0800 (PST) From: "Enji Cooper (yaneurabeya)" Message-Id: <2D23AD65-FC83-486F-99BD-1C2DAF6BCE05@gmail.com> Content-Type: multipart/alternative; boundary="Apple-Mail=_6B555CD4-2C50-408A-93D8-A69C3F5BF75D" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: d1f1402dff63 - main - libnetbsd: import `__CTASSERT(..)` macros Date: Sat, 21 Feb 2026 09:53:14 -0800 In-Reply-To: Cc: Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: John Baldwin References: <6998e4cc.32d8e.74c069d@gitrepo.freebsd.org> X-Mailer: Apple Mail (2.3826.700.81.1.4) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fJF8t1dLHz42y7 X-Spamd-Bar: ---- --Apple-Mail=_6B555CD4-2C50-408A-93D8-A69C3F5BF75D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 21, 2026, at 8:04=E2=80=AFAM, John Baldwin = wrote: >=20 > On 2/20/26 17:48, Enji Cooper wrote: >> The branch main has been updated by ngie: >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dd1f1402dff63dd163d4ba4ac65f7f2ff= d00c5e08 >> commit d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08 >> Author: Enji Cooper >> AuthorDate: 2026-02-20 20:24:46 +0000 >> Commit: Enji Cooper >> CommitDate: 2026-02-20 22:45:06 +0000 >> libnetbsd: import `__CTASSERT(..)` macros >> These compile-time assert macros are similar to = `Static_assert` on FreeBSD. >> These macros are in use in newer versions of = `contrib/netbsd-tests`. >=20 > FYI, _Static_assert is not a FreeBSD-ism, it's part of C11. Our old = CTASSERT is > a FreeBSD-ism that this extends, but really, these should be = implemented in > terms of _Static_assert when possible. Something like: >=20 > #if is_c11 > #define __CTASSERT(x) __Static_assert(x) > #else > /* all the rest */ > #endif >=20 > If __CTASSERT0 is used directly anywhere, you could emulate it via = something like >=20 > #define __CTASSERT0(x, y, z) __Static_assert(x, __STRING(y) "_" = __STRING(z)) >=20 > (Note that we build all of userspace as C17 by default in 15.0 and = later.) Hi jhb@! Excellent points. Incorporating our macros/adaptations can cause grief = sometimes and I don=E2=80=99t want to porting more code than necessary, = so I have incorporated these macros (and a few others) wholesale from = NetBSD (I got these from [1]). -Enji 1. = https://github.com/NetBSD/src/blob/c26cc77b3a0b26b95a2df2e0154e2b2f7292ab2= 0/sys/sys/cdefs.h#L168-L182= --Apple-Mail=_6B555CD4-2C50-408A-93D8-A69C3F5BF75D Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8
On Feb 21, = 2026, at 8:04=E2=80=AFAM, John Baldwin <jhb@freebsd.org> = wrote:

On 2/20/26 = 17:48, Enji Cooper wrote:
The branch main = has been updated by ngie:
URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dd1f1402dff63dd163d4ba4ac65f7f2ff= d00c5e08
commit d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08
Author: =     Enji Cooper = <ngie@FreeBSD.org>
AuthorDate: 2026-02-20 20:24:46 = +0000
Commit:     Enji Cooper = <ngie@FreeBSD.org>
CommitDate: 2026-02-20 22:45:06 +0000
=     libnetbsd: import `__CTASSERT(..)` macros
=          These compile-time = assert macros are similar to `Static_assert` on FreeBSD.
=          These macros are = in use in newer versions of = `contrib/netbsd-tests`.

FYI, _Static_assert is not a = FreeBSD-ism, it's part of C11.  Our old CTASSERT is
a = FreeBSD-ism that this extends, but really, these should be implemented = in
terms of _Static_assert when possible.  Something = like:

#if is_c11
#define __CTASSERT(x) =  __Static_assert(x)
#else
/* all the rest = */
#endif

If __CTASSERT0 is used directly anywhere, you could = emulate it via something like

#define __CTASSERT0(x, y, z) =  __Static_assert(x, __STRING(y) "_" __STRING(z))

(Note that = we build all of userspace as C17 by default in 15.0 and = later.)

Hi = jhb@!

Excellent points. Incorporating our macros/adaptations can cause grief = sometimes and I don=E2=80=99t want to porting more code than necessary, = so I have incorporated these macros (and a few others) = wholesale from NetBSD (I got these from = [1]).

-Enji

= = --Apple-Mail=_6B555CD4-2C50-408A-93D8-A69C3F5BF75D-- From nobody Sat Feb 21 20:27:51 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJJZv6rVqz6SCjM for ; Sat, 21 Feb 2026 20:27: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 4fJJZv64sDz3Gls for ; Sat, 21 Feb 2026 20:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771705671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O4KHG4a4jc2nB0M5tPuZeVfoCJZFnTzQThB3iSHh4Uk=; b=c9G5NKNkKYKhJktulbMq7ghdtw8gdb+8YpB13HQmOgnA/DtXEnRHyPpl46DqThdPyNbyWH 201o1O8+0+PbCtVc3pn8HGY09yabZY+oiTTjCKsk3pldIqjy2gXrRO1XplZzkuSg+2zgDv 0ff4c7zNQPVv6x0WEFQg0QwtW22F1d1AtWEoSbuhiu1ILc/DzJmaP57nYa/PxcDIW6TgDB ChXpo8ZiNrTL4RmlaAorHydF3/HxzpHZ+7kRfht7yPwBbpCwQaTGYh27ZMRThh3gNM0gVy 2aGJZjwuKBb0oBeRHQ1XZz9kdaIWJ98/Ww753eX4bBUpwU9XItLgTtT1V0aelA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771705671; a=rsa-sha256; cv=none; b=OVNllQ9KiH2Fmb5sCQjttQcey3KElWP+IzBz+FVi8KVA4t9TmXEz2t1L8ramsf/nYr6Ovb 2vDvHxI1m3rZq96j33T8r8AaS67kVa1OyKv5lZlYae9PkFCiEgys3GkRwBNBgdy6Y/R30Y 6XSLmZcxjRxGGb+wLoTQrBdR4MLUzLDGtPCjekCCfCN0kNxK1XDq0R+5n7s9rBYeBLFStO f/bil95RSzwVU2BE9/MuXjjUfaoPAD/GFXL8fKYAG10SBSkMI+I3IdRdVGLd0Gh5lUByJJ GRGJ1volQXEP0l0cvpbg/X6aGTF0CJCgWZpB4gye+Y4fskEAOUd0EADsUdx8Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771705671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O4KHG4a4jc2nB0M5tPuZeVfoCJZFnTzQThB3iSHh4Uk=; b=n6L9OATz87HQ0R+RL0xOkPqYK+C7HdPmt3OTp0mDzGZvVmjP2dnF3muRFrRlMpoS6+Vddy ZYozIBfRJx1MCf5fNrD161vDgiBlEh8s4parSoUt4xoQFDFa6bzqNcv5vXv1strHhjrN7Y 2CNpzF0yn7ikQ9mLcpCR+rks9+cuAq8I7b1cDU+x+cbsqqFn5p4gRi1C41KikhATeUGiNO HNSWm2pBrEPeZ2c8JBMDf2f8NZwEhiKn/sGhVVIQ9YpSOFtJFF6Q6qyMUgXos6YbJc3c8R 10ZY6gq3zGU9ypMnDyRAnxAqelCwt/p40u0N856HjuCfevsFL8p0z8eGZlAlDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJJZv4hgrz1RrK for ; Sat, 21 Feb 2026 20:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bbd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 20:27:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 7965c93e4d41 - main - packages: Don't create empty packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7965c93e4d4103ba6ed7ac1e5f1599c93cbcdbf7 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 20:27:51 +0000 Message-Id: <699a1547.1bbd3.1b2842a2@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7965c93e4d4103ba6ed7ac1e5f1599c93cbcdbf7 commit 7965c93e4d4103ba6ed7ac1e5f1599c93cbcdbf7 Author: Lexi Winter AuthorDate: 2026-02-21 20:19:42 +0000 Commit: Lexi Winter CommitDate: 2026-02-21 20:21:59 +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 --- Makefile.inc1 | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 55b41d76801d..93c54e0a0d14 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2272,17 +2272,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 Sat Feb 21 21:27:17 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJKvV024fz6SHjg for ; Sat, 21 Feb 2026 21:27: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 4fJKvT6SDGz3MqW for ; Sat, 21 Feb 2026 21: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=1771709237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m60a10MlCXYazoOhtUqpj7Q8W++sG8ousBZJV/YUIMM=; b=j3I10hAVyzMtEiFwA3Ek1H3YTpKtF9RObc5ksJKF3NcO9M2Jg12b9/WBYpNs8S7C74V7QZ OE7EzAZLnrWnSNRNsuuu3Qd/KBDgA7T5adXkD9+QEmIfQuGRYJ+KWjYjWetKBIoUnByJOW mklkagX66O2F5T3a6Bho73/TVW0ZrNcRGaCl4Cd+8B2Hb0BiktyFZTbM4VzBEH35zClrVt CEfJGBFy4xw0FFYp+5NeSLZyRH+xchMhoxUb2j3Z+iVkkWtg1tI5aHNS28D/GqdtQKv8zp y0hDhHU9Akm9ilgcFiNn06P58SoMmjzr3LoeQ+fh6nvljZOHj14kbRc/z3X4HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709237; a=rsa-sha256; cv=none; b=heaUsIfI5v2SmI2h9RX9kJFyhaWFQEt6Y9aFg/xkdlcvdRqQ35riVHN1k7xp9ZSqJKuORV i3f/ymhs+phQsYULxKY2qByGy0EThv9IG+w6fuyEgDeXaYoSMB6VNYTdfbUcbk7yX8nFaD uVU3ao/ydFNyF28oGGwTD+uOsEwQzmvuWVWt2TmR/bL5RFvwRtkXVnGW23HV8/PmT2ToaO 7JPNve7aZu3dUKcmSZQyNkC3s77fgoKxDqgOEmJsnwn6chbpmxaAGXMXCToRhcvRSac0az m5mWqELXW8OJp01mKwYUzC8URJClkVbwpA7VzEjTs23sQNHiAD4O8shbnQAWGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m60a10MlCXYazoOhtUqpj7Q8W++sG8ousBZJV/YUIMM=; b=K8ubmaUZAwPcy6MCGoSB03TZtqE3UTuPe9hb70Wfh79nMaA/G7MiwLMR+XbJZ1guNtKHmn 4CMCSoSTTZ8lnbR26Ev+RepgtYpX25pv/w0upsoI3GXOxC6Y9WqDS7FRXV3HSCx1GsrshK fPkN7rvf+bMCCpRCQsK68PhmaL+8YwrSOY/FyczjZ9gPMYMHW2Rqvvc/Vf89WQiBRurizS AL+CcCjzxGwQSkO4wGAQ/NFqMgm+WgeseXsUFgwQe+O3KXv/hDvT2V3+iBlMiQ0kI4WCTp rI1cXw5l0+VVaK9fmqdc2uwTLsVGpb+qrfx/bxWsf//kGXoF23g05PR9XbeSYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJKvT5lXnzqk for ; Sat, 21 Feb 2026 21:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:27:17 +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: d4f6cb754249 - main - build: Move all of lp under LPR option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4f6cb75424950ee776833ebc6b57855c094a610 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:27:17 +0000 Message-Id: <699a2335.220a6.2c3156ae@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d4f6cb75424950ee776833ebc6b57855c094a610 commit d4f6cb75424950ee776833ebc6b57855c094a610 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-20 18:20:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 21:25:49 +0000 build: Move all of lp under LPR option * Tag related directories with package=lp * Make the examples/printing directory conditional on MK_LPR * Make the hosts.lpd(5) manual page conditional on MK_LPR MFC after: 3 days --- etc/mtree/BSD.debug.dist | 4 ++-- etc/mtree/BSD.usr.dist | 6 +++--- share/examples/Makefile | 4 +++- share/man/man5/Makefile | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 18 ++++++++++++++++++ 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 62a6342c9eac..5eabea923cbd 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -61,8 +61,8 @@ libexec bsdinstall .. - lpr - ru + lpr tags=package=lp + ru tags=package=lp .. .. sendmail diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 3366bf939948..b9ee785ab8b2 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -181,8 +181,8 @@ .. hyperv .. - lpr - ru + lpr tags=package=lp + ru tags=package=lp .. .. sendmail @@ -352,7 +352,7 @@ .. ppp .. - printing + printing tags=package=lp .. scsi_target .. diff --git a/share/examples/Makefile b/share/examples/Makefile index 09bbf820e574..0174792d2ecb 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -25,7 +25,6 @@ LDIRS= BSD_daemon \ perfmon \ ppi \ ppp \ - printing \ ses \ scsi_target \ sound \ @@ -250,6 +249,8 @@ SE_PPP= \ ppp.secret.span-isp \ ppp.secret.span-isp.working +.if ${MK_LPR} != "no" +LDIRS+= printing SE_DIRS+= printing SE_PRINTINGPACKAGE=lp SE_PRINTING= \ @@ -269,6 +270,7 @@ SE_PRINTING= \ psif \ pstf \ pstfX +.endif SE_DIRS+= ses SE_SES= \ diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index abf4b59d184b..f950df8fdb47 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -75,7 +75,7 @@ MANGROUPS.${MK_TOOLCHAIN}+= TOOLCHAIN TOOLCHAINPACKAGE= toolchain TOOLCHAIN= ar.5 -MANGROUPS+= LP +MANGROUPS.${MK_LPR}+= LP LPPACKAGE= lp LP= hosts.lpd.5 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 81379ea452bb..648d0d3b297d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5292,11 +5292,29 @@ OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz OLD_DIRS+=usr/share/doc/smm/07.lpd OLD_FILES+=usr/share/examples/etc/hosts.lpd OLD_FILES+=usr/share/examples/etc/printcap +OLD_FILES+=usr/share/examples/printing/diablo-if-net +OLD_FILES+=usr/share/examples/printing/hpdf +OLD_FILES+=usr/share/examples/printing/hpif +OLD_FILES+=usr/share/examples/printing/hpof +OLD_FILES+=usr/share/examples/printing/hprf +OLD_FILES+=usr/share/examples/printing/hpvf +OLD_FILES+=usr/share/examples/printing/if-simple +OLD_FILES+=usr/share/examples/printing/if-simpleX +OLD_FILES+=usr/share/examples/printing/ifhp +OLD_FILES+=usr/share/examples/printing/make-ps-header +OLD_FILES+=usr/share/examples/printing/netprint +OLD_FILES+=usr/share/examples/printing/psdf +OLD_FILES+=usr/share/examples/printing/psdfX +OLD_FILES+=usr/share/examples/printing/psif +OLD_FILES+=usr/share/examples/printing/pstf +OLD_FILES+=usr/share/examples/printing/pstfX +OLD_DIRS+=usr/share/examples/printing OLD_FILES+=usr/share/man/man1/lp.1.gz OLD_FILES+=usr/share/man/man1/lpq.1.gz OLD_FILES+=usr/share/man/man1/lpr.1.gz OLD_FILES+=usr/share/man/man1/lprm.1.gz OLD_FILES+=usr/share/man/man1/lptest.1.gz +OLD_FILES+=usr/share/man/man5/hosts.lpd.5.gz OLD_FILES+=usr/share/man/man5/printcap.5.gz OLD_FILES+=usr/share/man/man8/chkprintcap.8.gz OLD_FILES+=usr/share/man/man8/lpc.8.gz From nobody Sat Feb 21 21:27:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJKvW0fVLz6SJ0V for ; Sat, 21 Feb 2026 21:27: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 4fJKvV6fDgz3Myn for ; Sat, 21 Feb 2026 21:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tbnisf3Ks+n0gl1buomE5OEspbHUxWRCgWx3auOTVE=; b=ONqfakb77Uoy2zS0hHNhNA70dbSOzYFSQRD0JjFm6TRcgeJKWhwaym1WezbpC4kfc/lx5b odh+q0Ak2Vb7lBvixTT+r34wRvTgghvK7pVxB0zJbH3FBikj+BhOeEVaM63+DhGZ6WKSMC lT4BZRFVHLAyYkqqxceG0Hjl/QpsTyJXm53Y2QbhOAZkq5hmdXj+IDzeciRFeH3APQHf7/ REwJBMIuese9UNE2MCzerEpCHSLAR+FEnEPuYa9HgeXhgIKSSLd+Y0BzIFyw8UVo7xx3hB UQyw5Zed35UtcqIvnOrxiPmz8WkcO25VTOTHmejABQU9sQrm1u96gFppxO9y4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709238; a=rsa-sha256; cv=none; b=dJqur1Dbz3eU+WrpUNJxWE9hWrATaNJKwRAm2cf2wTzCL2PPh7XuwO8mHNfiiuRvGInnfw BV9vqcnk8YnW3Hy28eOl8iBO8Ip0o0JZbGpKWnp5YtUd3Plbd61bxgb3iN3pgs5yOlr/Xd drQrTRB0avUKi4kastKWhHyBSO4ilsRCDK3Uyxftnro0bVzMzebcF4KO+7XVASXSyLSNrW tb6S5tesiEU/mSbHWKfKbjwiAr1Zlm+UYKIA86ERlRhqxGZ7Efjo8wamn6bm2QXgC+cTpt 0gOTVkTzSD2zouNx0YlSTzqs8LENczN7O9q5r+gWK9wzbE6OYA18Erey4x1j8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tbnisf3Ks+n0gl1buomE5OEspbHUxWRCgWx3auOTVE=; b=qO0WplBaCs4l10TwGe/L2imkJ3VlzVH/xSkCa1obfC2zObQoWbrmB6Ra4buT86WS0LcazB Zl+DHAJ27+sElpYWpSMM+hwu+j0rVAC9ee0BDyALwlCN9JECB3A54a3V1XQM9nxUYbHbLf I1Cu5RgilITRKyxde4cHChjRIdbDWMhhe2WGmLaXeKnnxVVSj6kOnIDNGfbcEZczR7BGPh BJjFlqV5xI2IOk9pQyWFoMyGrfEc5LS9+SrX5Yc+TmAxs2te9DqQnVvC6PTF1dzzB9tPKE AXlkcerC09lZWM457zbSWFM59kQcy0Jd1DeSRyuUyeqV5hIF5XIRQkr1Z0qZTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJKvV5kjszql for ; Sat, 21 Feb 2026 21:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2113e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:27:18 +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: d57dee7ab66f - main - lpr: Add deprecation notice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d57dee7ab66f60537b557cb602be194e3eed253d Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:27:18 +0000 Message-Id: <699a2336.2113e.6ffe99dd@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d57dee7ab66f60537b557cb602be194e3eed253d commit d57dee7ab66f60537b557cb602be194e3eed253d Author: Dag-Erling Smørgrav AuthorDate: 2026-02-19 17:55:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 21:26:51 +0000 lpr: Add deprecation notice These programs require elevated privileges to work and have not seen regular maintenance in decades. Unless someone steps up and overhauls them, we will have to remove them before 16.0. Better-maintained alternatives are available in ports (print/cups, sysutils/LPRng). MFC after: 3 days --- usr.sbin/lpr/chkprintcap/chkprintcap.8 | 3 +++ usr.sbin/lpr/lp/lp.1 | 3 +++ usr.sbin/lpr/lpc/lpc.8 | 3 +++ usr.sbin/lpr/lpd/lpd.8 | 3 +++ usr.sbin/lpr/lpq/lpq.1 | 3 +++ usr.sbin/lpr/lpr/lpr.1 | 3 +++ usr.sbin/lpr/lpr/printcap.5 | 3 +++ usr.sbin/lpr/lprm/lprm.1 | 3 +++ usr.sbin/lpr/lptest/lptest.1 | 3 +++ usr.sbin/lpr/pac/pac.8 | 3 +++ 10 files changed, 30 insertions(+) diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8 index 7aecf9fbb1b7..1e9638c2b5aa 100644 --- a/usr.sbin/lpr/chkprintcap/chkprintcap.8 +++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8 @@ -34,6 +34,9 @@ .Nm .Op Fl d .Op Fl f Ar printcap +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1 index 907ce867279e..fee272c456e5 100644 --- a/usr.sbin/lpr/lp/lp.1 +++ b/usr.sbin/lpr/lp/lp.1 @@ -44,6 +44,9 @@ .Op Fl d Ar printer .Op Fl n Ar num .Op Ar name ... +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8 index 089be4ab3bfc..cc1ba05dd775 100644 --- a/usr.sbin/lpr/lpc/lpc.8 +++ b/usr.sbin/lpr/lpc/lpc.8 @@ -34,6 +34,9 @@ .Sh SYNOPSIS .Nm .Op Ar command Op Ar argument ... +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8 index eed37ea1d6f4..9a4e46996811 100644 --- a/usr.sbin/lpr/lpd/lpd.8 +++ b/usr.sbin/lpr/lpd/lpd.8 @@ -35,6 +35,9 @@ .Nm .Op Fl cdlpsFW46 .Op Ar port# +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1 index c87bcbbaa94d..a5e26446ba76 100644 --- a/usr.sbin/lpr/lpq/lpq.1 +++ b/usr.sbin/lpr/lpq/lpq.1 @@ -38,6 +38,9 @@ .Op Fl P Ns Ar printer .Op job # ...\& .Op user ...\& +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1 index b73870a0f46e..c4f86756b959 100644 --- a/usr.sbin/lpr/lpr/lpr.1 +++ b/usr.sbin/lpr/lpr/lpr.1 @@ -46,6 +46,9 @@ .Op Fl w Ar num .Op Fl cdfghlnmprstv .Op Ar name ... +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5 index e745fafc7b27..e1bc891c5c09 100644 --- a/usr.sbin/lpr/lpr/printcap.5 +++ b/usr.sbin/lpr/lpr/printcap.5 @@ -33,6 +33,9 @@ .Nd printer capability data base .Sh SYNOPSIS .Nm +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm Printcap diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1 index 8d35a3434969..e6ae6e22012b 100644 --- a/usr.sbin/lpr/lprm/lprm.1 +++ b/usr.sbin/lpr/lprm/lprm.1 @@ -37,6 +37,9 @@ .Op Fl .Op job # ...\& .Op Ar user ...\& +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/lpr/lptest/lptest.1 b/usr.sbin/lpr/lptest/lptest.1 index 76f9c2418ce8..ba897c1ddccb 100644 --- a/usr.sbin/lpr/lptest/lptest.1 +++ b/usr.sbin/lpr/lptest/lptest.1 @@ -35,6 +35,9 @@ .Nm .Op Ar length .Op Ar count +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/lpr/pac/pac.8 b/usr.sbin/lpr/pac/pac.8 index 145d54ad4562..9443c3fc1ec2 100644 --- a/usr.sbin/lpr/pac/pac.8 +++ b/usr.sbin/lpr/pac/pac.8 @@ -40,6 +40,9 @@ .Op Fl s .Op Fl r .Op Ar name ... +.Sh DEPRECATION NOTICE +This facility is scheduled for removal prior to the release of +.Fx 16.0 . .Sh DESCRIPTION The .Nm From nobody Sat Feb 21 23:22:59 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJNSz6s62z6ST9H for ; Sat, 21 Feb 2026 23:22: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 4fJNSz69fTz3hSn for ; Sat, 21 Feb 2026 23:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771716179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IlU4QCOLf4WH5//WZkPzq+6ojEyHub2IctFQnJNAun0=; b=ZXS2zK0HXo/zmrvMsAG9xY1rI4mfctxjXiFMn9cryA+NW+t+lkFUSSGfru+rFjH2q7zBLr XA3Dhsx38wQ2LzKZItqSGnkcvUGfPUajOhYTp9AVthj1XVmVEllzwGFM6pQ/jUGGkKZ/q+ 6ZWm+o22+dV73hkgbA+TY5D1Kl2HBTrVWuLaxiEXaDZ8RWgaBoKa5MlSEGfa9mHzjrp/gT GtMhAoyB8bXn3Ep4QPakltTSTS0Xw0pozZXhH0oNrcNDiGPJGLIH7fIgsJOYtcaCYTkke8 lzDCNzcwAwMkWwZ3Pcq0Kjn6Wbk4qZ25BU7hz/cEd9nsEKnXtkhKJDtGpWBNdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771716179; a=rsa-sha256; cv=none; b=rRbytZSIUF7KqMeNaAHlqBWA+P4i2uZuScL4ooL0fdUSShcR323mxvdATBT+BOF2RFkVFI f0vj27rWIJkxgmgV+G8evFMX+o0c+WShHQb+v1VQNCgLjTsko9EjCkxh0FiVNioku62YPx gP36vVan7RzaOuWCnvkz5A9spNuDMAEE/KEzJr4S8nR/jijlYZ5SUcDSEegzd6vjHnolsH Ub+YDgBzkWWmmqoegx+rN7csyxl2tgJ+ol1teYJwZCTTBGYpuiRTlH0bAJXJCZm18fil7E MrjSaNbnFmYZEWWuguHG3jGGl+BI8DYTZoe3dDso8VJHB15QoPYJZ33n+v0b2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771716179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IlU4QCOLf4WH5//WZkPzq+6ojEyHub2IctFQnJNAun0=; b=whMxifZVfsh2k0wW/VTncqgGLXBDPNI3oiftYzoYeGN8XZmqH3xJzGtw1hhWhiadJKs4by b0trpgXnMxxYRTYVvSuibwm9vcIAPb0SoVy3I314fJAYONSoHBB4Yl0s4ust7gEn6CMAv+ jMyY14CPvh1imxyWYZOZZOZiMvP5fRqDcGMXRBgEHvihZhri8ldPIK3sOBRikHztnBiKFY YQ658JWRIOtl27FnDfSO1YXGrGyDXtmyg9vgL2iZsaZVYc5k4zQUFP+YRxKYg23d6zjx8y q6LAnTOliyC7JXcU3/U3OomTs8F8WOVMoR/buUMYBTdeNnf8xK7Hr39CZNbJ5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJNSz5mT0z40T for ; Sat, 21 Feb 2026 23:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 23:22:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: c242bf1b7079 - main - libc: Roll {l,ll,imax}div(3) manpages into just div(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c242bf1b70796313dabb5594b5aacdf4c20377aa Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 23:22:59 +0000 Message-Id: <699a3e53.35f70.4c977288@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=c242bf1b70796313dabb5594b5aacdf4c20377aa commit c242bf1b70796313dabb5594b5aacdf4c20377aa Author: Aymeric Wibo AuthorDate: 2026-02-21 23:14:23 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-21 23:19:25 +0000 libc: Roll {l,ll,imax}div(3) manpages into just div(3) No need to have 4 separate manpages for these functions. Reviewed by: ziaee, rpokala, des Approved by: rpokala, des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55360 --- lib/libc/stdlib/Makefile.inc | 5 ++- lib/libc/stdlib/div.3 | 86 ++++++++++++++++++++++++++++++++------------ lib/libc/stdlib/imaxdiv.3 | 71 ------------------------------------ lib/libc/stdlib/ldiv.3 | 76 --------------------------------------- lib/libc/stdlib/lldiv.3 | 71 ------------------------------------ 5 files changed, 67 insertions(+), 242 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index c2107fdaeaae..3698377b9b27 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -91,7 +91,7 @@ SYM_MAPS+= ${LIBC_SRCTOP}/stdlib/Symbol.map MAN+= a64l.3 abort.3 abs.3 atexit.3 atof.3 \ atoi.3 atol.3 at_quick_exit.3 bsearch.3 \ div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 \ - hcreate.3 imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 llabs.3 lldiv.3 \ + hcreate.3 imaxabs.3 insque.3 labs.3 llabs.3 \ lsearch.3 memalignment.3 memory.3 ptsname.3 qsort.3 \ quick_exit.3 \ radixsort.3 rand.3 random.3 reallocarray.3 reallocf.3 realpath.3 \ @@ -102,6 +102,9 @@ MAN+= a64l.3 abort.3 abs.3 atexit.3 atof.3 \ MLINKS+=a64l.3 l64a.3 \ a64l.3 l64a_r.3 MLINKS+=atol.3 atoll.3 +MLINKS+=div.3 ldiv.3 \ + div.3 lldiv.3 \ + div.3 imaxdiv.3 MLINKS+=exit.3 _Exit.3 MLINKS+=getenv.3 clearenv.3 \ getenv.3 putenv.3 \ diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3 index 87b9665684fb..6565a4159562 100644 --- a/lib/libc/stdlib/div.3 +++ b/lib/libc/stdlib/div.3 @@ -1,8 +1,12 @@ .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. +.\" Copyright (c) 2001 Mike Barcroft +.\" Copyright (c) 2026 Aymeric Wibo .\" .\" This code is derived from software contributed to Berkeley by -.\" Chris Torek. +.\" Chris Torek and the American National Standards Committee X3, +.\" on Information Processing Systems. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -27,41 +31,77 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 12, 2026 +.Dd February 18, 2026 .Dt DIV 3 .Os .Sh NAME -.Nm div +.Nm div , +.Nm ldiv , +.Nm lldiv , +.Nm imaxdiv .Nd return quotient and remainder from division -.Sh LIBRARY -.Lb libc .Sh SYNOPSIS +.Lb libc .In stdlib.h .Ft div_t .Fn div "int numer" "int denom" +.Ft ldiv_t +.Fn ldiv "long numer" "long denom" +.Ft lldiv_t +.Fn lldiv "long long numer" "long long denom" +.In inttypes.h +.Ft imaxdiv_t +.Fn imaxdiv "intmax_t numer" "intmax_t denom" .Sh DESCRIPTION The -.Fn div -function -computes the value -.Fa numer Ns / Ns Fa denom -(numerator/denominator). -It returns a structure named -.Fa div_t -that contains two -.Vt int +.Fn div , +.Fn ldiv , +.Fn lldiv , +and +.Fn imaxdiv +functions compute the value of +.Fa numer +(the numerator) divided by +.Fa denom +(the denominator) and return the stored result in the form of the +.Fa div_t , +.Fa ldiv_t , +.Fa lldiv_t , +or +.Fa imaxdiv_t +types, respectively. +These types are structs which contain two +.Vt int , +.Vt long , +.Vt long long , +or +.Vt intmax_t members named .Va quot -(quotient) and +(the quotient) and .Va rem -(remainder). -.Sh SEE ALSO -.Xr imaxdiv 3 , -.Xr ldiv 3 , -.Xr lldiv 3 +(the remainder). .Sh STANDARDS The +.Fn div , +.Fn ldiv , +.Fn lldiv , +and +.Fn imaxdiv +functions conform to +.St -isoC-2023 +and +.St -p1003.1-2024 . +.Sh HISTORY +The .Fn div -function -conforms to -.St -isoC-99 . +and +.Fn ldiv +functions first appeared in +.Bx 4.3 . +The +.Fn lldiv +and +.Fn imaxdiv +functions first appeared in +.Fx 5.0 . diff --git a/lib/libc/stdlib/imaxdiv.3 b/lib/libc/stdlib/imaxdiv.3 deleted file mode 100644 index 9e51c47b53c3..000000000000 --- a/lib/libc/stdlib/imaxdiv.3 +++ /dev/null @@ -1,71 +0,0 @@ -.\" Copyright (c) 2001 Mike Barcroft -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd February 12, 2026 -.Dt IMAXDIV 3 -.Os -.Sh NAME -.Nm imaxdiv -.Nd returns quotient and remainder -.Sh LIBRARY -.Lb libc -.Sh SYNOPSIS -.In inttypes.h -.Ft imaxdiv_t -.Fn imaxdiv "intmax_t numer" "intmax_t denom" -.Sh DESCRIPTION -The -.Fn imaxdiv -function computes the value of -.Fa numer -(numerator) divided by -.Fa denom -(denominator) and returns the stored result in the form of the -.Vt imaxdiv_t -type. -.Pp -The -.Vt imaxdiv_t -type is defined as: -.Bd -literal -offset indent -typedef struct { - intmax_t quot; /* Quotient. */ - intmax_t rem; /* Remainder. */ -} imaxdiv_t; -.Ed -.Sh SEE ALSO -.Xr div 3 , -.Xr ldiv 3 , -.Xr lldiv 3 , -.Xr math 3 -.Sh STANDARDS -The -.Fn imaxdiv -function conforms to -.St -isoC-99 . -.Sh HISTORY -The -.Fn imaxdiv -function first appeared in -.Fx 5.0 . diff --git a/lib/libc/stdlib/ldiv.3 b/lib/libc/stdlib/ldiv.3 deleted file mode 100644 index c2ab444bdcab..000000000000 --- a/lib/libc/stdlib/ldiv.3 +++ /dev/null @@ -1,76 +0,0 @@ -.\" Copyright (c) 1990, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" Chris Torek and the American National Standards Committee X3, -.\" on Information Processing Systems. -.\" -.\" 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. -.\" -.Dd February 12, 2026 -.Dt LDIV 3 -.Os -.Sh NAME -.Nm ldiv -.Nd return quotient and remainder from division -.Sh LIBRARY -.Lb libc -.Sh SYNOPSIS -.In stdlib.h -.Ft ldiv_t -.Fn ldiv "long numer" "long denom" -.Sh DESCRIPTION -The -.Fn ldiv -function -computes the value -.Fa numer Ns / Ns Fa denom -(numerator/denominator). -It returns the quotient and remainder in a structure named -.Vt ldiv_t -that contains two -.Vt long -members named -.Va quot -(quotient) and -.Va rem -(remainder). -.Sh SEE ALSO -.Xr div 3 , -.Xr imaxdiv 3 , -.Xr lldiv 3 , -.Xr math 3 -.Sh STANDARDS -The -.Fn ldiv -function -conforms to -.St -isoC-99 . -.Sh HISTORY -An -.Fn ldiv -function with similar functionality, but a different calling convention, -first appeared in -.At v4 . diff --git a/lib/libc/stdlib/lldiv.3 b/lib/libc/stdlib/lldiv.3 deleted file mode 100644 index 783ea3df6554..000000000000 --- a/lib/libc/stdlib/lldiv.3 +++ /dev/null @@ -1,71 +0,0 @@ -.\" Copyright (c) 2001 Mike Barcroft -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd February 12, 2026 -.Dt LLDIV 3 -.Os -.Sh NAME -.Nm lldiv -.Nd returns quotient and remainder -.Sh LIBRARY -.Lb libc -.Sh SYNOPSIS -.In stdlib.h -.Ft lldiv_t -.Fn lldiv "long long numer" "long long denom" -.Sh DESCRIPTION -The -.Fn lldiv -function computes the value of -.Fa numer -(numerator) divided by -.Fa denom -(denominator) and returns the stored result in the form of the -.Vt lldiv_t -type. -.Pp -The -.Vt lldiv_t -type is defined as: -.Bd -literal -offset indent -typedef struct { - long long quot; /* Quotient. */ - long long rem; /* Remainder. */ -} lldiv_t; -.Ed -.Sh SEE ALSO -.Xr div 3 , -.Xr imaxdiv 3 , -.Xr ldiv 3 , -.Xr math 3 -.Sh STANDARDS -The -.Fn lldiv -function conforms to -.St -isoC-99 . -.Sh HISTORY -The -.Fn lldiv -function first appeared in -.Fx 5.0 . From nobody Sat Feb 21 23:23:00 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJNT11v3fz6ST9K for ; Sat, 21 Feb 2026 23:23: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 4fJNT10G9gz3hY8 for ; Sat, 21 Feb 2026 23:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771716181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tl/6xHPp0iTrg0eaAyprCWtBABbVaVZf/KyFLYCavwA=; b=qXIOc0w06tDLKKPDmRHYzUsPu35Ayw1eO90tbxOotBBAUsIKLKEYs5y6fR9OEGmIaJ6WxD G7D+T/BOTa5g25YulNUq2hCSNpc5I9o22QRIiRvH9dD0QgxJXJm/GvWkO7JzaGIyx8VK+k C/m/3oaoGEXaiY872j4VsUAwE8z0t28t9yrK5bnOaXY+4OVugoi87CRRe0eXam3HbE+rrv DWsPJCNAWdHRHfOcIYhDr3BhY2lXYYqsi4+5emaKI/qx5CzdvGYNAyGysGN7uiMRw+/WZR LsXYMuOCOL854ZzX9pHTDRoJ+ZH03GJjdEdSl8pBEjVcKyRxPOckPtpYB3T3Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771716181; a=rsa-sha256; cv=none; b=eNG9HDA8Ah8r7FpT3Jz7IoM21ii7z9RbJLdHLbUYz/ONGz10EPrBc/TrwL80TZ2o2gW9uw 7a3JL2w06C+obCbrO2UZgbasvcfkCVTAKXAlxnCaTws/xn6ou4esmBNOVeASXeL4tBPmSV ju8C3X4Kz/aLoLficOLVli2gloAAxWvSexJmCQjYUXWCRs7xDk4FAh/1J3MVgFBDqj+XzJ 30Wv/1pa01798bMpCF7xk61XHQLOx+oy0qGsd2KJRuVBtij6wxnoc1DhuyWjMF7QGk752A TSkD+gdqVW8v386fQZ0NBu40jBK0Zt3A0Ac9HOqbu7cSpwNJ1TJkFMsWtdil8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771716181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tl/6xHPp0iTrg0eaAyprCWtBABbVaVZf/KyFLYCavwA=; b=pUjdwPhcoUQQcf3JhVmz27+elTxhDF5M1shDrdOuhZ8kbqQPrqMnPQKREKP43huajlQp9p oMx40IXRmk9Vzx6mLrpj9nraq3yAVZPn6X0pBz2vi6hF0iSVOARu9hM51zk0XCuQSvBJxX 3M6lagwNY50Q9vQT7ErRo1foTai3fRrWWp8OHGc2maIrU7q+2vQB1RAHe2v9nU0BhQIMtq TL0Chh0hzhBAsd2qAG6E0Tg9bRK5dYXPzuOCqSTLcvLSBZzYM/hEAajXuLfGsWb+o405KL pmVo4Fae2LbxdzWpVVBkyLcKA/VDAgFTKaPd9p3zUXgrcuk8nt3MQdmyWl/hCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJNT06QlLz3r8 for ; Sat, 21 Feb 2026 23:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3767c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 23:23:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 637a8ec15793 - main - stdckdint.3: Fix standard in comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 637a8ec157935c76839185d9068e6f4bc42047bc Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 23:23:00 +0000 Message-Id: <699a3e54.3767c.33aaae35@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=637a8ec157935c76839185d9068e6f4bc42047bc commit 637a8ec157935c76839185d9068e6f4bc42047bc Author: Aymeric Wibo AuthorDate: 2026-02-21 23:20:18 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-21 23:20:19 +0000 stdckdint.3: Fix standard in comment Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55360 --- share/man/man3/stdckdint.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man3/stdckdint.3 b/share/man/man3/stdckdint.3 index e3593472c08b..4f12b4a8c575 100644 --- a/share/man/man3/stdckdint.3 +++ b/share/man/man3/stdckdint.3 @@ -87,7 +87,7 @@ int main(void) .\" and .\" .Nm ckd_mul .\" macros conform to -.\" .St -isoC-23 . +.\" .St -isoC-2023 . .Sh HISTORY The .Nm ckd_add , From nobody Sat Feb 21 23:23:01 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJNT22vKLz6ST4S for ; Sat, 21 Feb 2026 23:23: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 4fJNT20QGHz3hHc for ; Sat, 21 Feb 2026 23:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771716182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w2znmG9AitgYWxS+yacg2NhGXiPjU/EDQQe8zZ///D8=; b=ykqw280azN2Mmfv1cZ9ut0SK4sOp95TauJpixJgY5r2gP5o1lWpKQP0HpdJzasRraFNnU5 /WCMu7WmfxfCP+Wvhm3AcNKDzuz8N6ChT1smnEGZEMDjzhxuSxuh8oRHxZ2Y8H0gtISAeW 16BKy1N0sQ5bayIMyr7Xdhxdc/K/Kn4tW3yafA17YeiJos5IqiKjNXv+68e8TiWFQgsiKz PEpvjbqHMhcmCEjO1OR65fhtFPAW9kRtX7RvvChu5WQamnipa/ebp2gny+ozmqQlVsJ6tF bKObIS9bEGSnt1sXxpktvlAGe/vW2nqQJQF8huUl9EhQy9A+cg80QAoeq1CjEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771716182; a=rsa-sha256; cv=none; b=M/b2Vx6YwDN+vFwXeN664IvTm6U7Ww48nIzpmExquWUhsFsNzRatA31CH2iDNUdzrqd+QN rWfgrESSUoacl3B5til6HixMPTMxitkLnVkAdOwx7tNYyL3qXHNK8MOy5002jWLj49dLjV c+Rxrs2+S+UVjf8UWYQpXs3SUwZyjkoJ8w5a1kvv4VAn6FkNt9YUxpXrsVGLCuitADLbT4 KHoHZy05O/NggJ25r43AiGFGGSfAYLLEWzoKjhQSvmUNcF4VU/GlcJ/z4z4IpvYDLv+I/S rwRp26VoTqgBNVo1p72FDPKLxEpqUmuaem3YDQcGt8wbROd1uGiqnBh1E2HszA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771716182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w2znmG9AitgYWxS+yacg2NhGXiPjU/EDQQe8zZ///D8=; b=wn83zNwPxbPdszrdqjkuaXSecGKy/PjmcJnKmb5Ym5BOzHU2AkBk6Eu0o6EWWadcR79DDe 7ncQJW2lvGFMZxER0De7wAFtJggQDh9WBk0a9eSC+YgzJUdpdiXFHSoVfVETfoIltNvxOg 6b1yUCayTco9oP9TUi8XY6eJHX4hjay6uesZyO84G5uxW7ENGF6Lt0/M2vxIjqYa0jnFpE BAURZ1eXElf8SPfdXseX4FoVqqlbxtvwR8mgVQ7h41jVz3HmQxRo2kQEx0Nqucj0o1xao3 XVeDRqHSYrlUdFT14pkNhkI4bdtV+Egx7KQig2AuURqFanXFtsQLebJz3sDgbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJNT16vl3z40V for ; Sat, 21 Feb 2026 23:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 372ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 23:23:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 98ffaae49fea - main - libc: Roll {l,ll,imax}abs(3) manpages into just abs(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98ffaae49fea5c478230ef68086bcea89a6f654b Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 23:23:01 +0000 Message-Id: <699a3e55.372ae.57956dd2@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=98ffaae49fea5c478230ef68086bcea89a6f654b commit 98ffaae49fea5c478230ef68086bcea89a6f654b Author: Aymeric Wibo AuthorDate: 2026-02-19 03:02:19 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-21 23:22:05 +0000 libc: Roll {l,ll,imax}abs(3) manpages into just abs(3) No need to have 4 separate manpages for these functions. Use opportunity to change parameter names in the source from j -> i to reflect the name used in POSIX. (The ISO C standard uses j but i is a better name anyway.) Reviewed by: des, rpokala Approved by: rpokala Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55361 --- lib/libc/stdlib/Makefile.inc | 5 ++- lib/libc/stdlib/abs.3 | 72 ++++++++++++++++++++++++++++++-------------- lib/libc/stdlib/abs.c | 4 +-- lib/libc/stdlib/imaxabs.3 | 60 ------------------------------------ lib/libc/stdlib/imaxabs.c | 4 +-- lib/libc/stdlib/labs.3 | 64 --------------------------------------- lib/libc/stdlib/labs.c | 4 +-- lib/libc/stdlib/llabs.3 | 60 ------------------------------------ lib/libc/stdlib/llabs.c | 4 +-- 9 files changed, 61 insertions(+), 216 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 3698377b9b27..2cdff5b934cb 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -91,7 +91,7 @@ SYM_MAPS+= ${LIBC_SRCTOP}/stdlib/Symbol.map MAN+= a64l.3 abort.3 abs.3 atexit.3 atof.3 \ atoi.3 atol.3 at_quick_exit.3 bsearch.3 \ div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 \ - hcreate.3 imaxabs.3 insque.3 labs.3 llabs.3 \ + hcreate.3 insque.3 \ lsearch.3 memalignment.3 memory.3 ptsname.3 qsort.3 \ quick_exit.3 \ radixsort.3 rand.3 random.3 reallocarray.3 reallocf.3 realpath.3 \ @@ -101,6 +101,9 @@ MAN+= a64l.3 abort.3 abs.3 atexit.3 atof.3 \ MLINKS+=a64l.3 l64a.3 \ a64l.3 l64a_r.3 +MLINKS+=abs.3 labs.3 \ + abs.3 llabs.3 \ + abs.3 imaxabs.3 MLINKS+=atol.3 atoll.3 MLINKS+=div.3 ldiv.3 \ div.3 lldiv.3 \ diff --git a/lib/libc/stdlib/abs.3 b/lib/libc/stdlib/abs.3 index d47f83ea0f73..b5844761ef48 100644 --- a/lib/libc/stdlib/abs.3 +++ b/lib/libc/stdlib/abs.3 @@ -1,5 +1,6 @@ .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. +.\" Copyright (c) 2026 Aymeric Wibo .\" .\" This code is derived from software contributed to Berkeley by .\" the American National Standards Committee X3, on Information @@ -29,49 +30,74 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 3, 2022 +.Dd February 19, 2026 .Dt ABS 3 .Os .Sh NAME -.Nm abs -.Nd integer absolute value function -.Sh LIBRARY -.Lb libc +.Nm abs , +.Nm labs , +.Nm llabs , +.Nm imaxabs +.Nd return absolute value for integer types .Sh SYNOPSIS +.Lb libc .In stdlib.h .Ft int -.Fn abs "int j" +.Fn abs "int i" +.Ft long +.Fn labs "long i" +.Ft long long +.Fn llabs "long long i" +.In inttypes.h +.Ft intmax_t +.Fn imaxabs "intmax_t i" .Sh DESCRIPTION The -.Fn abs -function -computes -the absolute value of the integer -.Fa j . +.Fn abs , +.Fn labs , +.Fn llabs , +and +.Fn imaxabs +functions compute the absolute value of +.Fa i . .Sh RETURN VALUES The -.Fn abs -function -returns -the absolute value. +.Fn abs , +.Fn labs , +.Fn llabs , +and +.Fn imaxabs +functions return the absolute value. .Sh SEE ALSO .Xr cabs 3 , .Xr fabs 3 , .Xr floor 3 , -.Xr hypot 3 , -.Xr imaxabs 3 , -.Xr labs 3 , -.Xr llabs 3 , -.Xr math 3 +.Xr hypot 3 .Sh STANDARDS The -.Fn abs -function conforms to -.St -isoC-99 . +.Fn abs , +.Fn labs , +.Fn llabs , +and +.Fn imaxabs +functions conform to +.St -isoC-2023 +and +.St -p1003.1-2024 . .Sh HISTORY The .Fn abs function first appeared in .At v6 . +The +.Fn labs +function first appeared in +.Bx 4.3 . +The +.Fn llabs +and +.Fn imaxabs +functions first appeared in +.Fx 5.0 . .Sh BUGS The absolute value of the most negative integer remains negative. diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c index baed3795bf5e..3ebbff748897 100644 --- a/lib/libc/stdlib/abs.c +++ b/lib/libc/stdlib/abs.c @@ -32,7 +32,7 @@ #include int -abs(int j) +abs(int i) { - return(j < 0 ? -j : j); + return(i < 0 ? -i : i); } diff --git a/lib/libc/stdlib/imaxabs.3 b/lib/libc/stdlib/imaxabs.3 deleted file mode 100644 index fa68216facc1..000000000000 --- a/lib/libc/stdlib/imaxabs.3 +++ /dev/null @@ -1,60 +0,0 @@ -.\" Copyright (c) 2001 Mike Barcroft -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd November 14, 2001 -.Dt IMAXABS 3 -.Os -.Sh NAME -.Nm imaxabs -.Nd returns absolute value -.Sh LIBRARY -.Lb libc -.Sh SYNOPSIS -.In inttypes.h -.Ft intmax_t -.Fn imaxabs "intmax_t j" -.Sh DESCRIPTION -The -.Fn imaxabs -function returns the absolute value of -.Fa j . -.Sh SEE ALSO -.Xr abs 3 , -.Xr fabs 3 , -.Xr hypot 3 , -.Xr labs 3 , -.Xr llabs 3 , -.Xr math 3 -.Sh STANDARDS -The -.Fn imaxabs -function conforms to -.St -isoC-99 . -.Sh HISTORY -The -.Fn imaxabs -function first appeared in -.Fx 5.0 . -.Sh BUGS -The absolute value of the most negative integer remains negative. diff --git a/lib/libc/stdlib/imaxabs.c b/lib/libc/stdlib/imaxabs.c index 08a27ac98da7..e0fd9448f0b2 100644 --- a/lib/libc/stdlib/imaxabs.c +++ b/lib/libc/stdlib/imaxabs.c @@ -29,7 +29,7 @@ #include intmax_t -imaxabs(intmax_t j) +imaxabs(intmax_t i) { - return (j < 0 ? -j : j); + return (i < 0 ? -i : i); } diff --git a/lib/libc/stdlib/labs.3 b/lib/libc/stdlib/labs.3 deleted file mode 100644 index 97f527b7d941..000000000000 --- a/lib/libc/stdlib/labs.3 +++ /dev/null @@ -1,64 +0,0 @@ -.\" Copyright (c) 1990, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" the American National Standards Committee X3, on Information -.\" Processing Systems. -.\" -.\" 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. -.\" -.Dd November 14, 2001 -.Dt LABS 3 -.Os -.Sh NAME -.Nm labs -.Nd return the absolute value of a long integer -.Sh LIBRARY -.Lb libc -.Sh SYNOPSIS -.In stdlib.h -.Ft long -.Fn labs "long j" -.Sh DESCRIPTION -The -.Fn labs -function -returns the absolute value of the long integer -.Fa j . -.Sh SEE ALSO -.Xr abs 3 , -.Xr cabs 3 , -.Xr floor 3 , -.Xr imaxabs 3 , -.Xr llabs 3 , -.Xr math 3 -.Sh STANDARDS -The -.Fn labs -function -conforms to -.St -isoC . -.Sh BUGS -The absolute value of the most negative integer remains negative. diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c index 23696f1c0f0c..93102b3a2b91 100644 --- a/lib/libc/stdlib/labs.c +++ b/lib/libc/stdlib/labs.c @@ -32,7 +32,7 @@ #include long -labs(long j) +labs(long i) { - return(j < 0 ? -j : j); + return(i < 0 ? -i : i); } diff --git a/lib/libc/stdlib/llabs.3 b/lib/libc/stdlib/llabs.3 deleted file mode 100644 index 6a12fd539dc6..000000000000 --- a/lib/libc/stdlib/llabs.3 +++ /dev/null @@ -1,60 +0,0 @@ -.\" Copyright (c) 2001 Mike Barcroft -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd November 14, 2001 -.Dt LLABS 3 -.Os -.Sh NAME -.Nm llabs -.Nd returns absolute value -.Sh LIBRARY -.Lb libc -.Sh SYNOPSIS -.In stdlib.h -.Ft "long long" -.Fn llabs "long long j" -.Sh DESCRIPTION -The -.Fn llabs -function returns the absolute value of -.Fa j . -.Sh SEE ALSO -.Xr abs 3 , -.Xr fabs 3 , -.Xr hypot 3 , -.Xr imaxabs 3 , -.Xr labs 3 , -.Xr math 3 -.Sh STANDARDS -The -.Fn llabs -function conforms to -.St -isoC-99 . -.Sh HISTORY -The -.Fn llabs -function first appeared in -.Fx 5.0 . -.Sh BUGS -The absolute value of the most negative integer remains negative. diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c index ac151e3a5036..ff56e526b8a9 100644 --- a/lib/libc/stdlib/llabs.c +++ b/lib/libc/stdlib/llabs.c @@ -29,7 +29,7 @@ #include long long -llabs(long long j) +llabs(long long i) { - return (j < 0 ? -j : j); + return (i < 0 ? -i : i); } From nobody Sun Feb 22 00:14:57 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJPcy0rTBz6SXyL for ; Sun, 22 Feb 2026 00:14: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 4fJPcx74knz3pvC for ; Sun, 22 Feb 2026 00:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771719298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Osp90rMGdqa77eTX3z1VBvIHmWOX0ep1PT1w8GWEA6g=; b=KwQFnVeGrDK3KenipttoGtEOGwbtY2wAg27q30oA/UjYHlmRHwCG2VfHqEu0jYP7gZlBSL Fgm896A26oWdW16Bvss4kvGxWyNSJpxnhZ8lv7oBn+CPputbcSNuVjz1GVpQremUJWD6Ls JIOv9z7i4wGGErpJgmIaylUIjPxPijfWwH7rWMIoWYDpVvW/XUHODfmOB+3zSZ8oAx+kCA XUfhOU/3blWL1RVHnM+yv7Xa+Zqhf0YV2aqytGZfFYNszbhMh8qvBxR9a5TqA/zkQQ1NnW R1vQY36TG0lLj0wVM+tjchFn73iQ6r/q3OpS4Q1Xrp6PP7g4eQwCtlqM1uYPuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771719298; a=rsa-sha256; cv=none; b=AJGFwOYE9T6XH4u0wu/Ypro0y6+lC/x5kOy1y4HCarOfYA6U1Fl0gbo7j042I7arYr+odJ tepJCOTY3fYfz2g9RAvRGGcIIfFpq3paPj/3GkIr7iWoqp5spnTRhpOgwayvQV5piNubeZ bT5j6z7A1fQpMFW452ZsMyKExvAmjJufP6uSq1hzQTLja8Y+V/SZdRjyLQogUqPL6Tq1Bx x7cUTTSYa5+lfnk/enPBd1N90YkTL/GKb+rFrt6nRupb0ZYYicfNzd3LOhTiQnDGm6n4rP Z/hz0gQdKdVZ3ETs2cVDHtFMte+OL1QI+K32JqXNS+zglmWu40DM4RbAzMQAtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771719298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Osp90rMGdqa77eTX3z1VBvIHmWOX0ep1PT1w8GWEA6g=; b=ZdfGmCn0nG2TrIERn9bwHGB/8fFowJpQ2rxQ0EWdr7biaLqoufLPSXcVhwqPNpI4p6xNVZ 4Tb77v+uKDNBGA1hqNr6cW+80KzQ0CqXNzcWHfSuq7spqJHgHOcqEtEexbspWxWZJHettX lIuYx/KrLQ468j3P0/POH8P2Mg6VK20JrL3leP1t5UYDg3CtA9T6YMenRh+e0qwU51rRoO 4bHBNdzlND7hYZ0AJK5jhKZaB+H2rVNGjwWccDQeh8ojpRQIENmOEkIyLTB8G2jZoPB+wH Eu4Zy6njb7agatfmK1hxB+IJcD4h0YeC2aDo0KYry+qFKxgmQzMpdtpcdqwVZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJPcx6fFlz50N for ; Sun, 22 Feb 2026 00:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bcac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 00:14:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 456ae9820823 - main - ufs_disk_close.3: Correct include header macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 456ae9820823fcd078746318620925792f112c9a Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 00:14:57 +0000 Message-Id: <699a4a81.3bcac.3f9e5c@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=456ae9820823fcd078746318620925792f112c9a commit 456ae9820823fcd078746318620925792f112c9a Author: Alexander Ziaee AuthorDate: 2026-02-21 21:24:20 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-22 00:14:01 +0000 ufs_disk_close.3: Correct include header macro This manual used the library macro to mark up a header file, causing pollution in the apropos database for libraries, as well as omission from the apropos database for headers. This also renders differently, enclosing the header in angle brackets. MFC after: 3 days --- lib/libufs/ufs_disk_close.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libufs/ufs_disk_close.3 b/lib/libufs/ufs_disk_close.3 index f332a9bb5de9..04cae3965a81 100644 --- a/lib/libufs/ufs_disk_close.3 +++ b/lib/libufs/ufs_disk_close.3 @@ -56,7 +56,7 @@ The structure referenced by the pointer must be aligned to at least the alignment specified by .Dv LIBUFS_ALIGN that is defined in the -.Lb libufs.h +.In libufs.h header file. The disk is opened read-only. The specified From nobody Sun Feb 22 00:41:07 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJQC732rVz6SZq6 for ; Sun, 22 Feb 2026 00:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJQC72RGkz3sKV for ; Sun, 22 Feb 2026 00:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771720867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n5SNOmhN7mNfl1LydGDs5cLYvqBlajNvTNrVnCxkMG4=; b=BJEcOQXO/kSCoUXfaW+aOKs0FTu33jh1M6NV6BjmMv9Xsd+QlS1DEhPRx2vii9AQEu5jGD CA4pVwlFLz3e6Wkb7Rj2bT/6mdDhSjChoJLuvV39tIRWr7ws4+Fb3J4TgUeD5gVymqS0iu eMVto5T0rsxutHJEKn3JblkJceUwpK8AISAo3bQgdb0Up/pgwpgZlGpseYzxd4M1wb8Qm+ x6NDtvQFhUpBcKnydPES56TstZ5to4LIKPmMDJCindTucmnEMn8F4PUTHhLaiWuRiIIbri PNg6eKXS5/uNw5DRLiEhGsemBelEaaiKp1vzWVk+pXYH2SCaZR8Wv+QRZphpbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771720867; a=rsa-sha256; cv=none; b=eRImyPH9kWSHu93495JotTAfRxu/rtGwLvtQQBn5MKqK+GqJyHLwcz6o/GxYvXS4Tub+Pe giEfGe118OEU72P1D9Dxcfwum13db5zLqPGUEXCPTH0DFFU+D02/ZLO2ZDYAG8y9Vwr03P AOPiJLRQvSrgQoOt87xlSc4//drkwwXw4gQsLWt1FSpkCIZjFtdk0e2aZRr579P9mSl/pc QRuj8eCI1wq5MGw0NNUanQp6JRendA7J6eq9PeaANTOsXS067DYQ0SYqWbECkfgRxWWK7l +Ggy6iE8JEn1oR/iljqe6UIm9k9tBO7dN6te6k1nEWNFsmHJfHgUKAuM0Fh7hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771720867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n5SNOmhN7mNfl1LydGDs5cLYvqBlajNvTNrVnCxkMG4=; b=jSQCcgCtMKxp9QbXIrNdE8bOlMdBTE5W5c8CXbuBePlxFk1SmtcpmPny+cLh+dJ8uQrZCj 2sYTa5du7zYtt/MTZUDHMFIEwf2fZSQA/l7DzSiUPQXHR2K1fRFg3CULzehIUk51MtQqAJ g8+G0vGVA3VaJITihx4ynxOiUbTsdocNZpi3xsfofQ2GbTRZ+4PSTxsxwviSJFLXMsxo1I zrTM5ZppM+5qO9gNVhWhCvx6kNzIGSlxkAvKrK0hURlxbsk3iRxx18CYFE1o0g3E7ybQFw EKVJep2x10ylGnnvPosTC4pKzTP/DhdU1OJ43AcqGyK1CdzShlbKHdtKov2Nhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQC720lQz6Lt for ; Sun, 22 Feb 2026 00:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ec92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 00:41:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 6881fd278d80 - main - pkg-stage.sh: Add ext2 and ntfs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6881fd278d80ac63b4d511fc130a79ff16d1bb48 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 00:41:07 +0000 Message-Id: <699a50a3.3ec92.46cdf88b@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6881fd278d80ac63b4d511fc130a79ff16d1bb48 commit 6881fd278d80ac63b4d511fc130a79ff16d1bb48 Author: Colin Percival AuthorDate: 2026-02-22 00:38:01 +0000 Commit: Colin Percival CommitDate: 2026-02-22 00:41:02 +0000 pkg-stage.sh: Add ext2 and ntfs Having these packages available on release media may help users who need to sneakernet other packages (e.g. firmware) from systems running Linux or Windows. Suggested by: vladlen, ziaee MFC after: 3 days --- release/scripts/pkg-stage.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 5c4ec76150da..2f56cf794973 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -16,6 +16,8 @@ comms/usbmuxd devel/git@lite editors/emacs@nox editors/vim +filesystems/ext2 +filesystems/ntfs misc/freebsd-doc-all net/mpd5 net/rsync From nobody Sun Feb 22 01:55:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJRs56js8z6Sj38 for ; Sun, 22 Feb 2026 01:55: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 4fJRs52yFPz4658 for ; Sun, 22 Feb 2026 01:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771725337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NqyBP7sVS4/4jwpqN5F/OxlFEN8CdwD6b+xuXHRqwgc=; b=ZS4JvA5n/rpUl9/ACCnIQtgpB7DR0kP2y+5uuZsZvbeqSd9dbYIsLUnRzqojY/cpB9GbOF S3Kuqx6OO/HjV3P7ZlD7+VhgKXrSFmrpCYwu3fN9MfEMsKXjWVFjbvOmI++8rOc3ycsMHQ 9KGdZk5kw4KeVBOT5cjR1OwP6vjOdd9LxaRfp8B/NlaMmTr1KUE6ezwB+omVXOOP8Gp6Y1 v7mMgFdFA9druKScPccizRyksvxT1N2MU8QgdXyS+dU0q6k0YMUR0iG+cnrgsFlSdXxYmX T1fxZ41LKBk01vdLtJ+cVd2jF2EcMGqjBL2Ksli0aY2y/2Z4RoDJOGYlGzz4MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771725337; a=rsa-sha256; cv=none; b=k0PNLkonfXSeHJtTI7/mSi270mkQpn9CQWEuGYdtORr6s1fPuo/mFNSR2HDsiowBmAiCbn ziUpKsw9/0NJmDd8bwWLRd6XTfm4J5TCmTQSUFHKAAJBdohgEVYLI83KzeniTC3k4Fkr+z dMzx+D+6jbF18TlVM0YLdY2lC7zs1Bai6IVYjt9eYHtZeKJGKG882SAGNIG5oMytoGFQ09 RHiBxfx9NKZJsmCbetU9BWe+YFJcevz/S9Jv8HFxMrjusNH10dLWKNHYWRsORq9lqZFmwj lPauTc7Qxspqq6Twiy8L4Uf2MQkFzcYxDGOlW+CQUP+G0UMATemNnoYKe9G/tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771725337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NqyBP7sVS4/4jwpqN5F/OxlFEN8CdwD6b+xuXHRqwgc=; b=bShs0eLBrJydROLvatt3RGChVZklTEtUSxtDDwVXHSgUn7aJeH7cAfd6OaFAylzk/9oqZH f7nbp9jW5wyNrRulNHkTAn7JAPEYneRv5MYWfLRgUTZWGKHVLjleSdnlmVqfanzVeArpD8 lx9lKYNC7iYkDQniEfPTpLrbzack6yaCaRDNJoRx1KMZMfc7jf1yCfB5gf6sH1KsnrRWzv xp2egdIzyDGdS9MNwi05bMvOdAEvuAOadNSZaToQRhvNtOiM/zSDZndu+Fi+FQPAXgFbVh bLMzJuMeK1VZeGEF1z+na+Y0q5Jezi9pUHCAm2RrcV16oJti4jqUbhbIOrAF4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJRs50Wrsz8QZ for ; Sun, 22 Feb 2026 01:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43963 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:55:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9a44e42a2b8f - main - Retire GNU diff3 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a44e42a2b8f5f78695016344e760d72ad0b1220 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:55:36 +0000 Message-Id: <699a6218.43963.73261828@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9a44e42a2b8f5f78695016344e760d72ad0b1220 commit 9a44e42a2b8f5f78695016344e760d72ad0b1220 Author: Ed Maste AuthorDate: 2024-10-02 16:30:57 +0000 Commit: Ed Maste CommitDate: 2026-02-22 01:53:19 +0000 Retire GNU diff3 We added the option to build BSD diff3 in commit 2201f7c49f11 ("Build BSD diff3 if GNU diff3 is disabled.") and made it the default in 4d5c434ed16e ("diff3: use bsd diff3 by default") after resolving deficiencies relative to GNU diff3. Thus, we can now remove the GNU diff3 build infrastructure and source. Reviewed by: bapt, ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46878 --- contrib/diff/ABOUT-NLS | 768 ---- contrib/diff/AUTHORS | 112 - contrib/diff/COPYING | 340 -- contrib/diff/ChangeLog | 3878 ----------------- contrib/diff/FREEBSD-Xlist | 59 - contrib/diff/FREEBSD-upgrade | 5 - contrib/diff/NEWS | 244 -- contrib/diff/README | 69 - contrib/diff/THANKS | 22 - contrib/diff/TODO | 1 - contrib/diff/config.h | 573 --- contrib/diff/doc/diff.7 | 6287 --------------------------- contrib/diff/doc/diff.texi | 4653 -------------------- contrib/diff/doc/fdl.texi | 452 -- contrib/diff/doc/stamp-vti | 4 - contrib/diff/doc/version.texi | 4 - contrib/diff/lib/basename.c | 79 - contrib/diff/lib/c-stack.c | 311 -- contrib/diff/lib/c-stack.h | 19 - contrib/diff/lib/cmpbuf.c | 147 - contrib/diff/lib/cmpbuf.h | 21 - contrib/diff/lib/dirname.h | 43 - contrib/diff/lib/error.c | 310 -- contrib/diff/lib/error.h | 66 - contrib/diff/lib/exclude.c | 263 -- contrib/diff/lib/exclude.h | 43 - contrib/diff/lib/exit.h | 32 - contrib/diff/lib/exitfail.c | 27 - contrib/diff/lib/exitfail.h | 20 - contrib/diff/lib/file-type.c | 75 - contrib/diff/lib/file-type.h | 166 - contrib/diff/lib/gettext.h | 68 - contrib/diff/lib/gnulib.mk | 90 - contrib/diff/lib/hard-locale.c | 74 - contrib/diff/lib/hard-locale.h | 24 - contrib/diff/lib/inttostr.h | 47 - contrib/diff/lib/posixver.c | 59 - contrib/diff/lib/posixver.h | 1 - contrib/diff/lib/prepargs.c | 93 - contrib/diff/lib/prepargs.h | 3 - contrib/diff/lib/quotesys.c | 125 - contrib/diff/lib/quotesys.h | 9 - contrib/diff/lib/setmode.h | 27 - contrib/diff/lib/strcase.h | 35 - contrib/diff/lib/strftime.c | 1330 ------ contrib/diff/lib/strtoimax.c | 80 - contrib/diff/lib/strtoumax.c | 2 - contrib/diff/lib/unlocked-io.h | 132 - contrib/diff/lib/version-etc.c | 176 - contrib/diff/lib/version-etc.h | 37 - contrib/diff/lib/xalloc.h | 87 - contrib/diff/lib/xmalloc.c | 255 -- contrib/diff/lib/xstrtol.h | 91 - contrib/diff/man/cmp.1 | 63 - contrib/diff/man/diff.1 | 227 - contrib/diff/man/diff3.1 | 78 - contrib/diff/man/sdiff.1 | 90 - contrib/diff/src/analyze.c | 1038 ----- contrib/diff/src/cmp.c | 677 --- contrib/diff/src/context.c | 478 -- contrib/diff/src/diff.c | 1357 ------ contrib/diff/src/diff.h | 375 -- contrib/diff/src/diff3.c | 1743 -------- contrib/diff/src/dir.c | 288 -- contrib/diff/src/ed.c | 169 - contrib/diff/src/ifdef.c | 430 -- contrib/diff/src/io.c | 859 ---- contrib/diff/src/normal.c | 71 - contrib/diff/src/sdiff.c | 1226 ------ contrib/diff/src/side.c | 281 -- contrib/diff/src/system.h | 326 -- contrib/diff/src/util.c | 775 ---- gnu/usr.bin/Makefile | 1 - gnu/usr.bin/diff3/Makefile | 22 - gnu/usr.bin/diff3/Makefile.depend | 15 - release/packages/ucl/diff3-all.ucl | 15 - share/man/man5/src.conf.5 | 5 - share/mk/src.opts.mk | 1 - targets/pseudo/userland/gnu/Makefile.depend | 1 - tools/build/options/WITHOUT_GNU_DIFF | 5 - tools/build/options/WITH_GNU_DIFF | 4 - usr.bin/Makefile | 2 - 82 files changed, 32560 deletions(-) diff --git a/contrib/diff/ABOUT-NLS b/contrib/diff/ABOUT-NLS deleted file mode 100644 index 2f50c6693eff..000000000000 --- a/contrib/diff/ABOUT-NLS +++ /dev/null @@ -1,768 +0,0 @@ -Notes on the Free Translation Project -************************************* - -Free software is going international! The Free Translation Project is -a way to get maintainers of free software, translators, and users all -together, so that will gradually become able to speak many languages. -A few packages already provide translations for their messages. - - If you found this `ABOUT-NLS' file inside a distribution, you may -assume that the distributed package does use GNU `gettext' internally, -itself available at your nearest GNU archive site. But you do _not_ -need to install GNU `gettext' prior to configuring, installing or using -this package with messages translated. - - Installers will find here some useful hints. These notes also -explain how users should proceed for getting the programs to use the -available translations. They tell how people wanting to contribute and -work at translations should contact the appropriate team. - - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -Quick configuration advice -========================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -INSTALL Matters -=============== - -Some packages are "localizable" when properly installed; the programs -they contain can be made to speak your own native language. Most such -packages use GNU `gettext'. Other packages have their own ways to -internationalization, predating GNU `gettext'. - - By default, this package will be installed to allow translation of -messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the GNU `gettext' own -library will be used. This library is wholly contained within this -package, usually in the `intl/' subdirectory, so prior installation of -the GNU `gettext' package is _not_ required. Installers may use -special options at configuration time for changing the default -behaviour. The commands: - - ./configure --with-included-gettext - ./configure --disable-nls - -will respectively bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. - - When you already have GNU `gettext' installed on your system and run -configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might be not what is desirable. You -should use the more recent version of the GNU `gettext' library. I.e. -if the file `intl/VERSION' shows that the library which comes with this -package is more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. - - Internationalized packages have usually many `po/LL.po' files, where -LL gives an ISO 639 two-letter code identifying the language. Unless -translations have been forbidden at `configure' time by using the -`--disable-nls' switch, all available translations are installed -together with the package. However, the environment variable `LINGUAS' -may be set, prior to configuration, to limit the installed set. -`LINGUAS' should then contain a space separated list of two-letter -codes, stating which languages are allowed. - -Using This Package -================== - -As a user, if your language has been installed for this package, you -only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's -suppose that you speak German and live in Germany. At the shell -prompt, merely execute `setenv LANG de_DE' (in `csh'), -`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). -This can be done from your `.login' or `.profile' file, once and for -all. - - You might think that the country code specification is redundant. -But in fact, some languages have dialects in different countries. For -example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The -country code serves to distinguish the dialects. - - The locale naming convention of `LL_CC', with `LL' denoting the -language and `CC' denoting the country, is the one use on systems based -on GNU libc. On other systems, some variations of this scheme are -used, such as `LL' or `LL_CC.ENCODING'. You can get the list of -locales supported by your system for your country by running the command -`locale -a | grep '^LL''. - - Not all programs have translations for all languages. By default, an -English message is shown in place of a nonexistent translation. If you -understand other languages, you can set up a priority list of languages. -This is done through a different environment variable, called -`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' -for the purpose of message handling, but you still need to have `LANG' -set to the primary language; this is required by other parts of the -system libraries. For example, some Swedish users who would rather -read translations in German than English for when Swedish is not -available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. - - Special advice for Norwegian users: The language code for Norwegian -bokma*l changed from `no' to `nb' recently (in 2003). During the -transition period, while some message catalogs for this language are -installed under `nb' and some older ones under `no', it's recommended -for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and -older translations are used. - - In the `LANGUAGE' environment variable, but not in the `LANG' -environment variable, `LL_CC' combinations can be abbreviated as `LL' -to denote the language's main dialect. For example, `de' is equivalent -to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' -(Portuguese as spoken in Portugal) in this context. - -Translating Teams -================= - -For the Free Translation Project to be a success, we need interested -people who like their own language and write it well, and who are also -able to synergize with other translators speaking the same language. -Each translation team has its own mailing list. The up-to-date list of -teams can be found at the Free Translation Project's homepage, -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. - - If you'd like to volunteer to _work_ at translating messages, you -should become a member of the translating team for your own language. -The subscribing address is _not_ the same as the list itself, it has -`-request' appended. For example, speakers of Swedish can send a -message to `sv-request@li.org', having this message body: - - subscribe - - Keep in mind that team members are expected to participate -_actively_ in translations, or at solving translational difficulties, -rather than merely lurking around. If your team does not exist yet and -you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. - - The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skill are praised more than -programming skill, here. - -Available Packages -================== - -Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of January -2004. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a -translation percentage of at least 50%. - - Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es - +----------------------------------------------------+ - a2ps | [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | | - ap-utils | | - aspell | [] | - bash | [] [] [] [] | - batchelor | | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] | - bluez-pin | [] [] [] | - clisp | | - clisp | [] [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - darkstat | [] () [] | - diffutils | [] [] [] [] [] [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] () [] [] [] [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] [] [] | - flex | [] [] [] [] | - fslint | | - gas | [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] [] | - gettext | [] [] [] [] [] | - gettext-examples | [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] [] [] [] | - gliv | | - glunarclock | [] [] | - gnubiff | [] | - gnucash | [] () [] [] | - gnucash-glossary | [] () [] | - gnupg | [] () [] [] [] [] | - gpe-aerial | [] | - gpe-beam | [] [] | - gpe-calendar | [] [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | [] [] | - gpe-edit | [] | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] [] | - gprof | [] [] [] | - gpsdrive | () () () | - gramadoir | [] | - grep | [] [] [] [] [] [] | - gretl | [] | - gtick | [] () | - hello | [] [] [] [] [] [] | - id-utils | [] [] | - indent | [] [] [] [] | - iso_3166 | [] [] [] [] [] [] [] [] [] [] | - iso_3166_1 | [] [] [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] | - iso_4217 | [] [] [] [] | - iso_639 | | - jpilot | [] [] [] | - jtag | | - jwhois | [] | - kbd | [] [] [] [] [] | - latrine | () | - ld | [] [] | - libc | [] [] [] [] [] [] | - libgpewidget | [] [] | - libiconv | [] [] [] [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lingoteach_lessons | () () | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] | - man-db | [] () [] [] () | - minicom | [] [] [] | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] | - nano_1_0 | [] () [] [] [] | - opcodes | [] | - parted | [] [] [] [] [] | - ptx | [] [] [] [] [] | - python | | - radius | [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] | - sed | [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | | - sharutils | [] [] [] [] [] [] | - silky | () | - skencil | [] () [] | - sketch | [] () [] | - soundtracker | [] [] [] | - sp | [] | - tar | [] [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] [] | - tin | () () | - tp-robot | | - tuxpaint | [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] [] [] [] | - xchat | [] [] [] [] | - xfree86_xkb_xml | [] [] | - xpad | [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs da de el en en_GB eo es - 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68 - - et eu fa fi fr ga gl he hr hu id is it ja ko lg - +-------------------------------------------------+ - a2ps | [] [] [] () () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] | - aspell | [] [] | - bash | [] [] | - batchelor | [] [] | - bfd | [] | - binutils | [] [] | - bison | [] [] [] [] | - bluez-pin | [] [] [] [] [] | - clisp | | - clisp | [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] [] | - darkstat | () [] [] [] | - diffutils | [] [] [] [] [] [] [] | - e2fsprogs | | - enscript | [] [] | - error | [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext | [] [] [] | - gettext-examples | [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gliv | () | - glunarclock | [] [] [] [] | - gnubiff | [] | - gnucash | () [] | - gnucash-glossary | [] | - gnupg | [] [] [] [] [] [] [] | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] [] [] | - gpe-clock | [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] [] | - gpe-sketchbook | [] | - gpe-su | [] | - gpe-taskmanager | [] | - gpe-timesheet | [] [] [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] | - gprof | [] [] | - gpsdrive | () () () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] | - gtick | [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - indent | [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] [] | - iso_3166_1 | [] [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | | - iso_4217 | [] [] [] [] [] [] | - iso_639 | | - jpilot | [] () | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] | - latrine | [] | - ld | [] | - libc | [] [] [] [] [] [] | - libgpewidget | [] [] [] [] | - libiconv | [] [] [] [] [] [] [] [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] | - lingoteach_lessons | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | | - make | [] [] [] [] [] [] | - man-db | () () | - minicom | [] [] [] [] | - mysecretdiary | [] [] | - nano | [] [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] | - sharutils | [] [] [] [] [] | - silky | () [] () () | - skencil | [] | - sketch | [] | - soundtracker | [] [] | - sp | [] () | - tar | [] [] [] [] [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] [] [] [] | - tin | [] () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] () [] | - vorbis-tools | [] | - wastesedge | () | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] | - xchat | [] [] [] | - xfree86_xkb_xml | [] [] | - xpad | [] [] | - +-------------------------------------------------+ - et eu fa fi fr ga gl he hr hu id is it ja ko lg - 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0 - - lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru - +-----------------------------------------------------+ - a2ps | [] [] () () [] [] [] | - aegis | () () () | - ant-phone | [] [] | - anubis | [] [] [] [] [] [] | - ap-utils | [] () [] | - aspell | [] | - bash | [] [] [] | - batchelor | [] | - bfd | [] | - binutils | [] | - bison | [] [] [] [] [] | - bluez-pin | [] [] [] | - clisp | | - clisp | [] | - console-tools | [] | - coreutils | [] [] | - cpio | [] [] [] [] [] | - darkstat | [] [] [] [] | - diffutils | [] [] [] [] [] [] | - e2fsprogs | [] | - enscript | [] [] [] [] | - error | [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] | - flex | [] [] [] [] | - fslint | [] [] | - gas | | - gawk | [] [] [] | - gbiff | [] [] | - gcal | | - gcc | | - gettext | [] [] [] | - gettext-examples | [] [] [] | - gettext-runtime | [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] | - gliv | [] [] [] | - glunarclock | [] [] [] [] | - gnubiff | [] | - gnucash | [] [] () [] | - gnucash-glossary | [] [] | - gnupg | [] | - gpe-aerial | [] [] [] [] | - gpe-beam | [] [] [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] [] | - gpe-conf | [] [] [] [] | - gpe-contacts | [] [] [] [] | - gpe-edit | [] [] [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] [] | - gpe-ownerinfo | [] [] [] [] | - gpe-sketchbook | [] [] [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] | - gprof | [] [] | - gpsdrive | () () [] | - gramadoir | () [] | - grep | [] [] [] [] [] | - gretl | | - gtick | [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - indent | [] [] [] [] | - iso_3166 | [] [] [] | - iso_3166_1 | [] [] | - iso_3166_2 | | - iso_3166_3 | [] | - iso_4217 | [] [] [] [] [] [] [] [] | - iso_639 | [] | - jpilot | () () | - jtag | | - jwhois | [] [] [] [] () | - kbd | [] [] [] | - latrine | [] | - ld | | - libc | [] [] [] [] | - libgpewidget | [] [] [] | - libiconv | [] [] [] [] [] | - lifelines | | - lilypond | | - lingoteach | | - lingoteach_lessons | | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] | - make | [] [] [] [] | - man-db | [] | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] [] [] [] | - nano_1_0 | [] [] [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] [] | - ptx | [] [] [] [] [] [] [] [] | - python | | - radius | [] [] | - recode | [] [] [] [] | - rpm | [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] | - sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] | - sharutils | [] [] | - silky | () | - skencil | [] [] | - sketch | [] [] | - soundtracker | | - sp | | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] | - vorbis-tools | [] [] [] | - wastesedge | | - wdiff | [] [] [] [] [] | - wget | [] [] [] | - xchat | [] [] [] | - xfree86_xkb_xml | [] [] | - xpad | [] [] | - +-----------------------------------------------------+ - lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru - 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63 - - sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu - +-----------------------------------------------------+ - a2ps | [] [] [] [] | 16 - aegis | | 0 - ant-phone | | 3 - anubis | [] [] | 9 - ap-utils | () | 3 - aspell | | 4 - bash | | 9 - batchelor | | 3 - bfd | [] [] | 6 - binutils | [] [] [] | 8 - bison | [] [] | 14 - bluez-pin | [] [] [] | 14 - clisp | | 0 - clisp | | 5 - console-tools | | 3 - coreutils | [] [] [] [] | 16 - cpio | [] [] | 14 - darkstat | [] [] [] () () | 12 - diffutils | [] [] [] | 23 - e2fsprogs | [] [] | 6 - enscript | [] [] | 12 - error | [] [] [] | 15 - fetchmail | [] [] | 11 - fileutils | [] [] [] [] [] | 17 - findutils | [] [] [] [] [] [] | 29 - flex | [] [] | 13 - fslint | | 3 - gas | [] | 3 - gawk | [] [] | 12 - gbiff | | 4 - gcal | [] [] | 4 - gcc | [] | 4 - gettext | [] [] [] [] [] | 16 - gettext-examples | [] [] [] [] [] | 14 - gettext-runtime | [] [] [] [] [] [] [] [] | 22 - gettext-tools | [] [] [] [] [] [] | 14 - gimp-print | [] [] | 10 - gliv | | 3 - glunarclock | [] [] [] | 13 - gnubiff | | 3 - gnucash | [] [] | 9 - gnucash-glossary | [] [] [] | 8 - gnupg | [] [] [] [] | 17 - gpe-aerial | [] | 7 - gpe-beam | [] | 8 - gpe-calendar | [] [] [] [] | 13 - gpe-clock | [] [] [] | 10 - gpe-conf | [] [] | 9 - gpe-contacts | [] [] [] | 11 - gpe-edit | [] [] [] [] [] | 12 - gpe-go | | 5 - gpe-login | [] [] [] [] [] | 13 - gpe-ownerinfo | [] [] [] [] | 13 - gpe-sketchbook | [] [] | 9 - gpe-su | [] [] [] | 10 - gpe-taskmanager | [] [] [] | 10 - gpe-timesheet | [] [] [] [] | 12 - gpe-today | [] [] [] [] [] | 13 - gpe-todo | [] [] [] [] | 12 - gphoto2 | [] [] [] | 11 - gprof | [] [] | 9 - gpsdrive | [] [] | 3 - gramadoir | [] | 5 - grep | [] [] [] [] | 26 - gretl | | 3 - gtick | | 7 - hello | [] [] [] [] [] | 34 - id-utils | [] [] | 12 - indent | [] [] [] [] | 21 - iso_3166 | [] [] [] [] [] [] [] | 27 - iso_3166_1 | [] [] [] | 16 - iso_3166_2 | | 0 - iso_3166_3 | | 2 - iso_4217 | [] [] [] [] [] [] | 24 - iso_639 | | 1 - jpilot | [] [] [] [] [] | 9 - jtag | [] | 2 - jwhois | () [] [] | 11 - kbd | [] [] | 11 - latrine | | 2 - ld | [] [] | 5 - libc | [] [] [] [] | 20 - libgpewidget | [] [] [] [] | 13 - libiconv | [] [] [] [] [] [] [] [] | 27 - lifelines | [] | 2 - lilypond | [] | 3 - lingoteach | | 2 - lingoteach_lessons | () | 0 - lynx | [] [] [] | 14 - m4 | [] [] | 15 - mailutils | | 5 - make | [] [] [] | 16 - man-db | [] | 5 - minicom | | 11 - mysecretdiary | [] [] | 10 - nano | [] [] [] [] | 17 - nano_1_0 | [] [] [] | 17 - opcodes | [] [] | 6 - parted | [] [] [] | 15 - ptx | [] [] | 22 - python | | 0 - radius | | 4 - recode | [] [] [] | 20 - rpm | [] [] | 9 - screem | [] [] | 2 - scrollkeeper | [] [] [] | 15 - sed | [] [] [] [] [] [] | 24 - sh-utils | [] [] | 14 - shared-mime-info | [] [] | 7 - sharutils | [] [] [] [] | 17 - silky | () | 3 - skencil | [] | 6 - sketch | [] | 6 - soundtracker | [] [] | 7 - sp | [] | 3 - tar | [] [] [] [] [] | 24 - texinfo | [] [] [] | 14 - textutils | [] [] [] [] | 16 - tin | | 1 - tp-robot | | 2 - tuxpaint | [] [] [] [] [] | 29 - unicode-han-tra... | | 0 - unicode-transla... | | 2 - util-linux | [] [] | 15 - vorbis-tools | | 8 - wastesedge | | 0 - wdiff | [] [] [] | 18 - wget | [] [] [] [] [] [] [] [] | 24 - xchat | [] [] [] [] [] | 15 - xfree86_xkb_xml | [] [] [] [] [] | 11 - xpad | | 5 - +-----------------------------------------------------+ - 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu - 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373 - - Some counters in the preceding matrix are higher than the number of -visible blocks let us expect. This is because a few extra PO files are -used for implementing regional variants of languages, or language -dialects. - - For a PO file in the matrix above to be effective, the package to -which it applies should also have been internationalized and -distributed as such by its maintainer. There might be an observable -lag between the mere existence a PO file and its wide availability in a -distribution. - - If January 2004 seems to be old, you may fetch a more recent copy of -this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date -matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. - -Using `gettext' in new packages -=============================== - -If you are writing a freely available program and want to -internationalize it you are welcome to use GNU `gettext' in your -package. Of course you have to respect the GNU Library General Public -License which covers the use of the GNU `gettext' library. This means -in particular that even non-free programs can use `libintl' as a shared -library, whereas only free software can use `libintl' as a static -library or use modified versions of `libintl'. - - Once the sources are changed appropriately and the setup can handle -the use of `gettext' the only thing missing are the translations. The -Free Translation Project is also available for packages which are not -developed inside the GNU project. Therefore the information given above -applies also for every other Free Software Project. Contact -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. - diff --git a/contrib/diff/AUTHORS b/contrib/diff/AUTHORS deleted file mode 100644 index f5f0e90b3238..000000000000 --- a/contrib/diff/AUTHORS +++ /dev/null @@ -1,112 +0,0 @@ -Authors of GNU diffutils. - - Copyright 2001 Free Software Foundation, Inc. - - This file is part of GNU diffutils. - - GNU diffutils is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - GNU diffutils is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNU diffutils; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - -The following contributions warranted legal paper exchanges with the -Free Software Foundation. Also see files ChangeLog and THANKS. - -DIFFUTILS Leonard H. Tower Jr. US 1949 1987-03-09 -Assigns diff (diff.c, initial version). - -DIFFUTILS Torbjorn Granlund Sweden 1961 1988-01-11 -Assigns cmp. -tege@matematik.su.se - -DIFFUTILS Mike Haertel US 1967 1988-09-16 -Assigns changes to diff. - -DIFFUTILS David S. Hayes US ? 1988-01-12 -Assigns changes to diff. - -DIFFUTILS Randall Smith US 1964 1988-09-21 -Assigns diff3. - -DIFFUTILS Richard Stallman US 1953 1988-01-15 -Assigns changes to GNU Diff. - -DIFFUTILS F. Thomas May US 1965 1989-08-22 -Assigns changes to diff (for -D). - -DIFFUTILS Optimal Solutions, Inc. 1989-08-14 -Disclaims changes by Thomas May to diff. - -DIFFUTILS Wayne Davison 1990-09-10 -Disclaims changes to diff. - -DIFFUTILS Digital Research Inc. 1990-09-13 -Disclaims changes by Wayne Davison to diff. - -DIFFUTILS Paul Eggert 1990-03-16 -Disclaims changes to diff. -eggert@twinsun.com - -DIFFUTILS Paul Eggert 1990-08-14 -Disclaims changes to GNU Diff. -eggert@twinsun.com - -DIFFUTILS Twin Sun Inc. 1990-03-16 -Disclaims changes to GNU Diff by Paul Eggert. - -DIFFUTILS Twin Sun Inc. 1990-08-14 -Disclaims changes to GNU Diff by Paul Eggert. - -DIFFUTILS Chip Rosenthal US 1959 1990-03-06 -Assigns changes to diff. -chip@chinacat.Unicom.COM - -DIFFUTILS Unicom Systems Development 1990-03-06 -Disclaims changes by Chip Rosenthal to diff. - -GCC DIFFUTILS Paul Eggert and Twin Sun Inc. 1992-03-11 -Disclaims changes by Paul Eggert to gcc and diff. -eggert@twinsun.com - -DIFF Wayne Davison 1993-06-20 -Disclaims diffcvt.c. - -DIFFUTILS Francois Pinard Canada 1949 1993-01-15 -Assigns wdiff and future changes submitted to the FSF. -pinard@iro.umontreal.ca - -DIFFUTILS Patrick D'Cruze Australia 1971 1994-11-10 -Assigns changes (makefile.in, analyze.c, cmp.c, error.c, diff.c, -diff3.c, getopt.c, getopt1.c, regex.c, sdiff.c, util.c, xmalloc.c; -new file: language.++) - -DIFFUTILS Paul R. Eggert US 1954 1997-04-07 -Assigns past and future changes. -eggert@twinsun.com - -DIFFUTILS Paul R. Eggert US 1954 1997-04-07 -Assigns past and future changes to manual. -eggert@twinsun.com - -ANY DIFFUTILS GNATS Cyclic Software 1997-11-11 *** 32197 LINES SKIPPED *** From nobody Sun Feb 22 02:00:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJRyN0rtWz6SjKB for ; Sun, 22 Feb 2026 02:00: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 4fJRyN04YZz46Nv for ; Sun, 22 Feb 2026 02:00:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771725612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nORMdHbyPkoJ+PefmhYlO6/3UIky+d47XjBFalRDVMs=; b=EYrKLP4FMw/kDYG06NNgpcFWxi9VjgpynyHiJ2WxIraYxTBSBx2PMCZc3bsrcXJG56ocH7 qH4Kvig/5IaDeyjbu8p82hOPNyjdcifYkGTr7yZLv/8Ux3uzgV6RxI5m6MYN67jjFklo+E hKikSBsenYTXCO1H8j58yqKfOazh7K/gbLXUW5gMyrdqcGeJDK7nRW7b4tVqlDpS01KEoS t3t47MlJSP7oMNa31n9x553T82yOHxExMZI2qetNBrr9ikbXrIMwCZdnGTgPhNNd/8wZ2C BbnL1+dGk8kQAff3w7n/GY1Eyk5eoy3a8ggcDHQvmUAIfYqEp+l3zegkbCwaDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771725612; a=rsa-sha256; cv=none; b=tdkBfvyukCnFrLoxVfJMtAiaVcQkuYjiT88ZwyZ2e8zwxUBR0B8/Ah2B18R6e1DZ/j3T1V 6o4Qvpc1vBJq8PLSiWQcLNVrg5H/OF1foQj/VdYYy8E/lWwdGBf6M8MAv528u66DuJ9MJ/ 3TB2BbMuzdLwDJ7jSo2Db1ZnX6dozrWOEMFrZ6GW/JVx4AJM9rff5FDKq9JTF2m83sJCLr U8PxsX2tG1yAapyq92xUiGMuGTYA7bDJuGse0Fkn/v6vABMVrMFAqr11rAJLcKGYIsTQ3i 6vZyuQql2ciuUcQkXOR0PT2A89Yej/I+6p4V25teIYAsApM4s11sNjgNlazlVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771725612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nORMdHbyPkoJ+PefmhYlO6/3UIky+d47XjBFalRDVMs=; b=hLq+8MHmQ86B6NK+c019KbN37HBSmGFriSc1Fz3ifqkM4A1jNqCpICpShQT/hmw4chb7M1 mjN557vArKLG4fGJ4TB7AocWyQa3pGlArF7dRCP5uLajACdzi2/flQj79go2shT4ZDxh4b 255hAzWSCmEBvfQe4Hmm3Lbopxs0/0Z+rStolm0X2mEqzl/XU97ExX0XgaZohaju+HgpU7 e8SvXfBeFJFiifKlOcHzWAtJOTWMyJllJG9OYnkrhfgl3lZ0Nk74/MIAKI4U5KWdDyIU6N 2BtdWB4FBytgMGFBYayzPMFkul/GSDNOyzB+oSR5ZRubqpiDIouB01ZvFVA1lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJRyM6TtMz8VC for ; Sun, 22 Feb 2026 02:00:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4690e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 02:00:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: eda36ae09dd1 - main - asmc: resource cleanup simplifications List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eda36ae09dd1fab78bd377739fc5d6c65c61f5d7 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 02:00:11 +0000 Message-Id: <699a632b.4690e.2fab15e8@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=eda36ae09dd1fab78bd377739fc5d6c65c61f5d7 commit eda36ae09dd1fab78bd377739fc5d6c65c61f5d7 Author: Enji Cooper AuthorDate: 2026-01-30 06:55:08 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 01:59:06 +0000 asmc: resource cleanup simplifications This change makes `asmc_detach(..)` reentrant by setting freed resources to known invalid values when done, and makes `asmc_attach(..)` call `asmc_detach(..)` instead of attempting to the semi-equivalent way of cleaning up the driver resources allocated in `asmc_detach(..)`. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55413 --- sys/dev/asmc/asmc.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index bff214c084c5..084b57331dd9 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -795,25 +795,21 @@ asmc_attach(device_t dev) if (sc->sc_irq == NULL) { device_printf(dev, "unable to allocate IRQ resource\n"); ret = ENXIO; - goto err2; + goto err; } ret = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC | INTR_MPSAFE, asmc_sms_intrfast, NULL, dev, &sc->sc_cookie); if (ret) { device_printf(dev, "unable to setup SMS IRQ\n"); - goto err1; + goto err; } + nosms: return (0); -err1: - bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid_irq, sc->sc_irq); -err2: - bus_release_resource(dev, SYS_RES_IOPORT, sc->sc_rid_port, - sc->sc_ioport); - mtx_destroy(&sc->sc_mtx); - if (sc->sc_sms_tq) - taskqueue_free(sc->sc_sms_tq); + +err: + asmc_detach(dev); return (ret); } @@ -826,16 +822,25 @@ asmc_detach(device_t dev) if (sc->sc_sms_tq) { taskqueue_drain(sc->sc_sms_tq, &sc->sc_sms_task); taskqueue_free(sc->sc_sms_tq); + sc->sc_sms_tq = NULL; } - if (sc->sc_cookie) + if (sc->sc_cookie) { bus_teardown_intr(dev, sc->sc_irq, sc->sc_cookie); - if (sc->sc_irq) + sc->sc_cookie = NULL; + } + if (sc->sc_irq) { bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid_irq, sc->sc_irq); - if (sc->sc_ioport) + sc->sc_irq = NULL; + } + if (sc->sc_ioport) { bus_release_resource(dev, SYS_RES_IOPORT, sc->sc_rid_port, sc->sc_ioport); - mtx_destroy(&sc->sc_mtx); + sc->sc_ioport = NULL; + } + if (mtx_initialized(&sc->sc_mtx)) { + mtx_destroy(&sc->sc_mtx); + } return (0); } From nobody Sun Feb 22 02:25:43 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJSWw6G1gz6SlNX for ; Sun, 22 Feb 2026 02:25: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 4fJSWw3kMFz3CmW for ; Sun, 22 Feb 2026 02:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771727148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUNKAyPb7gGBEVkg1eJB3TbP+byNV3C64kwC7BPK/vA=; b=JXC1/20L3hxc3OncVAJ8vYpuX0DEiselXKlHfd1YET7YJw5Vq87Vly3i84rJzNLsHcuKha GPVdSIBzJVhFOlMMXsAUKDOg0BWGyKSqRTeoMy4XRdy0ceE1UiKL+paC9nULCzY/vr4CMT xvOwfL41mJ66uRB5EyXW1ycV49Pg0AGAhpefYo1yN82UzDjUNqEYzaALxiFW79/3y6LndY 4sai9CC6IFcPKhWJ7B1m4XcfLsXxRQEnxX2wYn4iNuVBY2jnY4ajkwxfl9L5qGsmRndukw bU82fVd+Q5XrUb+32cycB4eDC8E7ePqXeSe6dkyucj7negI4PMq4iMZOe1Rvew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771727148; a=rsa-sha256; cv=none; b=Vh5V9q/IRJ1twfBob/4v10AVTUTcsIVSkZ1dGQdk09t0X0zcA/l0EdsVFXqmiqFhV1gCv9 ZZeugsutsP6JfnzlBEZ9+8e8fl8Z0sJ1rIT+wZmmsP/n7GsNs5lZ+ZZWei1N02tNr2PocB /r7q0uphuyHjqvS5CnnWF7uDSXtrKu7cxdGu4m49YG2r/q12XCQN+3EMb3cv268OjOIlot yrD86ve0+Xa49XrosL7ML6xbeI0H6poN+WeqxA4ir01cz4k1LnrZ6ST0s410txeCr8ToZH S/ZQN9v6kNktnTvp7KzcfV8GL1Ed6Y0P3kyyM+aeqU85Drf98BTGL+nY4N3KYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771727148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUNKAyPb7gGBEVkg1eJB3TbP+byNV3C64kwC7BPK/vA=; b=C3F5VrRnfD1Sh6SJfrNGBn20l4vcg8Dgq8H4abfWKAAW2kUlc7yireXJotS+dTWq3FPuFt bISDJGXMgPUuu/+cnRzZFtmfUAWr3dNYtAUoYw62AjePiStOnyUgmArP5NixPqB2uSZnVJ UVWHvqYUzaAqo78zn9ekB4uvehbBj5EtgJopui1MeLnnT/2Yim9F9YWsvVNNdbEMCUPU7Y VCGZ0JBM+7Kb601oWjycO5PMG0V/Nsql1hLpywL+8NyG81EtQhmWLK5dLLAGvLNGcck39g 3ttonNBTjT8XYOjll2euxS1u87PUwfr7j/Wchi9eMBylhmPVKzhHt1UALCZ/pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJSWq3JWgz8m3 for ; Sun, 22 Feb 2026 02:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1906d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 02:25:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 19a18bb750e8 - main - powerpc64: initial conversion of oea64 to rwlocks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19a18bb750e8ed88207664b4959e433b7e68e926 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 02:25:43 +0000 Message-Id: <699a6927.1906d.2beeb7b0@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=19a18bb750e8ed88207664b4959e433b7e68e926 commit 19a18bb750e8ed88207664b4959e433b7e68e926 Author: Adrian Chadd AuthorDate: 2026-02-22 02:22:46 +0000 Commit: Adrian Chadd CommitDate: 2026-02-22 02:22:46 +0000 powerpc64: initial conversion of oea64 to rwlocks Convert the oea64 mmu code to rwlocks. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D54936 --- sys/powerpc/aim/mmu_oea64.c | 50 +++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 7dfda5776a37..22442c59fd30 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -123,7 +123,7 @@ uintptr_t moea64_get_unique_vsid(void); */ #define PV_LOCK_COUNT MAXCPU -static struct mtx_padalign pv_lock[PV_LOCK_COUNT]; +static struct rwlock __exclusive_cache_line pv_lock[PV_LOCK_COUNT]; #define PV_LOCK_SHIFT HPT_SP_SHIFT #define pa_index(pa) ((pa) >> PV_LOCK_SHIFT) @@ -138,11 +138,17 @@ static struct mtx_padalign pv_lock[PV_LOCK_COUNT]; #else #define PV_LOCK_IDX(pa) (pa_index(pa) % PV_LOCK_COUNT) #endif -#define PV_LOCKPTR(pa) ((struct mtx *)(&pv_lock[PV_LOCK_IDX(pa)])) -#define PV_LOCK(pa) mtx_lock(PV_LOCKPTR(pa)) -#define PV_UNLOCK(pa) mtx_unlock(PV_LOCKPTR(pa)) -#define PV_LOCKASSERT(pa) mtx_assert(PV_LOCKPTR(pa), MA_OWNED) -#define PV_PAGE_LOCK(m) PV_LOCK(VM_PAGE_TO_PHYS(m)) +#define PV_LOCKPTR(pa) ((struct rwlock *)(&pv_lock[PV_LOCK_IDX(pa)])) + +#define PV_WR_LOCK(pa) rw_wlock(PV_LOCKPTR(pa)) +#define PV_RD_LOCK(pa) rw_rlock(PV_LOCKPTR(pa)) +#define PV_UNLOCK(pa) rw_unlock(PV_LOCKPTR(pa)) +#define PV_LOCKASSERT(pa) rw_assert(PV_LOCKPTR(pa), RA_LOCKED) +#define PV_LOCK_RD_ASSERT(pa) rw_assert(PV_LOCKPTR(pa), RA_RLOCKED) +#define PV_LOCK_WR_ASSERT(pa) rw_assert(PV_LOCKPTR(pa), RA_WLOCKED) + +#define PV_PAGE_WR_LOCK(m) PV_WR_LOCK(VM_PAGE_TO_PHYS(m)) +#define PV_PAGE_RD_LOCK(m) PV_RD_LOCK(VM_PAGE_TO_PHYS(m)) #define PV_PAGE_UNLOCK(m) PV_UNLOCK(VM_PAGE_TO_PHYS(m)) #define PV_PAGE_LOCKASSERT(m) PV_LOCKASSERT(VM_PAGE_TO_PHYS(m)) @@ -500,7 +506,7 @@ static struct pvo_head * vm_page_to_pvoh(vm_page_t m) { - mtx_assert(PV_LOCKPTR(VM_PAGE_TO_PHYS(m)), MA_OWNED); + rw_assert(PV_LOCKPTR(VM_PAGE_TO_PHYS(m)), RA_LOCKED); return (&m->md.mdpg_pvoh); } @@ -1028,7 +1034,7 @@ moea64_mid_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) */ mtx_init(&moea64_slb_mutex, "SLB table", NULL, MTX_DEF); for (i = 0; i < PV_LOCK_COUNT; i++) - mtx_init(&pv_lock[i], "page pv", NULL, MTX_DEF); + rw_init(&pv_lock[i], "pv lock"); /* * Initialise the bootstrap pvo pool. @@ -1644,7 +1650,7 @@ moea64_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, pvo->pvo_vaddr |= PVO_MANAGED; } - PV_LOCK(pa); + PV_WR_LOCK(pa); PMAP_LOCK(pmap); if (pvo->pvo_pmap == NULL) init_pvo_entry(pvo, pmap, va); @@ -2023,7 +2029,7 @@ moea64_remove_write(vm_page_t m) return; powerpc_sync(); - PV_PAGE_LOCK(m); + PV_PAGE_WR_LOCK(m); refchg = 0; LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { pmap = pvo->pvo_pmap; @@ -2096,7 +2102,7 @@ moea64_page_set_memattr(vm_page_t m, vm_memattr_t ma) lo = moea64_calc_wimg(VM_PAGE_TO_PHYS(m), ma); - PV_PAGE_LOCK(m); + PV_PAGE_WR_LOCK(m); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { pmap = pvo->pvo_pmap; PMAP_LOCK(pmap); @@ -2355,7 +2361,7 @@ moea64_page_exists_quick(pmap_t pmap, vm_page_t m) ("moea64_page_exists_quick: page %p is not managed", m)); loops = 0; rv = false; - PV_PAGE_LOCK(m); + PV_PAGE_RD_LOCK(m); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { if (!(pvo->pvo_vaddr & PVO_DEAD) && pvo->pvo_pmap == pmap) { rv = true; @@ -2390,7 +2396,7 @@ moea64_page_wired_mappings(vm_page_t m) count = 0; if ((m->oflags & VPO_UNMANAGED) != 0) return (count); - PV_PAGE_LOCK(m); + PV_PAGE_RD_LOCK(m); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) if ((pvo->pvo_vaddr & (PVO_DEAD | PVO_WIRED)) == PVO_WIRED) count++; @@ -2760,7 +2766,7 @@ moea64_remove_all(vm_page_t m) LIST_INIT(&freequeue); - PV_PAGE_LOCK(m); + PV_PAGE_WR_LOCK(m); LIST_FOREACH_SAFE(pvo, vm_page_to_pvoh(m), pvo_vlink, next_pvo) { pmap = pvo->pvo_pmap; PMAP_LOCK(pmap); @@ -2983,7 +2989,7 @@ moea64_pvo_remove_from_page(struct pvo_entry *pvo) if (pvo->pvo_vaddr & PVO_MANAGED) pg = PHYS_TO_VM_PAGE(PVO_PADDR(pvo)); - PV_LOCK(PVO_PADDR(pvo)); + PV_WR_LOCK(PVO_PADDR(pvo)); moea64_pvo_remove_from_page_locked(pvo, pg); PV_UNLOCK(PVO_PADDR(pvo)); } @@ -3024,7 +3030,7 @@ moea64_query_bit(vm_page_t m, uint64_t ptebit) */ rv = false; powerpc_sync(); - PV_PAGE_LOCK(m); + PV_PAGE_RD_LOCK(m); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { if (PVO_IS_SP(pvo)) { ret = moea64_sp_query(pvo, ptebit); @@ -3084,7 +3090,7 @@ moea64_clear_bit(vm_page_t m, u_int64_t ptebit) * For each pvo entry, clear the pte's ptebit. */ count = 0; - PV_PAGE_LOCK(m); + PV_PAGE_WR_LOCK(m); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { if (PVO_IS_SP(pvo)) { if ((ret = moea64_sp_clear(pvo, m, ptebit)) != -1) { @@ -3690,7 +3696,7 @@ moea64_sp_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, } } - PV_LOCK(spa); + PV_WR_LOCK(spa); PMAP_LOCK(pmap); /* Note: moea64_remove_locked() also clears cached REF/CHG bits. */ @@ -4094,6 +4100,8 @@ moea64_sp_query_locked(struct pvo_entry *pvo, uint64_t ptebit) pmap_t pmap; struct pvo_entry *sp; + PV_LOCKASSERT(PVO_PADDR(pvo)); + pmap = pvo->pvo_pmap; PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -4126,12 +4134,18 @@ moea64_sp_query_locked(struct pvo_entry *pvo, uint64_t ptebit) return (refchg); } +/* + * Note: this assumes the vm_page represented by the given pvo + * is at least read locked. + */ static int64_t moea64_sp_query(struct pvo_entry *pvo, uint64_t ptebit) { int64_t refchg; pmap_t pmap; + PV_LOCKASSERT(PVO_PADDR(pvo)); + pmap = pvo->pvo_pmap; PMAP_LOCK(pmap); From nobody Sun Feb 22 03:00:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJTHg5hGCz6SnXC for ; Sun, 22 Feb 2026 03:00: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 4fJTHg2WdTz3FqT for ; Sun, 22 Feb 2026 03:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771729215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QbAxR8dkV3/Kv9L0noRRI1dlFHylENRu+Ex6RF89RXY=; b=MctkMWkW5MqwLdQrbkdRUam4FQlOj9j0CrBubTTbNYdunWJFQToFKg8S3Dn5FoUS9Kwznw xdXN884DYTUlm26ut5jmpQ0gmg6V8UeYrwrsLO5vbCQa36arDb+sptRsH0kjf4L2LLRFhf fGCH4pmwWLPUs0XAct2JlvfIm/RbBSnrx+7nC8CpXkLhGjfLvZnPqXaL+NaLoLHiyPvVZG vgdaCaeIK63toEwYtlwW++fa79J6r6Syb7UUaxymYy/lrT1DbWti0jRBuUFkJJFH5IsCb/ gFxCOGnf8X9ollcarFwQfmvEvoEZsUlUjHKyFbUMw+0mUFixs6kflAlPMxTfrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771729215; a=rsa-sha256; cv=none; b=OeumVMqP9F9pXuImMwt1miGbz3hiJigCjugXogdu1eaxQhmcmPN4FJ+CcYYVU5BQ7mGtpa 63hyE4Itz+5aReWKQhg1o3er/DV86c9dIBqSnpZQs6zzZmSlsTdA9SCehqiAugH/rNPbbP I819Ne33LX9qIroZqXFIR17zEZ/Xv7aHNdDf7sUlyQqfBmddvXUDIvYW7oyOhJJtqFvEDR B4gv/wZA0IxbZ9y39HFw14UiB6SEax0oJDMu+WpnUS3Cb4/GFzHQsI+ZmnMwZKOwR6GN5m u8ZQsQqOZ9YZ4L7yQ7r46MZgtHA9BAQU4MfQe9LucVICPH7Ks7NYv3qvyjc8HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771729215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QbAxR8dkV3/Kv9L0noRRI1dlFHylENRu+Ex6RF89RXY=; b=rEaT1alrFV1x3GdPLvC6UE6BKppIXWyPYnY+XWfVgueFLZMVK9qxjoL+7ck+wqntewVDAL vnHAf8guF/7p70IM9Sr139GSlAU+9KpIoqRvhgWKYj2wXAd+8KzQlIz1YCYiJDy/c+u/us f4EBdQJ0B1dpcm6BgYS69H5YsR0IXya2tAfcRYJJlPuCnEJ8+KS0FeeIXTXTym/VA4Hg/S Mw+bXaGULVvVFBLGItZhV2EEg++/1eZUsi6JAlnsMtu4aYelwaSbWzw1wf+VlCxKODH/eq IwAmnJV2JA+ExI6gIp9zOjIOXJJ7PilurOwxHmCe675vomhUXDkL7gfBWCRUOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJTHg26M7z9rT for ; Sun, 22 Feb 2026 03:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c7b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:00:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 4544f34f2d30 - main - .gitignore: ignore additional unwanted files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4544f34f2d30ee63ab1eec9fa52c31bd92d457ca Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:00:15 +0000 Message-Id: <699a713f.1c7b3.81402c1@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=4544f34f2d30ee63ab1eec9fa52c31bd92d457ca commit 4544f34f2d30ee63ab1eec9fa52c31bd92d457ca Author: Enji Cooper AuthorDate: 2026-02-04 07:39:03 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:00:06 +0000 .gitignore: ignore additional unwanted files Ignore more files generated by toolchains, e.g., `.pico`, etc. Ignore the `.DS_Store` produced by macOS as well because all they provide is additional file metadata that shouldn't be committed to `git`. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55096 --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index a53a26f16d4f..91a9252d80f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,17 @@ *.a *.core +*.lo +*.nossppico *.o *.orig +*.pico +*.pieo +*.po +# Don't ignore translation files under `contrib/...`. +!contrib/**/po *.rej *.so +*.so.[0-9]* *.sw[nop] *~ _.tinderbox.* @@ -14,6 +22,8 @@ _.arm64.* _.i386.* _.powerpc.* _.riscv.* +.*DS_Store +.depend* GPATH GRTAGS GTAGS From nobody Sun Feb 22 03:29:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJTxr3GXvz6Sqkb for ; Sun, 22 Feb 2026 03:29: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 4fJTxr2Xywz3JSC for ; Sun, 22 Feb 2026 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771730992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VtoH8aqXUJ8yLvfmcyE4BOXVHjA8jZJqVWWVKTOejMc=; b=Ab2cScgs5En/a6jzwtYylrlssEMockFQ/GQ8+p23xDxkeO4DGcEARMMrAjxrtw+6ZrqfyI bOgQaKJaiKWERhlky5I/RW2CtI70Idy2zPi3avNX4H1tjC/RMtbukdS0OwOVT50AfsCFvn wXtVgNtEMvRmidvCaqxTZF4pCl76rTe/TjFYhjT78tJUjiOGqoRqlZzMUzx1XRxs9xp6hl jBBI+sTLVhNTHj6yuzcl/uZvEkoQ3GGKosQvx6gLrDpGF9BTyQbhCoIwcE+9y6vE5kCUo4 u6Jmo3hjod6OkixjfOqQ3qvvpXI7lZuZvzDkThoealUrDZlIE9JfmxsIUeptcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771730992; a=rsa-sha256; cv=none; b=svF1j9rNRxHKaEsac36DgP9eakzLtjwXo6ArilJwRb95QFr7v68qPZYywwsk/IE/escrqn czckXNbFYaMLj75GrbsXab6xn1mSQW0vr/zfFc06rV8W3kug+e1nbzaPomZkvOrbcVrwpt 7BjlXBnTjbGnTbAj0dup/J5gmbSXPnPZ57Cir1Y05LlKadUXqOiuevIv0WOxb70aoZN0Vp pJAg+KVSkRZ8XS32DrC1+k6DCQ6PjkLjJhcrkSQaoFpIeQzkdqyyl5pPuTwkgWr3D6u0Uz KJsh9lpzQs0Jam8UtJrcdAy8ayTgwFi91vhOmQXNEJjV+GihhV9YiEzm/ujxOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771730992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VtoH8aqXUJ8yLvfmcyE4BOXVHjA8jZJqVWWVKTOejMc=; b=LugAw5jIDHzXT0pWFFzQYkjQ2k8+FFK+zgiMB1MGfNJq6u6+XRrusMFNvhcJFpFQcCN5fB IKLvu4aSHQmqjq09hV9pruvxjlfYJbtV9VY26NW/D0iv0aznUuXFNuveMr82Uh/Gu+8bkd Vi2ZESQoZub5QAu0oztNdd6zqBcvrynEyTxDydxhjgKReR7aewrhSHfVopDtX3+ZR/XhXW TDcV74mddmOIwnKXnGIbzM4LeaXQPg4vFPxAc1Y3VrwS6LVIxRw1CNni8qA3IaJxD/GI+s schDbiAG8UmG224vlfS9oojwRV1EPtzlzP4Z+L6wa4Pn/mqODVne+w7WVv0Ccw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJTxr1yKLzBfd for ; Sun, 22 Feb 2026 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f967 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:29:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 6a6152bc292f - main - rsu: migrate to new net80211 encryption key API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a6152bc292fbd86015507978c6d3556ef3915a1 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:29:52 +0000 Message-Id: <699a7830.1f967.50a3a96d@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=6a6152bc292fbd86015507978c6d3556ef3915a1 commit 6a6152bc292fbd86015507978c6d3556ef3915a1 Author: Adrian Chadd AuthorDate: 2026-02-22 03:29:44 +0000 Commit: Adrian Chadd CommitDate: 2026-02-22 03:29:44 +0000 rsu: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Differential Revision: https://reviews.freebsd.org/D54483 --- sys/dev/usb/wlan/if_rsu.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c index e976948f6849..2f934737f699 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -1724,7 +1724,8 @@ rsu_set_key_group(struct rsu_softc *sc, const struct ieee80211_key *k) RSU_ASSERT_LOCKED(sc); /* Map net80211 cipher to HW crypto algorithm. */ - algo = rsu_crypto_mode(sc, k->wk_cipher->ic_cipher, k->wk_keylen); + algo = rsu_crypto_mode(sc, k->wk_cipher->ic_cipher, + ieee80211_crypto_get_key_len(k)); if (algo == R92S_KEY_ALGO_INVALID) return (EINVAL); @@ -1732,13 +1733,14 @@ rsu_set_key_group(struct rsu_softc *sc, const struct ieee80211_key *k) key.algo = algo; key.cam_id = k->wk_keyix; key.grpkey = (k->wk_flags & IEEE80211_KEY_GROUP) != 0; - memcpy(key.key, k->wk_key, MIN(k->wk_keylen, sizeof(key.key))); + memcpy(key.key, ieee80211_crypto_get_key_data(k), + MIN(ieee80211_crypto_get_key_len(k), sizeof(key.key))); RSU_DPRINTF(sc, RSU_DEBUG_KEY | RSU_DEBUG_FWCMD, "%s: keyix %u, group %u, algo %u/%u, flags %04X, len %u, " "macaddr %s\n", __func__, key.cam_id, key.grpkey, - k->wk_cipher->ic_cipher, key.algo, k->wk_flags, k->wk_keylen, - ether_sprintf(k->wk_macaddr)); + k->wk_cipher->ic_cipher, key.algo, k->wk_flags, + ieee80211_crypto_get_key_len(k), ether_sprintf(k->wk_macaddr)); error = rsu_fw_cmd(sc, R92S_CMD_SET_KEY, &key, sizeof(key)); if (error != 0) { @@ -1764,19 +1766,22 @@ rsu_set_key_pair(struct rsu_softc *sc, const struct ieee80211_key *k) return (ESHUTDOWN); /* Map net80211 cipher to HW crypto algorithm. */ - algo = rsu_crypto_mode(sc, k->wk_cipher->ic_cipher, k->wk_keylen); + algo = rsu_crypto_mode(sc, k->wk_cipher->ic_cipher, + ieee80211_crypto_get_key_len(k)); if (algo == R92S_KEY_ALGO_INVALID) return (EINVAL); memset(&key, 0, sizeof(key)); key.algo = algo; memcpy(key.macaddr, k->wk_macaddr, sizeof(key.macaddr)); - memcpy(key.key, k->wk_key, MIN(k->wk_keylen, sizeof(key.key))); + memcpy(key.key, ieee80211_crypto_get_key_data(k), + MIN(ieee80211_crypto_get_key_len(k), sizeof(key.key))); RSU_DPRINTF(sc, RSU_DEBUG_KEY | RSU_DEBUG_FWCMD, "%s: keyix %u, algo %u/%u, flags %04X, len %u, macaddr %s\n", __func__, k->wk_keyix, k->wk_cipher->ic_cipher, key.algo, - k->wk_flags, k->wk_keylen, ether_sprintf(key.macaddr)); + k->wk_flags, ieee80211_crypto_get_key_len(k), + ether_sprintf(key.macaddr)); error = rsu_fw_cmd(sc, R92S_CMD_SET_STA_KEY, &key, sizeof(key)); if (error != 0) { From nobody Sun Feb 22 07:44:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJbb71WYHz6SDL0 for ; Sun, 22 Feb 2026 07:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJbb70qWXz41ZL for ; Sun, 22 Feb 2026 07:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771746243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DYggLrN6rFb1/Drk1HPR7BrsmS9hPGjt8VXDIeu0HCk=; b=HugUp+zOIPTmbXb8gAvG68KoP+OfbrAZNJRQEQNugaOK9kKBFXkVmnSr+KVUswpamHku7/ jpQCK05GBuq7topzqCbPazKPS6sEYA+MGcQ73HmZ98x96/2IZWdve1slgYQlvdzCfJPWK+ wMHuw7nJ3wSij4x2bGYmBJ0QmZkQE7mskTdOYYQMvJeXLo29dajRS4CXkQThgZvRKZ576k zlsk1dZSZk0E3E2OKwftm85og8AfRCWkDnA2feilPh/7exDgFdI5vBv4KMxHUz3EFblFBB 0SU3q5+OsLKRYaekXokQfcjnyqU+jpltXB4c8O1cfMAmozyg3rG7dSkftdkV6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771746243; a=rsa-sha256; cv=none; b=Tjm5u48A+2TNjkwwiBvmzOn65lHxg+ie2280z8YttI0SqXA6EDl3SFL43dZY0E3Ur4Rlfp bXKm6AZHwa3rO7SLKD90Om0GEXSi2VKbr4NULPWNdGNDNyRUuHHBO/I9JQdXjSS5vLcvLG iHu6ER/IQD56rSq4m+oTCigXj8TT55N7gLmH/Cgr19YtBbj2oQ8aVr2uXxSeYtW6cifw73 6odtRcZdLQJjlXhlNl7iIMnLKRZCcinGrlbVChJEOWRWfs+cjetiVBqcHGYJUH4Wf4pR5o CnKfXhcPHQd2z0vQRD8i5N+6GyJyO23X/uoLGwLKiQDF+siP/mAZNtBtpFh2ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771746243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DYggLrN6rFb1/Drk1HPR7BrsmS9hPGjt8VXDIeu0HCk=; b=V2PKNnsuxCcpg0DaeBN4+hCn5xC3GQSB8lvRGhYZ29ZQ7XHFOyofv7/p97rOKGleEcy4zg KPH3aS1E6HjirIcMG6o8JhAeC+Ud4v6hNouH5g73jjdDtagwGx9dV7dB3jBDwsBa6H+qF0 vgRxlvIAup1/XxmJJAq9iPL1E9mDkQESw7v9VPXgbAoShWMDfsxnc7XNwQCA20fywawRDw v4eEyqCjjxShz9APbBz3cFK/KExWW6c6Lfk4h3qV2H666NwT31iPQSEcP5R8QcnyRmfXMf rm4sOqHQYNsidtiP/pXs16ZZkrv1fRs4mlspK29IzrX1d6QddYPNBL7Lbt2xRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJbb70B21zbrG for ; Sun, 22 Feb 2026 07:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 07:44:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 451f593194cb - main - ports.7: Add port files to FILES List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 451f593194cbea74bcae53b4b8e6e55f6b2ec12d Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 07:44:03 +0000 Message-Id: <699ab3c3.1be31.590d5f65@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=451f593194cbea74bcae53b4b8e6e55f6b2ec12d commit 451f593194cbea74bcae53b4b8e6e55f6b2ec12d Author: Alexander Ziaee AuthorDate: 2026-02-22 02:51:13 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-22 07:43:49 +0000 ports.7: Add port files to FILES Add terse descriptions for the individual files that make up a port to the FILES section of the ports reference manual. MFC after: 3 days Reviewed by: adamw Differential Revision: https://reviews.freebsd.org/D55404 --- share/man/man7/ports.7 | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 24c1eb4b7f51..318a19ba98c0 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 6, 2025 +.Dd February 21, 2026 .Dt PORTS 7 .Os .Sh NAME @@ -592,15 +592,30 @@ Which directory to use for the data. .El .Sh FILES -.Bl -tag -width ".Pa /usr/ports/Mk/bsd.port.mk" -compact -.It Pa /usr/ports +.Bl -tag -width "/usr/ports/Mk/bsd.port.mk" -compact +.It Pa /usr/ports/ The default ports directory. .It Pa /usr/ports/Mk/bsd.port.mk The big Kahuna. -.It Pa /var/db/ports +.It Pa /var/db/ports/ The directory where the results of configuring .Va OPTIONS are stored. +.It Pa ${PORT}/Makefile +The specification for building the port. +.It Pa ${PORT}/distfiles +The directory where fetched files are stored. +.It Pa ${PORT}/distinfo +The checksums generated with +.Ql make makesum . +.It Pa ${PORT}/files/ +The directory for any patches. +.It Pa ${PORT}/pkg-descr +The long description of the port. +.It Pa ${PORT}/pkg-plist +The list of all files installed by the port. +.It Pa ${PORT}/work +The port's building and staging directory. .El .Sh EXAMPLES .Bl -tag -width 0n From nobody Sun Feb 22 17:20:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJrMn5GG5z6TT7T for ; Sun, 22 Feb 2026 17:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJrMn4D6Yz3rZC for ; Sun, 22 Feb 2026 17:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771780805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XN/7hl0RRa8zd2dbjfFyoqVMAv33jyiXhSxe4rj3m0o=; b=tzYCwrAVvbhiwIa8TVl0PLZX23ArBUcxftnqos/Hq38O/OrtlPT/MwWIlxuxzAcjDUXr7R G0i+hSVYk88bZ1/Z7aUQOIROipRVJZYDQfipQS5kN7oy0Hzx565sTDY23/mLiWEFw0Cu9F J+R8e/cXZLAJqJK1l2Qg/lmyH8LhstFVtO9OApwjNzMF7yR+Kco/41IlC4bV+0cClWkVPv KXDdISdUmQ24jCsPXQrvW20+EvfG0Cx3INR/RswOx6PM4zNB4NQas0KbWsZp+Ryit/uL62 T2HxfmJG01VhKEaG+dm/E0FHtfCfmRuRuI5vsxFDaqHrRl+a3ky6FeOOGhAUHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771780805; a=rsa-sha256; cv=none; b=hjLH6uH65gwAuRUWUdE6dBVjbauyGB2t3kEJEu0G1Y3ajRRj60GmykOLKktve8R7P5GfM1 JrUl/wbfOZXpN4MioGji9tKLLK4JdlsEFCeWYW9TKCuzMolCmMXlQgLEGZ2DytYHbDSyjZ /uUXbq3/1jDOlO4kwS3O/cFCDz9wziCwP+Ttq5qVQQqcj5SU78+pDTCXIQ1xfNRUfsiiIX V0RZWqlRJhYF+6fafLV8BPCyeFfPGl3j+g2domdI+2hBpOEwwp8jonJ3SmqHwn7El52tZC 9KggV0DBf7V8sHmIxG9S7hFg920Ozyi6cge6w3zz0/Aqwpvshi+57Flty/GCrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771780805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XN/7hl0RRa8zd2dbjfFyoqVMAv33jyiXhSxe4rj3m0o=; b=V1glRpVEdTOfQOd3Bo0uCYkjJs1+QqKXVIj0BdsuNtc9K05n96M0WFGADq1WWclXyvFBMN 7d1kxPxsiTo5WOhpQGidUnA1GbGXugmTaoiBd0OhTlPOX2B2EORWvHb1JjrwjmcXBI1mz2 IW/4DcIfLyve9VH1DHYDmwwoatqYJWYUiJRWjGR5mp0LI7Tc1a24XOkg+Eh9vS3HVvq9lm ge+Z4TeA4RnA+J79TSk2U3PSzvQE8lG260snBU81eml1jMggB3vbrPCcmpJG+6EcO8o8RJ AwcsNHmbaLDhgl7wrOcbc6424mKjp29KbylZDhJKsG6QPMtLMfpPeAi8SPQchQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJrMn3FGJzsPM for ; Sun, 22 Feb 2026 17:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3844b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:20:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 7755a406a6ae - main - fusefs: remove the obsolete rename_lock List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7755a406a6ae3801e885a79f714155f97c4d2bc6 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:20:05 +0000 Message-Id: <699b3ac5.3844b.56573101@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7755a406a6ae3801e885a79f714155f97c4d2bc6 commit 7755a406a6ae3801e885a79f714155f97c4d2bc6 Author: Alan Somers AuthorDate: 2026-02-10 20:45:23 +0000 Commit: Alan Somers CommitDate: 2026-02-22 17:08:27 +0000 fusefs: remove the obsolete rename_lock This lock was included in the original GSoC submission. Its purpose seems to have been to prevent concurrent FUSE_RENAME operations for the current mountpoint, as well as to synchronize FUSE_RENAME with fuse_vnode_setparent. But it's obsolete, now that ef6ea91593e added mnt_renamelock . MFC after: 2 weeks Sponsored by: ConnectWise Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55231 --- sys/fs/fuse/fuse_ipc.c | 2 -- sys/fs/fuse/fuse_ipc.h | 2 -- sys/fs/fuse/fuse_vnops.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c index f3d92d861352..c24e11a7ff2f 100644 --- a/sys/fs/fuse/fuse_ipc.c +++ b/sys/fs/fuse/fuse_ipc.c @@ -550,7 +550,6 @@ fdata_alloc(struct cdev *fdev, struct ucred *cred) TAILQ_INIT(&data->aw_head); data->daemoncred = crhold(cred); data->daemon_timeout = FUSE_DEFAULT_DAEMON_TIMEOUT; - sx_init(&data->rename_lock, "fuse rename lock"); data->ref = 1; return data; @@ -565,7 +564,6 @@ fdata_trydestroy(struct fuse_data *data) return; /* Driving off stage all that stuff thrown at device... */ - sx_destroy(&data->rename_lock); crfree(data->daemoncred); mtx_destroy(&data->aw_mtx); knlist_delete(&data->ks_rsel.si_note, curthread, 0); diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h index 6fb04fd4ee25..8ceb6bb1fb1a 100644 --- a/sys/fs/fuse/fuse_ipc.h +++ b/sys/fs/fuse/fuse_ipc.h @@ -194,8 +194,6 @@ struct fuse_data { */ u_long ticketer; - struct sx rename_lock; - uint32_t fuse_libabi_major; uint32_t fuse_libabi_minor; diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 22d5893d4fbc..49014a1cdd35 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2272,7 +2272,6 @@ fuse_vnop_rename(struct vop_rename_args *ap) if (err) goto out; } - sx_xlock(&data->rename_lock); err = fuse_internal_rename(fdvp, fcnp, tdvp, tcnp); if (err == 0) { if (tdvp != fdvp) @@ -2280,7 +2279,6 @@ fuse_vnop_rename(struct vop_rename_args *ap) if (tvp != NULL) fuse_vnode_setparent(tvp, NULL); } - sx_unlock(&data->rename_lock); if (tvp != NULL && tvp != fvp) { cache_purge(tvp); From nobody Sun Feb 22 17:46:09 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJrxt3cpBz6TVYV for ; Sun, 22 Feb 2026 17:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJrxt1Hg6z3twW for ; Sun, 22 Feb 2026 17:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W7Z7vfgFc32GChuOPfvRCgaHRD8zZ7FjzOX/iKeFySQ=; b=eH0hGosj7pYI9jsZH4kCKdf51uADkWDOTuUGqXUQZ6dQ01Q0KXEbd4BQZOoy9FdkspUEKa /L/DGUJtRu0R+QL3rcsLfhb/f/0tn3MW8G/koYPby41jexkmWcsKRNgE/vWt77RyBagpQp g7kA9EV0FHgYZSIiDfpY2cOCAwc9CEDHx3K+VpCv7p4iRxysVAg/uWg8cSkwy5ofqRbkpS +08f2Y3sTWRbCSX3RcLbGtX/Yc4RIoJJR0flRsvdf9HiHg710wHj6ihhC7rZSnhb7d8AJd fOCIlE3Fj4znOgTBIQN5U3FaigDwA5QL3f2XG+liMABPb1i1lb3g4Mz6V4rbQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782370; a=rsa-sha256; cv=none; b=OqKCcx/kD6w2jMye76XJGoOpOQsSbKe91IjZUZR/np7RRRP666KvNF865yCqY1JUjMJ34k eouORrUy0ewSdbv0mUmjPF9omd1xGYsGs12v8DOLcTGrtsMwbnkSVjDfonQ1nMUaZZ7YUw tB7BWqUTwtbq4hRRJRRP0JVoqbWmJhf+h5T/vmqOjC5TyEj9LTTQ9rW6mpIk6I49LXM0jG eSVw6Z3/aCeCugK7KdsivLJc9FAEymRhFe2W8jbH42P2YYY8K/DaSTTobZ9hEngEuRbb3c jKX3eeD522FpR9jfoMzTWhKs8JwNHUXF1fqKcz+GhTbMiPuidnmBRCUfw40PPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W7Z7vfgFc32GChuOPfvRCgaHRD8zZ7FjzOX/iKeFySQ=; b=mX2QJlaxwl/6ioeSQxfsS8t/zaSGPzpMHap4cZxf0Wtwm/+RuN+Fl0Tys6E7AHkyV/JpZi /L/EOYUofIMwpiaTMzzT89V/7ZPzhDCCsLGuOJzwa2FJWC71/lHIrPVbjPYvgoQjBoMEyJ Ohcw9GrBpdZWk7JfGN9L4rnmXcbmlBlrxZtAkgRSwx691vcMZMrGNUhHAZRLgkW+fRSEw7 mBDPeNvOzNFnr/zg3HPJfQvniWBzmpzZ+QTPp7cPQLtBg5lGSRUew+iGunpZFATR4cJGxp fJc5ki3HJ9wDGAtO0+NzLT5PsDjBC/nxWHJEsj/f7FCjXXpyKAyrn0J/8ad5lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJrxs6r2wzv7j for ; Sun, 22 Feb 2026 17:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39fb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:46:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c984c7593e11 - main - tcp: cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c984c7593e11aa95f21f79bb5425a9d5e9181945 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:46:09 +0000 Message-Id: <699b40e1.39fb4.5ef58c21@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c984c7593e11aa95f21f79bb5425a9d5e9181945 commit c984c7593e11aa95f21f79bb5425a9d5e9181945 Author: Michael Tuexen AuthorDate: 2026-02-22 17:44:10 +0000 Commit: Michael Tuexen CommitDate: 2026-02-22 17:44:10 +0000 tcp: cleanup No functional change intended. Reviewed by: pouria, rrs, Timo Völker MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55415 --- sys/netinet/tcp_subr.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 6a6eef32e777..c759e9a1cd6b 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -582,13 +582,14 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, if ((m->m_flags & M_PKTHDR) == 0) { /* Can't handle one that is not a pkt hdr */ TCPSTAT_INC(tcps_tunneled_errs); - goto out; + m_freem(m); + return (true); } thlen = sizeof(struct tcphdr); if (m->m_len < off + sizeof(struct udphdr) + thlen && (m = m_pullup(m, off + sizeof(struct udphdr) + thlen)) == NULL) { TCPSTAT_INC(tcps_tunneled_errs); - goto out; + return (true); } iph = mtod(m, struct ip *); uh = (struct udphdr *)((caddr_t)iph + off); @@ -598,7 +599,7 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, m = m_pullup(m, off + sizeof(struct udphdr) + thlen); if (m == NULL) { TCPSTAT_INC(tcps_tunneled_errs); - goto out; + return (true); } else { iph = mtod(m, struct ip *); uh = (struct udphdr *)((caddr_t)iph + off); @@ -620,9 +621,10 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, #ifdef INET case IPVERSION: len = ntohs(iph->ip_len) - sizeof(struct udphdr); - if (len != m->m_pkthdr.len) { + if (__predict_false(len != m->m_pkthdr.len)) { TCPSTAT_INC(tcps_tunneled_errs); - goto out; + m_freem(m); + return (true); } else { iph->ip_len = htons(len); tcp_input_with_port(&m, &off, IPPROTO_TCP, port); @@ -633,9 +635,11 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, case IPV6_VERSION >> 4: ip6 = mtod(m, struct ip6_hdr *); len = ntohs(ip6->ip6_plen) - sizeof(struct udphdr); - if (len + sizeof(struct ip6_hdr) != m->m_pkthdr.len) { + if (__predict_false(len + sizeof(struct ip6_hdr) != + m->m_pkthdr.len)) { TCPSTAT_INC(tcps_tunneled_errs); - goto out; + m_freem(m); + return (true); } else { ip6->ip6_plen = htons(len); tcp6_input_with_port(&m, &off, IPPROTO_TCP, port); @@ -643,13 +647,9 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, break; #endif default: - goto out; + m_freem(m); break; } - return (true); -out: - m_freem(m); - return (true); } From nobody Sun Feb 22 17:53:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6h6X56z6TVqX for ; Sun, 22 Feb 2026 17:53: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 4fJs6h5p6Qz3vJZ for ; Sun, 22 Feb 2026 17:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1JMc7Rc2Brdy+APovc5B9Nk9kXzGI1Ys3SqYe9SVdDI=; b=wqRHt0qiOgcBz4Nt9LtTBp25h6TcKzV7Grs3mfkHCEJroO4OQV/lQuN3PrOGXIOiSBksLw IXYZiUY2VgW+Mm6vhJl/xQEChBUIOedIV0z1eURL6crE+RzLbJnFGmWz1udHgYlSobD6FW bmIF7mnkXz7Rsy5/clxvHdn5r04DbpT5xx6bNvjelJeSId+9yJu0/3GFlgkAHxFxxX1DUE sA7uPgW+tj3tD/hI7A5/dXnFCAJSdm2C9y+nFlWkU5y6RxfZsHaGyI4xxkTmiyMP1cgKBY LwDGK2qKAuASZOhRBC28aJFsay0yBYsQzDexk6HuVJiaCEVNS+9L8j31rZcqfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782828; a=rsa-sha256; cv=none; b=ZqfIQJkJArPMT0aeAQg3aTUtyP23NMJM/RmhL5V681s9476QTk2+OJ0zM6qPtMjJytzNQm JMuKkwXX4NdVVnfVhjUt/dJQy67WUL1uPY9/NADHpNbGIQXnk6lgA0TyMIWlW/RHfEVdFl wQdznah88SQlsQnoo3eF/XuwHJEXMECtXdD+IpS9TKPVvJyB7qaLbqlQ3qgb+Zq/gJJWq2 ioFWI9cGcweZ24aIVAurNBQojkatCqT23s9YDmy6tt9h3bR1OQ/WGEDFvegYg7upsK0yRA dzF+dW1lN9KUF+2NCi4gN4SH7qjLXLLvWwSRQoL03mMs5j03Vqwa4mZubEIGgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1JMc7Rc2Brdy+APovc5B9Nk9kXzGI1Ys3SqYe9SVdDI=; b=fRb45BxjK88Fv+xFaOF9Gq3UVr2RVRRYJKPLf0GqXkQcq+8Gd8Nif6FGhhan1mtgMMUQCM 4I3TeIG1i0crKA01ZMy3SHj1YdEbw+WyS8xajgto5rBSPvJmfKmnDQUQu7m4CWLrG44lQ8 UeB3U7t3z6weu/RQe6pXtsPtut3dXYHSYyFpeqmMSA7YLCD+yQLTV9pt/zfAFJfovb+ZGq AV44ohwypFEyhVZD/2Av9kSzkmByc0TTKf2Za4q/DF4aW6D5P6u3s/ubb4MvyJN2hpoumj PUHHN84KXq6myjTDUm7dDXtS9yr+zmupHwHKutqEf94aLfdYeTZ7YptY37julg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6h5NDRzvcc for ; Sun, 22 Feb 2026 17:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c066 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 6b77d34f4491 - main - HYM8563: Add support for clock output. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b77d34f449128e6591131ec3d1822e2df3d8d8a Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:48 +0000 Message-Id: <699b42ac.3c066.798e0381@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=6b77d34f449128e6591131ec3d1822e2df3d8d8a commit 6b77d34f449128e6591131ec3d1822e2df3d8d8a Author: Michal Meloun AuthorDate: 2025-11-06 19:19:37 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:27 +0000 HYM8563: Add support for clock output. The RTC contains a configurable clock output. MFC after: 3 weeks --- sys/dev/iicbus/rtc/hym8563.c | 238 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 213 insertions(+), 25 deletions(-) diff --git a/sys/dev/iicbus/rtc/hym8563.c b/sys/dev/iicbus/rtc/hym8563.c index f2db23d47e67..56c5e88edc83 100644 --- a/sys/dev/iicbus/rtc/hym8563.c +++ b/sys/dev/iicbus/rtc/hym8563.c @@ -40,7 +40,8 @@ #include #include -#ifdef FDT +#if defined(FDT) && !defined(__powerpc64__) +#include #include #include #endif @@ -73,14 +74,28 @@ #define HYM8563_WEEKDAY 0x06 #define HYM8563_MONTH 0x07 /* plus 1 bit for century */ #define HYM8563_MONTH_CENTURY (1 << 7) -#define HYM8563_YEAR 0x08 +#define HYM8563_YEAR 0x08 + +#define HYM8563_CLKOUT 0x0D +#define HYM8563_CLKOUT_ENABLE (1 << 7) +#define HYM8563_CLKOUT_32768 0 +#define HYM8563_CLKOUT_1024 1 +#define HYM8563_CLKOUT_32 2 +#define HYM8563_CLKOUT_1 3 +#define HYM8563_CLKOUT_MASK 3 struct hym8563_softc { device_t dev; struct intr_config_hook init_hook; }; -#ifdef FDT +#if defined(FDT) && !defined(__powerpc64__) +/* Clock class and method */ +struct hym8563_clk_sc { + device_t base_dev; +}; + + static struct ofw_compat_data compat_data[] = { {"haoyu,hym8563", 1}, {NULL, 0}, @@ -89,35 +104,200 @@ static struct ofw_compat_data compat_data[] = { static inline int -hym8563_read_buf(struct hym8563_softc *sc, uint8_t reg, uint8_t *buf, - uint16_t buflen) +hym8563_read_buf(device_t dev, uint8_t reg, uint8_t *buf, uint16_t buflen) { - return (iicdev_readfrom(sc->dev, reg, buf, buflen, IIC_WAIT)); + return (iicdev_readfrom(dev, reg, buf, buflen, IIC_WAIT)); } static inline int -hym8563_write_buf(struct hym8563_softc *sc, uint8_t reg, uint8_t *buf, - uint16_t buflen) +hym8563_write_buf(device_t dev, uint8_t reg, uint8_t *buf, uint16_t buflen) { - return (iicdev_writeto(sc->dev, reg, buf, buflen, IIC_WAIT)); + return (iicdev_writeto(dev, reg, buf, buflen, IIC_WAIT)); } static inline int -hym8563_read_1(struct hym8563_softc *sc, uint8_t reg, uint8_t *data) +hym8563_read_1(device_t dev, uint8_t reg, uint8_t *data) { - return (iicdev_readfrom(sc->dev, reg, data, 1, IIC_WAIT)); + return (iicdev_readfrom(dev, reg, data, 1, IIC_WAIT)); } static inline int -hym8563_write_1(struct hym8563_softc *sc, uint8_t reg, uint8_t val) +hym8563_write_1(device_t dev, uint8_t reg, uint8_t val) +{ + + return (iicdev_writeto(dev, reg, &val, 1, IIC_WAIT)); +} + +#if defined(FDT) && !defined(__powerpc64__) +static int +hym8563_clk_set_gate(struct clknode *clk, bool enable) { + struct hym8563_clk_sc *sc; + uint8_t val; + int rv; + + sc = clknode_get_softc(clk); - return (iicdev_writeto(sc->dev, reg, &val, 1, IIC_WAIT)); + rv = hym8563_read_1(sc->base_dev, HYM8563_CLKOUT, &val); + if (rv != 0) { + device_printf(sc->base_dev, + "Cannot read CLKOUT registers: %d\n", rv); + return (rv); + } + if (enable) + val |= HYM8563_CLKOUT_ENABLE; + else + val &= ~HYM8563_CLKOUT_ENABLE; + hym8563_write_1(sc->base_dev, HYM8563_CLKOUT, val); + if (rv != 0) { + device_printf(sc->base_dev, + "Cannot write CLKOUT registers: %d\n", rv); + return (rv); + } + return (0); } +static int +hym8563_clk_recalc(struct clknode *clk, uint64_t *freq) +{ + struct hym8563_clk_sc *sc; + uint8_t val; + int rv; + + sc = clknode_get_softc(clk); + + rv = hym8563_read_1(sc->base_dev, HYM8563_CLKOUT, &val); + if (rv != 0) { + device_printf(sc->base_dev, + "Cannot read CLKOUT registers: %d\n", rv); + return (rv); + } + + switch (val & HYM8563_CLKOUT_MASK) { + case HYM8563_CLKOUT_32768: + *freq = 32768; + break; + case HYM8563_CLKOUT_1024: + *freq = 1024; + break; + case HYM8563_CLKOUT_32: + *freq = 32; + break; + case HYM8563_CLKOUT_1: + *freq = 1; + break; + default: + return (EINVAL); + } + return (0); +} +static int +hym8563_clk_set(struct clknode *clk, uint64_t fparent, uint64_t *fout, + int flags, int *stop) +{ + struct hym8563_clk_sc *sc; + uint8_t val, tmp; + int rv; + + sc = clknode_get_softc(clk); + + switch (*fout) { + case 32768: + tmp = HYM8563_CLKOUT_32768; + break; + case 1024: + tmp = HYM8563_CLKOUT_1024; + break; + case 32: + tmp = HYM8563_CLKOUT_32; + break; + case 1: + tmp = HYM8563_CLKOUT_1; + break; + default: + *stop = 1; + return (EINVAL); + } + + rv = hym8563_read_1(sc->base_dev, HYM8563_CLKOUT, &val); + if (rv != 0) { + device_printf(sc->base_dev, + "Cannot read CLKOUT registers: %d\n", rv); + return (rv); + } + + val &= ~HYM8563_CLKOUT_MASK; + val |= tmp; + rv = hym8563_write_1(sc->base_dev, HYM8563_CLKOUT, val); + if (rv != 0) { + device_printf(sc->base_dev, + "Cannot write CLKOUT registers: %d\n", rv); + return (rv); + } + + return (0); +} + +static clknode_method_t hym8563_clk_clknode_methods[] = { + CLKNODEMETHOD(clknode_recalc_freq, hym8563_clk_recalc), + CLKNODEMETHOD(clknode_set_freq, hym8563_clk_set), + CLKNODEMETHOD(clknode_set_gate, hym8563_clk_set_gate), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(hym8563_clk_clknode, hym8563_clk_clknode_class, + hym8563_clk_clknode_methods, sizeof(struct hym8563_clk_sc), + clknode_class); + + +static int +hym8563_attach_clocks(struct hym8563_softc *sc) +{ + struct clkdom *clkdom; + struct clknode_init_def clkidef; + struct clknode *clk; + struct hym8563_clk_sc *clksc; + const char **clknames; + phandle_t node; + int nclks, rv; + + node = ofw_bus_get_node(sc->dev); + + /* clock-output-names are optional. Could use them for clkidef.name. */ + nclks = ofw_bus_string_list_to_array(node, "clock-output-names", + &clknames); + + clkdom = clkdom_create(sc->dev); + + memset(&clkidef, 0, sizeof(clkidef)); + clkidef.id = 1; + clkidef.name = (nclks == 1) ? clknames[0] : "hym8563-clkout"; + clk = clknode_create(clkdom, &hym8563_clk_clknode_class, &clkidef); + if (clk == NULL) { + device_printf(sc->dev, "Cannot create '%s'.\n", clkidef.name); + return (ENXIO); + } + clksc = clknode_get_softc(clk); + clksc->base_dev = sc->dev; + clknode_register(clkdom, clk); + + rv = clkdom_finit(clkdom); + if (rv != 0) { + device_printf(sc->dev, "Cannot finalize clkdom initialization: " + "%d\n", rv); + return (ENXIO); + } + + if (bootverbose) + clkdom_dump(clkdom); + + return (0); +} +#endif + static int hym8563_gettime(device_t dev, struct timespec *ts) { @@ -129,7 +309,7 @@ hym8563_gettime(device_t dev, struct timespec *ts) sc = device_get_softc(dev); /* Read all RTC data */ - rv = hym8563_read_buf(sc, HYM8563_SEC, buf, sizeof(buf)); + rv = hym8563_read_buf(sc->dev, HYM8563_SEC, buf, sizeof(buf)); if (rv != 0) { device_printf(sc->dev, "Cannot read time registers: %d\n", rv); return (rv); @@ -154,7 +334,7 @@ hym8563_gettime(device_t dev, struct timespec *ts) if (buf[5] & HYM8563_MONTH_CENTURY) bct.year += 0x100; - clock_dbgprint_bcd(sc->dev, CLOCK_DBG_READ, &bct); + clock_dbgprint_bcd(sc->dev, CLOCK_DBG_READ, &bct); return (clock_bcd_to_ts(&bct, ts, false)); } @@ -182,14 +362,14 @@ hym8563_settime(device_t dev, struct timespec *ts) buf[5] |= HYM8563_MONTH_CENTURY; /* Stop RTC */ - rv = hym8563_write_1(sc, HYM8563_CTRL1, HYM8563_CTRL1_STOP); + rv = hym8563_write_1(sc->dev, HYM8563_CTRL1, HYM8563_CTRL1_STOP); if (rv != 0) { device_printf(sc->dev, "Cannot write CTRL1 register: %d\n", rv); return (rv); } /* Write all RTC data */ - rv = hym8563_write_buf(sc, HYM8563_SEC, buf, sizeof(buf)); + rv = hym8563_write_buf(sc->dev, HYM8563_SEC, buf, sizeof(buf)); if (rv != 0) { device_printf(sc->dev, "Cannot write time registers: %d\n", rv); return (rv); @@ -197,7 +377,7 @@ hym8563_settime(device_t dev, struct timespec *ts) return (rv); /* Start RTC again */ - rv = hym8563_write_1(sc, HYM8563_CTRL1, 0); + rv = hym8563_write_1(sc->dev, HYM8563_CTRL1, 0); if (rv != 0) { device_printf(sc->dev, "Cannot write CTRL1 register: %d\n", rv); return (rv); @@ -217,14 +397,14 @@ hym8563_init(void *arg) config_intrhook_disestablish(&sc->init_hook); /* Clear CTL1 register (stop and test bits) */ - rv = hym8563_write_1(sc, HYM8563_CTRL1, 0); + rv = hym8563_write_1(sc->dev, HYM8563_CTRL1, 0); if (rv != 0) { device_printf(sc->dev, "Cannot init CTRL1 register: %d\n", rv); return; } - + /* Disable interrupts and alarms */ - rv = hym8563_read_1(sc, HYM8563_CTRL2, ®); + rv = hym8563_read_1(sc->dev, HYM8563_CTRL2, ®); if (rv != 0) { device_printf(sc->dev, "Cannot read CTRL2 register: %d\n", rv); return; @@ -232,7 +412,7 @@ hym8563_init(void *arg) rv &= ~HYM8563_CTRL2_TI_TP; rv &= ~HYM8563_CTRL2_AF; rv &= ~HYM8563_CTRL2_TF; - rv = hym8563_write_1(sc, HYM8563_CTRL2, 0); + rv = hym8563_write_1(sc->dev, HYM8563_CTRL2, 0); if (rv != 0) { device_printf(sc->dev, "Cannot write CTRL2 register: %d\n", rv); return; @@ -250,7 +430,7 @@ static int hym8563_probe(device_t dev) { -#ifdef FDT +#if defined(FDT) && !defined(__powerpc64__) if (!ofw_bus_status_okay(dev)) return (ENXIO); @@ -266,10 +446,15 @@ static int hym8563_attach(device_t dev) { struct hym8563_softc *sc; - + sc = device_get_softc(dev); sc->dev = dev; +#if defined(FDT) && !defined(__powerpc64__) + if (hym8563_attach_clocks(sc) != 0) + return(ENXIO); +#endif + /* * Chip init must wait until interrupts are enabled. Often i2c access * works only when the interrupts are available. @@ -305,7 +490,10 @@ static device_method_t hym8563_methods[] = { static DEFINE_CLASS_0(hym8563_rtc, hym8563_driver, hym8563_methods, sizeof(struct hym8563_softc)); -DRIVER_MODULE(hym8563, iicbus, hym8563_driver, NULL, NULL); +EARLY_DRIVER_MODULE(hym8563, iicbus, hym8563_driver, NULL, NULL, + BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_FIRST); MODULE_VERSION(hym8563, 1); MODULE_DEPEND(hym8563, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); +#if defined(FDT) && !defined(__powerpc64__) IICBUS_FDT_PNP_INFO(compat_data); +#endif \ No newline at end of file From nobody Sun Feb 22 17:53:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6k3s3Sz6TWJ3 for ; Sun, 22 Feb 2026 17:53: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 4fJs6k0Wdxz3vV7 for ; Sun, 22 Feb 2026 17:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLNMH2HY4VlwABm2DXY5HP9cYyQg6KuvsGHLFjyHZQk=; b=Tar6bsLHCB8Hxiqas4h+D3nEYFxsb4hkaaFGHi/cGc3yhDTl8hPChbFX4cJmtOD4dpPX64 6UBSpOLddvmtfQ41Tv9NXt3TCmv4Wwdi6uCWF9/Z+OVxzvbCusNo05I1QkyU0l39+0znRW AI3psVtRW5TCmT6fTmuzv6vOETbR0aBn5oXmowRByk2NUJTyhmvzG/LpL0/dhJUT0ITDf1 0+sEGW5bZoFTyM5KMLN8bE0zH42MFdnmXge1mGF97spoBETE3P1MX+E8tApbA3+W9cAQTl 3rj7xX7zOqAzv5ot5hc/rABjw0eB+XyRKN89FlXESx6P0YG07p1qSM7rzZekMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782830; a=rsa-sha256; cv=none; b=X1cWnCX15aV2JMuHrSfR136WWOxHzN01JZyu4CuAdFq/5p5DGLhzHhtuFxcPLgIXEP1lzo 20/Jp2ycWTgMnMvXsDdZo+5H8oUo18PGInsYoaUdrJT4puIbuTkQUNHJI4IMNaO7aDb+eQ 4n3RPtR07r+WsJJJm3Y2v06ztWs+RvPSAO6iMYrhOir8qrNVuDxakQvtAndn2jBEAqzOVR TCqNW2b7LOS3diiBZmKNtWKkWsrqcoQzdGgUHp0fxaoI0szXZo0ZwYlh8nF7MsITGR0bw8 f0bIWYch1W6xjhpixjUDzBDLc7Tn2M+cpUCeFCB0OXbU8RerSG5eb76Gam/p/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=1771782830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLNMH2HY4VlwABm2DXY5HP9cYyQg6KuvsGHLFjyHZQk=; b=IhVm9K3wXNScKx6Q9bmhJ33KUhRaNVVt0yX8oZAXorORt9u10WKIY6DnNYiM6bJW8BoNUV dGXUKqg8bQsGqsrqLyLPcDaqAK6jJbXjlKd9nJ4gV5va2fZ3ViVHgJgQeXSUbjYIxEByGb SkKYC8+IQLtq6gA/3+WCCT+QoqPuBDXc+kaT/rueeu41hzwCkCnn6QcM4INqaHz+JxSHGw zprmeM1yjZc2DZDG5Xjzz65m8LCwjLVWMOU4d6r5oI3wdhawnISXw+5G5Zh708uH2fjZ5V vlt+51KdmhsvXNcBgDCFsMBiu1ptN1y3b15inlFPHUJw797qBzWyRsC+nGZKfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6j6XZKzv8F for ; Sun, 22 Feb 2026 17:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c27a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 4840558e5219 - main - OFW: Improve OFW_CPU. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4840558e521934345793ef83b0d45a72fd615a7b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:49 +0000 Message-Id: <699b42ad.3c27a.79433058@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=4840558e521934345793ef83b0d45a72fd615a7b commit 4840558e521934345793ef83b0d45a72fd615a7b Author: Michal Meloun AuthorDate: 2025-11-06 19:01:18 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:27 +0000 OFW: Improve OFW_CPU. Accept the assigned clock on the CPU node. Don't report a missing "clock-frequency" property if the CPU node has a "clocks" property. MFC after: 3 weeks --- sys/dev/ofw/ofw_cpu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index 852ce6ea3759..7da34af6592a 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -43,7 +43,7 @@ #include #include -#if defined(__arm__) || defined(__arm64__) || defined(__riscv) +#if defined(__arm__) || defined(__aarch64__) || defined(__riscv) #include #define HAS_CLK #endif @@ -343,6 +343,11 @@ ofw_cpu_attach(device_t dev) if (sc->sc_cpu_pcpu == NULL) sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev)); +#ifdef HAS_CLK + clk_set_assigned(dev, node); + if (!OF_hasprop(node, "clocks")) { +#endif + if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) { if (get_freq_from_clk(dev, sc) != 0) { if (bootverbose) @@ -357,6 +362,10 @@ ofw_cpu_attach(device_t dev) sc->sc_nominal_mhz); OF_device_register_xref(OF_xref_from_node(node), dev); + +#ifdef HAS_CLK + } +#endif bus_identify_children(dev); bus_attach_children(dev); return (0); From nobody Sun Feb 22 17:53:50 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6l2D5Pz6TVsp for ; Sun, 22 Feb 2026 17:53: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 4fJs6k6yqHz3vh7 for ; Sun, 22 Feb 2026 17:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6pTjrvyXsaHVFKCojJQinCOshtOY1dU0RclKvHwbto=; b=HBJCPBZHCrUCACov3FzBIDUihjr6ihbKvIV3XjZiPd+m1+c6WpwPjAoTmw54AGCdAZxtL0 bsUg3CoTKzsRp35DZN1qVeXW3UeD3B0WphNTOApEChEMfJN+/LJMJHZu9u4pFVbJJITxwh Mh26pKTJotVzxTWXGInL1Is8mCAe/qDErQgWnk9Try9vZQf3xxIwODfUl76swcGY4VhSfP b+FN9ZSUZ63h8T98JRsq8gKZqdrpK4HRKmtm+8A8M+sPuqTb3RYhT9AI/VyvHubTtLvynb st69yo69Nca0shbcXPWK/u89KdOJXjzH7O/sKgrASP9hF+lhRGvDbObv8GaCYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782831; a=rsa-sha256; cv=none; b=j9oSWXRrgoBqEWU33/g8rXNipWkShzGB+K5Fr7+pe+eVCUUlbuckJUM2JozS/5f5c1sG53 XK/xPEN3Zf7y2dHiUQz89ReuZs5kKWfeDbyIOdAPLaFfdhXisR4xhlc7mQJwPreWwUf6Gl 6EyU7qaEHKlUpfMt5/zeFaOyVmCJel6CtEo3bnH5Wz6G8lcXpyC54w4deCREgA+dywRI/1 2Dg1gWFgDa5jE7bsgc4eNX424/pvZUsXw2x8/VzO0qdPDqR/nxaKfNCS6si0sGLvpOc7E7 d/mLbV0kbe5WL6/CDQy4qzlyqT7O0g2oEH7rSJeq8w2Bo+Yes/4FQnyLNrV5Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6pTjrvyXsaHVFKCojJQinCOshtOY1dU0RclKvHwbto=; b=yVXtQnvKlG9OgDnfkuPgJGXQ9J3Tql7uSUsHYqsqjd46257qgaEA4xI/C9xRybISCDNa0O u6ZlZsYC0Oea+h+OdKqP15116lHFbk4LcMs6TUYG+q73f7q0bWol9km2bB640D51y5Wszv 9L1WguHlFi6hQswcxaxMaGsmnJQKux2xtMpagLIoJEI5qhHKeoRq5V7Ivz6Msu21Q91RaB E2q1yWVJGj6OHxNa5uE9ISHXZ/DNoDH5rjK9dWj51neVMamdKkA9ed1oWVkgviJKvjcLu1 yRg9X08fs+I+s++DsqTxn2G4g7ly152rYRB44Wy8zx4B2TK3F6GbniSWjkDODg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6k6VHfzv8G for ; Sun, 22 Feb 2026 17:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c3cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 2ade7208068d - main - TCA64xx: Convert mutex to SX lock. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ade7208068d1d215f8b9754b448566354d6944c Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:50 +0000 Message-Id: <699b42ae.3c3cd.2ed6d568@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=2ade7208068d1d215f8b9754b448566354d6944c commit 2ade7208068d1d215f8b9754b448566354d6944c Author: Michal Meloun AuthorDate: 2025-11-06 19:11:17 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:27 +0000 TCA64xx: Convert mutex to SX lock. I2C devices are permitted to sleep during transfers. MFC after: 3 weeks --- sys/dev/iicbus/gpio/tca64xx.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sys/dev/iicbus/gpio/tca64xx.c b/sys/dev/iicbus/gpio/tca64xx.c index ab8fedd3f8fd..4920d77dd81c 100644 --- a/sys/dev/iicbus/gpio/tca64xx.c +++ b/sys/dev/iicbus/gpio/tca64xx.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -93,7 +94,7 @@ struct tca64xx_softc { device_t dev; device_t busdev; enum chip_type chip; - struct mtx mtx; + struct sx mtx; uint32_t addr; uint8_t num_pins; uint8_t in_port_reg; @@ -260,7 +261,7 @@ tca64xx_attach(device_t dev) sc->dev = dev; sc->addr = iicbus_get_addr(dev); - mtx_init(&sc->mtx, "tca64xx gpio", "gpio", MTX_DEF); + sx_init(&sc->mtx, "tca64xx gpio"); OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev); sc->busdev = gpiobus_add_bus(dev); if (sc->busdev == NULL) { @@ -293,7 +294,7 @@ tca64xx_detach(device_t dev) sc = device_get_softc(dev); gpiobus_detach_bus(dev); - mtx_destroy(&sc->mtx); + sx_destroy(&sc->mtx); return (0); } @@ -383,7 +384,7 @@ tca64xx_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) if (pin >= pins) return (EINVAL); - mtx_lock(&sc->mtx); + sx_xlock(&sc->mtx); addr = TCA64XX_REG_ADDR(pin, sc->conf_reg); error = tca64xx_read(dev, addr, &val); @@ -414,7 +415,7 @@ tca64xx_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) error = tca64xx_write(dev, addr, inv_val); fail: - mtx_unlock(&sc->mtx); + sx_unlock(&sc->mtx); return (error); } @@ -478,11 +479,11 @@ tca64xx_pin_set(device_t dev, uint32_t pin, unsigned int val) dbg_dev_printf(dev, "Setting pin: %u to %u\n", pin, val); - mtx_lock(&sc->mtx); + sx_xlock(&sc->mtx); error = tca64xx_read(dev, addr, &value); if (error != 0) { - mtx_unlock(&sc->mtx); + sx_unlock(&sc->mtx); dbg_dev_printf(dev, "Failed to read from register.\n"); return (error); } @@ -494,12 +495,12 @@ tca64xx_pin_set(device_t dev, uint32_t pin, unsigned int val) error = tca64xx_write(dev, addr, value); if (error != 0) { - mtx_unlock(&sc->mtx); + sx_unlock(&sc->mtx); dbg_dev_printf(dev, "Could not write to register.\n"); return (error); } - mtx_unlock(&sc->mtx); + sx_unlock(&sc->mtx); return (0); } @@ -522,11 +523,11 @@ tca64xx_pin_toggle(device_t dev, uint32_t pin) dbg_dev_printf(dev, "Toggling pin: %d\n", pin); - mtx_lock(&sc->mtx); + sx_xlock(&sc->mtx); error = tca64xx_read(dev, addr, &value); if (error != 0) { - mtx_unlock(&sc->mtx); + sx_unlock(&sc->mtx); dbg_dev_printf(dev, "Cannot read from register.\n"); return (error); } @@ -535,12 +536,12 @@ tca64xx_pin_toggle(device_t dev, uint32_t pin) error = tca64xx_write(dev, addr, value); if (error != 0) { - mtx_unlock(&sc->mtx); + sx_unlock(&sc->mtx); dbg_dev_printf(dev, "Cannot write to register.\n"); return (error); } - mtx_unlock(&sc->mtx); + sx_unlock(&sc->mtx); return (0); } From nobody Sun Feb 22 17:53:53 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6n55grz6TW1N for ; Sun, 22 Feb 2026 17:53: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 4fJs6n1d3Lz3vKH for ; Sun, 22 Feb 2026 17:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+WPlj77kvBjqV0I7STcCpdoCtL0NPEsVj4WXYOqnIo=; b=eEeh0SY8/yWyasaHA+LjSIf8tEu0owbwiZWpAhHfIgo9bBiqmokt3ZT4rr0UaX0YBmI5iX zBKqRp9aMEDMOg7tWkRU1s/TocbWbF3ZmdhM9Qx/4zhEcUBHzZrEolyoIMXug58zB/Fm5v 9NXpq+s28BInOzK858yr9f9nTPkxE/h7NbDmTO5tIVYzwUuqHPmieNDBFq2vNMwbzr86Qn v1QgCOOmgmclHMMI89pkS8kGeNJZlljmXhjMVY9qTDAm0jkrDPnjtlWpXYGFGomJ5TTxQf ZW9xjfXVAZNEU9FqRLXQ/2DRR0jD29yFtbKw7HHZan1oq3IRm8CihKnR7TQMfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782833; a=rsa-sha256; cv=none; b=q75rXI3zXH5TaBmWn2fhxX+3dVf/8LvcXSU06Z/zOYu59WI6BLFqZ/PVDXAIqxk4oXfbdc dIpNOFyWsx8NX4vKyEkgQzdZDZIFX+5eCrdnTiRK/0psVA6MX+3GEpiT4kLN3Quu4zWITW WOvXWw73b8U6pEexdQMI94wduVF/dSPrdvtmW6S/bUQgjxAcrxG6TcMpTgcANiu9xF572U 7ii+uy8j7t1phNNNoEWlcfKjxrcmzzcxdk3o2kPvio2M/D+Sx/1+p4MldwkQ7yVv+81Bog /6tQp/MSsOAer7IViQLRQuR73yqs+/VvWUf6P59ViNGYv+fxywyvlgsTaX6bLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A+WPlj77kvBjqV0I7STcCpdoCtL0NPEsVj4WXYOqnIo=; b=X1a7vDgIpRcRG70cDHIuWfjZ/VtecLcS+2Hvjh5EMm9GL/+eFrxW3KOYiGRzjwkTNYEw6k iOvSy3ce2/e/XXPqvjxuCxneO7w8mBHi21phzbDvtNXOGDxIh93iNw7LlU3HEjp338/1Ua +h7yRudgtqkKr7R/Odu0WCG7uCWBZonZAPdyj/oSCaqPStxbStvIKlRCJdIyJf7TScxSDs FVObVLcsZcDg4oKl/gTPplRgGIxVQqoA1Y+6lEDZpr3rhXCP6A41zGxfXfxcq0UgGAHMrt U8K5U6VCuzFzUdO63+Ub24tbPic9SDRiVgAA1n76OCdIn+FRExkUBtxCrXl/lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6n10J4zvG4 for ; Sun, 22 Feb 2026 17:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bc8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: f40ed4881e25 - main - fdt,simple_mfd: Map memory as shareable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f40ed4881e2581d56b1a63ffb0122e017b2139f3 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:53 +0000 Message-Id: <699b42b1.3bc8a.42148dfd@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=f40ed4881e2581d56b1a63ffb0122e017b2139f3 commit f40ed4881e2581d56b1a63ffb0122e017b2139f3 Author: Michal Meloun AuthorDate: 2025-11-06 19:21:49 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:27 +0000 fdt,simple_mfd: Map memory as shareable. It may be submapped in child drivers. MFC after: 3 weeks --- sys/dev/fdt/simple_mfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/fdt/simple_mfd.c b/sys/dev/fdt/simple_mfd.c index 1c642c6ca99c..66352e3f9409 100644 --- a/sys/dev/fdt/simple_mfd.c +++ b/sys/dev/fdt/simple_mfd.c @@ -207,7 +207,7 @@ simple_mfd_attach(device_t dev) if (ofw_bus_is_compatible(dev, "syscon")) { sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); + RF_ACTIVE | RF_SHAREABLE); if (sc->mem_res == NULL) { device_printf(dev, "Cannot allocate memory resource\n"); From nobody Sun Feb 22 17:53:52 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6m6wVZz6TWGq for ; Sun, 22 Feb 2026 17:53: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 4fJs6m1PjKz3vK2 for ; Sun, 22 Feb 2026 17:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrcgsibQd4lhMXRCVt4qDYz2MVmogHOY6gXpzrCYhQc=; b=OEBGXW26ZqnA/vmXSR7oUzKTIAEeXtpzO0c85gdAWtByFcpKgW+sDV+OwxUldxt9bdZ31m 5kSMq3ZvDJhBe+3LxcX4fwjMtx3Qf2M7Iucvyzz9ZAku6qpGQrBWMfLWEye9y0iTMmDMq1 OV027FF6UVoGKBidxas5ITlzdXvMkFQW94eWGDcfY4kbr9+gF11Q4UGPXSa5b0cV1G5iN0 SRSn9YhHN04dZvCmleQgQRoULA8abWRm6kE2HN+zH+jWtNcu6RoWgbVeEh9u1/UwAupAOA hWGAE6JULsJYdsCqq0jksWrfOzUb6qDMq1Yrjpnna3dJkOZc5Y11FhoQGbzd6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782832; a=rsa-sha256; cv=none; b=mI/tGy+PiKvD/F6OlIfbHfAIJXVE9iseFn6PZCepTEJPoi0GTakD2Ckt5Psx7hrlpFY6Eh ROjSLM8n3hj6wEL/0WPvprOJRoxPEgSnCs5YCqbUIfnquY4nG00CH7K5hVqXlNLWqa4wjV y/XKlY2hxx8P37Dp7z3hDmxUcyWLKf1GFsDSxeYXojFnwV5TVUz9nQ2F5Ji1/EM67F5X2z v3ghLkvYOtbHshXZRxianIBdeI8SOFdYYOZE2wxaRSUsAYZuHyQwXDNAvtSLpCb/L/NUnM md2Cr9/c+82ONzkTWbsQpfeTVtX39gKGYI4XLwfidcU9+PEbY2VmWYISlTb9aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrcgsibQd4lhMXRCVt4qDYz2MVmogHOY6gXpzrCYhQc=; b=iUYQUxjz5/alYSvXyr8WmAPrDAOLUDo1EuzyxM/UxvwQ94vqijp3cjzmz/SIYVSOCRjRJC cC88hzZa3qi9LvGsbb5bYFuitvJ1ZHRngweq2OtCEiwP1alFEYrs/AyaRDkj5BBuS6U5OZ EDGOGlKv2b3KcnHDn6u1k6qCzq1hLnKxWJhTcnDGVTJ5POLwxgmy7FOYTwfaWbyZqHtMy+ VAeGV0Ki90LOtancZ0GdUi++ne8lmdX6CRV9FbaEyq6utYjM6dJDPYx7M31PhlQaShgjBJ TF8cHuuH+PeClpEfkUYHAGSq2neEaZTutxpwlKEpYIbgloBLAgoEBp/0GD/5QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6m0ZFjzvCl for ; Sun, 22 Feb 2026 17:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3acc5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 67fc0ff33d20 - main - dtb: generate .DTB for some RK3588 based boards. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67fc0ff33d202bf90d93e0553271742ccd779bab Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:52 +0000 Message-Id: <699b42b0.3acc5.5c7aeb@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=67fc0ff33d202bf90d93e0553271742ccd779bab commit 67fc0ff33d202bf90d93e0553271742ccd779bab Author: Michal Meloun AuthorDate: 2025-11-06 19:44:43 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:27 +0000 dtb: generate .DTB for some RK3588 based boards. MFC after: 3 weeks --- sys/modules/dtb/rockchip/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index 9c8ca1acc837..fb29f4f0970a 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -22,7 +22,10 @@ DTS= \ rockchip/rk3568-nanopi-r5s.dts \ rockchip/rk3566-radxa-zero-3e.dts \ rockchip/rk3566-radxa-zero-3w.dts \ - rockchip/rk3568-bpi-r2-pro.dts + rockchip/rk3568-bpi-r2-pro.dts \ + rockchip/rk3588-rock-5-itx.dts \ + rockchip/rk3588-rock-5b.dts \ + rockchip/rk3588-orangepi-5-plus DTSO= rk3328-analog-sound.dtso \ rk3328-i2c0.dtso \ From nobody Sun Feb 22 17:53:55 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6q5sCSz6TWH0 for ; Sun, 22 Feb 2026 17: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 4fJs6q2qQgz3vkc for ; Sun, 22 Feb 2026 17: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=1771782835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XxojDxhaO7ji0++NNBZmkCmuSbtHGZXB8mm3xahxLjQ=; b=KPLaUZ+gmihkMOhB8+6BkqVKmzhgJuPbIA0z1K36dSb4dwSNyTHlHQ2k2JqZo/znHBU3up Y5OSdCoUxpczwHuQmYyI6v5uKacjPqJ92GQbGtDIqC+RvifmNJ4WDjKF36kcr3FjrllCtU 3tKbxBRHIgQ0yBp4Wiuj1fHCGW2tILurK8xZhKJ1/iETz28aokkEZFiQWsHJxOcp4g4iz/ n7ypOgW/MXdKhx9/grzBaBhqV+/6LdaY66Cr6z8JRyuAJALtn7fav83XrxUemWEOaLugB5 AXepcFo/AZlMLun3Ajt7nt4Qgbd4xRQ4+QFoQBUStn2MXV+M8nstJxUlml1Pkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782835; a=rsa-sha256; cv=none; b=RGQyo1eCFOTwWDKolc+fgeWcERYLNwdZZIwFnKzVElxxLHliMJYr3T1IN55qvxTCBzBoEg Lf9nW7m6wIXNiJn4KoyQfrhk4NX4i5cH16H8lNGNrc7Z0ftv0ClFkK4bsiVoEhobY/pJAp Pv4pC6wa77Z/du0QXBWvZ2BpR6a7Wt4b7XCd8Q0Gn5+hxMP9kWCvQKQW+uFhiF7tJpISMv fYa8JpLD5ZbM5xQDDM0oqYQkprHSskS49WDIKChsRfDM4ZeyY0pmn+hg73rP280281kqAG f/y5BZnTBBz98U00I2e9PMdpmKk7uC636Pa67d5yB8eDRbWirG/afgfX6cva0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XxojDxhaO7ji0++NNBZmkCmuSbtHGZXB8mm3xahxLjQ=; b=M0hhCrqQlLJe8E+iIxh4BRQFkvqICAEmvI2196umbjNxU4oW5yg5xiIAx4+ApTG4TwAcz5 7U3A/OIC2GatW+U4G/c+99ygQ8iMOiJPzVqBELfLMxytgBKrVP5B73P5/POvILG0UphQ1c bROBR3u/SZVfp/iiEE2+DpTf11Zdww6eXKI6oj8rdoNXBP4stffFZFKt39SgDouw+kfs2v IGV6RBiF6kzM37NuuBZQrMB0h181GegAZvI/sIUr0eGff5r9cd4gP5Odr8Jgsei8gldeKI eccqQQAr1/DrGYgZgu30XIV39N+yJ+2HOHRftwL4XMrzrMLIRhNWO663/u6NwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6q2Bvqzvb7 for ; Sun, 22 Feb 2026 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ab57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 9de43130f989 - main - regulator_fixed: add support for 'gpios' property List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9de43130f989896d92dda22ed73ca3033863efd7 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:55 +0000 Message-Id: <699b42b3.3ab57.672318b9@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=9de43130f989896d92dda22ed73ca3033863efd7 commit 9de43130f989896d92dda22ed73ca3033863efd7 Author: Michal Meloun AuthorDate: 2025-11-06 19:37:14 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:28 +0000 regulator_fixed: add support for 'gpios' property This is a newer version of the "gpio" property. MFC after: 3 weeks --- sys/dev/regulator/regulator_fixed.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/dev/regulator/regulator_fixed.c b/sys/dev/regulator/regulator_fixed.c index 55cdb5e4aeae..148bd28cdd16 100644 --- a/sys/dev/regulator/regulator_fixed.c +++ b/sys/dev/regulator/regulator_fixed.c @@ -380,6 +380,7 @@ regfix_parse_fdt(struct regfix_softc * sc) { phandle_t node; int rv; + char *name; struct regnode_init_def *init_def; node = ofw_bus_get_node(sc->dev); @@ -405,15 +406,21 @@ regfix_parse_fdt(struct regfix_softc * sc) if (OF_hasprop(node, "gpio-open-drain")) sc->init_def.gpio_open_drain = true; - if (!OF_hasprop(node, "gpio")) - return (0); - rv = ofw_bus_parse_xref_list_alloc(node, "gpio", "#gpio-cells", 0, - &sc->gpio_prodxref, &sc->gpio_ncells, &sc->gpio_cells); + if (OF_hasprop(node, "gpio")) + name = "gpio"; + else if (OF_hasprop(node, "gpios")) + name = "gpios"; + else + return(0); + + rv = ofw_bus_parse_xref_list_alloc(node, name, "#gpio-cells", + 0, &sc->gpio_prodxref, &sc->gpio_ncells, &sc->gpio_cells); if (rv != 0) { sc->gpio_prodxref = 0; - device_printf(sc->dev, "Malformed gpio property\n"); + device_printf(sc->dev, "Malformed gpios property\n"); return (ENXIO); } + return (0); } From nobody Sun Feb 22 17:53:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6p6ntRz6TW3h for ; Sun, 22 Feb 2026 17: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 4fJs6p2nGRz3vmm for ; Sun, 22 Feb 2026 17: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=1771782834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1c5IEuDvAz/zS6F4zW8x5qxYpptDgM0Q85XnZamJ+GU=; b=ObYXLMRLem1XLvtUNYybq+gxRZc9CWalODOQGwwTqcC0HHmWhmfCgL7CWxOczOpNgINgDI K8fdOiZDWZnK4R4cClbzT/lqQ+NFeWhxXZQMhjGINw+ONDVbKR1n2mTdQkho2ZEmrmgVvB A6PYMuYbeCJBPSthzLt8KAN3IBXA85yH5P8aQMYSpigjsXgxHzm1Upq5A/AhbCokacTQfk 0MPT+4wB+FzcjUSRuHuhaxo5jCu6ytlH9HPV+MNf9vz56twI5VTTeI9covsF8KDKZZv+dh kXLx5VZswGeHWNqZPJw9p8SPKibx24f/RP3wyHt++7c+TwTCrXj9ZVAQFIgdLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782834; a=rsa-sha256; cv=none; b=n1CYyLognSMk/Xap+ZqG04Wi1sk1W9oPeLtKqBpBID7jLHaxG1K2+UE4yZsmrF+yQmPbpN UOgGrQjgfvlIlYCqKX7dtM2WoPKIiIW2xJX3UbFuxSTmAeGxzWInS0v9GQg5B6rjlqI9pK bKwkk8VCWLksGScubUo4zuHSIiCpO9duWHjWlrzSwxneTZz68/Q3pi6GCSEpDvPM2SV3Kr bCSJHXI6IM+MElFcWORRor4Zofd7s08SFpTfEIUXMO2ZRhjJnG9zverTBgK5/l+9sJkNyZ ifzEZSGuNQyw8Wx7ndWUaBp+YHITgbyc4RK6Uzl1w73dlFBjRPdTD2yZR7bDSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1c5IEuDvAz/zS6F4zW8x5qxYpptDgM0Q85XnZamJ+GU=; b=b2R1f7AqRXr/LW+jDvQb0IeS+Uu67Er5pW96t92OXthKfjCOuZ1ZyM7ddFfysQsRuCVvzq qf8MYZVCXrjU3C4ijwAgZI+BVBCrXDPbxuJtMfIfJlGGs37hcbiCANr78O+zRzElQxLgWX o6Jcj34tfy2V5f1leCnhvF4viqPVURAQQ5L35Ycz8m6bddJLCOsMomvYwxmcVCEQwylxGh r/C1O7k99QUJhEuy66dyPT4hp7Ns4S93ScjBGbU4m4i3XrvObCYwXa9fPX5i1cqpRaw2h4 Sgqvr5ZPszLIw94NVkCbG0fNpX5VDjH8ytNz6XPlTykrlian66uMm6eS0CGNOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6p1xCZzvG6 for ; Sun, 22 Feb 2026 17:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ba44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 92c66dc5f872 - main - pci_dw: improve pci_dw List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92c66dc5f8723083530efbbc5cfa4068105f472c Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:54 +0000 Message-Id: <699b42b2.3ba44.6ae21f80@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=92c66dc5f8723083530efbbc5cfa4068105f472c commit 92c66dc5f8723083530efbbc5cfa4068105f472c Author: Michal Meloun AuthorDate: 2024-10-07 16:50:10 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:27 +0000 pci_dw: improve pci_dw Add support for 64-bit ranges. Process 'bus-range' property. Add some debug prints. MFC after: 3 weeks --- sys/dev/pci/pci_dw.c | 78 ++++++++++++++++++++++++++++++++++++++++------------ sys/dev/pci/pci_dw.h | 3 ++ 2 files changed, 63 insertions(+), 18 deletions(-) diff --git a/sys/dev/pci/pci_dw.c b/sys/dev/pci/pci_dw.c index dcc9c0c5e369..7c9448a5593e 100644 --- a/sys/dev/pci/pci_dw.c +++ b/sys/dev/pci/pci_dw.c @@ -55,10 +55,10 @@ #include "pcib_if.h" #include "pci_dw_if.h" -#ifdef DEBUG -#define debugf(fmt, args...) do { printf(fmt,##args); } while (0) +#if 0 +#define dprintf(fmt, args...) do { printf(fmt,##args); } while (0) #else -#define debugf(fmt, args...) +#define dprintf(fmt, args...) #endif #define DBI_WR1(sc, reg, val) pci_dw_dbi_wr1((sc)->dev, reg, val) @@ -92,7 +92,7 @@ pci_dw_dbi_read(device_t dev, u_int reg, int width) sc = device_get_softc(dev); MPASS(sc->dbi_res != NULL); - + dprintf("%s: reg: 0x%04X, width: %d\n", __func__, reg, width); switch (width) { case 4: return (bus_read_4(sc->dbi_res, reg)); @@ -113,6 +113,8 @@ pci_dw_dbi_write(device_t dev, u_int reg, uint32_t val, int width) sc = device_get_softc(dev); MPASS(sc->dbi_res != NULL); + dprintf("%s: reg: 0x%04X, val: 0x%08X, width: %d\n", __func__, + reg, val, width); switch (width) { case 4: @@ -162,7 +164,7 @@ pci_dw_check_dev(struct pci_dw_softc *sc, u_int bus, u_int slot, u_int func, return (true); } - /* we have only 1 device with 1 function root port */ + /* we have only 1 device with 1 function on root port */ if (slot > 0 || func > 0) return (false); return (true); @@ -434,9 +436,14 @@ pci_dw_decode_ranges(struct pci_dw_softc *sc, struct ofw_pci_range *ranges, nmem = 0; for (i = 0; i < nranges; i++) { - if ((ranges[i].pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) == - OFW_PCI_PHYS_HI_SPACE_MEM32) + switch (ranges[i].pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) { + case OFW_PCI_PHYS_HI_SPACE_MEM32: + case OFW_PCI_PHYS_HI_SPACE_MEM64: ++nmem; + break; + default: + break; + } } sc->mem_ranges = malloc(nmem * sizeof(*sc->mem_ranges), M_DEVBUF, @@ -445,8 +452,9 @@ pci_dw_decode_ranges(struct pci_dw_softc *sc, struct ofw_pci_range *ranges, nmem = 0; for (i = 0; i < nranges; i++) { - if ((ranges[i].pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) == - OFW_PCI_PHYS_HI_SPACE_IO) { + switch (ranges[i].pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) { + + case OFW_PCI_PHYS_HI_SPACE_IO: if (sc->io_range.size != 0) { device_printf(sc->dev, "Duplicated IO range found in DT\n"); @@ -462,9 +470,10 @@ pci_dw_decode_ranges(struct pci_dw_softc *sc, struct ofw_pci_range *ranges, "trimming window size to 4GB\n"); sc->io_range.size = UINT32_MAX; } - } - if ((ranges[i].pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) == - OFW_PCI_PHYS_HI_SPACE_MEM32) { + break; + + case OFW_PCI_PHYS_HI_SPACE_MEM32: + case OFW_PCI_PHYS_HI_SPACE_MEM64: MPASS(nmem < sc->num_mem_ranges); sc->mem_ranges[nmem] = ranges[i]; if (sc->mem_ranges[nmem].size > UINT32_MAX) { @@ -475,6 +484,13 @@ pci_dw_decode_ranges(struct pci_dw_softc *sc, struct ofw_pci_range *ranges, sc->mem_ranges[nmem].size = UINT32_MAX; } ++nmem; + break; + + default: + device_printf(sc->dev, + "%s: Unsupported range type (0x%X)\n", + __func__, ranges[i].pci_hi & + OFW_PCI_PHYS_HI_SPACEMASK); } } @@ -703,6 +719,7 @@ pci_dw_init(device_t dev) struct pci_dw_softc *sc; int rv, rid; bool unroll_mode; + u_int32_t br[2]; sc = device_get_softc(dev); sc->dev = dev; @@ -710,11 +727,30 @@ pci_dw_init(device_t dev) mtx_init(&sc->mtx, "pci_dw_mtx", NULL, MTX_DEF); - /* XXXn Should not be this configurable ? */ - sc->bus_start = 0; - sc->bus_end = 255; - sc->root_bus = 0; - sc->sub_bus = 1; + if (OF_hasprop(sc->node, "bus-range")) { + rv = OF_getencprop(sc->node, "bus-range", br, sizeof(br)); + if (rv < 0) { + device_printf(dev, + "Cannot read 'bus-range' property: %d\n", rv); + rv = ENXIO; + goto out; + } + if (rv != 8) { + device_printf(dev, + "Malformed 'bus-range' property: %d\n", rv); + rv = ENXIO; + goto out; + } + sc->bus_start = br[0]; + sc->bus_end = br[1]; + } else { + sc->bus_start = 0; + sc->bus_end = 255; + } + sc->root_bus = sc->bus_start; + sc->sub_bus = sc->bus_start + 1; + dprintf("%s: bus range[%d..%d], root bus %d, sub bus: %d\n", __func__, + sc->bus_end, sc->bus_start, sc->root_bus, sc->sub_bus); /* Read FDT properties */ if (!sc->coherent) @@ -724,6 +760,8 @@ pci_dw_init(device_t dev) sizeof(sc->num_lanes)); if (rv != sizeof(sc->num_lanes)) sc->num_lanes = 1; + dprintf("%s: num lanes: %d\n", __func__, sc->num_lanes); + if (sc->num_lanes != 1 && sc->num_lanes != 2 && sc->num_lanes != 4 && sc->num_lanes != 8) { device_printf(dev, @@ -769,7 +807,6 @@ pci_dw_init(device_t dev) &sc->dmat); if (rv != 0) goto out; - rv = ofw_pcib_init(dev); if (rv != 0) goto out; @@ -778,6 +815,9 @@ pci_dw_init(device_t dev) if (rv != 0) goto out; + dprintf("%s: version: 0x%08X, version type:0x%08X\n", __func__, + DBI_RD4(sc, DW_MISC_VERSION), DBI_RD4(sc, DW_MISC_VERSION_TYPE)); + unroll_mode = pci_dw_detect_atu_unroll(sc); if (bootverbose) device_printf(dev, "Using iATU %s mode\n", @@ -786,6 +826,7 @@ pci_dw_init(device_t dev) rid = 0; rv = ofw_bus_find_string_index(sc->node, "reg-names", "atu", &rid); if (rv == 0) { + dprintf("%s: Have 'atu' regs\n", __func__); sc->iatu_ur_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->iatu_ur_res == NULL) { @@ -798,6 +839,7 @@ pci_dw_init(device_t dev) sc->iatu_ur_offset = 0; sc->iatu_ur_size = rman_get_size(sc->iatu_ur_res); } else if (rv == ENOENT) { + dprintf("%s: Using 'dbi' regs for atu\n", __func__); sc->iatu_ur_res = sc->dbi_res; sc->iatu_ur_offset = DW_DEFAULT_IATU_UR_DBI_OFFSET; sc->iatu_ur_size = DW_DEFAULT_IATU_UR_DBI_SIZE; diff --git a/sys/dev/pci/pci_dw.h b/sys/dev/pci/pci_dw.h index 388eae86e40f..5b6f62ad6c84 100644 --- a/sys/dev/pci/pci_dw.h +++ b/sys/dev/pci/pci_dw.h @@ -61,6 +61,9 @@ #define DW_MISC_CONTROL_1 0x8BC #define DBI_RO_WR_EN (1 << 0) +#define DW_MISC_VERSION 0x8F8 +#define DW_MISC_VERSION_TYPE 0x8FC + /* Legacy (pre-4.80) iATU mode */ #define DW_IATU_VIEWPORT 0x900 #define IATU_REGION_INBOUND (1U << 31) From nobody Sun Feb 22 17:53:56 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6s0bLBz6TVtB for ; Sun, 22 Feb 2026 17: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 4fJs6r4FSBz3vq1 for ; Sun, 22 Feb 2026 17: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=1771782836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rfjnMQFdTvKEehhaumXzHeqcvFFPuhgRwD/aDnyqQ2s=; b=UHG5Ql3TCFH2wSmwYEzLVTUpzcNE+xULptYCdYEIEbjdHkIVRVKM8xyULE2LWU2g4udCGr uCrdTx/6xt2gTRA8lOvA6myqUYVQ8i2tNtCNYfKO/fhZWqZgLm74JlPDUUY5TTsZ95SLJx 7JZ6mzqV5y7DCr3Ub+vbwI7V6YTfvUklBTWL5Fjb55kEmvy3+RJWUAmF38j7FzP2lbSzzU i3m7EoY2QsFr7eE8WoDL2/71+KyDsEuYu1Zdm1sCxbhmUiwKWw0LVj6jxqj3yb3h/w18lU lJIGcTRcZHYgx4ia8GMk2gZMYCiqKhbDZ7Va9eoQ8tzmSGdKAwNdR23aywDnzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782836; a=rsa-sha256; cv=none; b=CIDCXNnU6hoAtmNHJBQPMISb7fYpqisKrea3f16tKuEroN5RcaTBsrwF3IhZsOj10cF1G2 K+h0QR9ANpkpK+8gn1YuDcsKgeLjdUlMT29bgRcjIZmQQbM+UImm/FBAQTXft8i5SNWd19 XmCMnVlS579vb29zN0gkyaEc2gjA9pY4aKxzq8fEqXTvdzyESrJPghqybFlv2SD57h5X+C I6KytvyuLiw7rSAjGwBZE5NAIiYyywv3Ep/y+XfxOS1YgYATvYhIay3nujxAJL44qApcTF ZqYL3Ho90Yi5PiuGvOquLfZTcVPidVvHLSHX3LqhqKTI/Sjp3ezKT7sKwczzoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rfjnMQFdTvKEehhaumXzHeqcvFFPuhgRwD/aDnyqQ2s=; b=IhY+NKoFB8NYqlo2sV4sHu++AiPsfROefbPurPU/0KH+LTBwaaDY4pVsfih2DjWWQsrKlD OOV5o1OlF8CxfYWt4T7SjDiE+N/Hj97t4p4WIfdK51/xIlOG82ijyJ60zIx9u6S7Dp1bM/ pJ/lqKlRiKD1XqPOLYhP3EulHlMOwdqCo9+Ho2guC86niyVthom572sZ9R3nm1H/aa7VvT DUfF4wr2OJxm3AAX934v992S4nfaFVTtEGvx5pbGS0oNfDIFAbWE/I38YiDo994wnA8g73 h4GrU5OboHUuhZQdwSgPjK6aDO7HUwfF7CpqaEuWirHfBlzJZCEz7Wsc/z96rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6r3P8CzvG8 for ; Sun, 22 Feb 2026 17:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bfb5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: dc9a7b15b78b - main - HYM8563: Add HYM563 RTC driver to common config. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc9a7b15b78b2b3d141c3a8c83fb2c88b54c2762 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:56 +0000 Message-Id: <699b42b4.3bfb5.746aea39@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=dc9a7b15b78b2b3d141c3a8c83fb2c88b54c2762 commit dc9a7b15b78b2b3d141c3a8c83fb2c88b54c2762 Author: Michal Meloun AuthorDate: 2025-11-06 19:52:50 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:28 +0000 HYM8563: Add HYM563 RTC driver to common config. MFC after: 3 weeks --- sys/conf/files | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/files b/sys/conf/files index b330727b58c6..4913efebf00d 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1852,6 +1852,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 From nobody Sun Feb 22 18:08:09 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJsRG0dRCz6TX58 for ; Sun, 22 Feb 2026 18:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJsRF4pBCz40jv for ; Sun, 22 Feb 2026 18:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771783689; 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=3g1wAZIGix/TMe0swshJGiIgq7VuA5oOdRAQfh9nHVM=; b=EWRVUEENh4ux2aoStxRQqYPihWSnwcHmsAgqHtqaewAybpadfydRyCW+PfPS6rbZKNdLZ6 WKpgfmdvmLdi1O4YBDmxhN7M3g8S9O9LqdJ+T57gqWa63PVsl7EsVQoph2uzegdwiMqEqB bALm8snZD1zqM0FSu4Kgon1DV+DJY3eqkEik24V/AOFDAD6sdzE9974n/gIq/5BoVa3haM CuzzxUG5Ft/mghgvAvfaHB6rtPe6bxKYhTKgGNe1w/xajvNlwxeza3ihOI0f0sSmiUpHZH vG/9LNUBsfhtqjF++6Rz/P5lA8ZwPdPQ1qP1Zw/2kzw3MF+xMwAUmiJsmj34Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771783689; a=rsa-sha256; cv=none; b=l+BUq3KjFE4gu+zcw0gLeA+GifhacKdj38Ske8x7Nns/wsgUSOSRFjCOgT6kZ+p9PPLJ9t /KQoHvSd49tW6wGo5hZ6Nh3CYm7QZWpyASHolPeMgTQ2gKQ1G+8z5fiHhx2QKWI3wKThMU 0MdPB9MptZEPZvPVPz2HDGgYgSzBI3/gETeQ4JrVQSY8o+NzF9QummhaF99tGGkYcr4nvk gT79qn2obs6gKNsa6he19E1rIZbuQuxDMRxvWCf7YU1Xb3UNbaUXAcKabNg2bYDX3YWkNA EKBfelftDmevY73sz1+EKKtnDWNPSXZ2rcArC7sGMXFp5QDVpMYPBB44jF98zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771783689; 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=3g1wAZIGix/TMe0swshJGiIgq7VuA5oOdRAQfh9nHVM=; b=a6M6ySX5yk5SO7QJ4e94IRs03VkdPfY4J8mYwY9n2JGS3kW7W+g7wHp6HXNvdTnt9PA3qE mb4OXPO0kvu+wC9VdyfPbDv/kzYuP+8u4gQItp3iT75f8QharB47E/1IuRMJrbgTQ4OYbu cW3rfDUYxCjjNQ8/w0VfxF/hRhI56sILE8K+kaefaS0KIC4uKqdF5eZHwc0qCnu8KMdd8y c0IzxtwkaiPAU7FMfK+xx3CbRZddGrtyEL1PFZqTaTFKCYaYyC3WCrxV6kcc99Oq0d47e7 ytyhQ/Ug6VuDBQSOHs/jU8DLa/mYvQZK8QDyqQoujI3CgOFL2Ao+ouutwfe8rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJsRF3Y76zvc0 for ; Sun, 22 Feb 2026 18:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cb04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 18:08:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: John From: Adrian Chadd Subject: git: d5ca52182e52 - main - rge: fix callout setup/teardown; handle invalid ethernet address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5ca52182e522a192d0c8fbdaa438f50e200082f Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 18:08:09 +0000 Message-Id: <699b4609.3cb04.61c61729@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ca52182e522a192d0c8fbdaa438f50e200082f commit d5ca52182e522a192d0c8fbdaa438f50e200082f Author: John AuthorDate: 2026-02-22 18:06:39 +0000 Commit: Adrian Chadd CommitDate: 2026-02-22 18:07:29 +0000 rge: fix callout setup/teardown; handle invalid ethernet address * Do the callout init early; since some of the teardown path expects the callout to be valid * Handle an invalid ethernet address by generating a local one. PR: kern/293307 Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D55419 --- sys/dev/rge/if_rge.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index 443acbbd77c3..5daede0ac95d 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -67,6 +67,9 @@ #include "if_rge_sysctl.h" #include "if_rge_stats.h" +#define ETHER_IS_VALID(addr) \ + (!ETHER_IS_MULTICAST(addr.octet) && !ETHER_IS_ZERO(addr.octet)) + #define RGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) static int rge_attach(device_t); @@ -182,7 +185,7 @@ rge_attach_if(struct rge_softc *sc, const char *eaddr) static int rge_attach(device_t dev) { - uint8_t eaddr[ETHER_ADDR_LEN]; + struct ether_addr eaddr; struct rge_softc *sc; struct rge_queues *q; uint32_t hwrev, reg; @@ -196,6 +199,8 @@ rge_attach(device_t dev) mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); + callout_init_mtx(&sc->sc_timeout, &sc->sc_mtx, 0); + /* Enable bus mastering */ pci_enable_busmaster(dev); @@ -465,9 +470,15 @@ rge_attach(device_t dev) goto fail; } - rge_get_macaddr(sc, eaddr); + rge_get_macaddr(sc, eaddr.octet); RGE_UNLOCK(sc); + if (!ETHER_IS_VALID(eaddr)) { + device_printf(dev, + "No MAC address found. Using ether_gen_addr().\n"); + ether_gen_addr_byname(device_get_nameunit(dev), &eaddr); + } + if (rge_allocmem(sc)) goto fail; if (rge_alloc_stats_mem(sc)) @@ -481,7 +492,7 @@ rge_attach(device_t dev) ifmedia_set(&sc->sc_media, IFM_ETHER | IFM_AUTO); sc->sc_media.ifm_media = sc->sc_media.ifm_cur->ifm_media; - rge_attach_if(sc, eaddr); + rge_attach_if(sc, eaddr.octet); /* * TODO: technically should be per txq but we only support @@ -501,8 +512,6 @@ rge_attach(device_t dev) TASK_INIT(&sc->sc_tx_task, 0, rge_tx_task, sc); - callout_init_mtx(&sc->sc_timeout, &sc->sc_mtx, 0); - return (0); fail: rge_detach(dev); From nobody Sun Feb 22 18:08:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJsRH0Hf1z6TWxr for ; Sun, 22 Feb 2026 18:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJsRG50Gzz40pr for ; Sun, 22 Feb 2026 18:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771783690; 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=0x6qA/EZxv7HRj7V6yyHbSURxOGMR+08Ju0qYuAzkgg=; b=R/2QcE2WI0HXSpxNzfEi4+Ple0ISgr9VE2l5hJEsQNeZdD/h6xgt3kE/W8ZH2VswbgEgFv snqGkKvqeNYLJKtnqjIQetcBv3mSLuiHdEknI7ztE/gerEStcvG7OASxQqWhVw+9+xJT7t E4J+5EQFFTw4uPMdi5bFhZgpr1RvoPF6jWGo2/W0PlpW1myrrLYsVRRXTidgbdEM0TBSDz 67jeQKdRcMkRBuadk3EQ47kABacWQOvJ3gtZru5Jc0PFhB0B0gufW5psgVZRtkxprjXdTv BdWkRGvptzWkpSqo7A5XSNa23lg1KQdKG/QYd8dnPdhDF077LqNb2Xr64U4vVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771783690; a=rsa-sha256; cv=none; b=jrvjHMuVCyGzi4xafk5cjEWxUHdsvRmw5BQl54o9L10H5fAdfdByu3py9zS9ZyiV93XRxa 6tHFX+OrScGbX0JzF8YuexGVTRh7nQaYV94cSIeE/CLMNiRWNX7bxe8RYrRNq4dJdBLDcv rMreJaUxPXnA+WUuT+tv91lbCcnRuOjAslqTnBVR/aVILQlXQa7LHppXSFNZt9lp/Oratm HsqwQqROavc5IeMU67dQebNJ9qQibH2Da7GLN4urN0HuBWmJ7AvF95p9RXIe4wRzXlnPlt pPQ99fpZL0kPLzUzm9hPSRdX4I4YyXOLsZgm4Vq7rBfufY0DbpL0QkqQFvaE+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771783690; 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=0x6qA/EZxv7HRj7V6yyHbSURxOGMR+08Ju0qYuAzkgg=; b=vvygrXHye9AsRCNGwUt4TkL4twu1X7L3C0163xms9Jn7eRnDQrrVqo+gYRw9lQkic8bbxe WgPjFkxxpeLnBfgYyAySHyn2dGfL/NC0uJsyqXPNtigrtGPG+AhYSUPT/ksMVjrqRGkDiL BPz+KnmijXtsKtFBAKYJ+0eTt/paxVu5fCXLj9ILxC5L1KMlM70QX8C4UAOnSfT7dmJ5H3 f7xhE+eYatlccxY0HmeZFt2kAeYeXsMdemhyahCYF9CfuuRaCQr68fjgSqIe/CF+yUgi44 quIk6MrHKf98bcPX0o7uflJ2MZ2yXSBrgGjgSgKaDOU2M6ccScyXE28NqBp0oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJsRG4Jh4zvRs for ; Sun, 22 Feb 2026 18:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d832 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 18:08:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: John From: Adrian Chadd Subject: git: d1947d0a1a55 - main - rge: correctly free busdma memory / zero things out only if allocated List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1947d0a1a55f905e5ed076d46d4f75a00c6f823 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 18:08:10 +0000 Message-Id: <699b460a.3d832.185f41ce@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=d1947d0a1a55f905e5ed076d46d4f75a00c6f823 commit d1947d0a1a55f905e5ed076d46d4f75a00c6f823 Author: John AuthorDate: 2026-02-22 18:06:44 +0000 Commit: Adrian Chadd CommitDate: 2026-02-22 18:07:34 +0000 rge: correctly free busdma memory / zero things out only if allocated * Only free busdma memory that was allocated * Don't free tx/rx rings until their buffers have also been freed PR: kern/293307 Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D55420 --- sys/dev/rge/if_rge.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index 5daede0ac95d..dfa6cd1325e5 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -1762,13 +1762,6 @@ rge_freemem(struct rge_softc *sc) RGE_ASSERT_UNLOCKED(sc); - /* TX desc */ - bus_dmamap_unload(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list_map); - if (q->q_tx.rge_tx_list != NULL) - bus_dmamem_free(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list, - q->q_tx.rge_tx_list_map); - memset(&q->q_tx, 0, sizeof(q->q_tx)); - /* TX buf */ for (i = 0; i < RGE_TX_LIST_CNT; i++) { struct rge_txq *tx = &q->q_tx.rge_txq[i]; @@ -1800,12 +1793,13 @@ rge_freemem(struct rge_softc *sc) } } - /* RX desc */ - bus_dmamap_unload(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list_map); - if (q->q_rx.rge_rx_list != 0) - bus_dmamem_free(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list, - q->q_rx.rge_rx_list_map); - memset(&q->q_rx, 0, sizeof(q->q_tx)); + /* TX desc */ + if (q->q_tx.rge_tx_list != NULL) { + bus_dmamap_unload(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list_map); + bus_dmamem_free(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list, + q->q_tx.rge_tx_list_map); + } + memset(&q->q_tx, 0, sizeof(q->q_tx)); /* RX buf */ for (i = 0; i < RGE_RX_LIST_CNT; i++) { @@ -1830,6 +1824,14 @@ rge_freemem(struct rge_softc *sc) } } + /* RX desc */ + if (q->q_rx.rge_rx_list != NULL) { + bus_dmamap_unload(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list_map); + bus_dmamem_free(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list, + q->q_rx.rge_rx_list_map); + } + memset(&q->q_rx, 0, sizeof(q->q_tx)); + return (0); } @@ -1845,9 +1847,10 @@ rge_free_stats_mem(struct rge_softc *sc) RGE_ASSERT_UNLOCKED(sc); - bus_dmamap_unload(sc->sc_dmat_stats_buf, ss->map); - if (ss->stats != NULL) + if (ss->stats != NULL) { + bus_dmamap_unload(sc->sc_dmat_stats_buf, ss->map); bus_dmamem_free(sc->sc_dmat_stats_buf, ss->stats, ss->map); + } memset(ss, 0, sizeof(*ss)); return (0); } From nobody Sun Feb 22 18:08:11 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJsRH6crSz6TX81 for ; Sun, 22 Feb 2026 18:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJsRH5Rjbz40dS for ; Sun, 22 Feb 2026 18:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771783691; 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=gEQz+f6UkMfB3uxlG9RbWacyG5ng/lZ32m7vdwIAuQo=; b=ZBGWDmQqtXSq1UYtCbNODfFms6DAYqg7VW2R/GnKGLgw+WWhsbIMWPTBSXUg67r2emgput +YFm55PmR1BSyjuRqLsyEDS50YIX3Z/Moh4mcuQAQY7brVnTbJeXxBhDkfPJr/WywcsdOG OZ+MaD7h3i12TQq1sz7Sl2FuNyIntK3N2pDK66mXw+rA+uGMz3cCIs2IoggJKCdeGCAgIX VcpckopFVR080PfhwaIfNPULPsQLjBCpP4txvbMxD+rC4W6ynLXm554x0ruPnV6Ec82//1 HPndhAwlABkx4EHbUrqd4Iv/DrzuRoJjP7OGgv/pv40KECOzMauvt7OZn8XBrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771783691; a=rsa-sha256; cv=none; b=S3uqUPzt7VyufiKXbEvgvBJi1f83VCBi2ybv7ebKx+UVRNY/8hnh2KpfWiOB2F6wpTwi1r WtUzZKCU0/RF29kRpzST2USazou8rC56eUDK21Th7ns2Hg1CI3pt70W7BmSrF1s69jaiP/ Pc+ScX6SdHLZ6aopr9RKgjK15OqL5G3rIE2gdxWhJvXoNAojT6vrLrivl4jLxxgLq6aafz /ML7937/69VQfAuSklW4Yb8Ht3XI8kJSnc+JmpFolkodoJGOLxwuEa7wsPEzBU7QttOPB6 oRdvDfcPss6WftYIj4iv31ku6V99RY3lZ/+mCg9RLhCPi4aYCkt81md1cvHzEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771783691; 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=gEQz+f6UkMfB3uxlG9RbWacyG5ng/lZ32m7vdwIAuQo=; b=lh3GMk8L9DjRJfKiakerb0nU+6EUff4gK9pXxTRbOoEG5vQpkTKBdubqtP+gxL37u1Jl0m lEmhIDanYq+T1jnQ0XbgDlsvRFgDhmYvCROYmi+WNwS5O+Vm6HznZs5sfiIZTpbcbkz4v3 2XUe9JrcfYxyXgbyWfavEP708B7fFOrl6+Dqw1Iw/4MU8bCudlNeyRlFWa3boqwXHX8n0m uaNf0C/yAKXZrkzBNRBlk9tL8/O5nb/W1ce0NpfB9MXXcm8a1Y3yUd2orQt/Yp7Pc5K7xs f1qmusK0acr7sjx0NIZ8Q2+tTxni2vzZ1RDL97NFN/bbqZ00ksOlXWAKylTW6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJsRH4tcSzvc2 for ; Sun, 22 Feb 2026 18:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d256 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 18:08:11 +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: acbf7498f5e1 - main - rge: log silicon revision during attach List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acbf7498f5e11b00ffcd6c12bdb8bd1eddeb6d7f Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 18:08:11 +0000 Message-Id: <699b460b.3d256.1396c93@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=acbf7498f5e11b00ffcd6c12bdb8bd1eddeb6d7f commit acbf7498f5e11b00ffcd6c12bdb8bd1eddeb6d7f Author: Christos Longros AuthorDate: 2026-02-22 18:06:50 +0000 Commit: Adrian Chadd CommitDate: 2026-02-22 18:07:37 +0000 rge: log silicon revision during attach The initial import from OpenBSD contained chip revision printf() calls commented out, as OpenBSD's bare printf() style does not translate to FreeBSD's device_printf() idiom. The result is that users cannot distinguish RTL8125 from RTL8125B, RTL8125D_1, RTL8125D_2 etc. via dmesg alone, even though all variants show as '' from the PCI probe string. Add proper device_printf() calls including the raw hwrev value, consistent with how re(4) reports chip revisions. Signed-off-by: Christos Longros Reviewed by: zlei, imp, adrian Differential Revision: https://reviews.freebsd.org/D55402 --- sys/dev/rge/if_rge.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index dfa6cd1325e5..b2f1311b4c87 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -413,31 +413,31 @@ rge_attach(device_t dev) switch (hwrev) { case 0x60900000: sc->rge_type = MAC_R25; -// device_printf(dev, "RTL8125\n"); + device_printf(dev, "chip rev: RTL8125 (0x%08x)\n", hwrev); break; case 0x64100000: sc->rge_type = MAC_R25B; -// device_printf(dev, "RTL8125B\n"); + device_printf(dev, "chip rev: RTL8125B (0x%08x)\n", hwrev); break; case 0x64900000: sc->rge_type = MAC_R26_1; -// device_printf(dev, "RTL8126_1\n"); + device_printf(dev, "chip rev: RTL8126_1 (0x%08x)\n", hwrev); break; case 0x64a00000: sc->rge_type = MAC_R26_2; -// device_printf(dev, "RTL8126_2\n"); + device_printf(dev, "chip rev: RTL8126_2 (0x%08x)\n", hwrev); break; case 0x68800000: sc->rge_type = MAC_R25D_1; -// device_printf(dev, "RTL8125D_1\n"); + device_printf(dev, "chip rev: RTL8125D_1 (0x%08x)\n", hwrev); break; case 0x68900000: sc->rge_type = MAC_R25D_2; -// device_printf(dev, "RTL8125D_2\n"); + device_printf(dev, "chip rev: RTL8125D_2 (0x%08x)\n", hwrev); break; case 0x6c900000: sc->rge_type = MAC_R27; -// device_printf(dev, "RTL8127\n"); + device_printf(dev, "chip rev: RTL8127 (0x%08x)\n", hwrev); break; default: RGE_PRINT_ERROR(sc, "unknown version 0x%08x\n", hwrev); From nobody Sun Feb 22 19:27:06 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJvBL3v6Dz6TdNj for ; Sun, 22 Feb 2026 19:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJvBL38cjz3DRh for ; Sun, 22 Feb 2026 19:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771788426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3xNQL5ULDe0mUGvCr0TWVqw56uHjc7CdhBES5gYeeTU=; b=CeGwccMm6joSjxHYP6gBMbuS1kiONFgb6BJ8xvJZ25P9QYJTifOFl7JgHwnAwxNv9410Sg pHMTFMJ5JEDsjF2idkJduWfugWHE5FusyzBQT5z162T4ua5e3HdOIENnRdjwQI9DPZGlhd AiMVbPZnU+aGnsYSAxm1/bucZsQQPKFvsjbi4cHL0uFJ0fcH2NGWO2gAR59V0ClrbyNlp8 tb3WTxMZ11mQcTE+cBIjX8kxU5y83U5K5ag88lNO0xb+AUv8haQ/kBh54jZ9oXzE3TfxmR TA4e8WOuGo7njh4ZlbTcN4k0LPgbKlu0+26Lu/+kAHLkhKqaJ/PUwi8WYTBx6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771788426; a=rsa-sha256; cv=none; b=UDSrFiaDLIIhV0FnGkI7Lhee2DTelbpfSjJyzWJMJVF4j8bLn9i9d0M1cN9OMMFY4hB8gY fN1Dy7RSd5nAMRNnRtQcab//lT4DLteZlS02sVYWum+zf0XaVsziYtpK//N2Rdude7gEGT MvRVlPdiSx+oWXqH/0buT+FO36xC+6BIbJVfxmTMoG9X9gFtL8Wscn5eYusmIhehIsf2M2 KtXci/GSalWE8WzqCrfFxFV+DhBLXSlggfPrgZa+h/NOpjPRffFgeN2twQK6AhCfuqrDnc RTnAMcUHPG5F3II/4nQH1sefwMXjHfeZngI0cAeAWNqekx0TcdtNDOcC+JpnjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771788426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3xNQL5ULDe0mUGvCr0TWVqw56uHjc7CdhBES5gYeeTU=; b=r5HEEDm8yuRdBEkpXpIbm7go+jvG6OAV8m32sfssxvc3w/EQYBM2+nGm95//PIiNDbkmxW 0lTNx8HIK3bkJFANzeURulvH0+c3P1qSuoe9AazzMSjc+shydvZIWU7NM88smVTyHyeDL7 Us8XLITZQD3UWKQWyxu3LVoSircn+4Ycr2J8X+Lw27A7APULinOto4SCc3EDRPHYqUH/0B dBBD7OoiR3KAwNWCHYfJZxG6mxswbuAKBZk1r/ZhXYur3uWgI4WpGCUaolKfYl21cw+dOE ZJSJtlbRqGUG3/4/kddILbMg6WIm6BuKeTJjfzvZ0C9stqAtyiM0myXJHJj3AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJvBL1pnSzxSh for ; Sun, 22 Feb 2026 19:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4376d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 19:27:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: eaeb356ce349 - main - buf: Relax an assertion in BUF_UNLOCK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaeb356ce3491f05b6a99ccd485180a42df22c46 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 19:27:06 +0000 Message-Id: <699b588a.4376d.7292a010@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eaeb356ce3491f05b6a99ccd485180a42df22c46 commit eaeb356ce3491f05b6a99ccd485180a42df22c46 Author: Mark Johnston AuthorDate: 2026-02-22 19:26:17 +0000 Commit: Mark Johnston CommitDate: 2026-02-22 19:26:17 +0000 buf: Relax an assertion in BUF_UNLOCK The BUF_UNLOCK macro asserts that B_REMFREE is not set, as it is up to the lock owner to complete the dequeue from the free list before releasing the lock. However, if the thread has acquired the lock multiple times, then releasing the recursive lock should be ok. Modify the assertion to reflect this. This was triggered by an out-of-tree filesystem. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55418 --- sys/sys/buf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/buf.h b/sys/sys/buf.h index f08f05e6d50f..85ff5f3dfdc1 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -321,7 +321,7 @@ struct buf { * it has been handed off to biodone. */ #define BUF_UNLOCK(bp) do { \ - KASSERT(((bp)->b_flags & B_REMFREE) == 0, \ + KASSERT(((bp)->b_flags & B_REMFREE) == 0 || BUF_LOCKRECURSED(bp), \ ("BUF_UNLOCK %p while B_REMFREE is still set.", (bp))); \ \ BUF_UNLOCK_RAW((bp)); \ From nobody Sun Feb 22 19:54:02 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJvnQ4SJ0z6Tg9h for ; Sun, 22 Feb 2026 19:54: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 4fJvnQ3nzNz3Gfl for ; Sun, 22 Feb 2026 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771790042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=otXTvgufF54habMtzgt6rN8hxB1+AdwEQReVTsTZlME=; b=FVRyyYnmmDk4XtwczDwEFsjFZ2+OCIwQsXYcDXbIYYRkkmxv8k60FD10Li2y/6WiT+M/8Y lsPMreVpkyej30Ubh7gzllXvrUchwlD7dpmlK27exP9bdvQjr49GvXfrl5uOBHSrR++oNY 6AZ6T7Z4jfFb2UFj+9xLGcN/piK05vCedePam7p39Aroy54wgAgTHA5gn7AjZDI2he/iFT hEWGrBAKVIY6M3kMJwvH7c/nveclXABP9qbNnXplilxkEouyWpaR8h3Av6/oj21MdDzumB KpSZIGYKNhfP05O8soeHfRmZs66lFw+ZgJrLsr90tFrCJrY2LdG9BM9Mg+ZIUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771790042; a=rsa-sha256; cv=none; b=L+uvnvfsZpbhK2BPMv/IY6R+TwM7CkJhwRUyVZRZF8p3b/RKEV+6aEPnPnup9ypgF5qp6b tx7p//swgZrvE4V7VFxzjM5QXkWkfRt241xZBnfKXzgv4QSmBvxHSUsq3hxCFVzjOCzwpY QcphptFLSiTuXUUr7PBjkQuQzMHGcdf0OzIUEhaOY6XKsERt5ciBw02FBDC96YEinL63Wi Cj/R4qHVKHBfd80HDWa/VAXujosMPfb3JNDeSfQ+p6JofPVKVbyMMSVCWl1S5F0bT6Snl9 Mni4cRGAMgDhyNSkTcBl7FrTEcNoA2//FAG1OjY5Q7MFKnhc3ynnFTHQu10bPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771790042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=otXTvgufF54habMtzgt6rN8hxB1+AdwEQReVTsTZlME=; b=G8qKSQ26Eu6NTjReu3mT3Mz1dnDpDY2mSFsI2kYy60qMl6Dxp9PbzMZgBFekraPSRHXgJG xgweU+N+EdwXtNshES+AoK4OUA/raRIdkdx83PbNmuHcutXzHG9ptAj/LzIQLBLXeGNRDP gKs9hcbKno271ypLhH+1xIUBG18spssrkEo1YSZsSpeX5+jrp2LGXEZL+lWM1HLuqtUftp 7AzJ6IDJ+ZMnork4YT1iHULmkeIHpiODorAzxEszFzkj0UmRXeQyaXi7aJOJRMNppyx9bw oJ2SK9Mduns2rYf5S0G7R4Oxpm28w/0mOjuGd4dc27VXTaKI8trgSK0GUhQD/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJvnQ33pWzyLX for ; Sun, 22 Feb 2026 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47532 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 19:54:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 0a492eb9c648 - main - ttys: Align comment whitespace and wrapping List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a492eb9c648e3ee11d36d14f6a0e3ed73b3da92 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 19:54:02 +0000 Message-Id: <699b5eda.47532.57a3f3f7@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=0a492eb9c648e3ee11d36d14f6a0e3ed73b3da92 commit 0a492eb9c648e3ee11d36d14f6a0e3ed73b3da92 Author: Alexander Ziaee AuthorDate: 2026-02-22 07:32:46 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-22 19:50:43 +0000 ttys: Align comment whitespace and wrapping This doesn't lengthen or shorten any configuration, only comments, so merging the configuration will be safe. Reviewed by: imp Closes: https://github.com/freebsd/freebsd-src/pull/2042 --- sbin/init/ttys | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sbin/init/ttys b/sbin/init/ttys index d3ac4546d9be..4aa4ddfce6fe 100644 --- a/sbin/init/ttys +++ b/sbin/init/ttys @@ -2,18 +2,18 @@ # It is used by several different programs. Common entries for the # various columns include: # -# name The name of the terminal device. +# name The name of the terminal device. # -# getty The program to start running on the terminal. Typically a -# getty program, as the name implies. Other common entries -# include none, when no getty is needed, and xdm, to start the -# X Window System. +# getty The program to start running on the terminal. Typically a +# getty program, as the name implies. Other common entries +# include none, when no getty is needed, and xdm, to start the +# X Window System. # -# type The initial terminal type for this port. For hardwired -# terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically xterm. -# Other common values include dialup for incoming modem ports, and -# unknown when the terminal type cannot be predetermined. +# type The initial terminal type for this port. For hardwired +# terminal lines, this will contain the type of terminal used. +# For virtual consoles, the correct type is typically xterm. +# Other common values include dialup for incoming modem ports, +# and unknown when the terminal type cannot be predetermined. # # status Must be on or off. If on, init will run the getty program on # the specified port. If the word "secure" appears, this tty @@ -21,7 +21,7 @@ # # name getty type status comments # -# If console is marked "insecure", then init will ask for the root password +# If console is marked "insecure", init will ask for the root password # when going to single-user mode. console none unknown off secure # From nobody Sun Feb 22 19:54:03 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJvnR4Vj2z6Tg50 for ; Sun, 22 Feb 2026 19:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJvnR3tWKz3GTC for ; Sun, 22 Feb 2026 19:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771790043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kv/we3iH4py2ODkFS7BWUDBrVmiWcchik8sSDITcATc=; b=HaUsJMZASia5WkZQSjsK+G+cxr5rwsYzF5BbgarslUvy0w/5jwSAkOuTUEJ8ICZDBOuLdu VDoCUtJAIoJ3i8shVnl98eHUHelxnblelE9HMOIDdpHnsE74lIyQJjAlA/9tJAsgEZbOCP mb0LNyleGmDGcWE4bZk6G0fn05Reb6H40EM7M6lexv/YDurIJVQOA1kOlryuWu0jbowKb/ 0+ZdQ1ltrRLWZyISHw6LO+SWhhATiOevjDLO8u1dKkOvc0lrKxuEcg66xLF17veLPV7PVm LeRV/thcrMgo85on3LlMJUnVQSDSUfSD8xW2R907VVN5fqqRLiUz7p2qmqk9vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771790043; a=rsa-sha256; cv=none; b=Zue04JAsL/Ytd4uUdFe/9lZZbTPC7CHYQXnXdSDTKlAziSkLglGkequQOP0AnCF29c57tz AD1fRl0SP/odHWxetIzD4eOOvWNTmIYcnEncSxj8FJxC6epxI7+XmJUMys4vdHfAsVNxwc LnMR3XTAWaQoCfg8cuEmVOGfRDQg0qVRTVg9Kw++oxkGDg3Yz5EWY5k5WpuppEXSgdeVQ7 +9NzAUVS+QHVBErHBrXtBMOFKbHfzMqtSf/HUdhCnxJ/hcM/m5Marbt10ymQINs6JwEoxw 5bTRPk3Z/9QNPLbfjqPDgv6GZrBsDsIk8Bx7dBuPj9JDzoXiqhvxCPt08/X1Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771790043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kv/we3iH4py2ODkFS7BWUDBrVmiWcchik8sSDITcATc=; b=xIqZ48pfFK0z+3a8SxiksFhv69pUdsAU+5uKMRKIM1O9q5cfcs6m6IKD0OgPT4QlbBBVAJ IkOp5vhZ3cazgAOlcYSVdEA/f6wxCQ/E3hp6+/gZkumvi2c7zyNz29R4HVdmDVwgnYI2fu K+U0y+mAqOUms3s5N6kYiw3fE374u+QA0QIkN+uyhvgszzNoH1/xrCRazfoqzobpYVGCGp zZZH1Mcj/5CCcQA+jTq5dRYMrtsQF8gafSKIh71nQhbVA2G/8cdPVRxRHSimdan95RyL7g TRyuk0UQuynWYTJLYX+em7Tws3PMOiJA2GveSBp97wpYIkmfIkQyCU3AyEFIGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJvnR3Sq6zygJ for ; Sun, 22 Feb 2026 19:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47536 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 19:54:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 6d15e0efa0b3 - main - ttys: Correct comment about required statuses List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d15e0efa0b3a85cf69f3c72d3f24f4f97850a03 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 19:54:03 +0000 Message-Id: <699b5edb.47536.1efe20f0@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=6d15e0efa0b3a85cf69f3c72d3f24f4f97850a03 commit 6d15e0efa0b3a85cf69f3c72d3f24f4f97850a03 Author: Alexander Ziaee AuthorDate: 2026-02-22 07:37:45 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-22 19:51:07 +0000 ttys: Correct comment about required statuses The status field also accepts onifconsole and onifexists, so it looks crusty saying that it only accepts on and off. Reviewed by: imp Closes: https://github.com/freebsd/freebsd-src/pull/2042 --- sbin/init/ttys | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/init/ttys b/sbin/init/ttys index 4aa4ddfce6fe..664bb14b02c8 100644 --- a/sbin/init/ttys +++ b/sbin/init/ttys @@ -15,9 +15,9 @@ # Other common values include dialup for incoming modem ports, # and unknown when the terminal type cannot be predetermined. # -# status Must be on or off. If on, init will run the getty program on -# the specified port. If the word "secure" appears, this tty -# allows root login. +# status Must be on, onifconsole, onifexists, or off. If on, init +# will run the getty program on the specified port. If the +# word "secure" appears, this tty allows root login. # # name getty type status comments # From nobody Sun Feb 22 20:03:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJw0k3V1cz6TgT9; Sun, 22 Feb 2026 20:03:50 +0000 (UTC) (envelope-from rpokala@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 4fJw0k2s2Jz3Hyy; Sun, 22 Feb 2026 20:03:50 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771790630; h=from:from:reply-to:subject: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=g5/IZPAZfWDQypafTnGxslkjvilrTMpajAjviGo7d98=; b=aEsmEo4O4HankgPIhAwb5s4bZ4wg3G7yb2YMNoJ5li9W5S6aG905cL86cN+kIw2V0G+Z6C psWRzkLPaz4hjKn57Cb7FMZkguLqqPFUhdwwJmzzf+9bU7EsQHYqoNAytNCp8TvHc3YCi2 cM3kCf1X13HRCvagPoS3JsirTtI4aA1LZBuKVoBiBgQaQlYff3K7dVDReInWTKnOSNHcjK J+MCfvQanWIUPKq8cR/GPfCOJAXq0a0bEoEIRMiBt6hTxviXeYGMgRpX5JEZSig5MD8Cwc 3vWJA5KY+vlbNDIi9VNiZvpQjAf9dpRH8s6Ss/SfBt+CKlKJTzS3jJADfiTrmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771790630; a=rsa-sha256; cv=none; b=ObWeOZF3jPGzW0Or9CoVWV1Y9b7t0PALhkHyzy9gWMKhsiXxqYi5BTiCbpHUUqXcPhpKci JdzP0OLOatuRn1H6AZifNzLmif6QREmGSu3JItR4LnjluFmobJvwCQgG4Kd60FRuNPzCBI dhyyFIz69BC5tgMEHg6FQFAZsEzbsYsh0F0MLUEk2Yh4h4Wn09MIGvPOWvbCIDEithTeKp aoDwux+wqmkFT1giWvICZU0EQyFb8sHbqR4264nWGSOwV1moNqGb5/HDbAZMT/PEiA74Bx x8ik8W0a5vDwJ5eFCM7rNWjR1STGQx8tnkO6jtj5nQ11ExxBdVVhTNv9Wm0Kog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771790630; h=from:from:reply-to:subject: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=g5/IZPAZfWDQypafTnGxslkjvilrTMpajAjviGo7d98=; b=tH3qYun/5XznED0pTp8WCTC6jV4ghNsA5EbpsRScerVkUiJAgNG2dPhNiUifJjG15Dplnu z+xHXoWHvR0LN+KdXA/qtYmGYomeTxbBe9idn4MpXdj/HOmbg9Ftb0g6AvMvkmJZmSLCU+ hXxgzAP5v0HI0EXz0GhRb+jjvYcXK6FzDsB2wo4NzTzKJY5VXKSJREvfSYJ1PVFawDQUSL L5eH2wcfUDHsO/79SZHUiOzQ6Z01mlKpnVB6bdwgYrmbKa34wJlJNkz8FMzQ1rw1e9Yv2W HuSQidPI47FE9eedLLdHMY4mS/+ruGBgxmapLZAbDvaDVbmVbLl/2P+/Q0LUKA== Received: from [192.168.1.10] (c-73-40-187-156.hsd1.pa.comcast.net [73.40.187.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fJw0k0xdzz16gb; Sun, 22 Feb 2026 20:03:50 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.106.26021521 Date: Sun, 22 Feb 2026 15:03:48 -0500 Subject: Re: d4f6cb754249 - main - build: Move all of lp under LPR option From: Ravi Pokala To: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= , , , Message-ID: Thread-Topic: d4f6cb754249 - main - build: Move all of lp under LPR option References: <699a2335.220a6.2c3156ae@gitrepo.freebsd.org> In-Reply-To: <699a2335.220a6.2c3156ae@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable Hi des, Why is the package "lp", when the conditional uses "LPR"? Shouldn't they ma= tch? Thanks, Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of Dag-Erling Sm=C3=B8rgrav > Date: Saturday, February 21, 2026 at 16:27 To: >, >, > Subject: git: d4f6cb754249 - main - build: Move all of lp under LPR option The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dd4f6cb75424950ee776833ebc6b578= 55c094a610 commit d4f6cb75424950ee776833ebc6b57855c094a610 Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2026-02-20 18:20:04 +0000 Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2026-02-21 21:25:49 +0000 build: Move all of lp under LPR option * Tag related directories with package=3Dlp * Make the examples/printing directory conditional on MK_LPR * Make the hosts.lpd(5) manual page conditional on MK_LPR MFC after: 3 days --- etc/mtree/BSD.debug.dist | 4 ++-- etc/mtree/BSD.usr.dist | 6 +++--- share/examples/Makefile | 4 +++- share/man/man5/Makefile | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 18 ++++++++++++++++++ 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 62a6342c9eac..5eabea923cbd 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -61,8 +61,8 @@ libexec bsdinstall .. - lpr - ru + lpr tags=3Dpackage=3Dlp + ru tags=3Dpackage=3Dlp .. .. sendmail diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 3366bf939948..b9ee785ab8b2 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -181,8 +181,8 @@ .. hyperv .. - lpr - ru + lpr tags=3Dpackage=3Dlp + ru tags=3Dpackage=3Dlp .. .. sendmail @@ -352,7 +352,7 @@ .. ppp .. - printing + printing tags=3Dpackage=3Dlp .. scsi_target .. diff --git a/share/examples/Makefile b/share/examples/Makefile index 09bbf820e574..0174792d2ecb 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -25,7 +25,6 @@ LDIRS=3D BSD_daemon \ perfmon \ ppi \ ppp \ - printing \ ses \ scsi_target \ sound \ @@ -250,6 +249,8 @@ SE_PPP=3D \ ppp.secret.span-isp \ ppp.secret.span-isp.working +.if ${MK_LPR} !=3D "no" +LDIRS+=3D printing SE_DIRS+=3D printing SE_PRINTINGPACKAGE=3Dlp SE_PRINTING=3D \ @@ -269,6 +270,7 @@ SE_PRINTING=3D \ psif \ pstf \ pstfX +.endif SE_DIRS+=3D ses SE_SES=3D \ diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index abf4b59d184b..f950df8fdb47 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -75,7 +75,7 @@ MANGROUPS.${MK_TOOLCHAIN}+=3D TOOLCHAIN TOOLCHAINPACKAGE=3D toolchain TOOLCHAIN=3D ar.5 -MANGROUPS+=3D LP +MANGROUPS.${MK_LPR}+=3D LP LPPACKAGE=3D lp LP=3D hosts.lpd.5 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/Opti= onalObsoleteFiles.inc index 81379ea452bb..648d0d3b297d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5292,11 +5292,29 @@ OLD_FILES+=3Dusr/share/doc/smm/07.lpd/paper.ascii.gz OLD_DIRS+=3Dusr/share/doc/smm/07.lpd OLD_FILES+=3Dusr/share/examples/etc/hosts.lpd OLD_FILES+=3Dusr/share/examples/etc/printcap +OLD_FILES+=3Dusr/share/examples/printing/diablo-if-net +OLD_FILES+=3Dusr/share/examples/printing/hpdf +OLD_FILES+=3Dusr/share/examples/printing/hpif +OLD_FILES+=3Dusr/share/examples/printing/hpof +OLD_FILES+=3Dusr/share/examples/printing/hprf +OLD_FILES+=3Dusr/share/examples/printing/hpvf +OLD_FILES+=3Dusr/share/examples/printing/if-simple +OLD_FILES+=3Dusr/share/examples/printing/if-simpleX +OLD_FILES+=3Dusr/share/examples/printing/ifhp +OLD_FILES+=3Dusr/share/examples/printing/make-ps-header +OLD_FILES+=3Dusr/share/examples/printing/netprint +OLD_FILES+=3Dusr/share/examples/printing/psdf +OLD_FILES+=3Dusr/share/examples/printing/psdfX +OLD_FILES+=3Dusr/share/examples/printing/psif +OLD_FILES+=3Dusr/share/examples/printing/pstf +OLD_FILES+=3Dusr/share/examples/printing/pstfX +OLD_DIRS+=3Dusr/share/examples/printing OLD_FILES+=3Dusr/share/man/man1/lp.1.gz OLD_FILES+=3Dusr/share/man/man1/lpq.1.gz OLD_FILES+=3Dusr/share/man/man1/lpr.1.gz OLD_FILES+=3Dusr/share/man/man1/lprm.1.gz OLD_FILES+=3Dusr/share/man/man1/lptest.1.gz +OLD_FILES+=3Dusr/share/man/man5/hosts.lpd.5.gz OLD_FILES+=3Dusr/share/man/man5/printcap.5.gz OLD_FILES+=3Dusr/share/man/man8/chkprintcap.8.gz OLD_FILES+=3Dusr/share/man/man8/lpc.8.gz From nobody Sun Feb 22 20:27:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJwWs4d4Jz6Thx6; Sun, 22 Feb 2026 20:27:21 +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 4fJwWs3yRHz3KX0; Sun, 22 Feb 2026 20:27:21 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771792041; 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=x+jV+LQs7RMWE84INx1xscw18ukcG54bE+aN2D/WbLY=; b=Pl627u0Sp00aCaVUQ+4zmUPGB12tyHP1U1kuauCYwoA4iqzLgzzHRfePfKNZm4TOZi55xu Y9rt9bO/UiSJ1IkoZ3nwcJ4vGU2fHwUgh3vloyczQadjo1t2/3DrRa9eETrbBnqME5Hx+l dtRVQ9aBWAfzUqgxYwLbGbPsZ7WGgGp7ZY+WlmPoEEMuqp5zHWSHZnmUwgL8HiTFohWV+2 kQTCElJNCm2WamtpWG00Vyz0/O1eGD4hGgqibXc7oayWrsRU+TdLGd+fUtAlL8TloVAOGE OWLM14lHSFa/uiRm2imbz3TZWAGHx4N2nkLZUYicm5Iwe0lev+zMAnKkk5VxYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771792041; a=rsa-sha256; cv=none; b=TeT/Edhc+qMOxuVHvvvGo4RMSLbRFxhrJdeaC0tBoOo3GGObn96D3fSGJsdQ9oQlaoTEve E4YIkkbb9ruwFGGehihICazzI5KfHmNziobElcCJJ61qvQXMFJXg5GALC3sT4sJM0wRIlU R5oRbwS6RofYMF7FHzW0G1B3qAz6zxBEn+A00rMTbBlG551V94qcljaF6WuKLn/nwknmV/ 63p9Q+XFqQG3mUqVDNZwymrbf7ZIVulp3WLgKMty8KocqO0UV/ueyg0YXttc3EE5+eeHRt Rgcw+DB4wBs7HfAkueAbJcqq3ysiJOCd8jh3h22H0yjEd0qBVCPp9QrQRoYSJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771792041; 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=x+jV+LQs7RMWE84INx1xscw18ukcG54bE+aN2D/WbLY=; b=mRwjRpMS7XU8S61WlkTXT69xZr2unG4+n9zJCNiaF3Pzgo12OvrQ+nmLa+ml6LDZfsTx4J k2fRPm1SVoC/W45602Iu89cLzMVaqKNyk0Yh7LGqLi8ggBddDSbHT5PSfiOTNTpsqLmY5r fxupPjqVjeSOmXL3L7GfbTKuujQzUb5iMzRwhNibpQAaFRPWGo94zYMKSLHy1oRaUPW/5n Sh6vTsAr20WxlWbUKCc4Bay3TkXdhVDysdzkIyBQzXwHvD0AHwtOmFEFxCXJpnMaYiyIVo tGHxcsvWKecygr9OvSSwBvX+OKY/a0oa4dgcsVo0RCKl1Gugr3JowgFH4cIGxA== 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 4fJwWs2bzGz15bv; Sun, 22 Feb 2026 20:27:21 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 49AC2F7683; Sun, 22 Feb 2026 21:27:19 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ravi Pokala Cc: , , Subject: Re: d4f6cb754249 - main - build: Move all of lp under LPR option In-Reply-To: (Ravi Pokala's message of "Sun, 22 Feb 2026 15:03:48 -0500") References: <699a2335.220a6.2c3156ae@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sun, 22 Feb 2026 21:27:19 +0100 Message-ID: <86zf50ttg8.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ravi Pokala writes: > Why is the package "lp", when the conditional uses "LPR"? idk, try asking the people who picked those names? > Shouldn't they match? should they? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sun Feb 22 20:52:20 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJx4h2X2Zz6S1Zw for ; Sun, 22 Feb 2026 20:52: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 4fJx4h1m5vz3Mkq for ; Sun, 22 Feb 2026 20:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771793540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cy8vMM7vbJ22O45g6bpPiatG5ewpQXgUt87KVoYnA98=; b=RN7a7XNItUH2VTGTcj5gS1m89sXAv69KV6eZJtt+Rfex1v1QMejkojpH/upM0AnglecFcG 8nYOqkY6upPRKYutlHOm3i5EtTvLO1s6mCc3byoGV+Q/dn6Q+juSuaOEsXnkiNXOXkm66Z GtMm0830JuYIZsBKz0R019dmvc71fsYhpoOZgvUTIYat+wzgzhq8onOxPFV6A4G3X97mMa sNzNcnWa8oDL0PHFJmW004izkJQHt4PgcmxhqyxCTxDpd69IcQEhZSf6t6yi5HhFY560df QVNXeuOs2vCE+8lNd4yBrMlSMzV3Nt52wrp+sRxPfE1wn87xpKXzAgfQqATFDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771793540; a=rsa-sha256; cv=none; b=xWwnrfTneP7l9NeZiNR8F4M0V9pID2aIXogMhXqsFf7GpoQgxJdlRk3dJED+OR+Qo7So79 yvbnVXtSuOJyOW6bOZHYlDUfduBDjEtR3DIXcYNsQQhKuX8YMpAWfkcO7NxQseDrgvjA51 PGHd+O+jHS/DkGsbIo1/G4z5euniN8iDlXXJ2mLzC4StJqxayTPo0fSl48Zv7ciZkdLjKQ mO4xpcMJ7wouqEHrrEGNvFo8D8dFLZN7QaYUk/uUmkpq1kJJYVguWLU8ld4BxynTvLHUw9 SoXOdTW5g9Jlj5+bWmyNlcelXF0bYfwyrQe/KpWjTM3Y7AtMrXW7BBnxL1tlYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771793540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cy8vMM7vbJ22O45g6bpPiatG5ewpQXgUt87KVoYnA98=; b=L8/ejOUNuNlJN+BiYUMTdfnQxpboTwmpLDPxzuU5P4LyoYq1PkLo2SIGVw+IdJMPS/Weyr WHBf3ptqgCrA8GRfoRWn2e5Z4+bZflDFE/7NquTXs3z5qc3EbjubBOOGB8RIpTbV/j/Ncg 2XC8gJj+r/RzH8f+vd5uUYtrKZZ+G7pnBVqE9YilacH26eCEJZ2H/CfpRXAg5X4VgO45Vq l9/as3bHUwRXbie/USMgybB1xR1eB64hvvdsWT9NosbJPcWduJ7Gnvh6oivz7/u1bCSRGF ey9ic3/8tl21vCu4R2SH+cCOEObaAvJO+NDkK8JdYzcI7FjuqpIePG35+DaedQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJx4h167Vz10VK for ; Sun, 22 Feb 2026 20:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a671 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 20:52:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: dfcd04c4c811 - main - net/if_vlan.c: do not leak vlan sx slock in vlan_clone_dump_nl() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfcd04c4c811096e5183a406d0f001a7c0ffa60a Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 20:52:20 +0000 Message-Id: <699b6c84.1a671.4a1e8f1c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dfcd04c4c811096e5183a406d0f001a7c0ffa60a commit dfcd04c4c811096e5183a406d0f001a7c0ffa60a Author: Konstantin Belousov AuthorDate: 2026-02-21 18:54:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-22 20:52:04 +0000 net/if_vlan.c: do not leak vlan sx slock in vlan_clone_dump_nl() Reported by: pho Reviewed by: markj Fixes: d4062b9f16e46f039f2b5b40dd35592b5dabf00c Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D55447 --- sys/net/if_vlan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index f74e3cb209fe..c254e2aa3107 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1345,6 +1345,7 @@ vlan_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) VLAN_SLOCK(); if (__predict_false((ifv = ifp->if_softc) == NULL)) { + VLAN_SUNLOCK(); /* * XXXGL: the interface already went through if_dead(). This * check to be removed when we got better interface removal. From nobody Sun Feb 22 21:21:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJxk32nZTz6S4Mr for ; Sun, 22 Feb 2026 21:21: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 4fJxk31t4Qz3V8r for ; Sun, 22 Feb 2026 21:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771795275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jiuUQ15aYdAXyaSE/W4xyjfvA9FWMBF8c6W8a4X89K0=; b=UQX2nNvrCfS040hlz58Z8IP3nlaegTrpLqzZefNoWID21Nfmh3v8hum5W/PEj62S+wMbmE dNnaTL00aE3fV/iy7IZ1CZ3jjuVpAQ+6fcLcI1Z+UAX5nDfwTcm70m8pv+UZNVTzL9Fo6T UFtv14BQlfJrcJEdpiK+3iZ9vyz8ZoeLqemO46SKHlwyl8dngh3QIrQAKSc1Pub/+INhS6 70wXBRHt6g1/R3GEoci0lFdbvarT44WHlF93GKv9HMBa11PEpzhAPPPpDFAmgDP69e0+tg vFMNxLM4Hr2EvnISOB9eaUdlNo0JEQYbh9Mx+aLTQgdp6BkHl6ccRZ2eTyDebA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771795275; a=rsa-sha256; cv=none; b=gHEZ2CGbN2VmIxaFwSC33TGo4608Z8nFiwUf52zxb1hMN6mFL3H8V4ls4VWs9MvnwgNyfc mvn1Tz3vV5yLXrLcfIWSFS51EQdfv0EyBJOCAI1fGdsmw4mRB+UZg/8cXqPcMH01dTT5Dl l+djcv61zfBlyct4wy5c+kj3qDnRxGS3wnaNgByINXJU5w4xl5cZLktit8jmnJEQ4JsRtw k6h7GsdJelMK0vLi7SdJxYjuZUFD9iCsCtRiwWB5oCpC2ypOQvbL3uc2YLw7Aoqb3hMols ZjNJqFYYG6DjM7pLlrWY90FEKGGhIPYAbaMXpCm78JkVgnJXk+Ej8M3arVeCOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771795275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jiuUQ15aYdAXyaSE/W4xyjfvA9FWMBF8c6W8a4X89K0=; b=bvXBM1VUWWH2ipzWdL2zK8tbL7o5ZI2lVk+p7TQ7MioadCBiEIBIK02nB3tflXwo0BRPRV 31V+a9yyH9tVm8meg7Ii96Dna9so0X0Y/SRok7lD9WDICIFREU5U5SZEvC9PIqPQL1N5VB 5KKYExFszkoPtq5G+gM/bfMyvmsbL7YPCFOLD2/VNWsnjtk3UNCZRscepmzmhECuf2wqKt ZLI1ZiBfnzfPkcqFJF34RWgtaC/o4YyUy7Jth0lqq2Fb+g0fH1kygfe6ZtANbeA8b1+D0K rfl/q5LzVmbHbRYuC6DRqK5lCminqAihVxx/71otTWjpNdV/Dyv47nshgoYgiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJxk31Sttz11fN for ; Sun, 22 Feb 2026 21:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f972 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 21:21:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: d2dea8b46a8a - main - arm: Add EARLY_PRINTF for ns8250 on arm/aarch64 platforms. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2dea8b46a8a61359c5185f4af3cc1761139bcb4 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 21:21:15 +0000 Message-Id: <699b734b.1f972.4e1fe548@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=d2dea8b46a8a61359c5185f4af3cc1761139bcb4 commit d2dea8b46a8a61359c5185f4af3cc1761139bcb4 Author: Michal Meloun AuthorDate: 2025-02-02 14:22:34 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 21:13:33 +0000 arm: Add EARLY_PRINTF for ns8250 on arm/aarch64 platforms. Reviewed by: adrian (previous version) MFC after: 3 weeks --- sys/conf/options | 4 ++++ sys/dev/uart/uart_dev_ns8250.c | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index d5192db59181..4aeb15a489ea 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1016,3 +1016,7 @@ PRESERVE_EARLY_KENV opt_global.h # Options for the Intel QuickAssist (QAT) driver QAT_DISABLE_SAFE_DC_MODE opt_qat.h + +# EARLY_PRINTF specific options fo NS8250 uart +UART_NS8250_EARLY_REG_IO_WIDTH opt_uart.h +UART_NS8250_EARLY_REG_SHIFT opt_uart.h diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index c38d50e54ad8..b0c7cd4b44e1 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -89,9 +89,7 @@ SYSCTL_INT(_hw, OID_AUTO, uart_noise_threshold, CTLFLAG_RWTUN, * options EARLY_PRINTF=ns8250 */ #if CHECK_EARLY_PRINTF(ns8250) -#if !(defined(__amd64__) || defined(__i386__)) -#error ns8250 early putc is x86 specific as it uses inb/outb -#endif +#if (defined(__amd64__) || defined(__i386__)) static void uart_ns8250_early_putc(int c) { @@ -103,7 +101,45 @@ uart_ns8250_early_putc(int c) continue; outb(tx, c); } +#elif (defined(__arm__) || defined(__aarch64__)) +#ifndef UART_NS8250_EARLY_REG_IO_WIDTH +#error Option 'UART_NS8250_EARLY_REG_IO_WIDTH' is missing. +#endif +#ifndef UART_NS8250_EARLY_REG_SHIFT +#error Option 'UART_NS8250_EARLY_REG_SHIFT' is missing. +#endif + +#if UART_NS8250_EARLY_REG_IO_WIDTH == 1 +#define T uint8_t +#elif UART_NS8250_EARLY_REG_IO_WIDTH == 2 +#define T uint16_t +#elif UART_NS8250_EARLY_REG_IO_WIDTH == 4 +#define T uint32_t + +#else +#error Invalid/unsupported UART_NS8250_EARLY_REG_IO_WIDTH value +#endif + +#include + +static void +uart_ns8250_early_putc(int c) +{ + volatile T *stat; + volatile T *tx; + + stat = (T *)(socdev_va + (REG_LSR << UART_NS8250_EARLY_REG_SHIFT)); + tx = (T *)(socdev_va + (REG_DATA << UART_NS8250_EARLY_REG_SHIFT)); + + while ((*stat & LSR_THRE) == 0) + continue; + *tx = c & 0xff; +} +#else +#error ns8250 early putc is not implemented for current architecture +#endif early_putc_t *early_putc = uart_ns8250_early_putc; +#undef DTYPE #endif /* EARLY_PRINTF */ /*