From nobody Mon May 12 06:43:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zwqnw2LRPz5vZMD; Mon, 12 May 2025 06:44:04 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [IPv6:2a01:4f8:13b:240c::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zwqnt6kqwz3vpb; Mon, 12 May 2025 06:44:02 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=Ba14h8G0; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 2a01:4f8:13b:240c::25 as permitted sender) smtp.mailfrom=herbert@gojira.at; dmarc=none Date: Mon, 12 May 2025 08:43:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1747032233; bh=GZPG5hebvy+OxlwNB6rWIz5KeqD866SKJBw5gqAPO2c=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=Ba14h8G0hVi2KdYYkoWIftDM0L5EQUpqdi3eStNGk0/kMmgEZdB5cDVNzNPeXHce7 R2BIxzJLdao52pZywvAYU4s6q8eM3DniCNGwB0kiqsBA20yhLpq8zwWzC2u5mBXRJ7 nhzhyMcTf/XqZD5WQI0Zw4SWmOrYKHg/YhCYkVied8Fi2PGkOWIYEndHItB8PKn3bg BoBsTIxY1XK262HpoX47fRmoK7Ui7t5UAzJ1M4RuDnKgFiIUTlL+hst7l63F1TJfF8 QYy+t/sYx7UTbbjdEHnk/g5LGODtuGc56zTlEJg4CNE9bMbrb4hRBn+maAvBsW0vk+ MHX6+BsKE+cYA== Message-ID: <87msbipbve.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Warner Losh Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 80b069913d49 - stable/14 - mpi3mr: Divert large WriteSame IOs to firmware if unmap and ndob bits are set In-Reply-To: References: <202504301721.53UHLjlw095104@gitrepo.freebsd.org> <878qn8r3t6.wl-herbert@gojira.at> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/30.1 Mule/6.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Zwqnt6kqwz3vpb X-Spamd-Bar: / X-Spamd-Result: default: False [-0.34 / 15.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.959]; NEURAL_SPAM_MEDIUM(0.93)[0.928]; NEURAL_HAM_LONG(-0.81)[-0.813]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:13b:240c::25]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-branches@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; DMARC_NA(0.00)[gojira.at]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gojira.at:+] Yes, thanks. Merge to releng/14.3?=20 On Thu, 08 May 2025 17:44:59 +0200, Warner Losh wrote: >=20 > I think that I've fixed this. >=20 > Warner >=20 > On Wed, May 7, 2025 at 6:41=E2=80=AFAM Herbert J. Skuhra wrote: > > > > On Wed, 30 Apr 2025 19:21:45 +0200, Warner Losh wrote: > > > > > > The branch stable/14 has been updated by imp: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D80b069913d496bd73b0ea8= e515b6bf3706530ea1 > > > > > > commit 80b069913d496bd73b0ea8e515b6bf3706530ea1 > > > Author: Chandrakanth patil > > > AuthorDate: 2024-06-06 08:38:52 +0000 > > > Commit: Warner Losh > > > CommitDate: 2025-04-30 17:05:52 +0000 > > > > > > mpi3mr: Divert large WriteSame IOs to firmware if unmap and ndob = bits are set > > > > > > Firmware advertises the transfer lenght for writesame commands to= driver during init. > > > So for any writesame IOs with ndob and unmap bit set and transfer= lengh is greater > > > than the max write same length specified by the firmware, then di= rect those commands > > > to firmware instead of hardware otherwise hardware will break. > > > > > > Reviewed by: imp > > > Approved by: imp > > > Differential revision: https://reviews.freebsd.org/D44452 > > > > > > (cherry picked from commit 3f3a15543a6721100dda0e4219eb48ecbe3573= 1a) > > > --- > > > sys/dev/mpi3mr/mpi3mr.c | 16 ++++++++++++++++ > > > sys/dev/mpi3mr/mpi3mr.h | 2 ++ > > > sys/dev/mpi3mr/mpi3mr_cam.c | 35 +++++++++++++++++++++++++++++++++++ > > > sys/dev/mpi3mr/mpi3mr_cam.h | 1 + > > > sys/modules/mpi3mr/Makefile | 3 +++ > > > 5 files changed, 57 insertions(+) > > > > > > diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c > > > index 03fea4bdfcc7..a7bc459c1db8 100644 > > > --- a/sys/dev/mpi3mr/mpi3mr.c > > > +++ b/sys/dev/mpi3mr/mpi3mr.c > > > @@ -2177,6 +2177,8 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_s= oftc *sc) > > > time_in_msec =3D (now.tv_sec * 1000 + now.tv_usec/1000); > > > iocinit_req.TimeStamp =3D htole64(time_in_msec); > > > > > > + iocinit_req.MsgFlags |=3D MPI3_IOCINIT_MSGFLAGS_WRITESAMEDIVERT= _SUPPORTED; > > > + > > > init_completion(&sc->init_cmds.completion); > > > retval =3D mpi3mr_submit_admin_cmd(sc, &iocinit_req, > > > sizeof(iocinit_req)); > > > @@ -3340,6 +3342,19 @@ void mpi3mr_update_device(struct mpi3mr_softc = *sc, > > > break; > > > } > > > > > > + switch (flags & MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_MASK) { > > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_256_LB: > > > + tgtdev->ws_len =3D 256; > > > + break; > > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_2048_LB: > > > + tgtdev->ws_len =3D 2048; > > > + break; > > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_NO_LIMIT: > > > + default: > > > + tgtdev->ws_len =3D 0; > > > + break; > > > + } > > > + > > > switch (tgtdev->dev_type) { > > > case MPI3_DEVICE_DEVFORM_SAS_SATA: > > > { > > > @@ -5649,6 +5664,7 @@ static void mpi3mr_invalidate_devhandles(struct= mpi3mr_softc *sc) > > > target->io_throttle_enabled =3D 0; > > > target->io_divert =3D 0; > > > target->throttle_group =3D NULL; > > > + target->ws_len =3D 0; > > > } > > > } > > > mtx_unlock_spin(&sc->target_lock); > > > diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h > > > index 2f91b0b702dd..fa50ed035fc2 100644 > > > --- a/sys/dev/mpi3mr/mpi3mr.h > > > +++ b/sys/dev/mpi3mr/mpi3mr.h > > > @@ -232,6 +232,8 @@ extern char fmt_os_ver[16]; > > > > > > #define MPI3MR_PERIODIC_DELAY 1 /* 1 second heartbeat/w= atchdog check */ > > > > > > +#define WRITE_SAME_32 0x0d > > > + > > > struct completion { > > > unsigned int done; > > > struct mtx lock; > > > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c > > > index d4cb7e9265dd..dca194a5c8cd 100644 > > > --- a/sys/dev/mpi3mr/mpi3mr_cam.c > > > +++ b/sys/dev/mpi3mr/mpi3mr_cam.c > > > @@ -83,6 +83,7 @@ > > > #include "mpi3mr.h" > > > #include /* XXX for pcpu.h */ > > > #include /* XXX for PCPU_GET */ > > > +#include > > > > > > #define smp_processor_id() PCPU_GET(cpuid) > > > > > > @@ -102,6 +103,37 @@ extern void mpi3mr_add_sg_single(void *paddr, U8= flags, U32 length, > > > > > > static U32 event_count; > > > > > > +static > > > +inline void mpi3mr_divert_ws(Mpi3SCSIIORequest_t *req, > > > + struct ccb_scsiio *csio, > > > + U16 ws_len) > > > +{ > > > + U8 unmap =3D 0, ndob =3D 0; > > > + U32 num_blocks =3D 0; > > > + U8 opcode =3D scsiio_cdb_ptr(csio)[0]; > > > + U16 service_action =3D ((scsiio_cdb_ptr(csio)[8] << 8) | scsiio= _cdb_ptr(csio)[9]); > > > + > > > + > > > + if (opcode =3D=3D WRITE_SAME_16 || > > > + (opcode =3D=3D VARIABLE_LEN_CDB && > > > + service_action =3D=3D WRITE_SAME_32)) { > > > + > > > + int unmap_ndob_index =3D (opcode =3D=3D WRITE_SAME_16) = ? 1 : 10; > > > + > > > + unmap =3D scsiio_cdb_ptr(csio)[unmap_ndob_index] & 0x08; > > > + ndob =3D scsiio_cdb_ptr(csio)[unmap_ndob_index] & 0x01; > > > + num_blocks =3D get_unaligned_be32(scsiio_cdb_ptr(csio) + > > > + ((opcode =3D=3D WRITE_S= AME_16) ? 10 : 28)); > > > + > > > + /* Check conditions for diversion to firmware */ > > > + if (unmap && ndob && num_blocks > ws_len) { > > > + req->MsgFlags |=3D MPI3_SCSIIO_MSGFLAGS_DIVERT_= TO_FIRMWARE; > > > + req->Flags =3D htole32(le32toh(req->Flags) | > > > + MPI3_SCSIIO_FLAGS_DIVERT_R= EASON_WRITE_SAME_TOO_LARGE); > > > + } > > > + } > > > +} > > > + > > > static void mpi3mr_prepare_sgls(void *arg, > > > bus_dma_segment_t *segs, int nsegs, int error) > > > { > > > @@ -1080,6 +1112,9 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *c= am_sc, union ccb *ccb) > > > break; > > > } > > > > > > + if (targ->ws_len) > > > + mpi3mr_divert_ws(req, csio, targ->ws_len); > > > + > > > req->Flags =3D htole32(mpi_control); > > > > > > if (csio->ccb_h.flags & CAM_CDB_POINTER) > > > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.h b/sys/dev/mpi3mr/mpi3mr_cam.h > > > index 3a0526217f86..115ce0c4b8d7 100644 > > > --- a/sys/dev/mpi3mr/mpi3mr_cam.h > > > +++ b/sys/dev/mpi3mr/mpi3mr_cam.h > > > @@ -121,6 +121,7 @@ struct mpi3mr_target { > > > struct mpi3mr_throttle_group_info *throttle_group; > > > uint64_t q_depth; > > > enum mpi3mr_target_state state; > > > + uint16_t ws_len; > > > }; > > > > > > struct mpi3mr_cam_softc { > > > diff --git a/sys/modules/mpi3mr/Makefile b/sys/modules/mpi3mr/Makefile > > > index 3f1f63a94ac3..39aa2e3f0ddd 100644 > > > --- a/sys/modules/mpi3mr/Makefile > > > +++ b/sys/modules/mpi3mr/Makefile > > > @@ -6,6 +6,9 @@ SRCS=3D mpi3mr_pci.c mpi3mr.c mpi3mr_cam.c mpi3mr_app= .c > > > SRCS+=3D opt_cam.h > > > SRCS+=3D device_if.h bus_if.h pci_if.h > > > > > > +CFLAGS+=3D -I${SRCTOP}/sys/compat/linuxkpi/common/include > > > +DEBUG_FLAGS=3D -g > > ^^^^^^^^^^^^^^^^ > > > + > > > .include > > > > > > CWARNFLAGS.mpi3mr_sas.c=3D ${NO_WUNNEEDED_INTERNAL_DECL} > > > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D249068#c2 > > > > -- > > Herbert From nobody Mon May 12 14:09:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zx1gR3c4Jz5w5QW; Mon, 12 May 2025 14:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zx1gR3BwDz43S3; Mon, 12 May 2025 14:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747058947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3dYRoLbQ0pN49aEI1v4gIeuAJzpaUZb1kVEFkw9LRdw=; b=OQoWQCUHnF+8+GTm6SltVa3qXGsgV8T1x08MitlNLkafqrqHUpN/+T+8QSoQz8tvJzIG2t zbDykYlxLzyJU/lwndzwU+zncQqVr274S42aECpiTnRNcfyJ9ihPQONrtjrvSYWgA/0H+B OsudpO2/iDxZgKx7F8wjb4V9xJ+X3ylDdYD7suzaDE1DktbNugSuiabqSYs+1uhyoZ03Km PqeQ8Th8BX28ERuHiihvwcrsuPh0PEfGFphA4jAEQ6+PIwfAZYnvegKrHTYpHD2q6j7mmj nhMq6GHjYdfwOo7e438Vg5UGIXyp2Ngi5S5j2GtAOfsoIgR2djR9voyjk4PJAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747058947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3dYRoLbQ0pN49aEI1v4gIeuAJzpaUZb1kVEFkw9LRdw=; b=JFpp6z7xQuOIrLSLscOW4YWLmzIHxmhqdsHxQIzXPK75wcuvruRwCk9OPCEc+K6k2sXnoM ntfowA9SFnytp4Xmi9SiHVanoOFdz6MElxlgoY3/Iieqoo/y7085eQ27ZsBF7CYSSlidA9 MieZtF5l9Qmu+1ktyrDu+suZoB9t9MsUd7F03ajJZA2JmLDCGGZG6xIjvrziHNZGWgG2K2 P/tsyOJ1dJ4JGZQNDfql+Ke5HcqR4kFHYYVe3k+RF97XXi4A8yGcybOkJ4lHHpyfi1Nb+r jraIpETlafYXVHKC8EMBXUDy753WY6q8pbDwpJdQJgNbomSY75Qe5x4abLsioQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747058947; a=rsa-sha256; cv=none; b=JFWqViywC3njAf/meU2bKZuIp/YWBAVdqXiqY9VybNsGs/suNVYJCDO16VcTEdbysRfnSG cNC9FggJBL+GZuFWHUWBvgzaxwvUPBD8/mdTqDu9wuvFUvxc+v1lxOmZiMnGnVEI5Y/Qsk 3DqoE73Eg7ky9FxOibWsLYpyp4y8FfBpfjZIOt0U6QLfH/uqLyI3IvtFW77NswbmzxJfZb 7dkEkRw64VSiftRiyycogh1sUDU3dYfVcH+drTob3y3Yxo/uYBQio1zLfhZfAeskGO+fdp dZOyCqT6+LcsMO7ZJh2Nz7O03gLQBI8h1REkcn/9Df7uaBPKqsCmnZIxbjtpCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zx1gR2cTpz1Jf9; Mon, 12 May 2025 14:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54CE972O024723; Mon, 12 May 2025 14:09:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54CE97gZ024720; Mon, 12 May 2025 14:09:07 GMT (envelope-from git) Date: Mon, 12 May 2025 14:09:07 GMT Message-Id: <202505121409.54CE97gZ024720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 00988d12bc37 - stable/14 - sndctl(8): Initial revision List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 00988d12bc37b76197c774ef54a318f58999de2a Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=00988d12bc37b76197c774ef54a318f58999de2a commit 00988d12bc37b76197c774ef54a318f58999de2a Author: Christos Margiolis AuthorDate: 2025-05-05 11:38:59 +0000 Commit: Christos Margiolis CommitDate: 2025-05-12 14:08:34 +0000 sndctl(8): Initial revision sndctl(8) is a new program that lists and modifies audio device properties, using a control-driven interface, in similar fashion to mixer(8). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D46227 Differential Revision: https://reviews.freebsd.org/D50167 (cherry picked from commit 44e5a01508353cfa52e185a531cfb5a6b39b28f6) (cherry picked from commit 9a37f1024cebfb89dcfa15c23bb287a5d09a9ae7) --- usr.sbin/Makefile | 1 + usr.sbin/sndctl/Makefile | 8 + usr.sbin/sndctl/sndctl.8 | 187 +++++++++ usr.sbin/sndctl/sndctl.c | 987 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1183 insertions(+) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index b836bd412077..31d583e7aab5 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -84,6 +84,7 @@ SUBDIR= adduser \ setpmac \ smbmsg \ snapinfo \ + sndctl \ spi \ spray \ syslogd \ diff --git a/usr.sbin/sndctl/Makefile b/usr.sbin/sndctl/Makefile new file mode 100644 index 000000000000..c1830413f931 --- /dev/null +++ b/usr.sbin/sndctl/Makefile @@ -0,0 +1,8 @@ +.include + +PROG= sndctl +SRCS= ${PROG}.c +MAN= ${PROG}.8 +LDFLAGS+= -lnv -lmixer + +.include diff --git a/usr.sbin/sndctl/sndctl.8 b/usr.sbin/sndctl/sndctl.8 new file mode 100644 index 000000000000..4c3810f3c16b --- /dev/null +++ b/usr.sbin/sndctl/sndctl.8 @@ -0,0 +1,187 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024-2025 The FreeBSD Foundation +.\" +.\" Portions of this software were developed by Christos Margiolis +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd May 5, 2025 +.Dt SNDCTL 8 +.Os +.Sh NAME +.Nm sndctl +.Nd list and modify soundcard properties +.Sh SYNOPSIS +.Nm +.Op Fl f Ar device +.Op Fl hov +.Op Ar control Ns Oo = Ns Ar value Oc Ar ... +.Sh DESCRIPTION +The +.Nm +utility is used to set and display sound card properties, using a +control-driven interface, in order to filter and/or set specific properties. +.Pp +The options are as follows: +.Bl -tag -width "-f device" +.It Fl f Ar device +Choose a specific audio device +.Pq see Sx FILES . +Userland devices (e.g those registered by +.Xr virtual_oss 8 +can also be selected. +.It Fl h +Print a help message. +.It Fl o +Print values in a format suitable for use inside scripts. +.It Fl v +Run in verbose mode. +This option will print all of the device's channel properties. +.El +.Pp +The device controls are as follows: +.Bl -column xxxxxxxxxxxxxxx xxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxx -offset indent +.It Sy Name Ta Sy Type Ta Sy Read/Write Ta Sy Action +.It name Ta String Ta Read Ta Device name +.It desc Ta String Ta Read Ta Device description +.It status Ta String Ta Read Ta Device status +.It devnode Ta String Ta Read Ta Device node +.It from_user Ta Boolean Ta Read Ta Userland device +.It unit Ta Number Ta Read Ta Device unit +.It caps Ta String Ta Read Ta Device OSS capabitilies +.It bitperfect Ta Boolean Ta Read/Write Ta Bit-perfect mode enabled +.It autoconv Ta Boolean Ta Read/Write Ta Auto-conversions enabled +.It realtime Ta Boolean Ta Read/Write Ta Real-time mode enabled +.It play Ta Group Ta Read Ta Playback properties +.It play.format Ta String Ta Read/Write Ta Playback format +.It play.rate Ta Number Ta Read/Write Ta Playback sample rate +.It play.vchans Ta Boolean Ta Read/Write Ta Playback VCHANs (virtual channels) enabled +.It play.min_rate Ta Number Ta Read Ta Minimum playback sample rate +.It play.max_rate Ta Number Ta Read Ta Maximum playback sample rate +.It play.min_chans Ta Number Ta Read Ta Natively supported minimum playback sample channels +.It play.max_chans Ta Number Ta Read Ta Natively supported maximum playback sample channels +.It play.formats Ta String Ta Read Ta Natively supported playback formats +.It rec Ta Group Ta Read Ta Recording properties +.It rec.format Ta String Ta Read/Write Ta Recording format +.It rec.rate Ta Number Ta Read/Write Ta Recording sample rate +.It rec.vchans Ta Boolean Ta Read/Write Ta Recording VCHANs (virtual channels) enabled +.It rec.min_rate Ta Number Ta Read Ta Minimum recording sample rate +.It rec.max_rate Ta Number Ta Read Ta Maximum recording sample rate +.It rec.min_chans Ta Number Ta Read Ta Natively supported minimum recording sample channels +.It rec.max_chans Ta Number Ta Read Ta Natively supported maximum recording sample channels +.It rec.formats Ta String Ta Read Ta Natively supported recording formats +.El +.Pp +The +.Pa play.format , +.Pa play.rate , +.Pa rec.format and +.Pa rec.rate +controls will be read-only if VCHANs are disabled. +.Pp +The device channel controls are as follows: +.Bl -column xxxxxxxxxxxxxxx xxxxx xxxxxxxx xxxxxxxxxxxxxxxxxxx -offset indent +.It Sy Name Ta Sy Type Ta Sy Read/Write Ta Sy Action +.It name Ta String Ta Read Ta Channel name +.It parentchan Ta String Ta Read Ta Parent (primary) channel name +.It unit Ta Number Ta Read Ta Channel unit +.It caps Ta String Ta Read Ta Channel OSS capabilities +.It latency Ta Number Ta Read Ta Channel latency +.It format Ta String Ta Read Ta Channel format +.It rate Ta Number Ta Read Ta Channel sample rate +.It pid Ta Number Ta Read Ta PID of process consuming channel +.It proc Ta String Ta Read Ta Name of process consuming channel +.It interrupts Ta Number Ta Read Ta Number of interrupts since channel was opened +.It xruns Ta Number Ta Read Ta Number of playback underruns/recoring overruns +.It feedcount Ta Number Ta Read Ta Number of bytes fed to channel +.It volume Ta Volume Ta Read Ta Channel left-right volume in normalized form (0.00 to 1.00). +.It hwbuf Ta Group Ta Read Ta Hardware buffer properties +.It hwbuf.format Ta String Ta Read Ta Hardware buffer format +.It hwbuf.rate Ta String Ta Read Ta Hardware buffer sample rate +.It hwbuf.size_bytes Ta Number Ta Read Ta Hardware buffer size in bytes +.It hwbuf.size_frames Ta Number Ta Read Ta Hardware buffer size in frames +.It hwbuf.blksz Ta Number Ta Read Ta Hardware buffer block size +.It hwbuf.blkcnt Ta Number Ta Read Ta Hardware buffer block count +.It hwbuf.free Ta Number Ta Read Ta Hardware buffer free space in bytes +.It hwbuf.ready Ta Number Ta Read Ta Hardware buffer ready space in bytes +.It swbuf Ta Group Ta Read Ta Software buffer properties +.It swbuf.format Ta String Ta Read Ta Software buffer format +.It swbuf.rate Ta String Ta Read Ta Software buffer sample rate +.It swbuf.size_bytes Ta Number Ta Read Ta Software buffer size in bytes +.It swbuf.size_frames Ta Number Ta Read Ta Software buffer size in frames +.It swbuf.blksz Ta Number Ta Read Ta Software buffer block size +.It swbuf.blkcnt Ta Number Ta Read Ta Software buffer block count +.It swbuf.free Ta Number Ta Read Ta Software buffer free space in bytes +.It swbuf.ready Ta Number Ta Read Ta Software buffer ready space in bytes +.It feederchain Ta String Ta Read Ta Channel feeder chain +.El +.Sh FILES +.Bl -tag -width /dev/dspX -compact +.It Pa /dev/dsp +The default audio device. +.It Pa /dev/dspX +The audio device file, where X is the unit of the device, for example +.Ar /dev/dsp0 . +.El +.Sh EXAMPLES +Disable auto-conversions and enable realtime mode to get as low latencies as +possible: +.Bd -literal -offset indent +$ sndctl autoconv=0 realtime=1 +.Ed +.Pp +Set the playback sample format to 2-channel signed 24-bit low endian, and sample +rate to 48000 Hz: +.Bd -literal -offset indent +$ sndctl play.format=s24le:2.0 play.rate=48000 +.Ed +.Pp +List the PIDs and process names of all channels for +.Pa /dev/dsp1 : +.Bd -literal -offset indent +$ sndctl -f /dev/dsp1 pid proc +.Ed +.Pp +Dump +.Pa /dev/dsp0 +information to a file and retrieve back later: +.Bd -literal -offset indent +$ sndctl -f /dev/dsp0 -o > info +\&... +$ sndctl -f /dev/dsp0 `cat info` +.Ed +.Sh SEE ALSO +.Xr sndstat 4 , +.Xr sound 4 , +.Xr mixer 8 , +.Xr sysctl 8 +.Sh AUTHORS +The +.Nm +utility was implemented by +.An Christos Margiolis Aq Mt christos@FreeBSD.org +under sponsorship from the +.Fx +Foundation. diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c new file mode 100644 index 000000000000..f362ce840cf7 --- /dev/null +++ b/usr.sbin/sndctl/sndctl.c @@ -0,0 +1,987 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * This software was developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Taken from sys/dev/sound/pcm/ */ +#define STATUS_LEN 64 +#define FMTSTR_LEN 16 + +struct snd_chan { + char name[NAME_MAX]; + char parentchan[NAME_MAX]; + int unit; +#define INPUT 0 +#define OUTPUT 1 + int direction; + char caps[BUFSIZ]; + int latency; + int rate; + char format[FMTSTR_LEN]; + int pid; + char proc[NAME_MAX]; + int interrupts; + int xruns; + int feedcount; + int volume; + struct { + char format[FMTSTR_LEN]; + int rate; + int size_bytes; + int size_frames; + int blksz; + int blkcnt; + int free; + int ready; + } hwbuf, swbuf; + char feederchain[BUFSIZ]; + struct snd_dev *dev; + TAILQ_ENTRY(snd_chan) next; +}; + +struct snd_dev { + char name[NAME_MAX]; + char desc[NAME_MAX]; + char status[BUFSIZ]; + char devnode[NAME_MAX]; + int from_user; + int unit; + char caps[BUFSIZ]; + int bitperfect; + int realtime; + int autoconv; + struct { + char format[FMTSTR_LEN]; + int rate; + int pchans; + int vchans; + int min_rate; + int max_rate; + int min_chans; + int max_chans; + char formats[BUFSIZ]; + } play, rec; + TAILQ_HEAD(, snd_chan) chans; +}; + +struct snd_ctl { + const char *name; + size_t off; +#define STR 0 +#define NUM 1 +#define VOL 2 +#define GRP 3 + int type; + int (*mod)(struct snd_dev *, void *); +}; + +struct map { + int val; + const char *str; +}; + +static int mod_bitperfect(struct snd_dev *, void *); +static int mod_autoconv(struct snd_dev *, void *); +static int mod_realtime(struct snd_dev *, void *); +static int mod_play_vchans(struct snd_dev *, void *); +static int mod_play_rate(struct snd_dev *, void *); +static int mod_play_format(struct snd_dev *, void *); +static int mod_rec_vchans(struct snd_dev *, void *); +static int mod_rec_rate(struct snd_dev *, void *); +static int mod_rec_format(struct snd_dev *, void *); + +static struct snd_ctl dev_ctls[] = { +#define F(member) offsetof(struct snd_dev, member) + { "name", F(name), STR, NULL }, + { "desc", F(desc), STR, NULL }, + { "status", F(status), STR, NULL }, + { "devnode", F(devnode), STR, NULL }, + { "from_user", F(from_user), NUM, NULL }, + { "unit", F(unit), NUM, NULL }, + { "caps", F(caps), STR, NULL }, + { "bitperfect", F(bitperfect), NUM, mod_bitperfect }, + { "autoconv", F(autoconv), NUM, mod_autoconv }, + { "realtime", F(realtime), NUM, mod_realtime }, + { "play", F(play), GRP, NULL }, + { "play.format", F(play.format), STR, mod_play_format }, + { "play.rate", F(play.rate), NUM, mod_play_rate }, + /*{ "play.pchans", F(play.pchans), NUM, NULL },*/ + { "play.vchans", F(play.vchans), NUM, mod_play_vchans }, + { "play.min_rate", F(play.min_rate), NUM, NULL }, + { "play.max_rate", F(play.max_rate), NUM, NULL }, + { "play.min_chans", F(play.min_chans), NUM, NULL }, + { "play.max_chans", F(play.max_chans), NUM, NULL }, + { "play.formats", F(play.formats), STR, NULL }, + { "rec", F(rec), GRP, NULL }, + { "rec.rate", F(rec.rate), NUM, mod_rec_rate }, + { "rec.format", F(rec.format), STR, mod_rec_format }, + /*{ "rec.pchans", F(rec.pchans), NUM, NULL },*/ + { "rec.vchans", F(rec.vchans), NUM, mod_rec_vchans }, + { "rec.min_rate", F(rec.min_rate), NUM, NULL }, + { "rec.max_rate", F(rec.max_rate), NUM, NULL }, + { "rec.min_chans", F(rec.min_chans), NUM, NULL }, + { "rec.max_chans", F(rec.max_chans), NUM, NULL }, + { "rec.formats", F(rec.formats), STR, NULL }, + { NULL, 0, 0, NULL } +#undef F +}; + +static struct snd_ctl chan_ctls[] = { +#define F(member) offsetof(struct snd_chan, member) + /*{ "name", F(name), STR, NULL },*/ + { "parentchan", F(parentchan), STR, NULL }, + { "unit", F(unit), NUM, NULL }, + { "caps", F(caps), STR, NULL }, + { "latency", F(latency), NUM, NULL }, + { "rate", F(rate), NUM, NULL }, + { "format", F(format), STR, NULL }, + { "pid", F(pid), NUM, NULL }, + { "proc", F(proc), STR, NULL }, + { "interrupts", F(interrupts), NUM, NULL }, + { "xruns", F(xruns), NUM, NULL }, + { "feedcount", F(feedcount), NUM, NULL }, + { "volume", F(volume), VOL, NULL }, + { "hwbuf", F(hwbuf), GRP, NULL }, + { "hwbuf.format", F(hwbuf.format), STR, NULL }, + { "hwbuf.rate", F(hwbuf.rate), NUM, NULL }, + { "hwbuf.size_bytes", F(hwbuf.size_bytes), NUM, NULL }, + { "hwbuf.size_frames", F(hwbuf.size_frames), NUM, NULL }, + { "hwbuf.blksz", F(hwbuf.blksz), NUM, NULL }, + { "hwbuf.blkcnt", F(hwbuf.blkcnt), NUM, NULL }, + { "hwbuf.free", F(hwbuf.free), NUM, NULL }, + { "hwbuf.ready", F(hwbuf.ready), NUM, NULL }, + { "swbuf", F(swbuf), GRP, NULL }, + { "swbuf.format", F(swbuf.format), STR, NULL }, + { "swbuf.rate", F(swbuf.rate), NUM, NULL }, + { "swbuf.size_bytes", F(swbuf.size_bytes), NUM, NULL }, + { "swbuf.size_frames", F(swbuf.size_frames), NUM, NULL }, + { "swbuf.blksz", F(swbuf.blksz), NUM, NULL }, + { "swbuf.blkcnt", F(swbuf.blkcnt), NUM, NULL }, + { "swbuf.free", F(swbuf.free), NUM, NULL }, + { "swbuf.ready", F(swbuf.ready), NUM, NULL }, + { "feederchain", F(feederchain), STR, NULL }, + { NULL, 0, 0, NULL } +#undef F +}; + +/* + * Taken from the OSSv4 manual. Not all of them are supported on FreeBSD + * however, and some of them are obsolete. + */ +static struct map capmap[] = { + { PCM_CAP_ANALOGIN, "ANALOGIN" }, + { PCM_CAP_ANALOGOUT, "ANALOGOUT" }, + { PCM_CAP_BATCH, "BATCH" }, + { PCM_CAP_BIND, "BIND" }, + { PCM_CAP_COPROC, "COPROC" }, + { PCM_CAP_DEFAULT, "DEFAULT" }, + { PCM_CAP_DIGITALIN, "DIGITALIN" }, + { PCM_CAP_DIGITALOUT, "DIGITALOUT" }, + { PCM_CAP_DUPLEX, "DUPLEX" }, + { PCM_CAP_FREERATE, "FREERATE" }, + { PCM_CAP_HIDDEN, "HIDDEN" }, + { PCM_CAP_INPUT, "INPUT" }, + { PCM_CAP_MMAP, "MMAP" }, + { PCM_CAP_MODEM, "MODEM" }, + { PCM_CAP_MULTI, "MULTI" }, + { PCM_CAP_OUTPUT, "OUTPUT" }, + { PCM_CAP_REALTIME, "REALTIME" }, + { PCM_CAP_REVISION, "REVISION" }, + { PCM_CAP_SHADOW, "SHADOW" }, + { PCM_CAP_SPECIAL, "SPECIAL" }, + { PCM_CAP_TRIGGER, "TRIGGER" }, + { PCM_CAP_VIRTUAL, "VIRTUAL" }, + { 0, NULL } +}; + +static struct map fmtmap[] = { + { AFMT_A_LAW, "alaw" }, + { AFMT_MU_LAW, "mulaw" }, + { AFMT_S8, "s8" }, + { AFMT_U8, "u8" }, + { AFMT_AC3, "ac3" }, + { AFMT_S16_LE, "s16le" }, + { AFMT_S16_BE, "s16be" }, + { AFMT_U16_LE, "u16le" }, + { AFMT_U16_BE, "u16be" }, + { AFMT_S24_LE, "s24le" }, + { AFMT_S24_BE, "s24be" }, + { AFMT_U24_LE, "u24le" }, + { AFMT_U24_BE, "u24be" }, + { AFMT_S32_LE, "s32le" }, + { AFMT_S32_BE, "s32be" }, + { AFMT_U32_LE, "u32le" }, + { AFMT_U32_BE, "u32be" }, + { AFMT_F32_LE, "f32le" }, + { AFMT_F32_BE, "f32be" }, + { 0, NULL } +}; + +static bool oflag = false; +static bool vflag = false; + +static void +cap2str(char *buf, size_t size, int caps) +{ + struct map *p; + + for (p = capmap; p->str != NULL; p++) { + if ((p->val & caps) == 0) + continue; + strlcat(buf, p->str, size); + strlcat(buf, ",", size); + } + if (*buf == '\0') + strlcpy(buf, "UNKNOWN", size); + else + buf[strlen(buf) - 1] = '\0'; +} + +static void +fmt2str(char *buf, size_t size, int fmt) +{ + struct map *p; + int enc, ch, ext; + + enc = fmt & 0xf00fffff; + ch = (fmt & 0x07f00000) >> 20; + ext = (fmt & 0x08000000) >> 27; + + for (p = fmtmap; p->str != NULL; p++) { + if ((p->val & enc) == 0) + continue; + strlcat(buf, p->str, size); + if (ch) { + snprintf(buf + strlen(buf), size, + ":%d.%d", ch - ext, ext); + } + strlcat(buf, ",", size); + } + if (*buf == '\0') + strlcpy(buf, "UNKNOWN", size); + else + buf[strlen(buf) - 1] = '\0'; +} + +static int +bytes2frames(int bytes, int fmt) +{ + int enc, ch, samplesz; + + enc = fmt & 0xf00fffff; + ch = (fmt & 0x07f00000) >> 20; + /* Add the channel extension if present (e.g 2.1). */ + ch += (fmt & 0x08000000) >> 27; + + if (enc & (AFMT_S8 | AFMT_U8 | AFMT_MU_LAW | AFMT_A_LAW)) + samplesz = 1; + else if (enc & (AFMT_S16_NE | AFMT_U16_NE)) + samplesz = 2; + else if (enc & (AFMT_S24_NE | AFMT_U24_NE)) + samplesz = 3; + else if (enc & (AFMT_S32_NE | AFMT_U32_NE | AFMT_F32_NE)) + samplesz = 4; + else + samplesz = 0; + + if (!samplesz || !ch) + return (-1); + + return (bytes / (samplesz * ch)); +} + +static struct snd_dev * +read_dev(char *path) +{ + nvlist_t *nvl; + const nvlist_t * const *di; + const nvlist_t * const *cdi; + struct sndstioc_nv_arg arg; + struct snd_dev *dp = NULL; + struct snd_chan *ch; + size_t nitems, nchans, i, j; + int fd, caps, unit; + + if ((fd = open("/dev/sndstat", O_RDONLY)) < 0) + err(1, "open(/dev/sndstat)"); + + if (ioctl(fd, SNDSTIOC_REFRESH_DEVS, NULL) < 0) + err(1, "ioctl(SNDSTIOC_REFRESH_DEVS)"); + + arg.nbytes = 0; + arg.buf = NULL; + if (ioctl(fd, SNDSTIOC_GET_DEVS, &arg) < 0) + err(1, "ioctl(SNDSTIOC_GET_DEVS#1)"); + + if ((arg.buf = malloc(arg.nbytes)) == NULL) + err(1, "malloc"); + + if (ioctl(fd, SNDSTIOC_GET_DEVS, &arg) < 0) + err(1, "ioctl(SNDSTIOC_GET_DEVS#2)"); + + if ((nvl = nvlist_unpack(arg.buf, arg.nbytes, 0)) == NULL) + err(1, "nvlist_unpack"); + + if (nvlist_empty(nvl) || !nvlist_exists(nvl, SNDST_DSPS)) + errx(1, "no soundcards attached"); + + if (path == NULL || (path != NULL && strcmp(basename(path), "dsp") == 0)) + unit = mixer_get_dunit(); + else + unit = -1; + + /* Find whether the requested device exists */ + di = nvlist_get_nvlist_array(nvl, SNDST_DSPS, &nitems); + for (i = 0; i < nitems; i++) { + if (unit == -1 && strcmp(basename(path), + nvlist_get_string(di[i], SNDST_DSPS_DEVNODE)) == 0) + break; + else if (nvlist_exists(di[i], SNDST_DSPS_PROVIDER_INFO) && + (int)nvlist_get_number(nvlist_get_nvlist(di[i], + SNDST_DSPS_PROVIDER_INFO), SNDST_DSPS_SOUND4_UNIT) == unit) + break;; + } + if (i == nitems) + errx(1, "device not found"); + +#define NV(type, item) \ + nvlist_get_ ## type (di[i], SNDST_DSPS_ ## item) + if ((dp = calloc(1, sizeof(struct snd_dev))) == NULL) + err(1, "calloc"); + + dp->unit = -1; + strlcpy(dp->name, NV(string, NAMEUNIT), sizeof(dp->name)); + strlcpy(dp->desc, NV(string, DESC), sizeof(dp->desc)); + strlcpy(dp->devnode, NV(string, DEVNODE), sizeof(dp->devnode)); + dp->from_user = NV(bool, FROM_USER); + dp->play.pchans = NV(number, PCHAN); + dp->rec.pchans = NV(number, RCHAN); +#undef NV + + if (dp->play.pchans && !nvlist_exists(di[i], SNDST_DSPS_INFO_PLAY)) + errx(1, "%s: playback channel list empty", dp->name); + if (dp->rec.pchans && !nvlist_exists(di[i], SNDST_DSPS_INFO_REC)) + errx(1, "%s: recording channel list empty", dp->name); + +#define NV(type, mode, item) \ + nvlist_get_ ## type (nvlist_get_nvlist(di[i], \ + SNDST_DSPS_INFO_ ## mode), SNDST_DSPS_INFO_ ## item) + if (dp->play.pchans) { + dp->play.min_rate = NV(number, PLAY, MIN_RATE); + dp->play.max_rate = NV(number, PLAY, MAX_RATE); + dp->play.min_chans = NV(number, PLAY, MIN_CHN); + dp->play.max_chans = NV(number, PLAY, MAX_CHN); + fmt2str(dp->play.formats, sizeof(dp->play.formats), + NV(number, PLAY, FORMATS)); + } + if (dp->rec.pchans) { + dp->rec.min_rate = NV(number, REC, MIN_RATE); + dp->rec.max_rate = NV(number, REC, MAX_RATE); + dp->rec.min_chans = NV(number, REC, MIN_CHN); + dp->rec.max_chans = NV(number, REC, MAX_CHN); + fmt2str(dp->rec.formats, sizeof(dp->rec.formats), + NV(number, REC, FORMATS)); + } +#undef NV + + /* + * Skip further parsing if the provider is not sound(4), as the + * following code is sound(4)-specific. + */ + if (strcmp(nvlist_get_string(di[i], SNDST_DSPS_PROVIDER), + SNDST_DSPS_SOUND4_PROVIDER) != 0) + goto done; + + if (!nvlist_exists(di[i], SNDST_DSPS_PROVIDER_INFO)) + errx(1, "%s: provider_info list empty", dp->name); + +#define NV(type, item) \ + nvlist_get_ ## type (nvlist_get_nvlist(di[i], \ + SNDST_DSPS_PROVIDER_INFO), SNDST_DSPS_SOUND4_ ## item) + strlcpy(dp->status, NV(string, STATUS), sizeof(dp->status)); + dp->unit = NV(number, UNIT); + dp->bitperfect = NV(bool, BITPERFECT); + dp->play.vchans = NV(bool, PVCHAN); + dp->play.rate = NV(number, PVCHANRATE); + fmt2str(dp->play.format, sizeof(dp->play.format), + NV(number, PVCHANFORMAT)); + dp->rec.vchans = NV(bool, RVCHAN); + dp->rec.rate = NV(number, RVCHANRATE); + fmt2str(dp->rec.format, sizeof(dp->rec.format), + NV(number, RVCHANFORMAT)); +#undef NV + + dp->autoconv = (dp->play.vchans || dp->rec.vchans) && !dp->bitperfect; + + if (!nvlist_exists(nvlist_get_nvlist(di[i], + SNDST_DSPS_PROVIDER_INFO), SNDST_DSPS_SOUND4_CHAN_INFO)) + errx(1, "%s: channel info list empty", dp->name); + + cdi = nvlist_get_nvlist_array( + nvlist_get_nvlist(di[i], SNDST_DSPS_PROVIDER_INFO), + SNDST_DSPS_SOUND4_CHAN_INFO, &nchans); + + TAILQ_INIT(&dp->chans); + caps = 0; + for (j = 0; j < nchans; j++) { +#define NV(type, item) \ + nvlist_get_ ## type (cdi[j], SNDST_DSPS_SOUND4_CHAN_ ## item) + if ((ch = calloc(1, sizeof(struct snd_chan))) == NULL) + err(1, "calloc"); + + strlcpy(ch->name, NV(string, NAME), sizeof(ch->name)); + strlcpy(ch->parentchan, NV(string, PARENTCHAN), + sizeof(ch->parentchan)); + ch->unit = NV(number, UNIT); + ch->direction = (NV(number, CAPS) & PCM_CAP_INPUT) ? + INPUT : OUTPUT; + cap2str(ch->caps, sizeof(ch->caps), NV(number, CAPS)); + ch->latency = NV(number, LATENCY); + ch->rate = NV(number, RATE); + fmt2str(ch->format, sizeof(ch->format), NV(number, FORMAT)); + ch->pid = NV(number, PID); + strlcpy(ch->proc, NV(string, COMM), sizeof(ch->proc)); + ch->interrupts = NV(number, INTR); + ch->xruns = NV(number, XRUNS); + ch->feedcount = NV(number, FEEDCNT); + ch->volume = NV(number, LEFTVOL) | + NV(number, RIGHTVOL) << 8; + fmt2str(ch->hwbuf.format, sizeof(ch->hwbuf.format), + NV(number, HWBUF_FORMAT)); + ch->hwbuf.rate = NV(number, HWBUF_RATE); + ch->hwbuf.size_bytes = NV(number, HWBUF_SIZE); + ch->hwbuf.size_frames = + bytes2frames(ch->hwbuf.size_bytes, NV(number, HWBUF_FORMAT)); + ch->hwbuf.blksz = NV(number, HWBUF_BLKSZ); + ch->hwbuf.blkcnt = NV(number, HWBUF_BLKCNT); + ch->hwbuf.free = NV(number, HWBUF_FREE); + ch->hwbuf.ready = NV(number, HWBUF_READY); + fmt2str(ch->swbuf.format, sizeof(ch->swbuf.format), + NV(number, SWBUF_FORMAT)); + ch->swbuf.rate = NV(number, SWBUF_RATE); + ch->swbuf.size_bytes = NV(number, SWBUF_SIZE); + ch->swbuf.size_frames = + bytes2frames(ch->swbuf.size_bytes, NV(number, SWBUF_FORMAT)); + ch->swbuf.blksz = NV(number, SWBUF_BLKSZ); + ch->swbuf.blkcnt = NV(number, SWBUF_BLKCNT); + ch->swbuf.free = NV(number, SWBUF_FREE); + ch->swbuf.ready = NV(number, SWBUF_READY); + strlcpy(ch->feederchain, NV(string, FEEDERCHAIN), + sizeof(ch->feederchain)); + ch->dev = dp; + + caps |= NV(number, CAPS); + TAILQ_INSERT_TAIL(&dp->chans, ch, next); + + if (!dp->rec.vchans && ch->direction == INPUT) { + strlcpy(dp->rec.format, ch->hwbuf.format, + sizeof(dp->rec.format)); + dp->rec.rate = ch->hwbuf.rate; + } else if (!dp->play.vchans && ch->direction == OUTPUT) { + strlcpy(dp->play.format, ch->hwbuf.format, + sizeof(dp->play.format)); + dp->play.rate = ch->hwbuf.rate; + } +#undef NV + } + cap2str(dp->caps, sizeof(dp->caps), caps); + +done: + free(arg.buf); + nvlist_destroy(nvl); + close(fd); + + return (dp); +} + +static void +free_dev(struct snd_dev *dp) +{ + struct snd_chan *ch; + + while (!TAILQ_EMPTY(&dp->chans)) { + ch = TAILQ_FIRST(&dp->chans); + TAILQ_REMOVE(&dp->chans, ch, next); + free(ch); + } + free(dp); +} + +static void +print_dev_ctl(struct snd_dev *dp, struct snd_ctl *ctl, bool simple, + bool showgrp) +{ + struct snd_ctl *cp; + size_t len; + + if (ctl->type != GRP) { + if (simple) + printf("%s=", ctl->name); + else + printf(" %-20s= ", ctl->name); + } + + switch (ctl->type) { + case STR: + printf("%s\n", (char *)dp + ctl->off); + break; + case NUM: + printf("%d\n", *(int *)((intptr_t)dp + ctl->off)); + break; + case VOL: + break; + case GRP: + if (!simple || !showgrp) + break; + for (cp = dev_ctls; cp->name != NULL; cp++) { + len = strlen(ctl->name); + if (strncmp(ctl->name, cp->name, len) == 0 && + cp->name[len] == '.' && cp->type != GRP) + print_dev_ctl(dp, cp, simple, showgrp); + } + break; + } +} + +static void +print_chan_ctl(struct snd_chan *ch, struct snd_ctl *ctl, bool simple, + bool showgrp) +{ + struct snd_ctl *cp; + size_t len; + int v; + + if (ctl->type != GRP) { + if (simple) + printf("%s.%s=", ch->name, ctl->name); + else + printf(" %-20s= ", ctl->name); + } + + switch (ctl->type) { + case STR: + printf("%s\n", (char *)ch + ctl->off); + break; + case NUM: + printf("%d\n", *(int *)((intptr_t)ch + ctl->off)); + break; + case VOL: + v = *(int *)((intptr_t)ch + ctl->off); + printf("%.2f:%.2f\n", + MIX_VOLNORM(v & 0x00ff), MIX_VOLNORM((v >> 8) & 0x00ff)); + break; + case GRP: + if (!simple || !showgrp) + break; + for (cp = chan_ctls; cp->name != NULL; cp++) { + len = strlen(ctl->name); + if (strncmp(ctl->name, cp->name, len) == 0 && + cp->name[len] == '.' && cp->type != GRP) + print_chan_ctl(ch, cp, simple, showgrp); + } + break; + } +} + +static void +print_dev(struct snd_dev *dp) +{ + struct snd_chan *ch; + struct snd_ctl *ctl; + + if (!oflag) { + printf("%s: <%s> %s", dp->name, dp->desc, dp->status); + + printf(" ("); + if (dp->play.pchans) + printf("play"); + if (dp->play.pchans && dp->rec.pchans) + printf("/"); + if (dp->rec.pchans) + printf("rec"); + printf(")\n"); + } + + for (ctl = dev_ctls; ctl->name != NULL; ctl++) + print_dev_ctl(dp, ctl, oflag, false); + + if (vflag) { + TAILQ_FOREACH(ch, &dp->chans, next) { + if (!oflag) + printf(" %s\n", ch->name); + for (ctl = chan_ctls; ctl->name != NULL; ctl++) + print_chan_ctl(ch, ctl, oflag, false); + } + } +} + +static int +sysctl_int(const char *buf, const char *arg, int *var) +{ + size_t size; + const char *val = arg; + int n, prev; + + n = strtol(val, NULL, 10); + if (errno == EINVAL || errno == ERANGE) { + warn("strtol(%s)", val); + return (-1); + } + + size = sizeof(int); + /* Read current value. */ + if (sysctlbyname(buf, &prev, &size, NULL, 0) < 0) { + warn("sysctlbyname(%s)", buf); + return (-1); + } + /* Apply new value. */ + if (sysctlbyname(buf, NULL, 0, &n, size) < 0) { + warn("sysctlbyname(%s, %d)", buf, n); + return (-1); + } + /* Read back applied value for good measure. */ + if (sysctlbyname(buf, &n, &size, NULL, 0) < 0) { + warn("sysctlbyname(%s)", buf); + return (-1); + } + + printf("%s: %d -> %d\n", buf, prev, n); + if (var != NULL) + *var = n; + + return (0); +} + +static int +sysctl_str(const char *buf, const char *arg, char *var, size_t varsz) +{ + size_t size; + const char *val = arg; + char prev[BUFSIZ]; + char *tmp; + + /* Read current value. */ + size = sizeof(prev); + if (sysctlbyname(buf, prev, &size, NULL, 0) < 0) { + warn("sysctlbyname(%s)", buf); + return (-1); + } + + size = strlen(val); + /* Apply new value. */ + if (sysctlbyname(buf, NULL, 0, val, size) < 0) { + warn("sysctlbyname(%s, %s)", buf, val); + return (-1); + } + /* Get size of new string. */ + if (sysctlbyname(buf, NULL, &size, NULL, 0) < 0) { + warn("sysctlbyname(%s)", buf); + return (-1); + } + if ((tmp = calloc(1, size)) == NULL) + err(1, "calloc"); + /* Read back applied value for good measure. */ + if (sysctlbyname(buf, tmp, &size, NULL, 0) < 0) { + warn("sysctlbyname(%s)", buf); + free(tmp); + return (-1); + } *** 256 LINES SKIPPED *** From nobody Mon May 12 22:14:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxDS841WNz5vvbk for ; Mon, 12 May 2025 22:15:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) (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 4ZxDS773ymz45P0 for ; Mon, 12 May 2025 22:15:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-30a93d80a80so4014086a91.3 for ; Mon, 12 May 2025 15:15:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1747088103; x=1747692903; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=WUYxasLzKDAWIej65egP2T8M1v/9m8L1CysFfFLKOO8=; b=lOSY9s8bIbf0yitECg5Gx6rNSggc4dqAl1xxpko36rjc9uAE+bA/TqLt42hBTxHu7C FSC7yeZIzOE6lw2M3AnuTcHPb7uDDkwh7vt9iY2hjj/DPfYUdILtNqjH/m4swnSG0/jG 9K88RghT8t0uMHacfGQwKwwdfsv/G0BEtaXMtEBEaM0g6n3Rd2wmQQdYn549NNP6gia0 mVvAN0jbp0cQYpDQt6AoGKMKlECNtCkA4hS37yT4Ae9b/4G3A08wgKT3nM4siWdQkLKo GpVNCTLAU00ZC5YiIa75bcDUubJutSRE0hkjjvHhGh2HL2EAvYq4kUd5RsUecOGqRKj8 JLpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747088103; x=1747692903; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WUYxasLzKDAWIej65egP2T8M1v/9m8L1CysFfFLKOO8=; b=oei5nDIILMdldoC1D3fHWdKmMGSXddUt5o33fwbo02zjXfjRMKt0untdgCd+kpDbU6 RQ9OMhHnZcUKW4PgVxTMGbaFbet0z0essmKyM9S8KnBkFjBDskBHf/rQ1tnc95wcK5PS JTmoWlOtb1gqLP+NqvrDRMHpQrwer+Z6MfQK2B9ER5a9N+jAYx8TiVL1YsJ9E8kzutTX /mN8CQujl8TmKEkD2Gs6ni4ME9EfKdijbFntBEpUQmQtBYfaQAgU73OD2uKpPkfqdYGm WmYETu+NStmf7fWP9wB43oi0pFnYHvXuPplHNM8ZQWhbGkHlT/E/m3Mk+vMfC+22fdz7 sw5A== X-Forwarded-Encrypted: i=1; AJvYcCUITrh79VlAvGdSxaw8+lnQNq1ZkWoEXD0L/1EwYpA3tJnadfMZi5wBM7HdooeZiJH0KfVTAwIeJOYu+F6ZRx6Q/1acGXDCrhI=@freebsd.org X-Gm-Message-State: AOJu0YyChK4/45d96Tg5P3fy/M+VDc/JkSmgJ+UGnEU7Ae88TLfoOSTq wHZbWXXnKhqIubt2fExKSOIrvONBSwWkipYjZoOZvnfta2Ez6hSUNrd31pqjASnKRcM901aZ6vJ LRQVw0XaZrg8Dazi/s1NZtgLIHmpWwvn3mhzz4Q== X-Gm-Gg: ASbGncsh4kfu2HDylbzZmSiuFz6FxglEY+Sk2MaQYTa4I61mOuTbhwSm/D3EoVShPQX 9Zk/aXm9R0o/by56602I19v4+gUI9cZiawSJa9Yxc3j3HY4tRlF0m+VTnALMHLgMqsRszLW31jd wFFLtrhvOB6FxO4ixjlcrOv7c8GpSjNTsBjnqR3MUk3N5qFvRsSOl/RK99IeD3SzXOpfAtzX12x Q== X-Google-Smtp-Source: AGHT+IGEtShE4hXV+tBbKyoT+LMmP1XyK4hNNIYgvXh5/rRhpqnnpPpHsh3askSL4ErSrUECQCNWhgWXzHSCm/MqoNI= X-Received: by 2002:a17:90b:3908:b0:2fe:99cf:f566 with SMTP id 98e67ed59e1d1-30c3cefe5cfmr23037107a91.13.1747088102496; Mon, 12 May 2025 15:15:02 -0700 (PDT) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 References: <202504301721.53UHLjlw095104@gitrepo.freebsd.org> <878qn8r3t6.wl-herbert@gojira.at> <87msbipbve.wl-herbert@gojira.at> In-Reply-To: <87msbipbve.wl-herbert@gojira.at> From: Warner Losh Date: Mon, 12 May 2025 16:14:51 -0600 X-Gm-Features: AX0GCFsAjrzk1BGs0JHOh9oJDBVa-FcnXGGORIRPoZ6SLPWMNbppQme4O2hXUoM Message-ID: Subject: Re: git: 80b069913d49 - stable/14 - mpi3mr: Divert large WriteSame IOs to firmware if unmap and ndob bits are set To: "Herbert J. Skuhra" Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4ZxDS773ymz45P0 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-Spamd-Bar: ---- I'll try. Warner On Mon, May 12, 2025 at 12:43=E2=80=AFAM Herbert J. Skuhra wrote: > > Yes, thanks. Merge to releng/14.3? > > On Thu, 08 May 2025 17:44:59 +0200, Warner Losh wrote: > > > > I think that I've fixed this. > > > > Warner > > > > On Wed, May 7, 2025 at 6:41=E2=80=AFAM Herbert J. Skuhra wrote: > > > > > > On Wed, 30 Apr 2025 19:21:45 +0200, Warner Losh wro= te: > > > > > > > > The branch stable/14 has been updated by imp: > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D80b069913d496bd73b0e= a8e515b6bf3706530ea1 > > > > > > > > commit 80b069913d496bd73b0ea8e515b6bf3706530ea1 > > > > Author: Chandrakanth patil > > > > AuthorDate: 2024-06-06 08:38:52 +0000 > > > > Commit: Warner Losh > > > > CommitDate: 2025-04-30 17:05:52 +0000 > > > > > > > > mpi3mr: Divert large WriteSame IOs to firmware if unmap and ndo= b bits are set > > > > > > > > Firmware advertises the transfer lenght for writesame commands = to driver during init. > > > > So for any writesame IOs with ndob and unmap bit set and transf= er lengh is greater > > > > than the max write same length specified by the firmware, then = direct those commands > > > > to firmware instead of hardware otherwise hardware will break. > > > > > > > > Reviewed by: imp > > > > Approved by: imp > > > > Differential revision: https://reviews.freebsd.org/D44452 > > > > > > > > (cherry picked from commit 3f3a15543a6721100dda0e4219eb48ecbe35= 731a) > > > > --- > > > > sys/dev/mpi3mr/mpi3mr.c | 16 ++++++++++++++++ > > > > sys/dev/mpi3mr/mpi3mr.h | 2 ++ > > > > sys/dev/mpi3mr/mpi3mr_cam.c | 35 +++++++++++++++++++++++++++++++++= ++ > > > > sys/dev/mpi3mr/mpi3mr_cam.h | 1 + > > > > sys/modules/mpi3mr/Makefile | 3 +++ > > > > 5 files changed, 57 insertions(+) > > > > > > > > diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c > > > > index 03fea4bdfcc7..a7bc459c1db8 100644 > > > > --- a/sys/dev/mpi3mr/mpi3mr.c > > > > +++ b/sys/dev/mpi3mr/mpi3mr.c > > > > @@ -2177,6 +2177,8 @@ static int mpi3mr_issue_iocinit(struct mpi3mr= _softc *sc) > > > > time_in_msec =3D (now.tv_sec * 1000 + now.tv_usec/1000); > > > > iocinit_req.TimeStamp =3D htole64(time_in_msec); > > > > > > > > + iocinit_req.MsgFlags |=3D MPI3_IOCINIT_MSGFLAGS_WRITESAMEDIVE= RT_SUPPORTED; > > > > + > > > > init_completion(&sc->init_cmds.completion); > > > > retval =3D mpi3mr_submit_admin_cmd(sc, &iocinit_req, > > > > sizeof(iocinit_req)); > > > > @@ -3340,6 +3342,19 @@ void mpi3mr_update_device(struct mpi3mr_soft= c *sc, > > > > break; > > > > } > > > > > > > > + switch (flags & MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_MASK) { > > > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_256_LB: > > > > + tgtdev->ws_len =3D 256; > > > > + break; > > > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_2048_LB: > > > > + tgtdev->ws_len =3D 2048; > > > > + break; > > > > + case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_NO_LIMIT: > > > > + default: > > > > + tgtdev->ws_len =3D 0; > > > > + break; > > > > + } > > > > + > > > > switch (tgtdev->dev_type) { > > > > case MPI3_DEVICE_DEVFORM_SAS_SATA: > > > > { > > > > @@ -5649,6 +5664,7 @@ static void mpi3mr_invalidate_devhandles(stru= ct mpi3mr_softc *sc) > > > > target->io_throttle_enabled =3D 0; > > > > target->io_divert =3D 0; > > > > target->throttle_group =3D NULL; > > > > + target->ws_len =3D 0; > > > > } > > > > } > > > > mtx_unlock_spin(&sc->target_lock); > > > > diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h > > > > index 2f91b0b702dd..fa50ed035fc2 100644 > > > > --- a/sys/dev/mpi3mr/mpi3mr.h > > > > +++ b/sys/dev/mpi3mr/mpi3mr.h > > > > @@ -232,6 +232,8 @@ extern char fmt_os_ver[16]; > > > > > > > > #define MPI3MR_PERIODIC_DELAY 1 /* 1 second heartbeat= /watchdog check */ > > > > > > > > +#define WRITE_SAME_32 0x0d > > > > + > > > > struct completion { > > > > unsigned int done; > > > > struct mtx lock; > > > > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_ca= m.c > > > > index d4cb7e9265dd..dca194a5c8cd 100644 > > > > --- a/sys/dev/mpi3mr/mpi3mr_cam.c > > > > +++ b/sys/dev/mpi3mr/mpi3mr_cam.c > > > > @@ -83,6 +83,7 @@ > > > > #include "mpi3mr.h" > > > > #include /* XXX for pcpu.h */ > > > > #include /* XXX for PCPU_GET *= / > > > > +#include > > > > > > > > #define smp_processor_id() PCPU_GET(cpuid) > > > > > > > > @@ -102,6 +103,37 @@ extern void mpi3mr_add_sg_single(void *paddr, = U8 flags, U32 length, > > > > > > > > static U32 event_count; > > > > > > > > +static > > > > +inline void mpi3mr_divert_ws(Mpi3SCSIIORequest_t *req, > > > > + struct ccb_scsiio *csio, > > > > + U16 ws_len) > > > > +{ > > > > + U8 unmap =3D 0, ndob =3D 0; > > > > + U32 num_blocks =3D 0; > > > > + U8 opcode =3D scsiio_cdb_ptr(csio)[0]; > > > > + U16 service_action =3D ((scsiio_cdb_ptr(csio)[8] << 8) | scsi= io_cdb_ptr(csio)[9]); > > > > + > > > > + > > > > + if (opcode =3D=3D WRITE_SAME_16 || > > > > + (opcode =3D=3D VARIABLE_LEN_CDB && > > > > + service_action =3D=3D WRITE_SAME_32)) { > > > > + > > > > + int unmap_ndob_index =3D (opcode =3D=3D WRITE_SAME_16= ) ? 1 : 10; > > > > + > > > > + unmap =3D scsiio_cdb_ptr(csio)[unmap_ndob_index] & 0x= 08; > > > > + ndob =3D scsiio_cdb_ptr(csio)[unmap_ndob_index] & 0x0= 1; > > > > + num_blocks =3D get_unaligned_be32(scsiio_cdb_ptr(csio= ) + > > > > + ((opcode =3D=3D WRITE= _SAME_16) ? 10 : 28)); > > > > + > > > > + /* Check conditions for diversion to firmware */ > > > > + if (unmap && ndob && num_blocks > ws_len) { > > > > + req->MsgFlags |=3D MPI3_SCSIIO_MSGFLAGS_DIVER= T_TO_FIRMWARE; > > > > + req->Flags =3D htole32(le32toh(req->Flags) | > > > > + MPI3_SCSIIO_FLAGS_DIVERT= _REASON_WRITE_SAME_TOO_LARGE); > > > > + } > > > > + } > > > > +} > > > > + > > > > static void mpi3mr_prepare_sgls(void *arg, > > > > bus_dma_segment_t *segs, int nsegs, int error) > > > > { > > > > @@ -1080,6 +1112,9 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc = *cam_sc, union ccb *ccb) > > > > break; > > > > } > > > > > > > > + if (targ->ws_len) > > > > + mpi3mr_divert_ws(req, csio, targ->ws_len); > > > > + > > > > req->Flags =3D htole32(mpi_control); > > > > > > > > if (csio->ccb_h.flags & CAM_CDB_POINTER) > > > > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.h b/sys/dev/mpi3mr/mpi3mr_ca= m.h > > > > index 3a0526217f86..115ce0c4b8d7 100644 > > > > --- a/sys/dev/mpi3mr/mpi3mr_cam.h > > > > +++ b/sys/dev/mpi3mr/mpi3mr_cam.h > > > > @@ -121,6 +121,7 @@ struct mpi3mr_target { > > > > struct mpi3mr_throttle_group_info *throttle_group; > > > > uint64_t q_depth; > > > > enum mpi3mr_target_state state; > > > > + uint16_t ws_len; > > > > }; > > > > > > > > struct mpi3mr_cam_softc { > > > > diff --git a/sys/modules/mpi3mr/Makefile b/sys/modules/mpi3mr/Makef= ile > > > > index 3f1f63a94ac3..39aa2e3f0ddd 100644 > > > > --- a/sys/modules/mpi3mr/Makefile > > > > +++ b/sys/modules/mpi3mr/Makefile > > > > @@ -6,6 +6,9 @@ SRCS=3D mpi3mr_pci.c mpi3mr.c mpi3mr_cam.c mpi3mr_a= pp.c > > > > SRCS+=3D opt_cam.h > > > > SRCS+=3D device_if.h bus_if.h pci_if.h > > > > > > > > +CFLAGS+=3D -I${SRCTOP}/sys/compat/linuxkpi/common/include > > > > +DEBUG_FLAGS=3D -g > > > ^^^^^^^^^^^^^^^^ > > > > + > > > > .include > > > > > > > > CWARNFLAGS.mpi3mr_sas.c=3D ${NO_WUNNEEDED_INTERNAL_DEC= L} > > > > > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D249068#c2 > > > > > > -- > > > Herbert From nobody Mon May 12 22:46:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxF7s0lLmz5vxNv; Mon, 12 May 2025 22:46: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxF7r6tzNz4Q2G; Mon, 12 May 2025 22:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747089961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/JPuFrjXxZULiA3FY34bv0D4Y7dL6XmME8yemQZvK9s=; b=pT2gvY9RopIBfv+whO+8zwM6mp39R3nJi2MZaDGv4WZVb8BVL+vMy5f5TPGs/PcKsKOErw iN6K4oAADZM7UTAMcMW2qziBj54+jKXQtHCZAaoBBZGIMVkkNV115fnb67J5cKjXFHyDsw z6GIRNQxCqDa6NOtk0ynjIUm9dMUd6G6bIjRXOTkcuhcOOA+4R3Qc/7ArEsvKwsXshy81g JGLCg5JrZw4RiH0m19PCGVzo7EOaMIE68ZDyz9L65KTrcH8Pf6ZRiEVLQfSaSVVvHnwv8n BPcjmHGQ2dCh8koQY+h06HEuYYj2Dmntn3nsV4nQRR0b/1d7a2/dOS6yINoL6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747089961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/JPuFrjXxZULiA3FY34bv0D4Y7dL6XmME8yemQZvK9s=; b=X1X0eWjTGuoMJw5bWvQP3cQm7biO0Y8i2as5GTQKbmQ1U3/x7BxpUqidfdXAWZCpIDAcUz +BHSx4VPU0ykaomXFo49MbFhiEYVg+k+QHBpOIH0luZHiM9dj5o5GdFkaTancHYhTIgfzI JLIk0sxiz96jkOozotyc5AkPdj5yHc6jvyiJ7pT8rgKcnSjMFVPiBpKVDXLCJDaR96V/WD 0GcsWT73UAtU+hLm9bTGlVqd/+IDQfaUZF5SOeeRhLePhUuBwuWGZl+ociCZJJ2R8bbTy0 kBLwSN5ow7WzCr2v+4lCXP7sQLnqyWYNUHYkQeriHZAZBQOblBhJOgX5f8UmJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747089961; a=rsa-sha256; cv=none; b=DQOLD3VoycriGQsXuWozPHks1gLuYME20cegnyn3l0tMdCu9tUDr554nBDT693oE1phmNf vNwpnnE7hh7+ErtJXNeZPsC22WxPXVGVuiczDQIWD90UrbKUNBay7R17nLRrd+pca7ddch ceDT1t9EZ1aeHy7ups7e0mKE8KTPh5L9gXNKBZKSf3VZ9s9bIhmmbCoxXCdoRkwq3PybeS K7UvSYAjaj7A8gEaYTVC0uBez9yjdv5b1hlu4sjvBo7N+jCO3Z5NSaq4FU1gKFcw8Rhtzf dKe+EvyIobQ3TK91gRikYuVKSmE8feKohQWSXjnyiitHVWwm5HsISL4Ikoj0MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxF7r6N2hz5PT; Mon, 12 May 2025 22:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54CMk0bi098570; Mon, 12 May 2025 22:46:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54CMk0i1098567; Mon, 12 May 2025 22:46:00 GMT (envelope-from git) Date: Mon, 12 May 2025 22:46:00 GMT Message-Id: <202505122246.54CMk0i1098567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e79a3515c241 - releng/14.3 - mpi3mr: Remove -g List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: e79a3515c241b84dfa1c73f41a25c4cc992d616d Auto-Submitted: auto-generated The branch releng/14.3 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e79a3515c241b84dfa1c73f41a25c4cc992d616d commit e79a3515c241b84dfa1c73f41a25c4cc992d616d Author: Warner Losh AuthorDate: 2025-05-08 02:09:45 +0000 Commit: Warner Losh CommitDate: 2025-05-12 22:45:35 +0000 mpi3mr: Remove -g This -g was introduce when I didn't review all the cahnges to mpi3mr I was MFCing. Remove it. This is a direct commit. PR: 249068 Fixes: 80b069913d496 Sponsored by: Netflix Approved by: re (cperciva) (cherry picked from commit 22ebbdea3f33fdeae5ee83077ea9c25979705f2f) --- sys/modules/mpi3mr/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/mpi3mr/Makefile b/sys/modules/mpi3mr/Makefile index 39aa2e3f0ddd..81d2e86afc7f 100644 --- a/sys/modules/mpi3mr/Makefile +++ b/sys/modules/mpi3mr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mpi3mr KMOD= mpi3mr @@ -7,7 +6,6 @@ SRCS+= opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include -DEBUG_FLAGS= -g .include From nobody Tue May 13 09:27:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxWMY2DV5z5wbYt; Tue, 13 May 2025 09:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxWMX5slRz3l6Q; Tue, 13 May 2025 09:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747128424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPUnEeTPhACeipYNbM58QAluF1IACGE2umPh/mSOxlo=; b=oNYDoBA16wLKjO1b83VNd61zchRS8bx+jJdSy/35n7Ph9DJtg4owhswDhIV/Q4pdxSHGKC St3KHczcYK/lXeezPlT2KbpEHg5uLyACdBASIyu4+k1ldZvX380PXO+r6Qtt4NHUUOXnAC Ego3YILBp462k8AnrkWTzFSZRooYnSrANhj+byb6I12g0av1f54Gqi47Q7R/4UEg7FL1Vg EP0XMwMXKY+yr9sBJBGi8vlE6mMK9GuZeK5yLeR1XZ89hVVBmlw/uvJ3x0ZxZIWFBv4Ipg MvipCsVrY9jfHcZqbtwnSVg3hExNDMVCf7GpU5WP0LeZOtB15KGNYR7jO+Bptw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747128424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPUnEeTPhACeipYNbM58QAluF1IACGE2umPh/mSOxlo=; b=rIbiSBpLIV6T3yD8egCP+T339ew3OFaz/ZkYgu+XDCdMV8bxq+qeM0ifxWxkt4J2k60O7y ncfU0UQ3e4uWqRb5BrJGXSZGS9tcpH2ky3hZINQMTvXSbYTh8bEScv7Vue926vXsoj1/Pw L6mvJIMSShATCzVOmIxAVZF2OVojz98JD6Qmv9+jNIX1Z4myddDl85gBxScvIuyU9rSEfb rx6/QYeDuCeRXPZEte+K+yXS5OflEZGn8MkIj+Eq/XGPvqZhwC1RQ+wxQxGYY7UHGOkoSd NKaQ4F34Dkoc8mYxP6ioEHAlqzvbMCFVs8r68YoEbVdQoXKnMtHhCNwe0f1mPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747128424; a=rsa-sha256; cv=none; b=lpf4gwO93HkqAi6ikM63LU2aY2FUou6EGvSdXL1fGG56RmKj0CgNoM90pjh8gjEgS49DDb cv3A14h5M9N+VKyzJcr4Y/YQbIiz7Izm1SQHmz+EO4Y3uFGw8ZGYnV1Nqt/bG2bStbZvQD n1TOEQfuw+y+VzuSx+akYX0TvXEKr5N0464VR3f61b3PxJy7dvfRmOu7rvcfw90kH8PHl3 0vsEG/bHauF9gZiSJe5zRgXB5uOo2v2btV1kA+egUE4t7dlxXXIup+a3JXjtazbJAkCBnh yDICQbDgi86W2OnEzj8r7kwitV2T63YkRHgSoBoebmnHfM5airVT8iS0G2YS+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxWMX5KFDzgsh; Tue, 13 May 2025 09:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54D9R4PG097953; Tue, 13 May 2025 09:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54D9R46p097948; Tue, 13 May 2025 09:27:04 GMT (envelope-from git) Date: Tue, 13 May 2025 09:27:04 GMT Message-Id: <202505130927.54D9R46p097948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: da6b04cd4043 - stable/14 - stress2: exlock2.sh: Fix impact of previous '-U' removal List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: da6b04cd404341d494e2c89e3058ccaea5ca8a79 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=da6b04cd404341d494e2c89e3058ccaea5ca8a79 commit da6b04cd404341d494e2c89e3058ccaea5ca8a79 Author: Olivier Certner AuthorDate: 2025-05-12 08:34:05 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 09:26:52 +0000 stress2: exlock2.sh: Fix impact of previous '-U' removal In commit "stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change" (1265d3b07eaa), I forgot that '-U' also has the side-effect of implying '-x' by default. Now that '-U' has been removed, make '-x' explicit. Fixes: 1265d3b07eaa ("stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change") MFC after: 1 hour Sponsored by: The FreeBSD Foundation (cherry picked from commit f6e826891760a34ef69e1122da0ee378f7caf454) --- tools/test/stress2/misc/exlock2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/exlock2.sh b/tools/test/stress2/misc/exlock2.sh index 292e60e8d9f6..a9cd886755f4 100755 --- a/tools/test/stress2/misc/exlock2.sh +++ b/tools/test/stress2/misc/exlock2.sh @@ -153,7 +153,7 @@ out: } #if defined(DEBUG) if (e != 0) { - system("ps | grep -v grep | grep /tmp/exlock2 | "\ + system("ps -x | grep -v grep | grep /tmp/exlock2 | "\ "awk '{print $1}' | xargs procstat -f"); } #endif From nobody Tue May 13 09:27:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxWMZ2DFXz5wbNX; Tue, 13 May 2025 09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxWMY6Vybz3l1Y; Tue, 13 May 2025 09:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747128425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXFTIbkKaGHFC+41YnwVfbASbRG0GcBCMwl0z4dbzDE=; b=be3mMsg2ljAqLRjocZjVw03puvIVEjMTiLIlERDPpof3ZSx7NvknyRTXSovk2eDrmp09iz y1OLLFmuAU9UTukUP48PpTKT3r6v4BA/6dD8Mb3YMdJU2m5G9PbEn9xOs6U7Zi9PDvEFdd hBc6memNbakmxp2lzOUx3zYzMICcviM7vRXraghSZH4WoEyRnGtDLfU24rVI2dmmN9SQsd qVkfN1qHud6nuij/ES09XTnB91HFieNnEtfDYNdpMyouQRfhM/xuN8ZwCJeDOWlY7JYJ/X 0NszKjTle0f1Sqj5yLK6gGBcIlNFLq2saksARAtMarEVwi0PwZEHYjW+XAjjNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747128425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXFTIbkKaGHFC+41YnwVfbASbRG0GcBCMwl0z4dbzDE=; b=NuPm7/tzrejBM3bUS07r1txFdDYICdg3vodYYsQt/PMb249sbJNGIqWVMSrYfIncmjIXGt psp1JwXBXvc3s5RVA3+1LHq24F5rxjkDGnESvD4Tqnnd+Jr1Uclx498wSw8d099A1xN6EN 8pwgZAV30Q3N5eX2ZuGitTzmf6apAgk09gniufPaV9cvfKtfhLRgEFatE+Uz4ce8RkHt2G 4uqzl+ttEeRcz/WFV6psFLNrHRXF4MlT14/rcDIGrm/87HPL/xQZLa6gBQHLxi8bO8n+y2 59WgZvYfr0wvFIrWaK5Co2NESAIJaFgjHRiUWaelDiaIOrYjSv6OC00fjr+Hvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747128425; a=rsa-sha256; cv=none; b=ONEl3RUZevyTtHBGSeHOty4/lEucWzbCHbNSywQIcmeB2OO4wSMYpNy1+PBOSg3GCQNjU8 n+rG9xc+s1Rsqgoaz2nRAZRqucxl3c1bDZfkM++uZzdVuRU8m92snBssQBQV3aiP47Ppto 0TSah6vfza0uQ47IqQ8HaVoeOqsWzLERqJ9VCfYb7zeGYPLGnl7122Blyw8Qpy5VaXi9TF FjrIVlnxtzdWXvJlxQb8Hq/uvU3fByah/SViOo3goHYYV3b6DnBBCu6NBzd/fmJLAjGbo0 tlHBAakybfw4G9n01HV4IUVSJXLsS/ilGn51T6Vj6QlE1GuJmN0lh68zxtt0Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxWMY5tT7zhbK; Tue, 13 May 2025 09:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54D9R5Mr097986; Tue, 13 May 2025 09:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54D9R5vF097983; Tue, 13 May 2025 09:27:05 GMT (envelope-from git) Date: Tue, 13 May 2025 09:27:05 GMT Message-Id: <202505130927.54D9R5vF097983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 1ca993dd4544 - stable/14 - sysctl.9: Constant integer example: Do not promote 'debug.sizeof' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ca993dd454445ad766f8b8b39103e09c1dccce9 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1ca993dd454445ad766f8b8b39103e09c1dccce9 commit 1ca993dd454445ad766f8b8b39103e09c1dccce9 Author: Olivier Certner AuthorDate: 2025-05-09 14:38:32 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 09:26:52 +0000 sysctl.9: Constant integer example: Do not promote 'debug.sizeof' Replace it with another one, selected from current in-tree uses. MFC after: 1 day Sponsored by: The FreeBSD Foundation (cherry picked from commit 129a6cf886e108b67f637a271f003519c99b9abd) --- share/man/man9/sysctl.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index 83f526b349a1..44f042b1d789 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -931,8 +931,8 @@ Examples of integer, opaque, string, and procedure sysctls follow: * flags are CTLFLAG_RD, the variable pointer is SYSCTL_NULL_INT_PTR, * and the value is declared. */ -SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, - sizeof(struct bio), "sizeof(struct bio)"); +SYSCTL_INT(_kern, OID_AUTO, hz_max, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, HZ_MAXIMUM, + "Maximum hz value supported"); /* * Example of a variable integer value. Notice that the control From nobody Tue May 13 12:42:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxbjD1J93z5wnQN; Tue, 13 May 2025 12:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxbjC6Wysz3sxL; Tue, 13 May 2025 12:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gp9p9VY/3FSCeRpVxk70/ZsT7DOTFKkk+g5fPMLQ9E=; b=u5f25kFmWnNt9wbUQcFttfDIGMaH+lpR8CVfnZhTm5Sg/BtVSCQr4AiEwK+Xd6YUrNVz86 iWCZfF8UgBqFT4t5I+8o0JEY3afCxtqiiEOk13oGKc5X5PXJS6FirnCtNWmDwSHQx75U4r W7sZ3SHB4Wy7ul4q/m8X+jrO+qUGnsHMPzv9NZoI0vz7AHOREC7A9bomK5pg116dwEmoPE glcKPP8YnreleBfDiekyGqWVod1Hlu8REJ+KgSEpXrFVPGcH+a490f8uz8d/47ntE4YggZ 1CcYV1kFNyltLNpctmF3kNeT13VyC2tCpI0lSHqzzoIqXVtw58XR+mQc+vaL+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gp9p9VY/3FSCeRpVxk70/ZsT7DOTFKkk+g5fPMLQ9E=; b=IX/JftyUFx6gSmVr0N1wzCEuigFya2b4/fAYj4Kxvazd4/12IQfOVx47QCJC29Zteg2HyE iuAuouFytGYqFXdMkphFgsqQoleu87M7gyhar6IrnkcpdioWwdDiRlkDYiPooyBRQSZado RvByRNrET3UkvlP6baDSgkXSl8aZt19qmuDJnVba6CCPI0rIX4wnfdo1HKVC1QQq5pjQAe gNdLUBlVSTxjg03C5DxPjpgRoh8tNbFn8bYyXHAJK8MU/9JohyyuikYGEfD2MFr/MdexLy JOvCbG1UxSK22SW0rE7pn9UFGL12sBUMloz7WiV4ou3k3k59Ojg+Wod/I/IHxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140159; a=rsa-sha256; cv=none; b=R6g37eWj0vwBXClU1LIW5xAlvHuFPxihmzuka+0W3aYE2CoaAoIDZaPpgwP0cFYCSor313 YZZmdhHUsTq51KhHMaGqeFvE9pmqF53Cc7Xc0T7I4YexIboKo0XBPHphIjj0U9eUmktqfk Ifm47Ld+HrBe7aZyC2ByJp2VveDmbAqx+PuetUQ0f4dhJcx6Rh3gcckN5O9MJff/4cWvJT ++YZ9eRZeq2WzMkWMrsoHC9U+o1CxCmkyCsTLnj9F9lGX+csp5ijD+uUQQJx5OKjwg6A1u bvTYmRM58+tEtgk/YhAC4cJndOL9cSAYTegYFOvIYAAq/yjtlwmZBgCNoba79w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxbjC63v1zn6c; Tue, 13 May 2025 12:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCgdhK072594; Tue, 13 May 2025 12:42:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCgdYR072591; Tue, 13 May 2025 12:42:39 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:39 GMT Message-Id: <202505131242.54DCgdYR072591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: eed005b57895 - releng/14.3 - RELNOTES: ps(1): Document change in behavior for '-a'/'-A' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: eed005b578954025bd2e4bab47d3c37f8d6c1e9c Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=eed005b578954025bd2e4bab47d3c37f8d6c1e9c commit eed005b578954025bd2e4bab47d3c37f8d6c1e9c Author: Olivier Certner AuthorDate: 2025-05-06 13:42:33 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:26 +0000 RELNOTES: ps(1): Document change in behavior for '-a'/'-A' Document the practical consequence of change "ps(1): Make '-a' and '-A' always show all processes" (93a94ce731a8) that specifying '-a'/'-A' leads to printing all processes regardless of the presence of other process selection options (except for '-x'/'-X', which command a filter). While here, mention a possible practical issue with '-J', as reported by dch@. This option was introduced by commit "Add -J to filter by matching jail IDs and names." (13767130c7147ae7182a, r265229), which unfortunately talked about '-J' being a filter while actually implementing it as a regular selection option which adds to the processes to display. Reviewed by: dch MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50193 (cherry picked from commit 428200d2f0689aa801f5cab15d3066e2c77825f5) Commit hash edited on MFC. (cherry picked from commit f18a49a747f7641e93c24d50207d54e7e612f97d) Approved by: re (cperciva) --- RELNOTES | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/RELNOTES b/RELNOTES index 82c0aacd97ee..838833f8db89 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,23 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +1ee62f354ab0: + ps(1)'s options '-a' and '-A', when combined with any other one + affecting the selection of processes except for '-X' and '-x', would + have no effect, in contradiction with the rule that one process is + listed as soon as any of the specified options selects it (inclusive + OR), which is both mandated by POSIX and arguably a natural expectation. + This bug has been fixed. + + As a practical consequence, specifying '-a'/'-A' now causes all + processes to be listed regardless of other selection options (except for + '-X' and '-x', which still apply). In particular, to list only + processes from specific jails, one must not use '-a' with '-J'. Option + '-J', contrary to its apparent initial intent, never worked as a filter + in practice (except by accident with '-a' due to the bug), but instead + as any other selection options (e.g., '-U', '-p', '-G', etc.) subject to + the "inclusive OR" rule. + a2132d91739d: ps(1)'s '-U' option has been changed to select processes by their real user IDs instead of their effective one, in accordance with POSIX and From nobody Tue May 13 12:42:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxbjF324xz5wnkb; Tue, 13 May 2025 12:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxbjF0G2fz3sxP; Tue, 13 May 2025 12:42:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BwCCmwcjuThGaEMfl+Gwd5esy/3YrLu7fTsbE9o0j2U=; b=MH32VNJCHyyML/FxdSPUZpzN13pfgzpps0gY8sHXralKwm4mIpTZ5w7MoKkP5+QFxSAsYi QSAvLsdJkLDVI3JplQhEz6PLeSvARHny/CBhDi1GKtYPDGPw98mACh/r6X5bcFfQ9sSxSM BfdimcIz7npd+AD+1EWBZCuCnVt6lSQKfH6rPhW3lHKhIsusJz82ATy6A3fqPWiAsuNr+P lNhE9ffWuwezaE8Uv7d7IzyUBNZ1B792tjp3cXr01UjI5sdKAcTsmw4CO8v0wWmOZNt0Ud EmsiSxloiPhJgz1xDb6OU0uM80AaIFAJ6XUtDJoVovnzT4gvfdOLzznTK6y4xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BwCCmwcjuThGaEMfl+Gwd5esy/3YrLu7fTsbE9o0j2U=; b=sX4t3484HmgRctHlcriPsCo9Uy8AGqkvTxazRjswRP+mWdjZyL1thMFbTrYw1aKxLNABGe MmhEi5zc6z+4VS2vtbhawAEPIH23vqwNGHDBmEHNBV8VRMlHF3Bm9JV/B5EJmrP0ooaJH0 SngULjoYQSLoEU87uNTZSu7Pd6M7ia7+kzbJO5lrZ7NG0O8wICMrlPUXOwIm1cxd3i8mBu UQbEUhl7h1gIhEUxRkXyQPuHAzwMKoX2SrMxXU1NUTcRQYPQlr1i5bVfGiNBLFiosrmnUX C54/bKSkG9YeQwd/tZQdom0bEaMIkZiDBCz95O0seyTIlbQID8GzU4bgwGmErA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140161; a=rsa-sha256; cv=none; b=YYE7EvjOWHZEL9VsCNccacfIOiB0qPHeR73Rw2sIFUNZmYFEOytOysjBI+C8qVefalVvuN G2gymCCgfpQjOpm2ltatYMKM4BXFL4ZnkAiAqXXQL81eg91x/ONeSfzSbZ/qpivqlCQKfC 09JN/sEZH7o+o9atGjvWghx8Zx35D8xfHeid/QVWolhQLoNXL7srPo7lFoeIgmmKE1WKrg kAuC2PszJ/smO8Y5/uDmTrw9Agz4mzxuWxUesiwlZb546S6c4nveQ5P6VxrB2DmtdSrC6q rejV/gxvd8Rv8IysDkyIf1wJP9SkhcG9NjMjJ2FPn/okU7J6df/SfY7Fea25Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxbjD6zfxznBn; Tue, 13 May 2025 12:42:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCgeGe072629; Tue, 13 May 2025 12:42:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCgeYF072626; Tue, 13 May 2025 12:42:40 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:40 GMT Message-Id: <202505131242.54DCgeYF072626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: d5fff1aad54c - releng/14.3 - ps.1: Remove ambiguity in description of option '-J' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: d5fff1aad54c2e5a79d00d5781c9919ad11adcf3 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d5fff1aad54c2e5a79d00d5781c9919ad11adcf3 commit d5fff1aad54c2e5a79d00d5781c9919ad11adcf3 Author: Olivier Certner AuthorDate: 2025-05-06 13:47:18 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:32 +0000 ps.1: Remove ambiguity in description of option '-J' As stated in the previous commit, option '-J' was introduced by commit "Add -J to filter by matching jail IDs and names." (13767130c7147ae7182a, r265229), which unfortunately talked about '-J' being a filter while actually implementing it as a regular selection option which adds to the processes to display. The manual page's formulation hinted more at '-J' being a filter, which it is not, or could be just considered ambiguous, because of the presence of the "only" word. Consequently, remove it and reformulate. Reviewed by: ziaee, dch MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50194 (cherry picked from commit cbda1aea6532697247bcca6e59d45775857c35e2) (cherry picked from commit 1586fd84fbdab2e2ec205ca717c69946805f2ba0) Approved by: re (cperciva) --- bin/ps/ps.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index c1c2bcea5813..1267b1013f69 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -35,7 +35,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd April 28, 2025 +.Dd May 06, 2025 .Dt PS 1 .Os .Sh NAME @@ -285,7 +285,7 @@ of the jail. Use .Fl J .Sy 0 -to display only host processes. +to request display of host processes. Implies .Fl x by default. From nobody Tue May 13 12:42:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxbjG3RJKz5wnkc; Tue, 13 May 2025 12:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxbjG140Vz3sbG; Tue, 13 May 2025 12:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q89/Gqo/3bETsWUJEiU1jPZ85/tzqGC7VL6zCJbbZBI=; b=FcmPatW80t1GAM33xAnHyDA3E58craAZRI5XAQjHyrslAMjzORVXoSsRKvjre8SwRAG2yv yCzcNMDdyR334QgSjTZ1Ekp3a+79cG7BgJlMwB+AV8mFOKLMX5DICez8yCjf7gb5YNZQ1L fQlx9l2wYb2tv/3/trQSQajA3/VYBz0cbK2I/el1PbrZenNdFg7BzHj492YP3kw+t0FdUz FPjgnhBsgcHiWJHIAgD/JdxqjDV3NAZ//7WFjOFdnlSHnJ+Abpt9XxQne4Y8z9sY/jj7G6 SQpI1tRjIayKDobpO5JWABx7JzJByY0iTN0syLRFlyaQSQ2Gvx+qREhldTDDqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q89/Gqo/3bETsWUJEiU1jPZ85/tzqGC7VL6zCJbbZBI=; b=ftgLkxKqHInZDcIXTTRt6X22DenAHWo9L/6780kPsw/jj5pZEbILgLw4h1xG3xKkEnhHZC 2oijCSzfpl7H4wp1PTzN7Ieyeb4HIzClGAg7LOcoKarNCJqQDw9m5XHrZdIheMgnF0qLVi M1fCWv6wAbbJPE/ffa9BV/PnOJ983A94u8MNLX3Qbsw9fEXO/JsLSWjpPiv3Qllh9OfefF 8Ku3c4zZGyy+WThOj5mlAc/46TrPW1wIDPB9BghLTcfCoCx8fYPKjzoEQzkvIrD22DEw3c EpygQOxxuWpLIxvMnJ3d7jYLMcE2aFRWS0U8dooz+3RKHm3oxx2juirmcAYDKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140162; a=rsa-sha256; cv=none; b=sxSgn1eVbq4nDuxkApLEK0aelFSQx00F7d68OWZZauhgzZyTbXJQEjn/usZt7ZGpCJak/B L0yu0T4DpRtxUyHKKLa7FjanaZb0hJTFKc0C7WpN9NbaYtqtOqVMUiVtT33kGSq2QZ0N9p DuKbYc/68y/bsdZURBqv0YV5TahwvDA6La7fUVyVCtjYFGyM3lfz/ypM5hdFw+H6zQ87Ak xuJXMop8lZrylW+XKd39MwioLMYYcAEQ0vOTLCJEHpgBCWrxgZySh8vydqLDkp+o3ed3Tf 4SJb2P/CCDdXDS+3g/119JgtnXCAN7g2PFIe34unXrdJCd7JGWa9nj6YWvszxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxbjG0Zv6znMj; Tue, 13 May 2025 12:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCgg9v072663; Tue, 13 May 2025 12:42:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCggGB072660; Tue, 13 May 2025 12:42:42 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:42 GMT Message-Id: <202505131242.54DCggGB072660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 2d5e13c86a6a - releng/14.3 - rc/tests: Fix process flags checks using ps(1) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 2d5e13c86a6ad3216ef091ec7c45456a7bafb308 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2d5e13c86a6ad3216ef091ec7c45456a7bafb308 commit 2d5e13c86a6ad3216ef091ec7c45456a7bafb308 Author: Olivier Certner AuthorDate: 2025-05-06 13:52:39 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:32 +0000 rc/tests: Fix process flags checks using ps(1) These checks use ps(1) with both the '-p' and '-a' flags, which worked so far as ps(1)'s '-a' option was buggy. Since the fix in commit "ps(1): Make '-a' and '-A' always show all processes" (93a94ce731a89b56), such a command-line always selects all processes, making the specified '-p' useless and the test wrong. Remove the useless '-a'. While here, remove the redundant '-x', as '-p' implies '-x' by default. MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50201 (cherry picked from commit 646375408742dd5ed9abb174a621a3f8f65a56ef) (cherry picked from commit a69fe62604021f120206e4064ca7463195aeb3a0) Approved by: re (cperciva) --- libexec/rc/tests/rc_subr_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh index f004354fe52e..60f77c2c2de3 100644 --- a/libexec/rc/tests/rc_subr_test.sh +++ b/libexec/rc/tests/rc_subr_test.sh @@ -59,9 +59,9 @@ oomprotect_all_body() atf_check -s exit:0 -o inline:"Starting ${__name}.\n" -e empty \ /bin/sh "$__script" "$__name" "$__pidfile" "$__childpidfile" onestart atf_check -s exit:0 -o match:'^..1..... .......1$' -e empty \ - ps -p "$(cat "$__pidfile")" -ax -o flags,flags2 + ps -p "$(cat "$__pidfile")" -o flags,flags2 atf_check -s exit:0 -o match:'^..1..... .......1$' -e empty \ - ps -p "$(cat "$__childpidfile")" -ax -o flags,flags2 + ps -p "$(cat "$__childpidfile")" -o flags,flags2 atf_check -s exit:0 -o ignore -e empty \ /bin/sh "$__script" "$__name" "$__pidfile" "$__childpidfile" onestop } From nobody Tue May 13 12:42:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxbjH3Xc9z5wnSX; Tue, 13 May 2025 12:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxbjH2PWLz3sxY; Tue, 13 May 2025 12:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MtxDBBCp8s478lwnpgNKh2V+U47zEDi7haNHoPFaz4=; b=D/rZ7fxVzNUTbKXpyELNMli72S8Y4bjqT77LoRkEU+yRUYsuIwOzsdKX0d6Qy5LdYNh32G 92t7XFr9lHTq9SUecKr+rUL9tz5hh7z+Gdc1S+XkYhTIiQLQsiRwcQN/hN2MHr/tmnkn63 ukLrmHaTjI0bjvCmIkWMJdF1eMekh+LQFNRQ/vwwf6JCdja5n6SAHyXgaPbVeYtri+w8iO CJD36cLKZF8UP7W9/6F57fDQZVgsavCN59S+k5l3G7nmZTQy0B4HMN3SOTDFdWM7dduVzi 14IdlyYxHjPF3WuYRZ+uqr3Pddp9CpGr4cnxm5/jb01E0X3ua1+wLZWhkAJxaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MtxDBBCp8s478lwnpgNKh2V+U47zEDi7haNHoPFaz4=; b=biZwNch2ZK5z+B577dAagvQKj+cLDsDOWSOdl+M3NhOvmqvnv+L7+zfnjhxsxx6W/eFno9 zsVjfZBa7l7WZnMenvQA1SAtqrvs8nq5CH2ZBuVxAc7zS3GQ0J5iODhFVTSAO+7H0/R9SM l/+Hz0FR+ziNMA1xY1yDX9Q48RGcoQSn3M1qaDe18zaIpN2vXjP+RekzbTxPsrtKCvqm64 g8w6UxWCTZMpb7RboX5lUn0la3V1UgiSivyRtusphSwPvLkkZx81IgJjguC3DoxHeccq+/ dhlRReqQZjXza88oMAPXFYC1EXwCra0bsmFEY6W1L9WxOnZr6qvcN/++S0+RUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140163; a=rsa-sha256; cv=none; b=hBonad/jWnYLMU9TRvGZbpJhvVl80ErZHKOBz1Z0Q7xSh1edvwyrRfclUd6U8PKoPDImHB MmYZszN75md9rqob12vBW7Dkw4HftIUw+kiSPfpyrVspffGpjUpUxyWonY3D4ubpHCaKfJ 9KFhu0HBe9zNoZacOyRKzo6skxevuer3lr2emT6ZeImQuvwgCXGBqBwpL0jqlrWfxGVoHU LH2BOj1CNQZe6A5YnRJ44R6kO5tvot9GGAc1G1tvpd2AbFi+BwDAkNVqyyDfJpngrPRdXX ou4F/PsO8FfZO4trbiHRTE8RgmzQWFo/gaBjS3AorYdaIEaf4BEPibmcCSQ4zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxbjH1pzpzmrt; Tue, 13 May 2025 12:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCghr3072696; Tue, 13 May 2025 12:42:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCgh30072693; Tue, 13 May 2025 12:42:43 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:43 GMT Message-Id: <202505131242.54DCgh30072693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 10e6bac460af - releng/14.3 - stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 10e6bac460af8482361ffafaada5776d39645675 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=10e6bac460af8482361ffafaada5776d39645675 commit 10e6bac460af8482361ffafaada5776d39645675 Author: Olivier Certner AuthorDate: 2025-05-06 14:43:33 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:32 +0000 stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change Remove '-Uroot', as now '-U' selects processes based on their real user IDs, and since the program using them was launched as 'root', the equivalent now is just to remove it, as now ps(1) by default selects processes based on its effective UID (root) and their effective UIDs. It seems that matching on effective or real UID does not really matter in this test, but at least this change simplifies the command-line. MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50200 (cherry picked from commit 1265d3b07eaa418e9c60800db93f3482ddbb6ae2) (cherry picked from commit 5af18707c155dca74071aa3bfb61160814f03bc3) Approved by: re (cperciva) --- tools/test/stress2/misc/exlock2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/exlock2.sh b/tools/test/stress2/misc/exlock2.sh index 58a49919d86a..292e60e8d9f6 100755 --- a/tools/test/stress2/misc/exlock2.sh +++ b/tools/test/stress2/misc/exlock2.sh @@ -153,7 +153,7 @@ out: } #if defined(DEBUG) if (e != 0) { - system("ps -Uroot | grep -v grep | grep /tmp/exlock2 | "\ + system("ps | grep -v grep | grep /tmp/exlock2 | "\ "awk '{print $1}' | xargs procstat -f"); } #endif From nobody Tue May 13 12:42:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxbjJ5wBBz5wnQV; Tue, 13 May 2025 12:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxbjJ34wkz3sqy; Tue, 13 May 2025 12:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=12Rqsug7iR2E/vefdFxOavWmuYRWX6SYjuPE6Cu6tcA=; b=cdGwvoslY/mxXEoaGLGH98+yZYudafxPS3kRtfJdXnEpe0+69Hqx4VPjeWh3GD7As71Mjt /9eB1JqC3qJl32JnbZ9huDynh1Go1fKXcVyFdteDtcUMdzDvSJELBLWD45jUZo46jHz/1r mt8MpZiZNpv0txG2JVy3pOnFB9t6L6cOKCyt/DI2YiHqCvKetzxLq9TAg9Ci9TPQ2+UDsv 4eiYeGFuUWTqYC6OHkKBjCYtrqg2MJU4PzopfIpC2ZWcNHn0HdCfiOiadXSGAxegZ0GJor NHbWIEb/nqTjuMSOXT6/yKZOqO/8Vi8zIhpcZ5qiLELPOC1xR0x9HtOGh0xVdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=12Rqsug7iR2E/vefdFxOavWmuYRWX6SYjuPE6Cu6tcA=; b=f0Wmd94BE2hI37V/KjmLuaBYGMzrEq3E0NXTn1o3XCwgT+kAc+ZedF3AzYlBb2iY/nZd29 lVJipQLXve9cuVI+NQbfAriWwd+j3+HJzW3S1KPa2LqD1uD3HciuQnkLvlDtwkvS6RNGRa gRy6AQtDKfVy7ARG/UvSVB5Rlm9H9pAer9hxgULgMtlD0YF4JSNKMeywmB5DjsymcGT/H2 74JfaZDe2jMxJC3KoGe1RSaA7jKG70Tr/YTLA+YHQM9Xwq9m96XlOrqkysq6K2EQY76Ey2 KVk6k9fHw9Ja5y5BeXxuf1/1KtvQFer8aLyeMzM8m9PenU9gWAfPFG59+00xrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140164; a=rsa-sha256; cv=none; b=oZrXRR137hGbAfrEo4jgIIX9rLOiqig8sklVdJCs5hj6O0mBPah141D7P2gLqoG09Y3L1/ 2OrkZwE0Xnu41hhWI74gT0Xxep/IiBV81UGEMLSc4BjKhbwHiDGVSpFnxm1LrNn5lSYttw 004seVWY+CQuIjQC0MxRBMGmb8RDcd2AVq8mqJ+ET4grkhif5ktHx7HkeU2eEZcktC8ND1 jJyhrFrk+c8cLWTL8D7PuobyAOx/somGYu7AQI596RFpyME/91kND50v/naXepDREnpIXX ZpcuXrpLwfC5z2D/oGph/Ue0ce70MM7xOnjN0yepfocERGLEJgdN5M39WQn9VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxbjJ2dwBzn6d; Tue, 13 May 2025 12:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCgiHO072729; Tue, 13 May 2025 12:42:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCgiZu072726; Tue, 13 May 2025 12:42:44 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:44 GMT Message-Id: <202505131242.54DCgiZu072726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: f7fa53cead2e - releng/14.3 - stress2: exlock2.sh: Fix impact of previous '-U' removal List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: f7fa53cead2ee93a4f688537375e0f794533db36 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f7fa53cead2ee93a4f688537375e0f794533db36 commit f7fa53cead2ee93a4f688537375e0f794533db36 Author: Olivier Certner AuthorDate: 2025-05-12 08:34:05 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:33 +0000 stress2: exlock2.sh: Fix impact of previous '-U' removal In commit "stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change" (1265d3b07eaa), I forgot that '-U' also has the side-effect of implying '-x' by default. Now that '-U' has been removed, make '-x' explicit. Fixes: 1265d3b07eaa ("stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change") MFC after: 1 hour Sponsored by: The FreeBSD Foundation (cherry picked from commit f6e826891760a34ef69e1122da0ee378f7caf454) (cherry picked from commit da6b04cd404341d494e2c89e3058ccaea5ca8a79) Approved by: re (implicit) --- tools/test/stress2/misc/exlock2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/exlock2.sh b/tools/test/stress2/misc/exlock2.sh index 292e60e8d9f6..a9cd886755f4 100755 --- a/tools/test/stress2/misc/exlock2.sh +++ b/tools/test/stress2/misc/exlock2.sh @@ -153,7 +153,7 @@ out: } #if defined(DEBUG) if (e != 0) { - system("ps | grep -v grep | grep /tmp/exlock2 | "\ + system("ps -x | grep -v grep | grep /tmp/exlock2 | "\ "awk '{print $1}' | xargs procstat -f"); } #endif From nobody Tue May 13 12:42:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxbjL2VSqz5wnVD; Tue, 13 May 2025 12:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxbjK3ycgz3sd5; Tue, 13 May 2025 12:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4erBud+QQJXrq4mZXKmKnATtEyhQObwGIeSacadwzcs=; b=SZo+L8TcycaCW6mRwlgkB8RJIiwk4IFEQm1OAFInrUwHJjiLwOqt05C+eZT93k7VULAVUM fB3Y/c78+eHlYPC1mMPjhNhM/JS3BtN+9AnACyJChVoIbc2Jzw8OiNQtOAvBMt0cW4K/2l 84Rp41REoO55XNSamITvOxd5dFCwc284jaI/FN+7D7NKLB94AxbK21sp/tt34wQujeTNUz NEmXUELhyyct7Ye91f/IGSuQ/iHMnkqRuMk+X2faiqVB6FOhy2bbW7JUGyyzzGYNhJEKkh d6BD5c0/AAx0J3D6QmgOE5P7MPFFqB39gpP4wgpKrMzGWdl6s84Yv8/RjgZYHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4erBud+QQJXrq4mZXKmKnATtEyhQObwGIeSacadwzcs=; b=Fd1iPa1HrLkIM+Bl4ghxus2oaSzRRypDTVNSzdzFLcLFY1lUwjMdwfibpcso9ZzyxJzSJN ODwLnMM6miUPyEnrM2BhR35gniwWDHub/dG7fChGgQJX331/cwAF9l/2m6HBegnSHqpb7n TZJp4TDKEEpwZgT9t2rN2BNiAc/0+xTdmSZRY4Tgd2bTevLuKh4xJpRWAXBWkoxnTi5GxG nAUJrKE5S7x0Xr1679v3WNoQC+/fnGx2lD46g99LuxdWvZ1Iqbvm2DaxI8DFy2fnHoGTua Bau5LbKMsT+LjfSPEIs3rTOpi/Mfh0nPl6NpDN883J+3VT0BUaWrolUkSZ6fUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140165; a=rsa-sha256; cv=none; b=W4PVGNmWObiYbauV069TcjYdBoClucG3ku/UmNgYSNQCQrawXTsOs9KVtP2lGufu2MlkO8 7159y9fANOUoRsq5XtJD8iqhBIuQIxel8oVcu/9gi5XHPZtlv3ZPymNk89/PMAmU6uAoIX kc3OlUA68YK4UINL1JvpiQybURtqLt+iKCeMW6DzX/854Dq98qu40iYpkk/oopVe6liQsV bIseKh1BR00mJCfjY1GAVlbUigVa2Aq7a3LD3mMgfYs8fLR8btXelkz9gWHUMV0V5PZw3q lWwQ8ydEehLARXC80BSDBpE0gPlgRhUqwruY0ryp6nwWTYC1fSRZcMlqPp+7tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxbjK3WGdzmrv; Tue, 13 May 2025 12:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCgjGM072764; Tue, 13 May 2025 12:42:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCgjkM072761; Tue, 13 May 2025 12:42:45 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:45 GMT Message-Id: <202505131242.54DCgjkM072761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: de6a4418eec9 - releng/14.3 - sysctl(9): Ease exporting struct sizes; Discourage doing that List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: de6a4418eec91dc8802defce0159c126a2c7b6d2 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=de6a4418eec91dc8802defce0159c126a2c7b6d2 commit de6a4418eec91dc8802defce0159c126a2c7b6d2 Author: Olivier Certner AuthorDate: 2025-05-01 16:02:44 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:33 +0000 sysctl(9): Ease exporting struct sizes; Discourage doing that Introduce two helpers, the more general SYSCTL_SIZEOF() and a struct-specific one SYSCTL_SIZEOF_STRUCT() which prepends 'struct' in the description and in the use of sizeof() but uses the raw structure name as the knob's name. The size of the object/structure is exported under 'debug.sizeof'. Existing knobs under 'debug.sizeof' were all converted to use the helpers. Add a note before the helpers discouraging the introduction of new leaves for ad-hoc reasons. List alternative means for developers to obtain the size of arbitrary kernel structures easily (thanks to markj@ for providing these). No functional change (intended). Reviewed by: kib, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50121 (cherry picked from commit 713abc9880aabe0ff924ff644bceb6ff404ed3cd) (cherry picked from commit efce9f8a510b60736994e50288b78fc7b32b5d90) Approved by: re (cperciva) --- .../openzfs/module/os/freebsd/zfs/zfs_znode_os.c | 4 ++++ sys/fs/devfs/devfs_devs.c | 7 ++----- sys/geom/geom_kern.c | 15 +++++---------- sys/kern/kern_mib.c | 18 ++++++------------ sys/kern/subr_devstat.c | 3 +-- sys/kern/vfs_cache.c | 3 +-- sys/sys/sysctl.h | 21 +++++++++++++++++++++ 7 files changed, 40 insertions(+), 31 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode_os.c index fea34273baef..61a59be9f78b 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode_os.c @@ -66,8 +66,12 @@ #include "zfs_comutil.h" /* Used by fstat(1). */ +#ifdef SYSCTL_SIZEOF +SYSCTL_SIZEOF(znode, znode_t); +#else SYSCTL_INT(_debug_sizeof, OID_AUTO, znode, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, sizeof (znode_t), "sizeof(znode_t)"); +#endif /* * Define ZNODE_STATS to turn on statistic gathering. By default, it is only diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index c6dcd4fc7646..124f9f0449af 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -121,11 +121,8 @@ SYSCTL_PROC(_kern, OID_AUTO, devname, CTLTYPE_OPAQUE|CTLFLAG_RW|CTLFLAG_ANYBODY|CTLFLAG_MPSAFE, NULL, 0, sysctl_devname, "", "devname(3) handler"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, cdev, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct cdev), "sizeof(struct cdev)"); - -SYSCTL_INT(_debug_sizeof, OID_AUTO, cdev_priv, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct cdev_priv), "sizeof(struct cdev_priv)"); +SYSCTL_SIZEOF_STRUCT(cdev); +SYSCTL_SIZEOF_STRUCT(cdev_priv); struct cdev * devfs_alloc(int flags) diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c index 14707403215d..f8f99087ad9c 100644 --- a/sys/geom/geom_kern.c +++ b/sys/geom/geom_kern.c @@ -230,13 +230,8 @@ SYSCTL_INT(_kern_geom, OID_AUTO, collectstats, CTLFLAG_RW, &g_collectstats, 0, "Control statistics collection on GEOM providers and consumers"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_class, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_class), "sizeof(struct g_class)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_geom, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_geom), "sizeof(struct g_geom)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_provider, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_provider), "sizeof(struct g_provider)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_consumer, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_consumer), "sizeof(struct g_consumer)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, g_bioq, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct g_bioq), "sizeof(struct g_bioq)"); +SYSCTL_SIZEOF_STRUCT(g_class); +SYSCTL_SIZEOF_STRUCT(g_geom); +SYSCTL_SIZEOF_STRUCT(g_provider); +SYSCTL_SIZEOF_STRUCT(g_consumer); +SYSCTL_SIZEOF_STRUCT(g_bioq); diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index d60c72a00f63..f69275fc3d1d 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -722,11 +722,9 @@ SYSCTL_STRING(_user, USER_LOCALBASE, localbase, CTLFLAG_RWTUN, localbase, sizeof(localbase), "Prefix used to install and locate add-on packages"); #include -SYSCTL_INT(_debug_sizeof, OID_AUTO, vnode, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct vnode), "sizeof(struct vnode)"); +SYSCTL_SIZEOF_STRUCT(vnode); -SYSCTL_INT(_debug_sizeof, OID_AUTO, proc, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct proc), "sizeof(struct proc)"); +SYSCTL_SIZEOF_STRUCT(proc); static int sysctl_kern_pid_max(SYSCTL_HANDLER_ARGS) @@ -758,19 +756,15 @@ SYSCTL_PROC(_kern, OID_AUTO, pid_max, CTLTYPE_INT | #include #include -SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct bio), "sizeof(struct bio)"); -SYSCTL_INT(_debug_sizeof, OID_AUTO, buf, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct buf), "sizeof(struct buf)"); +SYSCTL_SIZEOF_STRUCT(bio); +SYSCTL_SIZEOF_STRUCT(buf); #include -SYSCTL_INT(_debug_sizeof, OID_AUTO, kinfo_proc, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct kinfo_proc), "sizeof(struct kinfo_proc)"); +SYSCTL_SIZEOF_STRUCT(kinfo_proc); /* Used by kernel debuggers. */ const int pcb_size = sizeof(struct pcb); -SYSCTL_INT(_debug_sizeof, OID_AUTO, pcb, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct pcb), "sizeof(struct pcb)"); +SYSCTL_SIZEOF_STRUCT(pcb); /* XXX compatibility, remove for 6.0 */ #include diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index 6c0977d1cc35..3a107ac30390 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -600,5 +600,4 @@ devstat_free(struct devstat *dsp) } } -SYSCTL_INT(_debug_sizeof, OID_AUTO, devstat, CTLFLAG_RD, - SYSCTL_NULL_INT_PTR, sizeof(struct devstat), "sizeof(struct devstat)"); +SYSCTL_SIZEOF_STRUCT(devstat); diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index ab28540be8a8..92e9d77eb891 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -511,8 +511,7 @@ SYSCTL_INT(_debug, OID_AUTO, vfscache, CTLFLAG_RW, &doingcache, 0, #endif /* Export size information to userland */ -SYSCTL_INT(_debug_sizeof, OID_AUTO, namecache, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, - sizeof(struct namecache), "sizeof(struct namecache)"); +SYSCTL_SIZEOF_STRUCT(namecache); /* * The new name cache statistics diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 5fce4b8e1713..f08080d4e4fa 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -38,6 +38,7 @@ #define _SYS_SYSCTL_H_ #ifdef _KERNEL +#include #include #include #endif @@ -934,6 +935,26 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); CTLFLAG_RD | CTLFLAG_CAPRD | CTLTYPE_INT | CTLFLAG_MPSAFE, \ NULL, 1, sysctl_handle_int, "I", desc, "feature"); +/* + * Adding new leaves to the 'debug.sizeof' MIB tree for ad-hoc reasons is + * discouraged, and in particular for reporting to developers the size of some + * kernel structures, which can be obtained by the following alternative means: + * 1. In GDB, load a full kernel image and use 'print(sizeof(struct XXX))'. + * Alternatively, use 'ptype/o struct XXX' to additionally get the offsets + * and size of all structure's fields. + * 2. If the structure is allocated from UMA, then 'vmstat -z' reports its size + * (the mapping between structure types and zones is usually + * straightforward). + */ +/* Generates a read-only sysctl reporting the size of an object/structure. */ +#define SYSCTL_SIZEOF(name, expr) \ + SYSCTL_INT(_debug_sizeof, OID_AUTO, name, CTLFLAG_RD, \ + SYSCTL_NULL_INT_PTR, sizeof(expr), \ + "sizeof(" __STRING(expr) ")"); +/* Same, specialized for structures. */ +#define SYSCTL_SIZEOF_STRUCT(struct_name) \ + SYSCTL_SIZEOF(struct_name, struct struct_name) + #endif /* _KERNEL */ /* From nobody Tue May 13 12:42:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxbjM6NXjz5wnb9; Tue, 13 May 2025 12:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxbjL53D0z3t3Z; Tue, 13 May 2025 12:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UiAXNFsbkFFHkI8ur1oiMdeI+NZ4NoIrxrNnYUwPnqA=; b=PXGil6LKpsO2zhnq6qy7hosKPDAtUSzFt5q9p29TEAlHANHvrP2bPkpxVxy9gIYFeNRdlO M0wPCjmWGJIETGuDu3KPPE2/s8J7zzX0DJI38AENKUAxYmT/tkG8MQb6nUMMGVmXWkvUbn Zfclie/l0PHBdPjZ4dpSTfibNFoP8Ag6eF2OZ++0sveqeDSx+wMWj/ZBGViQ5hCxwS9bO3 1U7klbAZYO3N5AbxC+zU6O9CWBYx3XLGMBxmrqZWOi1lRCL1pzbZwchB2rUk7BUOfs1hvv FvjReYCOEnP4jxkjqVzk6hY6tpTLELRhyYKgpOYlSR3juB0X7fUjQsffgNu1yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UiAXNFsbkFFHkI8ur1oiMdeI+NZ4NoIrxrNnYUwPnqA=; b=iA9sz7xlJUMguJhJpHqJdX95wd66ev9LfdmI+FuqNUYZr0hOrOJkO4098l9ksaJAj8x8zz vtVI3Dsus+CzcEay8OV1hkCiREa93wsGK57J83d+aZspvigYDswMI5BOAXPY+Vp/wlY+fE 95BbtBjHdlhXg7o18TF9JbWSMBUeNUFmuaTjweweQCHkTxUf6UWnRDEz5TIX+0KDBtERPJ UWf/2DOB5Po8PQhU0iDlY1gu4UZl8tILZM4v1B/7qiXJDcFvnq6Z2ZBJ9DZquhC0WGQGX0 5zd281Flm0C4vkaWDfH6MLsBciR3CWNMXG78biIxxIYipL12UDKIFFNSFMQwlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140166; a=rsa-sha256; cv=none; b=G4WiiFkNbcWpeex+fNTveudxnuB8fFPUtYjGarKy3K/YE+PkErRhVfGHijC0/htRk5GX24 mcP14nIZMMpHVAsUWHWARrcaWDdwP/bEnHROFWiHUYFGs5VfT2FCmcdlapZasMY/dvL6IR /90/1XGg380MBBvHVy3GwMueWqTqpTQ6T05j2mViiqIC7zW5xO11KJG3CkekNCS9cX7Wha 0MiU8EGIeM1slM5zxFIBNfrbjI9NuijzKt12tk1gitfje9wkdeqJvi3wcv3OAsPQd039Fm /HAVR+rzrJqtUvZcofLXN21fsSfyYPAf+u4Bv9IBed1VoPjSmfWOGk6KCbQKTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxbjL4X1hzn6f; Tue, 13 May 2025 12:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCgkNh072802; Tue, 13 May 2025 12:42:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCgkZm072799; Tue, 13 May 2025 12:42:46 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:46 GMT Message-Id: <202505131242.54DCgkZm072799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: d156cabc0f37 - releng/14.3 - sysctl.9: Constant integer example: Do not promote 'debug.sizeof' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: d156cabc0f3774a4f53c419488f6c4f331861d51 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d156cabc0f3774a4f53c419488f6c4f331861d51 commit d156cabc0f3774a4f53c419488f6c4f331861d51 Author: Olivier Certner AuthorDate: 2025-05-09 14:38:32 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:33 +0000 sysctl.9: Constant integer example: Do not promote 'debug.sizeof' Replace it with another one, selected from current in-tree uses. MFC after: 1 day Sponsored by: The FreeBSD Foundation (cherry picked from commit 129a6cf886e108b67f637a271f003519c99b9abd) (cherry picked from commit 1ca993dd454445ad766f8b8b39103e09c1dccce9) Approved by: re (implicit) --- share/man/man9/sysctl.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index 83f526b349a1..44f042b1d789 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -931,8 +931,8 @@ Examples of integer, opaque, string, and procedure sysctls follow: * flags are CTLFLAG_RD, the variable pointer is SYSCTL_NULL_INT_PTR, * and the value is declared. */ -SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, - sizeof(struct bio), "sizeof(struct bio)"); +SYSCTL_INT(_kern, OID_AUTO, hz_max, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, HZ_MAXIMUM, + "Maximum hz value supported"); /* * Example of a variable integer value. Notice that the control From nobody Tue May 13 12:42:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxbjP0pXPz5wnMR; Tue, 13 May 2025 12:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxbjM601Gz3swd; Tue, 13 May 2025 12:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Bio6cNtJ662IRDanEION08PEdJ31AGTff67aLWTSlc=; b=sDrWs20AiGPD9yVVicN7c8ap8ACPypmR79huFmQb7fW2xnVREeK3Q9joD8NHXVajPBCgKI K+znvCtdko+ex7jj+hvni5lx8giGBARORVdPWolHXcM3rkH322w/EumzckVDbYgTyqC6KH y1FF8IGOsu2qPzkTJIQNVYbm5d1Ji/xZVGdbPyYX4R20DIa4mGoXjxwZU4umE/D/4ugcgN m/Y96H3GN+CohQtFkI8hcXqTauDYSyZ4osm7+GM8iU+p35PqAugCjlYNFL1ItvBO+us99V CNkDvo0cfJ0NsBtVw5EBvRrqQ4A/EchU5JEUcrfkXdYwbi5ym4+/EPzWihQB+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Bio6cNtJ662IRDanEION08PEdJ31AGTff67aLWTSlc=; b=ADJukZ6Oxdlzt0dvvrlOXjJQf89rYmJWsuApfxOPe5KOKAvpJjRpKNvM3xMbmNzSXA5RUH gZXa+NZo61oe6b7NJ7hd7/BphpY5hwFxkoneGiknQfyLgXoj02LxIXSj3rBowtek50w9Oi jBKVPfvOFx1miGzVg/A3hmDdqqHYJiOZpYEvQvF4mLdVun7xoRvRKMjDyBRvtum8zxkpoE nac9sz0/YpOxK8Zp9SaciGsfvKntmvo05BBsKmWkCcXwUxC9fORlo8h29HOZQjixRaHQf6 WVmFLKF2paOVveOgYQTMoXVlVKiPwNil0STr5b7mq0EtN7qdgWomVcMfJnE+Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140167; a=rsa-sha256; cv=none; b=DKfi+oOuSHxQc4mjfvk9nThAV7/Ii8olqOXXN1trs9TwqPheD5BwBz7AXbb5PHY5rtX3/W ML78ONTFExvZ6dyFnr8fUCim8Db+c3EVIg4kb0cZKrT/UEcBXWgwkrYRjJPJ18amVLVt2x y7/CAFI79OnB5ID2mcyE5eHKaCx9fAjOIoSS41TPzuyRYudqOVlhdn1SR+10KrvMIkSQvL SnaS3wDQtLdL7dX8m3ef8e/Ou1OTSB0dyYUGFt7SqRa3f5ZbtivTbMJv9RMhXhhX8G8FZ9 TxUSxxSMmvC0kjoU9qiK4h7FOqMkwrC1cTmBerTaF7nS/mLYih0Bk9KRQYAVCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxbjM5XbzznjJ; Tue, 13 May 2025 12:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCglcj072838; Tue, 13 May 2025 12:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCgl4r072835; Tue, 13 May 2025 12:42:47 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:47 GMT Message-Id: <202505131242.54DCgl4r072835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 10944406beb4 - releng/14.3 - queue(3): Install *_SPLIT_AFTER() links to the main manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 10944406beb48f2da722b1f4ee798d2b07b499fc Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=10944406beb48f2da722b1f4ee798d2b07b499fc commit 10944406beb48f2da722b1f4ee798d2b07b499fc Author: Olivier Certner AuthorDate: 2025-05-05 10:04:12 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:33 +0000 queue(3): Install *_SPLIT_AFTER() links to the main manual page Completes commit "queue(3): New *_SPLIT_AFTER(), *_ASSERT_EMPTY(), *_ASSERT_NONEMPTY()" (c02880233949b01f). MFC after: 1 day Sponsored by: The FreeBSD Foundation (cherry picked from commit c071616b06aa0f51ac4314f989c472d0268c2ddb) (cherry picked from commit eca0ce8afb15ef9f01703c4d15273eaf66eb63f5) Approved by: re (cperciva) --- share/man/man3/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 75f209ab4e0d..9f0c796e445c 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -217,6 +217,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 LIST_PREV.3 \ queue.3 LIST_REMOVE.3 \ queue.3 LIST_REPLACE.3 \ + queue.3 LIST_SPLIT_AFTER.3 \ queue.3 LIST_SWAP.3 \ queue.3 SLIST_CLASS_ENTRY.3 \ queue.3 SLIST_CLASS_HEAD.3 \ @@ -237,6 +238,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 SLIST_REMOVE_AFTER.3 \ queue.3 SLIST_REMOVE_HEAD.3 \ queue.3 SLIST_REMOVE_PREVPTR.3 \ + queue.3 SLIST_SPLIT_AFTER.3 \ queue.3 SLIST_SWAP.3 \ queue.3 STAILQ_CLASS_ENTRY.3 \ queue.3 STAILQ_CLASS_HEAD.3 \ @@ -259,6 +261,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 STAILQ_REMOVE.3 \ queue.3 STAILQ_REMOVE_AFTER.3 \ queue.3 STAILQ_REMOVE_HEAD.3 \ + queue.3 STAILQ_SPLIT_AFTER.3 \ queue.3 STAILQ_SWAP.3 \ queue.3 TAILQ_CLASS_ENTRY.3 \ queue.3 TAILQ_CLASS_HEAD.3 \ @@ -286,6 +289,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 TAILQ_PREV.3 \ queue.3 TAILQ_REMOVE.3 \ queue.3 TAILQ_REPLACE.3 \ + queue.3 TAILQ_SPLIT_AFTER.3 \ queue.3 TAILQ_SWAP.3 MLINKS+= stats.3 stats_tpl_alloc.3 \ stats.3 stats_tpl_fetch_allocid.3 \ From nobody Tue May 13 12:50:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zxbtr0dzSz5wnsx; Tue, 13 May 2025 12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zxbtr008mz40vD; Tue, 13 May 2025 12: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=1747140660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szwd5H/9iwvOBA/is4h/APSel5pk9Ukf/U0fquA2NMs=; b=eMUPexmT8YTi154JZRrMRQXh23wyxDmutdKn/FRqH3yc61DyKRgl6w7o6ZfnvNdi25nAjX BdiE/UtH5E4h6FFLG+FezFZy8qacR2cgcKxSAn2Axioo70Le+Lk0hyJtduTqEKYk03wWek 9aM1tUkaEhepEKCFoWHmJdv/pIdcUIKEov2H42Yc172aNHAFWO3YTsq0TDcf4cK+LbF8sr +aZVMu2gkiPJ1eTzeOICVsOsCQHSptV1ZCUku4x/+kbkxGxs726IawDErvvkOlR97uJa2r jN9gIZDY9oiGVB5mqy2aN0e8RpXQf8Do27wB2am45mu3Lo0F/dXuwF23hujn8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szwd5H/9iwvOBA/is4h/APSel5pk9Ukf/U0fquA2NMs=; b=U+jaXKPIqRGriWibOxkNEOasoF1ChWMqubUgTA0V+XjPps8fQGnktzJif0NhSP01rGKyaA AUSJI0aMayXFBCUqqtPX+WRElBBZIrifJ2pgNOgk5rNZHIsWusMp2svv9hznkvG+7RfCiA a+HQVRlh6fYVo9X5Xd3k3nSvQp6OUFPb6+vcOOZe/JEOvXz1eQr98RleZ8jUWDHYcLnbA6 anoInk/gzpdqTVvSOYMdnINjGsDmDrLCopLc9Ra8Uiog6VvGSKow9VsMf0H64df4voqM+h LgSejvTzO/5f1371TEryyTgOzd4VZF6XpdRZjTP5rbGfRTRm9XYg+T6Qm5vEQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140660; a=rsa-sha256; cv=none; b=WB7JfGuiEXELihMEVnHbgeh3BOrh7hgxRc/jESK4tV9KRumduTbwMXuSu8DoIHWcvTPn3k 1rXUKp9KBhNSmWc9C/UJjX2KGGTes7LGEXQByzuTDN5m8o2h49vtrrCfoVnjLjOGI87r9a 0arTOKxA8LPVYrSs0lFBkFLMIYPxSoo5rfxf5GbnMVJ0uwZ8aUbYupfUg5JQoNGRG0xVoA 3mjfZ+qPb+NRhbLx0u13osW5xVHpz/lSEHjs5Oq3pSVvEelAno6ZTbkdDkiTqxlPubjqj3 rfSzgHeQQrJWSKCcdNSAnI3whGiAiNidn226XoUNGkjrRIeLi7UHo/ieVhVFOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zxbtq6fqWznBv; Tue, 13 May 2025 12:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCoxuk085960; Tue, 13 May 2025 12:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCoxWa085957; Tue, 13 May 2025 12:50:59 GMT (envelope-from git) Date: Tue, 13 May 2025 12:50:59 GMT Message-Id: <202505131250.54DCoxWa085957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 33475cb18e9e - stable/14 - racct: Fix a typo in a comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 33475cb18e9eb5568c6704c2b2b9a63a46ddd2ed Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=33475cb18e9eb5568c6704c2b2b9a63a46ddd2ed commit 33475cb18e9eb5568c6704c2b2b9a63a46ddd2ed Author: Mark Johnston AuthorDate: 2025-05-01 14:00:05 +0000 Commit: Mark Johnston CommitDate: 2025-05-13 12:50:51 +0000 racct: Fix a typo in a comment Reported by: kib MFC after: 1 week (cherry picked from commit 5d1fba01ca07030a013815746c2c056b5c4a8a49) --- sys/kern/kern_racct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c index 43c3da0c2320..b121e24b9354 100644 --- a/sys/kern/kern_racct.c +++ b/sys/kern/kern_racct.c @@ -311,7 +311,7 @@ fixpt_t ccpu_exp[] = { /* * This function is analogical to the getpcpu() function in the ps(1) command. * They should both calculate in the same way so that the racct %cpu - * calculations are consistent with the values showed by the ps(1) tool. + * calculations are consistent with the values shown by the ps(1) tool. * The calculations are more complex in the 4BSD scheduler because of the value * of the ccpu variable. In ULE it is defined to be zero which saves us some * work. From nobody Tue May 13 12:51:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zxbts1PGDz5wnmH; Tue, 13 May 2025 12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zxbts0XFbz40sf; Tue, 13 May 2025 12: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=1747140661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SnbfZxzRRI2hQaTidfJNc8QzprDAK8PFNuirWkrWFOE=; b=Pgq3+28iXXIv3d/A9IEbS9eg9dU1UbEi8KqPM//s3hLGeN2L+npQ3bsWYa2XAAs96BL80g k1NziPNKHIWN8r72g/Sl20u85hwLqNhMgh9USgNsEOwgPFSkKw/Qap85WwhRO54vQmfokM 2I/elsruvqHLJUee0SKZeT7SOOQ+uRHLi5xQSstry1EH/J2lmcFF5Hv9f1hllbIsJLkuWY XgX8idzbkiTgV4AzY5sUmsFloKnLLdFa3yE122fVd4HyEeDkm0g84hir+vAP4r3Q/IRhkA YMZvkmJxVOMvijzkzSWC88x/oyBQG5IP24r5Lu0dg3AaOdTwJlA2QfJ9q0YYtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SnbfZxzRRI2hQaTidfJNc8QzprDAK8PFNuirWkrWFOE=; b=WhQ/V6yIYy5YLLwq7sASEWEm0Qd4irkAs8cOrKalFQeD0fhH2Ial/L11QRqALdZvJ3D2Qh BEnFqi3wNOBf700ztW9DKkdAbBOlSo8XJNRbB9UdQ2uKbIFbFePAhnVd0OkRYdL5cma27Q kH/2e7DWaOPRBgentjighvwmey8HI5/MQD8rTdvei33vC+d1eTS2UbieydXXurgwY8cUO5 hKlrQ7FC8jZ5UXza4hdwiYjrEm0L8edRc0xRerAOBRnS16a74FZg4fnRq64RRTG2MxCsu2 /r2YTrDYLesY28sRu/Az8r5+1wfY9Ij3M+GKIpvPBeJrgtfniB5qEyuY0OyL9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140661; a=rsa-sha256; cv=none; b=h3YW/rFcPdKtS1aCsxiPdL4YRvbcKeMWP7Rd3oGG33QVBODV1ulqq+HI9WxGtgiLr+n8et n/eMspyk4pq22IvGSEOCUEKUv9P1GfdgoCbwyHCg89GWggDLM4qzbY9VQMOH2S0Rg53d81 SLBOHx6Fg5i/DYPDFHNLHYh2V92IDDqI0hNnE3YMyuvMbsiTfV0mB2QwcB7JdQ7A2ETUqX 8LR+CSccOUCwDJgxQzPokhT6jAyzAObnGP0gFJhaare7coPb868uxr+Y8Pxi6RgXZqgkCt eg2YhreqYH2qcaTtf6EL2AwiTKGUTmm5hFoBFezmvPFTlMbe//lv4kW3Unp/Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zxbts0310zn6x; Tue, 13 May 2025 12:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCp0gi086935; Tue, 13 May 2025 12:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCp0h4086923; Tue, 13 May 2025 12:51:00 GMT (envelope-from git) Date: Tue, 13 May 2025 12:51:00 GMT Message-Id: <202505131251.54DCp0h4086923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: df4d9abbcc04 - stable/14 - aio: Fix opcode handling in aio_process_rw() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df4d9abbcc04db5a195b98d5291ba15949fc03c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=df4d9abbcc04db5a195b98d5291ba15949fc03c5 commit df4d9abbcc04db5a195b98d5291ba15949fc03c5 Author: Mark Johnston AuthorDate: 2025-05-02 21:37:39 +0000 Commit: Mark Johnston CommitDate: 2025-05-13 12:50:51 +0000 aio: Fix opcode handling in aio_process_rw() LIO_FOFFSET needs to be masked off, as it is in aio_aqueue(). Reported by: syzbot+b6e15476c91852bb2264@syzkaller.appspotmail.com Reviewed by: kib, asomers MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50118 (cherry picked from commit ab01a5f5628eb0d334f491ff06462cff214d5f49) --- sys/kern/vfs_aio.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index c5b0c7896a17..291ac46babef 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -764,10 +764,9 @@ aio_process_rw(struct kaiocb *job) long inblock_st, inblock_end; int error, opcode; - KASSERT(job->uaiocb.aio_lio_opcode == LIO_READ || - job->uaiocb.aio_lio_opcode == LIO_READV || - job->uaiocb.aio_lio_opcode == LIO_WRITE || - job->uaiocb.aio_lio_opcode == LIO_WRITEV, + opcode = job->uaiocb.aio_lio_opcode & ~LIO_FOFFSET; + KASSERT(opcode == LIO_READ || opcode == LIO_READV || + opcode == LIO_WRITE || opcode == LIO_WRITEV, ("%s: opcode %d", __func__, job->uaiocb.aio_lio_opcode)); aio_switch_vmspace(job); @@ -777,7 +776,6 @@ aio_process_rw(struct kaiocb *job) job->uiop->uio_td = td; fp = job->fd_file; - opcode = job->uaiocb.aio_lio_opcode; cnt = job->uiop->uio_resid; msgrcv_st = td->td_ru.ru_msgrcv; From nobody Tue May 13 12:51:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zxbtw0Chbz5wp4s; Tue, 13 May 2025 12:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zxbtv2glJz40nK; Tue, 13 May 2025 12: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=1747140663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qgPHxbnU0SshZGnbdk98SzrlGTrgxNSYW1N+5b2Ias=; b=iXUhcZZN3B/iuITFj5YbynFUTHVwSp9Kg+MELKz+Kuytv+fuDPMJ3WIZ5B7q3K7sSuqb/K kXnKW1kBSCO3+aR1XGGKLcWrb2NrqnVWoLODcWgv1sC+0RYoa+Ti8iYgrnAWZFQpeUbnUF vu46veExpHGTm9Bow2krpmUEv6fkmOGirsxS7wQdfsWolNtm9eM0k6SQOBVbgWFPjwGeCY 9JOLQIG69nkebhD6NWh1lCwAyMiSi/pBc6qdoodelF2So6h7MG/xwVKdOOrWG+QIRm13Kk T7RFn68m5KhgJJRuMg6FI2RWKXFv6r/1ZwA1a6UGU45TG2JqUh5E5oGfJxZt3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qgPHxbnU0SshZGnbdk98SzrlGTrgxNSYW1N+5b2Ias=; b=FE0p3KYrVjGI79i/shbTxHmopbbpo5FNxyu53GTL0ef8ArPt5ETxyD/dj7edzXdT0bLjUc 5G1fBRwmiQPlUy559Dl/E9lPUpIi/1ifxTPfUuDV7imi9N/4b7/bVMEZR9A1Xx3zNQJDBZ VC7p04oXEtj/Vy6/zMMADSa+kCAj+QQzb0F9D6wmEIJ3ja3Rhl34TKUZPlNQQrd8sTwxi4 7MOb/0fPZ9D7Bgxm8nRMQjY2t+2hKl9TCQe04xFi6WIby2sp89S0W89svEjv/fygdr1iL1 iXefzQHCWSWGqgMiFNFtUZ0+4CC0r4rwIKg6uYpNFmxq1o6tG0kvhQrSCSVwXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140663; a=rsa-sha256; cv=none; b=gzZRdek53ghaAnlk5dlL3A4IegZL2RWtdcSGa2Ogy9Bs5LVn0ftMJ72DzbC2lFpf8xYrLX Y14qB38LkLI6tmUk16epnaFIl5RyF0Tqbb+gfBxm4rtC7ZCQKNBWqpXbPhmJGGwN9JgNCn K/A/HiYpSFRk1EyhtR0SDCzFQ43h163/d2LJehPc7PiR5P0mgb7RsrpsxvOOt9Py7SP3it SUB3BlyF9P69bVFLVaZav93QXk3NlKIoOBOfS5mQMD+uu9Q54l58LZZ69d71kUaYPXWQU2 ElaWaleCJr1I8ynk59x8tM5toKAfHoPw20CXT/NUKt4Q47BPavOkw9ZPDR+xMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zxbtv1xPRznBx; Tue, 13 May 2025 12:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCp3ku087125; Tue, 13 May 2025 12:51:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCp37v087122; Tue, 13 May 2025 12:51:03 GMT (envelope-from git) Date: Tue, 13 May 2025 12:51:03 GMT Message-Id: <202505131251.54DCp37v087122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bd20de7d16c7 - stable/14 - vm_fault: Defer marking COW pages valid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bd20de7d16c768f00419602a0eb2ed93b942bf0e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bd20de7d16c768f00419602a0eb2ed93b942bf0e commit bd20de7d16c768f00419602a0eb2ed93b942bf0e Author: Mark Johnston AuthorDate: 2025-04-13 16:09:31 +0000 Commit: Mark Johnston CommitDate: 2025-05-13 12:50:51 +0000 vm_fault: Defer marking COW pages valid Suppose an object O has two shadow objects S1, S2 mapped into processes P1, P2. Suppose a page resident in O is mapped read-only into P1. Now suppose that P1 writes to the page, triggering a COW fault: it allocates a new page in S1 and copies the page, then marks it valid. If the page in O was busy when initially looked up, P1 would have to release the map lock and sleep first. Then, after handling COW, P1 must re-check the map lookup because locks were dropped. Suppose the map indeed changed, so P1 has to retry the fault. At this point, the mapped page in O is shadowed by a valid page in S1. If P2 exits, S2 will be deallocated, resulting in a collapse of O into S1. In this case, because the mapped page is shadowed, P2 will free it, but that is illegal; this triggers a "freeing mapped page" assertion in invariants kernels. Fix the problem by deferring the vm_page_valid() call which marks the COW copy valid: only mark it once we know that the fault handler will succeed. It's okay to leave an invalid page in the top-level object; it will be freed when the fault is retried, and vm_object_collapse_scan() will similarly free invalid pages in the shadow object. Reviewed by: kib MFC after: 1 month Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D49758 (cherry picked from commit c98367641991019bac0e8cd55b70682171820534) --- sys/vm/vm_fault.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index dd044d27f00f..9d7c5d452a0b 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1050,14 +1050,14 @@ vm_fault_cow(struct faultstate *fs) * Oh, well, lets copy it. */ pmap_copy_page(fs->m, fs->first_m); - vm_page_valid(fs->first_m); if (fs->wired && (fs->fault_flags & VM_FAULT_WIRE) == 0) { vm_page_wire(fs->first_m); vm_page_unwire(fs->m, PQ_INACTIVE); } /* - * Save the cow page to be released after - * pmap_enter is complete. + * Save the COW page to be released after pmap_enter is + * complete. The new copy will be marked valid when we're ready + * to map it. */ fs->m_cow = fs->m; fs->m = NULL; @@ -1740,6 +1740,19 @@ found: if (hardfault) fs.entry->next_read = vaddr + ptoa(ahead) + PAGE_SIZE; + /* + * If the page to be mapped was copied from a backing object, we defer + * marking it valid until here, where the fault handler is guaranteed to + * succeed. Otherwise we can end up with a shadowed, mapped page in the + * backing object, which violates an invariant of vm_object_collapse() + * that shadowed pages are not mapped. + */ + if (fs.m_cow != NULL) { + KASSERT(vm_page_none_valid(fs.m), + ("vm_fault: page %p is already valid", fs.m_cow)); + vm_page_valid(fs.m); + } + /* * Page must be completely valid or it is not fit to * map into user space. vm_pager_get_pages() ensures this. From nobody Tue May 13 12:51:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zxbtv15Fjz5wnyR; Tue, 13 May 2025 12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zxbtt4Nf5z40qV; Tue, 13 May 2025 12: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=1747140662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbvl3piWErlcCDJ2yiEC6q1OpoTTlUlVI8e8lTrdUzg=; b=YfXGA4Xfe5C49a3RIF2OTF6I/iIdmljSR5knkamRYjxySPUHpGmbndQ6r+0H+OkhCw0ZFI ey+rF1Gcc2OoE3MUtWAarg6dzRpbeyrae+j7FFA5J5LCAuLfjw6UJxKjIGaCpKV79kfglx jw4okOS2vu+dKuZ5oiXCWpmbnsCM83VUClY9dPpmSGReUn3EWhNBo5QMlIQ+34zZ5ceYhw hWiVleiUGY+vzkLSTRTOOo6293Dto45+vWx+8f6a+pPwms7j9q+5vbtjXFueygRY33lNRv XCZxR3WwgcNTbSh/idjthn3NuKkxdrgJXXzK21fREX1DCRtFqvzlqMNz7agNjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbvl3piWErlcCDJ2yiEC6q1OpoTTlUlVI8e8lTrdUzg=; b=FgnoawUcIczp7Aasr1irPvwtTJqV1DOFAge4vzfrUFwvmyr97BLVXlnNIul5zVBJvyP/d1 qs5SFnppcTZPZHY1H/BRQ5RDver+cnYtbcW8Ttsi6rZ3ZTECJ1/AcGg1tJ0jmR/BPXtkR8 5/gyaeuhXhFF5kzqnQ6Gsc2Y3TMulITmZsmWdSRZWCNBraW20KIbZYM+l+T5MoxZiIVeAc nCXq3xcHsx4PtFlBPl0eF9knB2a7mJvfbd/TEA0J9iYoYD1r1b5ca4/WWcdQ4OEapcKo1y 7301ELh8j3X2CRl9tDXufrlI97UqfqTabgITpye0GMf5D4mjHRGqEFND8NDmzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140662; a=rsa-sha256; cv=none; b=eOUDEeZiCNQnZJHQUp7aQvxYYVwcXbZmSiYuvvz9QufwT5MDR1LHak6VpngoAPStkDs4Cb FdZcasXCJp2UCTalmClwXMHA39VSaLLak44UlDPS9c20nt8aTQQEhMuW/Pa1SQsNn/ACwv 2pytBwJRBRfAevXHw8Uu1TfHIgEf30pDcvy3x5f12KmAiFy6wTuV/S7kzIpphf6NBca8+g h+/BwxGBGt1hZJjzNOxpOa12ZAIovDfcTpedbVhxj3baOL7Siyi0j5oHmkFX9GWnPgUhfr ++iHE0G7jKucdcbCaU5metp6xCDBTeAZipdNgGCDO+DfOv/c1oQGzeJckaeWFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zxbtt11qmzms0; Tue, 13 May 2025 12:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DCp2lL087091; Tue, 13 May 2025 12:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCp2EF087088; Tue, 13 May 2025 12:51:02 GMT (envelope-from git) Date: Tue, 13 May 2025 12:51:02 GMT Message-Id: <202505131251.54DCp2EF087088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6180a8eaba89 - stable/14 - tests: Serialize kern_descrip_test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6180a8eaba89e7dcb609aa89419b9629108a6b87 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6180a8eaba89e7dcb609aa89419b9629108a6b87 commit 6180a8eaba89e7dcb609aa89419b9629108a6b87 Author: Mark Johnston AuthorDate: 2025-05-02 23:59:55 +0000 Commit: Mark Johnston CommitDate: 2025-05-13 12:50:51 +0000 tests: Serialize kern_descrip_test It can trigger failures in unrelated tests when it modifies the maxfiles limit. MFC after: 1 week (cherry picked from commit 46adaf3642cff045b9ac87bd2e8b32124bd66ba2) --- tests/sys/kern/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index b6333c9f04f3..46977bedef98 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -16,6 +16,8 @@ ATF_TESTS_C+= kcov .endif ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test +# One test modifies the maxfiles limit, which can cause spurious test failures. +TEST_METADATA.kern_descrip_test+= is_exclusive="true" ATF_TESTS_C+= fdgrowtable_test ATF_TESTS_C+= kill_zombie .if ${MK_OPENSSL} != "no" From nobody Tue May 13 15:55:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zxh091WfTz5vYC2; Tue, 13 May 2025 15:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zxh083V32z3JN5; Tue, 13 May 2025 15:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747151752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ifn+1yhAe4eZcVHonyk2ncT4iXrxESDMZqukxgiyzuI=; b=AjIzh3XXuQPImno3UK49yXW5wGdViimlS5PQqhnsKMarryCh+xg1ICkMllipz80F2JQRUz 9Lkw3kVIvaRTfcSzjagUHBCrPxFI2TN6tu7z/Gqu3DcFpZRFlNNzFnlZlRmUi6TgJok2EW dX8Ecm4Ne1QWOMFz5relRCaQsVFzdhWoofhcIRBcusXvJW4ZVVzjqC4VBpeKJu+o1CX4I+ eJhDQOyom2J+B9R6xezufG2QddFFBe/OH7TXDA+PwQ7Vm/nCwsVn54L4PMuC9goe7KZYfM xVK7niKjoHTlUr6UGimrsUbF9ZtfzFMHvD3rS0mFHlDdU6M0L3iKn1TBhgMS5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747151752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ifn+1yhAe4eZcVHonyk2ncT4iXrxESDMZqukxgiyzuI=; b=eI7GoqOiVDkEG6WZqcV6uWJU8V5zj/gdS22l4m3iAr9nyQ41RPprTkvGU7c+OqOcjbPBeJ W1qyzoHIgeTdTb/vNZaRBMfbj6WEcSlFpWnMtBTb52mFjP+7UJDZXliHxk/uSl3s/ZlRbO f6M70gHLVKYqdecA3qbLOxRcqyGouiiVoQ8f7ntr1pX1ovaRw2CIxPMWMIEq5Rc3TJduEb /O6tlAxdYjhVGhpZAFNNLYiW+qbuwZnCPJOqthvLhjBey5Sd/HmVRYkFY2nC6c8ABjAf9l +J+0kYKq1oG8QNbQ+6PqM/bM3xNhDDUoWhASp/d/6ttAqvGo6/h2ZKZ921/DBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747151752; a=rsa-sha256; cv=none; b=l5yRFrd6eMWIbJElqDCyspztsc4IbASH281hkV174wI+pLW/RWDfXGSRb15ljIcAunjSrw KClYFrR11ZoKJvG7XIGSsRGKluDegtJRplUo/kdCp/ZhC+7i1OicxHwS3lVr8W+pNBXr2V gMaL2zbOKxiTTNYpQn4fonBsE11hOTMzDbYNbdEx38vMcjciB2iubcGiHNFaHuQxhRK5TJ AFPPew1b2KA7ySdmVh7DYEJoHaTTWaeceOdNWe2JX2CIjmBdgVanyH0AWMDqW/BsDR8axK aNvC5y9D4pkvWZ+9GTuVL9qEzKpi9DhwCTr3MDIna4q+c1NIdYxgQM8mb54vRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zxh0830qMztN8; Tue, 13 May 2025 15:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DFtqsh030464; Tue, 13 May 2025 15:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DFtqxQ030461; Tue, 13 May 2025 15:55:52 GMT (envelope-from git) Date: Tue, 13 May 2025 15:55:52 GMT Message-Id: <202505131555.54DFtqxQ030461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ravi Pokala Subject: git: f0d1e0026891 - stable/14 - amdsmn(4), amdtemp(4): Add support for AMD Family 1Ah (Zen5) CPUs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rpokala X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f0d1e002689130a8b34c91c80002cc1fce4dd8ae Auto-Submitted: auto-generated The branch stable/14 has been updated by rpokala: URL: https://cgit.FreeBSD.org/src/commit/?id=f0d1e002689130a8b34c91c80002cc1fce4dd8ae commit f0d1e002689130a8b34c91c80002cc1fce4dd8ae Author: Ravi Pokala AuthorDate: 2025-05-10 06:26:42 +0000 Commit: Ravi Pokala CommitDate: 2025-05-13 15:53:44 +0000 amdsmn(4), amdtemp(4): Add support for AMD Family 1Ah (Zen5) CPUs I found the '1AH_MxxH_ROOT' PCI device IDs in the Linux "AMD K8 Northbridge" driver [1][5]. Since Family 19h (Zen3, Zen4) uses the same registers as Family 17h (Zen1, Zen2), I tried using those same registers for Family 1Ah (Zen5) as well, and they worked. I pulled the 1Ah model ranges from Linux as well [2][3][4][6]. Added some additional logging under 'bootverbose', and used a local variable and macro for the stepping, rather than repeatedly using the mask directly. Consistently report the CPUID (family, model, stepping) using two, zero-padded, un-prefixed, uppercase nybbles, with an 'h' suffix. This is the format used in documentation and in Linux. My own testing with various models of Zen4 EPYC 9xx4 ("Genoa") shows that their CPUID models are in the range 0x10 .. 0x1f. Similar testing with various models of Zen5 EPYC 9xx5 ("Turin") shows that their CPUID models are in the range 0x00 ... 0x2f. [1] 2023-08-10: https://github.com/torvalds/linux/commit/c640166 [2] 2024-01-23: https://github.com/torvalds/linux/commit/3e4147f [3] 2024-01-25: https://github.com/torvalds/linux/commit/b9328fd [4] 2024-04-24: https://github.com/torvalds/linux/commit/2718a7f [5] 2024-07-28: https://github.com/torvalds/linux/commit/59c3400 [6] 2024-07-30: https://github.com/torvalds/linux/commit/bf5641e Sponsored by: Vdura MFC after: 3 days Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D50278 (cherry picked from commit 2a042fab4f91a525daa6255b69892fb434c62831) --- sys/dev/amdsmn/amdsmn.c | 26 +++++++++++++++++++++++-- sys/dev/amdtemp/amdtemp.c | 49 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/sys/dev/amdsmn/amdsmn.c b/sys/dev/amdsmn/amdsmn.c index 262adcc4bff3..b4cdd8c96549 100644 --- a/sys/dev/amdsmn/amdsmn.c +++ b/sys/dev/amdsmn/amdsmn.c @@ -25,7 +25,7 @@ */ /* - * Driver for the AMD Family 15h and 17h CPU System Management Network. + * Driver for the AMD Family 15h, 17h, 19h, 1Ah CPU System Management Network. */ #include @@ -63,6 +63,10 @@ #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 /* Also F1AH M40H */ #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 +#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT 0x153a +#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 +#define PCI_DEVICE_ID_AMD_1AH_M60H_ROOT 0x1122 + struct pciid; struct amdsmn_softc { @@ -130,6 +134,24 @@ static const struct pciid { .amdsmn_addr_reg = F17H_SMN_ADDR_REG, .amdsmn_data_reg = F17H_SMN_DATA_REG, }, + { + .amdsmn_vendorid = CPU_VENDOR_AMD, + .amdsmn_deviceid = PCI_DEVICE_ID_AMD_1AH_M00H_ROOT, + .amdsmn_addr_reg = F17H_SMN_ADDR_REG, + .amdsmn_data_reg = F17H_SMN_DATA_REG, + }, + { + .amdsmn_vendorid = CPU_VENDOR_AMD, + .amdsmn_deviceid = PCI_DEVICE_ID_AMD_1AH_M20H_ROOT, + .amdsmn_addr_reg = F17H_SMN_ADDR_REG, + .amdsmn_data_reg = F17H_SMN_DATA_REG, + }, + { + .amdsmn_vendorid = CPU_VENDOR_AMD, + .amdsmn_deviceid = PCI_DEVICE_ID_AMD_1AH_M60H_ROOT, + .amdsmn_addr_reg = F17H_SMN_ADDR_REG, + .amdsmn_data_reg = F17H_SMN_DATA_REG, + }, }; /* @@ -217,7 +239,7 @@ amdsmn_probe(device_t dev) default: return (ENXIO); } - device_set_descf(dev, "AMD Family %xh System Management Network", + device_set_descf(dev, "AMD Family %02Xh System Management Network", family); return (BUS_PROBE_GENERIC); diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index cad16c80ee17..1305337112b6 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -118,6 +118,9 @@ struct amdtemp_softc { #define DEVICEID_AMD_HOSTB19H_M40H_ROOT 0x14b5 #define DEVICEID_AMD_HOSTB19H_M60H_ROOT 0x14d8 /* Also F1AH M40H */ #define DEVICEID_AMD_HOSTB19H_M70H_ROOT 0x14e8 +#define DEVICEID_AMD_HOSTB1AH_M00H_ROOT 0x153a +#define DEVICEID_AMD_HOSTB1AH_M20H_ROOT 0x1507 +#define DEVICEID_AMD_HOSTB1AH_M60H_ROOT 0x1122 static const struct amdtemp_product { uint16_t amdtemp_vendorid; @@ -146,6 +149,9 @@ static const struct amdtemp_product { { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M40H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M60H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M70H_ROOT, false }, + { VENDORID_AMD, DEVICEID_AMD_HOSTB1AH_M00H_ROOT, false }, + { VENDORID_AMD, DEVICEID_AMD_HOSTB1AH_M20H_ROOT, false }, + { VENDORID_AMD, DEVICEID_AMD_HOSTB1AH_M60H_ROOT, false }, }; /* @@ -167,7 +173,7 @@ static const struct amdtemp_product { #define AMDTEMP_15H_M60H_REPTMP_CTRL 0xd8200ca4 /* - * Reported Temperature, Family 17h + * Reported Temperature, Family 17h - 1Ah * * According to AMD OSRR for 17H, section 4.2.1, bits 31-21 of this register * provide the current temp. bit 19, when clear, means the temp is reported in @@ -295,21 +301,33 @@ amdtemp_identify(driver_t *driver, device_t parent) static int amdtemp_probe(device_t dev) { - uint32_t family, model; + uint32_t family, model, stepping; - if (resource_disabled("amdtemp", 0)) + if (resource_disabled("amdtemp", 0)) { + if (bootverbose) + device_printf(dev, "Resource disabled\n"); return (ENXIO); - if (!amdtemp_match(device_get_parent(dev), NULL)) + } + if (!amdtemp_match(device_get_parent(dev), NULL)) { + if (bootverbose) + device_printf(dev, "amdtemp_match() failed\n"); return (ENXIO); + } family = CPUID_TO_FAMILY(cpu_id); model = CPUID_TO_MODEL(cpu_id); + stepping = CPUID_TO_STEPPING(cpu_id); switch (family) { case 0x0f: - if ((model == 0x04 && (cpu_id & CPUID_STEPPING) == 0) || - (model == 0x05 && (cpu_id & CPUID_STEPPING) <= 1)) + if ((model == 0x04 && stepping == 0) || + (model == 0x05 && stepping <= 1)) { + if (bootverbose) + device_printf(dev, + "Unsupported (Family=%02Xh, Model=%02Xh, Stepping=%02Xh)\n", + family, model, stepping); return (ENXIO); + } break; case 0x10: case 0x11: @@ -324,7 +342,8 @@ amdtemp_probe(device_t dev) default: return (ENXIO); } - device_set_desc(dev, "AMD CPU On-Die Thermal Sensors"); + device_set_descf(dev, "AMD Family %02Xh CPU On-Die Thermal Sensors", + family); return (BUS_PROBE_GENERIC); } @@ -485,7 +504,7 @@ amdtemp_attach(device_t dev) needsmn = true; break; default: - device_printf(dev, "Bogus family 0x%x\n", family); + device_printf(dev, "Bogus family %02Xh\n", family); return (ENXIO); } @@ -494,7 +513,7 @@ amdtemp_attach(device_t dev) device_get_parent(dev), "amdsmn", -1); if (sc->sc_smn == NULL) { if (bootverbose) - device_printf(dev, "No SMN device found\n"); + device_printf(dev, "No amdsmn(4) device found\n"); return (ENXIO); } } @@ -510,7 +529,7 @@ amdtemp_attach(device_t dev) device_printf(dev, "Erratum 319: temperature measurement may be inaccurate\n"); if (bootverbose) - device_printf(dev, "Found %d cores and %d sensors.\n", + device_printf(dev, "Found %d cores and %d sensors\n", sc->sc_ncores, sc->sc_ntemps > 1 ? sc->sc_ntemps * sc->sc_ncores : 1); @@ -858,7 +877,7 @@ amdtemp_probe_ccd_sensors17h(device_t dev, uint32_t model) break; default: device_printf(dev, - "Unrecognized Family 17h Model: %02xh\n", model); + "Unrecognized Family 17h Model: %02Xh\n", model); return; } @@ -878,7 +897,7 @@ amdtemp_probe_ccd_sensors19h(device_t dev, uint32_t model) maxreg = 8; _Static_assert((int)NUM_CCDS >= 8, ""); break; - case 0x10 ... 0x1f: + case 0x10 ... 0x1f: /* Zen4 EPYC "Genoa" */ sc->sc_temp_base = AMDTEMP_ZEN4_10H_CCD_TMP_BASE; maxreg = 12; _Static_assert((int)NUM_CCDS >= 12, ""); @@ -892,7 +911,7 @@ amdtemp_probe_ccd_sensors19h(device_t dev, uint32_t model) break; default: device_printf(dev, - "Unrecognized Family 19h Model: %02xh\n", model); + "Unrecognized Family 19h Model: %02Xh\n", model); return; } @@ -906,14 +925,16 @@ amdtemp_probe_ccd_sensors1ah(device_t dev, uint32_t model) uint32_t maxreg; switch (model) { + case 0x00 ... 0x2f: /* Zen5 EPYC "Turin" */ case 0x40 ... 0x4f: /* Zen5 Ryzen "Granite Ridge" */ + case 0x60 ... 0x7f: /* ??? */ sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE; maxreg = 8; _Static_assert((int)NUM_CCDS >= 8, ""); break; default: device_printf(dev, - "Unrecognized Family 1ah Model: %02xh\n", model); + "Unrecognized Family 1Ah Model: %02Xh\n", model); return; } From nobody Wed May 14 09:09:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zy6wZ2TMNz5wPCq; Wed, 14 May 2025 09:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zy6wZ1cv3z3S37; Wed, 14 May 2025 09:09:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747213758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/d1HVvaPDL7PKrm2hFeZEju5iIBLKtjkBNilsZoIQE=; b=LT7WGBeidfTGEIFe/5W6Ix8FWI7Efpp821BlMQ3e/bKAXKgtxXuKQwKAnFsp9DlN1zrc/i zcQ/FpvWz1qHtlOEwMGfXTQLP5auwL/TZm3JhRiG/7TvnNAEWnLJ6rfIKgRN6PhKa8e17m tpPcM2M3Ifn2CMNlHsGh+mrgJa64aojpBMtvxcwyzOWrqy46N70p1G7lxLJBZhYm9u3ag3 /Hmk+0PqPFv4vlp0y/PW7d+ji/1tj3VLFvsD/FJ9pg3okDMc7yjPSNmp0ZTniuk8m1iuLV 9Pmh65PDGdHTMpX1GvqhZ15zkMcrWXNy7HzCcfy28PpNomRD1lcOy4gRyu4JIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747213758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/d1HVvaPDL7PKrm2hFeZEju5iIBLKtjkBNilsZoIQE=; b=ol7lOybB+H2iJrDGbEYSSX0FMBIIgRo7nxk+o1eFXtsc72deOH+VkiRC+gnUefek7sGYKF JCSrEtP3puvX9S7uJTvtrZwtfTBlbA6GER9903hUNRO53EPIRzW3JCM+MNPakGi7zSZJuF JiohaIoIrs25pcR55BwPayIqHhJpTJ655oIkST5tSa2wfnr73llQbKNmEaia450KpqGV6R DGx+ZXw3sWJThqeP8srlLgPoiJjrFg5iSlEKwfo3FrSTlQucZEZ5IXdlkvt+o6ftqX8t09 uifQzz6lOQ8eMNXExf8sVrS6i1HxcX4M9a7GvE9KRs9Arx5/oQAiAC9aUrsZ6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747213758; a=rsa-sha256; cv=none; b=q8XFfby6GOlDbYDNzxNChaYLNKuIfLQRdeXbqPF+WaaWIY1CGn+sVjXv/E9SFqUp4kFS8n /JdCS2hBzJ7Pgg9QgCoL8UrJKpPi2u3alYdrEriKp29HIkBE+cr/Jd+sISAWKJyZ5WEC+q Yrv6RDjqWLyIr33mUZsZbaUtRIr0GsqPMJRuYuK2l8uaZWOKIXywTSKvMrYDlgNl2bx9hK 8fDImqZVuKSrnF4C2LiUSnWZsizrufnbmbj5YBIuzfoZ51HKyWARctdXm+TqYWIK9e1nCj UmINb1m/jq2iJYwf6GFH+CvPsokmCVmR71jDd4yK9tqPebEX+rga3QrwcnSMYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zy6wZ0JhRz9w2; Wed, 14 May 2025 09:09:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54E99HQD062843; Wed, 14 May 2025 09:09:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54E99HGa062840; Wed, 14 May 2025 09:09:17 GMT (envelope-from git) Date: Wed, 14 May 2025 09:09:17 GMT Message-Id: <202505140909.54E99HGa062840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cbc3efab49aa - stable/14 - mbuf: Allow clusters to fill an entire jumbo page. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cbc3efab49aaa69acd3ac1701bc11095a4373d0a Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cbc3efab49aaa69acd3ac1701bc11095a4373d0a commit cbc3efab49aaa69acd3ac1701bc11095a4373d0a Author: Dag-Erling Smørgrav AuthorDate: 2025-05-07 18:58:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-14 09:08:41 +0000 mbuf: Allow clusters to fill an entire jumbo page. The assumption that MCLBYTES == MJUMPAGESIZE can only happen if pages are small is incorrect: it can also happen if MCLSHIFT is adjusted to increase the size of clusters. Restore the ability to have clusters fill a jumbo page, while still disallowing them from exceeding them. MFC after: 1 week Fixes: 840327e5ddf3, 9c3ad5ba932b Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: siderop1_netapp.com, kevans, brooks Differential Revision: https://reviews.freebsd.org/D50242 (cherry picked from commit 271128b0698653294acf0ed3457d5871af5b3ef1) --- sys/conf/NOTES | 3 ++- sys/dev/cxgbe/adapter.h | 4 ++++ sys/dev/cxgbe/t4_sge.c | 8 ++++++++ sys/kern/kern_mbuf.c | 4 ++-- sys/sys/mbuf.h | 6 ++++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 6de8eab73027..55c1798bbffc 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2047,7 +2047,8 @@ device rtwnfw # mismatch between the mbuf size assumed by the kernel and the mbuf size # assumed by a module. The only driver that currently has the ability to # detect a mismatch is ti(4). -options MCLSHIFT=11 # mbuf cluster shift in bits, 11 == 2KB +options MCLSHIFT=12 # mbuf cluster shift in bits, 12 == 4 kB + # default is 11 == 2 kB options MSIZE=256 # mbuf size in bytes # diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 3bf4f666ce7d..d3820245837a 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -107,7 +107,11 @@ enum { CTRL_EQ_QSIZE = 1024, TX_EQ_QSIZE = 1024, +#if MJUMPAGESIZE != MCLBYTES SW_ZONE_SIZES = 4, /* cluster, jumbop, jumbo9k, jumbo16k */ +#else + SW_ZONE_SIZES = 3, /* cluster, jumbo9k, jumbo16k */ +#endif CL_METADATA_SIZE = CACHE_LINE_SIZE, SGE_MAX_WR_NDESC = SGE_MAX_WR_LEN / EQ_ESIZE, /* max WR size in desc */ diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index cc927f27d318..7591db6cd833 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -570,7 +570,9 @@ t4_sge_modload(void) } if (largest_rx_cluster != MCLBYTES && +#if MJUMPAGESIZE != MCLBYTES largest_rx_cluster != MJUMPAGESIZE && +#endif largest_rx_cluster != MJUM9BYTES && largest_rx_cluster != MJUM16BYTES) { printf("Invalid hw.cxgbe.largest_rx_cluster value (%d)," @@ -579,7 +581,9 @@ t4_sge_modload(void) } if (safest_rx_cluster != MCLBYTES && +#if MJUMPAGESIZE != MCLBYTES safest_rx_cluster != MJUMPAGESIZE && +#endif safest_rx_cluster != MJUM9BYTES && safest_rx_cluster != MJUM16BYTES) { printf("Invalid hw.cxgbe.safest_rx_cluster value (%d)," @@ -718,7 +722,9 @@ t4_tweak_chip_settings(struct adapter *sc) uint16_t indsz = min(RX_COPY_THRESHOLD - 1, M_INDICATESIZE); static int sw_buf_sizes[] = { MCLBYTES, +#if MJUMPAGESIZE != MCLBYTES MJUMPAGESIZE, +#endif MJUM9BYTES, MJUM16BYTES }; @@ -855,7 +861,9 @@ t4_init_rx_buf_info(struct adapter *sc) int i, j, n; static int sw_buf_sizes[] = { /* Sorted by size */ MCLBYTES, +#if MJUMPAGESIZE != MCLBYTES MJUMPAGESIZE, +#endif MJUM9BYTES, MJUM16BYTES }; diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index a740c31789a1..69d82086c7a5 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -61,8 +61,8 @@ #include #include -_Static_assert(MJUMPAGESIZE > MCLBYTES, - "Cluster must be smaller than a jumbo page"); +_Static_assert(MCLBYTES <= MJUMPAGESIZE, + "Cluster must not be larger than a jumbo page"); /* * In FreeBSD, Mbufs and Mbuf Clusters are allocated from UMA diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index c17fc9dec9a4..65a328cb52a1 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -886,9 +886,11 @@ m_gettype(int size) case MCLBYTES: type = EXT_CLUSTER; break; +#if MJUMPAGESIZE != MCLBYTES case MJUMPAGESIZE: type = EXT_JUMBOP; break; +#endif case MJUM9BYTES: type = EXT_JUMBO9; break; @@ -934,9 +936,11 @@ m_getzone(int size) case MCLBYTES: zone = zone_clust; break; +#if MJUMPAGESIZE != MCLBYTES case MJUMPAGESIZE: zone = zone_jumbop; break; +#endif case MJUM9BYTES: zone = zone_jumbo9; break; @@ -1056,9 +1060,11 @@ m_cljset(struct mbuf *m, void *cl, int type) case EXT_CLUSTER: size = MCLBYTES; break; +#if MJUMPAGESIZE != MCLBYTES case EXT_JUMBOP: size = MJUMPAGESIZE; break; +#endif case EXT_JUMBO9: size = MJUM9BYTES; break; From nobody Wed May 14 09:09:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zy6wb2MgJz5wPCr; Wed, 14 May 2025 09:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zy6wb16LDz3S4l; Wed, 14 May 2025 09:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747213759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qxUX1OyufeH1v/eBjawoFGLwfGJMArmzv2m5SBM7dLc=; b=pnVu8a39KGtF3IZh644uRjjZSlUbm/4W1XJ7TDn7PrbIEmLN76gn547qDHUrf2mumKSWfR 9aiAM6ZYcRu2zQ4CsNbudo/lKP02myJu5q5qAufsW2Kaiev31YowELiuk032qCKALKvMtP PcDCksX+pw/QrAFE06sXKJ9Z2QpB9y1XHllXtmo5SKtlzGwHwrLflwP1KIP+K2EXJfsaQy RNSxwCD/isldDzAF+vN76Jq8272ukZtja57VgvZo0Ewvj9B2xpCwE+rqgwWML5X3om0mOZ fPqzUHG2Zn71FXiBpk8cCs4MyUlwAb+QQQ/ngGv2oSZA/3dvxPsC1AGiTesDGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747213759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qxUX1OyufeH1v/eBjawoFGLwfGJMArmzv2m5SBM7dLc=; b=TuDQCwpgjGkOukJBPq3TTttjSlDVyQrSyyNXncrSalZBWyvnsyCan7c1XMl5xbsQBkx8pn 4aXhmA2Li6H33av8qBRWK9z6NT0OjHfX7Y+vGEdHoB99WUcoTb4EKaP/TCIzeAhET7lVs5 vDl5b/3eYlSg54anX/LxmdJG736vQXZ/e37B/aQtuUl5TSCk5lhsl1bM21LuvP5ju3Aj2M 46cpHo1LBUFMH5nWutZhIaZ21qd4t4IPtI1d6ho3YJDen/ZD7T7vim3yE+hO/ZCZBmHn2i emgXJ/MaoGh18kV5H6C2PfXeyj+HxBDgxDUNKPsTQpJaPVoCmr4ecnW/jqIJew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747213759; a=rsa-sha256; cv=none; b=dcdGgB+6m+k+4PSNanTc+vkqOt8vBcWWxHYlzrCQgB0q0NUMVbvH9li9OI9HczSzSuBPeG Pq4YpjsUffZ8FeovxLa+pZiwNgH8m+T+xiQsBuE02pA1M0uMGwq3Lnf9VArPKMkNdquVqd 3udZZMMf2Ke5cU45UFgH5vR+oZXW/+uP6jHLkONAaQkALavzBYfez64B1ds8l72CZvxcoF mJq+2Zkeze8ldQLecShmXZYyr6YJMnBQ6U5AIz+HceuPRcsn2RTxosJfaR3PnbmvXWj6YF iXT+KHrdYWz0PlcEBP7JSbNKShcIExKpgd1zKmf2Xg8lac+hZ+QgxwuWxj3hMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zy6wb0jv4z9rg; Wed, 14 May 2025 09:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54E99JOk062879; Wed, 14 May 2025 09:09:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54E99Idu062876; Wed, 14 May 2025 09:09:18 GMT (envelope-from git) Date: Wed, 14 May 2025 09:09:18 GMT Message-Id: <202505140909.54E99Idu062876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 242b52ba3c38 - stable/14 - bsdinstall: Use a login shell for final configuration. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 242b52ba3c38108f2c2af4194a031ed495b95dbc Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=242b52ba3c38108f2c2af4194a031ed495b95dbc commit 242b52ba3c38108f2c2af4194a031ed495b95dbc Author: Dag-Erling Smørgrav AuthorDate: 2025-05-11 21:00:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-14 09:08:42 +0000 bsdinstall: Use a login shell for final configuration. If the user accepts our offer of a shell to perform final configuration tasks before rebooting, start a login shell. This ensures it will have the correct PATH and be able to install packages without issues. PR: 286722 MFC after: 3 days Reviewed by: jrtc27, allanjude, emaste Differential Revision: https://reviews.freebsd.org/D50297 (cherry picked from commit 5870d6a1ef4ec5d6fc91d0f1635bca59e09a040d) --- usr.sbin/bsdinstall/scripts/auto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 6a89b3dfdd81..abd445282316 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -443,7 +443,7 @@ if [ -z "$BSDINSTALL_SKIP_MANUAL" ]; then clear echo This shell is operating in a chroot in the new system. \ When finished making configuration changes, type \"exit\". - chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1 + chroot "$BSDINSTALL_CHROOT" /bin/sh -l 2>&1 fi fi From nobody Wed May 14 11:44:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyBMM2dMqz5wZVr; Wed, 14 May 2025 11:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyBMM25XMz3h9C; Wed, 14 May 2025 11:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747223055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDqYDcRteLJL3Ny5YvJyAJmbd+2//3LyfKi8XNOpLwg=; b=Z1ULtRj6++JVw/oFngyydw4JNM1mAMHsUjYfEFlphbA6ivuqCDc76BOZaD+NyFKmloSc08 ivCYU+y4Lkd+VTPhCKyGhc0PWhjFcC7WRDeAhBmDOPob2fztOJS0zOuc5XVv76E5Hx9Vgq L8QtjxbsT8qQY6OtWKk8r9NdZ6A66EMnWblTXTYZF9pClDjhedoEPokHH8YHDX+eBziJyA UQosHht/EmgthDm5A5pvsuu4RteUHh4sma99tIYX75k2sBGDqLbrn6CfsFtZrtTVdWTV0Z nOlo+yc0OZrxFhL1MzQlwmSCGREX+hFnYkvbtM5ZmADw6miIh69jTt2AF6sXOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747223055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDqYDcRteLJL3Ny5YvJyAJmbd+2//3LyfKi8XNOpLwg=; b=usZVR+weg3nAezV94BBMwE1i7oRt/x2XwHVBKKlQZe1YUdUmSr1PNMfUWd0FtIN1WrPp12 2IQGgmsbRPUph+mFg0uN+NSW4C9D0yifdIe8s6qbLQXqvEkZXqAYpNVJSnfmG6G48/08TO AMqwrEhPWv1+7PB0hAgGxZz7j2whHV6J46dGtCdP5AHrkpvXZc5G4+2m7QWhTJhUIq5tra eYt3wZPyfemaLlG9g+yeMgzVyrTe9A8fChnE0Gp+qI1db54O33Rd/2ECatavKBhu1+q243 jTeHlPHvytCgUSFTgtfF9gWtzNCbrcmj3HQwyEOalCnS3YRCGoo+Av3lvhzZhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747223055; a=rsa-sha256; cv=none; b=vi+rYJ3eXY9Uy2O9EJOKj5Zk5byelmkixCAQ0pbU3y9AXXY708T+U0FBpouKLQbGsTTfTn bzRuZH+voyDDQK5B1LoclKvD0u79YuMaS459pa2kMGtxViP1Ss3J+dGp3q12gxQdIfJ6T/ 25wrBMCZM0rzXTsrQKIuWzgRX8vIXTqdcwnRXBagiAv3NxEomWFAuyZlEkP0Csp6Htl2xo cErU0ZT0MeVahgQtEpdV0NfaoqQ7qK6F64M6S8XAx+OxdG99Bb13kdq8nEToSbJiEUaiUW yWrCA4GPsQDh3S5Kvv+yRUUl+vn+X9d5MS6Zz+u0JBIS+x4F6MABZckc1U8BIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyBMM1ZH1zWwm; Wed, 14 May 2025 11:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54EBiFVq060208; Wed, 14 May 2025 11:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EBiFKI060205; Wed, 14 May 2025 11:44:15 GMT (envelope-from git) Date: Wed, 14 May 2025 11:44:15 GMT Message-Id: <202505141144.54EBiFKI060205@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3de66f369c1e - stable/14 - sound: Call PCM_RELEASE() if pcm_addchan() fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3de66f369c1e8db46ae938d446a72f6ff3493356 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3de66f369c1e8db46ae938d446a72f6ff3493356 commit 3de66f369c1e8db46ae938d446a72f6ff3493356 Author: Christos Margiolis AuthorDate: 2025-05-13 22:02:41 +0000 Commit: Christos Margiolis CommitDate: 2025-05-14 11:42:05 +0000 sound: Call PCM_RELEASE() if pcm_addchan() fails Fixes: fd906e47b18f ("sound: Simplify locking during device creation") Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50337 (cherry picked from commit dbfe79bbe5d5ebe296fbff2d101e0994d7881d0d) --- sys/dev/sound/pcm/sound.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 794e1586b511..cfac8f73990d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -139,6 +139,7 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) { struct snddev_info *d = device_get_softc(dev); struct pcm_channel *ch; + int err = 0; PCM_LOCK(d); PCM_WAIT(d); @@ -147,13 +148,12 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) if (!ch) { device_printf(d->dev, "chn_init(%s, %d, %p) failed\n", cls->name, dir, devinfo); - PCM_UNLOCK(d); - return (ENODEV); + err = ENODEV; } PCM_RELEASE(d); PCM_UNLOCK(d); - return (0); + return (err); } static void From nobody Wed May 14 14:24:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyFvr01D5z5wmGK; Wed, 14 May 2025 14:24: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyFvq6bnJz3vhS; Wed, 14 May 2025 14:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747232647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=86u0D1xHQXA4xBrYVO29gxrJ6AYXOWy31731Ajo9Qp8=; b=nxs3MXKdSYu0QNN+xAUDLkFXnTgItbkb/VqRq2FTke1j30tRVUz9EhemKhDvdcDUYSjMHR F6GbRE5uXZrk1y+hXf49pudvI0WuzArLIISVmBKy/rgHsJsJfjHd8/1O/feGorA9glPULx JkWtJu2mvUEdDg0e/us8yYMSbDf8ecNc13346lil7enAZYHx/PU5jn80cng5nAoiWc+x4m YSDC2T4eU7//YB+PKZgQ+azulQZxaeTtT6Zvr1tflIlZ3A7aD3DAZmRRg9v3cPVoRr1qnH CUajXh49sKVdECoZ+WxxTG0Uo2trPqflAnsbFs0+lGyKu5rh5wll6bSJ29E1kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747232647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=86u0D1xHQXA4xBrYVO29gxrJ6AYXOWy31731Ajo9Qp8=; b=wJglFSyu1ctF3zPK6A7MSZe7bSMna/8yqaoktUTXmWdJ1foiWXY2wpFu8mj45LJwZSKq1z 0tfOTru/Sxpqe1ZnNgs9+ace7ax+z6TWjUDzNuxn2AXR/ewJSc87KSFmRNRdqtKGiIqlTg 2PpSu37wu8EN1u8oBrvMk+Gnqo8jcOf8LDiCOM8kUPflcX+5blkgDpdx320nBEn9mRjfox kk/0MuFtDmgnvbV7m8pCIv7Rh6GBoa5O4ziQrzOndJSj0CRBmRlGfSBlsUXXwltxFFBOUy m9w5XcbguRcmrTnblYMV90w6S1C2G3ZBpKJTrWq/JHIndsyV6UUL+31RubGCyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747232647; a=rsa-sha256; cv=none; b=x4n9g2U2uVEouHUx49cM8fdBBPVriaqJPfWnBSHccnBt/AhJJExWjwdam6B4t3GkhmL9xW yBwhG4vVE/TGdl9ZdjRoreyolYjzvWmUMvE/ARxuiaJN99koAgmByYde4CSVHz5LoqyXUr RPIq8oXT0VkxkioTS3eG1Dn09dcGWfUtzZ4bRklp0B52i1X4TbPULcc+dvlsL0QVD1uFel 8zVnNhUKBpvwEu4SSHAMi3rLp/PrG1HXh6PlflbO6bKiZ8QkF0ewo5RoWZcW9Q4m7Wx6je uB3MuEpyKgxJwmrh5Unc+oCaTJi7yCwiU5hr6s11a2GKaGtbMbjrmGvT/11xUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyFvq686MzcFn; Wed, 14 May 2025 14:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54EEO7ad060376; Wed, 14 May 2025 14:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EEO7w7060372; Wed, 14 May 2025 14:24:07 GMT (envelope-from git) Date: Wed, 14 May 2025 14:24:07 GMT Message-Id: <202505141424.54EEO7w7060372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: aff92a9f3c6c - releng/14.3 - sound: Call PCM_RELEASE() if pcm_addchan() fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: aff92a9f3c6c4c363188b667ae046d4789a5a63b Auto-Submitted: auto-generated The branch releng/14.3 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=aff92a9f3c6c4c363188b667ae046d4789a5a63b commit aff92a9f3c6c4c363188b667ae046d4789a5a63b Author: Christos Margiolis AuthorDate: 2025-05-13 22:02:41 +0000 Commit: Christos Margiolis CommitDate: 2025-05-14 14:23:53 +0000 sound: Call PCM_RELEASE() if pcm_addchan() fails Fixes: fd906e47b18f ("sound: Simplify locking during device creation") Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50337 (cherry picked from commit dbfe79bbe5d5ebe296fbff2d101e0994d7881d0d) (cherry picked from commit 3de66f369c1e8db46ae938d446a72f6ff3493356) Approved by: re (cperciva) --- sys/dev/sound/pcm/sound.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 794e1586b511..cfac8f73990d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -139,6 +139,7 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) { struct snddev_info *d = device_get_softc(dev); struct pcm_channel *ch; + int err = 0; PCM_LOCK(d); PCM_WAIT(d); @@ -147,13 +148,12 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) if (!ch) { device_printf(d->dev, "chn_init(%s, %d, %p) failed\n", cls->name, dir, devinfo); - PCM_UNLOCK(d); - return (ENODEV); + err = ENODEV; } PCM_RELEASE(d); PCM_UNLOCK(d); - return (0); + return (err); } static void From nobody Wed May 14 14:24:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyFvw2lZCz5wmCP; Wed, 14 May 2025 14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyFvw27qxz3w11; Wed, 14 May 2025 14: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=1747232652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lwhk2L2AGWvtRBZNWDGGsc2o64zjrdKbojm5QAtiC3A=; b=rF6kPLqUnlIZj8nh6T9tmWilLGbwPIjyvCPJp5uyzW+g7nV2Ga5DH47BMga07rlYtDg+/q TTGGuab/T0lOYRlBXVfTYHSaaE4tCLYyht8V0xbXPlkiq4NV+UsMWEXJgmdNxRTfHF3QOP mZyb0bLpM3wTTkvrW7X0Tvk/lGx5c+bat9EYc1f10OKef/6prJiqJ/+zknLj8nLdan9unC qUmeth3SP1Eo5QMhU2LqEDd+g5AC0nIOQ1pmLZAs7+uUByUPOeJF0n2WF7YXi0MgRLE03L Ga9nXVoISU8P6BhdQplUkhFnkJgdd0bMzE9zeGezCXzwpj+o7TmgwhN0izFlVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747232652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lwhk2L2AGWvtRBZNWDGGsc2o64zjrdKbojm5QAtiC3A=; b=BsYqrjCV9GNnQqlPLmNEXWIUB6UTpGvv0kooX6ZqHAA5XbOee+2WEKbPmDFxuPPHFJnh9t 1NAhTEeZNR6vq1b7a4efRvwBo7RRU+4z7WbDV9bm7Z2svb0jfNv5E6nWhWy0jBs5PYENmn zKOaceVS7ijiGQ/KyJNIzHB3YtNFUIzs0x/dchvC9NAkhlJ0N0L84WIqMLF0u7O6mszx1X KMhnY/oDBIhrjEWXjT/HyGmoBy+jYHtlEh/ibxE9YPjsoA5uowHqKOMXZ2e0w78oTYpvIY xwUgUP2KHM/u/jrtbsXRlvebC/2tYXzn2ggI55ltwZnSb0IzID02vC2wFKfAFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747232652; a=rsa-sha256; cv=none; b=fG86X0Qk0i64qlyJuxyfU22OdARwYn1bzQ2RxWDnOk8m8NQpIFBdwKm6ospUtny2P89Cdb 2FkEfAuuSbP/9JPfn4Fmor4/n5Ea1Yrm5br+w7SrnwWdsD7L6vxJDZyjI4EHQ34dcl/I0z 3fT008XwnWwOLCHnO0ua6mR7tA++Bt1u92doTjhSyQXn0JzbUB5Vp6z0MGInoO7/NaphKN s8zaqSjz+fG9hlkDLHIqx5s23S8HQ17+yd8oKbHHVpr4TG7vudpgJSVyufans8ieJU3Hjb 0XmeTRQHjG6HgL1xf8me/zDdMYQLsOJhcP2yBiUm2E2zNUSmLR/B27qgEJ+NuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyFvw1LvZzc8s; Wed, 14 May 2025 14:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54EEOCRo060509; Wed, 14 May 2025 14:24:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EEOCau060506; Wed, 14 May 2025 14:24:12 GMT (envelope-from git) Date: Wed, 14 May 2025 14:24:12 GMT Message-Id: <202505141424.54EEOCau060506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 641bb44d8538 - stable/14 - libusb: Emit event after deregistering hotplug handler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 641bb44d8538c66446aea556baa22bbf5bd14255 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=641bb44d8538c66446aea556baa22bbf5bd14255 commit 641bb44d8538c66446aea556baa22bbf5bd14255 Author: SHENGYI HUNG AuthorDate: 2025-05-05 17:52:45 +0000 Commit: Ed Maste CommitDate: 2025-05-14 14:23:38 +0000 libusb: Emit event after deregistering hotplug handler The original implementation did not emit an event when a hotplug handler was deregistered. This omission causes issues for programs that follow the best practices recommended by libusb—particularly those that use `libusb_hotplug_register_callback()` or similar functions in a loop while managing hotplug handlers dynamically. Without emitting an event after deregistration, these programs can become stuck waiting indefinitely for an event that will never come, as the condition to break out of the wait loop is never satisfied. See: https://github.com/libusb/libusb/blob/6c0ae1ab456da49e7805115e77ce0428ace4ea41/libusb/hotplug.c#L459 Reviewed by: bapt Sponsored By: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50170 (cherry picked from commit d2852659180307475a8376ce86aa587cccbb10bf) --- lib/libusb/libusb10_hotplug.c | 1 + lib/libusb/libusb10_io.c | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index 98903686f76b..87490d3a76c7 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -246,6 +246,7 @@ void libusb_hotplug_deregister_callback(libusb_context *ctx, HOTPLUG_LOCK(ctx); TAILQ_REMOVE(&ctx->hotplug_cbh, handle, entry); + libusb_interrupt_event_handler(ctx); HOTPLUG_UNLOCK(ctx); free(handle); diff --git a/lib/libusb/libusb10_io.c b/lib/libusb/libusb10_io.c index 59bac60c4672..2790142486ba 100644 --- a/lib/libusb/libusb10_io.c +++ b/lib/libusb/libusb10_io.c @@ -231,6 +231,7 @@ do_done: /* Wakeup other waiters */ pthread_cond_broadcast(&ctx->ctx_cond); + DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb10_handle_events_sub complete"); return (err); } From nobody Wed May 14 14:26:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyFym5vP9z5wm09; Wed, 14 May 2025 14:26: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyFym5N9rz3wSr; Wed, 14 May 2025 14:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747232800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q7ITo0vXwUulEEln4U4fq96+Xh3heTKv4s1IDnWfHPM=; b=sG6JD3WJ6OWiXiJjZcqmV8cRyKr7p2TuIjzMeL5TZrtm2Kme3GkCXRAhw8goByJDAXD5pc fV6f96f70UQUp5Dwl3R17STMulNMi8cq47wOq/jG7HxIzzm9UmN/87HhST+WfmGBUvkLJv Gw6uysXgC7LfvEKoMcsuw1GzNjiBwOF0EdHkfgdianXpUWLUoy/rc8qvoBhdB1jnr2XIYg UvF2vUPzsuCFayxaveXdD09WbawwV/eQ1dc9eaO7Y1zfzKnnjL4gS4s9oJY5EeqdUT6v2R DhyrYGpX/9dQb3MCYXpdkLgsExiq1iarShOGsIqPCNhjvocQ86qcyu319uKVGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747232800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q7ITo0vXwUulEEln4U4fq96+Xh3heTKv4s1IDnWfHPM=; b=CyDuF5kNBpTE6I+78BU4WjncEpEmE42boIpDu53gAJvsve3RViQv/N75JeRzF7q50i3xkB 2uvk9sq4BQ/7BgOr/PDKjSTiBlwVlecDHOqR4HsKLHiZ2+MBfqRZOuLLSlzfBqBz/N+Sdn 8106Uxi/BnkE05VyGbPxHZ2pRcIqiWBIGzjORxdJcwvLwUqX3PcVVkWR72udDoMbTX/R4l lGvlv7rXPZdN12ISFYD9T+f+PZBpf56A42bGr9qABeKd1ZXQbAMxr9XtvgfCaqXKUBb2Oa 3N8OGAfYlSsMjsoS7agTZ0iXhqHdU3Ot8cPnPkGQ4+bhWoG8Gs6JtvJlwfzsNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747232800; a=rsa-sha256; cv=none; b=rQIcGbw26ffjh3tIbDyQ8Ay+ocQt/bjgJfpdrInzXf1FVBkdmaEiqRL7C/hFCEOlMg2v1K 5/HoZiaMBIspLkxkLMBeiNOxSYc5rUg3vaHxh+W99luRIBLMNiVPw6YeILqsBR4104SeUo nT02Rhkn9BV12kRXnq0lh5tTVgfcYkPrjhCc2tWyXEWwcpp3cYLE9M3ZtnmRM/cPqhXxLk /natsSB9HxW0ldHL23HWHuf8uR4Q6l2uYJKANYyswviO1Aj4F4Gx8hSEeldcavZE7N/P8S VAAL3cWtreEOEe+0MvmZj8/VG/ChXjX38siP4fRkel7REv7zI5eo7xmBS4Hy5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyFym4rWszcFp; Wed, 14 May 2025 14:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54EEQeY9061369; Wed, 14 May 2025 14:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EEQeTu061366; Wed, 14 May 2025 14:26:40 GMT (envelope-from git) Date: Wed, 14 May 2025 14:26:40 GMT Message-Id: <202505141426.54EEQeTu061366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 09dcc8a75697 - stable/14 - random(9): bump removal to FreeBSD 16.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09dcc8a75697233a683f1d8c105a4caa2b74e59c Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=09dcc8a75697233a683f1d8c105a4caa2b74e59c commit 09dcc8a75697233a683f1d8c105a4caa2b74e59c Author: Ed Maste AuthorDate: 2025-05-11 13:08:16 +0000 Commit: Ed Maste CommitDate: 2025-05-14 14:26:22 +0000 random(9): bump removal to FreeBSD 16.0 It has not yet been removed, and still has some in-tree consumers. PR: 277655 Sponsored by: The FreeBSD Foundation (cherry picked from commit 3a58c266e2e6201a3aebbb52311f38ccf3323e3b) --- share/man/man9/random.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/random.9 b/share/man/man9/random.9 index 7fc721564897..f1833c63a2ff 100644 --- a/share/man/man9/random.9 +++ b/share/man/man9/random.9 @@ -24,7 +24,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 March 18, 2024 +.Dd May 11, 2025 .Dt RANDOM 9 .Os .Sh NAME @@ -133,7 +133,7 @@ The deprecated .Fn random function will return a 31-bit value. It is obsolete and scheduled to be removed in -.Fx 15.0 . +.Fx 16.0 . Consider .Xr prng 9 instead and see From nobody Wed May 14 14:42:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyGK05b5Bz5wnM7; Wed, 14 May 2025 14:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyGK053knz40nK; Wed, 14 May 2025 14:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747233748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRru5jj9PiqAaN9MsS3Zs0yi3+c6wh02JuLqb+5Ldz4=; b=a0KAdtjJcR2QatTLSqi6qQhQjY/6HHzKps0SvVCnaybVdMspbTUH4diuBkcb9CaFaoIJEs Z0RvtDUp7s6tG31xCx8xbJGpCT2dZUDjd2jDIiw/ug2R2JF3im1eEKxIAwL4WjpRLdY1Qs WJUsND8HjOgmjgQpiro1tjsx2TwsjbbcUrgxUKa/urqgnZw/Ij08KP71hb0eycnebjtGED DNV/2s8ipFz/AN1deB8q5FxGuXtqb8FvsFsU7M155rvNG/rGsVoHNKrzaFWuis5BA1p/0l rfSTMYy86pD9bV8VNqXzatNpFX/YFU/LrOPCQkAYWJP/zquTZ49TDbMoYYle8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747233748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRru5jj9PiqAaN9MsS3Zs0yi3+c6wh02JuLqb+5Ldz4=; b=bocvymVQ7Pjdy5nOTBbVt+lakEYqgMxwZgnwhmmTUCzKhRU3Q98mkE+bva6NfOn7+BXqp0 Bg+q6bPEmZCexEwyA1pIrErnr8b68gKUwdn29RXiHQvXU/BqFgivWNRC0gvOKfKOEmnJgm s6DIM80wMM5OECvc5JdbG00QLn9roSgXmpb1gbBm0Mw9QJVy38wlf2beAMX+HJfYq9SGud vqFZjrGqKcsO6wc8ib59C9FOwXmIEn31vyz7ABZrbuEuEAS4BMRSYBctz9uCSYkKg+/Mea +cPznxD7pdPWHFQx2IboUa4vLFy4fiHqMF3ymnwqvvu2w5fuuDAFkTmWx2lXFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747233748; a=rsa-sha256; cv=none; b=xh/VG+oP+u3d/EDymFhz7yqlbiuRxDHxaDVRFE2k3TAuc2B8T5cq7C8qQ+KjNgpjTR6QM8 o3D7X8ThZzloIya5JcmL33JIDTEaCRby+iy9CXmlWXcgS96I2WypQF4uqJQ5O8bch+2M3J fojXS8QD0ICtC+nf16vYIZHG+Eek/kspb+g7C8msOuaIDA4cWmFgtHfAjwO6gcoNinO8sL 9RsOD3/V3YGPTOhpWjiqru/DhMTzj7w9wA0z3Uz+u77yBJeyhTgBTzOxUnLJSbnIV2Gz/e DR7nCKxXcb3GnM0EKrshPabhdZ0cTNAQ4yHdbaC9LkgcFuCE52ZptF8E3SakYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyGK04ZsPzd7F; Wed, 14 May 2025 14:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54EEgS66097842; Wed, 14 May 2025 14:42:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EEgSrl097839; Wed, 14 May 2025 14:42:28 GMT (envelope-from git) Date: Wed, 14 May 2025 14:42:28 GMT Message-Id: <202505141442.54EEgSrl097839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f7cd5c230849 - stable/14 - libusb(3): Fix link in comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f7cd5c230849730dd03f942d7bf8f2e770643e7a Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f7cd5c230849730dd03f942d7bf8f2e770643e7a commit f7cd5c230849730dd03f942d7bf8f2e770643e7a Author: Ting-Hsuan Huang AuthorDate: 2024-01-12 11:55:00 +0000 Commit: Ed Maste CommitDate: 2025-05-14 14:42:13 +0000 libusb(3): Fix link in comment Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1042 (cherry picked from commit 2a3a8eb9fac66183e5af4852bbcb40824629f182) --- lib/libusb/libusb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 022b5562a819..732fc9dca1e0 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -245,7 +245,7 @@ enum libusb_log_level { /* XXX */ /* libusb_set_debug should take parameters from libusb_log_level * above according to - * http://libusb.sourceforge.net/api-1.0/group__lib.html + * https://libusb.sourceforge.io/api-1.0/group__libusb__lib.html */ enum libusb_debug_level { LIBUSB_DEBUG_NO=0, From nobody Wed May 14 18:08:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyLtV13LZz5x1pd; Wed, 14 May 2025 18:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyLtV0JN2z3bT3; Wed, 14 May 2025 18:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747246098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2cX7smlxZY3Z8S5lI/1/iqtL0geZcFKxdxLC+jYSlrE=; b=KATaHEmZ00cPQVAw7Ph8OCnH8jYe4NH0s4RaQD2Q82GJNnd4K4TiwQJk0NoIpsNbblKetU QHQ3pEzd5LcscqP1P1CqjlF0mxQU8c3O0HmxawXWtSUSjYFIDO/XsEsLXs0jMxX9+4lhVO sZGuzS+8GQFYx+Kz7Gty40gQqlh/32nzkKp0IoAV8bhDx8g+gmgoMSO8ERxw8jwXAo7u1v RS9K4SDR+jU/yIEy5J1/UyE+jt/nERhRp88kRJ+XmuTDOZ9KykCUp9fmfZhTgIcVL2C0cF M+kaWgegQGLfEx3S35814tkC4pACahKxo/RYGByGS1GzJ66HyYMmCluznVXNuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747246098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2cX7smlxZY3Z8S5lI/1/iqtL0geZcFKxdxLC+jYSlrE=; b=VcCsFQWBrC3XtTXtIiTH87UKAhkCYrvliS8ilEvgLmpJ/8TuGa6U2qnCQkAcLsRTsrFsG4 aedjaI8r3T1sWUCyAi7OiwbrD4yzWsTWlAslghJoASJZMtF1CgDUELOZ+/wwQl8rNSuoh/ /82A+Y/R/0sl7XTXnu92EX4ScDleXa1sYKDEphkAPfxqlr1G/6Xq2YhVUdwLEulr5C3HVY tTjBg+E0QBxcTZBiLxAeteY/KksX7mPClnvsUfIz56uhATvudX0gKt1yHpiIhawTN1wFjS uE+lvXXnHDglTR/J4mGuGCdKbSN6QKbk6v2xeGaBpIRPBquCuPfW0pq3M3DvJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747246098; a=rsa-sha256; cv=none; b=ay5yBySsHI+xNSvm4c1rvU2pw3znBduC2MgyJa/pIm+4zNHLp4YOg2HkABKrX81JXsYM6I 4RtPQ88NbK4IST8ak78vssrr4yT+SZvCNVGI9vO/h1GOASvIfZs419T44PikVlwM0mb/7+ wB/K1+KHJSTi7LhvjqAt0iWIFNSw/L6D0tl1ByIkHWinQ2/XxngM0a5oYMoFyKt9xPEiIu SFuQywUFLoKsi07/vj65LUUU3FA/JITRwF0qGMvqTt2+7EoBJIlrmazTxGz2NjUNSUxkYj 84jcdUcI/0KMKotZb5fDsDgYOWcTM4Rj9G2rYKudSFHMUQr9N/c+vQ5gSy4GbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyLtT716Wzjtx; Wed, 14 May 2025 18:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54EI8H9p073983; Wed, 14 May 2025 18:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54EI8HHB073980; Wed, 14 May 2025 18:08:17 GMT (envelope-from git) Date: Wed, 14 May 2025 18:08:17 GMT Message-Id: <202505141808.54EI8HHB073980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 95223d920aea - releng/14.3 - bsdinstall: Use a login shell for final configuration. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 95223d920aea7dd3711040304b013f96b568cdb3 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=95223d920aea7dd3711040304b013f96b568cdb3 commit 95223d920aea7dd3711040304b013f96b568cdb3 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-11 21:00:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-14 18:08:15 +0000 bsdinstall: Use a login shell for final configuration. If the user accepts our offer of a shell to perform final configuration tasks before rebooting, start a login shell. This ensures it will have the correct PATH and be able to install packages without issues. Approved by: re (cperciva) PR: 286722 MFC after: 3 days Reviewed by: jrtc27, allanjude, emaste Differential Revision: https://reviews.freebsd.org/D50297 (cherry picked from commit 5870d6a1ef4ec5d6fc91d0f1635bca59e09a040d) (cherry picked from commit 242b52ba3c38108f2c2af4194a031ed495b95dbc) --- usr.sbin/bsdinstall/scripts/auto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 6a89b3dfdd81..abd445282316 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -443,7 +443,7 @@ if [ -z "$BSDINSTALL_SKIP_MANUAL" ]; then clear echo This shell is operating in a chroot in the new system. \ When finished making configuration changes, type \"exit\". - chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1 + chroot "$BSDINSTALL_CHROOT" /bin/sh -l 2>&1 fi fi From nobody Wed May 14 23:54:41 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyVZ94Zv3z5w14R; Wed, 14 May 2025 23:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyVZ91jXvz3ky2; Wed, 14 May 2025 23:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747266881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=orTDashH0xb6akdtvYacY28Tpu8okJCldCQ0qkkx/OY=; b=vtLKZ9DbvzN+3FajZbjASxdhO7N9ADzVO1toznrlWAoWLcu+ju9/ankKvhBSY+F+DumxR4 IGhKWeaB2ugbN/3E4l+2nSob6SobUp2rV0Qi89kQ71ZRwoeJqJTXEp2/YPsjO3VnfRQG6b 5UyRctakZ/ASbfBJlzid6AVZRIdwR1tIaevPDqy+9qYhFy0Oe6ZrWIJ2MI7SDVbO/SGcF7 oN8FNjcbnylsEucvTJoOZ+QQnyCPe/uDNo7hWyg+myX27MybPrNwNp9u2GlWE9RjA5o49R KR0ZMKLyo+5OiGcfSDOdq3JLREsV31nN8c3fHna1hvB/j4BINFwMjumGZ0pnrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747266881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=orTDashH0xb6akdtvYacY28Tpu8okJCldCQ0qkkx/OY=; b=UvYRIiDf0iZoh58ZyRLkvsm1CMqGjiIT+6MsSMfJiU7DGv35d7tkwTLPFZWd8bIpYWPshd Nae3bpQSJPbijePFEaEliR0hzPhQnkJIHTDYKdTQkah473pXSxqVS12LsfFF4GGxHxZRz9 SGYRzNByXUagKMGXwE3TkWtAVzOT1P5t5UCRZH4vMkfZJ0CshdQXkk8LYi48vbtvGKRc6e mHYTCcrxMp3iO4OuVjGRxlqSj32A9Q5X1/62jeHXnohYCJLmYhDPBRs3s4S4pBiAE3mkm+ vHrN2iDgEtbIAIHEzhPF2ILwfhUa4M8eibRI2D6oxxqzDyznH6IeqJTPkEAZAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747266881; a=rsa-sha256; cv=none; b=ef+TD4kAnExiDlp/ZgXIll/MmwYxgIGD3Y6J/0lOxFmdD+c41mpvkDErJreqKmU1Hjzl7Y zx0uY+s5sfVJ6D/KAtdZpnF/C0M3lVQGCUrOggYGmTyVasWsOF7md0eYLdz8wsK6PJqZSr G5p6NvqF+3nyOEJSO4PSsvaBM5fCE0zd729tSZnnpvQ6HiiPGUF3eg7lGeiGxtsTVjp3WI qieRGH2AgBSTHxfthCnCAFUPNuIGlAnirttkhZ3vMwysjz1MiIlRYLGj7PJbKE+CGmM1mh hgDhfxxQoFZe5mLORiZ38cqoUvC8Vx50wonkmbDHFrk0oDe8K0XGmrLk4oW86w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyVZ91FLLztr4; Wed, 14 May 2025 23:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54ENsf3r026809; Wed, 14 May 2025 23:54:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54ENsfQ9026806; Wed, 14 May 2025 23:54:41 GMT (envelope-from git) Date: Wed, 14 May 2025 23:54:41 GMT Message-Id: <202505142354.54ENsfQ9026806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: eadda156a50d - stable/14 - EC2: Remove old broken_txfifo workaround List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eadda156a50d3487ec1e6fc78f6cfe2df42448fa Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eadda156a50d3487ec1e6fc78f6cfe2df42448fa commit eadda156a50d3487ec1e6fc78f6cfe2df42448fa Author: Colin Percival AuthorDate: 2025-05-14 23:36:26 +0000 Commit: Colin Percival CommitDate: 2025-05-14 23:54:28 +0000 EC2: Remove old broken_txfifo workaround Early versions of Xen, including those used in the early days of EC2, had a bug in their UART emulation whereby the TX FIFO wouldn't send the expected interrupt when emptying; as a result, FreeBSD would write 16 characters to the serial console and then stop because we thought the FIFO was forever full. In 2013 (1c60b24baa50) I added a loader tunable "hw.broken_txfifo" which spinwaits for the FIFO TX rather than relying on the interrupt, and enabled this in loader.conf in EC2 images. A decade later, this workaround is almost certainly no longer needed in EC2 -- most instances don't run Xen, and the bug was long since fixed in Xen anyway -- but we've been holding on to the workaround "just in case". Unfortunately, the spinwait behaviour is causing latency spikes and triggering warnings from the ena(4) driver. This commit removes the hw.broken_txfifo setting from loader.conf in EC2 images, but leaves the loader tunable and associated code, since it has been necessary in some other environments. (It seems that the TX FIFO missing-interrupts bug has been independently written at least three times!) MFC after: 1 minute Sponsored by: Amazon (cherry picked from commit 9a685c09f06a55b18589d75f9307563d84a17fa9) --- release/tools/ec2.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 1116faed4e9c..bac8bb0d0e67 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -58,11 +58,6 @@ ec2_common() { # screenshot") which was introduced in 2016. echo 'boot_multicons="YES"' >> ${DESTDIR}/boot/loader.conf - # Some older EC2 hardware used a version of Xen with a bug in its - # emulated serial port. It is not clear if EC2 still has any such - # nodes, but apply the workaround just in case. - echo 'hw.broken_txfifo="1"' >> ${DESTDIR}/boot/loader.conf - # Graviton 1 through Graviton 4 have a bug in their ACPI where they # mark the PL061's pins as needing to be configured in PullUp mode # (in fact the PL061 has no pullup/pulldown resistors). Graviton 1 From nobody Thu May 15 00:49:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyWnT456kz5w4t7; Thu, 15 May 2025 00:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyWnT0gQCz3FrT; Thu, 15 May 2025 00:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747270173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U47D7QWR3F1MxHdACU1B9SNZ9UKHdOdH580N8y1OHAw=; b=dE+0NjooIOl1q+/pBRRTPO+McEk/ng64HbY44xnxSvUOONH+XXlR7JSnOM2Xz0ikqYBUH3 8Ar9k186Bp6ubWiCAoNOEnOlhJnq8lxCS/J98QFWq0qBSP53QvvUlJ8vO5XL89RL6sKmiP LKpgo6obR3c43oHnnwi+ifeK/gyIHJdKkAvOIReG6scEBOvmJdq1Nfp+QRK+SgVNuWPAyD rcsQg0DdkPjRY1NSvjCmQjq0BcnfLsnejWodL84nNFOucinbXuO05t4tVmb3T9wJ0YwMPV 9R4OCajMrdTok/VWeTRxjA3rU1q3rFfu/pVHF4DA1hKtS+o5BWOBxTvRzOFCMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747270173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U47D7QWR3F1MxHdACU1B9SNZ9UKHdOdH580N8y1OHAw=; b=fkIFO9OIamU2g/Ygs46MZXhTOq83FQnoLwZVB1BAFuSte7kmw64Jtqtnk7VYIG9BiU3R45 Md/kLN8Ro/vxcJmeEcEXOIxCQVBqSZvbY4iGzbGHehFrLJ0gX4x7p+jS68QBKILkil8x4O Gcols0wvXxeqMp4gzeVjovovA/YzApnhnCTOXcspR+FIBJ5+l0Na0DqzjT9m3okEPF1kez CbkQaixj1QmqCKgZYRNzxfuY5u2kHauT4V1RABkFsUHnB5T6ZW3e51sIOmyDTDHbWRLcuq fY0E8OvSzhMgSYjO4h9/U1EDP1zitUcolIPyPvBu9SrxiwfX7NgsfrXERMU25g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747270173; a=rsa-sha256; cv=none; b=qLD/RluWVd2V9zE+7AiMZSUzE1n6LFrAIEhiWnJty5/VaYoqT/UK7wgKE8bFKKx0FI5mRq yFD18ZPf6YcwPe8v6SB+mk4ROpi9OJgrunCOmyDb50V4JeIQ3OLtBa+FlJtJHH36686VYG EmTqwRjCt4akIMFCX2i5ZxcAYwUEZfBOIL/o5vPyvI3/IWwwaVZGGDWUu71Jg/r+Nv9lv2 TR+uuVApCGx7TEMZCgtSZpa+F0gMfUIuj7TnpMGO/q+WSyiMyZFQ+T/hbCoFz06LPi6CIe dvBlV2szTRtbxOTjocb3QbUGjdC67VOiRlVp7P8QFatc47UbE8m5e9jAdxSD8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyWnS6yt8zw2L; Thu, 15 May 2025 00:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F0nW4e022922; Thu, 15 May 2025 00:49:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F0nWbD022919; Thu, 15 May 2025 00:49:32 GMT (envelope-from git) Date: Thu, 15 May 2025 00:49:32 GMT Message-Id: <202505150049.54F0nWbD022919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 651102873e96 - stable/14 - stand/lua manuals: Describe better List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 651102873e96174e4e799d4e06538e1d841e182a Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=651102873e96174e4e799d4e06538e1d841e182a commit 651102873e96174e4e799d4e06538e1d841e182a Author: Alexander Ziaee AuthorDate: 2025-03-29 05:14:19 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-15 00:33:21 +0000 stand/lua manuals: Describe better The lua boot loader module manuals were getting pulled into search results for FreeBSD, but not for "boot" or "loader". Reword them to increase clarity for boot or loader searches, as well as the FreeBSD search term which we've been scoping to system topic overview manuals. MFC after: 3 days Reviewed by: imp, mhorne Approved by: mhorne (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pulls/1628 (cherry picked from commit 5d59c1b4f14e2fa6388b1d75ee3243085f1c69f2) --- stand/lua/cli.lua.8 | 4 ++-- stand/lua/color.lua.8 | 4 ++-- stand/lua/config.lua.8 | 4 ++-- stand/lua/core.lua.8 | 4 ++-- stand/lua/drawer.lua.8 | 4 ++-- stand/lua/gfx.lua.8 | 4 ++-- stand/lua/hook.lua.8 | 4 ++-- stand/lua/loader.conf.lua.5 | 2 +- stand/lua/loader.lua.8 | 4 ++-- stand/lua/menu.lua.8 | 4 ++-- stand/lua/password.lua.8 | 4 ++-- stand/lua/screen.lua.8 | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/stand/lua/cli.lua.8 b/stand/lua/cli.lua.8 index 4077ca6b0b56..aee1d3d53579 100644 --- a/stand/lua/cli.lua.8 +++ b/stand/lua/cli.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 24, 2021 +.Dd March 29, 2025 .Dt CLI.LUA 8 .Os .Sh NAME .Nm cli.lua -.Nd FreeBSD Lua CLI module +.Nd bootloader command line interpreter module .Sh DESCRIPTION .Nm contains the main functionality required to add new CLI commands, which can be diff --git a/stand/lua/color.lua.8 b/stand/lua/color.lua.8 index 8a31d2034a48..9a3b9b1b9385 100644 --- a/stand/lua/color.lua.8 +++ b/stand/lua/color.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2018 +.Dd March 29, 2025 .Dt COLOR.LUA 8 .Os .Sh NAME .Nm color.lua -.Nd FreeBSD color module +.Nd bootloader color module .Sh DESCRIPTION .Nm contains functionality for working with colors. diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index b2b1122285eb..7e8863203446 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 17, 2020 +.Dd March 29, 2025 .Dt CONFIG.LUA 8 .Os .Sh NAME .Nm config.lua -.Nd FreeBSD config module +.Nd bootloader configuration module .Sh DESCRIPTION .Nm contains configuration and module loading functionality. diff --git a/stand/lua/core.lua.8 b/stand/lua/core.lua.8 index 208dbf5e12c9..de43d3e2b220 100644 --- a/stand/lua/core.lua.8 +++ b/stand/lua/core.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 28, 2023 +.Dd March 29, 2025 .Dt CORE.LUA 8 .Os .Sh NAME .Nm core.lua -.Nd FreeBSD core module +.Nd bootloader core module .Sh DESCRIPTION .Nm contains core functionality that does not have a more fitting module. diff --git a/stand/lua/drawer.lua.8 b/stand/lua/drawer.lua.8 index a3a4865d3efe..91738f4b2434 100644 --- a/stand/lua/drawer.lua.8 +++ b/stand/lua/drawer.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2018 +.Dd March 29, 2025 .Dt DRAWER.LUA 8 .Os .Sh NAME .Nm drawer.lua -.Nd FreeBSD menu/screen drawer module +.Nd bootloader menu/screen drawer module .Sh DESCRIPTION .Nm contains functionality for drawing and manipulating the menu, logo, and brand diff --git a/stand/lua/gfx.lua.8 b/stand/lua/gfx.lua.8 index 82d3f90f4af7..75f258026804 100644 --- a/stand/lua/gfx.lua.8 +++ b/stand/lua/gfx.lua.8 @@ -3,12 +3,12 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd February 6, 2024 +.Dd March 29, 2025 .Dt GFX.LUA 8 .Os .Sh NAME .Nm gfx.lua -.Nd Fx Lua gfx module +.Nd bootloader graphics module .Sh DESCRIPTION The built-in graphics related Lua bindings for the .Fx diff --git a/stand/lua/hook.lua.8 b/stand/lua/hook.lua.8 index f0e20153a924..91d5f76b6e1c 100644 --- a/stand/lua/hook.lua.8 +++ b/stand/lua/hook.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 28, 2020 +.Dd March 29, 2025 .Dt HOOK.LUA 8 .Os .Sh NAME .Nm hook.lua -.Nd FreeBSD hook module +.Nd bootloader hook module .Sh DESCRIPTION .Nm contains functionality for defining hook types and attaching hooks. diff --git a/stand/lua/loader.conf.lua.5 b/stand/lua/loader.conf.lua.5 index 7fad7d2f78dd..509944ab6598 100644 --- a/stand/lua/loader.conf.lua.5 +++ b/stand/lua/loader.conf.lua.5 @@ -29,7 +29,7 @@ .Os .Sh NAME .Nm loader.conf.lua -.Nd Lua-based system bootstrap configuration file +.Nd system bootstrap Lua configuration information .Sh DESCRIPTION When the lua-based .Xr loader 8 diff --git a/stand/lua/loader.lua.8 b/stand/lua/loader.lua.8 index e5aee7e8602d..ffee46526c9f 100644 --- a/stand/lua/loader.lua.8 +++ b/stand/lua/loader.lua.8 @@ -3,12 +3,12 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd February 6, 2024 +.Dd March 29, 2025 .Dt LOADER.LUA 8 .Os .Sh NAME .Nm loader.lua -.Nd Fx Lua loader module +.Nd bootloader Lua binding module .Sh DESCRIPTION The built-in Lua bindings for the .Fx diff --git a/stand/lua/menu.lua.8 b/stand/lua/menu.lua.8 index e2a0ff09ffd9..e2e32efdf3b4 100644 --- a/stand/lua/menu.lua.8 +++ b/stand/lua/menu.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 31, 2021 +.Dd March 29, 2025 .Dt MENU.LUA 8 .Os .Sh NAME .Nm menu.lua -.Nd FreeBSD dynamic menu boot module +.Nd bootloader dynamic menu module .Sh DESCRIPTION .Nm contains the main functionality required to build a dynamic menu system. diff --git a/stand/lua/password.lua.8 b/stand/lua/password.lua.8 index 1fbe395ab0db..34623c001206 100644 --- a/stand/lua/password.lua.8 +++ b/stand/lua/password.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2018 +.Dd March 29, 2025 .Dt PASSWORD.LUA 8 .Os .Sh NAME .Nm password.lua -.Nd FreeBSD password module +.Nd bootloader password module .Sh DESCRIPTION .Nm contains functionality for prompting for and checking passwords. diff --git a/stand/lua/screen.lua.8 b/stand/lua/screen.lua.8 index 691af5bf0758..a41ce6faf08b 100644 --- a/stand/lua/screen.lua.8 +++ b/stand/lua/screen.lua.8 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2018 +.Dd March 29, 2025 .Dt SCREEN.LUA 8 .Os .Sh NAME .Nm screen.lua -.Nd FreeBSD screen manipulation module +.Nd bootloader screen manipulation module .Sh DESCRIPTION .Nm contains functionality for manipulating the screen. From nobody Thu May 15 00:49:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyWnX1pWCz5w4tD; Thu, 15 May 2025 00:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyWnW4RvYz3G4c; Thu, 15 May 2025 00:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747270175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kUiLLqku9WBEthaIYZf4zsmmM9cPlQtvYA2+CrVV2z0=; b=RHSieeOzVoHbaskdV6FwYUZ3ozZQjdHceMgSmAGnbyozaI7yEgBat7PdZlbJ8gJ5PUhrIa 7TnxD/ZOIUQvYioWsDVGtNJWJAhZqoUfWqIaUO5VV3F4NyPdbwxmAQZQ3hEbbMJdlTq8HZ NpIR+INO0YQkcHM7UWFSG2WIUwLoT7amwx4C6PSnKOnADKpV1CZVdw4JcVkdKWnDmVu5dr DdWr/gI0I89aZNlBGVMsAzCkRx2tY7f/QPTHHCAJzC3NjURQt/DXx21ozNpb5BwhuCxovM DJNMWOYy79y9Y1CkD1aScBkXhjGjSzGW/DqK28lEfgF7Ct3neRNuEY6n2LXlsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747270175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kUiLLqku9WBEthaIYZf4zsmmM9cPlQtvYA2+CrVV2z0=; b=ktUuMOcBbCFmd0OylJQO0W9++JJKVZVANJL5G08u6Di+X5XcP/L4dcKHO3U2FeZ8oIc6FC QcdpQXN07a0cRcPdES+dujtNPyd0kwraWXZkMMa38ak4172o8te8Oz1eesRHEsuh3sa1lN HJBxS3r52xOygM7MOrP4DEcGLt1iFHzZsvnCwkFS2D4+RhVBrD6uJWgUoa9oCTjyzSyjSr 6xzhLvsWJuAUKJ+nkUgZpJqLXvr5/x/SoT/CnQYjArLOrLJY74Ar4ejADBkMdMs+4rmSb9 c3ljlhtQFB8FmibrCobfdt2urR7WNwp8/+5hO7ZkTZnUlyyoVvUja99YJhUtVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747270175; a=rsa-sha256; cv=none; b=L5d7yfOdRHJl1Y/LSiYY2R4t8EfjyOTb449UVRiTDL7vJquc7BHqRs/24gdPIgl3jVKUUv fFRp26iSE4ui9+frF5SUWzKRoKKec5eXIDH4OyYLPsGE2qZI0U/MiUR8sAC/jZPZY1MkWW siaH+UPjx1csjut6Lh2A7CBiTnvMhu4iuIMS+R/h4YdtPolLa5W/rT9aiU1t6hJ5MxQHQL QEP3NO+FyDW0YTqS5Y1MA4Z0OJ2jpl2B/5UfWpe0Vb12JtOsIiNPY2UwcUJJeaAvi2GxfG +GHzV9WZsR07/IHREF8esPJnE7KhG69KrlXUG1H/imz7oNaxTYdTmZVb/g/s+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyWnW26vszvw7; Thu, 15 May 2025 00:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F0nZsR022994; Thu, 15 May 2025 00:49:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F0nZ8h022991; Thu, 15 May 2025 00:49:35 GMT (envelope-from git) Date: Thu, 15 May 2025 00:49:35 GMT Message-Id: <202505150049.54F0nZ8h022991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: d0e29f92f7a2 - stable/14 - e6000sw.4: Initial manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0e29f92f7a252b382d76c1e6bac33d8424af5fa Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=d0e29f92f7a252b382d76c1e6bac33d8424af5fa commit d0e29f92f7a252b382d76c1e6bac33d8424af5fa Author: Alexander Ziaee AuthorDate: 2025-05-12 00:52:19 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-15 00:45:40 +0000 e6000sw.4: Initial manual page For inclusion in the HW relnotes. MFC after: 3 days, note removed entries which didn't mfc Reviewed by: adrian, ivy, mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50293 (cherry picked from commit 6da793a8caa15ee2cbb984ea39ac87c6cd2fdf63) --- share/man/man4/Makefile | 1 + share/man/man4/e6000sw.4 | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 41fd7d36a74d..980fde8d3868 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -148,6 +148,7 @@ MAN= aac.4 \ etherswitch.4 \ eventtimers.4 \ exca.4 \ + e6000sw.4 \ e6060sw.4 \ fd.4 \ fdc.4 \ diff --git a/share/man/man4/e6000sw.4 b/share/man/man4/e6000sw.4 new file mode 100644 index 000000000000..4c10a99b249a --- /dev/null +++ b/share/man/man4/e6000sw.4 @@ -0,0 +1,39 @@ +.\" +.\" Copyright (c) 2025 Alexander Ziaee +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 10, 2025 +.Dt E6000SW 4 +.Sh NAME +.Nm e6000sw +.Nd Marvell 88E6000 series Gigabit Ethernet switch driver +.Sh SYNOPSIS +.Cd device mdio +.Cd etherswitch +.Cd e6000sw +.Sh DESCRIPTION +The +.Nm +driver supports Marvell Gigabit Ethernet switch controllers. +.Sh HARDWARE +The +.Nm +driver supports the following Gigabit Ethernet switch controllers: +.Pp +.Bl -bullet -compact +.It +Marvell 88E6190 +.It +Marvell 88E6176 +.It +Marvell 88E6172 +.It +Marvell 88E6341 +.It +Marvell 88E6141 +.El +.Sh SEE ALSO +.Xr e6060sw 4 , +.Xr etherswitch 4 , +.Xr etherswitchcfg 8 From nobody Thu May 15 01:50:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZyY7P6Jj7z5w92W; Thu, 15 May 2025 01:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZyY7P5N0Zz3CSP; Thu, 15 May 2025 01:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747273809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0OJ+vdmncnIU9+SoAWycAcHEbkHW7CpsBElir+L/LAI=; b=KPPbYHvOqWNxt+9EMcUFcmjCDm9iXvufF3ThUM0XSHLYLkyts9ys4UK9RKY6xul6wL1VrV ysn7uO8q0uLJ98o+m0ISe9FZeFEVZmjj8nmsSPudAffYoh3ueyAeNpf38GyCmArDuCpWB+ G6+DqHUlrxs1HVTihOvc7ZIMMsVrF8TuD1H9BJjE4k25LX+VMWYOBdqfrINJE8TRAqh01m I47qnGYSqyO70DldK7froGk/lmjIZ8Pc48N4CbpS06F7nbLV0Ik/5PEnK8H7BNXU/q0BOX nWheL6fKXqD9kmwu8/qSd9fbvHo+9DOCn/Y5d95IWV8cQ5cTOJJsb7epg8EYvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747273809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0OJ+vdmncnIU9+SoAWycAcHEbkHW7CpsBElir+L/LAI=; b=oMLLCTPxGOGKQy2KO1KOnxlAWagBx8VBdwIvxx6MW8wV/ft5WbZz9ih4P81xw2bxcThrSL u8OnPFXCs6z9u6YA6lrw3gYXTiIG3q3Qiow85i9Lq/FIdGtVkv4pf8/XGhu3Mu/TPngnSa 8TZbMb7OyotOjgaEJofN92Rukuo5b+jvmBpZbxJxpwP11J4Mt+kGkhNoRYipjOjHKsi1uY 4CNpSIFoB+OTK8UWk6cusX3SyPrzNb1wbNupzuFwFTIxPEh/BDDNlSykgDT27+F+L5CklX +RlnmZ+UW6E2nlGZQNqXu3UUuJS2phhfqwwOcazUaT+yzsK5hvyQs1c6rAXRNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747273809; a=rsa-sha256; cv=none; b=sUCJy/bSxfTIXGo4feDhnyRv1Iv+nxUobhUwMw4WlL3FtGmXglELRjsV0avj6DNuP64CCU ifGWFdY3TIBVAjVIRfsLQmdrycCHBcCy/6z0Ac1+oH72vcgBOfbGwb+emH1Dgzhu5Bot3H GJcnE34NZ+0W8G2EPSP2YMsJvHhGFLlklypm0cW0OFL+dm62D61nh///Df9RAQSOIJ/LWv BVokHNESyrDQS2yfDsV4NAl/oG/T5bBjSGqTPieL4rztrQcpUoMjpNjVgD2qIgFrECNhPW rsqJHjxnbDqxB0Eskyu1FuNUve0LbpoBtAZCIWET447+7eKvlEhTV9XX3HZ4Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZyY7P4ngGzxkW; Thu, 15 May 2025 01:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F1o94q039346; Thu, 15 May 2025 01:50:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F1o93v039341; Thu, 15 May 2025 01:50:09 GMT (envelope-from git) Date: Thu, 15 May 2025 01:50:09 GMT Message-Id: <202505150150.54F1o93v039341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 45d585ab7f22 - stable/14 - powerpc: Always use BE tag in nexus_map_resource List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 45d585ab7f222ca36988c406df528128a17f9884 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=45d585ab7f222ca36988c406df528128a17f9884 commit 45d585ab7f222ca36988c406df528128a17f9884 Author: Justin Hibbits AuthorDate: 2025-05-13 01:35:14 +0000 Commit: Justin Hibbits CommitDate: 2025-05-15 01:38:24 +0000 powerpc: Always use BE tag in nexus_map_resource 7b5a5e4e replaced nexus_activate_resource() with the bus generic equivalent, which uses bus_map_resource(). However, though not intended to have a functional change, nexus_map_resource() uses the bus tag of the build (BE vs LE), while nexus_activate_resource() always explicitly set a big-endian tag, leading to failures on powerpc64le now. Using BE unless otherwise explicitly specified with the RF_LITTLEENDIAN fixes LE on bare metal, and doesn't hurt in a VM, which nexus_map_resource() was added for. Reported by: pkubaj Tested by: pkubaj Fixes: 7b5a5e4e("powerpc nexus: Use bus_generic_rman_*") MFC after: 1 day (cherry picked from commit c4921a0faaf1683f39347dd066000d929c39c8b9) --- sys/powerpc/powerpc/nexus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 826e75daa374..b40bb26fd395 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -289,7 +289,7 @@ nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, if ((rman_get_flags(r) & RF_LITTLEENDIAN) != 0) map->r_bustag = &bs_le_tag; else - map->r_bustag = nexus_get_bus_tag(NULL, NULL); + map->r_bustag = &bs_be_tag; map->r_size = length; map->r_bushandle = (bus_space_handle_t)map->r_vaddr; break; From nobody Thu May 15 09:52:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZylrV3W65z5w3xV; Thu, 15 May 2025 09:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZylrV2LFCz49nJ; Thu, 15 May 2025 09:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWjTHPy2ksnO2C+ndbrOWCgwpklzHFculdAqkDFXeFA=; b=o5ZIt/Vu4KcWjCG2ajSWkbggD8E7cgk41Y50FCVjpNxWX3X4tAxmuPucPbCmPcHAGdGO49 Fe4Fz/fj2SwHi818XtcKzucUzDZ5Zjqf5TtPYD87jClT9cfdlorS1VLBjir1g32rOY/Ya+ Wo+5hah8twoWwbp27xMThlLcC4IVfUD3kOGg5x0ly2SftKMzLopPw4Sn0+ImkmU1a5A5Lq WnIz00RV3RJHF3RK4H0kOkKhjXM+u172W5E1qjIsMvfPZsqy0AFofUtn+KB4TtkxrzXR4c U1Osig4iLWRgTU4VTc3ry+zCANfaeXprx5xPiej22tKS+vR2InyJytDKo0IsSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWjTHPy2ksnO2C+ndbrOWCgwpklzHFculdAqkDFXeFA=; b=TNqTYqvvkDYm/rtqUR2ns9aqUQvWC2gmQ5IvpDd7uABroGY2QwMmc1u1nKGERV+vA6stnt fJYF6DtEGb9y6OnU7rtZfNkw7+joDu1d8WUg5xiU+gyPQRlzcq8lu89ad6sjUZeQGp7TDL VS/WDXvL90toryGxdNTz2rwsSu/eA4j251dbchxeg4EOgOeUYhcCKIqbsX7CzsM0VVt2lk FKZsYQJXpsgeXeu3kyPIR2KZVuef5Dzf/RfKc5m0xOECEZjI7im2W7ZBgLQ9O1BVBIXK6D PHxLs3DOQZl6NHo5AEPRiAwSo9kIOcOEehBfctG9HwzJzH7CKA/Fs8MIxeus1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747302778; a=rsa-sha256; cv=none; b=Dj8dxdsKCel1J8Dp/g5QDeUF7TiauRWv9cPkcV/+tUX/OnTzNAikGswp9s0RBgJdyCDBuQ cE3hL4z9VOqkXFcxhBoJUcw3ENObtCab7RxVROsDHsxRNSanJgHXyDjDLJP1SRxVFGwJHr phqIL2e5rKqlX3taTXXWQ+7wPmmLAtYxHo1KvtmeYMGyieUvmFNUXoJAtzGIYM28+5D+C8 Q8kVcp8MdUwkt+lTzgRJ5Esp6LIELOlEG7Y0XtpzBaCmORQRWAwYeoSh4k6Q8YAPHKRXRz Ex8HuoxDnG8l2Ae1JEuwM0ftGt2iOUGRRNqB3BOomYRGKr135vksBsOBOM9Hxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZylrV1mkCz1Bkh; Thu, 15 May 2025 09:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F9qwdJ050702; Thu, 15 May 2025 09:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F9qwku050699; Thu, 15 May 2025 09:52:58 GMT (envelope-from git) Date: Thu, 15 May 2025 09:52:58 GMT Message-Id: <202505150952.54F9qwku050699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1fcc3d6dd5c5 - stable/14 - bnxt: add guards around struct_group macros List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fcc3d6dd5c559ac6328f57d44ff11211d56088d Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1fcc3d6dd5c559ac6328f57d44ff11211d56088d commit 1fcc3d6dd5c559ac6328f57d44ff11211d56088d Author: Bjoern A. Zeeb AuthorDate: 2025-05-03 20:22:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-15 09:50:55 +0000 bnxt: add guards around struct_group macros The header file might be included after linux/stddef.h or others are included and the macros would be re-defined. Sponsored by: The FreeBSD Foundation Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50156 (cherry picked from commit 152e6197615570e7a2f5f1c6c2ed00ecee9dd10c) --- sys/dev/bnxt/bnxt_en/bnxt_dcb.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/bnxt/bnxt_en/bnxt_dcb.h b/sys/dev/bnxt/bnxt_en/bnxt_dcb.h index 293f1b85dad5..fa68401583ca 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_dcb.h +++ b/sys/dev/bnxt/bnxt_en/bnxt_dcb.h @@ -40,13 +40,17 @@ #define BNXT_DCB_CAP_DCBX_VER_IEEE 0x08 #define BNXT_DCB_CAP_DCBX_STATIC 0x10 +#ifndef __struct_group #define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ union { \ struct { MEMBERS } ATTRS; \ struct TAG { MEMBERS } ATTRS NAME; \ } +#endif +#ifndef struct_group_attr #define struct_group_attr(NAME, ATTRS, MEMBERS...) \ __struct_group(/* no tag */, NAME, ATTRS, MEMBERS) +#endif struct bnxt_cos2bw_cfg { uint8_t pad[3]; From nobody Thu May 15 09:52:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZylrW3yWFz5w3s8; Thu, 15 May 2025 09:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZylrW36T4z3C0H; Thu, 15 May 2025 09:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrnDH0YpN/1aJv7r+fZAsQ1V9dI/izQ/z5IZpLVxdjg=; b=VzvgHROmDOYFt+7VfTkfEZXnhkNl9bqKcI65g93G2hG0acZjvU1gMf0LGID5RVJLDel7A1 v7vw6B5QJLTZMZPfYjNBTxt2ARgUeVtZjERtwTFrQKeRbhIE0Uo2XzHlGTy28A53cePmlT egXQoUa6HBquFRmGqDt/a9ariDB2hnabBjnJ7CkN/hs7nUsonvev1Jvyu/lYeyV/9PokPf PN6xMhgp+JmHAnUrGrg+8fgagdJTbfHkU+yUZ0oTU6pu0WPxdbUpLP2himtuXEs2OMhJx5 wKS5GxrHYZgyg9MN+XIzBPUlIJnPqKw6h/0g7faA/KrEYyFbtWMUIQbruso91g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrnDH0YpN/1aJv7r+fZAsQ1V9dI/izQ/z5IZpLVxdjg=; b=gNHvKFwMc8JQSj0A66SX8cXHjrNxwJlG/QkXb8pFv/lg6v7vki6w8uvsWGTcb3CGaZQ1gG 69TjtPpFXSxxZvNNfDylito8XvupO9cHEAoHS92zEl+ldmwM0OyOIbJHorQU+IgjwPOWHi kyIukd1uSCQWK6pnkATnwWjnIUgGGPRBWxndVrYh04aNa0iQzgbnlYYjVJsMmyvo9qhS5R e1XrZwpjhx7cR1C0pUr3v5aOZXwsL8VGOGInu7pHqC7rWsV7PpqRj9OwehMYqKx+QRjUGl qNSSqvkGyY3FPvJqVjgFNJ4cKoE8ZiDWq+twoRt3cffds2BqSk5YS5LRaMEMLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747302779; a=rsa-sha256; cv=none; b=C8+C3wHuVBYBffZzZlfJAEXuHDimzFVRjhln95iaaZaioHiUGUO17qdiqh8svt2UFbaA4F RVK9ozfnmPdZynWgjQwvjiUx42pBGM4/Yg05uVk1e2XhoXUfWu8z+o2JyuNVhYMtWvX4BC 9wzKegQYWSWUiQcNTJ4JbY9n0P/duuwaoHYZil8ICuFgJK/lajgi3pdblEnNxobWTOIyVQ Kn/hm68UWKueqbnNeRoA3J/KzAqZ4GbJmDyU732KjW1hLxW3/OFJxdjHhihMCh76HNAGGU 6Wm71Dp7q80udjyk+S/hH1rSCJfr5L8iZ7LfwwiWfq/IIxirr+0iESYzshN3QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZylrW2jXvz1BV6; Thu, 15 May 2025 09:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F9qxIb050740; Thu, 15 May 2025 09:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F9qxlJ050737; Thu, 15 May 2025 09:52:59 GMT (envelope-from git) Date: Thu, 15 May 2025 09:52:59 GMT Message-Id: <202505150952.54F9qxlJ050737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 96ee4e56125d - stable/14 - LinuxKPI: pci: deal with kobject_add() being able to fail List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 96ee4e56125de12280457c153f82868a7f2751e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=96ee4e56125de12280457c153f82868a7f2751e7 commit 96ee4e56125de12280457c153f82868a7f2751e7 Author: Bjoern A. Zeeb AuthorDate: 2025-05-04 19:58:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-15 09:50:55 +0000 LinuxKPI: pci: deal with kobject_add() being able to fail lkpifill_pci_dev() uses a sequene of kobject_init/set_name/add. The problem is that kobject_add could fail. Move the entire logic to the beginning of the function, switch to kobject_init_and_add() and check the return code. Make lkpifill_pci_dev() return the error and deal in the callers with a possible error accordingly. Sponsored by: The FreeBSD Foundation Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50154 (cherry picked from commit 96e86aa6faa6fde4ff75fd757db55afe9e4be132) --- sys/compat/linuxkpi/common/src/linux_pci.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 36dbac24496b..bee79f0478c8 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -310,9 +310,18 @@ lkpi_pci_dev_release(struct device *dev) spin_lock_destroy(&dev->devres_lock); } -static void +static int lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) { + int error; + + error = kobject_init_and_add(&pdev->dev.kobj, &linux_dev_ktype, + &linux_root_device.kobj, device_get_nameunit(dev)); + if (error != 0) { + printf("%s:%d: kobject_init_and_add returned %d\n", + __func__, __LINE__, error); + return (error); + } pdev->devfn = PCI_DEVFN(pci_get_slot(dev), pci_get_function(dev)); pdev->vendor = pci_get_vendor(dev); @@ -342,12 +351,10 @@ lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) pdev->msi_desc = malloc(pci_msi_count(dev) * sizeof(*pdev->msi_desc), M_DEVBUF, M_WAITOK | M_ZERO); - kobject_init(&pdev->dev.kobj, &linux_dev_ktype); - kobject_set_name(&pdev->dev.kobj, device_get_nameunit(dev)); - kobject_add(&pdev->dev.kobj, &linux_root_device.kobj, - kobject_name(&pdev->dev.kobj)); spin_lock_init(&pdev->dev.devres_lock); INIT_LIST_HEAD(&pdev->dev.devres_head); + + return (0); } static void @@ -375,9 +382,14 @@ struct pci_dev * lkpinew_pci_dev(device_t dev) { struct pci_dev *pdev; + int error; pdev = malloc(sizeof(*pdev), M_DEVBUF, M_WAITOK|M_ZERO); - lkpifill_pci_dev(dev, pdev); + error = lkpifill_pci_dev(dev, pdev); + if (error != 0) { + free(pdev, M_DEVBUF); + return (NULL); + } pdev->dev.release = lkpinew_pci_dev_release; return (pdev); @@ -508,7 +520,10 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, device_set_ivars(dev, dinfo); } - lkpifill_pci_dev(dev, pdev); + error = lkpifill_pci_dev(dev, pdev); + if (error != 0) + return (error); + if (isdrm) PCI_GET_ID(device_get_parent(parent), parent, PCI_ID_RID, &rid); else From nobody Thu May 15 09:53:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZylrY2f9gz5w3tw; Thu, 15 May 2025 09:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZylrX51dsz3C0R; Thu, 15 May 2025 09:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmjszkNPYDm6TYNXCoDcu3oZw75P1+wH9mtTEQOEerQ=; b=PRhnaKzbyzDE1zapbeMMV6F+T9EQrqsciXZ7fkF4EetTxg1E7BzPR0XS6JXxYIyZ0GceB6 FfwJcCRJGKxfvYiStgVI3yHa7S1t0SM3zK3XbHlx4jDiSfOslRKEyxVZqWf53h+d1KzEH/ qz8PHAECkgwKmrL/5+FEl2SZtUKZIumrF6SDLRQHnYdy07X1l98m43CFNpeezjALLI/dTx 312+dCJDCNrgD1Mz9+R6n8GIKh7U07cIm5O1/aLPq5v07s/7ybsMXwpo24cRwfA2letTQL 5GqRic6pPgdxYuO42Vd2MCBfZd1YyRBrQlAPiEa8CMbUgjrAxig78enp60ieTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmjszkNPYDm6TYNXCoDcu3oZw75P1+wH9mtTEQOEerQ=; b=E0lHpqqNsD99mAupOvOOPVWQGbx0A+pW0HuzfHoB9/vYKjoisFwMG2k4JDaNcLKKAGYID7 IJD0fFG32uTRkCZuBWnORL6zlfYsZWMlH115WeK+IfqCeWQ2VeyorAqEBtdfycjJAH72yO pKr3mG3raTLF+44BzSq/+L6bfcsUrsb8IPh6QgHVSCRdukSIQj5uoijQSzeO6f37teaA9v 3vcdKgrcDPGF2BFrJERddIxYsIx55R62XxMgs/YNFUq7PW+zDgFepZhpo1o0G/GtlYNkuJ lACM9PsuHDlzg0NtLwU3UUCq+HQzfauxJXFTFuKJnAB7vL2sl2bEDxD7AeyN9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747302780; a=rsa-sha256; cv=none; b=eRW0vyKWvnGCeEWF5GslmBTsiaHQRD+NZgP+vWQXqDlkW1VZbaY/iWY4GTbYtjr5rNSIZu AIhN+Xka+ailKT9LaWe9zi3HB/ZaA/bTT9ZFB40dzB9DMISJc24s7UZbXZTMwb6yyERgFc d1OOmXNd0iR8FdxMfxUJjX2RB77XFEBb0O6OZnrGR4QNmf6FXBuJJPfMUQJumuZxNUzrzE 0Z0Kdzl2igHX/X0L9onD6iSOnAOHZMFuwIMIR71I8gNYzUPrcb5NQossodkzZxaWxX2tcy oYtNyTthTF5Z3/8e1tX1WHAqelF77vIDdx/9g28Ap/3w4shDXyEedbfJI/mO3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZylrX3fQVz1BHm; Thu, 15 May 2025 09:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F9r0Hm050783; Thu, 15 May 2025 09:53:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F9r0j6050780; Thu, 15 May 2025 09:53:00 GMT (envelope-from git) Date: Thu, 15 May 2025 09:53:00 GMT Message-Id: <202505150953.54F9r0j6050780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c6c953fc43d8 - stable/14 - LinuxKPI: pci: fix two errors in lkpi_pci_get_device() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6c953fc43d86417bbf18a41a328c60f02a34c69 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c6c953fc43d86417bbf18a41a328c60f02a34c69 commit c6c953fc43d86417bbf18a41a328c60f02a34c69 Author: Bjoern A. Zeeb AuthorDate: 2025-05-04 20:02:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-15 09:50:55 +0000 LinuxKPI: pci: fix two errors in lkpi_pci_get_device() On any result we need to acquire a reference. pci_dev_get() deals with a NULL argument so we can simply pass what we "found" at the end. This will avoid reference count problems. If the iteration on the linux list in lkpi_pci_get_device() does not find a match pdev will still be defined at the end of the loop but not pointing to a valid pdev. Store the found entry in a 2nd variable which otherwise will be NULL. This will avoid random panics, usually in sysfs_remove_dir() when the reference gets released. Found during mt76 bringup. Sponsored by: The FreeBSD Foundation Fixes: 8f61992d7cc11 Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50153 (cherry picked from commit 2c65f965146a7f822302715a439e17996d17453c) --- sys/compat/linuxkpi/common/src/linux_pci.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index bee79f0478c8..2c2f92082a4e 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -288,18 +288,22 @@ linux_pci_find(device_t dev, const struct pci_device_id **idp) struct pci_dev * lkpi_pci_get_device(uint16_t vendor, uint16_t device, struct pci_dev *odev) { - struct pci_dev *pdev; + struct pci_dev *pdev, *found; KASSERT(odev == NULL, ("%s: odev argument not yet supported\n", __func__)); + found = NULL; spin_lock(&pci_lock); list_for_each_entry(pdev, &pci_devices, links) { - if (pdev->vendor == vendor && pdev->device == device) + if (pdev->vendor == vendor && pdev->device == device) { + found = pdev; break; + } } + pci_dev_get(found); spin_unlock(&pci_lock); - return (pdev); + return (found); } static void From nobody Thu May 15 09:53:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZylrZ4lc3z5w3ty; Thu, 15 May 2025 09:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZylrY5FJSz3BtD; Thu, 15 May 2025 09:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rxo+hWzLqWe0xTpKC07pJncbClJrsEmVFAI5S75hqe0=; b=ogh9T+n2BYs0dDuscZLPJ0XmiwBYeH6ge/2WNYAhHFPdIUXKwaGVxWrqadHkO4RquuyIUT CDsJVWYetl07bnuQa8fO7/zqhMy7463SX+19q2gRowT5TC0ZfygWVoBT+qWCMEJYVLXj0J R9GJ2a1RzKjUzm+LJH8PM6+S00JXSU05xsC07KKbuAOgW+aynzSNMiqVJPArZtCMQskWg+ NyoTcVwUg6Sp8ypXE3tqOitOd49nheNfo+tZ3iym686Oxku/082xCQpZ70klrvo9PkF3iX OfUvWqxWAPTxONvn+HvEpcb2rKD13+lqRfSIet3zczPTht7mpSFACZmxYdsmdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rxo+hWzLqWe0xTpKC07pJncbClJrsEmVFAI5S75hqe0=; b=LsTtL+YYAGSq9uqR5WLEHjrzS7kEjomcmtFQfSL5rGjbaF8nBZd0fOjGpvWC81K92NsvPV 9DKB9BKsURrMbL2807YlrHUoWM7OZthy2R+gPIjyytb0MOZH6obfP6yk1NvF1Wgor8XU0j 9O2EZs6T2KykOUa9xMHBf5VCiyjY3c1n2MUDBLVOsj5vXMSpvxzS1Yrs3xEh/6jjkkRdlX f/LLf0lmqylHBfj1rxacMJQkynEC1VHAt2N4yC4Bt6D70dSo/A69iXYgTtM7AMxyfrrIgi vOH0eXlZdkjq66P+ikmkYk3ujp2SXlmzB0L2BLPplDct+qt6d8JnItwHb37w7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747302781; a=rsa-sha256; cv=none; b=Clwm/H6KRZ0bcGDKz2cnYZstLXLpeO16DGX/KA57lOV8/DzoV/V3DzZZhHzgDL9F31YQ7r MU6jr2Apv2yEg04os1jKm1guXBXICGMGzXmjSkfNqJwgICEyKvmEYyjqT5S4hsHGJUrUue xzSn5dlDgmrSoEILyMJwCJMFXqriJTq+pzcLfJsCyYPPD5yKH/6/w2NH9faMSKE7Z+s7Sl HjqgJ17mL0bXxKqMtGvCVJ2w7agPPK2iu/LxkfFqdMwf7kdmAe6Xjat9lpJ5fPM9zz8F3b xfyBjt/SXJTchodIhy65iH11oG2NMeMb5Q0m8l4T2CDnfJ5hL2Cvmq+8HSbbeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZylrY4cbwz1BmY; Thu, 15 May 2025 09:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F9r1fs050822; Thu, 15 May 2025 09:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F9r1sl050819; Thu, 15 May 2025 09:53:01 GMT (envelope-from git) Date: Thu, 15 May 2025 09:53:01 GMT Message-Id: <202505150953.54F9r1sl050819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ad937b02ed38 - stable/14 - LinuxKPI: add _devcd_free_sgtable() to devcoredump.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ad937b02ed3803525b1fd579c6ddf64be43c9a92 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ad937b02ed3803525b1fd579c6ddf64be43c9a92 commit ad937b02ed3803525b1fd579c6ddf64be43c9a92 Author: Bjoern A. Zeeb AuthorDate: 2025-04-24 11:13:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-15 09:50:56 +0000 LinuxKPI: add _devcd_free_sgtable() to devcoredump.h It may be that once we implement freeing of chained tables _devcd_free_sgtable() will become our _lkpi_dev_coredumpsg_free() but further investigations need to happen. For now make an updated iwlwifi driver happy which should not need more. Sponsored by: The FreeBSD Foundation Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50006 (cherry picked from commit 71576ed24b56143429a3b6774a7862965c2dea88) --- sys/compat/linuxkpi/common/include/linux/devcoredump.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/devcoredump.h b/sys/compat/linuxkpi/common/include/linux/devcoredump.h index b58c490615ad..5fa06c6595a8 100644 --- a/sys/compat/linuxkpi/common/include/linux/devcoredump.h +++ b/sys/compat/linuxkpi/common/include/linux/devcoredump.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2020 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -71,4 +71,11 @@ dev_coredumpsg(struct device *dev __unused, struct scatterlist *table, _lkpi_dev_coredumpsg_free(table); } +static inline void +_devcd_free_sgtable(struct scatterlist *table) +{ + /* UNIMPLEMENTED */ + _lkpi_dev_coredumpsg_free(table); +} + #endif /* _LINUXKPI_LINUX_DEVCOREDUMP_H */ From nobody Thu May 15 09:53:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zylrb2CMgz5w40p; Thu, 15 May 2025 09:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZylrZ658fz49rX; Thu, 15 May 2025 09:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UnsFtN3CcocDJF9Kxq7hJJwttGPaVY+o4xG7c6lQR9c=; b=KMSTo1X2R4ADpMqlrRxkyAtWhAMJ8OgY3SndXOJOgNQ1/gIqnqN4YWw2hNGIA476fg1PDB v2ZgHOTGJXdx5qYyn1TBUdj4wQsJijJIB+ADAjRCoDtjB/YnZcA7Uutahb8rpopHE/m4hQ DlMtAgZi768hJ65NeL0p5t668Ou1JbOinYgucJRutbdf7yIT0VK9Qpzgf/xUWTdghMy84g zi84wyJPRwdaZXPgpCCwt7lsIux5V8G7H3pImmZE/E6PBYbiS4ekf19L5/MtWEuiNut1cz E6tQmubsQKGy2HcApss0mJq9tDXaA0Co1z5WMVtKg3MWwQm7WT9cgnXNJ8zABA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UnsFtN3CcocDJF9Kxq7hJJwttGPaVY+o4xG7c6lQR9c=; b=vNnj5qSTMS2G5vPL650AluWZ6mCCGZm8j09wJr3caPyFq3WTso4MV7mAKa/L1127K/F1nl dOJF5X/TLbBSpaidqfj0A9UJFcazL7T275fxeD2icYGlSmT6NPt3I8JDxbiK/g6tPsBs+y KfK6PZuBK/odiwSY3NGSdfhZaqyy6VZnnBGV1A/TtDUTM2qjRAb6X1j0B24wJE8l4BeaPA 0hjASDR6ogNTydESNmQDSOLP1BRT/2m8SyIO8nHXBE1djDVFAu/N5JSXQrMn/yqN+ji7/J cQZArwIy1HT5tIh/I8XU5UWJupqeNnYvuLA81Y/ewJhQs0POcWr0bKid1HDraA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747302783; a=rsa-sha256; cv=none; b=ZBJrZjwq+71tpvxAJ19guV2OV7FsufqFLN0xu0hOXlgmiQSefw9I3IVSWTUflnc8qykIMQ XKSnNBtHeJB+BmxxmxQk+MTEtMvTgCW8aTTMazAX/YOaGMJ868fXrITbQBPajQ9tXhy8g4 p5C97QCSSNnyxqa5CuhzjUwhNGVq7F34Xd1FwpAOKKK71J0cn6dFcetRfN4qHTaLNSRG2T N05JFEiSRwjMqNACmnLPAXG0iwn6RES3dLOmWOE2BiiQKeg6JYqSrgIOFyA9jVoOs1Ti5m 4TeCVd5hqrohscWWuJmLhZDt4NDzIOkeDtKaKyGKoGzJxMe1+RlZVuMaLx0sIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZylrZ5Z7kz1BmZ; Thu, 15 May 2025 09:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F9r28k050864; Thu, 15 May 2025 09:53:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F9r2kC050861; Thu, 15 May 2025 09:53:02 GMT (envelope-from git) Date: Thu, 15 May 2025 09:53:02 GMT Message-Id: <202505150953.54F9r2kC050861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1d70da6aa294 - stable/14 - LinuxKPI: add ktime_get_boottime_seconds() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1d70da6aa294b9b3c0963e41667a4f74b3125615 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1d70da6aa294b9b3c0963e41667a4f74b3125615 commit 1d70da6aa294b9b3c0963e41667a4f74b3125615 Author: Bjoern A. Zeeb AuthorDate: 2025-04-24 11:12:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-15 09:50:56 +0000 LinuxKPI: add ktime_get_boottime_seconds() ktime_get_boottime_seconds() is needed by an updated iwlwifi driver. Sposored by: The FreeBSD Foundation Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50005 (cherry picked from commit 93b82146c43b8ecad4fd7694ec1daf6d79cca65c) --- sys/compat/linuxkpi/common/include/linux/ktime.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ktime.h b/sys/compat/linuxkpi/common/include/linux/ktime.h index 53c2abd64fc6..6a2f04f3d789 100644 --- a/sys/compat/linuxkpi/common/include/linux/ktime.h +++ b/sys/compat/linuxkpi/common/include/linux/ktime.h @@ -232,6 +232,13 @@ ktime_get_boottime_ns(void) return (ktime_to_ns(ktime_get_boottime())); } +static inline uint64_t +ktime_get_boottime_seconds(void) +{ + + return (ktime_divns(ktime_get_boottime(), NSEC_PER_SEC)); +} + static inline ktime_t ktime_get_real(void) { From nobody Thu May 15 09:53:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zylrc2qYZz5w40q; Thu, 15 May 2025 09:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zylrb6gMHz3C8p; Thu, 15 May 2025 09:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VFrB52Oelg6X33k1Z3lfbJHuIs6CrzLFC821lBfjKHI=; b=v8NSB9Z/u+qjHDlcFpbXPXo6hPVNWUE28Sdm1wxqW16rqcBPpOUfDoHxi+b3zCwdQbpOj5 I/zcdocpkILsKLIqo6s5O/hA7ar2HzT+4qTh3wbkLMXuv0H/ntKzjtDs6XJZSZpBjLUcOt 6b7Y6TZpya0u1IAJjfhFhggsL3udrT/97gNs2voTWMPKOkHcWxWzAssAAOYhoP1IfxgSVM aoRx0wEEkihjHTFOUxqRBwEm2zXInkk17hbis3WPaxcR+N/FCnoYTF/wmvFexEoIxZD3Mz hHXAnXxOwPzYOqA0MRGpszBz/5AykLTn3a7mCeD3EnPhfuesDgiNPRqWCASQTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VFrB52Oelg6X33k1Z3lfbJHuIs6CrzLFC821lBfjKHI=; b=NUkkRhBWOkOfXthU5yigaZO3fyJ2gJ21+iGwlqvb5zjHAXFZAcPU96a4Y7cvnc+XbPWiUN uGN9Mj+u2tLV0BpCUYs7PNeSZ5QaxI0HofLb8djxGa0jXmS48m4LTqLPVgE7X4jLbP5Uzm no5Sj3WmDUN7bkQb1WyQlGqjWOM/FG7nOxLS+pe+d2sIqm3SXMXJKluWsSzuDzWULW3PFJ G1A6ISU7UR4a6G03Bjyb2xJUzU46dU+Z5SshQZy0S+HShlz1eDxcqc6DVQ0oTuymEYkqmH DbeTczRqSnNlOpeNwcpRULMiSOQqAB/pBlcoN/wDcUuETAeyjOXNrGeq6Q/pTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747302784; a=rsa-sha256; cv=none; b=DBttTnzU5FM3N5cNvpJDitpUH+JbMMEeuQeOi/CQkdXPiOJUaKlFCD+EvAIwzrY6ivRKNz FXvxGRwHJb2KkKzKvZ4q22t/x0TSLLGuz4W7NilrbO8/yCTSvXDr4o8yagGvfGWhMqadc/ s5cG0iqp5YM7ajLDmVpFHsHG+NeppYaTxRyO1a45wkD67Tfgdl1J9i9vqAMNRn7YEgWPCe GVNrJ6tp9Iwdlq+jhvo63Z6U5/ZdEvP1jGBf/u3/LsA0JNoQu86r7DeknAlAgDCBqIFFEY /KP4VMBty5Yk4FQ4E/xaCj7HXb+BlT6jmF+epgAxKVMp8S+Ck7D14cixffeCLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zylrb6CGcz1BHn; Thu, 15 May 2025 09:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54F9r3kb050904; Thu, 15 May 2025 09:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F9r31S050901; Thu, 15 May 2025 09:53:03 GMT (envelope-from git) Date: Thu, 15 May 2025 09:53:03 GMT Message-Id: <202505150953.54F9r31S050901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e0692e7bb6e8 - stable/14 - LinuxKPI: 802.11: make sure AUTH frames are not being sent if BSS changed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e0692e7bb6e8abcc55a2510dceea5f83e823a827 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e0692e7bb6e8abcc55a2510dceea5f83e823a827 commit e0692e7bb6e8abcc55a2510dceea5f83e823a827 Author: Bjoern A. Zeeb AuthorDate: 2025-05-12 15:12:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-15 09:50:56 +0000 LinuxKPI: 802.11: make sure AUTH frames are not being sent if BSS changed iwlwifi keeps logging 'Invalid TXQ id' even after previous changes to catch the BSS changed. The reason for this is that we do not error in the SCAN -> AUTH path as otherwise we would not have the state machine get us back to SCAN to clear up firmware state before auth/assoc to the new BSS. If we are not in synch as net80211 just swapped the iv_bss from under us, disable the TX queue for the (old) lsta to prevent the AUTH frame sent from sta_newstate() reaching the driver. After all we are not trying to authenticate to that node (sta) anymore. Sponsored by: The FreeBSD Foundation PR: 274382 (cherry picked from commit 16d987fe781780100a31df30b9edd79ebb54f957) --- sys/compat/linuxkpi/common/src/linux_80211.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index fb9a4bc0177b..82eaa64790b4 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2021,6 +2021,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int struct ieee80211_prep_tx_info prep_tx_info; uint32_t changed; int error; + bool synched; /* * In here we use vap->iv_bss until lvif->lvif_bss is set. @@ -2211,14 +2212,6 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int __func__, ni, ni->ni_drv_data)); lsta = ni->ni_drv_data; - /* - * Make sure in case the sta did not change and we re-add it, - * that we can tx again. - */ - LKPI_80211_LSTA_TXQ_LOCK(lsta); - lsta->txq_ready = true; - LKPI_80211_LSTA_TXQ_UNLOCK(lsta); - /* Insert the [l]sta into the list of known stations. */ list_add_tail(&lsta->lsta_list, &lvif->lsta_list); @@ -2292,10 +2285,10 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int ieee80211_ref_node(lsta->ni); lvif->lvif_bss = lsta; if (lsta->ni == vap->iv_bss) { - lvif->lvif_bss_synched = true; + lvif->lvif_bss_synched = synched = true; } else { /* Set to un-synched no matter what. */ - lvif->lvif_bss_synched = false; + lvif->lvif_bss_synched = synched = false; /* * We do not error as someone has to take us down. * If we are followed by a 2nd, new net80211::join1() going to @@ -2305,9 +2298,20 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int * to net80211 as we never used the node beyond alloc()/free() * and we do not hold an extra reference for that anymore given * ni : lsta == 1:1. + * Problem is if we do not error a MGMT/AUTH frame will be + * sent from net80211::sta_newstate(); disable lsta queue below. */ } LKPI_80211_LVIF_UNLOCK(lvif); + /* + * Make sure in case the sta did not change and we re-added it, + * that we can tx again but only if the vif/iv_bss are in sync. + * Otherwise this should prevent the MGMT/AUTH frame from being + * sent triggering a warning in iwlwifi. + */ + LKPI_80211_LSTA_TXQ_LOCK(lsta); + lsta->txq_ready = synched; + LKPI_80211_LSTA_TXQ_UNLOCK(lsta); goto out_relocked; out: From nobody Thu May 15 13:07:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zyr9H3Xwpz5wKQD; Thu, 15 May 2025 13:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zyr9H2r9kz3l85; Thu, 15 May 2025 13:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747314467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AaxkLdAuOFgHujv7MSuCF9n9YMiIGsTffuPEOScVvTc=; b=qioVSuqANARkziFfijMBhWeRit9boawfaAV3KUJukLQgOnyCY0YGRhbxFXyFyZ/wMhpmU9 wSGNnEKH8JYZDdjwMuXnfh0nzaBkhMB6ULtpJcc2XcYWO/RkIOldyZ35/W574olDBa1XXc sfgHg48QWwQtchSnelSRXNfzlIuziJArKA9HTlgeBiG0RWt6VqkEaSlQ6jR4h9AvuzlfY1 c7c3YVhMGdjkD0TbqDxZmmcAiJtTkMAr/0OMS6k0gAQeeFvVprxVgP3X1eNzxLO3n8Xtw6 HWBY0YRe6xmwkJkhj5LrvRPst3dphumkp4atx/XGQxV32sztLBeBVWIeSjaQHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747314467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AaxkLdAuOFgHujv7MSuCF9n9YMiIGsTffuPEOScVvTc=; b=F6+NGlCFH4Mz9a0yrmMYjqp/b9Awk1KcMVNQ7KffB/gg0NJy3nnvBzIuPTkux+UbcITCe6 7ZS1/zDZFUE+rqR1u/nzT/Bli+QiZO4zsLZ14pYwaSCjnrVP5TLvOUNf6FBNHyl0ob3hVa Qa6xZa665G5Bl6QF33wLSj8THs1RbK0hZl+bQfVWJxbI/ivIvdz0MY8wtcBu/rR32AmnGD bshXiMwtK4DI9SpDl6ONQSxZhu2H9SvXEAOjgKyYuWGQ1fUCndN5k7W6sQU+Vt5+D4X1/L Uq15hmJ5fzEfOWWuP1NCK9zrrkKtTZRTOz17IsAE9+r4oIO88HgqUNV/GQYhqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747314467; a=rsa-sha256; cv=none; b=BGJBETpTjpMeGWAE/wBP4ubc0AmxQcv/A6Pd3Sl4kpnhkxUc1CEPHiJhBQ7acW+BpmMQCM uiLq7UBsDl7GmoKfRk2nDl5lqjzV5zKkGyj0DR5ccyIi5OZB0NedQrO+xLfIEqTZ5Gc6Wl ygrdxMQMNSJ/POY7vjU44YZr1EKfN6ilfVYcewzl3DvSQhX4lBBT03zF+eoHNuvdNLa7d4 LJc8EwSaRNNR8yZU/w+FOQn4nwO8QzSK+hc6tK7RVBLT7TlxwtZqb6mscZs82vHoBOnCgl sAHF3pPT1vbYYMV1oyFBRdguH5S0tvG/XsUi6vbXM/Kg+KRUo9Him9yJOfPJyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zyr9H2MYMz3bq; Thu, 15 May 2025 13:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FD7lPr008980; Thu, 15 May 2025 13:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FD7lnq008977; Thu, 15 May 2025 13:07:47 GMT (envelope-from git) Date: Thu, 15 May 2025 13:07:47 GMT Message-Id: <202505151307.54FD7lnq008977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: ac1943f97c01 - releng/14.3 - powerpc: Always use BE tag in nexus_map_resource List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: ac1943f97c01b0ef049a9bfd81cf2b4a05d0a9d9 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=ac1943f97c01b0ef049a9bfd81cf2b4a05d0a9d9 commit ac1943f97c01b0ef049a9bfd81cf2b4a05d0a9d9 Author: Justin Hibbits AuthorDate: 2025-05-13 01:35:14 +0000 Commit: Justin Hibbits CommitDate: 2025-05-15 13:06:51 +0000 powerpc: Always use BE tag in nexus_map_resource 7b5a5e4e replaced nexus_activate_resource() with the bus generic equivalent, which uses bus_map_resource(). However, though not intended to have a functional change, nexus_map_resource() uses the bus tag of the build (BE vs LE), while nexus_activate_resource() always explicitly set a big-endian tag, leading to failures on powerpc64le now. Using BE unless otherwise explicitly specified with the RF_LITTLEENDIAN fixes LE on bare metal, and doesn't hurt in a VM, which nexus_map_resource() was added for. Reported by: pkubaj Tested by: pkubaj Fixes: 7b5a5e4e("powerpc nexus: Use bus_generic_rman_*") MFC after: 1 day Approved by: re(cperciva) (cherry picked from commit c4921a0faaf1683f39347dd066000d929c39c8b9) (cherry picked from commit 45d585ab7f222ca36988c406df528128a17f9884) --- sys/powerpc/powerpc/nexus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 826e75daa374..b40bb26fd395 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -289,7 +289,7 @@ nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, if ((rman_get_flags(r) & RF_LITTLEENDIAN) != 0) map->r_bustag = &bs_le_tag; else - map->r_bustag = nexus_get_bus_tag(NULL, NULL); + map->r_bustag = &bs_be_tag; map->r_size = length; map->r_bushandle = (bus_space_handle_t)map->r_vaddr; break; From nobody Thu May 15 18:17:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zyz304FqSz5whhV; Thu, 15 May 2025 18:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zyz302fVqz3FMN; Thu, 15 May 2025 18:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6dsfvNVO8/5TelRxTlclCewgRIKzgARrqrRZX13jdc=; b=VX/s6Mg8UxInFWpSeHRKw/qvXHPpFW37wSIcbzN78O8//Im61bGBM5sTD+wGF8Rvw8CtBu ajFv1b+QiSQcMwgf6tTViipPdXo/pn3+ixHmDLlCPXDl9M4t4dA1cEe1WhESOv/3coLDQy jCAzUqGYhf/sxNpZ2LuKBjPTGqlcALAy/i9nzLzbvkXJnWp82np+NBoL3jvVkJAVworRk3 SyCVhumr7PSSR1lkeaQWXRX8lKeeH5eNtSOCpFCw/5QyEPRZFZ+FOOowT8gc+l5oDl5RPk HWD34FEERHsKHvRE6lJFvCa9zS1sKhCLI+TLcVx63yVlFlkY+2clXzYQVJPxSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6dsfvNVO8/5TelRxTlclCewgRIKzgARrqrRZX13jdc=; b=tBmn+dDbWFvNxd5f2wx8+sbHU88qekwjdu0LRcW0CDBNMhwQ1HNXvczkyz83RbwIKhlQCO l1RiQwS54iHaeI3qANkvSyA4fpL9llGQpIoU6/9KnxFuCIKDyEij2PQ2kt/sn/44sgUaWv TOdBfbhY2w3P8kPDbZFblUw/SFRfVbkPtR33iiOlPuh6nHgH9BE5By0Bdmjc7TeYKiqv+7 BoTRAHk/MvxX9gIqzrF/LhW3tReFAgbMd4yVN+Quz1vAku65XTy6xUKmNpvwtibrL27uz8 4yzcEXjm6LwtwRXD5HM+uydmnXK0i3JsBrS8gGivP1NW36hfn5nTpdhkLlEoJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747333068; a=rsa-sha256; cv=none; b=eN7YvtN1ooRwmvUt6CWmk6MuiRLFHO4dr2EgMu+EyV+ovjf8mMCvl3JnhzZtaHw1knDtu2 F6nOldAMIX16GcmTOdDQ4HfI4Kl/W0FG25wbxbhVNyHbDGmLLbK5P/4EQ/F+suk9ol5Nj+ WipkTAzIDaUecRvHT5HPHWG0p/T873SMr9NOuQgvEOnri9zSjA0VDic6x26CSlM3wAfFrH kfzZYH8FTyPO86BPRRIoyggx20FZ1j3ar7+Y1hCcLAlcle8HGf2MIP6eChaZN67p8HX/Fv NjUT3HUSfodi/5PrEIUlaqRGRdK50b8osqw/3C6VD48reEccM5U5OM1iI7hpBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zyz3029KszD0p; Thu, 15 May 2025 18:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FIHmqf090163; Thu, 15 May 2025 18:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FIHm4l090160; Thu, 15 May 2025 18:17:48 GMT (envelope-from git) Date: Thu, 15 May 2025 18:17:48 GMT Message-Id: <202505151817.54FIHm4l090160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: c58c931e2004 - stable/14 - ig4_iic: Allow sleeping if called from iichid interrupt handler. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c58c931e20045a6e254df5901e0321b537337440 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c58c931e20045a6e254df5901e0321b537337440 commit c58c931e20045a6e254df5901e0321b537337440 Author: Vladimir Kondratyev AuthorDate: 2025-03-07 06:26:51 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-05-15 18:11:55 +0000 ig4_iic: Allow sleeping if called from iichid interrupt handler. This replaces 50 ms busy loop with mtx_sleep for the same duration thus saving CPU time when iichid is driven with interrupts. Sponsored by: Future Crew, LLC MFC after: 2 month Differential Revision: https://reviews.freebsd.org/D48956 (cherry picked from commit c7225a3ede3cf99c538158962f4d65dee435bbcd) --- sys/dev/ichiic/ig4_iic.c | 5 +---- sys/dev/ichiic/ig4_var.h | 1 - sys/dev/iicbus/iichid.c | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c index 749a39e25117..31b097fd68bb 100644 --- a/sys/dev/ichiic/ig4_iic.c +++ b/sys/dev/ichiic/ig4_iic.c @@ -72,7 +72,7 @@ #include #include -#define DO_POLL(sc) (cold || kdb_active || SCHEDULER_STOPPED() || sc->poll) +#define DO_POLL(sc) (cold || kdb_active || SCHEDULER_STOPPED()) /* * tLOW, tHIGH periods of the SCL clock and maximal falling time of both @@ -713,14 +713,11 @@ ig4iic_callback(device_t dev, int index, caddr_t data) if ((how & IIC_WAIT) == 0) { if (sx_try_xlock(&sc->call_lock) == 0) error = IIC_EBUSBSY; - else - sc->poll = true; } else sx_xlock(&sc->call_lock); break; case IIC_RELEASE_BUS: - sc->poll = false; sx_unlock(&sc->call_lock); break; diff --git a/sys/dev/ichiic/ig4_var.h b/sys/dev/ichiic/ig4_var.h index 964a610e7408..cb44a1e7cd58 100644 --- a/sys/dev/ichiic/ig4_var.h +++ b/sys/dev/ichiic/ig4_var.h @@ -92,7 +92,6 @@ struct ig4iic_softc { bool platform_attached : 1; bool use_10bit : 1; bool slave_valid : 1; - bool poll: 1; /* * Locking semantics: diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index e99facdb06bb..fd544e82b2fc 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -602,7 +603,9 @@ iichid_intr(void *context) * acknowledge interrupts we fetch only length header and discard it. */ maxlen = sc->power_on ? sc->intr_bufsize : 0; + THREAD_SLEEPING_OK(); error = iichid_cmd_read(sc, sc->intr_buf, maxlen, &actual); + THREAD_NO_SLEEPING(); if (error == 0) { if (sc->power_on) { if (actual != 0) From nobody Thu May 15 18:17:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zyz316WR8z5wjFk; Thu, 15 May 2025 18:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zyz313fDSz3FjF; Thu, 15 May 2025 18:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwllhAEtHldXUmfR8tq2x88v4UnWoM8/nuLZNPXyk+o=; b=aUl1sWRX1ml3vV2yFom9b00VyK3UomouARbqbWf0feRYi6Oz73B7MkpmN2seuR90aBS2Qh MKvinuYf1pc3YJ1KgHZJohfUakoN3acwpZdXBaGYtyUiPpZgMbmdvxkqrzIB2Gkbcw78F9 1GiTNY94B+BnJq8n1ys/mmeQa4xza7p+HLHfkI2ZDKfRJ2jLe4jLeRTOyby2ljANYpS6x8 OewTsre2iTrU2NMpdKGKXEIsMRSzek0LvQ264hy+o2WI1rOOK14vd9izd6Nr33WMhr4pIJ EilTu/ZUVwgsaEyBkQ6fi2qazXFpP60nsVTPO2iLZHd5hHFj6EEerdXIOOyYAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwllhAEtHldXUmfR8tq2x88v4UnWoM8/nuLZNPXyk+o=; b=heiHqVAUxh5CZK9liE7mn9y4Z4ss5QIyNbbMuU+dixZP53GFBMw6fxS0/MTVGl6cnw/yeB 8lG+fQ1omHN/eq9wEzhcz6Y1R3BiQQMMfy3eJqdnYSdJ3lRWRO2WTPUhOx2G53HKRDBKmV xPK0EUzpmJ/igtMJNpfS7ESRLtpz2/lZ+e/vM4RfApHsywzAATnA7v4NXg6HpLofozGomx 0U1N/za2lTXti10WktI7izgmmh+KrZATQ0mGmHNinNgrQnOb9zaNTD7hOxo2S9QFATgQzH ky6weIZ8UiMpOP8KWjbxUQibPhyMmHD2kDO4bhkPBZXfy1uZSfoN6NPL7FIIcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747333069; a=rsa-sha256; cv=none; b=e3V02r4oO1l64YqSEybqSPdykzu2BynwBx2KfZpPjPEULqxo4nc2ozEZvK10uoTRblElpw /T+uawWQRtzBUWWcN6x2I6JPU/hwQMeM0wwYWCAJFrfIiF3TI7S5TcwNZQFDuLCQxJyu2G Nhfeq/5wAIZwoXfzqcrWaNegISC6bsIv66iO2invnT7YhCwEpFE8mPx/D5YKnKGEiWR3mz HLi71RfUElSYie4hF9j4MDPSFPBgf6Q2InmaIVfNhCo/8JwZflh12O0Fm2RSdmdIHcVD1Q 1kMRKnvzrM5vuheZd/HT16w78ejeI61HBEyUYtokZ7gss5eq4rbgnWu19QKOUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zyz3135PZzDBl; Thu, 15 May 2025 18:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FIHnra090196; Thu, 15 May 2025 18:17:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FIHn8h090193; Thu, 15 May 2025 18:17:49 GMT (envelope-from git) Date: Thu, 15 May 2025 18:17:49 GMT Message-Id: <202505151817.54FIHn8h090193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 3bd684f0aafe - stable/14 - iichid(4): Read wMaxInputLength bytes over I2C even if we discards data List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3bd684f0aafe046d07b241a76bbec7feacff88b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=3bd684f0aafe046d07b241a76bbec7feacff88b5 commit 3bd684f0aafe046d07b241a76bbec7feacff88b5 Author: Vladimir Kondratyev AuthorDate: 2025-03-07 06:26:51 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-05-15 18:12:08 +0000 iichid(4): Read wMaxInputLength bytes over I2C even if we discards data For some devices e.g. ITE5570 it is not enough to read HID-over-I2C input length header of RESET command response to acknowledge interrupt. Do a full-size read to avoid interrupt storm. Sponsored by: Future Crew LLC MFC after: 2 month Differential Revision: https://reviews.freebsd.org/D48957 (cherry picked from commit 548d3aa856a97f4483554beceeb57fa9ba0ff913) --- sys/dev/iicbus/iichid.c | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index fd544e82b2fc..577b0952e107 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -284,11 +284,25 @@ iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, return (error); actlen = actbuf[0] | actbuf[1] << 8; - if (actlen <= 2 || actlen == 0xFFFF || maxlen == 0) { +#ifdef IICHID_SAMPLING + if ((actlen == 0 && sc->sampling_rate_slow < 0) || + (maxlen == 0 && sc->sampling_rate_slow >= 0)) { +#else + if (actlen == 0) { +#endif + /* Read and discard reset command response. */ + msgs[0] = (struct iic_msg) + { sc->addr, IIC_M_RD | IIC_M_NOSTART, + le16toh(sc->desc.wMaxInputLength) - 2, sc->intr_buf }; + actlen = 0; +#ifdef IICHID_SAMPLING + } else if ((actlen <= 2 || actlen == 0xFFFF) && + sc->sampling_rate_slow >= 0) { /* Read and discard 1 byte to send I2C STOP condition. */ msgs[0] = (struct iic_msg) { sc->addr, IIC_M_RD | IIC_M_NOSTART, 1, actbuf }; actlen = 0; +#endif } else { actlen -= 2; if (actlen > maxlen) { @@ -580,7 +594,7 @@ iichid_intr(void *context) { struct iichid_softc *sc; device_t parent; - iichid_size_t maxlen, actual; + iichid_size_t actual; int error; sc = context; @@ -602,9 +616,8 @@ iichid_intr(void *context) * (to ON) before any other command. As some hardware requires reads to * acknowledge interrupts we fetch only length header and discard it. */ - maxlen = sc->power_on ? sc->intr_bufsize : 0; THREAD_SLEEPING_OK(); - error = iichid_cmd_read(sc, sc->intr_buf, maxlen, &actual); + error = iichid_cmd_read(sc, sc->intr_buf, sc->intr_bufsize, &actual); THREAD_NO_SLEEPING(); if (error == 0) { if (sc->power_on) { @@ -812,6 +825,7 @@ iichid_intr_setup(device_t dev, device_t child __unused, hid_intr_t intr, void *context, struct hid_rdesc_info *rdesc) { struct iichid_softc *sc; + device_t parent; if (intr == NULL) return; @@ -821,33 +835,38 @@ iichid_intr_setup(device_t dev, device_t child __unused, hid_intr_t intr, * Do not rely on wMaxInputLength, as some devices may set it to * a wrong length. Find the longest input report in report descriptor. */ - rdesc->rdsize = rdesc->isize; + rdesc->rdsize = + MAX(rdesc->isize, le16toh(sc->desc.wMaxInputLength) - 2); /* Write and get/set_report sizes are limited by I2C-HID protocol. */ rdesc->grsize = rdesc->srsize = IICHID_SIZE_MAX; rdesc->wrsize = IICHID_SIZE_MAX; + parent = device_get_parent(sc->dev); + iicbus_request_bus(parent, sc->dev, IIC_WAIT); + sc->intr_handler = intr; sc->intr_ctx = context; - sc->intr_buf = malloc(rdesc->rdsize, M_DEVBUF, M_WAITOK | M_ZERO); sc->intr_bufsize = rdesc->rdsize; + sc->intr_buf = realloc(sc->intr_buf, sc->intr_bufsize, + M_DEVBUF, M_WAITOK | M_ZERO); #ifdef IICHID_SAMPLING - sc->dup_buf = malloc(rdesc->rdsize, M_DEVBUF, M_WAITOK | M_ZERO); + sc->dup_buf = realloc(sc->dup_buf, sc->intr_bufsize, + M_DEVBUF, M_WAITOK | M_ZERO); taskqueue_start_threads(&sc->taskqueue, 1, PI_TTY, "%s taskq", device_get_nameunit(sc->dev)); #endif + iicbus_release_bus(parent, sc->dev); } static void iichid_intr_unsetup(device_t dev, device_t child __unused) { +#ifdef IICHID_SAMPLING struct iichid_softc *sc; sc = device_get_softc(dev); -#ifdef IICHID_SAMPLING taskqueue_drain_all(sc->taskqueue); - free(sc->dup_buf, M_DEVBUF); #endif - free(sc->intr_buf, M_DEVBUF); } static int @@ -1132,6 +1151,8 @@ iichid_attach(device_t dev) sc->power_on = true; + sc->intr_bufsize = le16toh(sc->desc.wMaxInputLength) - 2; + sc->intr_buf = malloc(sc->intr_bufsize, M_DEVBUF, M_WAITOK | M_ZERO); TASK_INIT(&sc->suspend_task, 0, iichid_suspend_task, sc); #ifdef IICHID_SAMPLING sc->taskqueue = taskqueue_create_fast("iichid_tq", M_WAITOK | M_ZERO, @@ -1142,6 +1163,7 @@ iichid_attach(device_t dev) sc->sampling_rate_slow = -1; sc->sampling_rate_fast = IICHID_SAMPLING_RATE_FAST; sc->sampling_hysteresis = IICHID_SAMPLING_HYSTERESIS; + sc->dup_buf = malloc(sc->intr_bufsize, M_DEVBUF, M_WAITOK | M_ZERO); #endif sc->irq_rid = 0; @@ -1164,6 +1186,7 @@ iichid_attach(device_t dev) if (sc->irq_res != NULL) bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq_res); + iichid_detach(dev); error = ENXIO; goto done; #endif @@ -1189,7 +1212,7 @@ iichid_attach(device_t dev) if (sc->sampling_rate_slow >= 0) { pause("iichid", (hz + 999) / 1000); - (void)iichid_cmd_read(sc, NULL, 0, NULL); + (void)iichid_cmd_read(sc, sc->intr_buf, 0, NULL); } #endif /* IICHID_SAMPLING */ @@ -1235,7 +1258,9 @@ iichid_detach(device_t dev) if (sc->taskqueue != NULL) taskqueue_free(sc->taskqueue); sc->taskqueue = NULL; + free(sc->dup_buf, M_DEVBUF); #endif + free(sc->intr_buf, M_DEVBUF); return (0); } From nobody Thu May 15 18:17:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zyz331YdFz5wj2N; Thu, 15 May 2025 18:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zyz324R88z3Fgr; Thu, 15 May 2025 18:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWEKZYNfTHBpi0PLmenunEqfy6jBNO9WGjfYRKThVeE=; b=Ro6XGyLM97ob28Y152crHdGQLrvtlQqjA/rZ8zrJbHOV4QPmFgdRYutMrutIqKVNWL4pQm P/nkfBjae+7o5qOHuaOZ4ereNwOC+lRSjwWoUdjEj9jwi8kCfygGAhmMXiyr1PEmroTz+o GABjz4TMlxmJR4A0STui0t3ttVOA8GZUcgAKsAu6BYYy7Zj8SwfQZM17etuZFjFFi68AzK NtSL9KK2ui7E63KLm4kj8S06++N1UGXIlCjWpa8iFTnHWEsUPg8LlzaoGjzLs33r8OB++4 pROI9pSGHAyLEvsvg6px3sNzwfLXGYRlM/6kSWUEKUR704MqCPICXa7ccyclTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWEKZYNfTHBpi0PLmenunEqfy6jBNO9WGjfYRKThVeE=; b=gHtn00s/oIB0DJQf37eGUCR6plQGiBMnTV//AaE4bXsaZCNY8fymheg7yBf2kHxLQra7wR MOlbiME7YG9GuNen8zwHhk/j5TxKfL22PRt0oU+qB5uZX0M7uSPZQGqs0ojGesXDWK4iju 2fdkVf2Y2mX01OsRf2mGavxeKrSocb5Gt4cMxB3r/av5Be7OFbGRJ6ZaKlaTM6gVkJxoaz 561XjYBErugxVJqFiDd6CZr9QzMaAhd9yO8yt6ae+Lmb4ga6kMAiVqee7r1juJsWM+fO7m LFKR/Ea2R/RFWBm0ti/N/sMaEoJsIG+e/xG+7zujeK9FjY9Jfci14YfpWo6lww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747333070; a=rsa-sha256; cv=none; b=CdET/z0Rlb3sZEkxNOCdcPL/2UsCQy3rRbz+JCP5znTp1S43gn1cekd5QB/NgjFPf8n0Qj 7yKrxuwKRGssDRX9Dviw1Si9hA3e8N+my/H9gcWYax95wXoJmyFBCq+Q9hTxVABsxjvEWJ d1FucaokbnFbbzRxkbh40QNn7XTBpllpZjGXL9ifwJWMrnP9TnV1AwMcgZQB8EUzHEoBxl hK/35l9NG+fcngzl63a4e7FNwrY72RnhW5j5mhFgONwh4BvEzl2czj7GzEoGqwl8yd65rm rcHzUdk57+2mOxkfxmSc8Za2ELhd5XPQEYu9KOgR8YsMaHJgQHHHhTZL5L2UVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zyz3242fLzD0q; Thu, 15 May 2025 18:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FIHo5v090230; Thu, 15 May 2025 18:17:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FIHoWf090227; Thu, 15 May 2025 18:17:50 GMT (envelope-from git) Date: Thu, 15 May 2025 18:17:50 GMT Message-Id: <202505151817.54FIHoWf090227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 072e0b158004 - stable/14 - iichid(4): Wait for RESET command response while attaching List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 072e0b158004a2cc7870e81ba482805f7f60b7c3 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=072e0b158004a2cc7870e81ba482805f7f60b7c3 commit 072e0b158004a2cc7870e81ba482805f7f60b7c3 Author: Vladimir Kondratyev AuthorDate: 2025-03-07 06:26:51 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-05-15 18:12:19 +0000 iichid(4): Wait for RESET command response while attaching before starting of children initialization to ensure that parent device is fully functional. Sponsored by: Future Crew LLC MFC after: 2 month Differential Revision: https://reviews.freebsd.org/D48958 (cherry picked from commit daa098cc37b9db36281623c00558976aea4fa90e) --- sys/dev/iicbus/iichid.c | 55 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 577b0952e107..0e4aa649ff48 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -98,6 +98,8 @@ enum { #define I2C_HID_POWER_ON 0x0 #define I2C_HID_POWER_OFF 0x1 +#define IICHID_RESET_TIMEOUT 5 /* seconds */ + /* * Since interrupt resource acquisition is not always possible (in case of GPIO * interrupts) iichid now supports a sampling_mode. @@ -156,6 +158,7 @@ enum iichid_powerstate_how { */ struct iichid_softc { device_t dev; + struct mtx mtx; bool probe_done; int probe_result; @@ -190,6 +193,7 @@ struct iichid_softc { bool open; /* iicbus lock */ bool suspend; /* iicbus lock */ bool power_on; /* iicbus lock */ + bool reset_acked; /* iichid mtx */ }; static device_probe_t iichid_probe; @@ -295,6 +299,12 @@ iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, { sc->addr, IIC_M_RD | IIC_M_NOSTART, le16toh(sc->desc.wMaxInputLength) - 2, sc->intr_buf }; actlen = 0; + if (!sc->reset_acked) { + mtx_lock(&sc->mtx); + sc->reset_acked = true; + wakeup(&sc->reset_acked); + mtx_unlock(&sc->mtx); + } #ifdef IICHID_SAMPLING } else if ((actlen <= 2 || actlen == 0xFFFF) && sc->sampling_rate_slow >= 0) { @@ -1136,21 +1146,9 @@ iichid_attach(device_t dev) device_printf(dev, "failed to power on: %d\n", error); return (ENXIO); } - /* - * Windows driver sleeps for 1ms between the SET_POWER and RESET - * commands. So we too as some devices may depend on this. - */ - pause("iichid", (hz + 999) / 1000); - - error = iichid_reset(sc); - if (error) { - device_printf(dev, "failed to reset hardware: %d\n", error); - error = ENXIO; - goto done; - } - sc->power_on = true; + mtx_init(&sc->mtx, device_get_nameunit(dev), NULL, MTX_DEF); sc->intr_bufsize = le16toh(sc->desc.wMaxInputLength) - 2; sc->intr_buf = malloc(sc->intr_bufsize, M_DEVBUF, M_WAITOK | M_ZERO); TASK_INIT(&sc->suspend_task, 0, iichid_suspend_task, sc); @@ -1209,12 +1207,40 @@ iichid_attach(device_t dev) &sc->sampling_hysteresis, 0, "number of missing samples before enabling of slow mode"); hid_add_dynamic_quirk(&sc->hw, HQ_IICHID_SAMPLING); +#endif /* IICHID_SAMPLING */ + + /* + * Windows driver sleeps for 1ms between the SET_POWER and RESET + * commands. So we too as some devices may depend on this. + */ + pause("iichid", (hz + 999) / 1000); + + error = iichid_reset(sc); + if (error) { + device_printf(dev, "failed to reset hardware: %d\n", error); + iichid_detach(dev); + error = ENXIO; + goto done; + } + /* Wait for RESET response */ +#ifdef IICHID_SAMPLING if (sc->sampling_rate_slow >= 0) { pause("iichid", (hz + 999) / 1000); (void)iichid_cmd_read(sc, sc->intr_buf, 0, NULL); - } + } else #endif /* IICHID_SAMPLING */ + { + mtx_lock(&sc->mtx); + if (!sc->reset_acked && !cold) { + error = mtx_sleep(&sc->reset_acked, &sc->mtx, 0, + "iichid_reset", hz * IICHID_RESET_TIMEOUT); + if (error != 0) + device_printf(sc->dev, + "Reset timeout expired\n"); + } + mtx_unlock(&sc->mtx); + } child = device_add_child(dev, "hidbus", -1); if (child == NULL) { @@ -1261,6 +1287,7 @@ iichid_detach(device_t dev) free(sc->dup_buf, M_DEVBUF); #endif free(sc->intr_buf, M_DEVBUF); + mtx_destroy(&sc->mtx); return (0); } From nobody Thu May 15 18:17:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zyz341Vgcz5wj43; Thu, 15 May 2025 18:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zyz335rk5z3Fby; Thu, 15 May 2025 18:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWFexlDfkdbCGQWUxobCzOAaYsEnSCHxamz5RvwNKsc=; b=UmZw4j01joGk8xeYEJ7L65XPyTXLVXIBoyC2VlDrsPpMcXO8zJY6EQWSqd2OhCvj+2SU8J VtbhsHpSzHDbu47v/DwcxshiBMQXOe6zVoD2g7nl46wpROj/xL9DLSwRzHFV69LN8BWiZ4 p/WD9hpkPoBwAwdrCNXoUKlJ+AHxECHiPdOBqSajH8MWkD0C8MwwB7w8V2kYW9TNzyoOSs BaIAcD//ITHaO4EDRhFbgL/A4XGXNR5v8959+5FE0gwzVetdH6oQDTmC7kCnX5yGLQlcCQ B5G9kUk+jPglr63sitxXoTngpJUf6ukHI3JwInd6NB63qafz7CLIVMyZcq/Ctw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWFexlDfkdbCGQWUxobCzOAaYsEnSCHxamz5RvwNKsc=; b=gCxbpjg/mS3s5R63z8LFd4SFN+PwCujyWsFy3a7leWAlxWe6Nl4N9/2GpPvI7Z0ZtuX2RI Hk8mrQTM6+uh6ludUB5X14TWFeP+zRqCqCLKg5qgrGoPvGw/cxDOqjQaPfmIbq/TwDCfOJ uFrCNiD2tp2CWAAmxkAUWmH2juy+k6/V9I3tzrLplqAaORobCTPtcpTFcSfJfsh80mFEfd TklLHkKxLmIbJ1aqOm/+K5z9C3CP/eKd+Jp7qJx75XtQfTl9mA8d+hL4CNjUHSJQYXS4vi DCgXWiGyrb2wl0XbqKVqkU1V4IvBDvmauiRvOQOiuNws9oy4htAQuythtTS2HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747333071; a=rsa-sha256; cv=none; b=cetBQez5PAjHkW5ByQvqSFAMDqctZPLMlOeiz8QP/BVetFNkDUGj/ZGc/W5I7aV8IszfK0 3a9yVANmCk+dvOIH3Sl8K1cLbMtk4rS2BiETnR81RfieFfa8RrzpFUCSa9GaGh9vGKN1+o c4o+/Lnpy3E3o8xb32kETNyfoCbQ1E3tMzJFtVBm0TYg3KbY1b3kipgexTjRvwZxWSKUn8 rDxfoLuFkQ6q0CdBkyCwpCnjXz+/HNJd3GRXrvCPxTB131LP3JGFIlzlbWgOzPMAoSy1FB gaqrM6pL3G0j9ieyzXbEfBoy1t6qS1BygojltN7EJQ439raGkpSkBMdE8Xajzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zyz335LnNzD8d; Thu, 15 May 2025 18:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FIHpUk090268; Thu, 15 May 2025 18:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FIHpsN090263; Thu, 15 May 2025 18:17:51 GMT (envelope-from git) Date: Thu, 15 May 2025 18:17:51 GMT Message-Id: <202505151817.54FIHpsN090263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 7798b72a9000 - stable/14 - iichid(4): Do not send packets read in interrupt handler to hidbus List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7798b72a90004cab0e6790060a18c00b87750341 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=7798b72a90004cab0e6790060a18c00b87750341 commit 7798b72a90004cab0e6790060a18c00b87750341 Author: Vladimir Kondratyev AuthorDate: 2025-04-28 21:39:28 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-05-15 18:13:41 +0000 iichid(4): Do not send packets read in interrupt handler to hidbus if no hidbus and hidbus clients were attached and opened by users. iichid(4) enables interrupts before hidbus is attached and sending packets to it at this time leads to panic at boot time. Fixes: daa098cc37b9 ("Wait for RESET command response while attaching") Tested by: dch PR: 286045 MFC with: daa098cc37b9 (cherry picked from commit 2abdb305bd0c105226f6a71a8d3dc89698c9ef6b) --- sys/dev/iicbus/iichid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 0e4aa649ff48..fc905ca48b7e 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -630,7 +630,7 @@ iichid_intr(void *context) error = iichid_cmd_read(sc, sc->intr_buf, sc->intr_bufsize, &actual); THREAD_NO_SLEEPING(); if (error == 0) { - if (sc->power_on) { + if (sc->power_on && sc->open) { if (actual != 0) sc->intr_handler(sc->intr_ctx, sc->intr_buf, actual); From nobody Thu May 15 18:17:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zyz360vfPz5wj4L; Thu, 15 May 2025 18:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zyz346pGXz3FjX; Thu, 15 May 2025 18:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y7WVtsqVvKlO4562k4UeOnhXHsAM7VEN7Yav3VxwesM=; b=CHIEmqA5MbwUTMbhZ9SjWoxczCNl/NV+B1rqkl2BQav7m62SRR2s6/+OwImwyoFD1gA02o NI9Hg9G/zdeaSAQjMs3y8968fL8w4aiGtvEebdb8CaIjkaMdaJD6X0qp3/IDCwfN43HUtF gA3OF3gFYUhoGVOf/XYriyQTc6SBNEuiIxnmd6FXqSAiffPO7BhDMLSpBKX5ffzNmYPbI6 oC6kvpPWS23BRezBQtygtvA29BrvkW7aoycqC4BpOEqTEnytK+tMQyvndQcWfaARA21h1Q orpWc6Q8kBSDskdRIiiNW1a7cbgshVTWwm9pYT0HostIgtuiv2vwEDbxZHGA5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y7WVtsqVvKlO4562k4UeOnhXHsAM7VEN7Yav3VxwesM=; b=Is4S9N5r9U08WZC85qxAdPiLauBnmT7w+uCaRaAdBshVipQVSHs3triFUzrC68/YLJ0exh 38AM7+QFTaMUv58mqbMI07q9GheNHRDforj99/n9hx/1qtoRNqCQDEHDV1T+LhPIAQYuDs 1KmVNNLRzw6nS1hJhQ3EFFecySVvAR/0Ah3uy7MjDUgvsoqHN6yk7/oi4GU9c0KtOlnJy1 uH8vHk3yTiWKA/ullO5LUOECAnwMKELHwh04Y5rF2WW2qmbrFCCQw0E0+LZ40jCGpDjRRG U1avMK0J0fae31lxXfG7oJGvBDprKnn2fxetn4/fvjjYm3fZpzFqCRWGFbyyaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747333073; a=rsa-sha256; cv=none; b=b0ybo5kAJzlQMFcqyebj7zjuHHAUOUmX+qstvIQgu9NubZVA9A90lgU6DRN8pAqWTWKW+B zI0COofpcH1KSjYddFyZnD8bIxgf02edLvfwG8QDyrB2QdrTq+Hb6+WA7ybksIA3pmgkSH 1HUVOOvep0D1nkCJtlpXTqQLqK/WXmaqaTTGJjjkb5TKfcsylZVYpbfv3d9x+evzg7Br6L 5l71ILXFqSZ83fWENwKQmIlS78ZXhgEW1DMAjhhUdi1PXMFqAhyCV+BjwtAzWKGpw0tNtj LI6gB58SaZ+uulQWGDPOrnmHdz1tKP7qAsjGWpnDhWwVANIWtpkdybKggNsEAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zyz3468J2zDBm; Thu, 15 May 2025 18:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FIHqm2090311; Thu, 15 May 2025 18:17:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FIHqLu090309; Thu, 15 May 2025 18:17:52 GMT (envelope-from git) Date: Thu, 15 May 2025 18:17:52 GMT Message-Id: <202505151817.54FIHqLu090309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 718273db61a5 - stable/14 - rtlbtfw(8): Add Mercusys MA530 VID/PID for Realtek 8761BUV List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 718273db61a5d1888a266febf7f71718f76b5c51 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=718273db61a5d1888a266febf7f71718f76b5c51 commit 718273db61a5d1888a266febf7f71718f76b5c51 Author: Vladimir Kondratyev AuthorDate: 2025-04-29 20:28:53 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-05-15 18:14:00 +0000 rtlbtfw(8): Add Mercusys MA530 VID/PID for Realtek 8761BUV Tested by: Yusuf Yaman PR: 286369 MFC after: 1 week (cherry picked from commit 7a7ab347fc6535a8c91d458dda76a61019163869) --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c | 1 + usr.sbin/bluetooth/rtlbtfw/main.c | 1 + usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c index b9fbc1c12a29..c3fb98b46e6a 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c @@ -127,6 +127,7 @@ const STRUCT_USB_HOST_ID ubt_rtl_devs[] = { USB_VPI(0x2ff8, 0xb011, 0) }, /* Realtek 8761BUV Bluetooth devices */ + { USB_VPI(0x2c4e, 0x0115, 0) }, { USB_VPI(0x2357, 0x0604, 0) }, { USB_VPI(0x0b05, 0x190e, 0) }, { USB_VPI(0x2550, 0x8761, 0) }, diff --git a/usr.sbin/bluetooth/rtlbtfw/main.c b/usr.sbin/bluetooth/rtlbtfw/main.c index 029c04f98b26..e0445726c3a2 100644 --- a/usr.sbin/bluetooth/rtlbtfw/main.c +++ b/usr.sbin/bluetooth/rtlbtfw/main.c @@ -112,6 +112,7 @@ static struct rtlbt_devid rtlbt_list[] = { { .vendor_id = 0x2ff8, .product_id = 0xb011 }, /* Realtek 8761BUV Bluetooth devices */ + { .vendor_id = 0x2c4e, .product_id = 0x0115 }, { .vendor_id = 0x2357, .product_id = 0x0604 }, { .vendor_id = 0x0b05, .product_id = 0x190e }, { .vendor_id = 0x2550, .product_id = 0x8761 }, diff --git a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf index d544913aaa12..d45ba0bd92c4 100644 --- a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf +++ b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf @@ -213,6 +213,14 @@ notify 100 { }; # Realtek 8761BUV Bluetooth devices +notify 100 { + match "system" "USB"; + match "subsystem" "DEVICE"; + match "type" "ATTACH"; + match "vendor" "0x2c4e"; + match "product" "0x0115"; + action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware"; +}; notify 100 { match "system" "USB"; match "subsystem" "DEVICE"; From nobody Thu May 15 18:17:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zyz363dDyz5wjGn; Thu, 15 May 2025 18:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zyz361551z3Fjc; Thu, 15 May 2025 18:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7kn6vU4PyIjQGtNBXOmzFblQ0+y5hA8o2Wl6vm+rmqU=; b=hiDFHEoWnc9Aa/1CIFYnKwM+mLs2ed/nCHESRUsx72wqqDsn7zsBW85VxhPPHSicNGKccY 9pzvbls3sQJwvGfFIJUvV45kYz0Ul1h5F+os71kRvVuSqY0rrgQHJMWmpQYD2dSx1k/E5v /NrkEhr0QduHy+X2J3aAH2QFjxTBoqDc/qNWSuMFuiVxiK3hvhMbNhWTwutLvKv3Xuh4fW EHWe9nELotmwMyuRmLjHEs6beENLVbBfk9leUVnaTc1oChbb8PO0Wqukz+iSGxbuw7o77p FGbW3xKAasl9OvZeFCTei8SXAZpoNO32YwY2w3NFU+RkR4180VS179ss3RPxiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7kn6vU4PyIjQGtNBXOmzFblQ0+y5hA8o2Wl6vm+rmqU=; b=TGxYPN/CE9BD7W1wCT6drFtuqQQV9B7Ak0nxi+EoS49T6bp55M1ZkWc/L5GwnZXFOM6nmv GGKdDTC81vbstsjDoo0IWq8Jj1P3vdzeD8zqplX+mNp1ETfRn8ii/bT8RIKSkXcaeJAR0x vU2yZJUy1B9npZFCACnzLmRe/7uDq4suCltMDUjWudwIQKCbJfWsQXQQF9U6sGPsClO9RG pvTvdYxRIUHtp0pNSAoKP18Fx5crEcttObez5gjNSVI9otW6QFagBsHRd70RW0L9DKrPIP 2cFalEwoRJfs+eTXX7ZLhOCjHL3OJN78n0YRo0ukic+QMqhxJyrbDVURkfpowA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747333074; a=rsa-sha256; cv=none; b=nev8AnJOvUbayTnnC6m3DOGp5HfX/9nqSYp2SurSdv7DortPbifxjK99NVbMXOkIEhqW6x MkP9OxkuGx3FTPsInrSk+e4W6dqv3cQj9QSVDX93HsgI8kO0NAc6Tzj3uuGl6Tz7Qbbvry zdbOOlmYalBp9L4f8pZ0Omp5yUahc5OaAlhqx8npkDn9T4EOqQfTqgZzI4agu01LUReUBT UZ2Zp3NVhEnX4gxdkAZfx3mBdSo+QaHfYdiiG/97eUQoDl0z0LAwuLC4gYrDK8T/KHhhNE T64T9sYUMLJ58CSuLlx0p5Q7fA3gerpo2YQvmhj54Nf+I6lonxkmfT/pRDv0Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zyz360dHDzD7H; Thu, 15 May 2025 18:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FIHruC090346; Thu, 15 May 2025 18:17:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FIHrad090343; Thu, 15 May 2025 18:17:53 GMT (envelope-from git) Date: Thu, 15 May 2025 18:17:53 GMT Message-Id: <202505151817.54FIHrad090343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: d7837cac6f64 - stable/14 - rtlbtfw(8): Fix incorrect chunk index overwrap in rtlbt_load_fwfile() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d7837cac6f64a7ed3682050f6401a2a7032fc6d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d7837cac6f64a7ed3682050f6401a2a7032fc6d9 commit d7837cac6f64a7ed3682050f6401a2a7032fc6d9 Author: Vladimir Kondratyev AuthorDate: 2025-04-29 20:28:53 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-05-15 18:14:18 +0000 rtlbtfw(8): Fix incorrect chunk index overwrap in rtlbt_load_fwfile() It prevented large (>256 chunks) firmwares from loading. Fixes: 5036d9652a57 ("rtlbtfw: Firmware loader for Realtek 87XX/88XX") Sponsored by: Future Crew, LLC MFC after: 1 week (cherry picked from commit a4fcbac5d891e3909474ffe7ed7064972a1a7577) --- usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c b/usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c index 493358294c07..21f2c3e2804f 100644 --- a/usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c +++ b/usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c @@ -189,19 +189,18 @@ rtlbt_load_fwfile(struct libusb_device_handle *hdl, uint8_t *data = fw->buf; int frag_num = fw->len / RTLBT_MAX_CMD_DATA_LEN + 1; int frag_len = RTLBT_MAX_CMD_DATA_LEN; - int i; + int i, j; int ret, transferred; - for (i = 0; i < frag_num; i++) { + for (i = 0, j = 0; i < frag_num; i++, j++) { rtlbt_debug("download fw (%d/%d)", i + 1, frag_num); memset(cmd_buf, 0, sizeof(cmd_buf)); cmd->opcode = htole16(0xfc20); - if (i > 0x7f) - dl_cmd->index = (i & 0x7f) + 1; - else - dl_cmd->index = i; + if (j > 0x7f) + j = 1; + dl_cmd->index = j; if (i == (frag_num - 1)) { dl_cmd->index |= 0x80; /* data end */ From nobody Thu May 15 19:14:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zz0Jf6b2dz5wmfB; Thu, 15 May 2025 19:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zz0Jf604fz3nm1; Thu, 15 May 2025 19:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747336482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3D+ctRixzVZ+OaRy8d9EEkkO2Qe9/xDr8iRqdPoTII=; b=tL1VizoHEc0zvQ3cV+X3K9rS4q+3Lo/m7vY98PuIfD9LKRdFOmst6RP/J2/UpMd/rizgpz Ogt7bSXnpYrUV4pdESC5OKpZG+uRBf5hfaO8kPD1hARiO4iay2Fc4HXCRyVwQ0GBifsrle 7eKCnwPves6PQIzyMKZHoOAcb4Txb1zwsZG48rqFJdePpBvjkb1M0mZF4dYiZXuvrdaBPl sceYFWtJG7yrR5jPXRsvDTvSeBjtDBzZpoCwX0Zci4pQjY9NOCbl6CalBKGKliBjviQDOj rBTBeTaKNJCaU/kKsKaqK26Wmj3xHMtBxD1dnaw1DL+5g38BgM5DD0r5G5yJYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747336482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3D+ctRixzVZ+OaRy8d9EEkkO2Qe9/xDr8iRqdPoTII=; b=Xk410di99ByCZJDJTwrSaRDLekdDr/oVP4HgpUhv24q8/YK0A3c0bU8easvYDdy3lQJEOm xH676mvD6XP4Mbdfb+Hun+khY1nQIOuvCH/7Rjw7je7j4hJkkuewWXeruMAfk3k1rh5BE6 YikgIJGzg9ELaw+OOoAdnZuybxfGHprmiEoYb8QQFOpFJlnwRTbunKCn2XOgLvveYTYwlD fQKN8uAMeMQ9S27Y1/7okgbijhpV3Vu9quVu5NDcZuigi2Un3v5q3X3t6azZfgvWlTIFsc 3/q1Ns6IDM71tXwrnyxfvwp8l+ak14fPLoHi0ZWVUjwj9Y/Jt2JBmTDEa2zQCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747336482; a=rsa-sha256; cv=none; b=Zs+Ja0pGr9mBOd/7a+0E/BrkuJ6RJAfqJooDAok9XF01Ml5k/HY6h/JK0/5fP4k8mRBfQP oLHOPiIJaJ0X2uADKYkUQDLETUTgxf/hV3yIqws+vnBQWlV7/r6VexbSu57HdWk6p4l/Ab SEihMtPVOXGMoqYneWWoEln/NjlgBAanB50hVR+7sfXZ+B8oMGPXeMJbxYA8mLZN+lrEeK fdmxmN1BjOKVH+PGeaGoRyJdGIshL2VSAELmXXFTEYxC2OYXuwS8dTPvt65gLykTteWx0b NppcgLUqZ8dB5ELXhT7zJlaDjI7nmhCqIwIctf1iHynOna7MZfkNRnPv9nFvKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zz0Jf5QHkzWHF; Thu, 15 May 2025 19:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FJEgJ4002677; Thu, 15 May 2025 19:14:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FJEg2s002674; Thu, 15 May 2025 19:14:42 GMT (envelope-from git) Date: Thu, 15 May 2025 19:14:42 GMT Message-Id: <202505151914.54FJEg2s002674@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 36174c38f9e3 - releng/14.3 - LinuxKPI: 802.11: make sure AUTH frames are not being sent if BSS changed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 36174c38f9e3433e7fdb8b2f2923499dff67b2e7 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=36174c38f9e3433e7fdb8b2f2923499dff67b2e7 commit 36174c38f9e3433e7fdb8b2f2923499dff67b2e7 Author: Bjoern A. Zeeb AuthorDate: 2025-05-12 15:12:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-15 19:13:58 +0000 LinuxKPI: 802.11: make sure AUTH frames are not being sent if BSS changed iwlwifi keeps logging 'Invalid TXQ id' even after previous changes to catch the BSS changed. The reason for this is that we do not error in the SCAN -> AUTH path as otherwise we would not have the state machine get us back to SCAN to clear up firmware state before auth/assoc to the new BSS. If we are not in synch as net80211 just swapped the iv_bss from under us, disable the TX queue for the (old) lsta to prevent the AUTH frame sent from sta_newstate() reaching the driver. After all we are not trying to authenticate to that node (sta) anymore. Sponsored by: The FreeBSD Foundation PR: 274382 Approved by: re (cperciva) (cherry picked from commit 16d987fe781780100a31df30b9edd79ebb54f957) (cherry picked from commit e0692e7bb6e8abcc55a2510dceea5f83e823a827) --- sys/compat/linuxkpi/common/src/linux_80211.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index fb9a4bc0177b..82eaa64790b4 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2021,6 +2021,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int struct ieee80211_prep_tx_info prep_tx_info; uint32_t changed; int error; + bool synched; /* * In here we use vap->iv_bss until lvif->lvif_bss is set. @@ -2211,14 +2212,6 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int __func__, ni, ni->ni_drv_data)); lsta = ni->ni_drv_data; - /* - * Make sure in case the sta did not change and we re-add it, - * that we can tx again. - */ - LKPI_80211_LSTA_TXQ_LOCK(lsta); - lsta->txq_ready = true; - LKPI_80211_LSTA_TXQ_UNLOCK(lsta); - /* Insert the [l]sta into the list of known stations. */ list_add_tail(&lsta->lsta_list, &lvif->lsta_list); @@ -2292,10 +2285,10 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int ieee80211_ref_node(lsta->ni); lvif->lvif_bss = lsta; if (lsta->ni == vap->iv_bss) { - lvif->lvif_bss_synched = true; + lvif->lvif_bss_synched = synched = true; } else { /* Set to un-synched no matter what. */ - lvif->lvif_bss_synched = false; + lvif->lvif_bss_synched = synched = false; /* * We do not error as someone has to take us down. * If we are followed by a 2nd, new net80211::join1() going to @@ -2305,9 +2298,20 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int * to net80211 as we never used the node beyond alloc()/free() * and we do not hold an extra reference for that anymore given * ni : lsta == 1:1. + * Problem is if we do not error a MGMT/AUTH frame will be + * sent from net80211::sta_newstate(); disable lsta queue below. */ } LKPI_80211_LVIF_UNLOCK(lvif); + /* + * Make sure in case the sta did not change and we re-added it, + * that we can tx again but only if the vif/iv_bss are in sync. + * Otherwise this should prevent the MGMT/AUTH frame from being + * sent triggering a warning in iwlwifi. + */ + LKPI_80211_LSTA_TXQ_LOCK(lsta); + lsta->txq_ready = synched; + LKPI_80211_LSTA_TXQ_UNLOCK(lsta); goto out_relocked; out: From nobody Thu May 15 22:23:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zz4V365bMz5x1tT; Thu, 15 May 2025 22:23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zz4V345q1z3ngQ; Thu, 15 May 2025 22:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747347787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Db6I9U5Qn5EiQ/VLQgPnq1qjA3TcZe3yjtyaC3C368=; b=oseieELhFy0jGe9WpQHtgcGT96cOT5XabX9mRhMF4FZ1Fkv8QsBhyQp75VuiBypeGKhgsk ILjBMKqprhdo3PQjHZ5Z8GdolwRuSocB54TOcmSlDq7gIey9L4A4iSpwYLqEoNsSObORo+ 6sPKDnykm4GDemO9AnaOAtku2R7b2mzwUOukfHpII53vy06T4cELs1zhpAQKWAhJfaMt8y 0FJ7HW35PfKSvRSy4iq5IvSvf6I90+UWZk2wVYSLJVAEOayqYuneqqTJLHX/zXwEFm+0u7 dgOqp/FopQVw1ZWx6ENCqn+2vFX+Av4zCNmtXGZ7N06MSJW0U3Huc9jGnNJlaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747347787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Db6I9U5Qn5EiQ/VLQgPnq1qjA3TcZe3yjtyaC3C368=; b=PCw/AVhVqx81T2UkkjHxoeuV+fv0sYelTyVwzMt1itCvbCcvkajGtudMHnA7W04WIJ3Qz6 lJQBEZHFSmDF6I3asBQI8lVgjbPXxkQ5/NFb0vBMmIeOnVJjfhqVI3VDcixrorJa69HKR8 WPQycG3pr5VG00wM+HKeB2eci+Ph31BO1UwrIkE1JRdZSp7XvIVF8nxj49hw9cT/AHP303 0A42eX0X9RnMvaCSIz/KKYbqhMFhOPVNvarCxuESGOUWmFrrrOwu5eKfQXw0Y1iil83DzI j+pHWCZ6zVc+KWBBkwZe4VfgsUNvEInzgWDcQuMhPVvugv2C6gV4YN+UWPD67g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747347787; a=rsa-sha256; cv=none; b=uIik293jW/4DPb9apU/B1DUpx/ENxsMRb5thu13GPhv49gWO4uzCCCTVQzrtAKYOjxxIyr GQVmTtrYeBSEvmXico4Y1CLqeBcXBwHc0y7AFP6CPqrk/p5bP+xS/MlGOmLzX17yId5CKs CwbMmQb2UMvV+XxlXje6gJlHpFDF6g9gm3yZeF5q380V+KyG40QjG/ey7FKExH3Lnp3y6n 0dI5/cgT0iPKpYT2rWIXTkGbvp9zzM47sRDmS4n1oB2N0wfzic65/DyaBh+bay6+EaOyPo J0R6SSCEIjz1pcTIcMi1xZmzin6tLNV78T5hjEl/1UbQLavOLeDBExakSxj28A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zz4V32vzTzd9G; Thu, 15 May 2025 22:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FMN7Bp059492; Thu, 15 May 2025 22:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FMN7Zs059488; Thu, 15 May 2025 22:23:07 GMT (envelope-from git) Date: Thu, 15 May 2025 22:23:07 GMT Message-Id: <202505152223.54FMN7Zs059488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 29d6968fd36d - releng/14.3 - EC2: Remove old broken_txfifo workaround List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 29d6968fd36d27b27f953d5c00f9763491b10734 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=29d6968fd36d27b27f953d5c00f9763491b10734 commit 29d6968fd36d27b27f953d5c00f9763491b10734 Author: Colin Percival AuthorDate: 2025-05-14 23:36:26 +0000 Commit: Colin Percival CommitDate: 2025-05-15 22:22:44 +0000 EC2: Remove old broken_txfifo workaround Early versions of Xen, including those used in the early days of EC2, had a bug in their UART emulation whereby the TX FIFO wouldn't send the expected interrupt when emptying; as a result, FreeBSD would write 16 characters to the serial console and then stop because we thought the FIFO was forever full. In 2013 (1c60b24baa50) I added a loader tunable "hw.broken_txfifo" which spinwaits for the FIFO TX rather than relying on the interrupt, and enabled this in loader.conf in EC2 images. A decade later, this workaround is almost certainly no longer needed in EC2 -- most instances don't run Xen, and the bug was long since fixed in Xen anyway -- but we've been holding on to the workaround "just in case". Unfortunately, the spinwait behaviour is causing latency spikes and triggering warnings from the ena(4) driver. This commit removes the hw.broken_txfifo setting from loader.conf in EC2 images, but leaves the loader tunable and associated code, since it has been necessary in some other environments. (It seems that the TX FIFO missing-interrupts bug has been independently written at least three times!) Approved by: re (cperciva) MFC after: 1 minute Sponsored by: Amazon (cherry picked from commit 9a685c09f06a55b18589d75f9307563d84a17fa9) (cherry picked from commit eadda156a50d3487ec1e6fc78f6cfe2df42448fa) --- release/tools/ec2.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 1116faed4e9c..bac8bb0d0e67 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -58,11 +58,6 @@ ec2_common() { # screenshot") which was introduced in 2016. echo 'boot_multicons="YES"' >> ${DESTDIR}/boot/loader.conf - # Some older EC2 hardware used a version of Xen with a bug in its - # emulated serial port. It is not clear if EC2 still has any such - # nodes, but apply the workaround just in case. - echo 'hw.broken_txfifo="1"' >> ${DESTDIR}/boot/loader.conf - # Graviton 1 through Graviton 4 have a bug in their ACPI where they # mark the PL061's pins as needing to be configured in PullUp mode # (in fact the PL061 has no pullup/pulldown resistors). Graviton 1 From nobody Fri May 16 00:00:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zz6f54wJ1z5vfy8; Fri, 16 May 2025 00:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zz6f513fSz46Bm; Fri, 16 May 2025 00:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747353613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3KZWSAwXdkwJA58IZswkwVgYUdfy5by5Q8nidE3B2Y=; b=EC8Oq9nTfpaEQ2BmbmYxo123vq2AfnsUCM7FdHIcDmrlqPG05E+27VGilIwwrUKMsoCrmx GtGsLJLMALKSwbmtXWzmY7hpPHD8hBn2Q8f4tL+wyJpvMZ4MlLOMwDyMQqsYjY0wKf790k RQC6QGf1v3tMJfPqllUe57QWikWFHhe136QMSPm9UcBY8DWPEXfDRkV63xigRKUU5D6Bsn PAnGikenCNYKPM0aBauqU7PGCgvxKt2cXDx2kGkHu6CD8YgBq03GplFoNcZEdZyvyA5cLt WUKKwCjOyaP/Wo7GNCDm9IK8bqgWwzOdjnqzbho7vP4JIdSMo4tUIWcFJEpuWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747353613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3KZWSAwXdkwJA58IZswkwVgYUdfy5by5Q8nidE3B2Y=; b=yn3eYVc2WyeT1SBHDmU0XaadcZPidAe9ONShbERUo/J0CLkJer+ehMBzf96k0chL24Kwqo MDkyX53qnxekoV/QK4UYLaFdqxedb+Gxwgh5uGnxtXySaTDnW6pWqTbQv9ehYhQtN5Ejtb XkD8jbfbPeruxgfml/+Fe/QOfzkSTgrbhPN9SM8KpTOVVmMDosIjKnsFewhpNLnNlF6m34 yRG1U3h90NaJ91wDck7mESelhZm6tLxth50gJDptpCqIm03tLdZY7XQfsPEvfviZqoRcsg rWJa0xIMQFhe0ig03aOcXhmpa4TH7RZD9hbkCrZODlZo+nQHodTOtFDi+TOpTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747353613; a=rsa-sha256; cv=none; b=Ka+yNGBQnX9fM4keRxXQOs8yDvUdrDqVX3Z+VJ74xqzNAFKj2XLNCB++OPA3Vzvy88G7/L /ieQMhIvVLAoUD48olPvI29GX3UGHWmhN/Twec4P5lFitgB9x+DPqNVoo+Y6cVqKvBczyv LeqIc5KV6detZSgME7hz8a7dA8iTu7wT/lyE3BQXeCXxw+5F3lY7+1exxy+P0Ev5zhfwh1 /QECduBsh6sbPaM5q9YxGoZvWZkRXhfhEslT2knzfhJF6qmiSHJo7uVYG7fKKj8NnVCqvC keJmzvefoNozkvshitJ9RFAqaPfzFRACd/20WH1ZERN83KUbHqc5/F/lwlI/KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zz6f50bjkzgMX; Fri, 16 May 2025 00:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54G00Dvw036034; Fri, 16 May 2025 00:00:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54G00DmF036030; Fri, 16 May 2025 00:00:13 GMT (envelope-from git) Date: Fri, 16 May 2025 00:00:13 GMT Message-Id: <202505160000.54G00DmF036030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a2ebf641da89 - releng/14.3 - 14.3: Update to BETA3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: a2ebf641da897fd916d572aa0ee148b3b1960539 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a2ebf641da897fd916d572aa0ee148b3b1960539 commit a2ebf641da897fd916d572aa0ee148b3b1960539 Author: Colin Percival AuthorDate: 2025-05-16 00:00:00 +0000 Commit: Colin Percival CommitDate: 2025-05-16 00:00:00 +0000 14.3: Update to BETA3 Approved by: re (implicit) Sponsored by: Amazon --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 4f6e7e82a1b2..13c927f499dc 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.3" -BRANCH="BETA2" +BRANCH="BETA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Sat May 17 01:47:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zzmz839kMz5wh64; Sat, 17 May 2025 01:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zzmz82KZPz3H0H; Sat, 17 May 2025 01:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8mFzMo6ioGZjxVda5XKug40gP/mX8sFBf+g3Lq4bXmE=; b=aQRcI1dHITrdDK581ZBDWH9Z5gjxkteY0ibGozYjEBXMyUCbb/CTMZPOIZRxQ0a/4jlg5I MVVCcSeJ/nuNu8vmUAeKij9yu1Z0nrn1C12exd8F5FpS1NFIpEOrP8XMU6NbMGcEcQSOnx Issp/8C699q5tTyreaWOZhnRcRD6EbQAjvw/zBXvbwJdBb3NhjmIkBOAuA32XmE3DM8KSI fQoVJddqQVWdbjycg1HoW+bCjuEfxpIvacldE+tAKQY6BWWPSUOEsa22zv7sR0NPEWOpv2 En0SbBuMVbN8PoOBsuRvIKr4iMCn0EH2i41vQlq5bgDEpM4mHMOIAwdK70/caw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8mFzMo6ioGZjxVda5XKug40gP/mX8sFBf+g3Lq4bXmE=; b=wzAlPUZ1/O0/dVDppDIg3BSEHWaAN4IE4T3PSaHNLfE3v8I5Wi+eMI3HA4mqqt99QD1FNL Qu5lAp+7acstlb060280y5jr4ndfco9YczfpqrjgHumtMle2xTFPhSrR47pZawOrDDvrZH JRbWq95nllWwS2PX24VBldAju0IbW/D1OFx+2VneEBoGR8yBs+PgQCVghzRtF7/F9+qdGA qor7a+cbuk0uiqrziNysyaPsaqBdJ/8rnvDrMCvl8Qw3p0hUBAZiHPKrRdlCLvrsVA8YqF 3bdlBkYxfWMo/pFI+dc9zWI/75+VgxZUehEN+AQpK6UWhlJ1Ksjp8JCiUfZ54A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747446436; a=rsa-sha256; cv=none; b=AE7D5QkJsVITbHbg/fcmMfAj4Woa+8IpCh7H7Hd+cxurJOnHj+9teLxQHPBINpsCJRYHDL UDAUxDKLmeQsf2y6p2wvh0bp1W+gEydRAnirqJNQJgbcA9vCStjJOTwDcJ+zuhq9J1wESt Hkpzm3Vyu5wlFxgcZA2EXyxTHlLJ95JboQZ4Noc2KHA7bph/WeFjg1pWlqB9XtUIkMk3Z3 1LSm5xN5fN//IrzBT7Bcmb+jH8kBUQqshkCfye+XVgtx4dcV0iuzyb3D+SLZnRHv5032dC 8Ud2yvVfpNn22jhOnTQrCnzp6/y4VW44ZKGqkd1SgC0crHzVQN/MgH3uF94B1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zzmz81jVQzCNM; Sat, 17 May 2025 01:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54H1lGtt034240; Sat, 17 May 2025 01:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54H1lG4b034237; Sat, 17 May 2025 01:47:16 GMT (envelope-from git) Date: Sat, 17 May 2025 01:47:16 GMT Message-Id: <202505170147.54H1lG4b034237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 1343a5b616ec - stable/14 - arswitch.4: Improve title and add HARDWARE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1343a5b616ec4e11047c5024bb844e7275f84ddd Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1343a5b616ec4e11047c5024bb844e7275f84ddd commit 1343a5b616ec4e11047c5024bb844e7275f84ddd Author: Alexander Ziaee AuthorDate: 2025-05-12 01:37:17 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-17 01:37:18 +0000 arswitch.4: Improve title and add HARDWARE For visibility in apropos and inclusion in the hardware release notes. MFC after: 3 days Reviewed by: adrian (previous), mhorne Approved by: mhorne (cherry picked from commit 9692d5e15e9bd7e628b06d655522477ce8c5b6fe) --- share/man/man4/arswitch.4 | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/share/man/man4/arswitch.4 b/share/man/man4/arswitch.4 index 3ec7316ae6e7..5bcd6c6810ee 100644 --- a/share/man/man4/arswitch.4 +++ b/share/man/man4/arswitch.4 @@ -22,12 +22,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 8, 2023 +.Dd May 11, 2025 .Dt ARSWITCH 4 .Os .Sh NAME .Nm arswitch -.Nd driver for Atheros Fast Ethernet switch +.Nd Atheros AR8000 series Ethernet switch driver .Sh SYNOPSIS .Cd "device mdio" .Cd "device etherswitch" @@ -35,18 +35,8 @@ .Sh DESCRIPTION The .Nm -device driver provides a management interface to multiple Atheros -fast ethernet switch chips: -.Bl -tag -compact -width "AR8216" -.It AR8216 -Fast Ethernet Switch -.It AR8226 -.It AR8316 -Six-port Gigabit Ethernet Switch -.It AR8327 -Seven-port Gigabit Ethernet Switch -.El -.Pp +driver provides a management interface to Atheros AR8000 series Ethernet +switch controllers. The driver uses an .Xr mdio 4 or @@ -70,6 +60,23 @@ and are mutually exclusive. .Pp Setting the switch MAC address is not supported. +.Sh HARDWARE +The +.Nm +driver supports the following Ethernet switch controllers: +.Pp +.Bl -bullet -compact +.It +Atheros AR8327 Seven-port Gigabit Ethernet Switch +.It +Atheros AR8316 Six-port Gigabit Ethernet Switch +.It +Atheros AR8236 Six-port Fast Ethernet Switch +.It +Atheros AR8226 Six-port Fast Ethernet Switch +.It +Atheros AR8216 Six-port Fast Ethernet Switch +.El .Sh SEE ALSO .Xr etherswitch 4 , .Xr etherswitchcfg 8 From nobody Sat May 17 01:47:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zzmz96BN3z5wh1N; Sat, 17 May 2025 01:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zzmz94KLFz3HF7; Sat, 17 May 2025 01:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0o0ngu/EIKI+Z4YuHeywzJaP9DEO1eC12PfP9i9V6/4=; b=Y5ann2AAsn4oTTvhYFbacIxpbcJBCcx3HYCq/olgn7nwtqN5GKje3tZWaDOXX1FLSZ3SnK EzOEj9Ex2F9yeI8tzXv1Rnwlr5F2WMETGJ/gnVzvA7B1uCLesZTSbEQstp4Cd8JuhL1qfW 3lHiPY4HvUvZUoRkICXTP1Dl8CeRKZSMFQMPDcAiaNyK5UX5I+mjnIbShHIvi3UCeuu8z+ LuFyNcDRBbEO+mAP0mQ6eskAxgaN9T8Cq5pz99oj3foE/oAVwF49HTbFZgEl9HB+TKwTTk BEadFXKONEFZk9cQzudRieCWPXfU5nJAsFuYaR32ZEB4479OJZJObO+U/AfK1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0o0ngu/EIKI+Z4YuHeywzJaP9DEO1eC12PfP9i9V6/4=; b=iS4lMAe7sR9za4LwaSy6Gso5yuEPhEst8SGZhD8UQfSqzTqsOsve6kqMzd6NGDDD6tStYf Hn7Iye+s1FDPKslnLmXH4LuVe2mZFRk0KyFqDpfc1MMc8DDWv+W99Ak9SSUEZKqVvAv+YV 0zcmdHW9yVOvAWWzTnpDJrMGgU0PPpIk+7+6zi3pWTdPOvfrh23sVcAv9jKPLsK4Pj6JZN ge5XhXc7VuZp9vVtn0ydvLP1iyqtcCh9UguMQAn3y6LpqbnsM8N/KXlAD0nNhQbC08ITNR 2gP5UWD1I12dk7sDfZiiYbuly9z9hkxY4c7W4Dbj8DolqY5A9gbaKLG8Ps+5UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747446437; a=rsa-sha256; cv=none; b=ywCHWKm/NgQvvcvzM2nBVSUTNS8e+58os7zsx3rCuBdwWzaB954BevtN5mPusDOgweuZmj tnGEcqBG8IBPgJtd3sdBq8HMMUVWdGx1tXTCHMu+4x8tnHu/dXF2JaLSsFU6/vJJJ8irye 4tkEEyLb4M7zvgJw2MOiGOiVvI5St2Xjx2AGTpHLSjbRDTS5Tt7KnNV9D8zvDaIwuYM7gM 3eB8yfrFd2XIsTyBxBLUyK52jPmkBF/waT0CvGCIM2zqdoABNbk7qpjSaFAksnvYZxYdAT fRS3ssnYmz5KB0sD9NMGwraoSSsVa51tddLKKI90U8HtvVbB68V5OL7HNxel6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zzmz92fvszCNN; Sat, 17 May 2025 01:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54H1lHhv034279; Sat, 17 May 2025 01:47:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54H1lHN4034276; Sat, 17 May 2025 01:47:17 GMT (envelope-from git) Date: Sat, 17 May 2025 01:47:17 GMT Message-Id: <202505170147.54H1lHN4034276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 17e9eb1e0eb7 - stable/14 - ar40xx.4: Initial manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17e9eb1e0eb721e2400232c71f20bc490c416c60 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=17e9eb1e0eb721e2400232c71f20bc490c416c60 commit 17e9eb1e0eb721e2400232c71f20bc490c416c60 Author: Alexander Ziaee AuthorDate: 2025-05-12 02:22:59 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-17 01:41:34 +0000 ar40xx.4: Initial manual page For inclusion in apropos and the hardware release notes. While here, add xrefs to this page and the previous e6000sw in etherswitch.4. MFC after: 3 days (but adjusted for 14.3) Reported by: adrian Reviewed by: adrian, mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50324 (cherry picked from commit 91c9751c3913497db2fbad1fcf7491557bbd2a75) --- share/man/man4/etherswitch.4 | 8 ++++---- share/man/man4/man4.arm/Makefile | 1 + share/man/man4/man4.arm/ar40xx.4 | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/share/man/man4/etherswitch.4 b/share/man/man4/etherswitch.4 index aeb5e484e7cf..928d5a09e49a 100644 --- a/share/man/man4/etherswitch.4 +++ b/share/man/man4/etherswitch.4 @@ -48,12 +48,12 @@ driver provides a framework for Ethernet switch devices. device nodes .El .Sh SEE ALSO +.Xr adm6996fc 4 , +.Xr ar40xx 4 , .Xr arswitch 4 , -.Xr iicbus 4 , -.Xr ip17x 4 , -.Xr rtl8366rb 4 , +.Xr e6000sw 4 , .Xr e6060sw 4 , -.Xr adm6996fc 4 , +.Xr iicbus 4 , .Xr ksz8995ma 4 , .Xr ukswitch 4 , .Xr etherswitchcfg 8 diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile index e2a41559410b..36540f690c5e 100644 --- a/share/man/man4/man4.arm/Makefile +++ b/share/man/man4/man4.arm/Makefile @@ -1,5 +1,6 @@ MAN= \ + ar40xx.4 \ aw_gpio.4 \ aw_mmc.4 \ aw_rtc.4 \ diff --git a/share/man/man4/man4.arm/ar40xx.4 b/share/man/man4/man4.arm/ar40xx.4 new file mode 100644 index 000000000000..e314d30dd4c6 --- /dev/null +++ b/share/man/man4/man4.arm/ar40xx.4 @@ -0,0 +1,35 @@ +.\" +.\" Copyright (c) 2025 Alexander Ziaee +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 10, 2025 +.Dt AR40XX 4 arm +.Sh NAME +.Nm ar40xx_switch +.Nd Qualcomm IPQ4018/IPQ4019 Gigabit Ethernet switch driver +.Sh SYNOPSIS +.Cd device mdio +.Cd etherswitch +.Cd ar40xx_switch +.Sh DESCRIPTION +The +.Nm +driver supports the Gigabit Ethernet switch inside the +Qualcomm IPQ4018/IPQ4019 SoC. +.Sh HARDWARE +The +.Nm +driver supports the following Gigabit Ethernet switch controllers: +.Pp +.Bl -bullet -compact +.It +Qualcomm IPQ 4019 Five-port Gigabit Ethernet Switch +.It +Qualcomm IPQ 4018 Five-port Gigabit Ethernet Switch +.El +.Sh SEE ALSO +.Xr etherswitch 4 , +.Xr etherswitchcfg 8 +.Sh CAVEATS +This driver currently only supports L2 port/VLAN mapping modes. From nobody Sat May 17 01:47:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZzmzB5Syhz5whB9; Sat, 17 May 2025 01:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZzmzB3jZ4z3H0P; Sat, 17 May 2025 01:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cp4GsNqRcAeyXjkG2EYuNAAI7ZzGqLMPgDUutU0AiU0=; b=Z3sgaprTN62X2cn4ncgt0pDw44g8K8pzoNLxoJf8oScVkJprDtWqRGo+tKu78XVKTM2AvR soxzHft+jw5mms/Xw9ZjPJaYirIM1F72bSDL8iY3GBY9hh8uJhFUQfEWvsDQRsEalcONSf lkK1tlx4dzbt0Sw1j1G5uWm9UOR81aF76rGw61lmYdRmkLO0VzYlSoUA3LmcaK1JTyR3Oo m3rgE6RpETcDzn1OYsXrdBGgFhF4uoXPGNagJYqYJIoDopO/8GIxbndCycsJBcf0RfVvxR JikBaaSJIDAaNQJ61EN3n9Bot+4CzUeMcCY0vWc39CglgdZImNf2heMbk/Ejyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cp4GsNqRcAeyXjkG2EYuNAAI7ZzGqLMPgDUutU0AiU0=; b=oYfDqGcwgdVKqVRr1DVT/+Bc8a7ag+DMU1yNzv+8XsiVAuKVKp7UuoPPrWq5NDZQP9oheA /L+3lryzDy75YzW6M+L0edYK3r6rMSW/T8f+VdJsKiXMv7rGeXHk05fDQM8WKtb/0Xb9my UgsKkz7BNjpPQ7Y8ZiQ8B55f6OfCVPfnNwAkHfhh/5ylPJ2dDr/fl/u9T8dClVgpOmYsQF OQg9BFRcMUCAEaYYWYvMW5eCYgbHl26uEdJs3f3aOkCXmvGDh5YL6gv6dweSjARvYsJda6 /PfQ8hPN9+2SR4yTRzG6+t43Cwp/kt04nhpkh02kT+4Ira1o+YPI9/G0Jk25gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747446438; a=rsa-sha256; cv=none; b=fNQNMIUs81+vLAJzrKrfHek0us1nyNWNt9sc5TdY7r8FW2YppZWecFbBUmB2JBppPr7lSS 5LdoVc+dy7GbHy3MHD5jnryVa03vGnhdRDgSTK/BB0x8El0Ju9pNVgjW/oevDOVH1l/qw4 W72JXygtV2bjF/6oJS3qyVE3e2gcknuBMZu5uxs/T2EQnUje8ATSrmkFKocRUVxJEWKVfE uL/TrvriEi9GHCYLET1GY1xCb0b3NYEO5toOHxSC9RzkYuDwegp63cPM+AhC4EgH4HGu2i A8y0ejVMv1ASbH+q5/SS3jkKnH0yG8q4Gl03S6gMNz8di0bdVswE7rtVHwhgVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZzmzB3JdtzCNP; Sat, 17 May 2025 01:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54H1lITj034312; Sat, 17 May 2025 01:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54H1lIdi034309; Sat, 17 May 2025 01:47:18 GMT (envelope-from git) Date: Sat, 17 May 2025 01:47:18 GMT Message-Id: <202505170147.54H1lIdi034309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 5e0e046d95a9 - stable/14 - e6060sw.4: Improve title and add HARDWARE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e0e046d95a92aab8bea856fe0008870ee11bfc9 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=5e0e046d95a92aab8bea856fe0008870ee11bfc9 commit 5e0e046d95a92aab8bea856fe0008870ee11bfc9 Author: Alexander Ziaee AuthorDate: 2025-05-12 01:08:10 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-17 01:42:36 +0000 e6060sw.4: Improve title and add HARDWARE For visibility in apropos and inclusion in the hardware release notes. MFC after: 3 days Reviewed by: adrian, mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50321 (cherry picked from commit bef89c155e77dd471af596a43f3914b754cc5155) --- share/man/man4/e6060sw.4 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/share/man/man4/e6060sw.4 b/share/man/man4/e6060sw.4 index 407138abe378..74736f65fe80 100644 --- a/share/man/man4/e6060sw.4 +++ b/share/man/man4/e6060sw.4 @@ -23,12 +23,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 5, 2017 +.Dd May 10, 2025 .Dt E6060SW 4 .Os .Sh NAME .Nm e6060sw -.Nd driver for Marvell 88E6060 and 88E6065 fast ethernet switch chip +.Nd Marvell 88E6060/88E6063/88E6065 Fast Ethernet switch driver .Sh SYNOPSIS .Cd "device mdio" .Cd "device etherswitch" @@ -44,6 +44,19 @@ This driver use smi interface by ethernet interface. 88E6060 support is only port vlan. 88E6065 support is port and dot1q vlan. dot1q support group base tag/untag. +.Sh HARDWARE +The +.Nm +driver supports the following Fast Ethernet switch controllers: +.Pp +.Bl -bullet -compact +.It +Marvell 88E6060 +.It +Marvell 88E6063 +.It +Marvell 88E6065 +.El .Sh EXAMPLES Configure dot1q vlan on 88E6065 by etherswitchcfg command. .Pp From nobody Sat May 17 01:47:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZzmzD1LGjz5wh7x; Sat, 17 May 2025 01:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZzmzC53nJz3H7l; Sat, 17 May 2025 01:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xGrasUasnMXLw7nC3YMc2M5g2O1E6xk0xF41OyfYXGg=; b=TLDGVL/l5uTaKHuCVwx4wgysfOn+NbPw/JKbrNSvFKwtDrwJIbZ5F8Udzn9t9P+Ab8XH1U X4R8G8nxwdsKvO9P06HD0jCatV36X5rVW8mcWtY3b0oNTYDBGftVwIVqJsUjYQlzAoA1hI 8nlwfp+kM7NWL1fzboNRFMfdmKskyXdSvddHN0lE6k/B8vSRbc9qkx7KGQfT+22gmPMeUc 5iOmhajPhZdgHJ298xrvxje9tUwue/ScHL8GYDmlJuOYi+qVZVKOrThXBiVm6qY+lQ6GeP OEm/TV9A/BNomQMyEdoRAOrbZ3+jut8KVSVaOtHmYtlZQ8vSs+6a6M5Ya6WUwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xGrasUasnMXLw7nC3YMc2M5g2O1E6xk0xF41OyfYXGg=; b=nkwY9HGkxNNcNcyXdp+bG4cux6Sv1E1LeJ7ejdWXGbyNh8q1LCX8YGs6+UuWw7zTvAiJUG MBpn6wYCkGXSo6XrNpYzrYdFtH5HNZjZiwiU0UGwW07U5fwyYsh2V2Av8qzDE31lRIjM8s iX7wkCHfzNOpvK5U8vmiSEV3AgkSVEfJB+zGMpzw42SqHJnEhH3hTCjwaw06jP6mE9laSs cfAdv2Xwk/4I3fxGMhAp7B5b/uk/uoEzCSfLnders3YjQlp1N/R1nwoQTfesSaWwWcXEGx o8ljtNAOdZZk7q11eAZPRAEqYwgVaQ7VEh6ZjIqEae2Cp2YscBb/xPTY+NeaTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747446439; a=rsa-sha256; cv=none; b=IR0sOqwMQplxqcJzzqeIshKdW15WwsPhKJIm+tkXHcHetUMjsAqzYHD4Iz2KbvFF3dPZds cj/MQ4EbV2GcTbeKyR1HTQLCX7FbkaGUetQolPanwnQS1rP+PaZqWT5MuniInCZ6S5dFo4 zmRd+sBSaVaMnmv6zYDF+RKSQOIlXfcwVs2iSFTPMx5PdSy1YdZ+0o5DqMyvZE/UAAeKtW CJyHVLjVSHNWV1JPFCdHktGg+zai04zSfn92vN0CEyNoG6tdBD/GvqLaCRejQXlxitHISE 2Llhd3qlwLM15SX22+UHaqk+Ahc/xFuQIBGIOgQnKY9bLy/yocXeyf94vhjrkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZzmzC4W9qzCLD; Sat, 17 May 2025 01:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54H1lJvs034350; Sat, 17 May 2025 01:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54H1lJUg034347; Sat, 17 May 2025 01:47:19 GMT (envelope-from git) Date: Sat, 17 May 2025 01:47:19 GMT Message-Id: <202505170147.54H1lJUg034347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: d93d6cccc90e - stable/14 - build.7: Document pkgbase PKG_FORMAT variable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d93d6cccc90e4dc80c74e1b90a16358be62b0a8e Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=d93d6cccc90e4dc80c74e1b90a16358be62b0a8e commit d93d6cccc90e4dc80c74e1b90a16358be62b0a8e Author: Alexander Ziaee AuthorDate: 2025-05-12 20:54:14 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-17 01:43:19 +0000 build.7: Document pkgbase PKG_FORMAT variable MFC after: 3 days Reported by: emaste Reviewed by: emaste, mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50318 (cherry picked from commit dd3d1a7694583362f5915ff5f1d9cdee64e2fe3e) --- share/man/man7/build.7 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index a1da9dce4bec..9a90a6dffafb 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -633,6 +633,20 @@ If set, this variable supplies a list of additional directories relative to the root of the source tree to build as part of the .Cm cross-tools target. +.It Va PKG_FORMAT +Specify a package compression format when building +.Pa src +into +.Cm packages . +Default: +.Ql tzst . +Consider using +.Ql tar +to disable compression. +Accepted options are documented in the +.Fl f +description of +.Xr pkg-create 8 . .It Va PORTS_MODULES A list of ports with kernel modules that should be built and installed as part of the From nobody Sat May 17 01:47:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZzmzF0qBQz5whCy; Sat, 17 May 2025 01:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZzmzD5Yr1z3HFf; Sat, 17 May 2025 01:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Vesw6Bxcs4tBTpodHoTekfqgG6FOUKWEWbEZAPbXC4=; b=kWLM/uyIXiJp/rHQoFxrkI/09Ma69/wzKXbViqB9KnqGRpZaRd382WeTBSMWYIgG6bAfPj ujLsFXy+7t4s9ngECxv2WLkAPPx1+0GRUzuuHpoARZYiubFOh3FaHWLi6sBfN2iysoVCqE PL+Dv2FOrZ/GGaiFjWyDw9SmfYZ/LsuWeZmbYfMuG5xynxZe7F+MB3UgKjoEc6cGxCQETB oFUnqOSdhYysjVEVQc2R5+azq112RkLzE8P55GYIQefZECXv+bxY/2aM1JjmHFQhgXFVC4 DE4JzT59l30ORkTJWMNMVhAiW602a/Z4nU7wfoG/B7teno1aVjmd8D7PypgbeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Vesw6Bxcs4tBTpodHoTekfqgG6FOUKWEWbEZAPbXC4=; b=c7OR8X0jjMiYJYc1WeXH1LTWNzGwRrHcR6YIP0mgQtqIrbVDoYe6u6FXRvw+KqvlKvnpEL lBt1JFX9fqNZvycW5ddH0j4X4VFrRLdp0/RD1eMkrYYduc0yUWggbvdSarEZHWR8uQ9G4C 0Y1tWxMrIvROy1o3p9KcSOp61BCVx56gU7493+Zi4dWu1+l0ZHnZd0sBm2+kySh65/D6jy R+SdOwGpYpavh9WY++PYjComxl/SN7H+8ahTxMFei/Ip+/XxI3/H3StJ4hSrAthC96g/cv +IR+8gflyT3jgf8ccpQ/vMLGEBEfWpMUPpspAgsD5Ap39Oz9UjHZa2CIFfctoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747446440; a=rsa-sha256; cv=none; b=LXkQE944ADwf0e61o/wigbJwuJjkU1eM8vcwA9QBe3MhbunsveW2BTHvRmVMMKKy2++JtP pbKbB/suT0hkc0OBI7sMY+HPu/6T9mtfmaf4hUuI3Hw0zSscsSYzCs3p1t3t1AS1LBQPct RCFvWGhj8GwzOLKVoOaEyQih/cmONJVBp8ajeGPu8e7dJl9xkNIRbnXMUQgDt0tBhEYgiR mq9B52JYrJc+9LDdcbhf04qVd+ady+wXgzQGUVZXbe18UHtqUMQ/L7lWxQH0JNa4+b4TpF hQ+V66cU61Y3scEwr37tYbhtfgLkDwNPkTGMig30km8BVBx+Id4jDOkbQTtX3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZzmzD56K6zCNQ; Sat, 17 May 2025 01:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54H1lKPw034383; Sat, 17 May 2025 01:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54H1lKgQ034380; Sat, 17 May 2025 01:47:20 GMT (envelope-from git) Date: Sat, 17 May 2025 01:47:20 GMT Message-Id: <202505170147.54H1lKgQ034380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: f526783367f9 - stable/14 - UPDATING: Strengthen recommendations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f526783367f9ffe00acf40d8a6ec56662cfbf323 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=f526783367f9ffe00acf40d8a6ec56662cfbf323 commit f526783367f9ffe00acf40d8a6ec56662cfbf323 Author: Alexander Ziaee AuthorDate: 2025-05-03 22:43:10 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-17 01:43:59 +0000 UPDATING: Strengthen recommendations Strengthen recommendations for ports_modules by adding a separate note. Use the unused [2] to add a note about creating backups. MFC after: 3 days Reviewed by: brooks, mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50126 (cherry picked from commit ca9131b729757959cb0fd4721603466284cfc6fe) --- UPDATING | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/UPDATING b/UPDATING index 3227b70ac69c..c19d5db50b7c 100644 --- a/UPDATING +++ b/UPDATING @@ -1985,10 +1985,11 @@ COMMON ITEMS: # Note: sometimes if you are running current you gotta do more than # is listed here if you are upgrading from a really old current. - + [2] make buildworld + [1] make buildkernel KERNCONF=YOUR_KERNEL_HERE - make installkernel KERNCONF=YOUR_KERNEL_HERE [1] + make installkernel KERNCONF=YOUR_KERNEL_HERE [3] etcupdate -p [5] make installworld @@ -2022,10 +2023,11 @@ COMMON ITEMS: To upgrade in-place from stable to current ---------------------------------------------- - + [2] make buildworld [9] + [1] make buildkernel KERNCONF=YOUR_KERNEL_HERE [8] - make installkernel KERNCONF=YOUR_KERNEL_HERE [1] + make installkernel KERNCONF=YOUR_KERNEL_HERE [3] etcupdate -p [5] make installworld @@ -2058,6 +2060,11 @@ FOOTNOTES: and effective, eg: PORTS_MODULES+=graphics/drm-kmod graphics/nvidia-drm-kmod + [2] To make complete dumps on zfs(4), use bectl(8), which + creates bootable snapshots of configurable depth that are + selectable via the bootloader. For ufs(4), use dump(8) and + restore(8). + [3] From the bootblocks, boot -s, and then do fsck -p mount -u / From nobody Sat May 17 01:47:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZzmzG2FkYz5wh1S; Sat, 17 May 2025 01:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZzmzF6qCXz3HRD; Sat, 17 May 2025 01:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMgJE5fTxizs1hVf4xrPIx1hQ5L7GONveJ0EGLAB84U=; b=R+/JCClp2UCOhqSIziWYs9JaoUsuOketAs1EWLDbowuMFmkBSC92zPHy37tY1gstgfWsS8 KzNtlevrfZlwQxAgDVudOeej5QRZ3eG2wCtqLw7t0iR0ZlaAI4lzWNqYWESFULALTm2rAv Aa+cjrrusXgQHg6NL3Wdq8VAuUPBhGq89YUMeoTsQ08vMW8TbxdPJJ/+ZxAaoZxFBBbn5k Plq66yuXTDtnTklmd25AUl6xeTRi738MwgUbGJcDKXgHNNkBYaa6sXsJce7mdW5OUuYSMr g6bD+ctduoureq3i8u9OPH1gYn6n2ezcanSZwWBA1gIRnCPNxbvUn1n6MTrJLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMgJE5fTxizs1hVf4xrPIx1hQ5L7GONveJ0EGLAB84U=; b=TBwJ0vG7xqY6iFStrIdu+YPKbtzjFahDm2sBXAE2K+HAOxZYmB8VxlIIyUHPG7t8oFR0yo OuMxu7aWrO4Qzg/KNd30oGtMGNz1g8xNEaopsOtVkuHpAm3L5rSjTLsjqA4IX3lzLQqMJ7 NqyvL0XhzLaBv4w/IibkIpfbmElsA8Jlnk1QEIdD0LlOwTmMOsPP9VHluOAROWNtyr/QQd JAqM8NneD+/qE6U4cdtrlMX/EC3F1dyuMgzknv8p/ThbxfNDmf91BXy93WlgfJdO8Xz8UW aVYE3XI1ZbVHZ/vu5J3B/BgiGGms6mluSDTnDIeAFAEBCJ3TfASCUuMWljQ7OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747446442; a=rsa-sha256; cv=none; b=W2S2xVPanavuefbSDnBQgN2nSi0+j7t4/d3Qyed0545QguunKLbnd4v+QtACGeB3TRPdXk 2r4fkOI2N6bVzwQuzhzC1YkmDMTXSFjRMcSojK6+ux4u04euxXWeetORlYR8iSuVdFzU/X XZYYn1g6+eYzrtQqhLiN+qmorTwp1t9H6KzvFdaX/pnWVbU73scRDywmxOPnn4bECsAmlo UTNtVMbcaNLIWmW+0EgxHWhp0dY21k0J6QcOSS3dmZlsHn2NXgXe7TONhoqp6QKq8EWTD4 fOAnb24bKq0H1TT3ROwjWHZlFrqhdQM7dGlNXKa1N7vn6iiKB0UEOS/LyXqYFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZzmzF6Lb1zCcS; Sat, 17 May 2025 01:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54H1lLir034417; Sat, 17 May 2025 01:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54H1lLId034414; Sat, 17 May 2025 01:47:21 GMT (envelope-from git) Date: Sat, 17 May 2025 01:47:21 GMT Message-Id: <202505170147.54H1lLId034414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 64a8c1930b8b - stable/14 - style: Recomend SPDX licenses List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 64a8c1930b8b74d05736bd9c022d5943343efd43 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=64a8c1930b8b74d05736bd9c022d5943343efd43 commit 64a8c1930b8b74d05736bd9c022d5943343efd43 Author: Alexander Ziaee AuthorDate: 2025-02-25 03:48:12 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-17 01:45:56 +0000 style: Recomend SPDX licenses While here, take this opportunity to update the copyright and clean some mdoc errors. MFC after: 3 days Reviewed by: carlavilla, mhorne, imp Approved by: imp (srcmgr) Approved by: carlavilla, mhorne (mentors) Differential Revision: https://reviews.freebsd.org/D49051 (cherry picked from commit b3de609802104234dca7449fc2b4f4106098d41b) --- share/man/man9/style.9 | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 59f0ff8b5c88..5542a9685c46 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -1,5 +1,5 @@ -.\"- -.\" Copyright (c) 1995-2022 The FreeBSD Project +.\" +.\" Copyright (c) 1995-2025 The FreeBSD Project .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,12 +22,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 13, 2024 +.Dd February 18, 2025 .Dt STYLE 9 .Os .Sh NAME .Nm style -.Nd "kernel source file style guide" +.Nd kernel source file style guide .Sh DESCRIPTION This file specifies the preferred style for kernel source files in the .Fx @@ -59,34 +59,24 @@ is silent on an issue. * them so they look like real paragraphs. */ .Ed +.Pp C++ comments may be used in C and C++ code. Single-line comments should be consistently either C or C++ within a file. Multi-line comments should also be consistently either C or C++, but may differ from single-line comments. .Pp -The copyright header should be a multi-line comment, with the first -line of the comment having a dash after the star like so: +The copyright header should be a multi-line comment like so: .Bd -literal -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 1984-2025 John Q. Public * - * Long, boring license goes here, but trimmed for brevity + * SPDX-License-Identifier: BSD-2-Clause */ .Ed .Pp -An automatic script collects license information from the tree for -all comments that start in the first column with -.Dq Li "/*-" . -If you desire to flag -.Xr indent 1 -to not reformat a comment that starts in the first column which is not a -license or copyright notice, change the dash to a star for those -comments. Comments starting in columns other than the first are never considered license statements. -Use the appropriate SPDX-License-Identifier line before the copyright. +Write the copyright lines before the appropriate SPDX-License-Identifier. If the copyright assertion contains the phrase .Dq Li "All Rights Reserved" that should be on the same line as the word @@ -132,11 +122,11 @@ Only add in front of foreign VCS IDs if the file is renamed. Add .Dq Li "From: " -and FreeBSD git hash with full path name if the file was derived -from another FreeBSD file and include relevant copyright info -from the original file. -.Bd -literal -.Ed +and the +.Fx +git hash with full path name if the file was derived from another +.Fx +file and include relevant copyright info from the original file. .Pp Leave one blank line before the header files. .Pp @@ -923,7 +913,8 @@ When using branch prediction hints, atypical error conditions should use (document the exceptions). Operations that almost always succeed use .Fn __predict_true . -Only use the annotation for the entire if statement, rather than individual clauses. +Only use the annotation for the entire if statement, +rather than individual clauses. Do not add these annotations without empirical evidence of the likelihood of the branch. .Sh FILES From nobody Sat May 17 01:47:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZzmzH2PdQz5whD2; Sat, 17 May 2025 01:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZzmzH0sNNz3HXD; Sat, 17 May 2025 01:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/jWKOLPX0Ilu2ah3bRYQxS05yhMtQyT9cx4j7QqUQo=; b=dBvrM+0gGVcsh5ugqxp848A1gdKxXFYPJD4SGf/mXoNxYep6QaPtfopPsicdVk4hYqUUpl M+3199zaCy3ytNdicU/AKYQgjvnH4s8a5zidXYON+E4LqSUmMr2shBD17/mLvDdkHGcyuG epzeLO3ES/dSyc6+aFgTE7oCAsvyx731X+tmRS4E7VsBzHqjnm7Ost3KABmNR964KRVWFC JBis9rZL71gBMjvBDHSY4yLVL/rW07oHf/6BGXsGmL0JaRUHDom3MRCk9R+kvMALK6iz/9 qFpck5h7co2vRVTJ0yJhWVXxNMzTd7Za7Ed4p584AV6p+ejQ0hZEkH+GiU+xNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747446443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/jWKOLPX0Ilu2ah3bRYQxS05yhMtQyT9cx4j7QqUQo=; b=VfNR49GDVGYbWAi7KiOW2bHUIohdJAFBqfn9YqYEQgnon+ygj/E3Cvq2VWPSfQqmzQ4sbS vbZdaXPPpLpO9uY7V0extbky+84ABqS6+CLcS9cjkFpLvHZT/Aofwvv09ggJ7nPeAHs0mO Uwi3+erxZbg8KqDfDNzOfEfNPfaxoRbe565JZ5CxjBAPO2wux0POkoGfeOaHfoDJfiW/ax p3HjohxZoaM+ACHkvx+qleWzd058KWh4a1PurTIeI3XAvSQHR5XvtYGgQlkuLkR3ME6arl cE51Fens3/joh2IbHGUNAKkeAhia1P1WrUDYvmC1n0O3bQ/iT/OsKOaYCfIAjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747446443; a=rsa-sha256; cv=none; b=Sw01DosXyqRIZAe4Zx2xK5TolmamxJByft9HdZdjcdAa/5Eu2wGzTpG9P5tJPtVFoXEKeB Z0StDcEuW1OMy14MU2eR8wubbsQU/j+kJNr71IvCt56XFr8vtp4pHZIXcmxYklePNPWOuI z0hAE0tMenU8e3/5BQd8WC/Tr5bDIuU2Wnw/UxLxfuyGZ7alZAGAc5l4Khxu+MuZJPtKmu qHxTzL2rrowbduONeFBkTuXaJfvWpiG9bAijWE+egG6JhxF+P+vqMXvEoxyMMSoIkNVWGe 3wkvk6YV4rgqfGw34kn2B0iye2wSN7OipqDehnHpNzqNz9vyyxRsmG9ytJ7ilA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZzmzH0D3pzCLF; Sat, 17 May 2025 01:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54H1lMrN034450; Sat, 17 May 2025 01:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54H1lMlG034447; Sat, 17 May 2025 01:47:22 GMT (envelope-from git) Date: Sat, 17 May 2025 01:47:22 GMT Message-Id: <202505170147.54H1lMlG034447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 3f5262eb0b22 - stable/14 - seq.1: Reset option list alignment + tag spdx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f5262eb0b2230e68314b6a7368800110b6ce9f9 Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3f5262eb0b2230e68314b6a7368800110b6ce9f9 commit 3f5262eb0b2230e68314b6a7368800110b6ce9f9 Author: Alexander Ziaee AuthorDate: 2025-01-27 19:37:43 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-17 01:46:48 +0000 seq.1: Reset option list alignment + tag spdx This option list was tabbed over 19 characters. style.mdoc(5) asks that lists are set to the longest item, or if that's too long then to use indent. Resetting it to indent buys us two lines at MANWIDTH 80, and three at 59. MFC after: 3 days Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48350 (cherry picked from commit 2f893597fcc34456d5adfc3f1633b39c76d0764f) --- usr.bin/seq/seq.1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.bin/seq/seq.1 b/usr.bin/seq/seq.1 index 682ef269cba1..d81dc7052a3c 100644 --- a/usr.bin/seq/seq.1 +++ b/usr.bin/seq/seq.1 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" $NetBSD: seq.1,v 1.8 2013/04/07 17:37:45 jdf Exp $ .\" .\" Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -69,7 +72,7 @@ Normally integer values are printed as decimal integers. The .Nm utility accepts the following options: -.Bl -tag -width Ar +.Bl -tag -width indent .It Fl f Ar format , Fl -format Ar format Use a .Xr printf 3 From nobody Sun May 18 03:11:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b0QpQ2TXCz5wgnL; Sun, 18 May 2025 03:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b0QpQ1kWnz3DV3; Sun, 18 May 2025 03:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747537918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVmKleE+BIPwL1rsC56yHTXsQSz5lxV85DNInC1nMQw=; b=i08JxMplzzkjWnqLvqUFki7vvWmO+rDHeQjL/ckKJUa0a5v/NIRbVQMLZE7OQ3OtYglSIX aqMtqGEwQn8z4QX3AoROdZR4VdoemgFKvacIohjmzdvZOviCK/O0NwsBVTaLJS8B0ulgCf AOP5l0ULI1fpzM4YcEvd0/htrx2SqEx2jUTvWBv+wZKWI7G3ekyizFMkMw+jD3m6LOdwc5 YLNf27z2psTms5AGDe17ud+dXc++c2Pc2GEUL5Chx7RU6nJRi6KYxlTh5nb2SpbcZpJZdi qLc722j9IuCa6JzpdQ0sXKb7PZPK2k/uvsu1xEtNa/xYeMnsZrX87O6izRYc1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747537918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVmKleE+BIPwL1rsC56yHTXsQSz5lxV85DNInC1nMQw=; b=RAAD5B80td5Jsp+RjmsU61IsKaDUZUjXb8U/ZAl3BRpeLqD0JE9ncLeunvWRBHFAe3bjWQ nlqSIDMrFC6hfRiV2AMxHT4RGTR6qDFznde1VNPqbzxTfEVwz4BphftgQs25Qd/z0iYFFt 1d3gMhYB8/qxK08j1AUZByCrT9/OIB3Xr0/qML61SAZiJJxsyWvjiNcYSQHOCZyZ1KWYKZ V8qcattC2VB/dUIqgiL2qyO5LJDKoFpzORA5MJ37M55LVRZ33NLyy2OA3Wt6rCzlb4r/ZV iiZm20arfnRo9ukwT+bMBCAAzovusGxO+H62hBTvz7VkCYSduvFM8+514Z14Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747537918; a=rsa-sha256; cv=none; b=E74Shu+PzmNkeXrrnXpGCKARbcAcAZ0If05YxHyMS/VEPcPmj2SLZEq8TN0tHKsn6dIWAo ttBZeV18ddYqx6e5HjjGSugab4e28GjHQp+ChyqKn+59z1pS5JjS/VHpLNf4wYFzQLNLur tw7S4g9856gBgjGsNrsJNq7++NGbLUR7mBU3qFGqyvThj+FlCy+bOd+56VTwHBxEQ4zzxX AOxQl02MfkSFfD1LM2q4EoBMipdWkqZcaafkt2U55yGuUz5HN7hZvyFnvadrlDW0ti5KpP B9VeQzvaqs6zDlbw+PJ+ztCp8OFJkuFDgcEM5NHYtiT2YUbjXggbhaL4va9hMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b0QpQ1KmLz1FpJ; Sun, 18 May 2025 03:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54I3Bwgt003118; Sun, 18 May 2025 03:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54I3BwEg003115; Sun, 18 May 2025 03:11:58 GMT (envelope-from git) Date: Sun, 18 May 2025 03:11:58 GMT Message-Id: <202505180311.54I3BwEg003115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 10d94b403add - stable/14 - sched: mark several kern.sched.* sysctls as CTLFLAG_RWTUN List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10d94b403add1454295fbcf554e3565791ce590d Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=10d94b403add1454295fbcf554e3565791ce590d commit 10d94b403add1454295fbcf554e3565791ce590d Author: Ka Ho Ng AuthorDate: 2025-05-11 18:59:10 +0000 Commit: Ka Ho Ng CommitDate: 2025-05-18 03:11:35 +0000 sched: mark several kern.sched.* sysctls as CTLFLAG_RWTUN The following sysctls which are not touched during boot time initialization are marked as CTLFLAG_RWTUN so they can be set by loader tunables as well: - kern.sched.interact - kern.sched.preempt_thresh - kern.sched.static_boost - kern.sched.idlespins - kern.sched.balance - kern.sched.steal_idle - kern.sched.steal_thresh - kern.sched.trysteal_limit - kern.sched.always_steal MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50279 (cherry picked from commit 62f55b34ec42750adb1833414de07e88e5148899) --- sys/kern/sched_ule.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 4b99f1c486bf..1aa95e984033 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -3312,14 +3312,14 @@ SYSCTL_PROC(_kern_sched, OID_AUTO, quantum, "Quantum for timeshare threads in microseconds"); SYSCTL_INT(_kern_sched, OID_AUTO, slice, CTLFLAG_RW, &sched_slice, 0, "Quantum for timeshare threads in stathz ticks"); -SYSCTL_UINT(_kern_sched, OID_AUTO, interact, CTLFLAG_RW, &sched_interact, 0, +SYSCTL_UINT(_kern_sched, OID_AUTO, interact, CTLFLAG_RWTUN, &sched_interact, 0, "Interactivity score threshold"); -SYSCTL_INT(_kern_sched, OID_AUTO, preempt_thresh, CTLFLAG_RW, +SYSCTL_INT(_kern_sched, OID_AUTO, preempt_thresh, CTLFLAG_RWTUN, &preempt_thresh, 0, "Maximal (lowest) priority for preemption"); -SYSCTL_INT(_kern_sched, OID_AUTO, static_boost, CTLFLAG_RW, &static_boost, 0, +SYSCTL_INT(_kern_sched, OID_AUTO, static_boost, CTLFLAG_RWTUN, &static_boost, 0, "Assign static kernel priorities to sleeping threads"); -SYSCTL_INT(_kern_sched, OID_AUTO, idlespins, CTLFLAG_RW, &sched_idlespins, 0, +SYSCTL_INT(_kern_sched, OID_AUTO, idlespins, CTLFLAG_RWTUN, &sched_idlespins, 0, "Number of times idle thread will spin waiting for new work"); SYSCTL_INT(_kern_sched, OID_AUTO, idlespinthresh, CTLFLAG_RW, &sched_idlespinthresh, 0, @@ -3327,18 +3327,19 @@ SYSCTL_INT(_kern_sched, OID_AUTO, idlespinthresh, CTLFLAG_RW, #ifdef SMP SYSCTL_INT(_kern_sched, OID_AUTO, affinity, CTLFLAG_RW, &affinity, 0, "Number of hz ticks to keep thread affinity for"); -SYSCTL_INT(_kern_sched, OID_AUTO, balance, CTLFLAG_RW, &rebalance, 0, +SYSCTL_INT(_kern_sched, OID_AUTO, balance, CTLFLAG_RWTUN, &rebalance, 0, "Enables the long-term load balancer"); SYSCTL_INT(_kern_sched, OID_AUTO, balance_interval, CTLFLAG_RW, &balance_interval, 0, "Average period in stathz ticks to run the long-term balancer"); -SYSCTL_INT(_kern_sched, OID_AUTO, steal_idle, CTLFLAG_RW, &steal_idle, 0, +SYSCTL_INT(_kern_sched, OID_AUTO, steal_idle, CTLFLAG_RWTUN, &steal_idle, 0, "Attempts to steal work from other cores before idling"); -SYSCTL_INT(_kern_sched, OID_AUTO, steal_thresh, CTLFLAG_RW, &steal_thresh, 0, +SYSCTL_INT(_kern_sched, OID_AUTO, steal_thresh, CTLFLAG_RWTUN, &steal_thresh, 0, "Minimum load on remote CPU before we'll steal"); -SYSCTL_INT(_kern_sched, OID_AUTO, trysteal_limit, CTLFLAG_RW, &trysteal_limit, - 0, "Topological distance limit for stealing threads in sched_switch()"); -SYSCTL_INT(_kern_sched, OID_AUTO, always_steal, CTLFLAG_RW, &always_steal, 0, +SYSCTL_INT(_kern_sched, OID_AUTO, trysteal_limit, CTLFLAG_RWTUN, + &trysteal_limit, 0, + "Topological distance limit for stealing threads in sched_switch()"); +SYSCTL_INT(_kern_sched, OID_AUTO, always_steal, CTLFLAG_RWTUN, &always_steal, 0, "Always run the stealer from the idle thread"); SYSCTL_PROC(_kern_sched, OID_AUTO, topology_spec, CTLTYPE_STRING | CTLFLAG_MPSAFE | CTLFLAG_RD, NULL, 0, sysctl_kern_sched_topology_spec, "A", From nobody Sun May 18 19:30:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b0rWw6Lkbz5whh2; Sun, 18 May 2025 19:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b0rWw2nRnz3jgk; Sun, 18 May 2025 19:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747596652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EU9IBcZvV2H9oZjH2Tn3mw3YV7Mpcng/pfPuIqABAdc=; b=CVS4gmNtZZ9bhcpbUqvQM0n+s3kuPUphjsSDMKDVWspabHNNI8EUYN+S3OsjWVO2bzq175 +VwqvH9R/aKOGN858XD6xwNrEKDnNVXJ0Xo+TguKuE/u99bTUIWtwSPtUQbKggMm5QPTmv ry1rQLf/RtiD4AWWSArPr4y9i8ERpJBMvgMRenxtnxsWEhzGrRJ8n31zE+Eqi/31lEDmqh 4uLqsZOdC1+qA40QW+KZjJgNgy2Gw/ddpw5x6olVaXkeM/FtKsgUPc/+QW3SZck9dGujEy Dj2zUxWfkPg0L+HR844n2Ny5S+aT+dMiZQbw+otRvbAZTZTYjYc+gWermWHhtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747596652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EU9IBcZvV2H9oZjH2Tn3mw3YV7Mpcng/pfPuIqABAdc=; b=xoApi12gg62sfs946zmWODCxTLs739jDaS4Pp2KVNQpYqX1M0mn60DTTVaExgC3pyUKwC/ LYvg0j+DCVS9tnZmkJvFxOsmWjUO29UdyJZzxNVSw6xxFTQFmglSvnLCRIwoZqQq38eBqi qGkDfZwLxCln8jPHeQV+D2g0cfYqp8+0SerhnoGFaKzv1d7qkGoD4/ac6bfJUgabjxAkL0 wm04IxJ3ZJ6UPd06/Iyzsl+h8PA2sRWruJC2Vw1s2nIsHBOMk/jPWZe3bRkyJ9/yVclek4 RKYlfWbNI9p65hHXxj9B07OrRHRRzxENDdMTPSloAKQTW+CwcpqJJ5jsoDoWRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747596652; a=rsa-sha256; cv=none; b=QyjWwDmHRDwfRXplXaiNrlNj49RhZaB/hGnPNT+VLbjay2jN1DaTTbdCs5Ny+CYuzqzriZ BNDZ/RRUdQ8w/i8IWgiiKx24WgJTUJhpHaahuoY4kDkJiQsYLHQOGMF2z2nzSL+xNyLgxw 3/AOBDKVx5Outhwl/VUWb4TF7dxonDzq80ygXBjocrzq/sBdHhCJyBkiHMFnXb+aeTMZ8f pPuU3c4W3Ko7mf7fQXcDY2jBt5EAtcAm4wdXMPYZVM1IUnhRGlyLjOieN6zrECQW1tsvI7 GpfNvTR+RNY4+cHciW+hrP3+KLWzJ5+dKn2qSY19R3PtErxibvOANJpueT8ReA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b0rWw22v7zY2Q; Sun, 18 May 2025 19:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54IJUqV3048867; Sun, 18 May 2025 19:30:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54IJUqDh048864; Sun, 18 May 2025 19:30:52 GMT (envelope-from git) Date: Sun, 18 May 2025 19:30:52 GMT Message-Id: <202505181930.54IJUqDh048864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 6426b0131012 - stable/14 - e6000sw.4: Add HISTORY List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6426b01310122c7563d982ec21c91b98f3f5bd3b Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=6426b01310122c7563d982ec21c91b98f3f5bd3b commit 6426b01310122c7563d982ec21c91b98f3f5bd3b Author: Alexander Ziaee AuthorDate: 2025-05-15 01:02:25 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-18 19:30:37 +0000 e6000sw.4: Add HISTORY MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50358 (cherry picked from commit c808bee35b1129abd9af137204ebd15559b90b5b) --- share/man/man4/e6000sw.4 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/man/man4/e6000sw.4 b/share/man/man4/e6000sw.4 index 4c10a99b249a..c1740b899bc9 100644 --- a/share/man/man4/e6000sw.4 +++ b/share/man/man4/e6000sw.4 @@ -37,3 +37,8 @@ Marvell 88E6141 .Xr e6060sw 4 , .Xr etherswitch 4 , .Xr etherswitchcfg 8 +.Sh HISTORY +The +.Nm +driver appeared in +.Fx 11.0 .