From nobody Mon May 19 02:58:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b12Rv46kMz5wLPc; Mon, 19 May 2025 02:58: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 4b12Rv2Lk7z4HZd; Mon, 19 May 2025 02:58:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747623483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kopBknXxxyyUt8L9+AE/T7UmombvmVosbQkJMRaNoZc=; b=u8qorqH05ZL23IHgW5Rz5aGerwSov5C9Y/YUMIQCKCCIufyKlcjDX8rKAIA466DtjJ86WV XiL/+YF8W1Bf2a1B7RZkYqRwL2hWDpZI+PNwt3iDtzGmYUu2UcZydhc+Uph+RdYGdaNTTY OG1UfqQfg4YW7dHJw2BbxuwwYQC7xjBm7DscxlSUZxCvuFqL5Xzcnk5maL6MWbi5q4ViUk +9FQt7xvkSXsLLwbTxkhZJ4FDyv2EVmfMUISIeNNYg1qTpRew2lE5cTacEDZSvq3ocIRGg OsG71Uus++vxt1eWCWJGsi8fSLzobOExaf+eA3IHFBZtF3ITkL9Y8RsEIc66Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747623483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kopBknXxxyyUt8L9+AE/T7UmombvmVosbQkJMRaNoZc=; b=GFuyr5lUdc8kXPxuPtkXaECBzVNlHS3QGhHkuJ6HR0PEIm9dXWUlXK+y2GEH1EKXMvod0D sRczJx88U75ETM441qme+SGZVEp1FDXrLJey32OBWvHn/1n+Gistx9XNWuu6Mg3Cs18PNE RdlxvzGbCVUySOJCwpUtznDJ0qtjaDfVjjBr0CS78eobBu06Ki6EEaJBsF1m8QyZn8m5ix 5kzQHn+/pXiBptynzNqEvkxqS6SVuzYZQlmYGQCxZMOxN7n03xIgsYZuSnOokz3X0pyMZH PzNtzeiyKdJ4q36COEo3/vcw6bOqVwpvJsKdycfkh5iR+GVzNeItlzFQrzI1tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747623483; a=rsa-sha256; cv=none; b=BEg2a29i6/RZyIjnDfh8IFjTI1JR/UVfUYO1YSQUhLDTtCdOT9YT+yN3/FXxb6vZe1ESEx X+j8FZKbqW+mxGg/XnYCbZtysqrdq1+yb3M1j45G3Q94aNF3Wy0HAHOEXg61W4gMpQgHzE BRpvSYcmRdvqE33CRX4qmlNGGM5iy57qxfMSE4SHD+tq6NR/LftZRxYnHJEzgOY8WspuT2 sdc6YS5Yi+DYy0oHfCTDZNLoggVC3ZDL6eSu59mZje/jhT7FjZTXzMv7MWXTmdnrJXpMwf z8yztNjr8HN2gItdVS3HYzHPR1kfKhQ/dPF1XaKN5xWmwbZR0KfGlleBNXBTpQ== 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 4b12Rv1gP2zmZ2; Mon, 19 May 2025 02:58: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 54J2w3gh078939; Mon, 19 May 2025 02:58:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J2w3kw078936; Mon, 19 May 2025 02:58:03 GMT (envelope-from git) Date: Mon, 19 May 2025 02:58:03 GMT Message-Id: <202505190258.54J2w3kw078936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 8f25fac9ce23 - main - cxgbetool.8: Fix some minor mechanical issues List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f25fac9ce2339ab5599e3af0ef7c6a1ea098aab Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=8f25fac9ce2339ab5599e3af0ef7c6a1ea098aab commit 8f25fac9ce2339ab5599e3af0ef7c6a1ea098aab Author: Alexander Ziaee AuthorDate: 2025-05-13 00:37:38 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-19 02:56:12 +0000 cxgbetool.8: Fix some minor mechanical issues + Tag SPDX + Macros should not appear in titles, write a hopefully better title + Nm needs to be on it's own line in SYNOPSIS, fold it so this page does not appear in unrelated search results (test case `apropos fw`) + Remove Ns's that do nothing and generate linter errors + Move list initializers to where they render, correcting linter errors Unresolved: This page produces an error when rendered due to the macros table. I don't know how to fix that yet, but I'm interested in learning! Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50320 --- usr.sbin/cxgbetool/cxgbetool.8 | 177 ++++++++++++++++++++++++----------------- 1 file changed, 103 insertions(+), 74 deletions(-) diff --git a/usr.sbin/cxgbetool/cxgbetool.8 b/usr.sbin/cxgbetool/cxgbetool.8 index a5f345c6b781..f0dee1830a5a 100644 --- a/usr.sbin/cxgbetool/cxgbetool.8 +++ b/usr.sbin/cxgbetool/cxgbetool.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 2015, 2018 Chelsio Inc .\" All rights reserved. .\" @@ -29,68 +32,93 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd December 10, 2024 +.Dd May 11, 2025 .Dt CXGBETOOL 8 .Os .Sh NAME .Nm cxgbetool -.Nd Userspace companion to -.Xr cxgbe 4 +.Nd userspace companion to Chelsio cxgbe Ethernet driver .Sh SYNOPSIS .Bl -item -compact .It -.Nm Ar nexus command Op Ar parameter ... +.Nm +.Ar nexus command Op Ar parameter ... .Pp .It -.Nm Ar nexus Cm clearstats Ar port_id +.Nm +.Ar nexus Cm clearstats Ar port_id .It -.Nm Ar nexus Cm clip Bro Cm hold | release Brc Ar ipv6-address +.Nm +.Ar nexus Cm clip Bro Cm hold | release Brc Ar ipv6-address .It -.Nm Ar nexus Cm clip Cm list +.Nm +.Ar nexus Cm clip Cm list .It -.Nm Ar nexus Cm context Bro Cm ingress | egress | fl | cong Brc Ar cntxt_id +.Nm +.Ar nexus Cm context Bro Cm ingress | egress | fl | cong Brc Ar cntxt_id .It -.Nm Ar nexus Cm hashfilter mode +.Nm +.Ar nexus Cm hashfilter mode .It -.Nm Ar nexus Cm hashfilter Ar filter-specification +.Nm +.Ar nexus Cm hashfilter Ar filter-specification .It -.Nm Ar nexus Cm hashfilter Ar idx Cm delete +.Nm +.Ar nexus Cm hashfilter Ar idx Cm delete .It -.Nm Ar nexus Cm hashfilter list +.Nm +.Ar nexus Cm hashfilter list .It -.Nm Ar nexus Cm filter mode +.Nm +.Ar nexus Cm filter mode .It -.Nm Ar nexus Cm filter Ar idx Ar filter-specification +.Nm +.Ar nexus Cm filter Ar idx Ar filter-specification .It -.Nm Ar nexus Cm filter Ar idx Cm delete Op Cm prio Bro Cm 0 | 1 Brc +.Nm +.Ar nexus Cm filter Ar idx Cm delete Op Cm prio Bro Cm 0 | 1 Brc .It -.Nm Ar nexus Cm filter list +.Nm +.Ar nexus Cm filter list .It -.Nm Ar nexus Cm i2c Ar port_id devaddr addr Op Ar len +.Nm +.Ar nexus Cm i2c Ar port_id devaddr addr Op Ar len .It -.Nm Ar nexus Cm loadcfg Ar fw-config.txt +.Nm +.Ar nexus Cm loadcfg Ar fw-config.txt .It -.Nm Ar nexus Cm loadcfg clear +.Nm +.Ar nexus Cm loadcfg clear .It -.Nm Ar nexus Cm loadfw Ar fw-image.bin +.Nm +.Ar nexus Cm loadfw Ar fw-image.bin .It -.Nm Ar nexus Cm memdump Ar addr len +.Nm +.Ar nexus Cm memdump Ar addr len .It -.Nm Ar nexus Cm policy Ar cop.txt +.Nm +.Ar nexus Cm policy Ar cop.txt .It -.Nm Ar nexus Cm policy clear +.Nm +.Ar nexus Cm policy clear .It -.Nm Ar nexus Bro Cm reg | reg64 Brc Ar addr Ns Op Ar =val +.Nm +.Ar nexus Bro Cm reg | reg64 Brc Ar addr Ns Op Ar =val .It -.Nm Ar nexus Cm regdump Op Ar register-block ... +.Nm +.Ar nexus Cm regdump Op Ar register-block ... .It -.Nm Ar nexus Cm sched-class Ar sub-command Op Ar param Ar value +.Nm +.Ar nexus Cm sched-class Ar sub-command Op Ar param Ar value .It -.Nm Ar nexus Cm sched-queue Ar port Ar queue Ar class +.Nm +.Ar nexus Cm sched-queue Ar port Ar queue Ar class .It -.Nm Ar nexus Cm stdio +.Nm +.Ar nexus Cm stdio .It -.Nm Ar nexus Cm tcb Ar tid +.Nm +.Ar nexus Cm tcb Ar tid .El .Sh DESCRIPTION .Nm @@ -155,22 +183,22 @@ A reference on the address must have been acquired previously. .El Display hardware context for an ingress queue, congestion manager, egress queue, or freelist manager. -.Bl -tag -width ingress_cntxt_id -compact +.Bl -tag -width "ingress_cntxt_id" -compact .It Ar ingress_cntxt_id context id of an ingress queue -- the value listed in one of -.Va dev.t4nex.%d.fwq.cntxt_id Ns , -.Va dev.cxgbe.%d.rxq.%d.cntxt_id Ns , +.Va dev.t4nex.%d.fwq.cntxt_id , +.Va dev.cxgbe.%d.rxq.%d.cntxt_id , or -.Va dev.cxgbe.%d.ofld_rxq.%d.cntxt_id Ns . +.Va dev.cxgbe.%d.ofld_rxq.%d.cntxt_id . .It Ar egress_cntxt_id context id of an egress queue -- the value listed in one of -.Va dev.t4nex.%d.mgmtq.cntxt_id Ns , -.Va dev.cxgbe.%d.txq.%d.cntxt_id Ns , -.Va dev.cxgbe.%d.ctrlq.%d.cntxt_id Ns , -.Va dev.cxgbe.%d.ofld_txq.%d.cntxt_id Ns , -.Va dev.cxgbe.%d.rxq.%d.fl.cntxt_id Ns , +.Va dev.t4nex.%d.mgmtq.cntxt_id , +.Va dev.cxgbe.%d.txq.%d.cntxt_id , +.Va dev.cxgbe.%d.ctrlq.%d.cntxt_id , +.Va dev.cxgbe.%d.ofld_txq.%d.cntxt_id , +.Va dev.cxgbe.%d.rxq.%d.fl.cntxt_id , or -.Va dev.cxgbe.%d.ofld_rxq.%d.fl.cntxt_id Ns . +.Va dev.cxgbe.%d.ofld_rxq.%d.fl.cntxt_id . Note that freelists are egress queues too. .It Ar flm_cntxt_id context id of a freelist manager. @@ -227,7 +255,7 @@ T} T{ bitwise and of the source address in an incoming IP datagram with .Ar mask equals -.Ar addr Ns . +.Ar addr . .Ar addr can be an IPv4 or IPv6 address. T} @@ -238,7 +266,7 @@ T} T{ bitwise and of the destination address in an incoming IP datagram with .Ar mask equals -.Ar addr Ns . +.Ar addr . .Ar addr can be an IPv4 or IPv6 address. T} @@ -249,7 +277,7 @@ T} T{ bitwise and of the source port in an incoming TCP or UDP datagram with .Ar mask equals -.Ar port Ns . +.Ar port . T} _ dport T{ @@ -258,7 +286,7 @@ T} T{ bitwise and of the destination port in an incoming TCP or UDP datagram with .Ar mask equals -.Ar port Ns . +.Ar port . T} _ fcoe T{ @@ -273,7 +301,7 @@ T} T{ bitwise and of the ingress port with .Ar mask equals -.Ar val Ns . +.Ar val . The ingress port is a 3 bit number that identifies the port on which a frame arrived. Physical ports are numbered 0-3 and 4-7 are internal loopback paths @@ -288,7 +316,7 @@ T} T{ bitwise and of the 16-bit outer VLAN tag of an incoming frame with .Ar mask equals -.Ar tag Ns . +.Ar tag . T} _ vlan T{ @@ -297,7 +325,7 @@ T} T{ bitwise and of the 16-bit VLAN tag of an incoming QinQ frame with .Ar mask equals -.Ar tag Ns . +.Ar tag . The inner VLAN tag is used if the incoming frame is QinQ. T} _ @@ -308,7 +336,7 @@ bitwise and of the 8-bit IP Type of Service/IPv6 Traffic Class in an incoming packet with .Ar mask equals -.Ar val Ns . +.Ar val . T} _ proto T{ @@ -317,7 +345,7 @@ T} T{ bitwise and of the 8-bit IP protocol in an incoming packet with .Ar mask equals -.Ar ipproto Ns . +.Ar ipproto . T} _ ethtype T{ @@ -326,7 +354,7 @@ T} T{ bitwise and of the 16-bit Ethernet type field of an incoming frame with .Ar mask equals -.Ar type Ns . +.Ar type . T} _ macidx T{ @@ -335,7 +363,7 @@ T} T{ bitwise and of the MAC Address Match Index of an incoming frame with .Ar mask equals -.Ar idx Ns . +.Ar idx . The MAC Address Match Index refers to an entry in the MPS TCAM or in the MPS hash. See .Cm matchtype @@ -348,7 +376,7 @@ T} T{ bitwise and of the Match Type of an incoming frame with .Ar mask equals -.Ar idx Ns . +.Ar idx . Match Type is one of the following: .Bl -tag -width "n" -compact .It 0 @@ -428,21 +456,21 @@ additional operational parameters. Hashfilters require an exact value for the 5-tuple (sip, dip, sport, dport, proto) and for any other match-criteria listed in "hashfilter mode". Possible filter actions are -.Cm drop Ns , -.Cm pass Ns , or -.Cm switch Ns . +.Cm drop , +.Cm pass , or +.Cm switch . .Pp -.Bl -tag -width nat_dport -offset indent -compact Operational parameters that can be used with all filters: +.Bl -tag -width "nat_dport" -offset indent -compact .It Cm hitcnts Count filter hits: 0 or 1 (default). .It Cm prio Filter has priority over active and server regions of TCAM: 0 (default) or 1. .El .Pp -.Bl -tag -width nat_dport -offset indent -compact Operational parameters that can be used with filters with -.Cm action pass Ns : +.Cm action pass : +.Bl -tag -width "nat_dport" -offset indent -compact .It Cm queue Context id of an ingress queue to which to deliver the packet. The context id is available in @@ -458,9 +486,9 @@ Select TCB hash information in rx descriptor. 0 (default) or 1 .El .Pp -.Bl -tag -width nat_dport -offset indent -compact Operational parameters that can be used with filters with -.Cm action switch Ns : +.Cm action switch : +.Bl -tag -width "nat_dport" -offset indent -compact .It Cm eport Egress port number on which to send the packet matching the filter. 0 to dev...nports - 1. @@ -483,8 +511,9 @@ replaces the existing tag with the one provided, and .Cm + Ns Ar tag inserts the given tag into the frame. .It Cm nat -Specify the desired NAT mode. Valid NAT modes values are: -.Bl -tag -width dip-dp-sip -compact +Specify the desired NAT mode. +Valid NAT modes values are: +.Bl -tag -width "dip-dp-sip" -compact .It Cm dip Perform NAT on destination IP. .It Cm dip-dp @@ -546,12 +575,12 @@ to the card. Display .Ar len bytes of data of the card's memory starting at -.Ar addr Ns . +.Ar addr . The card's memory map is available in -.Va dev.t4nex.%d.misc.meminfo Ns . +.Va dev.t4nex.%d.misc.meminfo . .It Cm policy Ar cop.txt Install the Connection Offload Policy (COP) in -.Ar cop.txt Ns . +.Ar cop.txt . A COP offers fine-grained control over which connections get offloaded and with what parameters. Set @@ -645,7 +674,7 @@ Set ULP mode to ULP_MODE_TLS. Use the specified congestion control algorithm. .Ar algo must be one of -.Cm reno Ns , Cm tahoe Ns , Cm newreno Ns , or Cm highspeed Ns . +.Cm reno , Cm tahoe , Cm newreno , or Cm highspeed . .It Cm class Ar sc Bind the connection to the specified tx scheduling class. Valid range is 0 to 14 (for T4) and 0 to 15 (T5 onwards). @@ -653,17 +682,17 @@ Valid range is 0 to 14 (for T4) and 0 to 15 (T5 onwards). Use the specified offload rx queue. .Ar qnum should be -.Cm random Ns , Cm roundrobin Ns , +.Cm random , Cm roundrobin , or a number between 0 and nofldrxq for the ifnet. .It Cm txq Ar qnum Use the specified offload tx queue. .Ar qnum should be -.Cm random Ns , Cm roundrobin Ns , +.Cm random , Cm roundrobin , or a number between 0 and nofldtxq for the ifnet. .It Cm bind Ar qnum Shorthand for -.Cm rxq Ar qnum Cm txq Ar qnum Ns . +.Cm rxq Ar qnum Cm txq Ar qnum . Use when nofldrxq is the same as nofldtxq. .It Cm mss Ar val Set the advertised TCP MSS in the SYN for this connection to @@ -671,10 +700,10 @@ Set the advertised TCP MSS in the SYN for this connection to (in bytes). The hardware MTU table must already have an entry that is suitable for the MSS. .El -.Pp .It Example of a COP. Note that hardware listener for port 22 will be IPv4 only because the rule -before it will prevent any IPv6 servers other than the first two. Also note +before it will prevent any IPv6 servers other than the first two. +Also note that outgoing connections to 192.168/16 are the only outgoing connections that will get offloaded. .Bd -literal @@ -704,7 +733,7 @@ operation. .Ar register-block can be .Cm sge pci dbg mc ma edc0 edc1 cim tp ulp_rx ulp_tx pmrx pmtx mps cplsw -.Cm smb i2c mi uart pmu sf pl le ncsi xgmac Ns . +.Cm smb i2c mi uart pmu sf pl le ncsi xgmac . .It Cm sched-class config Op Ar param Ar value Configure optional feature capabilities for the TX scheduler. .Bl -ohang -offset indent @@ -794,14 +823,14 @@ Consult the adapter documentation for specific information on any limitations. Bind the indicated port's NIC TX .Ar queue to the specified TX Scheduler -.Ar class. +.Ar class . If the TX .Ar queue is .Cm all, * or any negative value, the binding will apply to all of the TX queues associated with the -.Ar interface. +.Ar interface . If the class is .Cm unbind, clear or any negative value, the TX queue(s) will be unbound from @@ -811,7 +840,7 @@ Switch to interactive mode. .It Cm tcb Ar tid Display contents of the hardware TCB (TCP Control Block) for the connection identfied by -.Ar tid Ns . +.Ar tid . .El .Sh FILES /sys/dev/cxgbe/t4_ioctl.h From nobody Mon May 19 03:59:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b13pT2SJgz5wQFh; Mon, 19 May 2025 03:59: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 4b13pS4gfDz3dxX; Mon, 19 May 2025 03:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747627152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K30A9f/MOwjc/PT/vht6QsJMBH8LKCwaTH8WqHDaKnY=; b=hUVsW3SUpsZRxmLe5ctFpVPel2/F8ESM5w6j+hCysZgVIKUpKkECpqPfRVhKyDaWDuI6kZ LBsFucSPA5/j1nk6eolEuWlFLmxUN2XrQdNZKF+GFEIdwIWbJFgE9R0OeXiyaCSnwzXgcC ZwUCYAIW1KQt1ZgXr7gtVRJbszC7Z3pMfcJvJEJ5sorEEVE0rN16MNn2dFQokh/0ICiU33 om5X+Fdl7/TwMc5AvK0tiRZee68DxHEKX4Z1MxjlY/FCZBL41FGjGYKfaNP2aJL8c8k12d UwMPioQynLU4IL7a6JRH+DCs71H7azpJiZykE7gYb3uui9S8e9ZTyu3xazwF2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747627152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K30A9f/MOwjc/PT/vht6QsJMBH8LKCwaTH8WqHDaKnY=; b=OsvZBNZCPvNg+JLPlWCeK/qAGtwgDP1Y552DcC7qJ+fVXldPyElBMIsNFLEwLGHACQebaW QB71r/8EtdMzpD3ODUyir6Hf2ZwgrlAVnVlMsJxylvMAut8ihxQbyaEJ8+m2x20MXWLrIi MZwIZt+2mvqEi0hEYAdFUlRFqIVQ7FLQiM+cr4skuepqhZGLS991mF7swKeEoFDDq7ypB6 si2oS8g2CKkNSlJcJQ0ATUiIpL/FNv/42KoKhVvSt5KNS27mZfDBJiWuSIch0zTNfDzfpl 0RfcPA5+OcS4EZD3Ehp8AJC9ojinK+2FzBI/mM8fE4VMUZUeJJ5uVayRAKv/bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747627152; a=rsa-sha256; cv=none; b=JdFMUagwDMn5jvq7AJXsPjVtTtqkIgMUzAMbSnSbDLK9kOZNKAoVQc6TPx33EPrqWc587k 5IRGADusr2kXqHmBZOQJpR2qqOBb97IcBNUf7oXXQWGn8tztoWf4zfwNR09YFdaXz11V+P s+9z+NfCCBE5vmkTFrEzQ6JA0+JrSMObWsVV6fMkA8fzqDMOOVeyn0nE/SdVYch/9tkpB1 UgrpK16zpaWqPlVpS4Jh8NmXaxBOVWKVF4CyZW1v2lnqx5zmnFM4IrGi8LvtlKi4bPDPB1 BCfmbqDOjU/J1O0itK1YgL96chZHK12QG7DWiUxL1yuT9tDkpl0QZh6cul4u4A== 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 4b13pS3rPKzp1w; Mon, 19 May 2025 03:59: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 54J3xCPA093695; Mon, 19 May 2025 03:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J3xCGi093692; Mon, 19 May 2025 03:59:12 GMT (envelope-from git) Date: Mon, 19 May 2025 03:59:12 GMT Message-Id: <202505190359.54J3xCGi093692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 26b3641f97d9 - main - vm_page_grab_pages: avoid doomed range lookups List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26b3641f97d9025a7c12b70935098892ae26ca0c Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=26b3641f97d9025a7c12b70935098892ae26ca0c commit 26b3641f97d9025a7c12b70935098892ae26ca0c Author: Doug Moore AuthorDate: 2025-05-19 03:58:00 +0000 Commit: Doug Moore CommitDate: 2025-05-19 03:58:00 +0000 vm_page_grab_pages: avoid doomed range lookups In vm_page_grab_pages, if a range of grabbed pages has just been exhausted, then an immediate request for a new range is futile; we know there's no page there. So only try to lookup more ranges after allocating a page. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D50394 --- sys/vm/vm_page.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index eec85a5eb6f4..ea6fbdbc6386 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -5164,14 +5164,13 @@ vm_page_grab_pages(vm_object_t object, vm_pindex_t pindex, int allocflags, i = 0; vm_page_iter_init(&pages, object); retrylookup: - ahead = 0; + ahead = -1; for (; i < count; i++) { - if (ahead == 0) { + if (ahead < 0) { ahead = vm_radix_iter_lookup_range( &pages, pindex + i, &ma[i], count - i); } - if (ahead > 0) { - --ahead; + if (ahead-- > 0) { m = ma[i]; if (!vm_page_tryacquire(m, allocflags)) { if (vm_page_grab_sleep(object, m, pindex + i, From nobody Mon May 19 04:36:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b14f44wkqz5wSNY; Mon, 19 May 2025 04:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b14f35M28z3ws7; Mon, 19 May 2025 04:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747629419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjtXP54HpVIgGb5hXfRVE0RcclddrAipPFqOD3F002A=; b=S8RItbjqlU7kEJJtFvrpaF0W3GI3tZB1TiQthHUMREBim4GSYiZCxGhmnNgs6nG6mo0IL8 uCtc2P4WFIrSbcHMIPnBpfR2KArF+H7bxbdJurqofBovSVm7cB7wUlCkg+jwF759mSbsjC heCbYu8xyqqwA/5JjYOXDBUm9nzbSn8r5Ac8WSUClfNMGyj4OT0OpF9knMbv4zfeb1VUvm A1I9J+pmP9FRJJM5CnVwgwXwMmQb7hSKw/i9sEUTjlfS6tzvmTuK0VggzcECq+fI+3IT+B 2GQr6RhJfeeJ4GpeEuX1xq11ZyJTBQgLtSfr40AxwCGPEtgDedJbgZ+jtAFB2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747629419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjtXP54HpVIgGb5hXfRVE0RcclddrAipPFqOD3F002A=; b=B1uJj7gIv8e0q5MfpRVI1F5rtu4zRlM2isM4fGolUFgCYxZ6AHj8/D23Wz61pKKzJ9U5yH NqQdun+D4ErP2kPdgPOkurfPTs7C/Fg+Cx8M4l/4iYEUhSOYTj7BPCc902UR90p6RKXaCr Nx2gp+e+9cukolCiGNYAbrnPAPJslZNgaAYMZwmeEhhEqCEApY65iCNt7kOTwUiVV7wJfL n4s3msKdYJ9+o4QxOXLQ3Zau9YVqsBCd5F0MDmmnEJmZav/xstu085x4k8u9LTAAKFrets O+5HmybTKs11oQS4B4jhe0kD+8H8IficVnRpFOHet2u/zO4frZdrWjUzBGuNPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747629419; a=rsa-sha256; cv=none; b=ySno066eW0hp45IS7CKFFHiW2QKG04a+DnUSW183muWvq5zXmcxe72GFKAT3rPjxz3qNBf aRnKK7v7OQbF7MgJJJFSIX7Vl3V5fyDq67Vtf6HLCrBuklLf9BWw1GvFF7xgdVULa8sPQl MXO5laY1JgzDsYUREd6e6/triSXZP7NyGoolPCGetVD1ruQl1GeQPX508IdJr3mF9neY7U vnn+KQkf2jQf6/KylVXorAQ4QcBrtmUrGHmTqIcxFqHhSg9EVoUU7Gh23+bEOPgW3CvChD dbc4mbzzA14jtoAR66tFZfaeAELK0Jz7Xq+ewgg6rn1LFwU/vuP5VjWTpAnwYQ== 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 4b14f34ZRMzqBF; Mon, 19 May 2025 04:36: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 54J4axWS068114; Mon, 19 May 2025 04:36:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J4axmX068111; Mon, 19 May 2025 04:36:59 GMT (envelope-from git) Date: Mon, 19 May 2025 04:36:59 GMT Message-Id: <202505190436.54J4axmX068111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: ad2d7e594f6d - main - ifnet: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad2d7e594f6d519be6e9674c8048a406a453fef9 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ad2d7e594f6d519be6e9674c8048a406a453fef9 commit ad2d7e594f6d519be6e9674c8048a406a453fef9 Author: Zhenlei Huang AuthorDate: 2025-05-19 04:35:55 +0000 Commit: Zhenlei Huang CommitDate: 2025-05-19 04:35:55 +0000 ifnet: Fix a typo in a source code comment - s/possiable/possible MFC after: 3 days --- sys/net/if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if.c b/sys/net/if.c index 21e3b1a8576a..974ff3af4f61 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -871,7 +871,7 @@ if_attach_internal(struct ifnet *ifp, bool vmove) */ namelen = strlen(ifp->if_xname); /* - * Always save enough space for any possiable name so we + * Always save enough space for any possible name so we * can do a rename in place later. */ masklen = offsetof(struct sockaddr_dl, sdl_data[0]) + IFNAMSIZ; From nobody Mon May 19 05:24:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b15hX4wjdz5wWRS; Mon, 19 May 2025 05:24:12 +0000 (UTC) (envelope-from ivy@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b15hX1lJzz3RNW; Mon, 19 May 2025 05:24:12 +0000 (UTC) (envelope-from ivy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747632252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mCkOsJDH5glgcEBiD4MmWH93tv0wLegghs7cY9VZwPE=; b=jrKAdrefTu72DHWEWp/ac5e81lvAD2VpYWJ09xNXIQWZVGXRD47OhtHNiZaC7eeiNkJqKJ u3RHnVeLHYXiSUQ3yfSvNrOx7Tkj2ynImWoARf0yF3/xKUuKZEzAo+lSRMXgXqVlR1FfSq h5UhLBAk0IXyb1Xmu7PofTFxQdW0GpU962KQLYEHzTzV5+fTB812m57cQlHQtnEJR1cDTr gzqDzRx3X3QbPNim4lRhH8NMvnFiQcAEu+TC24S6oRvAKWhzRTnHeAX3l3WW1oGjzmnQ97 59DDJk5s5/znyX1pTFe06px5J0+Smm8+EGFycioT3G3V8Eq+9mmRaUrZIdsZXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747632252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mCkOsJDH5glgcEBiD4MmWH93tv0wLegghs7cY9VZwPE=; b=WymQYNKQG161PChC/coGOOy3htfcUAsyZh4mGLQ2uJPz4SnqpHxCoAimhRaty1ggqLeGyi glP+8DpVQnSHnPqFHuNFVLnTKdaBZDPKPIRauQgy7kF3Mj7dHjXtUyDdAr2RxkjBBxqAyH H0k5Y+LuLBIhDqcemw2Y5ouSuZbJDyn5mtV9eP4n0mLW7YoW9tAihCAXsT+92yopD58AIQ LKMqW18gaOvyQfmdARFSOlS82xQeb1M649XXLQgw2j/8TgOYZ5BWrXUQB5q6MNtRkHJMin C72eVm+35RrmQgXC4RXbd4Le+5YW4bgLQnnzkD3Qx7q1AaUc59Dm7IC1tV/czQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747632252; a=rsa-sha256; cv=none; b=WmsAsHnGJGyS2xXwBTnoPw9T39/Su+XLM/rusyB0Nw20zZ7vmgwlwNyc/+YhuVVdMOClmz FAMKreQoepquLOTdsweVS+PPK1f/whAWkiNTxY4if+/Qeh87gnKhxl9r+/xZHk7E/Elgpy qGUt6tvMO1I2Y4AQd27hiEcOdrbCMp0/AqpbC034sgA46oBf6gAgQM+dA/0WC5QooXOrWx Wcx17v+QOIBa4d4jzdWQXmzYa12PFtItei7tNri4EdYGQ76Xfei0Ad+NeX0YYoccU9hpeb tvgG2VygKSWS8J3B8pWz07U8K+0CA6yKA8MTujOT/Hwcc+xgExj6pCraToHxdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ragweed.eden.le-fay.org (ragweed.eden.le-fay.org [IPv6:2001:8b0:aab5:c401:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b15hW3W5Tz5dZ; Mon, 19 May 2025 05:24:11 +0000 (UTC) (envelope-from ivy@FreeBSD.org) Date: Mon, 19 May 2025 06:24:07 +0100 From: Lexi Winter To: Jessica Clarke Cc: Mark Johnston , Mitchell Horne , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: b61850c4e6f6 - main - bridge(4): default net.link.bridge.member_ifaddrs to false Message-ID: Mail-Followup-To: Jessica Clarke , Mark Johnston , Mitchell Horne , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202505150004.54F04FhR046897@gitrepo.freebsd.org> <82C39393-F26D-4E7B-B62A-5CC9C85BAD1A@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="4gevwjlrXrj/OKlk" Content-Disposition: inline In-Reply-To: <82C39393-F26D-4E7B-B62A-5CC9C85BAD1A@freebsd.org> --4gevwjlrXrj/OKlk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Jessica Clarke: > That would go some way to helping, but I really do not want =E2=80=9CI wa= nt a > tap interface for a VM=E2=80=9D and =E2=80=9CI want devd+dhclient to mana= ge DHCP for me > automatically=E2=80=9D to be incompatible, which based on the thread here= it > sounds like they are. this is not supposed to be broken, or at least, i think we want to continue supporting this even if it requires configuration changes. if i understand your use-case correctly, you are relying on devd to start dhclient on an interface when the link comes up, when this interface is also a member of a bridge, is that correct? if so, are you able to modify your devd event script to run dhclient on the bridge instead? --4gevwjlrXrj/OKlk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaCrAdgAKCRD1nT63mIK/ YBbZAP9A1famfrlm7CJEVNRYVpUN8Cdn67PKfFw4bpwNrBr6twEA60Wf409cRPsQ TaSjbVYbx14dQyH4SfDBcvhTirvewQ0= =IQSS -----END PGP SIGNATURE----- --4gevwjlrXrj/OKlk-- From nobody Mon May 19 05:29:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b15qH54TNz5wWdP for ; Mon, 19 May 2025 05:30:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 4b15qH2mpFz3V3D for ; Mon, 19 May 2025 05:30:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so30544195e9.1 for ; Sun, 18 May 2025 22:30:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747632602; x=1748237402; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jVcM1OA/sllDzGKIS0bCWj1li1tDp2zdxT5c+3UyrBk=; b=v6GqKUOdHECIYUsBBBnJgv2WSzgzuKV+xCZpFkHTtgihYAFleT0FbMr+XfYnmgfTBO 591DJfhnNlPd+6kRhJY0VJb5iI8KWADsFXqZ5nL/U1fYZjnztS0On5jop/rBjR4g2Av0 VgiP5ZK1uFRvhdeNDw1KDhywGZAafzRIKhjhQrX5Y7scu39CZGV9M04FuN9eI75lvMih tUnRu/0lOwV9naqejgPPpzrtzpw4jImOwl75O/W38Yw9FiGSGGsbVH3+HS39B52ioX2e EmxORWGwIFIoNeYg2MCraTsmng8euEemlhIkJOwmGialbq0yPMvpRmjJ2rOAmVOukVsR 8s9w== X-Forwarded-Encrypted: i=1; AJvYcCVr7q6Z8AbJeDbWhYQTR6RgG37Nc6aCiA3u/TSNCnKZe6CbMq87o1RyO8E8Dhuqfy6l5tmwdFy4szDt4e1p16cGemp40w==@freebsd.org X-Gm-Message-State: AOJu0YzUBsHQQu8/5Jqj5LWRtjU3py8pO9koxiQ+lZuNHVaJu5D1gg1R 0WQ4dxniv6mG0cR3YbhlXJgayqVtyqyasEHA70q7rL31Xz376vr3aopX8NEwgLlItTo= X-Gm-Gg: ASbGncvmyNwsI+q4+ReJsZWNhdX8Pi3ySvzIqzraRUCBjqKPzx6Gip5unN3zJi3nodJ n1G2vZ2kyd+S/57YPlmLAaV4b78TbjAq78Yee9+CY9RY6pY2tCS1VGCy6CrJaWOlzwHSYakEFYQ SjP02aC06VkzhbEEniHELpbxO02+n5FCdrZtUDBnjtQ+kVLeuRoKHrgeSBvAE67xGa1O9rfYXnQ N7hCNaByV4Cn81ocFFWk1IL/B+sXpMUVbOUE5nTwkCOCKD9aTC4qPSTFiY7VnkPhFYqe6S9play vbGfru97/aN3kp0jtkxZ1WCXttzWzR9tNmKCgVnEVhiYY4V97lD2feNCqH0K1bHUmw== X-Google-Smtp-Source: AGHT+IGkbK1Vtds7IjJ6v6x25md7coGT4fmDc/JVCN22hDk96MlNkeP4nwOCDy9hwynqdBPA3lcMPw== X-Received: by 2002:a05:600c:4449:b0:441:ac58:ead5 with SMTP id 5b1f17b1804b1-442fd67591fmr119452165e9.31.1747632601542; Sun, 18 May 2025 22:30:01 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f33691f2sm195758305e9.3.2025.05.18.22.30.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 May 2025 22:30:01 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.500.181.1.5\)) Subject: Re: git: b61850c4e6f6 - main - bridge(4): default net.link.bridge.member_ifaddrs to false From: Jessica Clarke In-Reply-To: Date: Mon, 19 May 2025 06:29:50 +0100 Cc: Mark Johnston , Mitchell Horne , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <972DBF16-1E5D-4679-B378-76B14AEFF4FD@freebsd.org> References: <202505150004.54F04FhR046897@gitrepo.freebsd.org> <82C39393-F26D-4E7B-B62A-5CC9C85BAD1A@freebsd.org> To: Lexi Winter X-Mailer: Apple Mail (2.3826.500.181.1.5) X-Rspamd-Queue-Id: 4b15qH2mpFz3V3D 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:209.85.128.0/17, country:US] X-Spamd-Bar: ---- On 19 May 2025, at 06:24, Lexi Winter wrote: >=20 > Jessica Clarke: >> That would go some way to helping, but I really do not want =E2=80=9CI = want a >> tap interface for a VM=E2=80=9D and =E2=80=9CI want devd+dhclient to = manage DHCP for me >> automatically=E2=80=9D to be incompatible, which based on the thread = here it >> sounds like they are. >=20 > this is not supposed to be broken, or at least, i think we want to > continue supporting this even if it requires configuration changes. >=20 > if i understand your use-case correctly, you are relying on devd to > start dhclient on an interface when the link comes up, when this > interface is also a member of a bridge, is that correct? >=20 > if so, are you able to modify your devd event script to run dhclient = on > the bridge instead? This is just devd=E2=80=99s default rules, /etc/devd/dhclient.conf. Jess From nobody Mon May 19 06:03:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b16YY0r4Jz5wYq0; Mon, 19 May 2025 06:03: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 4b16YY0C6Bz3k1y; Mon, 19 May 2025 06:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747634593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJYb7FgFdW3aguxH11ajHaXZeuBW+C2cqVR9yx5KZ0M=; b=gSf81e2hWLCKNBET8qPHcmOiuMLsivjKGUdsLSePIiZadoTG35720BLVlCnND5pdz5iIUR LOZHbs2glQbO42sum4LPV6uPRe3AJVHMf4Umio2qKW8Y00bCVJNzACVXheBOIKBfAo1TrB wUGISDUNFCh1vtKsklxFXlqNiMMwUqmzH3HM6R66Z67TRhQ/bKAkKn6lTthIJxEV/mQpFQ 5oRm6KJVDyQ2ozf2oS6OTAdNx9TbWStMhbj3LthVuGdktp5U6pIjrbcUTScMAAkaInV8Be wc7PKUJsRJQT132dEXMs6HxM9heHaw1eYzVMLu1+W4BWLZZYtFBxuxI6/MRaPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747634593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJYb7FgFdW3aguxH11ajHaXZeuBW+C2cqVR9yx5KZ0M=; b=Vtyd0oJynl8++Y7a9lKPAJkV2fPzxL68XOLrtE9I2aDl7+COflOqKPj5Zny5No5qtm5Qur T8gOADPsvpjqOeIQK4stKu+BmvMchFFU8EEEKmAuP7goH/PUX2hhMYGk12gW54ydLgEzo9 vlTIIhK0IjSvB/HVuXMSJMm6f06yn+v4Z45HILpprcY9hs/NBRWQeRAD5W/V18RPa9k62R pqOZJr4VBi2KDys7Kp+XeUOZXiSD3f2z+hokg7wKTaS/rkw173tX6yW3Sx35ItUBlf44ML Mc7Qu54f5goM7WsiJZKBPIYY/IrP0VTi4ObuxaXYhTADBoyf0ehbYFfli8fS3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747634593; a=rsa-sha256; cv=none; b=CoVGL3vDegr7EGN0rH+/dN6wiJ8GP/F/SIqJdcpeVMr+1tGygf+Lt7s4duU9AabnmZnmAI yfpAu53rkgew8AWDHyoEh783L3pWawbYxA/VR4PWEJiw8HWBd7/tKQgE0a80Mby9cnMYRs F2fy0dcknPuDylB48qdWQ1FvysE7n5TVR9gqYr5UMYDdzkpZgEFhA8AcJfkxD7OMe4GAnL jtaCot+DuG6IP7z6oRybwVwRFpfUgKCGqYP8EhZ80p4exjcfMgpduuA9mh3mJ4oR+tbqLA /MBTSx7Dzkq0ZH/wOhAZTvATPHtJ9tiBAk2qCiXk8Kipv6LITRognZXMpUZYGw== 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 4b16YX6tStzsK5; Mon, 19 May 2025 06:03: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 54J63CZJ036357; Mon, 19 May 2025 06:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J63C6e036354; Mon, 19 May 2025 06:03:12 GMT (envelope-from git) Date: Mon, 19 May 2025 06:03:12 GMT Message-Id: <202505190603.54J63C6e036354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6a4a86c2664c - main - namei.9: minor editing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a4a86c2664c368e31f71c41206685d02543a237 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a4a86c2664c368e31f71c41206685d02543a237 commit 6a4a86c2664c368e31f71c41206685d02543a237 Author: Konstantin Belousov AuthorDate: 2025-05-19 05:59:53 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-19 05:59:53 +0000 namei.9: minor editing Noted by: des Sponsored by: The FreeBSD Foundation --- share/man/man9/namei.9 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9 index 63e1a5de02ea..3f2f43e94cd1 100644 --- a/share/man/man9/namei.9 +++ b/share/man/man9/namei.9 @@ -323,7 +323,9 @@ mount point indicates extended shared lock support. .It Dv NOCROSSMOUNT Do not cross mount points during lookup. .Pp -For .. lookups leading to mount roots, returns the root vnode of +For +.Dq .. +lookup leading to mount root, returns the root vnode of the mount instead of the covered vnode of the filesystem where the mount was placed. .Pp @@ -370,9 +372,10 @@ or flags. .It Dv ISLASTCN This is last component of pathname. -It is handled specially, many flags augments its processing. +It is handled specially, many flags augment its processing. .It Dv ISDOTDOT -Current component name is .. . +Current component name is +.Dq .. . Usually implies a need to specially handle the vnode locking for instantiation of the target vnode. The generic From nobody Mon May 19 06:07:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b16g33cRvz5wYgM; Mon, 19 May 2025 06:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b16g339WYz3m8T; Mon, 19 May 2025 06:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747634879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4IAZLVbXJkJOMqUVpMyEE8sm+pGQ0rouanmkb5MNIQ=; b=UNTmiYKoI47Ap8tz2F2Wb8v/8EVsc8vSj8q2nXxvUsYHg7EVjhne9Wg/GMjpvUIj8nkEgq JJxOge1JdsQxiVC63V5TC4Ear/XLAvWhFDnAKE6/TT/1WVwNYt3Vv+4APrZY6+p2GSddAF LNX3QIEEf67iBxFSggOwcM+YTw/1t944VrkcndNLgPcTbi8Cgzv/YLhCSzyeA7LYQR6LBQ tGL8LwAhBWGHNC9wnd8WufS9Z9OEkfwPQdWk350TCepD//YlMuyL0OEa9yAlKOhAQkn2eK vNsDVrUTh13a3TzsDngiTuWjDAAtYBKSDbz90fhDVz7BDJw6ySE333GS9HoMVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747634879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4IAZLVbXJkJOMqUVpMyEE8sm+pGQ0rouanmkb5MNIQ=; b=Eiu5vFS7QOS30BFMSi/nqNVYJ3RzJOTwAlAWPJAQeGMn+hhOKE8XzmthSW5FJiQjUnjEE8 ENB7snbJEN4AmlzWqlKNGnXD9wkXLfhr1Osz9XQIaf4SZrpIgmvNoKdqdM4X2primEumEH ICgxi5OGN9RzjZUy44GsRpAeRlDo2DUCK1yWrME+tvsBjAC8EsbGjAgvg5S5bj7Rp9wqGW DJsxoDZ9lzr3KlxHbGTU8gWfjDbQodvzefq98dEjIpFGc5DoIcjmzGZ6v7TN+DFixPGwIe in2cUmgQ1JkF/YZ300++szd2Bj7hiLQMG3vl5m1S3FyfRnXFub3167b+tyJZWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747634879; a=rsa-sha256; cv=none; b=RhscC/kYiGKfsdHfUaoYVYks7AC5lWqoTzGgC0SEBCT1OLBWPhw4DmfIGHl7odYXiUbocW pGi/sT0qO8m8ExO2W7rDwOQWqKFsgG2BIy5Arkoxf/0lnqIgN2+wAO2Au6hvS4NJrBlcT6 SXDemwnwqvGiATAufB+aEHdWTdlxKc98MpUf87aLV6pf9ZUiL/HezvtqzucCHlXqzlhA4k 8Xo6+8km7uNi/PfhKRfwwqvwj1oIBMMhAw8XFYMMyKnSvuG8cMH7BzhyOGVGZaDJIJuQoR bjRy2Brcv0eFKqd1KylQ8Mhzg9Q59ukb7mdD0L003Nn/J+6MtCfgAuf7WjVsQA== 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 4b16g32ZKZzrnY; Mon, 19 May 2025 06:07: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 54J67xcC037848; Mon, 19 May 2025 06:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J67xVg037844; Mon, 19 May 2025 06:07:59 GMT (envelope-from git) Date: Mon, 19 May 2025 06:07:59 GMT Message-Id: <202505190607.54J67xVg037844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c0fdd2bf944b - main - pthread_switch_add_np(3): remove List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0fdd2bf944bb646116c6cd9879560579ebaa563 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c0fdd2bf944bb646116c6cd9879560579ebaa563 commit c0fdd2bf944bb646116c6cd9879560579ebaa563 Author: Konstantin Belousov AuthorDate: 2025-05-16 13:25:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-19 06:07:43 +0000 pthread_switch_add_np(3): remove The interface is not functional with libthr and returns not supported error always. There is no point in providing it to userspace or document. The symbols are kept for ABI compatibility, of course. Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50376 --- include/pthread_np.h | 7 --- lib/libthr/thread/thr_switch_np.c | 5 +- share/man/man3/Makefile | 2 - share/man/man3/pthread_np.3 | 10 ---- share/man/man3/pthread_switch_add_np.3 | 86 ---------------------------------- 5 files changed, 4 insertions(+), 106 deletions(-) diff --git a/include/pthread_np.h b/include/pthread_np.h index 8f0180d4bd04..dcc762156a67 100644 --- a/include/pthread_np.h +++ b/include/pthread_np.h @@ -34,11 +34,6 @@ #include #include -/* - * Non-POSIX type definitions: - */ -typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); - /* * Non-POSIX thread function prototype definitions: */ @@ -67,8 +62,6 @@ int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); -int pthread_switch_add_np(pthread_switch_routine_t); -int pthread_switch_delete_np(pthread_switch_routine_t); int pthread_timedjoin_np(pthread_t, void **, const struct timespec *); __END_DECLS diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c index 80cd34c15650..59a9a4c7e1a3 100644 --- a/lib/libthr/thread/thr_switch_np.c +++ b/lib/libthr/thread/thr_switch_np.c @@ -40,10 +40,13 @@ #include "thr_private.h" - __weak_reference(_pthread_switch_add_np, pthread_switch_add_np); __weak_reference(_pthread_switch_delete_np, pthread_switch_delete_np); +typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); +int _pthread_switch_add_np(pthread_switch_routine_t routine); +int _pthread_switch_delete_np(pthread_switch_routine_t routine); + int _pthread_switch_add_np(pthread_switch_routine_t routine __unused) { diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index a1a5febb2bf8..5469a69ab265 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -462,7 +462,6 @@ PTHREAD_MAN= pthread.3 \ pthread_spin_lock.3 \ pthread_suspend_all_np.3 \ pthread_suspend_np.3 \ - pthread_switch_add_np.3 \ pthread_testcancel.3 \ pthread_yield.3 @@ -527,7 +526,6 @@ PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ pthread_spin_lock.3 pthread_spin_trylock.3 \ pthread_spin_lock.3 pthread_spin_unlock.3 -PTHREAD_MLINKS+=pthread_switch_add_np.3 pthread_switch_delete_np.3 PTHREAD_MLINKS+=pthread_testcancel.3 pthread_setcancelstate.3 \ pthread_testcancel.3 pthread_setcanceltype.3 PTHREAD_MLINKS+=pthread_join.3 pthread_peekjoin_np.3 \ diff --git a/share/man/man3/pthread_np.3 b/share/man/man3/pthread_np.3 index caab8cc13209..9fb2544dd3c9 100644 --- a/share/man/man3/pthread_np.3 +++ b/share/man/man3/pthread_np.3 @@ -132,16 +132,6 @@ Suspend the specified thread. Suspend all active threads. .It Xo .Ft int -.Fn pthread_switch_add_np "pthread_switch_routine_t routine" -.Xc -Install a routine that is called every time a thread context switches. -.It Xo -.Ft int -.Fn pthread_switch_delete_np "pthread_switch_routine_t routine" -.Xc -Remove a routine that is called every time a thread context switches. -.It Xo -.Ft int .Fo pthread_timedjoin_np .Fa "pthread_t thread" "void **value_ptr" "const struct timespec *abstime" .Fc diff --git a/share/man/man3/pthread_switch_add_np.3 b/share/man/man3/pthread_switch_add_np.3 deleted file mode 100644 index f02ff15eedc3..000000000000 --- a/share/man/man3/pthread_switch_add_np.3 +++ /dev/null @@ -1,86 +0,0 @@ -.\" Copyright (c) 2003 Alexey Zelkin -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd October 12, 2021 -.Dt PTHREAD_SWITCH_ADD_NP 3 -.Os -.Sh NAME -.Nm pthread_switch_add_np , -.Nm pthread_switch_delete_np -.Nd thread context switches debugging primitives -.Sh LIBRARY -.Lb libpthread -.Sh SYNOPSIS -.In pthread_np.h -.Ft int -.Fn pthread_switch_add_np "pthread_switch_routine_t routine" -.Ft int -.Fn pthread_switch_delete_np "pthread_switch_routine_t routine" -.Sh DESCRIPTION -An application is allowed to monitor the thread context switches inside -the threading library. -An application can install a routine that gets called every time a thread -(explicitly created by an application with the -.Xr pthread_create 3 -function) gets the context switched. -The routine is passed the thread IDs of the threads that are -being switched in and out. -Installation and removal of these hooks may be done using the -.Fn pthread_switch_add_np -and -.Fn pthread_switch_delete_np -functions respectively. -.Sh RETURN VALUES -If successful, -these functions return 0. -Otherwise, an error number is returned to indicate the error. -.Sh ERRORS -The -.Fn pthread_switch_add_np -may fail if: -.Bl -tag -width Er -.It Bq Er EINVAL -.Dv NULL -pointer was passed in the -.Fa routine -argument. -.El -.Pp -The -.Fn pthread_switch_delete_np -may fail if: -.Bl -tag -width Er -.It Bq Er EINVAL -The -.Fa routine -argument is different from the argument previously passed to the -.Fn pthread_switch_add_np -function. -.El -.Sh SEE ALSO -.Xr pthread_create 3 , -.Xr pthread_np 3 -.Sh AUTHORS -This manual page was written by -.An Alexey Zelkin Aq Mt phantom@FreeBSD.org . From nobody Mon May 19 06:08:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b16g46zwxz5wYjL; Mon, 19 May 2025 06:08: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 4b16g448d1z3mBq; Mon, 19 May 2025 06:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747634880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pNTeyeNLBugHMQAoC1sRrGkGTEFnRHAnFTSG1smfVeI=; b=Mfo3W+rSZOhL4ylxHmDXWaJ8JYpfmAe5y9D2LPHWygAA31fkYqQkenGU3ro1v1vm+25WUW jv4GDVSv27+uf/ijMsAjZy2j695L60jynPaip20VoVAYLEc19yjKsK5Lisb+E/aePqUboG 3lzcrl6w53m8/nhK+VQ7rclh5yV0omXveezFYVdNJ+vuyEea3Dr0cnqMizJR7o0PgRJDFg s33by/uYdI/zXtyZhj78o+Sg9IfA5Y+lljYDEFcuigJe89BsOrJtrUD91o+THGQv0Wrv9l NxJS6jChb1M4jb/IkEpsyKjgXEv3uGp1CmsMhPv8lT4vWNOroWWuQbjCwyGHoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747634880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pNTeyeNLBugHMQAoC1sRrGkGTEFnRHAnFTSG1smfVeI=; b=tqX3KLH8QHzAIYahTcRATEnLsMS/hxhvrtIawr4Nj9o6S0YoOeWmNcrOWxmwNItbX1QTUT QGmAUXprfY6H5EK8ycGHuVisiymBlenDUUTJtY71t7yVm97ShwJ8ZIM1I+Vlkktd3nEEln Sw1jr4wesTQ0I7fPa7jrCaQmI/z2asW/jNLvTkZA3cE9S4UQ42wXXXCNOBvVdx9CyCt7Ps 4GBSG23bljfTbII2uWxmNWd1876yxtHZ/LNx6xqGjrpSig7nMXSOzcyFG91lL2vd8K7Zq1 OdEHRzEexIPNu2KnpCvk6SwnQiurbzJlobDjefWd1VZ+PAKS58n2cwyZ44ytmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747634880; a=rsa-sha256; cv=none; b=ie6dPfzNz3JzGUnynGlx+LV2b2PaUcfIbAdnkDUMLEjQmCkQOR2ZdPu/6kdojNysQrcx0F nirq+ELhiJYRapVpdJqkU+uoz7whn/Sey5XpgQohC4sUjo2TG+4uCW8DpJiHfyWLFrvn6W Xk3P4MXPPJkJSCeTc8hJzCtz9P8V1U+nBXQ4LiQ4KH9MD06m2dkxSbaIEvjdVMXezhlNRT on9SwMjayaG7zleX4KNlUSTjSkAv89Ln4ShFSk8oAhakanxrA+estf82DW195MyVRp2FT6 0Eyl3oECSG39IJ2A4Z5aIFDO2UogJ6x3yUeWmaN9/8XZWJ0IWb6ZcR2sZNEMpg== 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 4b16g432xhzs89; Mon, 19 May 2025 06:08: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 54J680Ap037896; Mon, 19 May 2025 06:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J680oL037893; Mon, 19 May 2025 06:08:00 GMT (envelope-from git) Date: Mon, 19 May 2025 06:08:00 GMT Message-Id: <202505190608.54J680oL037893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 31760ee65ae3 - main - libthr: add stable user interface for sigfastblock(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31760ee65ae3e79434fb257d93e17a6de6021f48 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=31760ee65ae3e79434fb257d93e17a6de6021f48 commit 31760ee65ae3e79434fb257d93e17a6de6021f48 Author: Konstantin Belousov AuthorDate: 2025-05-16 13:18:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-19 06:07:43 +0000 libthr: add stable user interface for sigfastblock(2) Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50377 --- include/pthread_np.h | 2 ++ lib/libthr/pthread.map | 2 ++ lib/libthr/thread/thr_sig.c | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/include/pthread_np.h b/include/pthread_np.h index dcc762156a67..a9e738540db4 100644 --- a/include/pthread_np.h +++ b/include/pthread_np.h @@ -59,6 +59,8 @@ int pthread_resume_np(pthread_t); int pthread_peekjoin_np(pthread_t, void **); void pthread_set_name_np(pthread_t, const char *); int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); +void pthread_signals_block_np(void); +void pthread_signals_unblock_np(void); int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map index f75ef4c9135e..1c8dde03367b 100644 --- a/lib/libthr/pthread.map +++ b/lib/libthr/pthread.map @@ -339,5 +339,7 @@ FBSD_1.6 { }; FBSD_1.8 { + pthread_signals_block_np; + pthread_signals_unblock_np; pthread_sigqueue; }; diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index c5ee5aa8423b..2cd3de512d1c 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "un-namespace.h" #include "libc_private.h" @@ -163,6 +164,24 @@ _thr_signal_block_setup(struct pthread *curthread) __sys_sigfastblock(SIGFASTBLOCK_SETPTR, &curthread->fsigblock); } +void +pthread_signals_block_np(void) +{ + struct pthread *curthread; + + curthread = _get_curthread(); + _thr_signal_block(curthread); +} + +void +pthread_signals_unblock_np(void) +{ + struct pthread *curthread; + + curthread = _get_curthread(); + _thr_signal_unblock(curthread); +} + int _thr_send_sig(struct pthread *thread, int sig) { From nobody Mon May 19 06:08:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b16g60LrYz5wZ5G; Mon, 19 May 2025 06:08: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 4b16g54jdJz3m4N; Mon, 19 May 2025 06:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747634881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXkZf0ZJXoDfoOGhzXlmGHRuTsQ8GJ/UGu8V/xLZsNE=; b=Hm7CT49Nc3x/7FM2iAKFKMnHtTSjRz9BjA1aOjhZNfLDLltO1CmC9/kdQwLkRMW9AXG66f pVkpRjRJ+Csb5ACcVEqzVtEA3Rt+6dJfblzAjC+bPJTtKnqIgFljuaVkpQ6aliCgklz421 UWrFak6amnByW8jeAuDNlSnrk6I3WSgs4JLJTDEE+18dhDoF4WXVlaVunefVljmBrGBTNH QHT1prTObnrcf+YtQ3m/vVbnkdyMobG75mMv2Bbt8lEbEt4L/YnqozC0WKpFftbwlJ5nOS 66YPwDTSLapBF0QxqP992U+uvgfC/2O2vo9UJadYVpMvpsQK5n5JnpNRgF4S+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747634881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXkZf0ZJXoDfoOGhzXlmGHRuTsQ8GJ/UGu8V/xLZsNE=; b=GVETx/iXk48Wep1D4zzpclSI83JUCfIpor2Ri8uIxnH2nreLskDWlze9BHz7UUXd9akza1 X+Odjx2P0+F0eBeaghV7KKZQ+AN9KVTHnI19O7q7/deZs/zweLcKmHflv3Eu9RR6ZIzfML 4sMb9WKQBIz+TiRdMY5rg0izHfYIqaPSbF/BqJQDWU+O1U/Dv0flg3xHBzx1zRKCXyarwC kVQzWpN8mB+gbo/o1wRSwzgBUFbufM4E/SmDr2uVLXWCRvu6ptakpoCP+68tkCDrMH32+6 KwkVtQWJ4tJpKiXdnWP6VsqwSUbt2mQlsdlo1wZJUw7yVYp48ntat5taBWW52g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747634881; a=rsa-sha256; cv=none; b=LRMmTqDkJigitTLvymQMwa8QcjIneurSI2fNRaMPZuSaoWwKIRRyZAD3miBcpNsscM6MKr Tb4CJSHqWdXspP+pQj6YrrLhl8SMLls085Ue5Qy2S8sWK5JCUQPMK9KLRIPobm+1m9xh4V KCJAspFEjnUJRncibFu7EZPu8tr840gzh7hL9x6D5EW+9PzxkTUPHURhkUoOl9ak4wIMqy QS+5dDUBSR6Z2cdQ9dvtBZUQUzB91CFt47t1rIULguW1wPrTZ/NnaA83hFU83/Yrv2VYcq KFckZPN+BtMOdUDRH7jUUcXy2TRQ9tQ3A1VPwHgzokBPd1cv5TkDBKM409T7MQ== 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 4b16g543CXzsGY; Mon, 19 May 2025 06:08: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 54J681A4037932; Mon, 19 May 2025 06:08:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J681l7037929; Mon, 19 May 2025 06:08:01 GMT (envelope-from git) Date: Mon, 19 May 2025 06:08:01 GMT Message-Id: <202505190608.54J681l7037929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1393f9a36b9c - main - pthread_signals_block_np(3): document List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1393f9a36b9c471d4af3518a3d3bb56c2a6adc58 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1393f9a36b9c471d4af3518a3d3bb56c2a6adc58 commit 1393f9a36b9c471d4af3518a3d3bb56c2a6adc58 Author: Konstantin Belousov AuthorDate: 2025-05-16 13:24:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-19 06:07:43 +0000 pthread_signals_block_np(3): document Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50377 --- share/man/man3/Makefile | 3 ++ share/man/man3/pthread_np.3 | 6 +++ share/man/man3/pthread_signals_block_np.3 | 81 +++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 5469a69ab265..6cdd443ec067 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -458,6 +458,7 @@ PTHREAD_MAN= pthread.3 \ pthread_setspecific.3 \ pthread_sigmask.3 \ pthread_sigqueue.3 \ + pthread_signals_block_np.3 \ pthread_spin_init.3 \ pthread_spin_lock.3 \ pthread_suspend_all_np.3 \ @@ -523,6 +524,8 @@ PTHREAD_MLINKS+=pthread_schedparam.3 pthread_getschedparam.3 \ PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ pthread_set_name_np.3 pthread_getname_np.3 \ pthread_set_name_np.3 pthread_setname_np.3 +PTHREAD_MLINKS+=pthread_signals_block_np.3 \ + pthread_signals_unblock_np.3 PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ pthread_spin_lock.3 pthread_spin_trylock.3 \ pthread_spin_lock.3 pthread_spin_unlock.3 diff --git a/share/man/man3/pthread_np.3 b/share/man/man3/pthread_np.3 index 9fb2544dd3c9..c6f0efac7415 100644 --- a/share/man/man3/pthread_np.3 +++ b/share/man/man3/pthread_np.3 @@ -116,6 +116,11 @@ Sets the specified thread's name. .Xc Sets the specified thread's name. .It Xo +.Ft void +.Fn pthread_signals_block_np void +.Xc +Blocks all asynchronous signals, quickly. +.It Xo .Ft int .Fn pthread_single_np void .Xc @@ -213,6 +218,7 @@ instead. .Xr pthread_resume_all_np 3 , .Xr pthread_resume_np 3 , .Xr pthread_set_name_np 3 , +.Xr pthread_signals_block_np 3 , .Xr pthread_suspend_all_np 3 , .Xr pthread_suspend_np 3 , .Xr pthread_switch_add_np 3 diff --git a/share/man/man3/pthread_signals_block_np.3 b/share/man/man3/pthread_signals_block_np.3 new file mode 100644 index 000000000000..de33f4e6189e --- /dev/null +++ b/share/man/man3/pthread_signals_block_np.3 @@ -0,0 +1,81 @@ +.\" Copyright (c) 2025 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" This documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" +.Dd May 16, 2025 +.Dt PTHREAD_SIGNALS_BLOCK_NP 3 +.Os +.Sh NAME +.Nm pthread_signals_block_np , +.Nm pthread_signals_unblock_np +.Nd fast asynchronous signals blocking and unblocking +.Sh LIBRARY +.Lb libpthread +.Sh SYNOPSIS +.In pthread_np.h +.Ft void +.Fn pthread_signals_block_np "void" +.Ft void +.Fn pthread_signals_unblock_np "void" +.Sh DESCRIPTION +The +.Fn pthread_signals_block_np +and +.Fn pthread_signals_unblock_np +functions provide user programs an interface to the fast asynchronous +signals blocking facility +.Xr sigfastblock 2 . +.Pp +Blocking signals with +.Fn pthread_signals_block_np +disables delivery of any asynchronous signal, until unblocked. +Signal blocking establishes a critical section where the execution +flow of the thread cannot be diverted into a signal handler. +Blocking signals is fast, it is performed by a single memory write into +a location established with the kernel. +.Pp +Synchronous signal delivery cannot be blocked in general, including with +these functions. +.Pp +The blocked state established by the +.Fn pthread_signals_block_np +is not completely POSIX-compliant. +Specifically, system calls executed while in a blocked section, +might abort sleep and return +.Er EINTR +upon queuing of an asynchronous signal to the thread, +but the signal handler is not called until the last unblock is done. +.Pp +Calls to +.Nm pthread_signals_block_np +can be nested, and must be complemented by an equal count of +calls to +.Nm pthread_signals_unblock_np +to return the calling thread to the standard mode of signal receiving. +.Pp +An example use of these function might be the construction of the CPU +state that cannot be done atomically, and which includes stages where +the state of the thread is not ABI compliant. +If a signal is delivered while such state is not yet finished, signal +handlers would misbehave. +Using standard functions +.Pq Fn sigprocmask +to establish critical section might be much slower, because +.Fn sigprocmask +is system call, while +.Fn pthread_signals_block_np +consists of a single atomic memory write. +.Sh RETURN VALUES +The functions do not return a value. +.Sh ERRORS +There are no errors reported by the functions. +.Sh SEE ALSO +.Xr sigfastblock 2 , +.Xr sigprocmask 2 , +.Xr pthread_sigmask 3 , +.Xr pthread_np 3 From nobody Mon May 19 08:11:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b19PC4VvMz5wjJH; Mon, 19 May 2025 08:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b19PC3qLWz3g1k; Mon, 19 May 2025 08:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747642271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNVb2JI0VMvVfvXvLHIahuwGEr9y6a2suH9I8wLwbpU=; b=I8Wanu14ueAD9yrWcJZDb/VekcXRJ1v2tBKpAs/DgVu6JeNkbwxrRRlhJR+a4pHGqkjbwS lFVLzf7XhN8bfqWgYLGw8lgZKPgk51yPTjCRDbU0OI/qn+eRztwaq3T5z+LWf6F9h45nKh ws02DJRW1IBML2z3RyJfW0eU/B2+XxGHhvh8+GZ0KgYmCY5kpq0qQokVQD1I/i7zuOv0jS 91beRDBMIBc//pwMtyI7XUE+Tot1HvocIwVOpp8+B3CYuPon+JYrsJ5PDitNGJy1rqmpmV JxdPxg4Lc7wp5quFljDIu3bQGco5tGVt9cb922/qB3MUHxglvrfx6B7QWELIRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747642271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNVb2JI0VMvVfvXvLHIahuwGEr9y6a2suH9I8wLwbpU=; b=BcLVIGq8Vgl+7x1mJIdwfmx2VqjQOk9bKpZdRO0MpyqeBc63ReyBt8271wb79+oecctwIk ui3BCWXtF9p6PPb7J3cObiRh+yTxmmVeryfLU+0on4kUHiyZKvFYm0Xmdj39s1kpy2uF7h it7yA6mHR2BAkZ2Z35yK/xDJlMbx2csKrpWnynOa11u41B2qk68h34Z67625ln+gNiK4HG t7MO8ZBkrv0OPZYCsi+7YvWcLTVY55EWZuC7jEwu/aups2bfTxXff07OiZz63vtM4TVNRT XlAPmGMq8LPJ11RklpvDN8rIWmveVsaZw94fEv6cun+Z2HatuPKpkTG2BIu4hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747642271; a=rsa-sha256; cv=none; b=L+pxJcPRvxZR9VFsS2XimiTXLDdiFlzQJykPcodTGtVC2bYNbeKdwy+9CIoDaL57PaMLBs t4M/bysHJfX3momt0wdEPBx+Hu4Em+RXrHF1oXUEvkCR6Evmw3EyoVJgOhzsguGoUJJB1n 2liQDn8gV7aR1HDv7BbitOi4hDWvL0b1qh5DgD5f+iY2GjH0aod/d6Q/wHvEl9dOXZG0ZS zRs6tgwk2G4lMFcl2gTLcP8MBzOeXwbxxPgkJZ2A+PRS+odRL4JAEDpSCFeSgjJQJ626vf 3UeqoxiYAG1WLEN7r8rGcOydYPQpsiUI+b7kgp6XmZmKMJ3e7HDzRXpdbYqzgg== 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 4b19PC3CzvzvSq; Mon, 19 May 2025 08:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54J8BBIO074625; Mon, 19 May 2025 08:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J8BBtP074622; Mon, 19 May 2025 08:11:11 GMT (envelope-from git) Date: Mon, 19 May 2025 08:11:11 GMT Message-Id: <202505190811.54J8BBtP074622@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: f69afe4201ff - main - zfsboot: fix misuse of the phrase zpool List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f69afe4201ff33da0b3c3ca464a92e2e0b07ac43 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f69afe4201ff33da0b3c3ca464a92e2e0b07ac43 commit f69afe4201ff33da0b3c3ca464a92e2e0b07ac43 Author: Graham Perrin AuthorDate: 2025-01-10 18:02:25 +0000 Commit: Lexi Winter CommitDate: 2025-05-19 08:10:29 +0000 zfsboot: fix misuse of the phrase zpool A pool is not a zpool. Reviewed by: jbh, ivy Approved by: des (mentor) MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1569 --- usr.sbin/bsdinstall/scripts/zfsboot | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index f4670e0d272c..493f137092ec 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -121,7 +121,7 @@ f_include $BSDCFG_SHARE/variable.subr : ${ZFSBOOT_BOOT_TYPE:=} # -# How much swap to put on each block device in the boot zpool +# How much swap to put on each block device in the boot pool # NOTE: Value passed to gpart(8); which supports SI unit suffixes. # : ${ZFSBOOT_SWAP_SIZE:=2g} @@ -137,7 +137,7 @@ f_include $BSDCFG_SHARE/variable.subr : ${ZFSBOOT_SWAP_MIRROR=} # -# Default ZFS datasets for root zpool +# Default ZFS datasets for root pool # # NOTE: Requires /tmp, /var/tmp, /$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME # NOTE: Anything after pound/hash character [#] is ignored as a comment. @@ -285,12 +285,12 @@ msg_odd_disk_selected="An even number of disks must be selected to create a RAID msg_ok="OK" msg_partition_scheme="Partition Scheme" msg_partition_scheme_help="Select partitioning scheme. GPT is recommended." -msg_please_enter_a_name_for_your_zpool="Please enter a name for your zpool:" +msg_please_enter_a_name_for_your_pool="Please enter a name for your pool:" msg_please_enter_amount_of_swap_space="Please enter amount of swap space (SI-Unit suffixes\nrecommended; e.g., \`2g' for 2 Gigabytes):" -msg_please_select_one_or_more_disks="Please select one or more disks to create a zpool:" +msg_please_select_one_or_more_disks="Please select one or more disks to create a pool:" msg_pool_name="Pool Name" msg_pool_name_cannot_be_empty="Pool name cannot be empty." -msg_pool_name_help="Customize the name of the zpool to be created (Required)" +msg_pool_name_help="Customize the name of the pool to be created (Required)" msg_pool_type_disks="Pool Type/Disks:" msg_pool_type_disks_help="Choose type of ZFS Virtual Device and disks to use (Required)" msg_processing_selection="Processing selection..." @@ -323,9 +323,9 @@ msg_unsupported_partition_scheme="%s is an unsupported partition scheme" msg_user_cancelled="User Cancelled." msg_yes="YES" msg_zfs_configuration="ZFS Configuration" -msg_please_enter_options_for_your_zpool="Please enter options for your zpool" +msg_please_enter_options_for_your_pool="Please enter options for your pool" msg_zfs_options_name="ZFS Pool Options" -msg_zfs_options_name_help="Customize ZFS options for the zpool to be created" +msg_zfs_options_name_help="Customize ZFS options for the pool to be created" ############################################################ FUNCTIONS @@ -748,8 +748,8 @@ dialog_menu_layout() # zfs_create_diskpart $disk $index # -# For each block device to be used in the zpool, rather than just create the -# zpool with the raw block devices (e.g., da0, da1, etc.) we create partitions +# For each block device to be used in the pool, rather than just create the +# pool with the raw block devices (e.g., da0, da1, etc.) we create partitions # so we can have some real swap. This also provides wiggle room incase your # replacement drivers do not have the exact same sector counts. # @@ -905,7 +905,7 @@ zfs_create_diskpart() fi fi - # NB: zpool will use the `zfs#' GPT labels + # NB: ZFS pools will use `zfs#' GPT labels if [ "$ZFSBOOT_BOOT_TYPE" = "BIOS+UEFI" ]; then if [ "$ZFSBOOT_BOOT_POOL" ]; then bootpart=p3 swappart=p4 targetpart=p4 @@ -1006,7 +1006,7 @@ zfs_create_diskpart() f_eval_catch $funcname gpart "$GPART_CREATE" BSD ${disk}s1 || return $FAILURE - # NB: zpool will use s1a (no labels) + # NB: ZFS pools will use s1a (no labels) bootpart=s1a swappart=s1b targetpart=s1d mbrindex=4 # @@ -1594,7 +1594,7 @@ dialog_menu_diskinfo() return $SUCCESS } -dialog_zpool_name() +dialog_pool_name() { local prompt="$* is already taken, please enter a name for the ZFS pool \ (Or confirm using the same name by just pressing enter)" @@ -1639,7 +1639,7 @@ for pool in ${pools}; do f_dprintf "Checking ${pool} against ${ZFSBOOT_POOL_NAME}" if [ "${pool}" = "${ZFSBOOT_POOL_NAME}" ]; then f_dprintf "Pool ${pool} already taken" - ZFSBOOT_POOL_NAME=$(dialog_zpool_name "${ZFSBOOT_POOL_NAME}") + ZFSBOOT_POOL_NAME=$(dialog_pool_name "${ZFSBOOT_POOL_NAME}") break fi done @@ -1771,7 +1771,7 @@ while :; do ?" $msg_pool_name") # Prompt the user to input/change the name for the new pool f_dialog_input input \ - "$msg_please_enter_a_name_for_your_zpool" \ + "$msg_please_enter_a_name_for_your_pool" \ "$ZFSBOOT_POOL_NAME" && ZFSBOOT_POOL_NAME="$input" ;; @@ -1860,7 +1860,7 @@ while :; do ?" $msg_zfs_options_name") # Prompt the user to input/change the pool options f_dialog_input input \ - "$msg_please_enter_options_for_your_zpool" \ + "$msg_please_enter_options_for_your_pool" \ "$ZFSBOOT_POOL_CREATE_OPTIONS" && ZFSBOOT_POOL_CREATE_OPTIONS="$input" ;; From nobody Mon May 19 08:34:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b19wm3SVmz5wlCf; Mon, 19 May 2025 08:35:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b19wm2x20z3rwP; Mon, 19 May 2025 08:35:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747643704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JiXsd09DeP4oxLiwrfswDfr8A4CJHVqVEq8YxLr7yRA=; b=g2+hOtgSRiGThh8b3+9sqI5BbjHAljkbfxL3ETNGxS5zN3dltyXR8C3tnLKs9BJKRZhQhV 7sFhvvHpjn7S7RcrMnVcf6hMvhLPPNXmXi+oIcmZFGZaEA2QoAJ3JNcIgdTxvT393t4uDD A00pqr8NXMP4LSYnGRwgZgBMszGYWC35I6xJkMiQDIaNhCylvMtYwSyU73VoeDSaNl8EXv lUlYDJQmuOdFq/px8ksSUYHC1YUER90bGJvpIuCPcvSaCCp6dlt4JLOeXmELk17/i3VkuW intuRISllYNAHjWrJdP7w5NBNYHW1RSUa1p5LdXh5cL3N+uya+HN6pszZud5kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747643704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JiXsd09DeP4oxLiwrfswDfr8A4CJHVqVEq8YxLr7yRA=; b=IbMwaK+yf+AcC9iur9btNn4eC4/gieKLNUgir1CixvWphnF39yzqz3NpvSahZv8sP/PKns y31F5QcJ8VzKliFsqtFucd8EoO+brgZbcuIvz/kxN0+MEw2iWC7aXR9SojcOp6SJnbmmiD zoNH7psfrHO9KFoK1eACP1XlHkxyz47laIXqcpYoxJ+DARbYZmhHVd3LUvdFKZU+QeV3iQ TUgJAN5yqaYDj3gexSBAWLeyZd00fliK2O9RhvtIn26+lEmBaKDRZSSwpWPAVxmK9T8gIy q+0g2YewKbxqOi0xtWCIxRgUE9kzNN/rcP1sdYWj4cbLzTOWjYTqrNHRJASJlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747643704; a=rsa-sha256; cv=none; b=iigEsPAzCOnUkWVxRqZDpwX/w0hpObOLv2bABLvmZyKP0o0pM9nHjmbv+gZErL/QFF5M42 ND0puyIiyCoKr9yZMwwsO9YHspttXF7BDccpXBXJOpHd9uYtyEkyfvhb3TvjUuNKiFeVzI iViaPXtir8S8B7LA3o3SEGtbMsdgCi5/BhwJqNlrcP2Rjs5qvBdhYhXx+cp374uSapzBv4 3DUpXvxmVQacXXY28cUrM4768ZjmMbXRlDHeSZuld1rWgCedwLDEqMkPTHH+PDdJgmk4Ep AQyE9DcHOzUmo/LLIMxjZvy55LpPxXaJxp3To6SyVG7FrwFuySHuJTFT0hGQWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R11" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b19wm1Vsjz7km; Mon, 19 May 2025 08:35:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 972FD1EE95; Mon, 19 May 2025 10:35:00 +0200 (CEST) From: Kristof Provost To: Shawn Webb Cc: Mitchell Horne , Lexi Winter , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b61850c4e6f6 - main - bridge(4): default net.link.bridge.member_ifaddrs to false Date: Mon, 19 May 2025 10:34:56 +0200 X-Mailer: MailMate (2.0r6255) Message-ID: In-Reply-To: References: <202505150004.54F04FhR046897@gitrepo.freebsd.org> <94441836-bb03-4c80-b603-aaa2997c4d29@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; markup=markdown Content-Transfer-Encoding: quoted-printable On 18 May 2025, at 22:39, Shawn Webb wrote: > I wonder if there is any security difference between DHCP on the > physical interface versus the bridge. Having the bridge grab an IP via > DHCP (or IPv6 SLAAC/DHCPv6) means that VMs much be trusted. If a VM is > compromised, a threat actor could redirect traffic on the host by > running their own DHCP service in the compromised VM. > > The question I have, though, is: is this an issue when the physical > interface is used instead of the bridge for grabbing a dynamic IP? > > So, I guess I'm asking, is there any security difference between the > following two configs: > > =3D=3D=3D=3D BEGIN CONFIG 1 =3D=3D=3D=3D > ifconfig_re0=3D"DHCP" > cloned_interfaces=3D"bridge0 tap0" > ifconfig_bridge0=3D"addm re0 addm tap0" > =3D=3D=3D=3D END CONFIG 1 =3D=3D=3D=3D > > =3D=3D=3D=3D BEGIN CONFIG 2 =3D=3D=3D=3D > ifconfig_re0=3D"up" > cloned_interfaces=3D"bridge0 tap0" > ifconfig_bridge0=3D"DHCP addm re0 addm tap0" > synchronous_dhclient=3D"YES" > =3D=3D=3D=3D END CONFIG 2 =3D=3D=3D=3D > I=E2=80=99ve not actually tested it, but given that ether_output() (which= is going to be the ifp->if_output for most interfaces) does this: https:= //cgit.freebsd.org/src/tree/sys/net/if_ethersubr.c#n417 (i.e. it outputs via if_bridge=E2=80=99s code rather than directly) I bel= ieve this doesn=E2=80=99t make any difference at all. =E2=80=94 Kristof From nobody Mon May 19 09:14:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1Bnr5tQMz5wnn6; Mon, 19 May 2025 09:14: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 4b1Bnr525Vz47Pb; Mon, 19 May 2025 09:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uoQHHc9xkSaAklEYNljVn3YCdPIK8vBt34dNCnH1meg=; b=gYu6Mccj9cKILiPoES1EVNDQX3rRhA1kPHh/W4g9JNOrcSjHL1TVM258ITes3gt9DxQ7AF ml2HF83vPHHyPvEylThZ2hvtgcQ5PUOjoMsfutTZDCW3RvUJ9aIzuo8Iy2Yev8HisIDJKF XqhkcZUWZOhHC/3DcdTcBvADY3o6X7x24izLJZFACqq1/nQ6XtURIoXWXtpgj03axh7DNO h1AbV17UAuYseZAdJR37DjhiLh9mXC4CCZ3QpfzLp115Phu2BV0jEdOEPWiMGFsFyxIY+7 gkGHe1SsdksCeksVKLfiQbOlhFanWqi7n+pyuAYvqFNaz5Eo6Cwu7nONAjXfdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uoQHHc9xkSaAklEYNljVn3YCdPIK8vBt34dNCnH1meg=; b=Uywt9ao1iiK2tV24nShFXWb4s4FNqNykkgtGLeV93zHX/zMq3inEN+CMwmm5NYX47zpFZa wpmGITh7SLiQxUrk30/vfB/0QrXI0Yt02ak+V+I7TdkIiVMtaQHPcRVewnE1aK6emq9lsg +aMOGHwvy79cOgxy+XiGnr9je/+MND2+r5pGNhfZlNXlxORxvugMTDiTJVxFzH9bCRocwZ Bn3DaqTU+18olpItCT/v84561Ef4PYrzprkrEKGf0RksE4SS2bXH4inY4It/kUEHit0PDr eAyJZlPBMIJxpmGRVNlcIS5s6ZVuPo8wjCJxLk2g1ruZGpcyyaGDBZ3p7gaeNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747646048; a=rsa-sha256; cv=none; b=GzvYi3rN1ul9unl7DNoEaR3XeCdY0tt/pyuCtkkNTTA1hG34N0ixfcvklszxkUxYswsa8X hzIoP5/hWkqfwFrFM1j7tG3Nto7Np8ILsXVkPvHR1C37U1J6S+TOzPMqnTUFz+LHirS2xG u/y3mcrjkkw4AeZT5p8onFdA51/rZt0uluyNHj44aKp/nACBMMXB2tOInInE1Vh0UYPeAy IAE3tOuHz7MEk/soprITgifHI3djkGIebT1sahIbb7lbV9DFT1EJCqG74BmSi8gkPQcPQf 7BmTy03bQ3IEYZrNnxBTLfKeixQ3rrJLZ+9cvH/ebNVzuIvN61xEo5jSHHtaKg== 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 4b1Bnr4RtZzy9Z; Mon, 19 May 2025 09:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54J9E8NJ093115; Mon, 19 May 2025 09:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J9E8DN093112; Mon, 19 May 2025 09:14:08 GMT (envelope-from git) Date: Mon, 19 May 2025 09:14:08 GMT Message-Id: <202505190914.54J9E8DN093112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 97c799661a76 - main - dwc_otg_fdt: do not create and leak extra usbus child List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97c799661a76b78963fd9f92a7e6bb452ebba999 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=97c799661a76b78963fd9f92a7e6bb452ebba999 commit 97c799661a76b78963fd9f92a7e6bb452ebba999 Author: Andriy Gapon AuthorDate: 2025-05-19 09:06:55 +0000 Commit: Andriy Gapon CommitDate: 2025-05-19 09:08:43 +0000 dwc_otg_fdt: do not create and leak extra usbus child dwc_otg_init() already takes care of creating the bus and setting up sc to point to it. Fixes: 518da7ace813e MFC after: 1 week --- sys/dev/usb/controller/dwc_otg_fdt.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/usb/controller/dwc_otg_fdt.c b/sys/dev/usb/controller/dwc_otg_fdt.c index 3d5dcb9e9a7b..2ed94b23212c 100644 --- a/sys/dev/usb/controller/dwc_otg_fdt.c +++ b/sys/dev/usb/controller/dwc_otg_fdt.c @@ -140,10 +140,6 @@ dwc_otg_attach(device_t dev) if (sc->sc_otg.sc_irq_res == NULL) goto error; - sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", DEVICE_UNIT_ANY); - if (sc->sc_otg.sc_bus.bdev == NULL) - goto error; - err = dwc_otg_init(&sc->sc_otg); if (err == 0) { err = device_probe_and_attach(sc->sc_otg.sc_bus.bdev); From nobody Mon May 19 09:15:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1Bqv20fnz5wnxc; Mon, 19 May 2025 09:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1Bqv1Xs3z47xc; Mon, 19 May 2025 09:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4WI8cHhYNBOLIc4PVgYS5gFNbML6bgEQeB0oIAJqq9s=; b=gzy5bEgZ/yi3qnfPfNkI4fKZ0CMmkreDeVvhYnPZOuHfN8UvsC80KyZGO12sbDMalow304 NaXMcNgZDooXc22kOkIo6czS9ziIRssb/xP7pLGT89PsjQU3lfhgbC8qWFwN9LEzx/gBAg ItneVoT1yk+ZXkIxehxw4y1eZJiJXAuSoijWFLbZuOWQ27eNBxl/8Q+Up2sh76i5zVejtG ECMpm8kVAO6uvPQ0IQ68u/Og1TMyIOlhkQZJSil/nMq4cDx41rM74wyEgeo5KHDyPYw1Vh sZoHdkrVw+eWpdG8NyqzcZiFJE6ROkfXcs2W1H8nE8o83wuYcTvr0wcJDiF7Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4WI8cHhYNBOLIc4PVgYS5gFNbML6bgEQeB0oIAJqq9s=; b=kjrBjz2IEN0SyF0ecMEVOQIYyh7Vj92tC1bYWAlDJoRhDdX8ZZ48Tqc/2LKJ3EbKbkQftJ luA6qh54vTW9zoqAUI4QYejvw2Ks89nOmNmxoSnvoMjXyhAxYbHjkww+H3WT8tA90ye+zJ 9Q8UZJoiTug63Na8NjlNqcIzNGWTFLu4LlEjK7HJSJ+MyGSloWm5hYqdiaOlfkQMwheDTm KBYzyF0k5MLyUfaCf1Bp1YN6ABKpsSR9ILpqaxP2fjyP7qEWbTcZi2jS+1HDbpfUzYKZE6 Qk3WzfdSVKqko0hhDXnv5RZMohBZp8RwuMi8h7ldMrKlb8zC6HrujQdxrZ8YDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747646155; a=rsa-sha256; cv=none; b=JyH/U54NWzgh+QsZFU2THe0Jrp/bfVsfPu+MOe55cTti+glvnZOzcnhEGunalhflHtOG9R zlEQ+mIdNKc9R6vkdENQ/H7GRlwW0j6MeWSUdMWChQoKbZVw9YBzF5QtQzrA5AqwYkDc1x R1rcDTxDjx5tIhGtMcHmjSMafflO6Y+PzV1egmLcrKs5mLCCsv0k2Mzn9Rle10CA0svAad MfpaEBHXoP9YyEMS+jY1YVkqnf+b/Q1XmDxHtMx43G3voNgeS3zJpheaYjkpqYj/ssyO36 yd/dGdFmjJ0RH9GLOAqUVWcMaNevGhs05TOJVq1iz3jFnN+7SvILHAhISSHKAQ== 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 4b1Bqv13YGzxdG; Mon, 19 May 2025 09:15:55 +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 54J9FtWl093750; Mon, 19 May 2025 09:15:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J9Fta5093747; Mon, 19 May 2025 09:15:55 GMT (envelope-from git) Date: Mon, 19 May 2025 09:15:55 GMT Message-Id: <202505190915.54J9Fta5093747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: eda3a7ac755c - main - ads111x: initialize the lock earlier, before it's used List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eda3a7ac755c5e02f92ff971db63d0a702963d66 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=eda3a7ac755c5e02f92ff971db63d0a702963d66 commit eda3a7ac755c5e02f92ff971db63d0a702963d66 Author: Andriy Gapon AuthorDate: 2025-03-30 19:47:50 +0000 Commit: Andriy Gapon CommitDate: 2025-05-19 09:15:03 +0000 ads111x: initialize the lock earlier, before it's used The first use can be in ads111x_add_channels. MFC after: 1 week --- sys/dev/iicbus/adc/ads111x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/iicbus/adc/ads111x.c b/sys/dev/iicbus/adc/ads111x.c index dd223f69bb5f..21924627cc68 100644 --- a/sys/dev/iicbus/adc/ads111x.c +++ b/sys/dev/iicbus/adc/ads111x.c @@ -559,6 +559,8 @@ ads111x_attach(device_t dev) return (err); } + sx_init(&sc->lock, "ads111x"); + /* Add the sysctl handler to set the chip configuration register. */ ctx = device_get_sysctl_ctx(dev); tree = device_get_sysctl_tree(dev); @@ -575,8 +577,6 @@ ads111x_attach(device_t dev) /* Set up channels based on metadata or default config. */ ads111x_add_channels(sc); - sx_init(&sc->lock, "ads111x"); - return (0); } From nobody Mon May 19 09:19:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1Bvx4nXZz5wpC2; Mon, 19 May 2025 09:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1Bvx4DrVz49Rt; Mon, 19 May 2025 09:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jzTMmLwIYxa7xavhrsEEbuhAUErMHtNyRI4gaFTVIRs=; b=LbgCDsxcQwfKUOslOJMYXvxsg4ONG4aMp3g75DKOZPk3ErFIhWMJ5ZYExdMxnlaMjISQn4 I/1TSlaGaT7dq0oWW9gs5QFqS8gspjmVSUD5NEKhDrmUJnrpS99SAccqEvkNB9GhElIL/F oLmEKKQ9cL2P1HLUig2/ItKQXeoOrD14cktUrpWCF71bfQoWpnwPxEabW7ZucFHHN+Qc2r nAg7xMTb3+K3r2BIR5m7tYpCY7NoKy2eRsz+20C96T+10hisxRU+FJRedLJTdyRYlyOGCh lqiIB5MN6w1/w8ZuHP0LZGqFSjyXM7nC0aRUdpwELFCy3CtER/wLTur2GP4qDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jzTMmLwIYxa7xavhrsEEbuhAUErMHtNyRI4gaFTVIRs=; b=XjgUH/U5Ive2a0xB2Eb2offkxrx0yL0NaPY8DAWzKP70447sHt/NC5NADDXMyHc7YtsLCb VkBtFf+VOhNA8+K9eAGiHbd9PaC7gMG9jdcgQ/HnES8xW/KVCOfkAwvKG/WMn7kCJSBMFf 3Y1y+5FU+QQ2WX8E1QqXInsSJuRooKPkHVbuSv0jIJN4AUvQG2kZseyP3kYkfG4zwoW1yw g/o+FScOtADpnUAZfvAlIO+fGVxE2Xu0qjI8nkjpvOWZKyxFHt+zUvji5PczLRIMS2qRtT argCZz3Xmm7WNaagajIzLKpdlsHTqbuZKgd01J/UWgw2RJJzYj3vtP5dpgDdhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747646365; a=rsa-sha256; cv=none; b=ibFlv6Lfddv3CW7YpG7o/53l8wH3ZAuKQMRa0bTG1vVfhtVZy8JvcM8dDKDizpHcbmww0l Xgas6SmylUq43dJkKrQX8Ze5J/JdzWlRDEXPzl1on6qpRLW2XPCSJeCHIauC6jRRntUXGF NhprPbQVKDKTj9KYWQezmXTOrDAVvPSKLq+xv/nehlBifz0kGI4HQANx0CkvIw99EqeVSp o35YwJ8atKmI51gVWiuIbYb8jNhMBbyov9/gqtFNZlVLatUEKRVBDYP1lV0G4c2Rl2P1hc k/EzUnqcYd/q29kio1Eeu09U8utivQT7N/g8YtLrtVXFo1AkQcKQFP6eJ3x1PA== 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 4b1Bvx3bFZzy9c; Mon, 19 May 2025 09:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54J9JPWc094864; Mon, 19 May 2025 09:19:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J9JPa3094861; Mon, 19 May 2025 09:19:25 GMT (envelope-from git) Date: Mon, 19 May 2025 09:19:25 GMT Message-Id: <202505190919.54J9JPa3094861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 3fc4ddb0151d - main - rk_i2s: correct some bit-field definitions, add more bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fc4ddb0151d1a4fec5ba6c878f4b8afc6aa83b8 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=3fc4ddb0151d1a4fec5ba6c878f4b8afc6aa83b8 commit 3fc4ddb0151d1a4fec5ba6c878f4b8afc6aa83b8 Author: Andriy Gapon AuthorDate: 2021-09-24 17:05:22 +0000 Commit: Andriy Gapon CommitDate: 2025-05-19 09:19:03 +0000 rk_i2s: correct some bit-field definitions, add more bits MFC after: 2 weeks --- sys/arm64/rockchip/rk_i2s.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 3d6aaf523c4a..5f1b6bbdeabf 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -91,16 +91,20 @@ #define TXFIFO0LR_MASK 0x3f #define I2S_DMACR 0x0010 #define I2S_DMACR_RDE_ENABLE (1 << 24) -#define I2S_DMACR_RDL(n) ((n) << 16) +#define I2S_DMACR_RDL(n) (((n) - 1) << 16) #define I2S_DMACR_TDE_ENABLE (1 << 8) #define I2S_DMACR_TDL(n) ((n) << 0) #define I2S_INTCR 0x0014 #define I2S_INTCR_RFT(n) (((n) - 1) << 20) -#define I2S_INTCR_TFT(n) (((n) - 1) << 4) +#define I2S_INTCR_TFT(n) ((n) << 4) +#define I2S_INTCR_RXOIC (1 << 18) +#define I2S_INTCR_RXOIE (1 << 17) #define I2S_INTCR_RXFIE (1 << 16) #define I2S_INTCR_TXUIC (1 << 2) +#define I2S_INTCR_TXUIE (1 << 1) #define I2S_INTCR_TXEIE (1 << 0) #define I2S_INTSR 0x0018 +#define I2S_INTSR_RXOI (1 << 17) #define I2S_INTSR_RXFI (1 << 16) #define I2S_INTSR_TXUI (1 << 1) #define I2S_INTSR_TXEI (1 << 0) From nobody Mon May 19 09:29:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1C7Y3BVtz5wpxp; Mon, 19 May 2025 09:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1C7Y2HXKz3J1Y; Mon, 19 May 2025 09:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FZDKxIuoTwCeP86zR8pzFfl26HxD9VypXDkKQvYtajQ=; b=Gr+hLmQ3YY7RYAKkI8nS6FHRichMz8KH/W01G5hjpgV8ZR7DCdfbqRfpnUUCTCJzWScb3l 8TLAYA5z4k7jpCv+DFRel0XrXUTjeazn1DCiyAFAB/B5gVgSyP27qePJWCuq3sN5ew34Ta EtI9Ip5i3Y6B8t4fcYIlTMkuHJ6hjVfu2sptzJoP3ENkApJyR9JAlQ2xI4CIH8u+9qMHhb cXymu7fVLwkJkljAwgBA4k756EUAeQUSvj2bf8Ix1kLVyHrb/oY1ZkrIpqk92DA32mBNRU MO4R88NpypDq9PH4em2sAt+EMVtbHczHqOL+FL1Hubkheaf9jauTENFPlE/3gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747646969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FZDKxIuoTwCeP86zR8pzFfl26HxD9VypXDkKQvYtajQ=; b=RNRZiKeQ++yaXhfUeneIm/0CatfcMzBf/t4rxRgqt34Xhd6HIhGQda2MUffrMa8utJ92DA M3ZMYPwvTJRyEipKKexD3D2+qyC2QNDhxcBNN+0364tmtRinqR43IqAk7n+/RVfpp7DQdY 6XRniAlNwr1Lzy0TMoD5X8MzBhKQ6FuhDBz9PkyHGiheDcccLy30LKbTzSj35MQxJOcu2j wBdiEWzWYLPNmE6cUYCN4XWJzdBISEi5A0vSdMn4V+1QNdQeekUNfN2r9Nn0vDoAzcwty0 3i/SH1x6t3baQxY7zsiVCJTWDGxhnb3tKBvd20/DcOvQd837uqtPYFgteXLJLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747646969; a=rsa-sha256; cv=none; b=A0gbmXbQE/6DoMZGpjsL2D3102o1X/eZ9t5CJjZAIg4uA59UfE+D1xqu4stOP78lmsR5rV vkLnGSw546INyJd5zptDGLZF0nX5NN0HMMGTo5BouxUAr70RDXPPf0SU8y9oeZHkdpH0r4 i6rOfOIp21EqTvR609LRFJNtZyBwFm9c5NL3Is7b/qY6LuAUjywvg0ZzTvgoBqjc7pXXVi kg3TGdyhNHha63JN4VMQj/BtwkzV3/M5GLdEFZsh/eqzDbpwBic9WfKV9PLDhLfdy7ZLej SWsS8dXT40gs8jwd8cFIhF37SOpGsO2mUfC0ywmM3E7oV47APNjdW1+olDlY3w== 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 4b1C7Y1s15zyNg; Mon, 19 May 2025 09:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54J9TTaL013040; Mon, 19 May 2025 09:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54J9TT4D013037; Mon, 19 May 2025 09:29:29 GMT (envelope-from git) Date: Mon, 19 May 2025 09:29:29 GMT Message-Id: <202505190929.54J9TT4D013037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 28d74f18f1c2 - main - OptionalObsoleteFiles: etc/rc.d/powerd is used/useful without ACPI/APM List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28d74f18f1c222022ee4e9a2cdc63b1c21037392 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=28d74f18f1c222022ee4e9a2cdc63b1c21037392 commit 28d74f18f1c222022ee4e9a2cdc63b1c21037392 Author: Andriy Gapon AuthorDate: 2025-05-19 09:23:29 +0000 Commit: Andriy Gapon CommitDate: 2025-05-19 09:29:06 +0000 OptionalObsoleteFiles: etc/rc.d/powerd is used/useful without ACPI/APM Just like powerd daemon does not depend on ACPI/APM, its rc script does not either. Fixes: 20eb6bd8c598f MFC after: 1 week --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 6de8f1c5a0f6..5c598306e152 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -55,10 +55,6 @@ OLD_FILES+=usr/share/man/man8/acpidump.8.gz OLD_FILES+=usr/share/man/man8/iasl.8.gz .endif -.if ${MK_ACPI} == no && ${MK_APM} == no -OLD_FILES+=etc/rc.d/powerd -.endif - .if ${MK_APM} == no OLD_FILES+=etc/rc.d/apm OLD_FILES+=etc/rc.d/apmd From nobody Mon May 19 12:40:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1HN5479dz5x2fd; Mon, 19 May 2025 12:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1HN53Scdz3DJG; Mon, 19 May 2025 12:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747658437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRLChdIvRWbQFPa12/m6NOwboyi8uX0yErUcx5ooNCM=; b=IA5NvrQR6a10uoRc6rD7Cqd3MSBqOqPWmrJBefADeNM9UqnwzHXnkw1mLByrs90AL4R0c+ izGCD90o9s8/kbcbPs8IrLuzDEshIgrR+ab0RIBPGi4oekZ2tkohi3zPzxBvvaF4VKHlcL HSjxaBYw5HXAu0w3bAgTAuCfaW9RMpkAhs3a6z1hwjNifVZ3e1qZaM0L5/LyxaNLO4juAN fmrXmBdxfOiAdg1fV0xy8cvL9wMD/bEvfwt1LbsHDx19fj+BdcXqCa08MFTDFSNg7PovsK Yd8/AnyzvZOBRLKAnq8gkqrUiGFMrUyyeM8lB5CXYNHPMkW7xhOUGcAGIoy8LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747658437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRLChdIvRWbQFPa12/m6NOwboyi8uX0yErUcx5ooNCM=; b=jOxPnB2mqp+e5uBlXjLSooz5bru699cuH1YWXGfZg8K87mRyNUuAYkLQYSIcNEphwMJ7QX e9AqeAVtGwG0hVTi8IGhhul1PWgZjby7Pmx3bbptfbOzY7jfqd5zjoc7ml3QLEXgiZiEz7 TEfrnXkxvkEBrugwieCtjF0waDYAnZTEqfhsc4WlgNf/4EEi10m7rIGEDlIxxSxPEefhEp z4ED06NN1Nt/yWCJKdVD6fzbpmirkIVQHvr98XYUHRP/me/ZHdSsqveajMXcXXq1mfZo+A WkdG5NALCzeEAlE2hMqZXF0UZdKvoBq6BWQ3LBVT93LrSxY1rACmobs3V9398g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747658437; a=rsa-sha256; cv=none; b=sAYvASIE0EWnHgyveMxJ+4nMLXUtOJc6p8IOxuX/p50t0O6d+HapxHWhfpl2taDySdtT8I O6Tt16AVjcxaKhXgXSHK0Z9ROtRn/A22ibF5LHBDLJwqNlMl/ykNN4/VgRGDym4MhN+QhE JKIJaqZcs9BrxRU0xJSTRiIuGqVQoF0XJ5KEtxYnGtSFk0e0v/ka2gvAiKT8jD9q5CxsHo DvptlXqMKS469De8aV0e9Af7NaFgt2Rg4c15kBH5BmBhglPUDL0xhzd7WWiEe3/15llI3X kYlfP5H0kRItO2YOjBQNt018+nUI8FGSL+wDfkfGNnN3XlKFPg2Bb3dZnIjvZA== 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 4b1HN534Hzz143h; Mon, 19 May 2025 12:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54JCeb1O076519; Mon, 19 May 2025 12:40:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54JCebvQ076516; Mon, 19 May 2025 12:40:37 GMT (envelope-from git) Date: Mon, 19 May 2025 12:40:37 GMT Message-Id: <202505191240.54JCebvQ076516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 29a062108405 - main - tcp: allow connections to IPv6 anycast address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29a062108405cf97e16d9a82635ddc9cfd89ae06 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=29a062108405cf97e16d9a82635ddc9cfd89ae06 commit 29a062108405cf97e16d9a82635ddc9cfd89ae06 Author: Lexi Winter AuthorDate: 2025-05-19 12:33:45 +0000 Commit: Lexi Winter CommitDate: 2025-05-19 12:40:26 +0000 tcp: allow connections to IPv6 anycast address currently, we reject incoming TCP connections to an IPv6 anycast address based on IETF I-D "draft-itojun-ipv6-tcp-to-anycast-01"[0]. the rationale is that since RFC2373 prohibits sending IPv6 packets with an anycast address as the source address, it would be impossible to establish a TCP connection to such an address since the destination host could not send any replies. however, this restriction was lifted in RFC4291 and it is no longer forbidden to send packets from an anycast address; therefore, it's both possible and permitted to establish a TCP connection using an anycast address as src or dst address (or both). based on the above, delete this restriction and allow people to do this. while there are certain operational reasons to avoid TCP anycast (such as the risk of the route changing while the connection is open), these also apply to IPv4 anycast and are specific to the local environment; for example, it's perfectly valid to have an anycast address which is only ever assigned to one node. [0] https://www.ietf.org/archive/id/draft-itojun-ipv6-tcp-to-anycast-01.txt Reviewed by: tuexen, kevans, adrian Approved by: kevans (mentor), des (mentor) Differential Revision: https://reviews.freebsd.org/D50019 --- sys/netinet/tcp_input.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 817079dfe6c8..c00a102e8520 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -567,8 +567,6 @@ int tcp6_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) { struct mbuf *m; - struct in6_ifaddr *ia6; - struct ip6_hdr *ip6; m = *mp; if (m->m_len < *offp + sizeof(struct tcphdr)) { @@ -580,19 +578,6 @@ tcp6_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) } } - /* - * draft-itojun-ipv6-tcp-to-anycast - * better place to put this in? - */ - ip6 = mtod(m, struct ip6_hdr *); - ia6 = in6ifa_ifwithaddr(&ip6->ip6_dst, 0 /* XXX */, false); - if (ia6 && (ia6->ia6_flags & IN6_IFF_ANYCAST)) { - icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR, - (caddr_t)&ip6->ip6_dst - (caddr_t)ip6); - *mp = NULL; - return (IPPROTO_DONE); - } - *mp = m; return (tcp_input_with_port(mp, offp, proto, port)); } From nobody Mon May 19 15:01:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1LW7582Zz5vyNw; Mon, 19 May 2025 15:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1LW74BhRz41Cm; Mon, 19 May 2025 15:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747666915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bABTzyeH/R+Soj82su6xW3Denzm8a9VLpoZV993VHKs=; b=HIQ93xlWp7ZfLA7IwUyjGjzjyaM1HDEjC6NCZ0ECmYFdiFeiHc48+vzjeQtTm9b8ltAlBG u1HCOmV9iTgPklWXmC9BkXK8cAH1Lq0p8KJPo3vA+fyk+egcXcNHB4WlmYbpLet63lKw37 jqlAnFzp0Fc3pIqgs6S3m7RqUF58+3ovvqJ3+fO7X5K2bO7WJ+dJZvK5A9bFPbKeUGN0Vb oYQ4r4V5gUwf6leudfNuq6FAJNiVXGIsvELKou3JEMcP/E66s6uMRZRnAFj009lE6zRn5H ip0F0xrM8dHbuzk/gWch87MB362ZvrYQ2qHL2r2W4IkMsxb1q6lOug0EylfVtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747666915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bABTzyeH/R+Soj82su6xW3Denzm8a9VLpoZV993VHKs=; b=DhKIF4icMZPGXTEgiJ5IPnHx+xOHD+7I1LlbO/CywDC1PQBzagAA94A4PxhqiLFw065zAF TfaEJkSFEEkiccAO0R1/RGye+bYGKBQaCta7D2+X74Bj+NENUM6SkDe/LkAcrBMWIHimLK diG2l5QjxJhe5eCX5SygTmZ15PgOetR4+sA737doodoWEYG3cb+ZehsGDNYHJbmadDCBal pJ71/9SfMJRVBB2AWy0YmbzLVHRvqOwW5Rz9KUATYzcQKzhl/oU/c6mFstrSIgkjyJJ/CD jwcm3bkYrC9KejKyAdG7um6SdiRF2yO5QkFEq405lyKu+Q9HaPY/R+DeNqUkYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747666915; a=rsa-sha256; cv=none; b=uOX5tz1jJ5H4JNJN0LvMZw9DNacoDKXlKlaYSkZqNwR3sJRmfCJQrzSN0BBkgMShRWsP6t +EO9hMOIdQee8yw/gb94J6pT8aN0V8WDPXVq4ipjCB5MIjzfGBiTvuGaaksCIr9B5r+FLR WNgeaDg29cLoMvCDYTZ27mnFiv1F8wLgduh9SwEoGou7T7fj5NB1jaZZ1w8WrPgWKv6SH9 VZLZCqmvhk6MJpTEzc1zp2dHfvAsNRzCTw7vRVHoplPvCYjxCFmKc++XJAYlpW4Z7MYPfJ 0UnhZXcNeu74ET2j0xX67QXtfe/F5KCV4axB5NRlttxMfn+BE0oruuqUrHUwEA== 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 4b1LW73CJKz16x5; Mon, 19 May 2025 15:01:55 +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 54JF1tWs050613; Mon, 19 May 2025 15:01:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54JF1tHG050610; Mon, 19 May 2025 15:01:55 GMT (envelope-from git) Date: Mon, 19 May 2025 15:01:55 GMT Message-Id: <202505191501.54JF1tHG050610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 19419d36cf2a - main - libc: Give __thr_jtable protected visibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19419d36cf2a132a325c0a66f49c3a66043072ba Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=19419d36cf2a132a325c0a66f49c3a66043072ba commit 19419d36cf2a132a325c0a66f49c3a66043072ba Author: Mark Johnston AuthorDate: 2025-05-19 14:29:12 +0000 Commit: Mark Johnston CommitDate: 2025-05-19 14:29:12 +0000 libc: Give __thr_jtable protected visibility This function pointer table is overwritten by libthr when it's loaded. libc's pthread stubs are implemented by looking up an entry in this table and invoking the function pointer contained in the entry. pthread calls are fairly expensive even when libthr is not loaded: each call involves indirection through the PLT, then through the GOT to look up __thr_jtable, then the function pointer itself. We can however eliminate one level of indirection by disallowing preemption of the __thr_jtable symbol, and since the existence table is an internal implementation detail, disabling preemption is unlikely to break anything. This gives a modest improvement in some microbenchmarks which call libc's pthread stubs. Reviewed by: kib MFC after: 1 month Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D50354 --- lib/libc/gen/_pthread_stubs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c index 2a0cebadd5fd..d867ee4db51e 100644 --- a/lib/libc/gen/_pthread_stubs.c +++ b/lib/libc/gen/_pthread_stubs.c @@ -63,6 +63,7 @@ static int stub_getname_np(pthread_t, char *, size_t); #define PJT_DUAL_ENTRY(entry) \ (pthread_func_t)entry, (pthread_func_t)entry +__attribute__((visibility("protected"))) pthread_func_entry_t __thr_jtable[PJT_MAX] = { [PJT_ATFORK] = {PJT_DUAL_ENTRY(stub_zero)}, [PJT_ATTR_DESTROY] = {PJT_DUAL_ENTRY(stub_zero)}, From nobody Mon May 19 19:43:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1SmM69Rzz5wKFd; Mon, 19 May 2025 19:43: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 4b1SmM5gjlz3jDS; Mon, 19 May 2025 19:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747683827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkzQLB+oRFnH0yGlgA78tVshriyNmvg9VXs/Sn0ts2s=; b=IqON/T123TKAGqX0Dt6C/48gLkRf+TQq0hgrMYIjsQnl5umbMoyV3j6JsCpTdgKFA3R71O JZZ1ICsa3uXP6jK4v7asgHCSKO8UJxaYfbqbsAumOQIfDJT2c0p96oYL0x6N5GUE5oJMIk xYDNX0MgfXZMP+8hVci04MEuCvBSihan8GfXwkv+KKAXEdADVIASPCxuJE7asFqe0Ev3YY q7gnG0vtjRbjmLNBaOs+6g3aUMqWXGNL8QfSosHl1CPJWciC78ihlM5GTyH3Z+DD85goNp 5n7Zuk8gfkS41Ch4tAVistc+ZErtukEmgQNE8K9wZN+l6civgMZjyYj967o0qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747683827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkzQLB+oRFnH0yGlgA78tVshriyNmvg9VXs/Sn0ts2s=; b=aL5Q2uYySQXltTc3IMrWxEGnzsqjANHAZr28AKNv7RyZcn88JmCZP/3UQV+PEULPFWvfRB TtE7OeHaHLO3ilKmzXDaDoorDE7uITdm+RaMyZb8PFILcZTqacCLFWvt4NDGKPxUgz9dEN V8ofeMnr/8LET8l8dYGs92A88k6NPkTId6uYHRZheK94rgrvJvf4dN2OcGOs/fzNovm0ut 5QX/uJk+68+jqxbqtPdOqbNbs2a288o8ZLgxr+ihRcB9Qi+s6cN0kPy9lYAZWJYykPzDaH bo6GiGmNCBIdsdUhbLBzQFwFi5qvEzYqsdkuRfFgGt+6qQr84xqv/qi9hKmi8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747683827; a=rsa-sha256; cv=none; b=rs8fn+AOGx9D7ipkl33emn5c3USkBx5uggVb+nnoxG2yuO9CGRmiN48qgSehlxK3e+U6jA pWvsSUztjoW2cQUgR813b1CMxm8E+aX1h2GvrF5QHDbzl/JKcn+qB/3i8sTCV4RaRCKPy2 IfLLidMc+mWphaJHoVz9tJog3CWLEkEdOehqAfE0NEpml1eciVivho9qHdGt3p2Ux/CoUT /IfUMoFOr72nINxsslHE0FtFwb8hw+WsVPpwPbO+WfQMCcFEiOLkkHu7/JmYDYJY8q0DqB ZqzBh2nDoo0qiKEeB3G8HvauPY/tzjoKPGZf87GRqFQGoCAIqzpEDqntrWhqJg== 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 4b1SmM5BG8z2j7; Mon, 19 May 2025 19:43: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 54JJhldi075759; Mon, 19 May 2025 19:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54JJhlUd075756; Mon, 19 May 2025 19:43:47 GMT (envelope-from git) Date: Mon, 19 May 2025 19:43:47 GMT Message-Id: <202505191943.54JJhlUd075756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: f750a114d2c5 - main - ip17x.4: Initial manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f750a114d2c50c4d25d304dbf1dabfd3ae3aa013 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=f750a114d2c50c4d25d304dbf1dabfd3ae3aa013 commit f750a114d2c50c4d25d304dbf1dabfd3ae3aa013 Author: Alexander Ziaee AuthorDate: 2025-05-19 19:40:02 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-19 19:40:07 +0000 ip17x.4: Initial manual page Add a stub manual only saying what it is, how to include it, what is supported, and since when. This plugs the ip17x driver into the manual subsystem and the release hardware notes. MFC to: 14.3 MFC after: 3 days Reviewed by: adrian, carlavilla Approved by: carlavilla (mentor) Differential Revision: https://reviews.freebsd.org/D50411 --- share/man/man4/Makefile | 1 + share/man/man4/ip17x.4 | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2b042455a357..2f997c68c55a 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -244,6 +244,7 @@ MAN= aac.4 \ ${_io.4} \ ${_ioat.4} \ ip.4 \ + ip17x.4 \ ip6.4 \ ipfirewall.4 \ ipheth.4 \ diff --git a/share/man/man4/ip17x.4 b/share/man/man4/ip17x.4 new file mode 100644 index 000000000000..ac5c989020a5 --- /dev/null +++ b/share/man/man4/ip17x.4 @@ -0,0 +1,42 @@ +.\" +.\" Copyright (c) 2025 Alexander Ziaee +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 18, 2025 +.Dt IP17X 4 +.Sh NAME +.Nm ip17x +.Nd IC Plus IP17x series Fast Ethernet switch driver +.Sh SYNOPSIS +.Cd device mdio +.Cd device etherswitch +.Cd device ip17x +.Sh DESCRIPTION +The +.Nm +driver supports the +IC Plus IP17X series Fast Ethernet switch controllers. +.Sh HARDWARE +The +.Nm +driver supports the following Fast Ethernet switch controllers: +.Pp +.Bl -bullet -compact +.It +IC Plus IP178C +.It +IC Plus IP175D +.It +IC Plus IP175C +.It +IC Plus IP175A +.El +.Sh SEE ALSO +.Xr etherswitch 4 , +.Xr etherswitchcfg 8 +.Sh HISTORY +The +.Nm +driver appeared in +.Fx 10.0 . From nobody Mon May 19 19:43:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1SmP0Fn5z5wKgk; Mon, 19 May 2025 19:43: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 4b1SmN6PT3z3jYQ; Mon, 19 May 2025 19:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747683828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hsMfSPBUY6I2uoHGFLZZvlQA7zZyI5kHaiAib3/e4K8=; b=D6a/WRslSqgY1BiDH3XSj4dPsAYzuP/KY/J76+QLl4k9aSAfC/S8Y/SwM2jOV9l1k1kj8f TufYueYdApaFiWAUYaczpXEfkfI8VyTdr6kS3k8r9fGLMAIyK8m5mFaN/ZOXhfhdreVtsS nyGXlpCu5Sm+xAf3/FQCpUjlAoD2G52gVSoVA4fj+V3PTUDheA9tR8caJK7hJV9NIhWkdL o86NsHWTiMcC3bUMBET5pNc3WXVkyisdfaQFmYNgiRut3gBSBjty/2jPdWdD1qCV2a7cW4 9udlEiQveqq/DpY7o9tHTvVsumoJG7kRwZcZh6kNvvgm8yHKuZVQia6vHZbWMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747683828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hsMfSPBUY6I2uoHGFLZZvlQA7zZyI5kHaiAib3/e4K8=; b=AXg3qMIIe/NwaTGvA3olJh16nGRITYS7Z8Vq0vbkaCqubQ5AV4q6sfojNikE25AZ6GP1A8 ijxaJC+tNDPVG6V7wxhEAS8rkdVm3+6ma6Ihg85iFU75bTeteROCh/8ER8KzzLuxDxa+1L mNRZYOhxxjYlcQVJyVsL0u6uA4YINEvYg7rk7jIZDaM7OFI7TsG5XIm471qw3dHUQyzBLO 4oM0zDz3+jcQWNttldq5U8EHe0oT59PJIt8kBO/rvrjPPUCFA/NEcAsTSaC8dMjsbPzn0t zG0EoBjSmzAstvKDDrDhNIWYCdCh/pqUiGpZj+leTHS7PI2O+U7yfhvZpoDMZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747683828; a=rsa-sha256; cv=none; b=WTCPDz1FKD7Lj2eRhlfLvejQea2R23jOvgpjs+UnKdxsnsdP4elz4wrUsihCcwni1y7FlN UQNbKzIDTxX/q+n6s79DyTo0qgM3T0caPgLtdcmbL3Jjg8DctigFS7KXccux4toBK4qqkE P9L7wX9Z+xmPK6RnpG07xnSR21NS3VWOKfJJsz8WYYMpcfNhvb+nZGW8HyND76E/iQ2Zmi vx5G4bbh/AzXvVtDQ2OSGHkm9vgPhnxE0LYz63Vn+j5Xxsx2d9Lm7UQHqBWVJusW5ae4Bj 4Vj8+2E2MOgE/tzYfvb85EVzLWq00TX1LpL128N8P8BdFnn208FGJtfPBjgGxw== 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 4b1SmN5vDJz2j8; Mon, 19 May 2025 19:43: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 54JJhmJB075795; Mon, 19 May 2025 19:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54JJhmJX075792; Mon, 19 May 2025 19:43:48 GMT (envelope-from git) Date: Mon, 19 May 2025 19:43:48 GMT Message-Id: <202505191943.54JJhmJX075792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 37f00bc257d0 - main - mtkswitch.4: Initial manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37f00bc257d0e785fad1d0ffbd7dcbf09e863417 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=37f00bc257d0e785fad1d0ffbd7dcbf09e863417 commit 37f00bc257d0e785fad1d0ffbd7dcbf09e863417 Author: Alexander Ziaee AuthorDate: 2025-05-19 19:42:01 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-19 19:42:47 +0000 mtkswitch.4: Initial manual page Add a stub manual only saying what it is, how to include it, what is supported, and since when. This plugs the mtkswitch driver into the manual subsystem and the release hardware notes. MFC to: 14.3 MFC after: 3 days Reviewed by: adrian, carlavilla Approved by: carlavilla (mentor) Differential Revision: https://reviews.freebsd.org/D50412 --- share/man/man4/Makefile | 1 + share/man/man4/mtkswitch.4 | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2f997c68c55a..ed39aafebbc3 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -341,6 +341,7 @@ MAN= aac.4 \ msdosfs.4 \ msk.4 \ mtio.4 \ + mtkswitch.4 \ multicast.4 \ muge.4 \ mvs.4 \ diff --git a/share/man/man4/mtkswitch.4 b/share/man/man4/mtkswitch.4 new file mode 100644 index 000000000000..c879df161791 --- /dev/null +++ b/share/man/man4/mtkswitch.4 @@ -0,0 +1,45 @@ +.\" +.\" Copyright (c) 2025 Alexander Ziaee +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 19, 2025 +.Dt MTKSWITCH 4 +.Sh NAME +.Nm mtkswitch +.Nd MediaTek/Ralink Ethernet switch driver +.Sh SYNOPSIS +.Cd device mdio +.Cd device etherswitch +.Cd device mtkswitch +.Sh DESCRIPTION +The +.Nm +driver supports MediaTek/Ralink Ethernet switch controllers. +.Sh HARDWARE +The +.Nm +driver supports the following Ethernet switch controllers: +.Pp +.Bl -bullet -compact +.It +MediaTek MT7628 (5 port Fast Ethernet) +.It +MediaTek MT7621 (5 port Gigabit Ethernet) +.It +MediaTek MT7620 (5 port Fast Ethernet) +.It +Ralink RT5350 (5 port Fast Ethernet) +.It +Ralink RT3352 (5 port Fast Ethernet) +.It +Ralink RT3050 (5 port Fast Ethernet) +.El +.Sh SEE ALSO +.Xr etherswitch 4 , +.Xr etherswitchcfg 8 +.Sh HISTORY +The +.Nm +driver appeared in +.Fx 11.0 . From nobody Mon May 19 21:40:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1WMB44Ykz5wW7r; Mon, 19 May 2025 21:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1WMB3CDFz42M4; Mon, 19 May 2025 21:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747690838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZCd1ZZppVaVjXOl+D/9wU9xYAmoHNunhCiK027hIlKo=; b=kFVuQmB0e7ZG/C71BuZ/jfxX5S71KskXcjOLf9AQj113HqLwhmxTqGAF/NQ9N2ZxWdxat2 wq6vMv4NppV86k1YRdzeSXxCGrbFONCuJJ/04ayfwG5MQ9PHE87RR1CRM//nNkPkBbBtbQ 9JCskCt1+hEJtjcvJiXckJi8MH5sHetlFog37x0fAzhhWbv+LDxIeejUy5dCC8tHvo7/8D 56eYVtaC86v89LXNF9SVf0QSNmy/8iNIfVLFxF/0s2pK62UlnFImL5yUVDTBo40Rn4XN6V n98RSxynhsi35HcdP81PxQ1sduWXbdhsWacpzHgSHnQXcPmfl51EP6ym95pj2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747690838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZCd1ZZppVaVjXOl+D/9wU9xYAmoHNunhCiK027hIlKo=; b=CiaZIuKSHVMltuMvFe0saJYD1jHHQWJ2Y3xjGnmllXVvq7BPyzbGwvZUFVqEmaudLWDm+G wfrlYVUarYn+uNhAv3EwU1RX01mwGXh+8y4Igz7cn+fnNvSXje96VpsO5Udn+JomGM0+nM sDwfkLlExfGPs7WNSYwhkRZUGg0uol9P08Febs3SBwszvzHzHp2ynxYhherH/u2gg9DnNB L9jrX5k1jGhx7rt3nkEO6a7/xjt+QYgpzGOAT5cHmgQ0rYqU786Ievx4GP1E7dBTb7ReFR X6eSQ8+RvRrQKfmHbMl2HRL0nJnWE5wQEE5Xjd3fBkR+o4nI3X5DAB7g7MSLwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747690838; a=rsa-sha256; cv=none; b=i4UZ9A+g7p7n2qtc9W9xSsT0PgsbTTM3XH3oAxTNIKJl3d/nhYaFs6r1uF3xXk/MiBfOxY SzWqbtKsIdi7ytZLof4WS+rRqV8rqk31cMjMinI6qFU3gzgDe0vZ4B7DQRj48lry7j9W0L X0bvNVy3mtJycbCSJ5Uf2rylBYNvEZjX6J1NLtf4cOvpEz2lK9jLClOAF5RBGbk0Om+gEg o0wCjICpfRNmpiYV4nrN2A+BxsyISrnf8686kGJ6GaPHb/cK0es5NWhw77iCQ5wMSaNoN/ 9O39s2PsSUPDTWGjbT9s27ZxLbPwZJXArLXsj5dyr9ccqOVmdeV/QplKdBSYcw== 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 4b1WMB2XxHz6CN; Mon, 19 May 2025 21:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54JLecuA018391; Mon, 19 May 2025 21:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54JLecFi018388; Mon, 19 May 2025 21:40:38 GMT (envelope-from git) Date: Mon, 19 May 2025 21:40:38 GMT Message-Id: <202505192140.54JLecFi018388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 79aba7a0ca84 - main - pciconf(8): Fix the -x option and its documentation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79aba7a0ca8468da36551e66d24e0b3385d8e328 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=79aba7a0ca8468da36551e66d24e0b3385d8e328 commit 79aba7a0ca8468da36551e66d24e0b3385d8e328 Author: Navdeep Parhar AuthorDate: 2025-05-19 06:16:18 +0000 Commit: Navdeep Parhar CommitDate: 2025-05-19 19:49:27 +0000 pciconf(8): Fix the -x option and its documentation Reviewed by: kib MFC after: 1 week Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D50421 --- usr.sbin/pciconf/pciconf.8 | 4 ++-- usr.sbin/pciconf/pciconf.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8 index 4e46d502887a..6c67e9e50df6 100644 --- a/usr.sbin/pciconf/pciconf.8 +++ b/usr.sbin/pciconf/pciconf.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 14, 2018 +.Dd May 19, 2025 .Dt PCICONF 8 .Os .Sh NAME @@ -39,7 +39,7 @@ .Nm .Fl w Oo Fl b | h Oc Ar device addr value .Nm -.Fl D Oo Fl b | h | x Oc Ar device addr Op start Ns Op : Ns Ar count +.Fl D Oo Fl b | h | x Oc Ar device bar Op Ar start Op Ns Ar count .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index 83ea50efb183..ef75a8fa2341 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -110,7 +110,7 @@ main(int argc, char **argv) bars = bridge = caps = errors = verbose = vpd= 0; width = 4; - while ((c = getopt(argc, argv, "aBbcDehlrwVv")) != -1) { + while ((c = getopt(argc, argv, "aBbcDehlrwVvx")) != -1) { switch(c) { case 'a': attachedmode = 1; From nobody Mon May 19 21:40:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1WMC6Jx9z5wWFv; Mon, 19 May 2025 21:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1WMC3xv1z42Tn; Mon, 19 May 2025 21:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747690839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pydT7G5Vv89G8bxnmUK966qJahB8/Z0to35jtwcVYGY=; b=exp9tZ5GFeivWsbcXRpRN/qTMSUvt54V+uIkGv321v8rgkRx+Q36Z3dfsajlDdcEM2dxHL B3K0aX7dM2kxcKVhbAdfXC8WI+/LskGLl23lAqAdWhGgPsWsmqCMKDvvCA28yvtGHW/CVh r+XEaDi95jYj4ddGRKfWJPTcDWhnvUDHFMogzUUC0egqg/my18kDhOiQITP2PHAkneZZLw fcSjzDoJEK+cBGThP8futmQNLGEW/MeOFvXBAENGaDw9wdUDuNxttoXbPlOe5f/R1lveaF p9vMRhpJVC/j/5LWzXc2zw3fYUZmCDqH/2CX4qhyw6VyzF48CPF41+lIp0FFCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747690839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pydT7G5Vv89G8bxnmUK966qJahB8/Z0to35jtwcVYGY=; b=wi8pCugA3tMZyCCaZ4KAU87vcYvpnbAgVGzc3z92964seRVI0kW3meFCMiyhajIoReDXSr rVzTkyeW/nUFBWga4YjciLxrB8syEvhkC9uxpJ4r96SucMPJ5vuQGk6pnjhgsY97r0zPeA ubbPJa+Ec6CHveTPPKAUY753iq4413X9O6SiJQU/hQN6XSRsAwF9blAHy2WIJ2dswFhotE uc29ozWyMpFNHOpcK1gY56yj1OovkiTCs5TE7H0D2NOPhHTHPnDVlx2d69RwUwKw8znjsI w8Ul2BospE+lryRBSVtajDDZpMMiRNvF0V97Gu4RGy9+iuH1ls6BmznWhYq8xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747690839; a=rsa-sha256; cv=none; b=gd2/gkvyMFLio1sjh6bU3kC84/xlYFFVbWYSR2lWm9PBMePo75xywZ6fqSImFBU5/9ESWD 4iaUDzLmI8Mk9Phhn5shjwR4VZX8qoauJ1nXSCsA6hfDpNkT76ex6hteNh6a+sEbuctkWw kOARMc96ICRL/utYYVAHcoxbiMQjgPFx9Qui8zAF6v1JEtUkAkM3U7qseqHIJfeImyBQhb 7VySXajBh12yQM2leM70poQy25A3jwXudNq+TDuvsJ0MM/BUdBmAZQl4g008aoKmxv0JRq slEBkMydq7kUtTuirtLcFkfCLY4vFNGOiwFRah0XukhYYKec8cIDOTnabu1yUA== 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 4b1WMC3RGQz5Wb; Mon, 19 May 2025 21:40: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 54JLedD8018426; Mon, 19 May 2025 21:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54JLedF2018423; Mon, 19 May 2025 21:40:39 GMT (envelope-from git) Date: Mon, 19 May 2025 21:40:39 GMT Message-Id: <202505192140.54JLedF2018423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 9fb60477fe26 - main - pciconf(8): Dump the correct number of bytes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fb60477fe260da2db029baebe63331d0f584a3d Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=9fb60477fe260da2db029baebe63331d0f584a3d commit 9fb60477fe260da2db029baebe63331d0f584a3d Author: Navdeep Parhar AuthorDate: 2025-05-19 06:26:46 +0000 Commit: Navdeep Parhar CommitDate: 2025-05-19 19:49:27 +0000 pciconf(8): Dump the correct number of bytes The loop variable should be incremented by 1 and not the width. Reviewed by: kib MFC after: 1 week Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D50422 --- usr.sbin/pciconf/pciconf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index ef75a8fa2341..4d3941131858 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -1153,7 +1153,7 @@ dump_bar(const char *name, const char *reg, const char *bar_start, case 1: db = (uint8_t *)(uintptr_t)((uintptr_t)pbm.pbm_map_base + pbm.pbm_bar_off + start * width); - for (a = 0; a < count; a += width, db++) { + for (a = 0; a < count; a++, db++) { res = fwrite(db, width, 1, stdout); if (res != 1) { errx(1, "error writing to stdout"); @@ -1164,7 +1164,7 @@ dump_bar(const char *name, const char *reg, const char *bar_start, case 2: dh = (uint16_t *)(uintptr_t)((uintptr_t)pbm.pbm_map_base + pbm.pbm_bar_off + start * width); - for (a = 0; a < count; a += width, dh++) { + for (a = 0; a < count; a++, dh++) { res = fwrite(dh, width, 1, stdout); if (res != 1) { errx(1, "error writing to stdout"); @@ -1175,7 +1175,7 @@ dump_bar(const char *name, const char *reg, const char *bar_start, case 4: dd = (uint32_t *)(uintptr_t)((uintptr_t)pbm.pbm_map_base + pbm.pbm_bar_off + start * width); - for (a = 0; a < count; a += width, dd++) { + for (a = 0; a < count; a ++, dd++) { res = fwrite(dd, width, 1, stdout); if (res != 1) { errx(1, "error writing to stdout"); @@ -1186,7 +1186,7 @@ dump_bar(const char *name, const char *reg, const char *bar_start, case 8: dx = (uint64_t *)(uintptr_t)((uintptr_t)pbm.pbm_map_base + pbm.pbm_bar_off + start * width); - for (a = 0; a < count; a += width, dx++) { + for (a = 0; a < count; a++, dx++) { res = fwrite(dx, width, 1, stdout); if (res != 1) { errx(1, "error writing to stdout"); From nobody Tue May 20 01:45:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1cp35y5jz5wpkN; Tue, 20 May 2025 01:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1cp35Mn5z420b; Tue, 20 May 2025 01:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747705547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y0wX5FtYh2lKoOqnpasdjRZxxAx8oujWrSI71+1I/Ak=; b=Mv+7A0izs/lW000toagCw0iQqGgjGKuCD4OGDaoALvaBeEIJjdZ4t5k+dXZqIA5M/KL4Ua AT7ppPGw04mUXCx3G0jgJjQ3asnqKNCkdm5NhjboN3QchGK88VDdiFWKpZMkrThzTk608F Y66zVuBmtnXR2ZbYAUsTYAZkY/ZNs7waLeMKBQnNVB/TdkQHEWP6jlLyPCz4665IKH/zH7 eYPQrty/ewnsR5uZdDSp8j/mYxZUUcxgn+cszq/SaRAQ/bftX2igYj1fP65gjfoxpLzBnL sprVpokPIzlBe0/Y2O48jS1hQyO13YC4zmb/IJSNJEmGCKuQ78RRgAielflrWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747705547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y0wX5FtYh2lKoOqnpasdjRZxxAx8oujWrSI71+1I/Ak=; b=oaqJGckT+4LTg4UqKqrMS792pP/qG+fYwIuf7/bJj5D1+1x2gvun+aDM8UGpquBFfOF+Rl sE0DHOs+zrHbghNJ6fKen5r2gw+mXCkNzEMJUIRZKWr6f7ZsVfL/sdXx7IPmD9JgxIKKY3 g5KrPtz/Eha/FcGP7ouRJ/U1MHV+4uMC9RQHxzA6v5zPULg+7y9ThrhkXNjZ5aAmAuj3ty txoFZ7FSGhIwD3JuWlr4Tz2Fgr2HO0ldFwPW/Y7IMx1quSH9E/kyxkP3QMQHnZ2rk5i4PX 2awiKplK5bobnjS4wi86JPSduDuB2ZYd8vlHAgMaft0JAFt0dNZvHWHUbtD5Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747705547; a=rsa-sha256; cv=none; b=AyvOe+pxEmyaPQMcA9nF8I3nHBy6JioICua1QoLJq9ND/lth1evRdjay+3T1bxfVqVjJNn snHV9gGFxT3Hr00yH8hiy7yhqfuqOvuI+NRg1NNp5xGRpCeKgf4QhnqYZ+v2IDFh+gng88 gHZ8Fia6xXxw7Byx2ZyMMoHlZff1/vXSGvHHfHpsCjJfcH1m/6iKFggYNINkD2G8sv0H4K NHUBKkpj9Mv89o5oQaypkF15BTI+9flKKIoNgO2ZzZmJ8M5BIVW+h7Ljgz3iSiUUK68uV7 vc6F962VA9y6o0ehBlytcyo0dti82lJbye3MAmQCxpEzpWBR9UceRBES9Gtdwg== 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 4b1cp34zX6zDXv; Tue, 20 May 2025 01:45: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 54K1jlus074571; Tue, 20 May 2025 01:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K1jlWA074568; Tue, 20 May 2025 01:45:47 GMT (envelope-from git) Date: Tue, 20 May 2025 01:45:47 GMT Message-Id: <202505200145.54K1jlWA074568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 0bab69859b32 - main - wtap(4): Fix build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bab69859b325583d3465043dc7c8ea81ef8e0c5 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=0bab69859b325583d3465043dc7c8ea81ef8e0c5 commit 0bab69859b325583d3465043dc7c8ea81ef8e0c5 Author: Farhan Khan AuthorDate: 2025-05-20 01:43:21 +0000 Commit: Li-Wen Hsu CommitDate: 2025-05-20 01:45:24 +0000 wtap(4): Fix build Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50264 --- sys/dev/wtap/if_wtap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 3aa3831e72c2..2b098bcc3dda 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -33,7 +33,7 @@ */ #include "if_wtapvar.h" #include /* uio struct */ -#include +#include #include #include @@ -395,7 +395,7 @@ wtap_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status, mac); avp->av_dev = make_dev(&wtap_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "%s", (const char *)vap->iv_ifp->if_xname); + "%s", if_name(vap->iv_ifp)); avp->av_dev->si_drv1 = sc; callout_init(&avp->av_swba, 0); From nobody Tue May 20 02:05:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1dF73SWqz5wr5v; Tue, 20 May 2025 02:05: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 4b1dF71qb4z49H4; Tue, 20 May 2025 02:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747706747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hczKNrDcoQM9EKlWSc3p1InPYFx7ULBQR5M6gd+3sjU=; b=D4kQ4+B8U/KL+3v/KiHoPq0TXfVXmn4++UTqD0+EGN1sYjfwcL086bMLmTKN5delVUb8hg G0vIqSnrVbVWBXqbQBaFS/z9E/atKkBn917A2y3p4DwIHkFMP2fm5krE8RDwVsUjdZf77x DcrDqw30JjPQCAbftw4dt3vC2zsuL50dOAb7aTH8ozRA5KsvWCWjOeOyHWkceITqxqjoWf /iLfrvJPmoGl5M8adXKa3macr760MqBtRoJwHguaT3B+ObFCiiEZ5ZUMVJTGGoWFL6ygPD 7oFc7a6YrylOn+2ediHF4IUpaNEy8F194hKNx/iSVAynO3ue1IU2USV6zGGmUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747706747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hczKNrDcoQM9EKlWSc3p1InPYFx7ULBQR5M6gd+3sjU=; b=KnL4izWIDfFxadRC2PCt4nfmw7Gk1xTj8MvL3E/7rW9EgpmN3hXZuvcQb3xRU4513njaRP hcq+2K8NFY5B6pI1M+Hcq6hqBnbfBttG95cuZ1w7QCcaMXTnTgv3LSI5HEur9eWDVZpXoc tpHOuyKS+81dyx1a2bTrCAAmgI8DaH9jVcYN2danC458zPys7V1BPMsrfeayhyJorqtdot r+4fJemeKf9sErACfxoMGCgRM8UCMhZjnsiiXqQVGBC/AO0NXjL3qzedFlh3UXXlloDiF0 NlHKuBuP8IzFgtXlzApOuCNOQd7+3M3DVfe7al71XSLC0UdIEIuqqjTCxVKSdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747706747; a=rsa-sha256; cv=none; b=X41BqPAnX5sCKguTHWxUZ0gJukOHGJ3prxWOPgIMbFyuzB2CUBiGVlBrDXGtEvQRoJnwqb vsCJcmXn0Y84kX5nQIv0CazXcQegBceHGR0OG0GAA/V/VcOO7r2RtcTeseZhlxaHPXsdgu ZbXSy305e/jQiAxwmjq+b0VMH5UqBP9193p/XCVN/heSagqME3WdwEMAHQlnRmBHcFrI30 4yEowfeR2VntLtVYABafOj0XBiPugu+DqFqPyYiZGFyQsMXIrE2MQuNuGlT5K5yyECkWWY yHlCt64X4jYbn0P9EDV7uUmZ+GWOYs4K8c0x5i+i7wropBhtdmMnvVd9vLUY7w== 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 4b1dF71Fc4zVF9; Tue, 20 May 2025 02:05: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 54K25lTo012557; Tue, 20 May 2025 02:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K25lWO012554; Tue, 20 May 2025 02:05:47 GMT (envelope-from git) Date: Tue, 20 May 2025 02:05:47 GMT Message-Id: <202505200205.54K25lWO012554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 9b5ddb2accfc - main - wtap(4): Connect to build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b5ddb2accfc80f70a0da52444008ebabef2a9ee Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=9b5ddb2accfc80f70a0da52444008ebabef2a9ee commit 9b5ddb2accfc80f70a0da52444008ebabef2a9ee Author: Li-Wen Hsu AuthorDate: 2025-05-20 02:04:18 +0000 Commit: Li-Wen Hsu CommitDate: 2025-05-20 02:04:18 +0000 wtap(4): Connect to build Sponsored by: The FreeBSD Foundation --- sys/modules/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 369cd47c6c8f..bc6fc7ae1a25 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -429,6 +429,7 @@ SUBDIR= \ wlan_xauth \ ${_wpi} \ ${_wpifw} \ + wtap \ ${_x86bios} \ xdr \ xl \ From nobody Tue May 20 03:47:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1gVj1sb7z5wxLC; Tue, 20 May 2025 03:47: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 4b1gVj1Lkkz42Ml; Tue, 20 May 2025 03:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747712861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=808wUJI7kFE+mYAcoVKhEAPY3NyqrtYY8h8gu8/5Dcs=; b=siyoIwSI2p3PJ6GhFXNTt6DKXwAHTWvZl8S2cfh34CN4KcDUGw7rpiLvhpKr9gox75lCKP VD/H1Ick51GVSfGFi8VKGwKq8kNmUGKQ9EyGuZjV5yAywFpzrdAUDg0pv6dtZ2DyZ/NWbT G6Efyl06rtyPphPNbCcWAxVbt6ilnvA/QDYRCn2CUDBMLRkQiwc7ehyNAx+9998ItyxBjs gaa5xC1uWH6uPK3lk5Q+lpdOFH3D3Mm2lJ6WQB/R1/I87qzQ8t9EGDf7KWuBm/03RP6AA4 C2EXcSkgDEU7IIV/h+4L2ExyQ6TiC47zror96ZISfp/39Iz4e36WAlurGfgZjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747712861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=808wUJI7kFE+mYAcoVKhEAPY3NyqrtYY8h8gu8/5Dcs=; b=W2J1s9kbKFI8P3uBnlXpnMsQLCpYMg3ZBn2MKz4nWkvuUklf6WQdm2ZRIeXPonA5+1y7WK dNOxUo/WywdtSl+KeFq+jEKwWMwysJBxj4VSguBmewMPZ/xW0jffCBqhfGTYflYe6hdE7Z xynVDbY82C0rrXSucXaA+lRB6AqUPHQh+qkpkvV2jagLPdDrT6vAZkR3gKDgvAZOuE1ub7 Yyvp/t227Sa79DDYcSKnOP4M+GaTl9TeFqrJITPZ2DXKRycNXKvZSQjFFyOkZVeOmFFz6Y lxE67CflUIwfoLg4ma8WNIEO2CMJea04DhA1ukM00bgkHsV+A3YHsGKdm/tm4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747712861; a=rsa-sha256; cv=none; b=brwR0VYHoO9VQrBsOIfeZR1oVFJuWWli4fIYzA1UBtm6Nd6ecBCJynTxtu19KusXVnlssY JkKftWTwEdnuIjPLCNgww9LhxqBV4g11YsQuKobcC2Srn2aToTi0irOfaejVku/B6HCjCh +b5immeUvO14AZY0mrdsWY0OCQFKHH79hEB61o9x3oiT4ZsZG53BI+HRIn3vqtSRaXo8/1 8WegzoscmLEkJ8dJ6GZAiTWxhPppG2p2j2jWSOBkmeukO2WO7gwGTmR/dliAGA5Ck1Qhfw jA0XrtCkRP0Nhr8GP4ujCiIwARyGETMcESMP2q7q+blk3RrnLeWdFoPvs+nk7Q== 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 4b1gVj0qZ1zZVB; Tue, 20 May 2025 03:47: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 54K3lfoS001820; Tue, 20 May 2025 03:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K3leUi001817; Tue, 20 May 2025 03:47:40 GMT (envelope-from git) Date: Tue, 20 May 2025 03:47:40 GMT Message-Id: <202505200347.54K3leUi001817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 252d6dde57d5 - main - MFV: less v678. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 252d6dde57d5dd0184929d1f8fb65e7713f51c6d Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=252d6dde57d5dd0184929d1f8fb65e7713f51c6d commit 252d6dde57d5dd0184929d1f8fb65e7713f51c6d Merge: 9b5ddb2accfc 48b0a08b8724 Author: Xin LI AuthorDate: 2025-05-20 03:44:02 +0000 Commit: Xin LI CommitDate: 2025-05-20 03:44:02 +0000 MFV: less v678. MFC after: 2 weeks contrib/less/LICENSE | 2 +- contrib/less/NEWS | 73 ++++++++++ contrib/less/brac.c | 2 +- contrib/less/ch.c | 55 ++++++-- contrib/less/charset.c | 36 +++-- contrib/less/charset.h | 2 +- contrib/less/cmd.h | 9 +- contrib/less/cmdbuf.c | 189 +++++++++++++++++++------- contrib/less/command.c | 206 ++++++++++++++++++++-------- contrib/less/compose.uni | 19 ++- contrib/less/cvt.c | 2 +- contrib/less/decode.c | 315 ++++++++++++++++++++++++------------------- contrib/less/edit.c | 7 +- contrib/less/evar.c | 6 +- contrib/less/filename.c | 6 +- contrib/less/fmt.uni | 2 +- contrib/less/forwback.c | 163 +++++++++++----------- contrib/less/funcs.h | 51 ++++--- contrib/less/help.c | 12 +- contrib/less/ifile.c | 2 +- contrib/less/input.c | 48 ++++--- contrib/less/jump.c | 27 ++-- contrib/less/lang.h | 2 +- contrib/less/less.h | 41 +++--- contrib/less/less.hlp | 10 ++ contrib/less/less.nro | 212 +++++++++++++++++++---------- contrib/less/lessecho.c | 2 +- contrib/less/lessecho.nro | 6 +- contrib/less/lesskey.c | 2 +- contrib/less/lesskey.h | 2 +- contrib/less/lesskey.nro | 23 +++- contrib/less/lesskey_parse.c | 9 +- contrib/less/lglob.h | 2 +- contrib/less/line.c | 279 +++++++++++++++++++++++++++++--------- contrib/less/linenum.c | 24 ++-- contrib/less/lsystem.c | 2 +- contrib/less/main.c | 33 +++-- contrib/less/mark.c | 2 +- contrib/less/mkutable | 7 +- contrib/less/optfunc.c | 25 +++- contrib/less/option.c | 80 +++++------ contrib/less/option.h | 26 ++-- contrib/less/opttbl.c | 231 ++++++++++++++++++++----------- contrib/less/os.c | 115 ++++++++++++---- contrib/less/output.c | 19 +-- contrib/less/pattern.c | 52 ++++--- contrib/less/pattern.h | 2 +- contrib/less/pckeys.h | 2 +- contrib/less/position.c | 15 ++- contrib/less/position.h | 3 +- contrib/less/prompt.c | 11 +- contrib/less/screen.c | 120 +++++++++++------ contrib/less/scrsize.c | 2 +- contrib/less/search.c | 184 ++++++++++--------------- contrib/less/signal.c | 55 ++++++-- contrib/less/tags.c | 2 +- contrib/less/ttyin.c | 8 +- contrib/less/ubin.uni | 2 +- contrib/less/version.c | 19 ++- contrib/less/wide.uni | 22 +-- usr.bin/less/defines.h | 15 ++- 61 files changed, 1903 insertions(+), 999 deletions(-) diff --cc contrib/less/command.c index 27eba082e520,000000000000..3ec1f9b48358 mode 100644,000000..100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@@ -1,2226 -1,0 +1,2320 @@@ - /* $FreeBSD$ */ +/* - * Copyright (C) 1984-2024 Mark Nudelman ++ * Copyright (C) 1984-2025 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ + + +/* + * User-level command processor. + */ + +#include "less.h" +#if MSDOS_COMPILER==WIN32C +#include +#endif +#include "position.h" +#include "option.h" +#include "cmd.h" + +extern int erase_char, erase2_char, kill_char; +extern int sigs; +extern int quit_if_one_screen; +extern int one_screen; +extern int sc_width; +extern int sc_height; +extern char *kent; +extern int swindow; +extern int jump_sline; - extern int quitting; ++extern lbool quitting; +extern int wscroll; +extern int top_scroll; +extern int ignore_eoi; +extern int hshift; +extern int bs_mode; +extern int proc_backspace; +extern int show_attn; +extern int less_is_more; ++extern int chopline; +extern POSITION highest_hilite; +extern char *every_first_cmd; +extern char version[]; +extern struct scrpos initial_scrpos; +extern IFILE curr_ifile; +extern void *ml_search; +extern void *ml_examine; +extern int wheel_lines; +extern int def_search_type; +extern lbool search_wrapped; ++extern int no_paste; ++extern lbool pasting; ++extern int no_edit_warn; ++extern POSITION soft_eof; +#if SHELL_ESCAPE || PIPEC +extern void *ml_shell; +#endif +#if EDITOR +extern constant char *editproto; +#endif +#if OSC8_LINK +extern char *osc8_uri; +#endif +extern int shift_count; +extern int forw_prompt; +extern int incr_search; +extern int full_screen; +#if MSDOS_COMPILER==WIN32C +extern int utf_mode; +extern unsigned less_acp; +#endif + +#if SHELL_ESCAPE +static char *shellcmd = NULL; /* For holding last shell command for "!!" */ +#endif +static int mca; /* The multicharacter command (action) */ +static int search_type; /* The previous type of search */ +static int last_search_type; /* Type of last executed search */ +static LINENUM number; /* The number typed by the user */ +static long fraction; /* The fractional part of the number */ +static struct loption *curropt; - static int opt_lower; ++static lbool opt_lower; +static int optflag; +static lbool optgetname; +static POSITION bottompos; +static int save_hshift; +static int save_bs_mode; +static int save_proc_backspace; +static int screen_trashed_value = 0; +static lbool literal_char = FALSE; ++static lbool ignoring_input = FALSE; ++#if HAVE_TIME ++static time_type ignoring_input_time; ++#endif +#if PIPEC +static char pipec; +#endif + +/* Stack of ungotten chars (via ungetcc) */ +struct ungot { + struct ungot *ug_next; + char ug_char; + lbool ug_end_command; +}; +static struct ungot* ungot = NULL; + +static void multi_search(constant char *pattern, int n, int silent); + +/* + * Move the cursor to start of prompt line before executing a command. + * This looks nicer if the command takes a long time before + * updating the screen. + */ - static void cmd_exec(void) ++public void cmd_exec(void) +{ + clear_attn(); + clear_bot(); + flush(); +} + +/* + * Indicate we are reading a multi-character command. + */ +static void set_mca(int action) +{ + mca = action; + clear_bot(); + clear_cmd(); +} + +/* + * Indicate we are not reading a multi-character command. + */ +static void clear_mca(void) +{ + if (mca == 0) + return; + mca = 0; +} + +/* + * Set up the display to start a new multi-character command. + */ +static void start_mca(int action, constant char *prompt, void *mlist, int cmdflags) +{ + set_mca(action); + cmd_putstr(prompt); + set_mlist(mlist, cmdflags); +} + +public int in_mca(void) +{ + return (mca != 0 && mca != A_PREFIX); +} + +/* + * Set up the display to start a new search command. + */ +static void mca_search1(void) +{ + int i; + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + set_mca(A_FILTER); + else +#endif + if (search_type & SRCH_FORW) + set_mca(A_F_SEARCH); + else + set_mca(A_B_SEARCH); + + if (search_type & SRCH_NO_MATCH) + cmd_putstr("Non-match "); + if (search_type & SRCH_FIRST_FILE) + cmd_putstr("First-file "); + if (search_type & SRCH_PAST_EOF) + cmd_putstr("EOF-ignore "); + if (search_type & SRCH_NO_MOVE) + cmd_putstr("Keep-pos "); + if (search_type & SRCH_NO_REGEX) + cmd_putstr("Regex-off "); + if (search_type & SRCH_WRAP) + cmd_putstr("Wrap "); + for (i = 1; i <= NUM_SEARCH_COLORS; i++) + { + if (search_type & SRCH_SUBSEARCH(i)) + { + char buf[INT_STRLEN_BOUND(int)+8]; + SNPRINTF1(buf, sizeof(buf), "Sub-%d ", i); + cmd_putstr(buf); + } + } + if (literal_char) + cmd_putstr("Lit "); + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + cmd_putstr("&/"); + else +#endif + if (search_type & SRCH_FORW) + cmd_putstr("/"); + else + cmd_putstr("?"); + forw_prompt = 0; +} + +static void mca_search(void) +{ + mca_search1(); + set_mlist(ml_search, 0); +} + +/* + * Set up the display to start a new toggle-option command. + */ +static void mca_opt_toggle(void) +{ + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + constant char *dash = (flag == OPT_NO_TOGGLE) ? "_" : "-"; + + set_mca(A_OPT_TOGGLE); + cmd_putstr(dash); + if (optgetname) + cmd_putstr(dash); + if (no_prompt) + cmd_putstr("(P)"); + switch (flag) + { + case OPT_UNSET: + cmd_putstr("+"); + break; + case OPT_SET: + cmd_putstr("!"); + break; + } + forw_prompt = 0; - set_mlist(NULL, 0); ++ set_mlist(NULL, CF_OPTION); +} + +/* + * Execute a multicharacter command. + */ +static void exec_mca(void) +{ + constant char *cbuf; - char *p; + + cmd_exec(); + cbuf = get_cmdbuf(); + if (cbuf == NULL) + return; + + switch (mca) + { + case A_F_SEARCH: + case A_B_SEARCH: + multi_search(cbuf, (int) number, 0); + break; +#if HILITE_SEARCH + case A_FILTER: + search_type ^= SRCH_NO_MATCH; + set_filter_pattern(cbuf, search_type); ++ soft_eof = NULL_POSITION; + break; +#endif + case A_FIRSTCMD: + /* + * Skip leading spaces or + signs in the string. + */ + while (*cbuf == '+' || *cbuf == ' ') + cbuf++; + if (every_first_cmd != NULL) + free(every_first_cmd); + if (*cbuf == '\0') + every_first_cmd = NULL; + else + every_first_cmd = save(cbuf); + break; + case A_OPT_TOGGLE: + toggle_option(curropt, opt_lower, cbuf, optflag); + curropt = NULL; + break; + case A_F_BRACKET: + match_brac(cbuf[0], cbuf[1], 1, (int) number); + break; + case A_B_BRACKET: + match_brac(cbuf[1], cbuf[0], 0, (int) number); + break; +#if EXAMINE - case A_EXAMINE: ++ case A_EXAMINE: { ++ char *p; + if (!secure_allow(SF_EXAMINE)) + break; + p = save(cbuf); + edit_list(p); + free(p); +#if TAGS + /* If tag structure is loaded then clean it up. */ + cleantags(); +#endif - break; ++ break; } +#endif +#if SHELL_ESCAPE + case A_SHELL: { + /* + * !! just uses whatever is in shellcmd. + * Otherwise, copy cmdbuf to shellcmd, + * expanding any special characters ("%" or "#"). + */ + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "!done"; + if (done_msg == NULL) + ++cbuf; + if (*cbuf != '!') + { + if (shellcmd != NULL) + free(shellcmd); + shellcmd = fexpand(cbuf); + } + if (!secure_allow(SF_SHELL)) + break; + if (shellcmd == NULL) + shellcmd = ""; + lsystem(shellcmd, done_msg); + break; } + case A_PSHELL: { + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "#done"; + if (done_msg == NULL) + ++cbuf; + if (!secure_allow(SF_SHELL)) + break; + lsystem(pr_expand(cbuf), done_msg); + break; } +#endif +#if PIPEC + case A_PIPE: { + constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "|done"; + if (done_msg == NULL) + ++cbuf; + if (!secure_allow(SF_PIPE)) + break; + (void) pipe_mark(pipec, cbuf); + if (done_msg != NULL) + error(done_msg, NULL_PARG); + break; } +#endif + } +} + +/* + * Is a character an erase or kill char? + */ +static lbool is_erase_char(char c) +{ + return (c == erase_char || c == erase2_char || c == kill_char); +} + +/* + * Is a character a carriage return or newline? + */ +static lbool is_newline_char(char c) +{ + return (c == '\n' || c == '\r'); +} + +/* + * Handle the first char of an option (after the initial dash). + */ +static int mca_opt_first_char(char c) +{ + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + if (flag == OPT_NO_TOGGLE) + { + switch (c) + { + case '_': + /* "__" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } else + { + switch (c) + { + case '+': + /* "-+" = UNSET. */ + optflag = no_prompt | ((flag == OPT_UNSET) ? + OPT_TOGGLE : OPT_UNSET); + mca_opt_toggle(); + return (MCA_MORE); + case '!': + /* "-!" = SET */ + optflag = no_prompt | ((flag == OPT_SET) ? + OPT_TOGGLE : OPT_SET); + mca_opt_toggle(); + return (MCA_MORE); + case CONTROL('P'): + optflag ^= OPT_NO_PROMPT; + mca_opt_toggle(); + return (MCA_MORE); + case '-': + /* "--" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } + /* Char was not handled here. */ + return (NO_MCA); +} + +/* + * Add a char to a long option name. + * See if we've got a match for an option name yet. + * If so, display the complete name and stop + * accepting chars until user hits RETURN. + */ +static int mca_opt_nonfirst_char(char c) +{ + constant char *p; + constant char *oname; + lbool ambig; ++ struct loption *was_curropt; + + if (curropt != NULL) + { - /* - * Already have a match for the name. - * Don't accept anything but erase/kill. - */ ++ /* Already have a match for the name. */ + if (is_erase_char(c)) + return (MCA_DONE); - return (MCA_MORE); ++ /* {{ Checking for TAB here is ugly. ++ * Also doesn't extend well -- can't do BACKTAB this way ++ * because it's a multichar sequence. }} */ ++ if (c != '\t') ++ return (MCA_MORE); + } + /* + * Add char to cmd buffer and try to match + * the option name. + */ + if (cmd_char(c) == CC_QUIT) + return (MCA_DONE); + p = get_cmdbuf(); - if (p == NULL) ++ if (p == NULL || p[0] == '\0') + return (MCA_MORE); + opt_lower = ASCII_IS_LOWER(p[0]); ++ was_curropt = curropt; + curropt = findopt_name(&p, &oname, &ambig); + if (curropt != NULL) + { - /* - * Got a match. - * Remember the option and - * display the full option name. - */ - cmd_reset(); - mca_opt_toggle(); - for (p = oname; *p != '\0'; p++) ++ if (was_curropt == NULL) + { - c = *p; - if (!opt_lower && ASCII_IS_LOWER(c)) - c = ASCII_TO_UPPER(c); - if (cmd_char(c) != CC_OK) - return (MCA_DONE); ++ /* ++ * Got a match. ++ * Remember the option and ++ * display the full option name. ++ */ ++ cmd_reset(); ++ mca_opt_toggle(); ++ cmd_setstring(oname, !opt_lower); + } + } else if (!ambig) + { + bell(); + } + return (MCA_MORE); +} + +/* + * Handle a char of an option toggle command. + */ +static int mca_opt_char(char c) +{ + PARG parg; + + /* + * This may be a short option (single char), + * or one char of a long option name, + * or one char of the option parameter. + */ - if (curropt == NULL && len_cmdbuf() == 0) ++ if (curropt == NULL && cmdbuf_empty()) + { + int ret = mca_opt_first_char(c); + if (ret != NO_MCA) + return (ret); + } + if (optgetname) + { + /* We're getting a long option name. */ + if (!is_newline_char(c) && c != '=') + return (mca_opt_nonfirst_char(c)); + if (curropt == NULL) + { + parg.p_string = get_cmdbuf(); + if (parg.p_string == NULL) + return (MCA_MORE); + error("There is no --%s option", &parg); + return (MCA_DONE); + } + optgetname = FALSE; + cmd_reset(); + } else + { + if (is_erase_char(c)) + return (NO_MCA); + if (curropt != NULL) + /* We're getting the option parameter. */ + return (NO_MCA); + curropt = findopt(c); + if (curropt == NULL) + { + parg.p_string = propt(c); + error("There is no %s option", &parg); + return (MCA_DONE); + } + opt_lower = ASCII_IS_LOWER(c); + } + /* + * If the option which was entered does not take a + * parameter, toggle the option immediately, + * so user doesn't have to hit RETURN. + */ + if ((optflag & ~OPT_NO_PROMPT) != OPT_TOGGLE || + !opt_has_param(curropt)) + { + toggle_option(curropt, opt_lower, "", optflag); + return (MCA_DONE); + } + /* + * Display a prompt appropriate for the option parameter. + */ - start_mca(A_OPT_TOGGLE, opt_prompt(curropt), NULL, 0); ++ start_mca(A_OPT_TOGGLE, opt_prompt(curropt), NULL, CF_OPTION); + return (MCA_MORE); +} + +/* + * Normalize search type. + */ +public int norm_search_type(int st) +{ + /* WRAP and PAST_EOF are mutually exclusive. */ + if ((st & (SRCH_PAST_EOF|SRCH_WRAP)) == (SRCH_PAST_EOF|SRCH_WRAP)) + st ^= SRCH_PAST_EOF; + return st; +} + +/* + * Handle a char of a search command. + */ +static int mca_search_char(char c) +{ + int flag = 0; + + /* + * Certain characters as the first char of + * the pattern have special meaning: + * ! Toggle the NO_MATCH flag + * * Toggle the PAST_EOF flag + * @ Toggle the FIRST_FILE flag + */ - if (len_cmdbuf() > 0 || literal_char) ++ if (!cmdbuf_empty() || literal_char) + { + literal_char = FALSE; + return (NO_MCA); + } + + switch (c) + { + case '*': + if (less_is_more) + break; + case CONTROL('E'): /* ignore END of file */ + if (mca != A_FILTER) + flag = SRCH_PAST_EOF; + search_type &= ~SRCH_WRAP; + break; + case '@': + if (less_is_more) + break; + case CONTROL('F'): /* FIRST file */ + if (mca != A_FILTER) + flag = SRCH_FIRST_FILE; + break; + case CONTROL('K'): /* KEEP position */ + if (mca != A_FILTER) + flag = SRCH_NO_MOVE; + break; + case CONTROL('S'): { /* SUBSEARCH */ + char buf[INT_STRLEN_BOUND(int)+24]; + SNPRINTF1(buf, sizeof(buf), "Sub-pattern (1-%d):", NUM_SEARCH_COLORS); + clear_bot(); + cmd_putstr(buf); + flush(); + c = getcc(); + if (c >= '1' && c <= '0'+NUM_SEARCH_COLORS) + flag = SRCH_SUBSEARCH(c-'0'); + else + flag = -1; /* calls mca_search() below to repaint */ + break; } + case CONTROL('W'): /* WRAP around */ + if (mca != A_FILTER) + flag = SRCH_WRAP; + break; + case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */ + flag = SRCH_NO_REGEX; + break; + case CONTROL('N'): /* NOT match */ + case '!': + flag = SRCH_NO_MATCH; + break; + case CONTROL('L'): + literal_char = TRUE; + flag = -1; + break; + } + + if (flag != 0) + { + if (flag != -1) + search_type = norm_search_type(search_type ^ flag); + mca_search(); + return (MCA_MORE); + } + return (NO_MCA); +} + +/* + * Handle a character of a multi-character command. + */ +static int mca_char(char c) +{ + int ret; + + switch (mca) + { + case 0: + /* + * We're not in a multicharacter command. + */ + return (NO_MCA); + + case A_PREFIX: + /* + * In the prefix of a command. + * This not considered a multichar command + * (even tho it uses cmdbuf, etc.). + * It is handled in the commands() switch. + */ + return (NO_MCA); + + case A_DIGIT: + /* + * Entering digits of a number. + * Terminated by a non-digit. + */ + if ((c >= '0' && c <= '9') || c == '.') + break; + switch (editchar(c, ECF_PEEK|ECF_NOHISTORY|ECF_NOCOMPLETE|ECF_NORIGHTLEFT)) + { + case A_NOACTION: + /* + * Ignore this char and get another one. + */ + return (MCA_MORE); + case A_INVALID: + /* + * Not part of the number. + * End the number and treat this char + * as a normal command character. + */ + number = cmd_int(&fraction); + clear_mca(); + cmd_accept(); + return (NO_MCA); + } + break; + + case A_OPT_TOGGLE: + ret = mca_opt_char(c); + if (ret != NO_MCA) + return (ret); + break; + + case A_F_SEARCH: + case A_B_SEARCH: + case A_FILTER: + ret = mca_search_char(c); + if (ret != NO_MCA) + return (ret); + break; + + default: + /* Other multicharacter command. */ + break; + } + + /* + * The multichar command is terminated by a newline. + */ + if (is_newline_char(c)) + { - /* - * Execute the command. - */ ++ if (pasting && no_paste) ++ { ++ /* Ignore pasted input after (and including) the first newline */ ++ start_ignoring_input(); ++ return (MCA_MORE); ++ } ++ /* Execute the command. */ + exec_mca(); + return (MCA_DONE); + } + + /* + * Append the char to the command buffer. + */ + if (cmd_char(c) == CC_QUIT) + /* + * Abort the multi-char command. + */ + return (MCA_DONE); + + switch (mca) + { + case A_F_BRACKET: + case A_B_BRACKET: + if (len_cmdbuf() >= 2) + { + /* + * Special case for the bracket-matching commands. + * Execute the command after getting exactly two + * characters from the user. + */ + exec_mca(); + return (MCA_DONE); + } + break; + case A_F_SEARCH: + case A_B_SEARCH: + if (incr_search) + { + /* Incremental search: do a search after every input char. */ + int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP|SRCH_SUBSEARCH_ALL)); + ssize_t save_updown; + constant char *pattern = get_cmdbuf(); + if (pattern == NULL) + return (MCA_MORE); + /* + * Must save updown_match because mca_search + * reinits it. That breaks history scrolling. + * {{ This is ugly. mca_search probably shouldn't call set_mlist. }} + */ + save_updown = save_updown_match(); + cmd_exec(); + if (*pattern == '\0') + { + /* User has backspaced to an empty pattern. */ + undo_search(1); + } else + { + if (search(st | SRCH_INCR, pattern, 1) != 0) + /* No match, invalid pattern, etc. */ + undo_search(1); + } + /* Redraw the search prompt and search string. */ + if (is_screen_trashed() || !full_screen) + { + clear(); + repaint(); + } + mca_search1(); + restore_updown_match(save_updown); + cmd_repaint(NULL); + } + break; + } + + /* + * Need another character. + */ + return (MCA_MORE); +} + +/* + * Discard any buffered file data. + */ +static void clear_buffers(void) +{ + if (!(ch_getflags() & CH_CANSEEK)) + return; + ch_flush(); + clr_linenum(); +#if HILITE_SEARCH + clr_hilite(); +#endif +} + +public void screen_trashed_num(int trashed) +{ + screen_trashed_value = trashed; +} + +public void screen_trashed(void) +{ + screen_trashed_num(1); +} + +public int is_screen_trashed(void) +{ + return screen_trashed_value; +} + +/* + * Make sure the screen is displayed. + */ +static void make_display(void) +{ + /* + * If not full_screen, we can't rely on scrolling to fill the screen. + * We need to clear and repaint screen before any change. + */ + if (!full_screen && !(quit_if_one_screen && one_screen)) + clear(); + /* + * If nothing is displayed yet, display starting from initial_scrpos. + */ + if (empty_screen()) + { + if (initial_scrpos.pos == NULL_POSITION) + jump_loc(ch_zero(), 1); + else + jump_loc(initial_scrpos.pos, initial_scrpos.ln); + } else if (is_screen_trashed() || !full_screen) + { + int save_top_scroll = top_scroll; + int save_ignore_eoi = ignore_eoi; + top_scroll = 1; + ignore_eoi = 0; + if (is_screen_trashed() == 2) + { + /* Special case used by ignore_eoi: re-open the input file + * and jump to the end of the file. */ + reopen_curr_ifile(); + jump_forw(); + } + repaint(); + top_scroll = save_top_scroll; + ignore_eoi = save_ignore_eoi; + } +} + +/* + * Display the appropriate prompt. + */ +static void prompt(void) +{ + constant char *p; + + if (ungot != NULL && !ungot->ug_end_command) + { + /* + * No prompt necessary if commands are from + * ungotten chars rather than from the user. + */ + return; + } + *** 2968 LINES SKIPPED *** From nobody Tue May 20 04:09:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1h0C4GQGz5wytQ; Tue, 20 May 2025 04:09: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 4b1h0C36SVz4DRd; Tue, 20 May 2025 04:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747714187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vKemjkBRYDh2nWUVvADyp3wu+N7/acjug342961O+4=; b=Yi2CRBipLlXA0Y0c+7j1Xj54Ycwzr65EXt9tJA1aPjXJzT8d2OSZTtqEnZ53587cMgYife YSuRbLseHAVFcavsImg4wyuBBJq6YxE8ORBnvlL9lrL7rNqotV32rcZSDZxMAJB8JKjUVV OvmeX6F4FylzFYDAF+l305NE0Vet6wWJB2Z20zdCkP1oLNxZOeRWou32/F8FMH12CRPqCA 5fXT4ypqQ0FloxHnS8eKTU4rz/Xmf/YxbfbggF/PNjjf3TmUUFnX+FKhHok/3at8X3oaNX xjZ+Qng+Iw84gKqW2GHKCmX/XkFqarOsum0BDN4VStBc8plBjJknVCtHfXdFzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747714187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vKemjkBRYDh2nWUVvADyp3wu+N7/acjug342961O+4=; b=n5uiVfNFZ39/zcIz6ZggrlrkLxzxEgjg/N0nRs/5sI9H+MMlsXZn5NsERHFTa+4BSY9IUk 8msI413iKdpQpgKvvkoRARqtan+34nmiaezu+9xMxnhKdavfKDdIR4JFruSxATjQ87Z+ql pIiRPZHi7pJX50BaVCeCA71051qVPuu5ZgPTC2ac+RCWzSdft47zfF72nyJEpmxaa8B6YO 6NnKCHQR9zrPOtDU3BmWpfX+AHe65rmJlyj+rhwf6NMotWRSdU8a2bNIEOUgvnuKA3pnOc nrJo2gMjbmS1bgINbjCamUInm5V2D7VgxqOg4L4Bj3pcPclBuUfw8k2bh0us5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747714187; a=rsa-sha256; cv=none; b=OI6cpcUqVQf8lg1WlPsi3hGt7ahhjPRyIz8L0n/IfwXXQvfTmI90Mc295NfsXVh+Zg7hoZ xcmJGlYkfdfZPRjpdBnK9HHS86vCxiTUmXtTn5Hu4+uajzi/qVKrTpbdwoGfg741roWzjV 3SRkAZdJLuhvwCfbMgFk6VG5dllsUaQi3cVsdRYGUM31Z5tzFlY4GSyT6xTqzVtdWUgltK LsdTO/L0pHGgbFOFmBlcHuscepv4Fqr3vPvSJa7aftl+Y+qUWff3YznHacLFjbl2n+u4on GFwVlYBZhHlGgClcl+dXI02NcfsjyfJruvwnrsYp/6JuopjhKD01LiCBUYCSaw== 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 4b1h0C2hYgzZth; Tue, 20 May 2025 04:09: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 54K49lt0039902; Tue, 20 May 2025 04:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K49l4v039899; Tue, 20 May 2025 04:09:47 GMT (envelope-from git) Date: Tue, 20 May 2025 04:09:47 GMT Message-Id: <202505200409.54K49l4v039899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 4ae2a46b1663 - main - powerpc: Enable VIMAGE on more kernel configs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ae2a46b1663ce4983210e00f158049c2301ab7b Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=4ae2a46b1663ce4983210e00f158049c2301ab7b commit 4ae2a46b1663ce4983210e00f158049c2301ab7b Author: Li-Wen Hsu AuthorDate: 2025-05-20 04:09:29 +0000 Commit: Li-Wen Hsu CommitDate: 2025-05-20 04:09:29 +0000 powerpc: Enable VIMAGE on more kernel configs Sponsored by: The FreeBSD Foundation --- sys/powerpc/conf/MPC85XX | 1 + sys/powerpc/conf/MPC85XXSPE | 1 + sys/powerpc/conf/QORIQ64 | 1 + 3 files changed, 3 insertions(+) diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX index 674e8cb23d4e..c74819c7fee0 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -34,6 +34,7 @@ options FFS options GDB options GEOM_PART_GPT options GEOM_LABEL # Provides labelization +options VIMAGE options INET options INET6 options TCP_HHOOK # hhook(9) framework for TCP diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE index 207533c32559..ca828137ed72 100644 --- a/sys/powerpc/conf/MPC85XXSPE +++ b/sys/powerpc/conf/MPC85XXSPE @@ -34,6 +34,7 @@ options FFS options GDB options GEOM_PART_GPT options GEOM_LABEL # Provides labelization +options VIMAGE options INET options INET6 options TCP_HHOOK # hhook(9) framework for TCP diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64 index e72d967dd895..c64d015c37d1 100644 --- a/sys/powerpc/conf/QORIQ64 +++ b/sys/powerpc/conf/QORIQ64 @@ -42,6 +42,7 @@ options QUOTA #Enable disk quotas for UFS options GDB options GEOM_PART_GPT options GEOM_LABEL #Provides labelization +options VIMAGE options INET options INET6 options TCP_HHOOK # hhook(9) framework for TCP From nobody Tue May 20 04:31:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1hT01Rn5z5x0y4; Tue, 20 May 2025 04:31: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 4b1hSz73ywz4N10; Tue, 20 May 2025 04:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747715476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CbFpu0QwwW3/0JW8sHcim8Hpl+YcPDO59B4QpAQUBiU=; b=La/3ZYr8N9Ys4YE8btVt3jQLnQG0A5sGHFx2oPwFk3cUDD+6pyaVLtVl8Iikl+lHtrT+gz YNpdl33yns5Sg+Q0dWctien9hcaxDuKF85MYRv3Zejwf4zm1qMZupiaiGz56NBdQeAiUXb hqgQwjKd4Va6d+IYDU+wauhLcLtnuw7pSQ1ltL9hfEaBW4KNlFWt7SXF3nKItlYqpAjLPM FAcDTAqDok7G/tunFhR3jU79n+fi7O/jG3g6h+o4sG3dqpX3BIfkPVlYMY60fOvlmXnw8J usE4vS6IFHrvmTRdTfozGtIGuefMo9KzoHL646sP1tDt0tvFfzqdES00mWPp2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747715476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CbFpu0QwwW3/0JW8sHcim8Hpl+YcPDO59B4QpAQUBiU=; b=YBvFshl1lnGw9+obVwOBTL4jkdVSq2iS87RBMbAkNETCmF0QqDuz/Wb7sMCVaiufPQPNfz hY0O6oYXs2KcWVoJfvzeAIkjuBTDpXwRQDXjpgCzTkWSZhyqSBF0ip4dji2cIeH/E+gZv1 XWaPKB4c0mq/SlrI8HX47Q7MV+slGdnlIyrLzRReKtk5L/sQqh8XadrG9xSOjJjvx9Jg1D VOWKhY3mQbcxrcnktBMribsV+nl4ktQLSjFzO0DqJ/yYRNylxVD2uzkXEY1KLn/8KofEm3 1Tx/uav1kC+Rvs0jo+ENW9u4nJ8XUuqMsFrCpcgEtW1GNVAcPSyzss7bYzDdrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747715476; a=rsa-sha256; cv=none; b=AbCvXuO3W7xxr+H9XlGLVyYS9IjJE8YYRqla1qNXMErEyHWgOqRLOGk00pITtlWaZiL6zs kXh2cQ0CTHonc4yK5uLzk0JX5btVIoeqiiMNTDC3JJf5D8xlJzrbKN/GHUZxfUmFl1MWzg ukcxRps6rDZ9p5QLQQowtKOhS6nx51n2skpraJk4/duK1JRWsCbLJ0dYh2xlSNgzCPpWic DQhQksifs5kwj6wthlkqW+9XsP3G9FGiyAkos/Wp2oHQ0d/3+RwzB99D0Fz6iXuCLncJ68 S4d4iSYF706eU08wsZ1UOQI+th+byEna405klwMLwmxpESv+ie4Os4E04lUeww== 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 4b1hSz6YVGzbKj; Tue, 20 May 2025 04:31: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 54K4VFHg090001; Tue, 20 May 2025 04:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K4VFxb089998; Tue, 20 May 2025 04:31:15 GMT (envelope-from git) Date: Tue, 20 May 2025 04:31:15 GMT Message-Id: <202505200431.54K4VFxb089998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 20bdc89bffd9 - main - primes: respect the precalculated primes table boundary List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20bdc89bffd9daa1909f4b006ce68099c92bfda7 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=20bdc89bffd9daa1909f4b006ce68099c92bfda7 commit 20bdc89bffd9daa1909f4b006ce68099c92bfda7 Author: Maxim Konovalov AuthorDate: 2025-05-20 04:16:19 +0000 Commit: Maxim Konovalov CommitDate: 2025-05-20 04:29:49 +0000 primes: respect the precalculated primes table boundary PR: 285658 --- usr.bin/primes/primes.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.bin/primes/primes.c b/usr.bin/primes/primes.c index d556a19a1553..7ad7d44d408c 100644 --- a/usr.bin/primes/primes.c +++ b/usr.bin/primes/primes.c @@ -289,6 +289,9 @@ primes(ubig start, ubig stop) for ( ; q < tab_lim; q += factor) { *q = '\0'; /* sieve out a spot */ } + if (p > pr_limit) { + break; + } factor = *p++; } while (factor <= fact_lim); From nobody Tue May 20 04:31:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1hT13RJ7z5x1Cg; Tue, 20 May 2025 04:31: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 4b1hT10m3Kz4My0; Tue, 20 May 2025 04:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747715477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KoDx+WlB+dsj8DN5zEbx3hefg0IWDqQLkFQ3EqUNibY=; b=LVP/cSAkuCZxWxBWoIhtTChzf11khXdk4Qs3jQFTaOPBjROXi+mGJeXZnOLvl7zh0+aZPf ckTa/knqkTdAQwJqSAaYxqN+fr6veZgyQpt+CDyy7/f7+wP79oU4h5xPA54u6sFJ9htuPo 1Keit/6QtldqR7AqQOTHe4g6PAnUdmpieatX4FlQvTnHMhSEueo46gFAZWhLtOSOygLwcR gL3draotUIsQfK+1QPqrocds1DjVLVAj96l8IhEaxlBEs71aedCQgX2mWLYFmo1sBAh+HH 68h4NvORAbnsTg0wHTXEIApmTj6jlW15/02O0m4meHQ06oMbqm/QvluKbmrizA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747715477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KoDx+WlB+dsj8DN5zEbx3hefg0IWDqQLkFQ3EqUNibY=; b=KgyMwYxSonil/SULfsN+HDFIQ8OsQeJZlQx0sjuSVOwa+DpoCwth15CWSXQcB1A9LzuDqq pi4y/yMBvT/vyOWSla0UjXH+EHyZNJEIf3PFpKyOs78pMknL193Kaz8VjZLOTEX0eEQjJ/ bw8FoTKhDLwqPqSkNGOsT5hmpS+OI6/IuxTJlQf6a7uJ9SMAbE+uPu1a+jUXVthmtDxboN GCFyyIpGWNtFebtbPFaRioHdTXKmQ7VpEg/eMweSD/A1kTKJF5sZSEwGYN+JGPIgC0vVm6 EiPRwwzrnD4UtSSN2mtOYsp5VditS08UlAoD3mq56QYdcW033WzkNy9nby+apQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747715477; a=rsa-sha256; cv=none; b=dgchm2jPuI1yJkfC5S3puPmXx3DUDx+/4UQJUzCKOQeyynY+GHOD4BvIreUk+F9/LurIgj EdC0AzPAVvTeppAQeqvzMXO5ECfxrXGN3d1ZMeICB6Ewjs60R/lXSwW2dI43d3T4n/LY3b sP0/uNaHO9f5+7O43uv/9a3PZ/V34DFJU6iZfrUWGCc2wBzxgvRic+7Ok3+qD031D8IRWA jHKODNe7e88inI/phYHT3f6yJL0pdy572Im9vB8qw7NyaqhRQNEcFOrJG92WyxMT4kM8X5 8qappI2BwAkLH9fae5+jBI5+WvIjzoC8nOu40fovo4hXfLHR4qkq/L7KULcPxA== 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 4b1hT10Mv7zbWs; Tue, 20 May 2025 04:31: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 54K4VG4A090040; Tue, 20 May 2025 04:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K4VGtS090037; Tue, 20 May 2025 04:31:16 GMT (envelope-from git) Date: Tue, 20 May 2025 04:31:16 GMT Message-Id: <202505200431.54K4VGtS090037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 6d10d6311356 - main - primes: fix a typo in the comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d10d63113564242d5af6d7818dc8f7916be0903 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=6d10d63113564242d5af6d7818dc8f7916be0903 commit 6d10d63113564242d5af6d7818dc8f7916be0903 Author: Maxim Konovalov AuthorDate: 2025-05-20 04:26:10 +0000 Commit: Maxim Konovalov CommitDate: 2025-05-20 04:29:49 +0000 primes: fix a typo in the comment --- usr.bin/primes/primes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/primes/primes.c b/usr.bin/primes/primes.c index 7ad7d44d408c..76d166e9bdab 100644 --- a/usr.bin/primes/primes.c +++ b/usr.bin/primes/primes.c @@ -285,7 +285,7 @@ primes(ubig start, ubig stop) } else { q = &table[mod ? factor-(mod/2) : 0]; } - /* sive for our current factor */ + /* sieve for our current factor */ for ( ; q < tab_lim; q += factor) { *q = '\0'; /* sieve out a spot */ } From nobody Tue May 20 04:31:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1hT23Qw5z5x0y7; Tue, 20 May 2025 04:31: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 4b1hT2207Nz4Mrq; Tue, 20 May 2025 04:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747715478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BFoM2yM0YfZSGHGjgCLCse2ByzzpAWuzENO4zIfh9lI=; b=MQjMRFiHtrTPoCM4TlGV5fAtcTajYwVFXuPiTvgT1nc59jh9FH5SU4v6gnzFdEjyUM/uHt kEZIxEiG89dXsqEiFdwuETWkWUQlqxGYXL9fPpG0JIJjOs81dilttpSuITZ3r2QvO6imIH SPuLUrSZiqUzGppdH1/A1WCKn8Q5wy21lHevAdU2ozYBMfzk79EstimiFnXtR2SJRbdO3+ XMFaou6gW0SUUGF93RspSVnrty0fYUBfhfnqZ945uAU3icvCONdTXCW4bfAY82AjJv0MMO uSDKWTSPoNrHGuXLCtQnmhrexiW2Ujf25nVj8S7AA/05LJX4YrOkFIjn7oFeSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747715478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BFoM2yM0YfZSGHGjgCLCse2ByzzpAWuzENO4zIfh9lI=; b=FSullZWfNqes+qGWtVn+3KmKLG3Je/thtX3qROK/tcam/k8OVAFwVgtRsLIHTqTuUeurG9 TPzCgF8idSy1VE4fZ8Mx672GJlZJ/iNy05wAuylHCPG1s7yq2p0LgkPWIPUGS8yglr68aJ vfU69BK49u/rbHkzkVsIrpVHyB2J66aJHL5jqhgqo7Ef4J5+MKEJDPhSpNfv9S4SSdj137 RrIOq8wInzSk5lh0K8kPLpCT07LQs3KA9Mqni/L9v93VOeAo/QcNOnfYbLCW9lB4BiZgvM S0rUxAXqbSTMMDbwbOQV1U00QvKZRQlOJh4ReyrlAgdMguL69Q+yiPjSKXHnIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747715478; a=rsa-sha256; cv=none; b=msVpDmcobIwtAMN0uy6NNpXJ1YoGWqE2BFYoG6/U2XbJn0xfUPz0jCV/Nr+Yw6xKLBLd9b sGhghJdn8RGMpo3UyIIfVXDe+kSwXD6EmAoy1tby9QNgvCcJodYxk3RpJrV0l+u/G3Q5jo MFDVOsWUXgHpV9KCQRwNzfbn0R2rlIL1YaBOEhRSZn+VrvMOdXPBCvGSre4sdSzgF4zna1 nFr+hIwrYJiSv3raPfVtXSku55iaWyqkfZmSLjvRBDKQ8HrEpt3mgon0Bf/g1gSND+T5HR vPzkG5VtCLZRFxU/iJl9W5vvl4i+XHSxUDGv6W34JRP0za0xvn7cM0fOHemgFw== 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 4b1hT21J1TzbWt; Tue, 20 May 2025 04:31: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 54K4VIEr090072; Tue, 20 May 2025 04:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K4VIuZ090069; Tue, 20 May 2025 04:31:18 GMT (envelope-from git) Date: Tue, 20 May 2025 04:31:18 GMT Message-Id: <202505200431.54K4VIuZ090069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 64c8e9fc32df - main - primes: put an additional comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64c8e9fc32dfe4391cdef948c05dc67e90596dc8 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=64c8e9fc32dfe4391cdef948c05dc67e90596dc8 commit 64c8e9fc32dfe4391cdef948c05dc67e90596dc8 Author: Maxim Konovalov AuthorDate: 2025-05-20 04:28:14 +0000 Commit: Maxim Konovalov CommitDate: 2025-05-20 04:29:49 +0000 primes: put an additional comment --- usr.bin/primes/primes.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/primes/primes.c b/usr.bin/primes/primes.c index 76d166e9bdab..1ce96d912012 100644 --- a/usr.bin/primes/primes.c +++ b/usr.bin/primes/primes.c @@ -241,6 +241,10 @@ primes(ubig start, ubig stop) if (p <= pr_limit) { return; } + /* + * the next odd number after the largest prime in the + * precomputed list + */ start = *pr_limit+2; } From nobody Tue May 20 07:15:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1m6G5dTHz5vxNs; Tue, 20 May 2025 07:15: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 4b1m6G4sCrz3vK7; Tue, 20 May 2025 07:15:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747725318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S5o2JseuOUqRIlTvvjb+fF/QJ7yQXB+bTzsyMjmLJsE=; b=s1sj0UI7hDSLGIfIX3aVpxD3xwplAQyFFTkDjCf8vDm+s++JnMiMiwtUUwGL3UrmjgwXS1 58AkjVbbLG8pPzho12hH0C3A7cpIwC5KX0JW9WNmAnkg18pf/qcMiSBfxTDmcbUVx/IfgP 1VR4mEdDmZjX8Igt6qAaIwIAbUO67iic+ADGYiwgUuDvgCn8FMLiBbbbqt+SA4XXZKa+aX wD4YyFvXeyIBuq0SWNimVxOYeRlBYlTH6vXkhxslIm7H19qWCYr2mF9kpq0v6r0m1n9TLQ 7dJzYaepxJhi0ew4pDgVfnyqv+/yxvtexwDU15XE7CNJ0gzMCVjDRGH3v0ZRUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747725318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S5o2JseuOUqRIlTvvjb+fF/QJ7yQXB+bTzsyMjmLJsE=; b=UV5PZMi6SNqbuFNurqGtRk33+p0EMIMcmpgj2EKgOr2uuFYpIvC7xOJjKpMQA32+VbrPMQ 4Wmx35meuPT8IcDuEWPE7aGYwPqGWMSMqz0ewURDOltzPagWKVloD/JgMJ5/o9W+YeF4FC +6z2M1Gz2ZlYpw4EfQxmO6e/V9MbKyVpdnQuVHpzCBeG1Msd5XvZmEOR65/nHSRYjvzkIF JgzaJkL0RsOOaWEyzicbItkQ3yXBX5j0EuVlOkV26rAdHW8+CZNVxJHM7QVLim12EjJzSG 6aCE0hZVMQbaPConT8eZ7rX671RSPdwY4r3A9WCsCHu2KbSquJal/ONuE+uwqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747725318; a=rsa-sha256; cv=none; b=kqrzwlqL43VxZ+U8iCbPthVsdKvtljR6hQ0pKKiSNpHgQ8Pb5D774Tj7fVMzS5EV2qkLKV 2R2fvdA1k1dVc+tWdjgmnb4FUV0P95UnrD6cO1b+GUCT/n9VTpTkMN5HseuDBL0IoQyhtY lL7wRL7ulmQELBvmGs49LGqbvPtSCSJiktsWpKnnpTSFVTRzEaGfhPI/JCJ/B9tk9biI+W dLfVdO4vjnvXZ10yj9a6N40aXYXzcScdjPVOW1xwuN9MukuvhLEjGqxqf0aDR0b5AarvHX UHpZYE5dwJNKap81cV82tETYUhmF0qJZyLALKdkMnA9Zn6o+h2697hAWNoY6lA== 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 4b1m6G4K9BzgXV; Tue, 20 May 2025 07:15: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 54K7FIgg094334; Tue, 20 May 2025 07:15:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K7FIi8094331; Tue, 20 May 2025 07:15:18 GMT (envelope-from git) Date: Tue, 20 May 2025 07:15:18 GMT Message-Id: <202505200715.54K7FIi8094331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 0f941203ac51 - main - vm_page: drop mpred from grab_valid_iter() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f941203ac513f5ed3cf30038ac9e7a062acf1b7 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=0f941203ac513f5ed3cf30038ac9e7a062acf1b7 commit 0f941203ac513f5ed3cf30038ac9e7a062acf1b7 Author: Doug Moore AuthorDate: 2025-05-20 07:11:40 +0000 Commit: Doug Moore CommitDate: 2025-05-20 07:14:49 +0000 vm_page: drop mpred from grab_valid_iter() Variable mpred in vm_page_grab_valid_iter() has become a write-only variable. Drop it. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50424 --- sys/vm/vm_page.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index ea6fbdbc6386..85a39aa8c22e 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4880,7 +4880,7 @@ int vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex, int allocflags, struct pctrie_iter *pages) { - vm_page_t m, mpred; + vm_page_t m; vm_page_t ma[VM_INITIAL_PAGEIN]; int after, i, pflags, rv; @@ -4924,7 +4924,6 @@ retrylookup: *mp = NULL; return (VM_PAGER_FAIL); } else { - mpred = vm_radix_iter_lookup_lt(pages, pindex); m = vm_page_alloc_iter(object, pindex, pflags, pages); if (m == NULL) { if (!vm_pager_can_alloc_page(object, pindex)) { @@ -4941,7 +4940,7 @@ retrylookup: after = MIN(after, VM_INITIAL_PAGEIN); after = MIN(after, allocflags >> VM_ALLOC_COUNT_SHIFT); after = MAX(after, 1); - ma[0] = mpred = m; + ma[0] = m; pctrie_iter_reset(pages); for (i = 1; i < after; i++) { m = vm_radix_iter_lookup(pages, pindex + i); @@ -4952,7 +4951,6 @@ retrylookup: break; } else if (vm_page_any_valid(m) || !vm_page_tryxbusy(m)) break; - mpred = ma[i] = m; } after = i; vm_object_pip_add(object, after); From nobody Tue May 20 08:09:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1nKK3qZ3z5w1jy; Tue, 20 May 2025 08:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1nKK37wNz3yfh; Tue, 20 May 2025 08:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747728597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjmZtH4JpxpXMJkLQBAnhtR/C3vmqtCB2MM01c8uzB0=; b=e9OXm6PO/p0rfJKp+ymzJ7CnLPUx8/hGrW+qsd6GKD8f4Y6Ppvgr4u66W3/XlIvL19oJZh qNjJo0BqQz4LMuctbJgRCb5c9Bl3y92m/SEu20IuR6XYHr9qhrJTbsSC9R5XMerYkxTZ0o Xydrjsaa7/FC0k8P3n1189TbQX3dWwjWm3oefYb6XjFpUHrZO4CFQejbaZRYR9bMrwFSR2 b82DKJ/hmcyLAsIpVjKkzrWfQIYFSpFSZjZfYf3HNpcjY5e96QS5OE4Vu183PaqFvA7eaU C8m287pe9Q3elU+xwHDHr/76JToYx1mn4Q3vE0uIBqgfJ8XuIpRI9wwf7lDjqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747728597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjmZtH4JpxpXMJkLQBAnhtR/C3vmqtCB2MM01c8uzB0=; b=WXLVspG1jTwNP9UijSXFo0+Bi59U5Yo5qc9hLXQRWYmesvpsGYxsIXMX/IAGr97TzpLPGO Z8HJ8PNAzTWsKj0EGguhVJGzisODDvmXgsERICdl9C8rDY9tct4E4Tzq4UO31wUV8ZjuJL edUpgrnFd4vjZT7sdbdx+gw+xxWlm5eODMEnPAsEcqMq9na/kIeDX0OabfWCFs+5fbsXWs SWToed6tFHLkyisXIJo1yYl7syAGduFHY5Pd8xulk2es6q2oNGkQUo+Dp4CDI7MTqsBziF G5oCymp0Ta2Z68cQHsQkeN/fjrpg17MrLoy0iDACIWpLT1zFtt37gQlymMTq7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747728597; a=rsa-sha256; cv=none; b=YBqtEmUvv0GIf9ZyKd2j0VZnJLilbRMaU8RQAR0M00B8Z9m8+Dto76F7AEonc829sA5lWD BzgWBDeUaURuCfkcXM8vBWoVdi3BCxw4auQc8Bsv0wdDjEr36NpivXfHMh8F1cJMbLrfsi N7JUUarSttORmO6+EeNBzHLTUjavBoKfmOkuSh9G+mruKaXAaqqQE0P+tA8nJXQnwd9Rhw mJ0TQYA8LE2afILLGv5zPH4lRaENS3k+iSx0Tpid/4a1AuJ0B79El/PPrQPyhtl9zZcXWl x/N09FKZrJ2prmxhARKGijxPTc88jU79ACdfT9sAYnijUiSkgiJY6qpculhmhg== 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 4b1nKK2XLszj1R; Tue, 20 May 2025 08:09:57 +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 54K89vOt088561; Tue, 20 May 2025 08:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K89vuZ088558; Tue, 20 May 2025 08:09:57 GMT (envelope-from git) Date: Tue, 20 May 2025 08:09:57 GMT Message-Id: <202505200809.54K89vuZ088558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: c8ffb90b1dd3 - main - Revert "vm_page: drop mpred from grab_valid_iter()" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8ffb90b1dd391b88b67f66028833876497d5d78 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c8ffb90b1dd391b88b67f66028833876497d5d78 commit c8ffb90b1dd391b88b67f66028833876497d5d78 Author: Doug Moore AuthorDate: 2025-05-20 08:08:43 +0000 Commit: Doug Moore CommitDate: 2025-05-20 08:08:43 +0000 Revert "vm_page: drop mpred from grab_valid_iter()" This reverts commit 0f941203ac513f5ed3cf30038ac9e7a062acf1b7. Removing the unread variable also removed a side-effect of computing a value to assign to that variable, and that side-effect was critical. --- sys/vm/vm_page.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 85a39aa8c22e..ea6fbdbc6386 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4880,7 +4880,7 @@ int vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex, int allocflags, struct pctrie_iter *pages) { - vm_page_t m; + vm_page_t m, mpred; vm_page_t ma[VM_INITIAL_PAGEIN]; int after, i, pflags, rv; @@ -4924,6 +4924,7 @@ retrylookup: *mp = NULL; return (VM_PAGER_FAIL); } else { + mpred = vm_radix_iter_lookup_lt(pages, pindex); m = vm_page_alloc_iter(object, pindex, pflags, pages); if (m == NULL) { if (!vm_pager_can_alloc_page(object, pindex)) { @@ -4940,7 +4941,7 @@ retrylookup: after = MIN(after, VM_INITIAL_PAGEIN); after = MIN(after, allocflags >> VM_ALLOC_COUNT_SHIFT); after = MAX(after, 1); - ma[0] = m; + ma[0] = mpred = m; pctrie_iter_reset(pages); for (i = 1; i < after; i++) { m = vm_radix_iter_lookup(pages, pindex + i); @@ -4951,6 +4952,7 @@ retrylookup: break; } else if (vm_page_any_valid(m) || !vm_page_tryxbusy(m)) break; + mpred = ma[i] = m; } after = i; vm_object_pip_add(object, after); From nobody Tue May 20 09:50:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1qYm3Bmsz5w87j; Tue, 20 May 2025 09:50: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 4b1qYm2gVHz3D8n; Tue, 20 May 2025 09:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747734652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPPKJvaooddnVWkTVGE6ihazAQoQtjzGr6gs6HY+v9c=; b=U9q/KCJMKxhFUL5zlGqjV0Dzp6uG5psfVXRB9xWq/HdD7AEbamOC9uyrSu8SEZ+hZlH2FE i9c/Y30Dti7m0voZ2bhc8k7PNJFqq7f2LUVmc/gBDFrYbeBeGnMsDmOo4HjjjHupwfXwyA IGcfnHOM8U1x6MObABXLvRUg6SnJ2bHyg0RKdOwzcK7ZF9+8hTnX18gQikx+avhYQzLawO gV9QJayjLWObUpFqMksXJEPch9VgKP6LfoGG4EmCYDghPRqoxvb3o7eAWw2lEPhJpHigTD 6SrT0kTjPYnlczA/lvEOjHH+GGSlM/aCRDr4U2xu6UDGaXFFr6c4t6X9GxTwLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747734652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPPKJvaooddnVWkTVGE6ihazAQoQtjzGr6gs6HY+v9c=; b=N5TYzfHt7gfIUIBiDRh7RM9QNrVCwhTFAwhFP9s4/LM6ICZ/cAkchSDFDQBHIGdDWdABVR gC/tIciTmnRHY6wB3b4FOey1uLhYbafdEEpUWWE2DMESK+4ye/di+FoefbNL5RZcumbag9 1v56eWu4owe5oJfm1Onwj0MjUjeQj2h/0ZMp+NBALtMkUw7+0V+Pc4R5URG50jlttKz0K2 5OYASyOIXfMd3M2tfZkvnyV6UwshlZvtzuu7RKUGf2RoSJ99jNjOFtO2VT89dbkMVuZB+x e01BZQ2XC01d1+/rtLcQI2DLaq4Ob/0VXzGb3Hv/m9BuiV4y0Cqg4eB+88weJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747734652; a=rsa-sha256; cv=none; b=LhMWxSyPW47gD36nKnfFnFXQ8n5FRleWKnArlXqnXbTZnc0FRwMWkPsoh6UX1ZcRi1stys TKNAqKv4XUxNaxqVjfwjfSdoUKyeXux4RkkajSGs+xf75RYJNu/ka+DEniWEZUt2ulngBy DnhCdXoSq3XUWGEemeM+NySxxxRexA/oE1EgdWng50w5mfDg5XsLVs8VRy/4tPTGoAhpek jnutrBr3z/ZpQXPnKlHJry4nIJTaUi8MRpt4mPGaPGGCO3anXY74EGmjTER4+JF3llZFgv kdhE+wtYFFTeiRrGopiH/wksq5KN5rYrlm+a3i7kEAzY79f0bjYQTs5OtYhWJA== 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 4b1qYm2Ft2zlRY; Tue, 20 May 2025 09:50: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 54K9oqjH085664; Tue, 20 May 2025 09:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K9oqon085661; Tue, 20 May 2025 09:50:52 GMT (envelope-from git) Date: Tue, 20 May 2025 09:50:52 GMT Message-Id: <202505200950.54K9oqon085661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: fba91af3b09b - main - makefs: Honor -T timestamps when creating images from mtree manifests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fba91af3b09b0cb021a50da2bc78e44dfd49b69a Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=fba91af3b09b0cb021a50da2bc78e44dfd49b69a commit fba91af3b09b0cb021a50da2bc78e44dfd49b69a Author: Bojan Novković AuthorDate: 2025-03-24 15:47:35 +0000 Commit: Bojan Novković CommitDate: 2025-05-20 09:50:22 +0000 makefs: Honor -T timestamps when creating images from mtree manifests makefs backends rely on the fsnode structure to derive most of the information about the underlying filesystem objects. Depending on how the image is built, the fsnode structures are initialized in the walk_dir or read_mtree functions. However, read_mtree fails to take timestamps passed by -T into account, leading to nonreproducible images in backends that do not check for -T. Fix this and make -T backend-agnostic by adding an appropriate check in read_mtree_keywords while making sure that mtree entries can still override -T timestamps. PR: 285630 Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D49531 --- usr.sbin/makefs/makefs.8 | 8 ++++++-- usr.sbin/makefs/makefs.c | 16 ++++++++++++++++ usr.sbin/makefs/makefs.h | 1 + usr.sbin/makefs/mtree.c | 19 ++++++++++++++++--- usr.sbin/makefs/walk.c | 16 ++-------------- 5 files changed, 41 insertions(+), 19 deletions(-) diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index ae11309953e4..a11eaf8206e9 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -259,9 +259,13 @@ can be a .Pa pathname , where the timestamps are derived from that file, or an integer value interpreted as the number of seconds from the Epoch. -Note that timestamps specified in an +Timestamps in a .Xr mtree 5 -spec file, override the default timestamp. +specfile (specified with +.Fl F ) +are used even if a default timestamp is specified. +However, the timestamps in an mtree manifest are ignored +if a default timestamp is specified. .It Fl t Ar fs-type Create an .Ar fs-type diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c index d85b9c2668e7..46e513e22b25 100644 --- a/usr.sbin/makefs/makefs.c +++ b/usr.sbin/makefs/makefs.c @@ -436,6 +436,22 @@ set_option_var(const option_t *options, const char *var, const char *val, return -1; } +void +set_tstamp(fsnode *cur) +{ + cur->inode->st.st_atime = stampst.st_atime; + cur->inode->st.st_mtime = stampst.st_mtime; + cur->inode->st.st_ctime = stampst.st_ctime; +#if HAVE_STRUCT_STAT_ST_MTIMENSEC + cur->inode->st.st_atimensec = stampst.st_atimensec; + cur->inode->st.st_mtimensec = stampst.st_mtimensec; + cur->inode->st.st_ctimensec = stampst.st_ctimensec; +#endif +#if HAVE_STRUCT_STAT_BIRTHTIME + cur->inode->st.st_birthtime = stampst.st_birthtime; + cur->inode->st.st_birthtimensec = stampst.st_birthtimensec; +#endif +} static fstype_t * get_fstype(const char *type) diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h index 62c7e430a00c..3cd56a036670 100644 --- a/usr.sbin/makefs/makefs.h +++ b/usr.sbin/makefs/makefs.h @@ -188,6 +188,7 @@ fsnode * read_mtree(const char *, fsnode *); int set_option(const option_t *, const char *, char *, size_t); int set_option_var(const option_t *, const char *, const char *, char *, size_t); +void set_tstamp(fsnode *); fsnode * walk_dir(const char *, const char *, fsnode *, fsnode *); void free_fsnodes(fsnode *); option_t * copy_opts(const option_t *); diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c index 83e207b07402..4f3c3f85dcc3 100644 --- a/usr.sbin/makefs/mtree.c +++ b/usr.sbin/makefs/mtree.c @@ -631,6 +631,9 @@ read_mtree_keywords(FILE *fp, fsnode *node) } /* Ignore. */ } else if (strcmp(keyword, "time") == 0) { + /* Ignore if a default timestamp is present. */ + if (stampst.st_ino != 0) + break; if (value == NULL) { error = ENOATTR; break; @@ -720,7 +723,9 @@ read_mtree_keywords(FILE *fp, fsnode *node) return (error); st->st_mode = (st->st_mode & ~S_IFMT) | node->type; - + /* Store default timestamp, if present. */ + if (stampst.st_ino != 0) + set_tstamp(node); /* Nothing more to do for the global defaults. */ if (node->name == NULL) return (0); @@ -1051,8 +1056,16 @@ read_mtree(const char *fname, fsnode *node) mtree_global.inode = &mtree_global_inode; mtree_global_inode.nlink = 1; mtree_global_inode.st.st_nlink = 1; - mtree_global_inode.st.st_atime = mtree_global_inode.st.st_ctime = - mtree_global_inode.st.st_mtime = time(NULL); + if (stampst.st_ino != 0) { + set_tstamp(&mtree_global); + } else { +#if HAVE_STRUCT_STAT_BIRTHTIME + mtree_global_inode.st.st_birthtime = +#endif + mtree_global_inode.st.st_atime = + mtree_global_inode.st.st_ctime = + mtree_global_inode.st.st_mtime = time(NULL); + } errors = warnings = 0; setgroupent(1); diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c index dc03a16cf2c6..65ba3f41fe02 100644 --- a/usr.sbin/makefs/walk.c +++ b/usr.sbin/makefs/walk.c @@ -248,20 +248,8 @@ create_fsnode(const char *root, const char *path, const char *name, cur->type = stbuf->st_mode & S_IFMT; cur->inode->nlink = 1; cur->inode->st = *stbuf; - if (stampst.st_ino) { - cur->inode->st.st_atime = stampst.st_atime; - cur->inode->st.st_mtime = stampst.st_mtime; - cur->inode->st.st_ctime = stampst.st_ctime; -#if HAVE_STRUCT_STAT_ST_MTIMENSEC - cur->inode->st.st_atimensec = stampst.st_atimensec; - cur->inode->st.st_mtimensec = stampst.st_mtimensec; - cur->inode->st.st_ctimensec = stampst.st_ctimensec; -#endif -#if HAVE_STRUCT_STAT_BIRTHTIME - cur->inode->st.st_birthtime = stampst.st_birthtime; - cur->inode->st.st_birthtimensec = stampst.st_birthtimensec; -#endif - } + if (stampst.st_ino != 0) + set_tstamp(cur); return (cur); } From nobody Tue May 20 09:50:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1qYn4ny3z5w7wg; Tue, 20 May 2025 09:50: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 4b1qYn3JG6z3DBt; Tue, 20 May 2025 09:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747734653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxLCIXJWbedEFzhC5ywdCLZIIsMfT4EuKsKCE+NhJVE=; b=Xk/V002gZmaR+rLpJORC/EKPfNwdr5/9j5OQNtyifwBgxHqPGF7raeesAdVPn8SHhAaVth vl4Uryom7eFAjP8RvwMRqaoz47LW1l6578kC0vAdQzRuRzaTwf9yUyyUmsgVF0E9GGA94d stMSwEUXiH0sjSxFvOHIzf2I02ac4Wm6DYY31jRVkDOfd9pZcr8/gyQJIoJmXQa70KaYoH 5XVS7Hav4bxX45H1MVnE8IdsEG6Xk1HcFSgrZW/WpqD5FuyLPQHfrnZSl2xIIjOnneQncV jvb6OB1pU5xvgPx+k4WwNaYbiXlcui0HBdnDj1KpVq8OU38oNDbaGjHe9HDZpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747734653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxLCIXJWbedEFzhC5ywdCLZIIsMfT4EuKsKCE+NhJVE=; b=mveER/b6HKPij/09Mfxnx7nusi06JHcS360X07X7t40rifmwF+rLHTPMbwbEp6xOxGOl4Z aTUz/XQLTqtiPGHX5H+soITEa6KyIdPu07YDoxDVTCnoxNLHiRCTMtcFio+Y/v/Fah2GUI gInbdhg6Y1fz2BH598oZ/MBS68A2ihw840QUpGGfo6griP5ao18RzMzJ9PC3gQViAYLbBW BRmKY87sqpzEJmz6T3oqStWae67eqWXgn7WGpYgqJoOtBEXoyUrS8h2CA9LypRotMav6yg JRygMJAr+KzSY/RPAybcMQP/iGpDSyNvw5iWYdmYtOeuAWwNgA5FbTywTMjYVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747734653; a=rsa-sha256; cv=none; b=C01MtJFa97bzyi9GOgTJydI24VJCPhCmx3MH+rgU8PT5+oyn01EBnL9ozB+eX/Iso/P8UJ 6IuTdZKxVyXnuA2LYwHtNs11MfiNpt+FweUlgLAE+3YWlUajQ1/ieA/JWv3TKIQJIrlsYI tCo78rd37/XomVI+CjfBhkbRnSBcGzRzZq5hiNt+jxGTB/SaSpLmvv8kw+LM04qpG030P9 9Ji9M8NP1cNAqnKyWIQ/oTXK2Fn4nY7oULzkcOSrqasXXzvj66yzf1zZqleiCfxBha28/2 lGWN4cDjpD/Kzdpl99+kJHja0Se6+PmZABMZnkCikPDeng9hsnZiWlSJ0QL9MQ== 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 4b1qYn2vnSzlXs; Tue, 20 May 2025 09:50: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 54K9orqI085702; Tue, 20 May 2025 09:50:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K9orwO085699; Tue, 20 May 2025 09:50:53 GMT (envelope-from git) Date: Tue, 20 May 2025 09:50:53 GMT Message-Id: <202505200950.54K9orwO085699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 1e904d6742bb - main - makefs: Remove redundant 'stampst' checks in several backends List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e904d6742bbed99387cc6bcb00dc088192f65df Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=1e904d6742bbed99387cc6bcb00dc088192f65df commit 1e904d6742bbed99387cc6bcb00dc088192f65df Author: Bojan Novković AuthorDate: 2025-04-01 11:12:39 +0000 Commit: Bojan Novković CommitDate: 2025-05-20 09:50:27 +0000 makefs: Remove redundant 'stampst' checks in several backends PR: 285630 Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49601 --- usr.sbin/makefs/ffs.c | 6 ++++-- usr.sbin/makefs/msdos/msdosfs_vnops.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 34a0f8a67497..4efcd20ad91a 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -679,8 +679,9 @@ ffs_build_dinode1(struct ufs1_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, { size_t slen; void *membuf; - struct stat *st = stampst.st_ino != 0 ? &stampst : &cur->inode->st; + struct stat *st; + st = &cur->inode->st; memset(dinp, 0, sizeof(*dinp)); dinp->di_mode = cur->inode->st.st_mode; dinp->di_nlink = cur->inode->nlink; @@ -725,8 +726,9 @@ ffs_build_dinode2(struct ufs2_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, { size_t slen; void *membuf; - struct stat *st = stampst.st_ino != 0 ? &stampst : &cur->inode->st; + struct stat *st; + st = &cur->inode->st; memset(dinp, 0, sizeof(*dinp)); dinp->di_mode = cur->inode->st.st_mode; dinp->di_nlink = cur->inode->nlink; diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c index 441af0cae86a..b104f419a86a 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vnops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c @@ -94,8 +94,6 @@ static void unix2fattime(const struct timespec *tsp, uint16_t *ddp, static void msdosfs_times(struct denode *dep, const struct stat *st) { - if (stampst.st_ino) - st = &stampst; #if HAVE_STRUCT_STAT_BIRTHTIME unix2fattime(&st->st_birthtim, &dep->de_CDate, &dep->de_CTime); From nobody Tue May 20 09:50:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1qYq0K8fz5w89s; Tue, 20 May 2025 09:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1qYp4dnDz3DDv; Tue, 20 May 2025 09:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747734654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Egf4MwKMh3r8K0ostdH/WkWQSkoRYDxTaa6USeCbFF0=; b=oqZp8m1CMwPMED1eIoTO3DkI1hnECOrOtCdDYjqEDUNPzsa9y5KnCQp0X62PcR42VhkoSt j2QTOj/eW1F1Zbk8oad69QIClxzlhGiYb5PwX2i60rT7yh5JsE/YQpv43i6H2H1aBPMPiC pqZEUHUfYhZLPWlDzw2sM1WTF/ROOBK/Bjo7EpMwTq+uiBCOl9ETj/bmt6kE9fhYOxNS7d isefHpQnfDxicCI4I1EOa9ryiXr1KX9ofoTTIIJLGcnSYQyTKPCbERFUmVYlqqX5j6nzFO 9EmY6FWhzoKvPfYuGC0U4IgZUuGHcpbnW/11HA6/BZWoRGiVrR8jGlhWYwmf0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747734654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Egf4MwKMh3r8K0ostdH/WkWQSkoRYDxTaa6USeCbFF0=; b=YO+Li3IvpTesM/sEF6ThM7X4FP0FIOQufS3P0FfHat74JM+qoFGzrHZqN0E3dd+jCOdI3u E84lW/zRy1KcRdygffeKBmmojuRCgkNMrvK/wTtXU/74N8BFaqZvWkY231R0FIcrskdLFa LwG7YduP70vGxspmrR/SqN5b3Q297RkLjPSAdGNO4zgHn0NDDWVi1kpTzcyP5NIku0iTF5 PEykNIA8jmzVRid6P6o2XDvWroaqNAwXuEFvyRv1IOWL1venhAkSxnbTWV9zI1Cgup03RA 0RuOjB/ClaMdwWcZNFfnZxdVyI4jZApfGdhdd0SpEgsdbWh5VXM8DE4HM77Zjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747734654; a=rsa-sha256; cv=none; b=JO+pJ1C/1dp2fzgcdJXHlI7UlLWWliQm94OQUfOMMaQnoTUyWAUhF/LNhN3pTrDoOAQuFt m2GVbXhhsWztsq4cLKEYy57J6XmkY+p0WvC9tQnG10IR1Z2DorL0fYlcmBeNI1rtNRMMAa 1bz7cNSVuiEoUaNt+zDQ+bKjpndm0efSK+5U3IozHabAJKPMlkpizvRSLsY0tAu7CpADWy fEwMmzidcggR0SEi7TskuCR6cVErRrUyNG57nvTFeG27CUDrh0Wwj3VllwJkFTE7gy6yyz lOYDWSeO1gzl3P/+++6LwVSp2lcaWdcIUvWNFaQohmCYHlg/GR0knJEnJ3qorw== 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 4b1qYp49NVzlRb; Tue, 20 May 2025 09:50:54 +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 54K9osXR085751; Tue, 20 May 2025 09:50:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K9osXp085747; Tue, 20 May 2025 09:50:54 GMT (envelope-from git) Date: Tue, 20 May 2025 09:50:54 GMT Message-Id: <202505200950.54K9osXp085747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 964b0ece795a - main - makefs: Add tests for the -T flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 964b0ece795a4e2c811753873bf6883ffb160af8 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=964b0ece795a4e2c811753873bf6883ffb160af8 commit 964b0ece795a4e2c811753873bf6883ffb160af8 Author: Bojan Novković AuthorDate: 2025-03-25 12:54:17 +0000 Commit: Bojan Novković CommitDate: 2025-05-20 09:50:31 +0000 makefs: Add tests for the -T flag Add tests for the -T flag to each makefs backend. This includes tests for both mtree and directory scan options. PR: 285630 Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Reviewed by: markj, emaste, kevans, jlduran Differential Revision: https://reviews.freebsd.org/D49492 --- usr.sbin/makefs/tests/Makefile | 2 + usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 78 +++++++++++++++ usr.sbin/makefs/tests/makefs_ffs_tests.sh | 77 +++++++++++++++ usr.sbin/makefs/tests/makefs_msdos_tests.sh | 136 +++++++++++++++++++++++++++ usr.sbin/makefs/tests/makefs_tests_common.sh | 7 ++ usr.sbin/makefs/tests/makefs_zfs_tests.sh | 80 ++++++++++++++++ 6 files changed, 380 insertions(+) diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile index 39844827f999..345b728651d6 100644 --- a/usr.sbin/makefs/tests/Makefile +++ b/usr.sbin/makefs/tests/Makefile @@ -3,6 +3,8 @@ ATF_TESTS_SH+= makefs_cd9660_tests TEST_METADATA.makefs_cd9660_tests+= required_files="/sbin/mount_cd9660" ATF_TESTS_SH+= makefs_ffs_tests +ATF_TESTS_SH+= makefs_msdos_tests +TEST_METADATA.makefs_msdos_tests+= required_files="/sbin/mount_msdosfs" .if ${MK_ZFS} != "no" ATF_TESTS_SH+= makefs_zfs_tests # ZFS pools created by makefs always have the same GUID, so OpenZFS diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh index 066a9d6ec0e0..e058dfc57b7b 100644 --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh @@ -374,6 +374,81 @@ o_flag_rockridge_dev_nodes_cleanup() common_cleanup } +atf_test_case T_flag_dir cleanup +T_flag_dir_body() +{ + timestamp=1742574909 + check_cd9660_support + create_test_dirs + + mkdir -p $TEST_INPUTS_DIR/dir1 + atf_check -e empty -o empty -s exit:0 \ + $MAKEFS -T $timestamp -o rockridge $TEST_IMAGE $TEST_INPUTS_DIR + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp + atf_check_equal $st_mtime $timestamp + atf_check_equal $st_ctime $timestamp +} + +T_flag_dir_cleanup() +{ + common_cleanup +} + +atf_test_case T_flag_F_flag cleanup +T_flag_F_flag_body() +{ + atf_expect_fail "-F doesn't take precedence over -T" + timestamp_F=1742574909 + timestamp_T=1742574910 + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + + atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ + mtree -c -k "type,time" -p $TEST_INPUTS_DIR + change_mtree_timestamp $TEST_SPEC_FILE $timestamp_F + atf_check -e empty -o not-empty -s exit:0 \ + $MAKEFS -F $TEST_SPEC_FILE -T $timestamp_T -o rockridge $TEST_IMAGE $TEST_INPUTS_DIR + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp_F + atf_check_equal $st_mtime $timestamp_F + atf_check_equal $st_ctime $timestamp_F +} + +T_flag_F_flag_cleanup() +{ + common_cleanup +} + +atf_test_case T_flag_mtree cleanup +T_flag_mtree_body() +{ + timestamp=1742574909 + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + + atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ + mtree -c -k "type" -p $TEST_INPUTS_DIR + atf_check -e empty -o empty -s exit:0 \ + $MAKEFS -T $timestamp -o rockridge $TEST_IMAGE $TEST_SPEC_FILE + + check_cd9660_support + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp + atf_check_equal $st_mtime $timestamp + atf_check_equal $st_ctime $timestamp +} + +T_flag_mtree_cleanup() +{ + common_cleanup +} + atf_test_case duplicate_names cleanup duplicate_names_head() { @@ -425,6 +500,9 @@ atf_init_test_cases() atf_add_test_case o_flag_publisher atf_add_test_case o_flag_rockridge atf_add_test_case o_flag_rockridge_dev_nodes + atf_add_test_case T_flag_dir + atf_add_test_case T_flag_F_flag + atf_add_test_case T_flag_mtree atf_add_test_case duplicate_names } diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/tests/makefs_ffs_tests.sh index 2505b2e24d72..f828f632b06e 100644 --- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh @@ -241,6 +241,80 @@ o_flag_version_2_cleanup() common_cleanup } + +atf_test_case T_flag_dir cleanup +T_flag_dir_body() +{ + timestamp=1742574909 + create_test_dirs + + mkdir -p $TEST_INPUTS_DIR/dir1 + atf_check -e empty -o not-empty -s exit:0 \ + $MAKEFS -M 1m -T $timestamp $TEST_IMAGE $TEST_INPUTS_DIR + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp + atf_check_equal $st_mtime $timestamp + atf_check_equal $st_ctime $timestamp +} + +T_flag_dir_cleanup() +{ + common_cleanup +} + +atf_test_case T_flag_F_flag cleanup +T_flag_F_flag_body() +{ + atf_expect_fail "-F doesn't take precedence over -T" + timestamp_F=1742574909 + timestamp_T=1742574910 + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + + atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ + mtree -c -k "type,time" -p $TEST_INPUTS_DIR + change_mtree_timestamp $TEST_SPEC_FILE $timestamp_F + atf_check -e empty -o not-empty -s exit:0 \ + $MAKEFS -F $TEST_SPEC_FILE -T $timestamp_T -M 1m $TEST_IMAGE $TEST_INPUTS_DIR + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp_F + atf_check_equal $st_mtime $timestamp_F + atf_check_equal $st_ctime $timestamp_F +} + +T_flag_F_flag_cleanup() +{ + common_cleanup +} + +atf_test_case T_flag_mtree cleanup +T_flag_mtree_body() +{ + timestamp=1742574909 + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + + atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ + mtree -c -k "type" -p $TEST_INPUTS_DIR + atf_check -e empty -o not-empty -s exit:0 \ + $MAKEFS -M 1m -T $timestamp $TEST_IMAGE $TEST_SPEC_FILE + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp + atf_check_equal $st_mtime $timestamp + atf_check_equal $st_ctime $timestamp +} + +T_flag_mtree_cleanup() +{ + common_cleanup +} + atf_init_test_cases() { @@ -255,4 +329,7 @@ atf_init_test_cases() atf_add_test_case o_flag_version_1 atf_add_test_case o_flag_version_2 + atf_add_test_case T_flag_dir + atf_add_test_case T_flag_F_flag + atf_add_test_case T_flag_mtree } diff --git a/usr.sbin/makefs/tests/makefs_msdos_tests.sh b/usr.sbin/makefs/tests/makefs_msdos_tests.sh new file mode 100644 index 000000000000..b36b43b3abf6 --- /dev/null +++ b/usr.sbin/makefs/tests/makefs_msdos_tests.sh @@ -0,0 +1,136 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 The FreeBSD Foundation +# +# This software was developed by Klara, Inc. +# under sponsorship from the FreeBSD Foundation and the Sovereign Tech Agency. +# +# 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. +# + +MAKEFS="makefs -t msdos" +MOUNT="mount_msdosfs" +. "$(dirname "$0")/makefs_tests_common.sh" + +common_cleanup() +{ + if ! test_md_device=$(cat $TEST_MD_DEVICE_FILE); then + echo "$TEST_MD_DEVICE_FILE could not be opened; has an md(4) device been attached?" + return + fi + + umount -f /dev/$test_md_device || : + mdconfig -d -u $test_md_device || : +} + +check_msdosfs_support() +{ + kldstat -m msdosfs || \ + atf_skip "Requires msdosfs filesystem support to be present in the kernel" +} + +atf_test_case T_flag_dir cleanup +T_flag_dir_body() +{ + atf_expect_fail \ + "The msdos backend saves the wrong timestamp value" \ + "(possibly due to the 2s resolution for FAT timestamp)" + timestamp=1742574909 + check_msdosfs_support + + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + atf_check -e empty -o not-empty -s exit:0 \ + $MAKEFS -T $timestamp -s 1m $TEST_IMAGE $TEST_INPUTS_DIR + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp + atf_check_equal $st_mtime $timestamp + atf_check_equal $st_ctime $timestamp +} + +T_flag_dir_cleanup() +{ + common_cleanup +} + +atf_test_case T_flag_F_flag cleanup +T_flag_F_flag_body() +{ + atf_expect_fail "-F doesn't take precedence over -T" + timestamp_F=1742574909 + timestamp_T=1742574910 + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + + atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ + mtree -c -k "type,time" -p $TEST_INPUTS_DIR + change_mtree_timestamp $TEST_SPEC_FILE $timestamp_F + atf_check -e empty -o not-empty -s exit:0 \ + $MAKEFS -F $TEST_SPEC_FILE -T $timestamp_T -s 1m $TEST_IMAGE $TEST_INPUTS_DIR + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp_F + atf_check_equal $st_mtime $timestamp_F + atf_check_equal $st_ctime $timestamp_F +} + +T_flag_F_flag_cleanup() +{ + common_cleanup +} + +atf_test_case T_flag_mtree cleanup +T_flag_mtree_body() +{ + timestamp=1742574908 # Even value, timestamp precision is 2s. + check_msdosfs_support + + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ + mtree -c -k "type" -p $TEST_INPUTS_DIR + atf_check -e empty -o not-empty -s exit:0 \ + $MAKEFS -T $timestamp -s 1m $TEST_IMAGE $TEST_SPEC_FILE + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + # FAT directory entries don't have an access time, just a date. + #atf_check_equal $st_atime $timestamp + atf_check_equal $st_mtime $timestamp + atf_check_equal $st_ctime $timestamp +} + +T_flag_mtree_cleanup() +{ + common_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case T_flag_dir + atf_add_test_case T_flag_F_flag + atf_add_test_case T_flag_mtree +} diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs/tests/makefs_tests_common.sh index b418cafc90a6..edb79bc811e1 100644 --- a/usr.sbin/makefs/tests/makefs_tests_common.sh +++ b/usr.sbin/makefs/tests/makefs_tests_common.sh @@ -141,3 +141,10 @@ mount_image() $MOUNT ${1} /dev/$(cat $TEST_MD_DEVICE_FILE) $TEST_MOUNT_DIR } +change_mtree_timestamp() +{ + filename="$1" + timestamp="$2" + + sed -i "" "s/time=.*$/time=${timestamp}.0/g" "$filename" +} diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 3d5819439a73..520d1f211ac3 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -858,6 +858,83 @@ perms_cleanup() common_cleanup } +# +# Verify that -T timestamps are honored. +# +atf_test_case T_flag_dir cleanup +T_flag_dir_body() +{ + timestamp=1742574909 + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + + atf_check $MAKEFS -T $timestamp -s 10g -o rootpath=/ -o poolname=$ZFS_POOL_NAME \ + $TEST_IMAGE $TEST_INPUTS_DIR + + import_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp + atf_check_equal $st_mtime $timestamp + atf_check_equal $st_ctime $timestamp +} + +T_flag_dir_cleanup() +{ + common_cleanup +} + +atf_test_case T_flag_F_flag cleanup +T_flag_F_flag_body() +{ + atf_expect_fail "-F doesn't take precedence over -T" + timestamp_F=1742574909 + timestamp_T=1742574910 + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + + atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ + mtree -c -k "type,time" -p $TEST_INPUTS_DIR + change_mtree_timestamp $TEST_SPEC_FILE $timestamp_F + atf_check -e empty -o not-empty -s exit:0 \ + $MAKEFS -F $TEST_SPEC_FILE -T $timestamp_T -s 10g -o rootpath=/ \ + -o poolname=$ZFS_POOL_NAME $TEST_IMAGE $TEST_INPUTS_DIR + + mount_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp_F + atf_check_equal $st_mtime $timestamp_F + atf_check_equal $st_ctime $timestamp_F +} + +T_flag_F_flag_cleanup() +{ + common_cleanup +} + +atf_test_case T_flag_mtree cleanup +T_flag_mtree_body() +{ + timestamp=1742574909 + create_test_dirs + mkdir -p $TEST_INPUTS_DIR/dir1 + + atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ + mtree -c -k "type" -p $TEST_INPUTS_DIR + atf_check $MAKEFS -T $timestamp -s 10g -o rootpath=/ -o poolname=$ZFS_POOL_NAME \ + $TEST_IMAGE $TEST_SPEC_FILE + + import_image + eval $(stat -s $TEST_MOUNT_DIR/dir1) + atf_check_equal $st_atime $timestamp + atf_check_equal $st_mtime $timestamp + atf_check_equal $st_ctime $timestamp +} + +T_flag_mtree_cleanup() +{ + common_cleanup +} + atf_init_test_cases() { atf_add_test_case autoexpand @@ -883,6 +960,9 @@ atf_init_test_cases() atf_add_test_case root_props atf_add_test_case used_space_props atf_add_test_case perms + atf_add_test_case T_flag_dir + atf_add_test_case T_flag_F_flag + atf_add_test_case T_flag_mtree # XXXMJ tests: # - test with different ashifts (at least, 9 and 12), different image sizes From nobody Tue May 20 14:57:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1yMF4H32z5wW99; Tue, 20 May 2025 14:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1yMF3kf3z3kfl; Tue, 20 May 2025 14:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747753033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZ6fVzxGFtvF1KSAQbzB/kTLDwKisNMl25lxWW7xsmc=; b=FBiHm9bmVqdMVZxCFdKQtiHCphoguKm0DSEdjRmXITlPaPtsySgvXGg37lpMQ5QohWIBJk pK6Y5jX7H6p6kimRMMfBNzZYr/flrlMyojSA7kr7WpJxiStkx3HzvsuycHEYUrxCYHoKCy s5rgw66VUw671cLtq+yVJtLOoyjjum0Qc1hSxHwCuZQrdMKUYZQnIL8y8fQP/+fLbotBve x4dRjfdEdUIKHuL0OpghOpQbCOkTFai/1IjFYtrIXVrn/2ZEJIAyJtHVJgUf4GBnO6trkG ZQKcK2S+SJlR3dnBzfI/fVuTkYOGzvi9z4UjkX9hHw17bjs6VSsgWs/QV2cOOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747753033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZ6fVzxGFtvF1KSAQbzB/kTLDwKisNMl25lxWW7xsmc=; b=ok5IuOTMNYrYp/yJA4Va+PutgmhKU+DfwudyYNgCEZ+Afb+cGCQaKmX8kXPQ3h2zddeJV0 TuNiTAgRr76q7CHObvbftkOxx0MNsa4DD2RQVs5KK5iJJaAzDH4pCtU/croaUGzMRNSiiK ptUzbLHZ/I6JnC6XJXb+qLiXFUmB4DrjnJCIlpyYRcxyC6gYFI4LrN4PRvP9CvNB4wn1ux TCCoTRHE0yu7YCaAOLfciTPWqkTHUxYePJJrkw4O7YiexagscQbjtVYAi/IlxwYHUA5sP0 iecHQjAdiS9MaYl2v+7WANdweWJWsSwziDxSVyLgO1EoMETfvNaCGVup80EKeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747753033; a=rsa-sha256; cv=none; b=KAxba/NzE7qgTXHzSvd2010OJXb4ssDigJho1GoSFC/CtvnSi1FmQkPpTog2bxL/cYhMKU PF5Wo1zFNcUWwt5tYanwTgZkEi0aOBsjBzwOYye7wsMXs1OOizvDRlx4DSSDDug9xc2QBe YIC3l+EBlq6qEhTr39r567un4/uuy701CSRD6yLIPHDOeOFVrg/aGdIY9BTqH2/itJJtvl xeHbMd/K0gWjqLf7PZTzupLULYsfGdm/PIr4d0TKV7HnqO1wj6Z2dMH6Hs9/t8Wpr4Hf4o ZIlPNzgbyU1nhRx+rx6HtnvJEWrLO5WGE7A8E6Pq2ayBWAon5UPh9U2vOMbb5A== 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 4b1yMF3K0Kzv7t; Tue, 20 May 2025 14:57: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 54KEvDMn053954; Tue, 20 May 2025 14:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KEvD1r053951; Tue, 20 May 2025 14:57:13 GMT (envelope-from git) Date: Tue, 20 May 2025 14:57:13 GMT Message-Id: <202505201457.54KEvD1r053951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d2fd5b99c95329085d0700a4dd38507a054a50d Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=0d2fd5b99c95329085d0700a4dd38507a054a50d commit 0d2fd5b99c95329085d0700a4dd38507a054a50d Author: Andriy Gapon AuthorDate: 2024-11-10 11:15:30 +0000 Commit: Andriy Gapon CommitDate: 2025-05-20 14:55:18 +0000 ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush LSR_TEMT bit is set if both transmit hold and shift registers are empty, but the flush command flushes only the hold register. While here, update the diagnostic message to report which registers could not be flushed. MFC after: 2 weeks --- sys/dev/uart/uart_dev_ns8250.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index 1df39b499539..0f19ede6d9df 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -265,12 +265,12 @@ ns8250_flush(struct uart_bas *bas, int what) * https://github.com/rust-vmm/vm-superio/issues/83 */ lsr = uart_getreg(bas, REG_LSR); - if (((lsr & LSR_TEMT) == 0) && (what & UART_FLUSH_TRANSMITTER)) + if (((lsr & LSR_THRE) == 0) && (what & UART_FLUSH_TRANSMITTER)) drain |= UART_DRAIN_TRANSMITTER; if ((lsr & LSR_RXRDY) && (what & UART_FLUSH_RECEIVER)) drain |= UART_DRAIN_RECEIVER; if (drain != 0) { - printf("uart: ns8250: UART FCR is broken\n"); + printf("uart: ns8250: UART FCR is broken (%#x)\n", drain); ns8250_drain(bas, drain); } } From nobody Tue May 20 15:47:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b1zSh4XW8z5wYnL; Tue, 20 May 2025 15:47: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 4b1zSh3dNYz3q2n; Tue, 20 May 2025 15:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747756020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KKe3pFOBlUfTL9IuMGPLfW9oZE0bHlnzfRGzKDqIrDU=; b=UDSBHjgjVswe5B2mkQBGcPTtR8MD9VesINgbPoHS2P+REkyyYhM1prtaC+okURxDmMhVo4 BX2UEYyaP9tq/ylPNixWmtKb3zFOj5PXMiTxXgb4EXliuyTVrjfcY/XLqHu1D/qTIapojo UGrv+G+AYDF2r2DyNKOIleVmslnZULkoHroJaEkJiSIhIVzZE7bzDbDbI/mj8ulFFRTs35 XqOSltN7IgRrA14jkIWyIuFlpqd9h9rUkplWlkGZPvpe2fIHq59FfcdQCpsNTX8gv6M+9j hVQ/RWqjhg9ECv8hTw3gxjLUUFoztiL95gUoU6HvEF3olROGuQGtO8/tt6a34g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747756020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KKe3pFOBlUfTL9IuMGPLfW9oZE0bHlnzfRGzKDqIrDU=; b=i/Px4UxUxm8o2VYnVLAq0OUOfO9ui1SbIuHx4IP94kwfu+Eayzbkb6SGyJDL9bhRNDjCae brGnyV1ujsnOmr/Zi9Oxi+KE5yXIzkzSWgQwxO30EuA0LtwYDCGjcAUi8U72JBNrNZYxWE O7eZ+7faBFegyTjUi6jGB7Kv0AcA9clpfX79CO7LPQKIs2n3E/jaKAuFeJ7G4bPd8M/XcL qmJbo9zA7L7Tk8OvdlN+Y/yra07DJB40Osf41zvSb6Wtmuye/zCUGleVwtAbkNIJ4/Gyrm ldjILzXrI7kS4m+FRNwgKCrhvfnoMMIGBWfyJCqnTDjQ0gFkuWZmsAkrLxUlyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747756020; a=rsa-sha256; cv=none; b=ZxjkAbUVwmij8tHfvDjxu6suPXycl8HTGuMTws8nI8dkSld7CtqSQEilCK9eNCosnvNOi+ ioWupsLMFovyzVBQ0m9A0Bp+blBc1HEB7WLw2ByyOCA4KqXzSciYSgDO0FzztYyibrrxAI jFAhCqXX/BZl3ux31uQ6KEKabprMrh0SS0bA+Pb3SqCZTkN8wq6z3f5YcT59fvcQ9lNYW6 BhbiJsxvdhMBUtGpXGhK30glOKj5O4aarOuHy0lhAryyoz6+gp6YHUncvpa/ZIzCrWq0Mc hNht1XmSuvH6PLFAuyZ9sEH7A5cEs2yNwJFVPUCuo5GD+a0mDygKi7gEB+YuqA== 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 4b1zSh2WbtzwKD; Tue, 20 May 2025 15:47: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 54KFl0Z1047416; Tue, 20 May 2025 15:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KFl01Q047413; Tue, 20 May 2025 15:47:00 GMT (envelope-from git) Date: Tue, 20 May 2025 15:47:00 GMT Message-Id: <202505201547.54KFl01Q047413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 0693c3f7cb3d - main - ifnet: Integrate if_unroute() into if_down() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0693c3f7cb3d9e5389863a0c131ddef799c77091 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0693c3f7cb3d9e5389863a0c131ddef799c77091 commit 0693c3f7cb3d9e5389863a0c131ddef799c77091 Author: Zhenlei Huang AuthorDate: 2025-05-20 15:45:20 +0000 Commit: Zhenlei Huang CommitDate: 2025-05-20 15:45:20 +0000 ifnet: Integrate if_unroute() into if_down() if_unroute() is static since 2004 and is not used anywhere except for if_down(). This also makes it easier to grep by the pattern `if_flags &= ~IFF_UP`. No functional change intended. Reviewed by: glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49356 --- sys/net/if.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 974ff3af4f61..853fc3c78fce 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -278,7 +278,6 @@ static void if_input_default(struct ifnet *, struct mbuf *); static int if_requestencap_default(struct ifnet *, struct if_encap_req *); static int if_setflag(struct ifnet *, int, int, int *, int); static int if_transmit_default(struct ifnet *ifp, struct mbuf *m); -static void if_unroute(struct ifnet *, int flag, int fam); static int if_delmulti_locked(struct ifnet *, struct ifmultiaddr *, int); static void do_link_state_change(void *, int); static int if_getgroup(struct ifgroupreq *, struct ifnet *); @@ -2097,25 +2096,6 @@ link_init_sdl(struct ifnet *ifp, struct sockaddr *paddr, u_char iftype) return (sdl); } -/* - * Mark an interface down and notify protocols of - * the transition. - */ -static void -if_unroute(struct ifnet *ifp, int flag, int fam) -{ - - KASSERT(flag == IFF_UP, ("if_unroute: flag != IFF_UP")); - - ifp->if_flags &= ~flag; - getmicrotime(&ifp->if_lastchange); - ifp->if_qflush(ifp); - - if (ifp->if_carp) - (*carp_linkstate_p)(ifp); - rt_ifmsg(ifp, IFF_UP); -} - void (*vlan_link_state_p)(struct ifnet *); /* XXX: private from if_vlan */ void (*vlan_trunk_cap_p)(struct ifnet *); /* XXX: private from if_vlan */ struct ifnet *(*vlan_trunkdev_p)(struct ifnet *); @@ -2190,7 +2170,14 @@ if_down(struct ifnet *ifp) { EVENTHANDLER_INVOKE(ifnet_event, ifp, IFNET_EVENT_DOWN); - if_unroute(ifp, IFF_UP, AF_UNSPEC); + + ifp->if_flags &= ~IFF_UP; + getmicrotime(&ifp->if_lastchange); + ifp->if_qflush(ifp); + + if (ifp->if_carp) + (*carp_linkstate_p)(ifp); + rt_ifmsg(ifp, IFF_UP); } /* From nobody Tue May 20 16:12:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b201x1KQGz5wbNM; Tue, 20 May 2025 16:12: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 4b201x0hXcz3sVR; Tue, 20 May 2025 16:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747757541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FLdLxWOghTzi3Cwt9xeeeC933fhI8IhaIOBgV1rZd7o=; b=lyihud5UaH7WPkt4kllZGA6PQRSwpKGn84mJeV1ucofMi7wzmYKqajhWrHzkZWcpdzD5PO MT2L7H/E7w/4SQuLWrR2yWU/Kc9HuXQ36wFTVhCIE0N3lyQYP/22IJ5vl5+5yhtr84DOxk 9QnZEEI69MnyRkwwOg3EcWrU3wpMJN0YcoZhAqeAY+Lo+rh76K7wSYF5x8FyylxaVNjIKQ /Tu2k7yT37VhCTiM/md2tWS8e1SRS9ViETt0+3w8AarhHsAk1+nF9QuqzZdhMKkTB7EKJv 3LZaZkkhqEtn4EuzCC+TgOuqrGr1rJ6QrFxn54mD2rCQAdj8QKMPjlD1mPq/BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747757541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FLdLxWOghTzi3Cwt9xeeeC933fhI8IhaIOBgV1rZd7o=; b=K9wcvWdxDhbQZ19W3X7AMoKCUfEd15l6ESXXAIHqzuYr02XOEg8yWswEl/MpbQ5ZxAmf7a cKxFdYWErNitLEXa1VLfwLE3UQV/67wxZYVYi4/hpVL6m0rZBc7Qb27WgXtmD1aY51V5XQ cE60bQvDE4R4tszlrg5S+bh0xm7m3fGytQSZDfmE/Oj0ayorxBtTMuw4W3qO+vy0LVfxDi rcW/sXnrW6Z+Ap/onxgSyvLD2e24b+q/+4+SlGCwfn81qRu5b1FxZk3Km01NJwsqgJsEMM JWIOHPvk6AFsjd/Be41W0TjUWBHxWiy6gDRcj2/+VmZ9pwgmgn1tGkSoxKYyjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747757541; a=rsa-sha256; cv=none; b=NtYv99WXOrmI1YB72yD1rRy9RPSUi7J+GWdxAcK1i4VGNSvFpKAys4K/oodLlYj4oN2JqS +HUH1l87JwKR2y5LNabzao867VeIXuwRLuHPlcPVJwyXH6foDjdjnkUK0my8kiyJrJhp4H HsvF0pN36/qci/QLxKDpses08kejJa9A1VRmF7OvXL2QFIZhr8ua6WVC0zLuTiZZi3Sfhe UTBemelMhIF1dNqStixQznCjFzc7/1fpAsAE9Auplng1HCFYV9ijkju6VecgMeNwIAcZd1 zv9TsqHCzDRV6JRf7L56tcvFoLDh+OxzNvSEiNJrfCIyIhSBgc+q+M0wDjwd8w== 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 4b201x09Cjzwdn; Tue, 20 May 2025 16:12: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 54KGCKr1003841; Tue, 20 May 2025 16:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KGCKGu003838; Tue, 20 May 2025 16:12:20 GMT (envelope-from git) Date: Tue, 20 May 2025 16:12:20 GMT Message-Id: <202505201612.54KGCKGu003838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 41cf74fe8ce5 - main - loader - guard against empty rootdev List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41cf74fe8ce5c6f8f10aa074e9405043a242a2b1 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=41cf74fe8ce5c6f8f10aa074e9405043a242a2b1 commit 41cf74fe8ce5c6f8f10aa074e9405043a242a2b1 Author: Simon J. Gerraty AuthorDate: 2025-05-20 16:10:50 +0000 Commit: Simon J. Gerraty CommitDate: 2025-05-20 16:10:50 +0000 loader - guard against empty rootdev At least one instance of u-boot pretending to be EFI is passing empty rootdev to loader which does not end well. A simple precaution is harmless. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50334 --- stand/common/metadata.c | 2 +- stand/efi/loader/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/common/metadata.c b/stand/common/metadata.c index 22df6f175791..715354aedd04 100644 --- a/stand/common/metadata.c +++ b/stand/common/metadata.c @@ -111,7 +111,7 @@ md_load_dual(char *args, vm_offset_t *modulep, vm_offset_t *dtb, int kern64) * tested/set by MI code before launching the kernel. */ rootdevname = getenv("rootdev"); - if (rootdevname == NULL) + if (rootdevname == NULL || *rootdevname == '\0') rootdevname = getenv("currdev"); /* Try reading the /etc/fstab file to select the root device */ getrootmount(rootdevname); diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 2384fd08b964..c9a842afb06d 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -513,7 +513,7 @@ find_currdev(bool do_bootmgr, bool is_last, * it's wrong. */ rootdev = getenv("rootdev"); - if (rootdev != NULL) { + if (rootdev != NULL && *rootdev != '\0') { printf(" Setting currdev to configured rootdev %s\n", rootdev); set_currdev(rootdev); From nobody Tue May 20 16:40:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b20dx6V0gz5wd5Q; Tue, 20 May 2025 16:40: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 4b20dx5gBlz3wyK; Tue, 20 May 2025 16:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747759205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFxnkXrCkj4osYzFT4m/W/11/PEwRncSovImQSLAWXE=; b=hJU69iSadwEn5bqRxXUwROY/0JvB+ZJYLFD87tEQNaKzxFArGb7rgalV+J7+4aPU3u/B2n OlyiJk3E5TKIJQrslObolYvnadAlksGg6svCweYRi0pEKKr4gwXQ//B8J9XVwZ8p0hJEvZ 2yiJBjp6PyKhPCMX+jjy7K7PbrIrG8fN9OF0Q67IDxWFsAYwMVOn3VWL8RQE+STizJwPd/ nBsxkDEMTVraWUwybrkma/dDj0C6mhUH7Xl2DA26IeNaMGHX4NGPILARTvp2YsPhhmSFRF atMVLoMhhSv1i7oYuos4KHIvUgT0rWnLijD7VDMz1IgHk4UxLv7z8CPIKpOI/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747759205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFxnkXrCkj4osYzFT4m/W/11/PEwRncSovImQSLAWXE=; b=N28usIpqQMs8lM0XRe9z6dBFnwvvtqDnZAdNTHZvoM8D583lCkFUawhEozKMMEF4oHIdHJ A+N8hRc2V2evRA/tjVDzeLSlgV/emcDiMU5q9UwAf/MJH+NVNSruGQzkpluMzaI9S2N/Md VLhPZzQLstaugFcSaYWHCCc3zAVIYDPF/M2gNH4Sjce2PUS7xQS6B4miuZG+uoluisdOnl 8CK3DzkBc8Seg/RlJbLtOHDIi9KeGSj/jj0Ti9fkIjoXUWij+1d3PSGXSjx1GQjS8LzGnX b2fWJh0oMlsQBKYdYpW6xnS3ddK6C3pswQ8E9k7jMKS7OYOiurFKoyYg1iSCRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747759205; a=rsa-sha256; cv=none; b=jcb92DELIAVVDocB4Kx+Zy3vvbGHe6AYafdMTxk5HIdnIo/cytgXMfl3Ogs8Y8O3ceo40J bFGntufec4MXvCx5QDyjqi2bk7JVLwWj8Kho5fHNoE66imCWnGOOpV22dj6GXzQTMlXEC2 l6Wfz5Kgd9bCITJPEqcFAV0ZEOiukabScM0lZBvzyCrSprgtp6ZYNZqM0tBZgHIa0DCCwj 2m+tuMFHBjld75UYZbtDiq8uVLUPiMt5QUYOB2oyFq2xGkR1TFFMWq8e7/a8T9IOnSEboq eWADlsjLjQ+aWkXX5HnOzndUeR8xOvnM2J3IIs1QWbbnlks32uq4Ms2aFY277w== 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 4b20dx57cPzxJn; Tue, 20 May 2025 16:40: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 54KGe58C045649; Tue, 20 May 2025 16:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KGe5xB045644; Tue, 20 May 2025 16:40:05 GMT (envelope-from git) Date: Tue, 20 May 2025 16:40:05 GMT Message-Id: <202505201640.54KGe5xB045644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 084046ad8f85 - main - usbhid.4: Add cross-references to "other USB HID drivers" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 084046ad8f859d270a3cf900a82c5254153afcac Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=084046ad8f859d270a3cf900a82c5254153afcac commit 084046ad8f859d270a3cf900a82c5254153afcac Author: Ed Maste AuthorDate: 2025-05-20 15:45:50 +0000 Commit: Ed Maste CommitDate: 2025-05-20 16:38:41 +0000 usbhid.4: Add cross-references to "other USB HID drivers" Reviewed by: ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50437 --- share/man/man4/usbhid.4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man4/usbhid.4 b/share/man/man4/usbhid.4 index c47afaff3534..5109bbe72de6 100644 --- a/share/man/man4/usbhid.4 +++ b/share/man/man4/usbhid.4 @@ -55,7 +55,11 @@ tunables: .It Va hw.usb.usbhid.enable Enable .Nm -and make its priority greater than other USB HID drivers have. +and make its priority greater than other USB HID drivers, such as +.Xr ukbd 4 , +.Xr ums 4 , +and +.Xr uhid 4 . Default is 0. .El .Bl -tag -width indent From nobody Tue May 20 18:28:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b233h35rxz5wmBS; Tue, 20 May 2025 18:29:04 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b233h2S8tz46Rj; Tue, 20 May 2025 18:29:04 +0000 (UTC) (envelope-from mmel@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747765744; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KDnatz8kIA0M+FRimjh1ZIHjMl4k95+3yqtrX1mXNxQ=; b=qTSYiiUBk2xZPDHxKpdpuEJu52q3sELzcQBDpJa2UeA7IEp1iu229+BO5APHxAwqnoGgBR +NfISlatcj2dD1bFb+bB4/Kn+ouFvkR+Z3VbNH3uHwyEmzYIMa1rfd789pa4n/BFqzQc2/ +b+UujkxDaECCkuRK4OkocT9EdoAt0a9qCyCpAqQHng8h+sE1jhKdvZmQQXoqzt1d4H60X pWCbz/89frphEwukbZekQICvHiLrcDudfrPkqAackx3B+A+hYjfSF9pfVFYAwT203eSAme Ezsm5sXjRUR9zMSlAI4vWYzAswQFuoICtoT9Ac3hgjoq9m4pqcC4EF8L66qIGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747765744; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KDnatz8kIA0M+FRimjh1ZIHjMl4k95+3yqtrX1mXNxQ=; b=tYS+94/e6JKCwOWdTXAJ/Hd/BhqPlw4Ltit4vMtaK3ZAPbhDBHKyE93/ll2Dt7QCEhY2aJ g9C+y71tRaNba9g5vvwKI1YCaLZ/oO1o4oT7SV20EE8kCVOMi/YUCcjcRi91gYKJoZW8be 7EUDR4DgtoUtsfWX3chxkO5rjhqT9kbTJmwfwkukbd8BT1ZZS7NFjrQnH0hELYPNOE9R8j ccdhO+50RravfnHrp8fc34LjXD3LsCv8/NN4CIC9H19YWywSjE0HIUI2gjoCybxKJLIvAb P/qOOa6r/3fhcyTxMi8Z2fiqoTxkmctdJUsuAVpJSY0bfzZX7TEelqQEiLmCog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747765744; a=rsa-sha256; cv=none; b=wX7v/jg1xlqD7S5D7E2HkeKDFnsoDhzKFUvzFglIFYYwGtIGCMje3aXFCbsb7rDDBKudFO ALZfZXgkofXICfWWwqYBmCDsDjPbsJyzPNY1kVCGDp4CUZjDXISJ+2e7i+qQ0BvPYgD+Cl mxkuij28dvNViCOAQm78+Y1BXqvFCfxJavACuxIcSKyBBOS67wCBLDnQGTRBWIHnWdMgbD JZGBkE5ncx3jFUH1bWflhGcgw9n/zl0hsNB75xnJVsPm8Wyl3nsqzb3NlD18T5DBvaZiXt BtK0E+SzIcra13ZfXbQK5tufi9luf+Lhw0XPIdj3hIiXl2mPmgCl/ztcp4g7/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2001:67c:14a0:5fe0:2485:80fb:e080:1b9a] (unknown [IPv6:2001:67c:14a0:5fe0:2485:80fb:e080:1b9a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mmel/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b233g4PX1z18Q2; Tue, 20 May 2025 18:29:03 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Message-ID: <1a11f640-be62-4f4e-b537-70806ac54831@FreeBSD.org> Date: Tue, 20 May 2025 20:28:57 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: mmel@FreeBSD.org Subject: Re: git: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush To: Andriy Gapon , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505201457.54KEvD1r053951@gitrepo.freebsd.org> Content-Language: cs, en-US From: Michal Meloun In-Reply-To: <202505201457.54KEvD1r053951@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 20.05.2025 16:57, Andriy Gapon wrote: > The branch main has been updated by avg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0d2fd5b99c95329085d0700a4dd38507a054a50d > > commit 0d2fd5b99c95329085d0700a4dd38507a054a50d > Author: Andriy Gapon > AuthorDate: 2024-11-10 11:15:30 +0000 > Commit: Andriy Gapon > CommitDate: 2025-05-20 14:55:18 +0000 > > ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush > > LSR_TEMT bit is set if both transmit hold and shift registers are > empty, but the flush command flushes only the hold register. I don't think that's true. Imho, ns8250_flush() is used also before changing baud rate, so we need to ensure that all bits are flushed, including the transmit register. Michal > > While here, update the diagnostic message to report which registers > could not be flushed. > > MFC after: 2 weeks > --- > sys/dev/uart/uart_dev_ns8250.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c > index 1df39b499539..0f19ede6d9df 100644 > --- a/sys/dev/uart/uart_dev_ns8250.c > +++ b/sys/dev/uart/uart_dev_ns8250.c > @@ -265,12 +265,12 @@ ns8250_flush(struct uart_bas *bas, int what) > * https://github.com/rust-vmm/vm-superio/issues/83 > */ > lsr = uart_getreg(bas, REG_LSR); > - if (((lsr & LSR_TEMT) == 0) && (what & UART_FLUSH_TRANSMITTER)) > + if (((lsr & LSR_THRE) == 0) && (what & UART_FLUSH_TRANSMITTER)) > drain |= UART_DRAIN_TRANSMITTER; > if ((lsr & LSR_RXRDY) && (what & UART_FLUSH_RECEIVER)) > drain |= UART_DRAIN_RECEIVER; > if (drain != 0) { > - printf("uart: ns8250: UART FCR is broken\n"); > + printf("uart: ns8250: UART FCR is broken (%#x)\n", drain); > ns8250_drain(bas, drain); > } > } From nobody Tue May 20 20:25:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b25fS3BN3z5vvhH; Tue, 20 May 2025 20:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b25fS2tgcz3KgY; Tue, 20 May 2025 20:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747772752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dhU0C8bUGAvt+jRmpApJj8PnUaOxYVfyixu9/DTl3NQ=; b=IwiMn4HCz2DXj/y1ja67k9RgJg8ofUyJ0wEJRMtRC6vZ6g9qNiwJHsZ4ZQ5IGrnPrce1zL JXYcDzz9XpcpO9rkx9hrqpih9pA/C4FJWH9o1gS7RedXHmqr16ui1aDuO5TtniKKCA+oIU 4vb20K9V5bO8tH+jPsvN47IgfJMrVAWVDpkB14DCBfdK5+pJHg80Pzezxl0HS6rtJtU1hy 8rR6T/P0Qdrxm8epdiMQXOlBmxIR0K1zVcpFlTYK/mRnAi+xusp6gWhxSRwmfKUiwt7otI ZYqN3Uojjhcj9lSJjfXMVSX3bdquy7JXla1D2Fj6ZqfbTs1K47VMnEKWYBeKGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747772752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dhU0C8bUGAvt+jRmpApJj8PnUaOxYVfyixu9/DTl3NQ=; b=U67o+wEnj02sj1bYyOyVFujppPGgMcHHXkq1cQxUc288evunM0RZN/okkMTKB6YnnLBcNG A1VooEEEdBpUACG/QFgOr2UawA1RGkXs35XT/dUwAYXjMbowTSMVPrWmciyD436IFAzuAS 1kndt6+sZ0Csl+52fY4xIH+r4Pz2h1ozK4+RtqnUf3l6I6Gc9lM2nkomgnQYooXOezFku0 V+h14E+ApfySfyTzVyUQl1DHcZLNjGcRdQltkeLF8JRai3VIMjguaUZkteHDa5cqDEnkjC A8elmCLrBzLKzR8uCBFtCKgX50tkbJ6eq/cGjlQsmI0Q38QAqgKoRXIsRXA+TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747772752; a=rsa-sha256; cv=none; b=LXhfp25OhI01cGPFtxfA5TP6/YBkmCaG2iaKMBfkpQtldFhBJxYK052Jq1B0w4A2Q+hVDB ue8J6PAfHKC10+tl3CpWeG4vjdTQgOYwRwwN2qiYE5eQbzo6zl9cgk6UtMAL7Zcj13NicJ mNsgRZH8Iu4din8h9nJV3SDiAl52ahpmZrJpL3sJIVMvm0nz14F3WbcnAKs8G0jftWA1uX 0buDnVtch02dl0poVDRVJ6kUNVC1NWVLYCKQueclURuMUbYiyKn9NUN5FxBlmp382z549p dJII5pmnXEQb+ebQ1XXkf2UAR5D+IRTxs0o4jgGvDh0nrTpkpuSJbAuEcGF1sA== 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 4b25fS2Kc9z14M0; Tue, 20 May 2025 20:25: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 54KKPqbk073336; Tue, 20 May 2025 20:25:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KKPqfp073333; Tue, 20 May 2025 20:25:52 GMT (envelope-from git) Date: Tue, 20 May 2025 20:25:52 GMT Message-Id: <202505202025.54KKPqfp073333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5319cb21610a - main - file: Qualify pointers to capsicum rights as const List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5319cb21610ad947c56fd0cd4f18ef5b58bc8db7 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5319cb21610ad947c56fd0cd4f18ef5b58bc8db7 commit 5319cb21610ad947c56fd0cd4f18ef5b58bc8db7 Author: Mark Johnston AuthorDate: 2025-05-20 20:19:30 +0000 Commit: Mark Johnston CommitDate: 2025-05-20 20:19:30 +0000 file: Qualify pointers to capsicum rights as const File descriptor lookup routines typically take a set of capsicum rights as input to the lookup, so that the fd's rights can be atomically checked. This set should be qualified with const. No functional change intended. Reviewed by: olce, oshogbo, brooks, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50419 --- sys/kern/kern_descrip.c | 52 +++++++++++++++++++++++++++--------------------- sys/kern/sys_procdesc.c | 5 +++-- sys/kern/uipc_mqueue.c | 5 +++-- sys/kern/uipc_sem.c | 6 +++--- sys/kern/uipc_syscalls.c | 7 ++++--- sys/kern/vfs_syscalls.c | 5 +++-- sys/sys/file.h | 21 +++++++++---------- sys/sys/filedesc.h | 19 +++++++++--------- sys/sys/namei.h | 4 ++-- sys/sys/procdesc.h | 6 ++++-- sys/sys/socketvar.h | 4 ++-- 11 files changed, 74 insertions(+), 60 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index cbffe592554d..e70f2d248365 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -109,7 +109,8 @@ static void fdgrowtable_exp(struct filedesc *fdp, int nfd); static void fdunused(struct filedesc *fdp, int fd); static void fdused(struct filedesc *fdp, int fd); static int fget_unlocked_seq(struct thread *td, int fd, - cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp); + const cap_rights_t *needrightsp, struct file **fpp, + seqc_t *seqp); static int getmaxfd(struct thread *td); static u_long *filecaps_copy_prep(const struct filecaps *src); static void filecaps_copy_finish(const struct filecaps *src, @@ -2877,7 +2878,7 @@ finit_vnode(struct file *fp, u_int flag, void *data, const struct fileops *ops) } int -fget_cap_noref(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_cap_noref(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp) { struct filedescent *fde; @@ -2910,7 +2911,7 @@ out: #ifdef CAPABILITIES int -fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, +fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp) { struct filedesc *fdp = td->td_proc->p_fd; @@ -2950,7 +2951,7 @@ get_locked: } #else int -fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, +fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp) { int error; @@ -3221,7 +3222,7 @@ out_free: */ #ifdef CAPABILITIES static int -fget_unlocked_seq(struct thread *td, int fd, cap_rights_t *needrightsp, +fget_unlocked_seq(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp) { struct filedesc *fdp; @@ -3277,7 +3278,7 @@ fget_unlocked_seq(struct thread *td, int fd, cap_rights_t *needrightsp, } #else static int -fget_unlocked_seq(struct thread *td, int fd, cap_rights_t *needrightsp, +fget_unlocked_seq(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp __unused) { struct filedesc *fdp; @@ -3320,7 +3321,7 @@ fget_unlocked_seq(struct thread *td, int fd, cap_rights_t *needrightsp, * racing with itself. */ int -fget_unlocked(struct thread *td, int fd, cap_rights_t *needrightsp, +fget_unlocked(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp) { struct filedesc *fdp; @@ -3389,7 +3390,7 @@ out_fallback: */ #ifdef CAPABILITIES int -fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_only_user(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp) { const struct filedescent *fde; @@ -3419,7 +3420,7 @@ fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, } #else int -fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_only_user(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp) { struct file *fp; @@ -3455,7 +3456,7 @@ fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, */ static __inline int _fget(struct thread *td, int fd, struct file **fpp, int flags, - cap_rights_t *needrightsp) + const cap_rights_t *needrightsp) { struct file *fp; int error; @@ -3501,15 +3502,15 @@ _fget(struct thread *td, int fd, struct file **fpp, int flags, } int -fget(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp) { return (_fget(td, fd, fpp, 0, rightsp)); } int -fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, vm_prot_t *maxprotp, - struct file **fpp) +fget_mmap(struct thread *td, int fd, const cap_rights_t *rightsp, + vm_prot_t *maxprotp, struct file **fpp) { int error; #ifndef CAPABILITIES @@ -3552,22 +3553,24 @@ fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, vm_prot_t *maxprotp, } int -fget_read(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget_read(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { return (_fget(td, fd, fpp, FREAD, rightsp)); } int -fget_write(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget_write(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { return (_fget(td, fd, fpp, FWRITE, rightsp)); } int -fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, int needfcntl, - struct file **fpp) +fget_fcntl(struct thread *td, int fd, const cap_rights_t *rightsp, + int needfcntl, struct file **fpp) { #ifndef CAPABILITIES return (fget_unlocked(td, fd, rightsp, fpp)); @@ -3605,7 +3608,7 @@ fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, int needfcntl, * XXX: what about the unused flags ? */ static __inline int -_fgetvp(struct thread *td, int fd, int flags, cap_rights_t *needrightsp, +_fgetvp(struct thread *td, int fd, int flags, const cap_rights_t *needrightsp, struct vnode **vpp) { struct file *fp; @@ -3627,14 +3630,15 @@ _fgetvp(struct thread *td, int fd, int flags, cap_rights_t *needrightsp, } int -fgetvp(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, 0, rightsp, vpp)); } int -fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp, +fgetvp_rights(struct thread *td, int fd, const cap_rights_t *needrightsp, struct filecaps *havecaps, struct vnode **vpp) { struct filecaps caps; @@ -3666,14 +3670,16 @@ out: } int -fgetvp_read(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp_read(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, FREAD, rightsp, vpp)); } int -fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp_exec(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, FEXEC, rightsp, vpp)); @@ -3681,7 +3687,7 @@ fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp #ifdef notyet int -fgetvp_write(struct thread *td, int fd, cap_rights_t *rightsp, +fgetvp_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp) { diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 6acaef9d394d..11bd1b6f30e1 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -118,7 +118,7 @@ static const struct fileops procdesc_ops = { * died. */ int -procdesc_find(struct thread *td, int fd, cap_rights_t *rightsp, +procdesc_find(struct thread *td, int fd, const cap_rights_t *rightsp, struct proc **p) { struct procdesc *pd; @@ -165,7 +165,8 @@ procdesc_pid(struct file *fp_procdesc) * Retrieve the PID associated with a process descriptor. */ int -kern_pdgetpid(struct thread *td, int fd, cap_rights_t *rightsp, pid_t *pidp) +kern_pdgetpid(struct thread *td, int fd, const cap_rights_t *rightsp, + pid_t *pidp) { struct file *fp; int error; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 54a9eda5a7a7..d647c7b991f4 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -2169,13 +2169,14 @@ sys_kmq_unlink(struct thread *td, struct kmq_unlink_args *uap) return (error); } -typedef int (*_fgetf)(struct thread *, int, cap_rights_t *, struct file **); +typedef int (*_fgetf)(struct thread *, int, const cap_rights_t *, + struct file **); /* * Get message queue by giving file slot */ static int -_getmq(struct thread *td, int fd, cap_rights_t *rightsp, _fgetf func, +_getmq(struct thread *td, int fd, const cap_rights_t *rightsp, _fgetf func, struct file **fpp, struct mqfs_node **ppn, struct mqueue **pmq) { struct mqfs_node *pn; diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index 35ca9a9fb06e..2fc4d3e9cfb3 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -123,8 +123,8 @@ static int ksem_create(struct thread *td, const char *path, semid_t *semidp, mode_t mode, unsigned int value, int flags, int compat32); static void ksem_drop(struct ksem *ks); -static int ksem_get(struct thread *td, semid_t id, cap_rights_t *rightsp, - struct file **fpp); +static int ksem_get(struct thread *td, semid_t id, + const cap_rights_t *rightsp, struct file **fpp); static struct ksem *ksem_hold(struct ksem *ks); static void ksem_insert(char *path, Fnv32_t fnv, struct ksem *ks); static struct ksem *ksem_lookup(char *path, Fnv32_t fnv); @@ -587,7 +587,7 @@ ksem_create(struct thread *td, const char *name, semid_t *semidp, mode_t mode, } static int -ksem_get(struct thread *td, semid_t id, cap_rights_t *rightsp, +ksem_get(struct thread *td, semid_t id, const cap_rights_t *rightsp, struct file **fpp) { struct ksem *ks; diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 91fcdf9a7a9d..0bbf13936bf9 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -85,7 +85,7 @@ static int sockargs(struct mbuf **, char *, socklen_t, int); * A reference on the file entry is held upon returning. */ int -getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, +getsock_cap(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp, struct filecaps *havecapsp) { struct file *fp; @@ -105,7 +105,8 @@ getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, } int -getsock(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +getsock(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { struct file *fp; int error; @@ -718,7 +719,7 @@ kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct uio auio; struct iovec *iov; struct socket *so; - cap_rights_t *rights; + const cap_rights_t *rights; #ifdef KTRACE struct uio *ktruio = NULL; #endif diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index f992eccf567f..ac906c6286f4 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4409,7 +4409,7 @@ out: * semantics. */ int -getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, +getvnode_path(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp) { struct file *fp; @@ -4447,7 +4447,8 @@ getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, * A reference on the file entry is held upon returning. */ int -getvnode(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +getvnode(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { int error; diff --git a/sys/sys/file.h b/sys/sys/file.h index 0c025fde475c..c79759a3f966 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -258,14 +258,15 @@ extern const struct fileops socketops; extern int maxfiles; /* kernel limit on number of open files */ extern int maxfilesperproc; /* per process limit on number of open files */ -int fget(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp); -int fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, +int fget(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp); +int fget_mmap(struct thread *td, int fd, const cap_rights_t *rightsp, vm_prot_t *maxprotp, struct file **fpp); -int fget_read(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_read(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int fget_write(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_fcntl(struct thread *td, int fd, const cap_rights_t *rightsp, int needfcntl, struct file **fpp); int _fdrop(struct file *fp, struct thread *td); int fget_remote(struct thread *td, struct proc *p, int fd, struct file **fpp); @@ -290,15 +291,15 @@ int file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td); void finit(struct file *, u_int, short, void *, const struct fileops *); void finit_vnode(struct file *, u_int, void *, const struct fileops *); -int fgetvp(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_exec(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp, +int fgetvp_rights(struct thread *td, int fd, const cap_rights_t *needrightsp, struct filecaps *havecaps, struct vnode **vpp); -int fgetvp_read(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_read(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_write(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); int fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, bool *fsearch); int fgetvp_lookup(struct nameidata *ndp, struct vnode **vpp); diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 242f5b8831fd..602d236ff853 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -275,22 +275,23 @@ struct filedesc_to_leader * struct filedesc_to_leader * filedesc_to_leader_share(struct filedesc_to_leader *fdtol, struct filedesc *fdp); -int getvnode(struct thread *td, int fd, cap_rights_t *rightsp, +int getvnode(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, +int getvnode_path(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); void mountcheckdirs(struct vnode *olddp, struct vnode *newdp); -int fget_cap_noref(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp, struct filecaps *havecapsp); -int fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, +int fget_cap_noref(struct filedesc *fdp, int fd, + const cap_rights_t *needrightsp, struct file **fpp, + struct filecaps *havecapsp); +int fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp); /* Return a referenced file from an unlocked descriptor. */ -int fget_unlocked(struct thread *td, int fd, cap_rights_t *needrightsp, - struct file **fpp); +int fget_unlocked(struct thread *td, int fd, + const cap_rights_t *needrightsp, struct file **fpp); /* Return a file pointer without a ref. FILEDESC_IS_ONLY_USER must be true. */ -int fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp); +int fget_only_user(struct filedesc *fdp, int fd, + const cap_rights_t *needrightsp, struct file **fpp); #define fput_only_user(fdp, fp) ({ \ MPASS(FILEDESC_IS_ONLY_USER(fdp)); \ MPASS(refcount_load(&fp->f_count) > 0); \ diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 20c4f4c34dc0..bbaa71f629e6 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -70,7 +70,7 @@ struct nameidata { */ const char *ni_dirp; /* pathname pointer */ enum uio_seg ni_segflg; /* location of pathname */ - cap_rights_t *ni_rightsneeded; /* rights required to look up vnode */ + const cap_rights_t *ni_rightsneeded; /* rights needed to look up vnode */ /* * Arguments to lookup. */ @@ -244,7 +244,7 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define NDINIT_ALL(ndp, op, flags, segflg, namep, dirfd, startdir, rightsp) \ do { \ struct nameidata *_ndp = (ndp); \ - cap_rights_t *_rightsp = (rightsp); \ + const cap_rights_t *_rightsp = (rightsp); \ MPASS(_rightsp != NULL); \ NDINIT_PREFILL(_ndp); \ NDINIT_DBG(_ndp); \ diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index ca26d65d5417..4e8b06fb7377 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -94,8 +94,10 @@ struct procdesc { * In-kernel interfaces to process descriptors. */ int procdesc_exit(struct proc *); -int procdesc_find(struct thread *, int fd, cap_rights_t *, struct proc **); -int kern_pdgetpid(struct thread *, int fd, cap_rights_t *, pid_t *pidp); +int procdesc_find(struct thread *, int fd, const cap_rights_t *, + struct proc **); +int kern_pdgetpid(struct thread *, int fd, const cap_rights_t *, + pid_t *pidp); void procdesc_new(struct proc *, int); void procdesc_finit(struct procdesc *, struct file *); pid_t procdesc_pid(struct file *); diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 9e3a59433f2b..6512a2d69fd5 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -488,9 +488,9 @@ enum shutdown_how; */ int getsockaddr(struct sockaddr **namp, const struct sockaddr *uaddr, size_t len); -int getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, +int getsock_cap(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp, struct filecaps *havecaps); -int getsock(struct thread *td, int fd, cap_rights_t *rightsp, +int getsock(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); void soabort(struct socket *so); int soaccept(struct socket *so, struct sockaddr *sa); From nobody Tue May 20 20:25:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b25fT3w7yz5vw5C; Tue, 20 May 2025 20:25: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 4b25fT37rKz3L3p; Tue, 20 May 2025 20:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747772753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDB8FRDZFeANPK7pQas/1V8HMsa6Ex5228oHda7sv9o=; b=n05dMQE8L7hHqg8EywEn2qH/hKSuBGAV4s7oPdu78iQL7BT2ZmWPQH6pX/k2UE9IJNmmAL SxREIAnym1U7JfBdOyNGDiyaPpaYuNSERXxauw9rDVb6zYBxEAOPnTFaKfxRJHeoToTTUW /eZX2/oeZb8//ag3CTVye6KHatep+68e4jFzoaOhs5GKC1bIY6ak6A4iPF6x6o5AP6lhvM rrsuSGA05E0tdW/jn+mwNy72qXSExGajVTqU4wKUqB9TxiUJJ+XKM3b0VQp2odq460TRbD nHYEmj89yigzYKe7/PCVU/S/LNvFi85G8NdH87wgZTKDncfLMbGXaMhjstInjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747772753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDB8FRDZFeANPK7pQas/1V8HMsa6Ex5228oHda7sv9o=; b=o6XmQv5In9PQ/5sBiNPSgyt3Ah2sx8stu9rG1KNAQxEGi1b570nUd1oKcFQo99Yj7kLXUR uVYShe9YIwksmXLYNU9YStj17WjI0mAyb5SSw0CrOSB4LTgNbkZ1zpg+5En2Rk9mwUOgIe r3i5j3e8ZylVo33U5b34q/yagfxa7xeqAIRC0CPEjkW3eEyJJmU6AkPMlwJMr2f/LqiBKE 2woB7oQhE/y0bHqra5SNAhWKG/pOORhU8fvGdMIFJQSYJwW0u9TilFElIu4UUu9I5NOz85 J0qqPUeijmxXaNvldxpV3jS0UErrGaoH2T5oliXnNQW+3zrK+OV7HIRzTP2QFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747772753; a=rsa-sha256; cv=none; b=dQdKHHajuWsa+TL2ApH/E0ENoe87kO4P9MtTeOKLcYdYM64QC9DZYjPX3A3QS8ed0CZvUa E05XUc4Qx2B2XaEaSMmZjSEOivewyIEwD2xGEsJ/wbc8Gv8GuzGE+fxUxSpWm1focrnGH2 dDGcLyIrmTtgQJ+8bQ4M2oGJMB0zRNjNp/tfXl4vZYCZRVd7wM85piGWGh3+AYK/pm1ugK tjZo/wKkK+mBWz+kKfpOdye8sE8zK2vkbw5oGdX9l54LNaoI5Aq/YQBQcQ7tbFNDq8pCrl XhILELD0OH+fZo6XkEwhdlwNBT9RPlmRvVKQ+JdTDuFeQhqTTvvjbbSYWTnXGQ== 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 4b25fT2jsWz13fB; Tue, 20 May 2025 20:25: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 54KKPrLN073371; Tue, 20 May 2025 20:25:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KKPr9a073368; Tue, 20 May 2025 20:25:53 GMT (envelope-from git) Date: Tue, 20 May 2025 20:25:53 GMT Message-Id: <202505202025.54KKPr9a073368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1f922483cc99 - main - capsicum: Statically initialize commonly used capability rights List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f922483cc993e282329ffed9096f437799b630e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f922483cc993e282329ffed9096f437799b630e commit 1f922483cc993e282329ffed9096f437799b630e Author: Mark Johnston AuthorDate: 2025-05-20 20:19:47 +0000 Commit: Mark Johnston CommitDate: 2025-05-20 20:19:47 +0000 capsicum: Statically initialize commonly used capability rights Rather than initializing all of these sets during boot, define a macro which can do so at compile-time. This lets us get rid of the silly sysinit and furthermore allows the sets to live in .rodata, where they ought to be anyway. The CAP_RIGHTS_INITIALIZER2 macro can create a set out of up to two capsicum rights. This could be made more general, but we currently don't have any use for a more abstract implementation, so just keep it simple for now. Also remove the unused cap_chflags_rights symbol. No functional change intended. Reviewed by: olce, oshogbo, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50420 --- sys/kern/subr_capability.c | 156 ++++++++++++++++----------------------------- sys/sys/caprights.h | 92 +++++++++++++------------- sys/sys/capsicum.h | 18 ++++++ 3 files changed, 119 insertions(+), 147 deletions(-) diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c index a97c16d6d7df..a6175a2944ae 100644 --- a/sys/kern/subr_capability.c +++ b/sys/kern/subr_capability.c @@ -50,107 +50,61 @@ #ifdef _KERNEL #define assert(exp) KASSERT((exp), ("%s:%u", __func__, __LINE__)) -__read_mostly cap_rights_t cap_accept_rights; -__read_mostly cap_rights_t cap_bind_rights; -__read_mostly cap_rights_t cap_chflags_rights; -__read_mostly cap_rights_t cap_connect_rights; -__read_mostly cap_rights_t cap_event_rights; -__read_mostly cap_rights_t cap_fchdir_rights; -__read_mostly cap_rights_t cap_fchflags_rights; -__read_mostly cap_rights_t cap_fchmod_rights; -__read_mostly cap_rights_t cap_fchown_rights; -__read_mostly cap_rights_t cap_fchroot_rights; -__read_mostly cap_rights_t cap_fcntl_rights; -__read_mostly cap_rights_t cap_fexecve_rights; -__read_mostly cap_rights_t cap_flock_rights; -__read_mostly cap_rights_t cap_fpathconf_rights; -__read_mostly cap_rights_t cap_fstat_rights; -__read_mostly cap_rights_t cap_fstatfs_rights; -__read_mostly cap_rights_t cap_fsync_rights; -__read_mostly cap_rights_t cap_ftruncate_rights; -__read_mostly cap_rights_t cap_futimes_rights; -__read_mostly cap_rights_t cap_getpeername_rights; -__read_mostly cap_rights_t cap_getsockopt_rights; -__read_mostly cap_rights_t cap_getsockname_rights; -__read_mostly cap_rights_t cap_ioctl_rights; -__read_mostly cap_rights_t cap_listen_rights; -__read_mostly cap_rights_t cap_linkat_source_rights; -__read_mostly cap_rights_t cap_linkat_target_rights; -__read_mostly cap_rights_t cap_mmap_rights; -__read_mostly cap_rights_t cap_mkdirat_rights; -__read_mostly cap_rights_t cap_mkfifoat_rights; -__read_mostly cap_rights_t cap_mknodat_rights; -__read_mostly cap_rights_t cap_pdgetpid_rights; -__read_mostly cap_rights_t cap_pdkill_rights; -__read_mostly cap_rights_t cap_pread_rights; -__read_mostly cap_rights_t cap_pwrite_rights; -__read_mostly cap_rights_t cap_read_rights; -__read_mostly cap_rights_t cap_recv_rights; -__read_mostly cap_rights_t cap_renameat_source_rights; -__read_mostly cap_rights_t cap_renameat_target_rights; -__read_mostly cap_rights_t cap_seek_rights; -__read_mostly cap_rights_t cap_send_rights; -__read_mostly cap_rights_t cap_send_connect_rights; -__read_mostly cap_rights_t cap_setsockopt_rights; -__read_mostly cap_rights_t cap_shutdown_rights; -__read_mostly cap_rights_t cap_symlinkat_rights; -__read_mostly cap_rights_t cap_unlinkat_rights; -__read_mostly cap_rights_t cap_write_rights; -__read_mostly cap_rights_t cap_no_rights; - -static void -cap_rights_sysinit(void *arg) -{ - cap_rights_init_one(&cap_accept_rights, CAP_ACCEPT); - cap_rights_init_one(&cap_bind_rights, CAP_BIND); - cap_rights_init_one(&cap_connect_rights, CAP_CONNECT); - cap_rights_init_one(&cap_event_rights, CAP_EVENT); - cap_rights_init_one(&cap_fchdir_rights, CAP_FCHDIR); - cap_rights_init_one(&cap_fchflags_rights, CAP_FCHFLAGS); - cap_rights_init_one(&cap_fchmod_rights, CAP_FCHMOD); - cap_rights_init_one(&cap_fchown_rights, CAP_FCHOWN); - cap_rights_init_one(&cap_fchroot_rights, CAP_FCHROOT); - cap_rights_init_one(&cap_fcntl_rights, CAP_FCNTL); - cap_rights_init_one(&cap_fexecve_rights, CAP_FEXECVE); - cap_rights_init_one(&cap_flock_rights, CAP_FLOCK); - cap_rights_init_one(&cap_fpathconf_rights, CAP_FPATHCONF); - cap_rights_init_one(&cap_fstat_rights, CAP_FSTAT); - cap_rights_init_one(&cap_fstatfs_rights, CAP_FSTATFS); - cap_rights_init_one(&cap_fsync_rights, CAP_FSYNC); - cap_rights_init_one(&cap_ftruncate_rights, CAP_FTRUNCATE); - cap_rights_init_one(&cap_futimes_rights, CAP_FUTIMES); - cap_rights_init_one(&cap_getpeername_rights, CAP_GETPEERNAME); - cap_rights_init_one(&cap_getsockname_rights, CAP_GETSOCKNAME); - cap_rights_init_one(&cap_getsockopt_rights, CAP_GETSOCKOPT); - cap_rights_init_one(&cap_ioctl_rights, CAP_IOCTL); - cap_rights_init_one(&cap_linkat_source_rights, CAP_LINKAT_SOURCE); - cap_rights_init_one(&cap_linkat_target_rights, CAP_LINKAT_TARGET); - cap_rights_init_one(&cap_listen_rights, CAP_LISTEN); - cap_rights_init_one(&cap_mkdirat_rights, CAP_MKDIRAT); - cap_rights_init_one(&cap_mkfifoat_rights, CAP_MKFIFOAT); - cap_rights_init_one(&cap_mknodat_rights, CAP_MKNODAT); - cap_rights_init_one(&cap_mmap_rights, CAP_MMAP); - cap_rights_init_one(&cap_pdgetpid_rights, CAP_PDGETPID); - cap_rights_init_one(&cap_pdkill_rights, CAP_PDKILL); - cap_rights_init_one(&cap_pread_rights, CAP_PREAD); - cap_rights_init_one(&cap_pwrite_rights, CAP_PWRITE); - cap_rights_init_one(&cap_read_rights, CAP_READ); - cap_rights_init_one(&cap_recv_rights, CAP_RECV); - cap_rights_init_one(&cap_renameat_source_rights, CAP_RENAMEAT_SOURCE); - cap_rights_init_one(&cap_renameat_target_rights, CAP_RENAMEAT_TARGET); - cap_rights_init_one(&cap_seek_rights, CAP_SEEK); - cap_rights_init_one(&cap_send_rights, CAP_SEND); - cap_rights_init(&cap_send_connect_rights, CAP_SEND, CAP_CONNECT); - cap_rights_init_one(&cap_setsockopt_rights, CAP_SETSOCKOPT); - cap_rights_init_one(&cap_shutdown_rights, CAP_SHUTDOWN); - cap_rights_init_one(&cap_symlinkat_rights, CAP_SYMLINKAT); - cap_rights_init_one(&cap_unlinkat_rights, CAP_UNLINKAT); - cap_rights_init_one(&cap_write_rights, CAP_WRITE); - cap_rights_init(&cap_no_rights); -} -SYSINIT(cap_rights_sysinit, SI_SUB_COPYRIGHT, SI_ORDER_ANY, cap_rights_sysinit, - NULL); - +const cap_rights_t cap_accept_rights = CAP_RIGHTS_INITIALIZER(CAP_ACCEPT); +const cap_rights_t cap_bind_rights = CAP_RIGHTS_INITIALIZER(CAP_BIND); +const cap_rights_t cap_connect_rights = CAP_RIGHTS_INITIALIZER(CAP_CONNECT); +const cap_rights_t cap_event_rights = CAP_RIGHTS_INITIALIZER(CAP_EVENT); +const cap_rights_t cap_fchdir_rights = CAP_RIGHTS_INITIALIZER(CAP_FCHDIR); +const cap_rights_t cap_fchflags_rights = CAP_RIGHTS_INITIALIZER(CAP_FCHFLAGS); +const cap_rights_t cap_fchmod_rights = CAP_RIGHTS_INITIALIZER(CAP_FCHMOD); +const cap_rights_t cap_fchown_rights = CAP_RIGHTS_INITIALIZER(CAP_FCHOWN); +const cap_rights_t cap_fchroot_rights = CAP_RIGHTS_INITIALIZER(CAP_FCHROOT); +const cap_rights_t cap_fcntl_rights = CAP_RIGHTS_INITIALIZER(CAP_FCNTL); +const cap_rights_t cap_fexecve_rights = CAP_RIGHTS_INITIALIZER(CAP_FEXECVE); +const cap_rights_t cap_flock_rights = CAP_RIGHTS_INITIALIZER(CAP_FLOCK); +const cap_rights_t cap_fpathconf_rights = CAP_RIGHTS_INITIALIZER(CAP_FPATHCONF); +const cap_rights_t cap_fstat_rights = CAP_RIGHTS_INITIALIZER(CAP_FSTAT); +const cap_rights_t cap_fstatfs_rights = CAP_RIGHTS_INITIALIZER(CAP_FSTATFS); +const cap_rights_t cap_fsync_rights = CAP_RIGHTS_INITIALIZER(CAP_FSYNC); +const cap_rights_t cap_ftruncate_rights = CAP_RIGHTS_INITIALIZER(CAP_FTRUNCATE); +const cap_rights_t cap_futimes_rights = CAP_RIGHTS_INITIALIZER(CAP_FUTIMES); +const cap_rights_t cap_getpeername_rights = + CAP_RIGHTS_INITIALIZER(CAP_GETPEERNAME); +const cap_rights_t cap_getsockopt_rights = + CAP_RIGHTS_INITIALIZER(CAP_GETSOCKOPT); +const cap_rights_t cap_getsockname_rights = + CAP_RIGHTS_INITIALIZER(CAP_GETSOCKNAME); +const cap_rights_t cap_ioctl_rights = CAP_RIGHTS_INITIALIZER(CAP_IOCTL); +const cap_rights_t cap_listen_rights = CAP_RIGHTS_INITIALIZER(CAP_LISTEN); +const cap_rights_t cap_linkat_source_rights = + CAP_RIGHTS_INITIALIZER(CAP_LINKAT_SOURCE); +const cap_rights_t cap_linkat_target_rights = + CAP_RIGHTS_INITIALIZER(CAP_LINKAT_TARGET); +const cap_rights_t cap_mmap_rights = CAP_RIGHTS_INITIALIZER(CAP_MMAP); +const cap_rights_t cap_mkdirat_rights = CAP_RIGHTS_INITIALIZER(CAP_MKDIRAT); +const cap_rights_t cap_mkfifoat_rights = CAP_RIGHTS_INITIALIZER(CAP_MKFIFOAT); +const cap_rights_t cap_mknodat_rights = CAP_RIGHTS_INITIALIZER(CAP_MKNODAT); +const cap_rights_t cap_pdgetpid_rights = CAP_RIGHTS_INITIALIZER(CAP_PDGETPID); +const cap_rights_t cap_pdkill_rights = CAP_RIGHTS_INITIALIZER(CAP_PDKILL); +const cap_rights_t cap_pread_rights = CAP_RIGHTS_INITIALIZER(CAP_PREAD); +const cap_rights_t cap_pwrite_rights = CAP_RIGHTS_INITIALIZER(CAP_PWRITE); +const cap_rights_t cap_read_rights = CAP_RIGHTS_INITIALIZER(CAP_READ); +const cap_rights_t cap_recv_rights = CAP_RIGHTS_INITIALIZER(CAP_RECV); +const cap_rights_t cap_renameat_source_rights = + CAP_RIGHTS_INITIALIZER(CAP_RENAMEAT_SOURCE); +const cap_rights_t cap_renameat_target_rights = + CAP_RIGHTS_INITIALIZER(CAP_RENAMEAT_TARGET); +const cap_rights_t cap_seek_rights = CAP_RIGHTS_INITIALIZER(CAP_SEEK); +const cap_rights_t cap_send_rights = CAP_RIGHTS_INITIALIZER(CAP_SEND); +const cap_rights_t cap_send_connect_rights = + CAP_RIGHTS_INITIALIZER2(CAP_SEND, CAP_CONNECT); +const cap_rights_t cap_setsockopt_rights = + CAP_RIGHTS_INITIALIZER(CAP_SETSOCKOPT); +const cap_rights_t cap_shutdown_rights = CAP_RIGHTS_INITIALIZER(CAP_SHUTDOWN); +const cap_rights_t cap_symlinkat_rights = CAP_RIGHTS_INITIALIZER(CAP_SYMLINKAT); +const cap_rights_t cap_unlinkat_rights = CAP_RIGHTS_INITIALIZER(CAP_UNLINKAT); +const cap_rights_t cap_write_rights = CAP_RIGHTS_INITIALIZER(CAP_WRITE); +const cap_rights_t cap_no_rights = CAP_RIGHTS_INITIALIZER(0ULL); #endif #define CAPARSIZE_MIN (CAP_RIGHTS_VERSION_00 + 2) diff --git a/sys/sys/caprights.h b/sys/sys/caprights.h index 62711545114d..48c75afc62a0 100644 --- a/sys/sys/caprights.h +++ b/sys/sys/caprights.h @@ -58,52 +58,52 @@ typedef struct cap_rights cap_rights_t; #endif #ifdef _KERNEL -extern cap_rights_t cap_accept_rights; -extern cap_rights_t cap_bind_rights; -extern cap_rights_t cap_connect_rights; -extern cap_rights_t cap_event_rights; -extern cap_rights_t cap_fchdir_rights; -extern cap_rights_t cap_fchflags_rights; -extern cap_rights_t cap_fchmod_rights; -extern cap_rights_t cap_fchown_rights; -extern cap_rights_t cap_fchroot_rights; -extern cap_rights_t cap_fcntl_rights; -extern cap_rights_t cap_fexecve_rights; -extern cap_rights_t cap_flock_rights; -extern cap_rights_t cap_fpathconf_rights; -extern cap_rights_t cap_fstat_rights; -extern cap_rights_t cap_fstatfs_rights; -extern cap_rights_t cap_fsync_rights; -extern cap_rights_t cap_ftruncate_rights; -extern cap_rights_t cap_futimes_rights; -extern cap_rights_t cap_getpeername_rights; -extern cap_rights_t cap_getsockopt_rights; -extern cap_rights_t cap_getsockname_rights; -extern cap_rights_t cap_ioctl_rights; -extern cap_rights_t cap_linkat_source_rights; -extern cap_rights_t cap_linkat_target_rights; -extern cap_rights_t cap_listen_rights; -extern cap_rights_t cap_mkdirat_rights; -extern cap_rights_t cap_mkfifoat_rights; -extern cap_rights_t cap_mknodat_rights; -extern cap_rights_t cap_mmap_rights; -extern cap_rights_t cap_no_rights; -extern cap_rights_t cap_pdgetpid_rights; -extern cap_rights_t cap_pdkill_rights; -extern cap_rights_t cap_pread_rights; -extern cap_rights_t cap_pwrite_rights; -extern cap_rights_t cap_read_rights; -extern cap_rights_t cap_recv_rights; -extern cap_rights_t cap_renameat_source_rights; -extern cap_rights_t cap_renameat_target_rights; -extern cap_rights_t cap_seek_rights; -extern cap_rights_t cap_send_rights; -extern cap_rights_t cap_send_connect_rights; -extern cap_rights_t cap_setsockopt_rights; -extern cap_rights_t cap_shutdown_rights; -extern cap_rights_t cap_symlinkat_rights; -extern cap_rights_t cap_unlinkat_rights; -extern cap_rights_t cap_write_rights; +extern const cap_rights_t cap_accept_rights; +extern const cap_rights_t cap_bind_rights; +extern const cap_rights_t cap_connect_rights; +extern const cap_rights_t cap_event_rights; +extern const cap_rights_t cap_fchdir_rights; +extern const cap_rights_t cap_fchflags_rights; +extern const cap_rights_t cap_fchmod_rights; +extern const cap_rights_t cap_fchown_rights; +extern const cap_rights_t cap_fchroot_rights; +extern const cap_rights_t cap_fcntl_rights; +extern const cap_rights_t cap_fexecve_rights; +extern const cap_rights_t cap_flock_rights; +extern const cap_rights_t cap_fpathconf_rights; +extern const cap_rights_t cap_fstat_rights; +extern const cap_rights_t cap_fstatfs_rights; +extern const cap_rights_t cap_fsync_rights; +extern const cap_rights_t cap_ftruncate_rights; +extern const cap_rights_t cap_futimes_rights; +extern const cap_rights_t cap_getpeername_rights; +extern const cap_rights_t cap_getsockopt_rights; +extern const cap_rights_t cap_getsockname_rights; +extern const cap_rights_t cap_ioctl_rights; +extern const cap_rights_t cap_linkat_source_rights; +extern const cap_rights_t cap_linkat_target_rights; +extern const cap_rights_t cap_listen_rights; +extern const cap_rights_t cap_mkdirat_rights; +extern const cap_rights_t cap_mkfifoat_rights; +extern const cap_rights_t cap_mknodat_rights; +extern const cap_rights_t cap_mmap_rights; +extern const cap_rights_t cap_no_rights; +extern const cap_rights_t cap_pdgetpid_rights; +extern const cap_rights_t cap_pdkill_rights; +extern const cap_rights_t cap_pread_rights; +extern const cap_rights_t cap_pwrite_rights; +extern const cap_rights_t cap_read_rights; +extern const cap_rights_t cap_recv_rights; +extern const cap_rights_t cap_renameat_source_rights; +extern const cap_rights_t cap_renameat_target_rights; +extern const cap_rights_t cap_seek_rights; +extern const cap_rights_t cap_send_rights; +extern const cap_rights_t cap_send_connect_rights; +extern const cap_rights_t cap_setsockopt_rights; +extern const cap_rights_t cap_shutdown_rights; +extern const cap_rights_t cap_symlinkat_rights; +extern const cap_rights_t cap_unlinkat_rights; +extern const cap_rights_t cap_write_rights; #endif #endif /* !_SYS_CAPRIGHTS_H_ */ diff --git a/sys/sys/capsicum.h b/sys/sys/capsicum.h index 9b50986ede0a..d493535454e9 100644 --- a/sys/sys/capsicum.h +++ b/sys/sys/capsicum.h @@ -371,6 +371,24 @@ _Static_assert(CAP_RIGHTS_VERSION == CAP_RIGHTS_VERSION_00, _r; \ }) +#define _CAP_RIGHTS_WORD_INITIALIZER(i, r) \ + (CAPIDXBIT(r) == (i) + 1 ? (r) : 0ULL) + +/* + * Define a set of up to two rights at compile time. + */ +#define CAP_RIGHTS_INITIALIZER2(r1, r2) ((struct cap_rights){ \ + .cr_rights = { \ + [0] = ((uint64_t)CAP_RIGHTS_VERSION << 62) | \ + _CAP_RIGHTS_WORD_INITIALIZER(0, r1) | \ + _CAP_RIGHTS_WORD_INITIALIZER(0, r2), \ + [1] = _CAP_RIGHTS_WORD_INITIALIZER(1, r1) | \ + _CAP_RIGHTS_WORD_INITIALIZER(1, r2), \ + }, \ +}) +#define CAP_RIGHTS_INITIALIZER(r) \ + CAP_RIGHTS_INITIALIZER2(r, 0ULL) + /* * Allow checking caps which are possibly getting modified at the same time. * The caller is expected to determine whether the result is legitimate via From nobody Tue May 20 20:34:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b25qx5Hshz5vwlc; Tue, 20 May 2025 20:34: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 4b25qx4WPYz3MFt; Tue, 20 May 2025 20:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747773245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7na5+JeIbqW/0YlreqYRhzFVQYiMst0Cbg2tRwUM8o=; b=Tv3XLx6OERZblUcOmjo2TFblHONVLKfskJrAP99MIqf3rDPf5TeuiCzkTb1T/5IAU8/kkJ +le/VvjbiGPoWDD4CD9wjYAf3pSO1iHmGN8QYzp2J+v3ieIm+y3lLz+ak6eY4B+PpyEfRd +OscBjmV/RkaJcrZJHHervOX9xnChoVgO8X0PNbcVk/r3HW3a8HPn+cdxdVv7VAnGLlVlm olY2IMoj9Hnf6Wy8EMtDyLqtU1RVWOnHUEb0LXqP9VozBz3uoYLD3ztiC3E4SoKwSY58XN N5nvdUPJjDVZom79ig8S8iWyB2x8LDzSSoAJaMppgftlXub7C3DIpaWEByGuCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747773245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7na5+JeIbqW/0YlreqYRhzFVQYiMst0Cbg2tRwUM8o=; b=UtA2w0ImcYTJ6SriD3Dk5Ef+oqkFaQssPyknFCoiobamhkMC5LpUb/bbyYJqclJGrOaEKy ZNk+6yMSNAwIDxuHnmXsLA5D9plffbixjqAFf5y7FrNky7IgjgqpZ2LRwdALFcSs5J4wX8 8gIl4cvleo4bMR7R0DShZCRKmDqtB08eBpNz0LsVNNjHmbtt8CJckus3EeWEUIsIOkUW9t WXlfUiwgwKzbfvLEp6Rvo4+ptF8ZphrayqR7hy9E5fcJk86C702x6oF4MJpqBwYPGpskwh hpxiBk8ghvLjEbtUbThkjV5JgPIU4AnxlxD7jmLOsFuwjU8JyUaMLnfWS4nEgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747773245; a=rsa-sha256; cv=none; b=coEt/FT3VnlHW/J4j7jCRVtIp1F05ozQ6RcLx/QFIha3fY3AdcFsEOhO8RqyvAYgt6f67D szCRdtahFxIkPX6t9q6pcrGZ4+2TBmzFrwmN3IS/qy2EdzS4lmsc7C1O/4C09vucehrNTz 01RWjodkqhoenA1WcsIXJKN/OtSaqXTbIRM5YEBic7zpmXMik6f0B2FMXfjl88J7pVxH0x Pveg8ZBucEVKzpO2hUI5Vv2vsKHuH4at4I8jScsIWgYreHgjJ7A1k/sMQi2K4OTYA3Jat8 HKmuxKRuDDAYBeyo7EHZqqKzN7M/0omGvXiCIoEWX/jvQB0O/N8cF4duiyQZKA== 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 4b25qx46b2z14YD; Tue, 20 May 2025 20:34: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 54KKY51G091173; Tue, 20 May 2025 20:34:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KKY5Sd091170; Tue, 20 May 2025 20:34:05 GMT (envelope-from git) Date: Tue, 20 May 2025 20:34:05 GMT Message-Id: <202505202034.54KKY5Sd091170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 62d18f8c4c10 - main - release: Add -DPKGBASE option to include pkgbase packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62d18f8c4c10a5e680b0b795040abffc7964977e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=62d18f8c4c10a5e680b0b795040abffc7964977e commit 62d18f8c4c10a5e680b0b795040abffc7964977e Author: Isaac Freund AuthorDate: 2025-05-10 21:36:53 +0000 Commit: Ed Maste CommitDate: 2025-05-20 20:30:12 +0000 release: Add -DPKGBASE option to include pkgbase packages If this option is set, an offline repo of pkgbase packages corresponding to base.txz and kernel.txz will be included in the disc1 release media rather than the base.txz and kernel.txz tarballs. Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50346 --- release/Makefile | 53 +++++++++++- release/scripts/FreeBSD-base-offline.conf | 4 + release/scripts/pkgbase-stage.lua | 138 ++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 1a64c51d3400..578df226ff49 100644 --- a/release/Makefile +++ b/release/Makefile @@ -21,6 +21,8 @@ # Variables affecting the build process: # WORLDDIR: location of src tree -- must have built world and default kernel # (by default, the directory above this one) +# PKGBASE: if set, include pkgbase packages rather than dist tarballs in +# disc1 and dvd1 installation media # PORTSDIR: location of ports tree to distribute (default: /usr/ports) # XTRADIR: xtra-bits-dir argument for /mkisoimages.sh # NOPKG: if set, do not distribute third-party packages @@ -124,7 +126,7 @@ CLEANFILES+= ${I}.xz .if defined(WITH_DVD) && !empty(WITH_DVD) CLEANFILES+= pkg-stage .endif -CLEANDIRS= dist ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd +CLEANDIRS= dist pkgbase-repo pkgbase-repo-conf ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd beforeclean: chflags -R noschg . .include @@ -170,7 +172,16 @@ ports.txz: --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \ ${XZ_CMD} > ${.OBJDIR}/ports.txz ) -disc1: packagesystem +.if defined(PKGBASE) +PKGBASE_REPO= pkgbase-repo +PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI) +.endif + +pkgbase-repo: + mkdir -p pkgbase-repo + ( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo ) + +disc1: packagesystem ${PKGBASE_REPO} # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ @@ -181,6 +192,24 @@ disc1: packagesystem MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ -DDB_FROM_SRC -DNO_ROOT) +.if defined(PKGBASE) +# Create offline pkgbase repo on release media + mkdir -p ${.TARGET}/usr/freebsd-packages/repos/ + ${.CURDIR}/scripts/pkgbase-stage.lua disc \ + ${.OBJDIR}/pkgbase-repo/${PKG_ABI}/latest \ + ${.TARGET}/usr/freebsd-packages/offline \ + "${_ALL_libcompats}" + cp ${.CURDIR}/scripts/FreeBSD-base-offline.conf \ + ${.TARGET}/usr/freebsd-packages/repos/ + mtree -c -p ${.TARGET}/usr/freebsd-packages | \ + mtree -C -k type,mode,link,size | \ + sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG +# Copy manifest only (no distfiles) to get checksums + mkdir -p ${.TARGET}/usr/freebsd-dist + cp MANIFEST ${.TARGET}/usr/freebsd-dist + echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG + echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG +.else # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ @@ -190,6 +219,7 @@ disc1: packagesystem for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done +.endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} pkg || true @@ -256,6 +286,24 @@ dvd: packagesystem DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \ MK_TESTS=no MK_DEBUG_FILES=no \ -DDB_FROM_SRC -DNO_ROOT) +.if defined(PKGBASE) +# Create offline pkgbase repo on release media + mkdir -p ${.TARGET}/usr/freebsd-packages/repos/ + ${.CURDIR}/scripts/pkgbase-stage.lua dvd \ + ${.OBJDIR}/pkgbase-repo/${PKG_ABI}/latest \ + ${.TARGET}/usr/freebsd-packages/offline \ + "${_ALL_libcompats}" + cp ${.CURDIR}/scripts/FreeBSD-base-offline.conf \ + ${.TARGET}/usr/freebsd-packages/repos/ + mtree -c -p ${.TARGET}/usr/freebsd-packages | \ + mtree -C -k type,mode,link,size | \ + sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG +# Copy manifest only (no distfiles) to get checksums + mkdir -p ${.TARGET}/usr/freebsd-dist + cp MANIFEST ${.TARGET}/usr/freebsd-dist + echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG + echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG +.else # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist for dist in MANIFEST $$(ls *.txz | grep -v container); \ @@ -265,6 +313,7 @@ dvd: packagesystem for dist in MANIFEST $$(ls *.txz | grep -v container); \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done +.endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} pkg || true diff --git a/release/scripts/FreeBSD-base-offline.conf b/release/scripts/FreeBSD-base-offline.conf new file mode 100644 index 000000000000..b77334e7a4aa --- /dev/null +++ b/release/scripts/FreeBSD-base-offline.conf @@ -0,0 +1,4 @@ +FreeBSD-base: { + url: "file:///usr/freebsd-packages/offline", + enabled: yes +} diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua new file mode 100755 index 000000000000..01eec8c44e49 --- /dev/null +++ b/release/scripts/pkgbase-stage.lua @@ -0,0 +1,138 @@ +#!/usr/libexec/flua + +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright(c) 2025 The FreeBSD Foundation. +-- +-- This software was developed by Isaac Freund +-- under sponsorship from the FreeBSD Foundation. + +-- Run a command using the OS shell and capture the stdout +-- Strips exactly one trailing newline if present, does not strip any other whitespace. +-- Asserts that the command exits cleanly +local function capture(command) + local p = io.popen(command) + local output = p:read("*a") + assert(p:close()) + -- Strip exactly one trailing newline from the output, if there is one + return output:match("(.-)\n$") or output +end + +local function append_list(list, other) + for _, item in ipairs(other) do + table.insert(list, item) + end +end + +-- Returns a list of packages to be included in the given media +local function select_packages(pkg, media, all_libcompats) + local components = { + kernel = {}, + kernel_dbg = {}, + base = {}, + base_dbg = {}, + src = {}, + tests = {}, + } + + for compat in all_libcompats:gmatch("%S+") do + components["lib" .. compat] = {} + components["lib" .. compat .. "_dbg"] = {} + end + + local rquery = capture(pkg .. "rquery -U -r FreeBSD-base %n") + for package in rquery:gmatch("[^\n]+") do + if package == "FreeBSD-src" or package:match("^FreeBSD%-src%-.*") then + table.insert(components["src"], package) + elseif package == "FreeBSD-tests" or package:match("^FreeBSD%-tests%-.*") then + table.insert(components["tests"], package) + elseif package:match("^FreeBSD%-kernel%-.*") then + -- Kernels other than FreeBSD-kernel-generic are ignored + if package == "FreeBSD-kernel-generic" then + table.insert(components["kernel"], package) + elseif package == "FreeBSD-kernel-generic-dbg" then + table.insert(components["kernel_dbg"], package) + end + elseif package:match(".*%-dbg$") then + table.insert(components["base_dbg"], package) + else + local found = false + for compat in all_libcompats:gmatch("%S+") do + if package:match(".*%-dbg%-lib" .. compat .. "$") then + table.insert(components["lib" .. compat .. "_dbg"], package) + found = true + break + elseif package:match(".*%-lib" .. compat .. "$") then + table.insert(components["lib" .. compat], package) + found = true + break + end + end + if not found then + table.insert(components["base"], package) + end + end + end + assert(#components["kernel"] == 1) + assert(#components["base"] > 0) + + local selected = {} + if media == "disc" then + append_list(selected, components["base"]) + append_list(selected, components["kernel"]) + append_list(selected, components["kernel_dbg"]) + append_list(selected, components["src"]) + append_list(selected, components["tests"]) + for compat in all_libcompats:gmatch("%S+") do + append_list(selected, components["lib" .. compat]) + end + else + assert(media == "dvd") + append_list(selected, components["base"]) + append_list(selected, components["base_dbg"]) + append_list(selected, components["kernel"]) + append_list(selected, components["kernel_dbg"]) + append_list(selected, components["src"]) + append_list(selected, components["tests"]) + for compat in all_libcompats:gmatch("%S+") do + append_list(selected, components["lib" .. compat]) + append_list(selected, components["lib" .. compat .. "_dbg"]) + end + end + + return selected +end + +local function main() + -- Determines package subset selected + local media = assert(arg[1]) + assert(media == "disc" or media == "dvd") + -- Local repository to fetch from + local source = assert(arg[2]) + -- Directory to create new repository + local target = assert(arg[3]) + -- =hitespace separated list of all libcompat names (e.g. "32") + local all_libcompats = assert(arg[4]) + + assert(os.execute("mkdir -p pkgbase-repo-conf")) + local f = assert(io.open("pkgbase-repo-conf/FreeBSD-base.conf", "w")) + assert(f:write(string.format([[ + FreeBSD-base: { + url: "file://%s", + enabled: yes + } + ]], source))) + assert(f:close()) + + local pkg = "pkg -o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes " .. + "-o INSTALL_AS_USER=1 -o PKG_DBDIR=./pkgdb -R ./pkgbase-repo-conf " + + assert(os.execute(pkg .. "update")) + + local packages = select_packages(pkg, media, all_libcompats) + + assert(os.execute(pkg .. "fetch -o " .. target .. " " .. table.concat(packages, " "))) + assert(os.execute(pkg .. "repo " .. target)) +end + +main() From nobody Tue May 20 20:34:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b25qy6NnGz5vx5H; Tue, 20 May 2025 20:34: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 4b25qy5WC7z3MJC; Tue, 20 May 2025 20:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747773246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bOJQJ/8j/Q5aTbhn8DedXZ36hxpQdawnmqX4AcphcCw=; b=lPQZC151IEs7BpBc4CfH9p9FQD36Xtbyb/qOMwCFajWY12cYRZCVnuMBQQ72HlpmBcWZti 8v37PP833sGq/UJMmqMDAi16qr9bimiMSRpl4mTahRMxMBQFpmazlQZgJRl5en24WlZrJ4 YbARKoyrbDrGD6LDlwLmgDtwhTRLNMb+t7RmB9+EqJNymLP+dvjAUEcfwdlINIEQHjg6Ta VQoleobbBztVm+QxdL0pl4+2MoODbe45hpwzH4ae7iXg5BgB/EqVXExJRW3/HEJDXNHimV chOwiAnA5MTm2lrimFFdCDQ4tWqkwHi3nNuoqda2ZBU9+eJ+guIKDCwcZ0CP3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747773246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bOJQJ/8j/Q5aTbhn8DedXZ36hxpQdawnmqX4AcphcCw=; b=K0USKZJdKOLs2utMTE6pkN72WocBUvdBQJg68GcFur5BMQ1vCLxWBi/sQQC+FuXOd4Bs6X iGRVhFn2sm0YRhhfDy5X1NDChY3bEYfJkNREIdlUcqHvGN3+QpQGj01RHXQOXFJOsluwwV pidYap7YEHSVysKvJ9oHnXvNoKF3FUZoi01gtwRAIl6wwolYa7NgN2vyQ6Z9T7TU7DNkvb Js5N1Ac/jfv0fk7uHBMHi5ZoSpWnLY95leS23uADl0BCfV3RlMFxU+BjWywU2dlebrADB+ XluSUl8pwlzxFU7BLYF4uAUarZ9KjX3WPwRkAwBvE1p3aihB8jpEMppoUyMqSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747773246; a=rsa-sha256; cv=none; b=KaUhcz3sXBwVTDiweZTM9eggrfVQoKzAmrsw3QVCd1I6kU4lnjaLA26CAmRz9gn1DJUT/R twVbRaID0+feyIA9CxIfC6z0sghf8m49fVPEF9cmV5bn+apV1nxnoutc6pNv3mP67MVbLf g+1xs6c9dHKK7PC9sHeFP9rxYWF6Tw2LP8ILmnA5LON91G3etVJxZi5O+96IEeg7IzItrZ iZ2D8Y8foDrASZyK/GmeyVI3VadbuKtU7vcUEhu0NoolfcxlO+r/4vw4eNMxAz7GdDqo1M HAn47qSUy08sI4zaIEYjBls9aQwa76fs53KiVBJRrAyvlVhvgsUqGFTMG8lh2A== 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 4b25qy4lpPz14rB; Tue, 20 May 2025 20:34:06 +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 54KKY6YR091209; Tue, 20 May 2025 20:34:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KKY6Ap091206; Tue, 20 May 2025 20:34:06 GMT (envelope-from git) Date: Tue, 20 May 2025 20:34:06 GMT Message-Id: <202505202034.54KKY6Ap091206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5b29ffe61469 - main - release.7: Document PKGBASE option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b29ffe61469e601c5e53f65d2a115b0c43e3f13 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5b29ffe61469e601c5e53f65d2a115b0c43e3f13 commit 5b29ffe61469e601c5e53f65d2a115b0c43e3f13 Author: Ed Maste AuthorDate: 2025-05-16 18:47:34 +0000 Commit: Ed Maste CommitDate: 2025-05-20 20:33:22 +0000 release.7: Document PKGBASE option Reviewed by: ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50382 --- share/man/man7/release.7 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 5c5c11efd0fb..36c14afe0bf1 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 26, 2024 +.Dd May 20, 2025 .Dt RELEASE 7 .Os .Sh NAME @@ -282,6 +282,10 @@ within the This is intended for use only when .Fa /usr/ports is expected to exist by alternative means. +.It Va PKGBASE +Include base system packages for use with +.Xr pkg 8 +on the install media, instead of legacy tarball distribution sets. .El .Sh EMBEDDED BUILDS The following From nobody Tue May 20 21:12:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b26h065bqz5w0TV; Tue, 20 May 2025 21:12:16 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b26h03dZ1z3QTd; Tue, 20 May 2025 21:12:16 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747775536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=PVv5faAY2JlPevI0BJBEXsjhHF8QG0TO2Es0Goi0kyU=; b=akK8lmuEDpqeQLmkeSBVt3aGK6y6hYbeWfMuQnBbqjMd7Lw3fx2mzU1nJmQbt0yoWgpYB/ SPgXSy0HuG26MrlMc6gJCcZM28j2OjfJU6c7M1tv4kKmF6h6a2tN/yn5AGxNDZyiqbMu4O BBjejESO0o4KAuyr+1UOZMel7WK0I30qT5EdP5/t4MGm6ZaDCYFypVAsYim2fLqfdiHSPy WjYQFJoMD+pN0mVA93ZE5uGfO9F1Am8kKVZXK7jupzOtlQzyvON6zSu6oEMMsbdlwU39nH OoRYj1sNgzPk4GJgZi9Py2Y6wYq7a2W/Uygd6OWG/YCejjAzksYfdTCkAMQp9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747775536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=PVv5faAY2JlPevI0BJBEXsjhHF8QG0TO2Es0Goi0kyU=; b=ylrlmPUJuLtSf+JJacgZxgAag9Ecw/j4C23ZDT0q3WH9jDjWaMHX+ShBWBqzI4xJec5POF f5cla6xRR0PfaRVfZIrpb8rYZhEoTAeXd0Oq4zrMOGJXVyUGwhhTHNiBf8IOh1AWZVM+UP B8yeVdapZ/JZZAKIrJoRtDeEJ61NQmQ6NJaEs8aEdi2AurdxF+2nicPftiDkuzGCIxQ4gm Kqho1+gs8/1pmOSIQVS8G3uJRUsmmsy9UZOO3hbOUhdiy/s6X24vqM63FT/E4Vq+YQrika slLpPqg6PxFVeBpO4wh8Bet4zsscNQja3o8VQR2xTnLZi1KuzoM6YAxdDwC0mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747775536; a=rsa-sha256; cv=none; b=YpUtr7/+mAQgA12T3knWSApCPpo6DQr+1qdcXmp5g2zyu2hqm2Jb7yldu3WSmgAxGiXt22 45LlDgk2gpKoqPpl0V7lXMhA4UDQESZcIsMRESoqdRUbZG6mjZsTWOpGF9Ua2WSo6jQBX3 eip4h3Liorqkpb/l3E/5hzlQ/QmamvAcJ1FmNPKivOsnl5SeyICgRKxsR4XaUCkrvlEUBi psDiBky58VvUIfEfEsODKA2TAGgT5g3CC9PC3ZK22NfGiwwkGtu5uKQ+TDC4tSOMjwhro1 damDmaZVQKMBlxee0iU5Qy5yrihgpyjWxKDksBWQZJBvhDeZZyQvW8EAnPGBbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.0.88] (unknown [93.188.39.137]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b26gz66gCz1CyZ; Tue, 20 May 2025 21:12:15 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: Date: Wed, 21 May 2025 00:12:11 +0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Andriy Gapon Subject: Re: git: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush To: mmel@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505201457.54KEvD1r053951@gitrepo.freebsd.org> <1a11f640-be62-4f4e-b537-70806ac54831@FreeBSD.org> Content-Language: en-US Autocrypt: addr=avg@FreeBSD.org; keydata= xsDNBGcKrHEBDADRvwQOK0b/yo4ys5cs6bOQMhEh4xtfbaZ/CU00cpPgUip3sOZCdrtMWlRC g25z97prxE9pKueZi+HXDhIPpa9xl14ghqF4oYScuJ1i18HyiOH2y5Q3Vv/TtFiSzicd3EAu QgS3jVidpgDSPDdj2Yz3UxYpZ+PuFl6nOnvCvqOFcjUlzKCyPaiN2b86l1Nscmhnc+zQ/faB erUOEFEDQbWMA5YfXi8HrbeR16hfRfGt7E0aMDlIj9FIPIq71UWMN9CimPgs4+rbNr1MAlLa z4GxSDhVYZEY5rqtCzr+PLXboRQWnaUwXl0/biw9enf17NHdYv1SNAFTX2eC4dZ3qBVI74dS PgNprm+PMfz+6Hhs/dAv+Nan5nVhg3EFIjYTiy0MnjMSq8uI0v0ykpAGAcJJ5xl6d23aLxgN 6f0z6pJRCO0hGPgU7UzvFD0MxJxmbzqdT1R51KDan1oD41b+tjl2LMBuCDCoB0U44Pu0zLdp xMfFTxCXtwIYKIUxwd28jwMAEQEAAc0eQW5kcml5IEdhcG9uIDxhdmdARnJlZUJTRC5vcmc+ wsENBBMBCAA3FiEEmXvSmjiQFHPVOpLnzDOt5NLj67sFAmcKrHEFCQeEzgACGwMECwkIBwUV CAkKCwUWAgMBAAAKCRDMM63k0uPru5tSDACFK15LLbq89RSQ6QMnjiIm1t/wYJyumb519MHu Dhzxx1lbr8oghf0RHtF6kYRLQPaW2VdToi74pRobd3CN4bhZKDLSL6WfTn17RfavDjL6Njwp KBo30CkOeYKWq1mDmo0xEoQj8cc7ybEZnus+YScZOpj8Ti4EFwhRt6SHer7YDb161IHKL8m4 MsCxpFSGEjbKj8Iul3Ri/fTOO8w14ivcuEEQIvJt4/+4YV5Az8G23wKzL/3aJ7SOT3oYGmR9 atBTmVO3DlODjM+rZLegd8SfLSPTcBTHspWE5duemIzZbEX3BP77r3Qx4Fo5Tkit3bG1XVar yPQato+sFGFEGifdE9USBQoAoOaaeZevwAWjDU0TIuCT0CUe0sKtQuNP4LRq0n9EEHOXBu9a CfdMhFUSkAZnuE7miSVwgPvoVNJ1stA37EXLN/sVsWik7wslTQ5vF81VpdGFiwoQPOe2XEKh ogcwGSnXbwv1gD4x+Gz/7Y+kFyr1NY+4/nSaeXVcS2fOwM0EZwqscgEMAMQTe6ypAmQe/TFO HqKD2hfFKdksTptKi6uEh8xIwct8G/0FBldDWXo9eu8CGr/ZrDg0/bAwJxbaLRQCMH19Gq2Y hLvZ1QK5GQJVzZKcqfxbF2LiDUTs6WkdOBIhGpdDy7p1xFrvqCGCtNFYHuGYm067EozibBSF BWAPstKu2FQuVHZNMOfs7p3OIz3Yfqu9woXDeg3/8G2qVQJINe+8EwXKlhgh4CyDbq7nAZoA kIu1SE9z9u3WI5mcNy/0dFmVUsFxBqRC3ewbvzie8tKyZ9yFOlaZPT0Y4nRBXQTI3mLZ8zQ8 mtrWK5OOmrJ02kdeO9RBXe+OMaUUWMf92ZIoBFb4HP6N+B+4N1y1OwULousfl7JRoYxA4MRL ls7E2sSoJvrEBTJB3Pc34xu8rsJ1A5V3NgN6djX8yEZYpTRkcmrBeWy/ofDqZPVqneAx0LRm eldDS9msXDW4KXODyPZ+9unvmHAcoH0xaBYaSH44CDZDQDg4LNcmbOvuu1TEXBJhjQARAQAB wsD8BBgBCAAmFiEEmXvSmjiQFHPVOpLnzDOt5NLj67sFAmcKrHMFCQeEzgACGwwACgkQzDOt 5NLj67sUCAv5AXqgWnYN9EblapMbZjkiqL8pZQ0GNqh+Pg9FwbyULxjtRTO6rD4D0IxizByb ef+neeUNyYlagt5nfKMysEr0SU/gHKCi8vyTF/63ukMrGUNGmJJxrndl5ZYKC6j6eX7twrZF L1Uvlmn6FnQ22red5kHO93fDjG4zaDIZvHfwj7kzjZ4tpC7Byinf88s14mdZeScc0PnU2hj4 UGYju/wg2FF4YxaZYhcmdTiRYY0Wx85XSMZv19pnn78sadEuRvfRd4JTmw++j1xGXeqQGWzz /CTG5/Ex9GAkQ02hZbmi236byDXoet4G8TEyOph9QFVkV9bNd0jQZaFZPGEj4PSPUYGAF7s5 xJaNGgctC3aZ7WjEv1FBoo44XCU4xcjJ1wZQUrHxRhx6TW0Jtcl0U9qfKFW30TSPo6RyiXuj X4ltWKAtjoXB8nUmEJckaz7IRu2b4pXDeazZuz5JBygUs10yJjDxh2vFQZo0KaBAPx9MZlPn gpPTjT15L8xGftEjQXF6 In-Reply-To: <1a11f640-be62-4f4e-b537-70806ac54831@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 20/05/2025 21:28, Michal Meloun wrote: > > > On 20.05.2025 16:57, Andriy Gapon wrote: >> The branch main has been updated by avg: >> >> URL: https://cgit.FreeBSD.org/src/commit/? >> id=0d2fd5b99c95329085d0700a4dd38507a054a50d >> >> commit 0d2fd5b99c95329085d0700a4dd38507a054a50d >> Author:     Andriy Gapon >> AuthorDate: 2024-11-10 11:15:30 +0000 >> Commit:     Andriy Gapon >> CommitDate: 2025-05-20 14:55:18 +0000 >> >>      ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush >>      LSR_TEMT bit is set if both transmit hold and shift registers are >>      empty, but the flush command flushes only the hold register. > I don't think that's true. I am not sure to which part of the commit message your "that" refers to, so I'll try to justify everything. T_H_R_E - transmitter holding register empty T_EMPT - transmitter empty All hardware documentation that I have around describes those bits like that. We do not have direct control over the shift register, hardware clears it after sending. > Imho, ns8250_flush() is used also before changing > baud rate, so we need to ensure that all bits are flushed, including the > transmit register. That's an interesting point. My intention was actually to avoid bogus "FCR is broken" message which can happen because of a race between the UART transmission and code execution. I think that LSR_THRE is proper for checking that FCR works. But to actually detect and ensure that all transmission has completed we should use LSR_TEMT like you say. At the same time, this UART flush is not like stdout flush, of course, where we ensure that all buffered data is transmitted. For UART, we just clear the FIFO and the holding register. So, I am not sure if polling for empty transmitter is important. Besides, I do not see the code which would flush transmitter when parameters are changing. I can find only two places where UART_FLUSH_TRANSMITTER is passed: - ns8250_bus_attach - ns8250_bus_probe Additionally, ns8250_bus_transmit uses ns8250_drain(UART_DRAIN_TRANSMITTER) in broken_txfifo case. P.S. Maybe I don't understand the code, but UART_FLUSH_RECEIVER in ns8250_bus_attach looks strange to me. It's one thing to flush data while in the loop-back mode, but I think that in ns8250_bus_attach the hardware is fully set up to receive data from the outside world. So, how can we hope to drain all of it and to reliably detect whether FIFO flushing works. I mean that something on the other end could be continuously transmitting. -- Andriy Gapon From nobody Tue May 20 22:59:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b293z4tbcz5w7mX; Tue, 20 May 2025 22:59: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 4b293z4BfQz3dgb; Tue, 20 May 2025 22:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747781983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liTqlFx+Ee6C/bhc+7viwzsRmSKkMEnt7iB38eE9XTg=; b=E2FGYQF0DRAFsDEclrOPlC5gWBi60YXHjEL8T7KPw7EFEaEh/Hd+3Pf+T1PIfy9Cc/YSzE BZq9zrwHtcmLVfxvKTVTc1yLNPJjKJfVV6mJddmv7+Me3iSS0iSHWv7MR7S2GYLeb6oJTg C3i6NKxxgLy7F6yKFV/sK+sfysxWfRfVbIShRzgRgJlsTeRlh8xB3Zq6mMYfj97knfgEB0 dzPxgCAhhrYdetOAMZIst0jjo/lWfrXEVj4e3p4PJsJaOk0t9CPhM8cFDr5ecfWI3/35Ej pysCfCUxvuCJNOgY0281ABaHPXVdXxJT1Rop2Ag47GiIyc15Qx5T+MGv6Gu8/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747781983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liTqlFx+Ee6C/bhc+7viwzsRmSKkMEnt7iB38eE9XTg=; b=k9eS+n1LM/YfnzmLWAIVd+nOKfLA+G/DnJw2GwEehYpEtwUoIEHTgu4WG2Auoamc+yS+qt LmlWfCk9arN+b/OgBsG1dR9gjxnjKlL480/raPu4O2Kds91sbVrW8YkXuBbFU4HCiRcZLo Qk3x+ECZ8/Pmxg9+0Wd14KQOGThb9/ktxNc3YtA+uMovFOXtJ464qT4hpi5dQ/Z9WvvxZf kHYJUFnC9yXzRUZBw/Fq3fmwRtnRmNVFEyxB2D6hY9ZDJyXKMX/VnXbmWuakZHNh0n+0e/ Lg+Lp4D7F4v4gzu65OucthOQ2ZhBLBqXlEE9EQB0rn7cDloAWk94tajiGYPO0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747781983; a=rsa-sha256; cv=none; b=FUo0Mv0Bq1gF3WStqB/hcSct/KzEdHT3KR7qe7GnDfW/EiiFKsGbnZqgADJjNC94NiT/QS PGNRN9PouKHgWEmVUd8ncJ2XXdFLISBxd8RdF0H6ClVRqBSOL78S9mrpqWcfhinzbNI89O xuCg72nD8LNvHr6PGokEdF6EekeNoGmMpCXnLLw/Rfm8m94M5FV806OQWLl7Krjdr9yGhl B1UsY4SMK486d7ZCQnZgHzxyue8PtgmC7PCWeegqHeumg0r31AF7hjIvLqcmaJII5n9QK7 xi0pnUYo/kGJ0CIoKYeNSLtgcyxiDOJnLKdat5Ls6KoqDBNxNydrBJeqBKg5+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 4b293z3R9Pz17y0; Tue, 20 May 2025 22:59: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 54KMxhjo053601; Tue, 20 May 2025 22:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KMxhl1053598; Tue, 20 May 2025 22:59:43 GMT (envelope-from git) Date: Tue, 20 May 2025 22:59:43 GMT Message-Id: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: ac62b97951c2 - main - openssh: Add ${SKSRCS} to libssh List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac62b97951c25a33ec0880e574ccff31be7452f7 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=ac62b97951c25a33ec0880e574ccff31be7452f7 commit ac62b97951c25a33ec0880e574ccff31be7452f7 Author: Jose Luis Duran AuthorDate: 2025-05-20 22:58:23 +0000 Commit: Jose Luis Duran CommitDate: 2025-05-20 22:58:23 +0000 openssh: Add ${SKSRCS} to libssh sshkey.c references sshsk_sign(), which is defined in ${SKSRCS}. Due to how FreeBSD builds libssh, or put differently, due to upstream not building a shared libssh.so, we need to partially revert 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere"), and add ${SKSRCS} back, to avoid linking problems, especially when building with GCC: /usr/local/bin/ld: /usr/obj/usr/src/amd64.amd64/secure/lib/libssh/libprivatessh.so: undefined reference to `sshsk_sign' collect2: error: ld returned 1 exit status` Put the sources in a separate line, to maintain line-by-line compatibility with upstream Makefile.in PR: 286580 Reviewed by: emaste Approved by: emaste (mentor) Fixes: 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere") Differential Revision: https://reviews.freebsd.org/D50020 --- secure/lib/libssh/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 39083d007675..35883d4a9d42 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -39,6 +39,9 @@ SRCS= ${LIBOPENSSH_SRCS} \ sftp-realpath.c platform-pledge.c platform-tracing.c platform-misc.c \ sshbuf-io.c +# Add ${SKSRCS} to avoid linking problems. +SRCS+= ${SKSRCS} + PACKAGE= ssh # Portability layer From nobody Tue May 20 23:51:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2BCR4wFjz5wC22; Tue, 20 May 2025 23:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2BCR2J0mz3k4r; Tue, 20 May 2025 23:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747785075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ScWVt/IvU1F6ibs3DkfxMdWPGtEBHEkf+8a8GaQprVg=; b=CrhsH5jljgDG1kaNJjBESEICITRI8qggVQC7R3Y48fnrgsoSp8U5bhQ/yYlyu/nn4yQt3c Jl5bSav3Jx9Tp9ZKYo1Tif+VgOdex67+hJl7iG3GSKSGxN0oofUfU6WCBSlRHPL4jjxG30 qn7NwysHJ5veSZdP4Up1m9PPkzaLj9kZ0UAJepLgp9Oa0+2FhNTCAIXB5l3KyEo+Yr2DWP tGrMgURW+ak2MTF29xNHpRsAfU34z3fdABstRQyVb6TS/7VURSKV9wDBPRE9CmTBDLojrC x7Hmk6X4u6R5qmCogzfMC7ik2AfopRjn2S+dyYuLQ8GuBlNXkuOSff9le3RVww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747785075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ScWVt/IvU1F6ibs3DkfxMdWPGtEBHEkf+8a8GaQprVg=; b=xZA9AG7ZQLdG1UmiU27Lyv8FqN4NN5ZC6CBgm3b7nUQjFfguMX//v0r+70Tbc+Mo0Lo8ts QiwL4VW8TBFxp//WrfQ6GDgIvBpCBx4Qpe1QICwnZIJvyCNzlYluLKdpB+7zrB6r6qnVKJ UJIa1St6BYMbrSTh7WHi5oY5eR+E62uZ4h3szzsNidxhR81oF2eTluFBqaNQrkj2su4SMS TtPK8KWUxuz7WCm9wiy2rLOhRm2L/jLzoeXKGavdL60HAWz3b80DFYtuxx+OEDS44CKhCB 4gjxcYNr45uw5SSmiSe3xqHHMJKtq5M0uJjNI1O5hXxSxQ8qYX6BGO02bSLRZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747785075; a=rsa-sha256; cv=none; b=ZHXLZR0PlUx5Og8mjcUV+GCsCY35k9woXQvUI2gARhTVdkBJAtRin/v9AE4CbOsG0Tvxcx RlQ1QoryXWdnaAAbV1sYaaUkpWOWb0ELPgSrQY9Qhw3pw7GHPWcL3rheK4zwSvQSZkFL6Z sf9Ou3UCLsy9cjT5q+fAHFMoysPUf0fMUgDKRM1ih9mrAWwNI1lTLsND2Qmb91ilO2xEGe 6vdjyCEK+mtji6VRv7gDu+FyiX0bYUWJo9o+pX3yDYLWhD3JOyMHh+ggYXGLOiI689T+yb Buo58PbFdjnJW92OHndR1iqgG1fFoy5HFVv4jcVYCzk/h6jfOtgQRJ7ZQA7Z8w== 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 4b2BCR1ktjz19f7; Tue, 20 May 2025 23:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54KNpF2q058708; Tue, 20 May 2025 23:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KNpFWE058687; Tue, 20 May 2025 23:51:15 GMT (envelope-from git) Date: Tue, 20 May 2025 23:51:15 GMT Message-Id: <202505202351.54KNpFWE058687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b044f125373e - main - gve: Use load-acquire to fetch generation bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b044f125373e05c20ca16edfd29cccad1f4025bd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b044f125373e05c20ca16edfd29cccad1f4025bd commit b044f125373e05c20ca16edfd29cccad1f4025bd Author: Jasper Tran O'Leary AuthorDate: 2025-05-20 23:34:44 +0000 Commit: Mark Johnston CommitDate: 2025-05-20 23:50:59 +0000 gve: Use load-acquire to fetch generation bits When running the driver using the DQO queue format, we must load the generation bit and check it before possibly reading the rest of the descriptor's fields. Previously, we guarded against reordering of reads using an explicit thread fence. This commit changes the thread fence to a load with acquire semantics. Because the tx and rx generation fields are in a bitfield, we cannot explicitly address them in an atomic load. Instead we load the respective containing bytes in the descriptor and mask them appropriately. Signed-off-by: Jasper Tran O'Leary Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50384 --- sys/dev/gve/gve_adminq.h | 3 ++- sys/dev/gve/gve_dqo.h | 20 ++++++++++++++++---- sys/dev/gve/gve_rx_dqo.c | 24 +++++++++++++++++------- sys/dev/gve/gve_tx_dqo.c | 25 +++++++++++++++++-------- 4 files changed, 52 insertions(+), 20 deletions(-) diff --git a/sys/dev/gve/gve_adminq.h b/sys/dev/gve/gve_adminq.h index bc51046a3037..531a844f7d90 100644 --- a/sys/dev/gve/gve_adminq.h +++ b/sys/dev/gve/gve_adminq.h @@ -377,7 +377,8 @@ struct stats { _Static_assert(sizeof(struct stats) == 16, "gve: bad admin queue struct length"); -/* These are control path types for PTYPE which are the same as the data path +/* + * These are control path types for PTYPE which are the same as the data path * types. */ struct gve_ptype_entry { diff --git a/sys/dev/gve/gve_dqo.h b/sys/dev/gve/gve_dqo.h index 214138303a77..212bfa1a6ad3 100644 --- a/sys/dev/gve/gve_dqo.h +++ b/sys/dev/gve/gve_dqo.h @@ -208,9 +208,14 @@ _Static_assert(sizeof(struct gve_tx_metadata_dqo) == 12, #define GVE_TX_METADATA_VERSION_DQO 0 +/* Used to access the generation bit within a TX completion descriptor. */ +#define GVE_TX_DESC_DQO_GEN_BYTE_OFFSET 1 +#define GVE_TX_DESC_DQO_GEN_BIT_MASK 0x80 + /* TX completion descriptor */ struct gve_tx_compl_desc_dqo { - /* For types 0-4 this is the TX queue ID associated with this + /* + * For types 0-4 this is the TX queue ID associated with this * completion. */ uint16_t id:11; @@ -222,12 +227,14 @@ struct gve_tx_compl_desc_dqo { /* Flipped by HW to notify the descriptor is populated. */ uint16_t generation:1; union { - /* For descriptor completions, this is the last index fetched + /* + * For descriptor completions, this is the last index fetched * by HW + 1. */ __le16 tx_head; - /* For packet completions, this is the completion tag set on the + /* + * For packet completions, this is the completion tag set on the * TX packet descriptors. */ __le16 completion_tag; @@ -258,6 +265,10 @@ struct gve_rx_desc_dqo { _Static_assert(sizeof(struct gve_rx_desc_dqo) == 32, "gve: bad dqo desc struct length"); +/* Used to access the generation bit within an RX completion descriptor. */ +#define GVE_RX_DESC_DQO_GEN_BYTE_OFFSET 5 +#define GVE_RX_DESC_DQO_GEN_BIT_MASK 0x40 + /* Descriptor for HW to notify SW of new packets received on RX queue. */ struct gve_rx_compl_desc_dqo { /* Must be 1 */ @@ -266,7 +277,8 @@ struct gve_rx_compl_desc_dqo { /* Packet originated from this system rather than the network. */ uint8_t loopback:1; - /* Set when IPv6 packet contains a destination options header or routing + /* + * Set when IPv6 packet contains a destination options header or routing * header. */ uint8_t ipv6_ex_add:1; diff --git a/sys/dev/gve/gve_rx_dqo.c b/sys/dev/gve/gve_rx_dqo.c index a499ac9d3c6a..11b2c7ea0c55 100644 --- a/sys/dev/gve/gve_rx_dqo.c +++ b/sys/dev/gve/gve_rx_dqo.c @@ -962,6 +962,19 @@ drop_frag_clear_ctx: rx->ctx = (struct gve_rx_ctx){}; } +static uint8_t +gve_rx_get_gen_bit(uint8_t *desc) +{ + uint8_t byte; + + /* + * Prevent generation bit from being read after the rest of the + * descriptor. + */ + byte = atomic_load_acq_8(desc + GVE_RX_DESC_DQO_GEN_BYTE_OFFSET); + return ((byte & GVE_RX_DESC_DQO_GEN_BIT_MASK) != 0); +} + static bool gve_rx_cleanup_dqo(struct gve_priv *priv, struct gve_rx_ring *rx, int budget) { @@ -971,17 +984,14 @@ gve_rx_cleanup_dqo(struct gve_priv *priv, struct gve_rx_ring *rx, int budget) NET_EPOCH_ASSERT(); while (work_done < budget) { - bus_dmamap_sync(rx->dqo.compl_ring_mem.tag, rx->dqo.compl_ring_mem.map, + bus_dmamap_sync(rx->dqo.compl_ring_mem.tag, + rx->dqo.compl_ring_mem.map, BUS_DMASYNC_POSTREAD); compl_desc = &rx->dqo.compl_ring[rx->dqo.tail]; - if (compl_desc->generation == rx->dqo.cur_gen_bit) + if (gve_rx_get_gen_bit((uint8_t *)compl_desc) == + rx->dqo.cur_gen_bit) break; - /* - * Prevent generation bit from being read after the rest of the - * descriptor. - */ - atomic_thread_fence_acq(); rx->cnt++; rx->dqo.tail = (rx->dqo.tail + 1) & rx->dqo.mask; diff --git a/sys/dev/gve/gve_tx_dqo.c b/sys/dev/gve/gve_tx_dqo.c index 7361d47b8ce6..8a1993c3e712 100644 --- a/sys/dev/gve/gve_tx_dqo.c +++ b/sys/dev/gve/gve_tx_dqo.c @@ -1029,6 +1029,19 @@ gve_clear_tx_ring_dqo(struct gve_priv *priv, int i) gve_tx_clear_compl_ring_dqo(tx); } +static uint8_t +gve_tx_get_gen_bit(uint8_t *desc) +{ + uint8_t byte; + + /* + * Prevent generation bit from being read after the rest of the + * descriptor. + */ + byte = atomic_load_acq_8(desc + GVE_TX_DESC_DQO_GEN_BYTE_OFFSET); + return ((byte & GVE_TX_DESC_DQO_GEN_BIT_MASK) != 0); +} + static bool gve_tx_cleanup_dqo(struct gve_priv *priv, struct gve_tx_ring *tx, int budget) { @@ -1041,20 +1054,16 @@ gve_tx_cleanup_dqo(struct gve_priv *priv, struct gve_tx_ring *tx, int budget) uint16_t type; while (work_done < budget) { - bus_dmamap_sync(tx->dqo.compl_ring_mem.tag, tx->dqo.compl_ring_mem.map, + bus_dmamap_sync(tx->dqo.compl_ring_mem.tag, + tx->dqo.compl_ring_mem.map, BUS_DMASYNC_POSTREAD); compl_desc = &tx->dqo.compl_ring[tx->dqo.compl_head]; - if (compl_desc->generation == tx->dqo.cur_gen_bit) + if (gve_tx_get_gen_bit((uint8_t *)compl_desc) == + tx->dqo.cur_gen_bit) break; - /* - * Prevent generation bit from being read after the rest of the - * descriptor. - */ - atomic_thread_fence_acq(); type = compl_desc->type; - if (type == GVE_COMPL_TYPE_DQO_DESC) { /* This is the last descriptor fetched by HW plus one */ tx_head = le16toh(compl_desc->tx_head); From nobody Tue May 20 23:51:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2BCS4Hq6z5wBnn; Tue, 20 May 2025 23:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2BCS2s6kz3k4s; Tue, 20 May 2025 23:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747785076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vn5IkqkuqpIZSRWtydWiLE5e1zHHNb4n07JOU0rtWQ=; b=kO53stSzvAImQqzfQOsfSTS3pOiF/tXOOj6Rzc1gErChNVYPYbW61Wi7UGWL0rr4AESAuk R5R1sDJAhwpYMM7sAP/2OPaKaHyWDJldxodzP9xFSLKiAwRIHwpZXmDLCspt/4osEj9I+t 3/8dN/fUWrjXGy38WG8brM04BnMen2a/drfdv2O3lnDhAYOgGcsmYLFj+Vkr7/ry6VIRf5 VKlojFkM0/2m+yFwdcQNNXsLV/JdHoBo8BfKEnBU1ofctUuWzR9uymuYuqGoJTi+KBjkRd IKCbnb6q+qmpsSBNqxIZ7hfxpKFr0/P/1YoJ6c7PBN1odNpmHnKD9YC2InUSrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747785076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vn5IkqkuqpIZSRWtydWiLE5e1zHHNb4n07JOU0rtWQ=; b=bE9yUsjkPRKCSC8eOt8zSQlDbAhSmI1c/X55bqrqYnTFL7jkSMOaqyMbqdjDbAs+6u8dtP JjMZxS+jI09ZCrBbUK+4eWZQFakZ9kP+o+Ot3LTNhu4QU5YZ7498+a2zKWp0JYZxyTTsWm 6QA+0vRLimuaXIQHbvk6+rlwO+dj8jNRMxWQ/z1CttMt7lpnY0o7ltNTiRLc7XUCXIf+EN WhLwfo02ITdk+2nFjB/4F67xNqrMeVGrmcfbQL3WGePfaq1ipzmBrEjYVZ7g7T0YhtqkCN HTcz8Z/ovBTPzM58IZSzd9dkAbFgP/HY8UoDPDsYn+qauO6ExDfuaEpi7j9AOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747785076; a=rsa-sha256; cv=none; b=Y4B72yHWiKRvhTIEmqQr+w3xNhvmbuhzyPcWacK5Vq1cQZK2qOwqaDp2T07L4EV20q6d+a s3kfYXaQpTWNv8v215Cqzztuq41SBVXf+uw75/ZXtrAGWG9d4RloP8k9oIfuMKI7XQCYE9 0Fs3IzPfTHywzgQprwzyfeY/clI7UzMvOcJ9gYiuuLSdjxc1pPm614Mp/Hk3xnT032WY0b /L5aMgve2hXoevqfOukrGRni3yFzzSrrIz7ozK+stJVGoQ+LdX6XTrpy7+Zk70ERFWGMCy BBtZ8R1xrVNHtvfweYJYIGI1RW3zEQlBfyDoASuW5lVodoQtx9GNUJ4ZbspO3A== 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 4b2BCS2PHXz19N8; Tue, 20 May 2025 23:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54KNpGgE059129; Tue, 20 May 2025 23:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54KNpGV4059126; Tue, 20 May 2025 23:51:16 GMT (envelope-from git) Date: Tue, 20 May 2025 23:51:16 GMT Message-Id: <202505202351.54KNpGV4059126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3d2957336c7d - main - gve: Add callout to detect and handle TX timeouts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d2957336c7ddaa0a29cf60cfd458c07df1f5be9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d2957336c7ddaa0a29cf60cfd458c07df1f5be9 commit 3d2957336c7ddaa0a29cf60cfd458c07df1f5be9 Author: Jasper Tran O'Leary AuthorDate: 2025-05-20 23:34:45 +0000 Commit: Mark Johnston CommitDate: 2025-05-20 23:50:59 +0000 gve: Add callout to detect and handle TX timeouts A TX timeout occurs when the driver allocates resources on a TX queue for a packet to be sent, prompts the hardware to send the packet, but does not receive a completion for the packet within a given timeout period. An accumulation of TX timeouts can cause one or more queues to run out of space and cause the entire driver to become stuck. This commit adds a lockless timer service that runs periodically and checks queues for timed out packets. In the event we detect a timeout, we prompt the completion phase taskqueue to process completions. Upon the next inspection of the queue we still detect timed out packets, if the last "kick" occurred within a fixed cooldown window, we opt to reset the driver, even if the prior kick successfully freed timed out packets. Signed-off-by: Jasper Tran O'Leary Reviewed by: markj, ziaee MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50385 --- share/man/man4/gve.4 | 8 ++++- sys/dev/gve/gve.h | 47 +++++++++++++++++++++++++++++ sys/dev/gve/gve_main.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++-- sys/dev/gve/gve_sysctl.c | 6 +++- sys/dev/gve/gve_tx.c | 32 ++++++++++++++++++++ sys/dev/gve/gve_tx_dqo.c | 32 +++++++++++++++++++- sys/dev/gve/gve_utils.c | 43 ++++++++++++++++++++++++++ 7 files changed, 241 insertions(+), 5 deletions(-) diff --git a/share/man/man4/gve.4 b/share/man/man4/gve.4 index 754071e2fad8..924a01a06d08 100644 --- a/share/man/man4/gve.4 +++ b/share/man/man4/gve.4 @@ -26,7 +26,7 @@ .\" 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 October 14, 2024 +.Dd May 20, 2025 .Dt GVE 4 .Os .Sh NAME @@ -180,6 +180,12 @@ These messages are seen if any admin queue command fails: .It "Unknown AQ command opcode %d" .El .Pp +These messages appear if a TX timeout is detected: +.Bl -diag +.It "Found %d timed out packet(s) on txq%d, kicking it for completions" +.It "Found %d timed out packet(s) on txq%d with its last kick %ld sec ago which is less than the cooldown period %d. Resetting device" +.El +.Pp These messages are recorded when the device is being reset due to an error: .Bl -diag .It "Scheduling reset task!" diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index 5b298b889ed6..48e9a371df21 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -47,6 +47,21 @@ #define GVE_TX_MAX_DESCS 4 #define GVE_TX_BUFRING_ENTRIES 4096 +#define GVE_TX_TIMEOUT_PKT_SEC 5 +#define GVE_TX_TIMEOUT_CHECK_CADENCE_SEC 5 +/* + * If the driver finds timed out packets on a tx queue it first kicks it and + * records the time. If the driver again finds a timeout on the same queue + * before the end of the cooldown period, only then will it reset. Thus, for a + * reset to be able to occur at all, the cooldown must be at least as long + * as the tx timeout checking cadence multiplied by the number of queues. + */ +#define GVE_TX_TIMEOUT_MAX_TX_QUEUES 16 +#define GVE_TX_TIMEOUT_KICK_COOLDOWN_SEC \ + (2 * GVE_TX_TIMEOUT_CHECK_CADENCE_SEC * GVE_TX_TIMEOUT_MAX_TX_QUEUES) + +#define GVE_TIMESTAMP_INVALID -1 + #define ADMINQ_SIZE PAGE_SIZE #define GVE_DEFAULT_RX_BUFFER_SIZE 2048 @@ -337,6 +352,14 @@ struct gve_tx_fifo { struct gve_tx_buffer_state { struct mbuf *mbuf; + + /* + * Time at which the xmit tq places descriptors for mbuf's payload on a + * tx queue. This timestamp is invalidated when the mbuf is freed and + * must be checked for validity when read. + */ + int64_t enqueue_time_sec; + struct gve_tx_iovec iov[GVE_TX_MAX_DESCS]; }; @@ -357,12 +380,21 @@ struct gve_txq_stats { counter_u64_t tx_mbuf_defrag_err; counter_u64_t tx_mbuf_dmamap_enomem_err; counter_u64_t tx_mbuf_dmamap_err; + counter_u64_t tx_timeout; }; #define NUM_TX_STATS (sizeof(struct gve_txq_stats) / sizeof(counter_u64_t)) struct gve_tx_pending_pkt_dqo { struct mbuf *mbuf; + + /* + * Time at which the xmit tq places descriptors for mbuf's payload on a + * tx queue. This timestamp is invalidated when the mbuf is freed and + * must be checked for validity when read. + */ + int64_t enqueue_time_sec; + union { /* RDA */ bus_dmamap_t dmamap; @@ -396,6 +428,8 @@ struct gve_tx_ring { uint32_t req; /* free-running total number of packets written to the nic */ uint32_t done; /* free-running total number of completed packets */ + int64_t last_kicked; /* always-valid timestamp in seconds for the last queue kick */ + union { /* GQI specific stuff */ struct { @@ -594,6 +628,11 @@ struct gve_priv { struct gve_state_flags state_flags; struct sx gve_iface_lock; + + struct callout tx_timeout_service; + /* The index of tx queue that the timer service will check on its next invocation */ + uint16_t check_tx_queue_idx; + }; static inline bool @@ -652,6 +691,7 @@ int gve_alloc_tx_rings(struct gve_priv *priv, uint16_t start_idx, uint16_t stop_ void gve_free_tx_rings(struct gve_priv *priv, uint16_t start_idx, uint16_t stop_idx); int gve_create_tx_rings(struct gve_priv *priv); int gve_destroy_tx_rings(struct gve_priv *priv); +int gve_check_tx_timeout_gqi(struct gve_priv *priv, struct gve_tx_ring *tx); int gve_tx_intr(void *arg); int gve_xmit_ifp(if_t ifp, struct mbuf *mbuf); void gve_qflush(if_t ifp); @@ -662,6 +702,7 @@ void gve_tx_cleanup_tq(void *arg, int pending); int gve_tx_alloc_ring_dqo(struct gve_priv *priv, int i); void gve_tx_free_ring_dqo(struct gve_priv *priv, int i); void gve_clear_tx_ring_dqo(struct gve_priv *priv, int i); +int gve_check_tx_timeout_dqo(struct gve_priv *priv, struct gve_tx_ring *tx); int gve_tx_intr_dqo(void *arg); int gve_xmit_dqo(struct gve_tx_ring *tx, struct mbuf **mbuf_ptr); int gve_xmit_dqo_qpl(struct gve_tx_ring *tx, struct mbuf *mbuf); @@ -697,6 +738,12 @@ int gve_alloc_irqs(struct gve_priv *priv); void gve_unmask_all_queue_irqs(struct gve_priv *priv); void gve_mask_all_queue_irqs(struct gve_priv *priv); +/* Miscellaneous functions defined in gve_utils.c */ +void gve_invalidate_timestamp(int64_t *timestamp_sec); +int64_t gve_seconds_since(int64_t *timestamp_sec); +void gve_set_timestamp(int64_t *timestamp_sec); +bool gve_timestamp_valid(int64_t *timestamp_sec); + /* Systcl functions defined in gve_sysctl.c */ extern bool gve_disable_hw_lro; extern char gve_queue_format[8]; diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index 8a00deedef36..2abd9d1aa698 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -32,10 +32,10 @@ #include "gve_adminq.h" #include "gve_dqo.h" -#define GVE_DRIVER_VERSION "GVE-FBSD-1.3.3\n" +#define GVE_DRIVER_VERSION "GVE-FBSD-1.3.4\n" #define GVE_VERSION_MAJOR 1 #define GVE_VERSION_MINOR 3 -#define GVE_VERSION_SUB 3 +#define GVE_VERSION_SUB 4 #define GVE_DEFAULT_RX_COPYBREAK 256 @@ -50,6 +50,9 @@ static struct gve_dev { struct sx gve_global_lock; +static void gve_start_tx_timeout_service(struct gve_priv *priv); +static void gve_stop_tx_timeout_service(struct gve_priv *priv); + static int gve_verify_driver_compatibility(struct gve_priv *priv) { @@ -99,6 +102,72 @@ gve_verify_driver_compatibility(struct gve_priv *priv) return (err); } +static void +gve_handle_tx_timeout(struct gve_priv *priv, struct gve_tx_ring *tx, + int num_timeout_pkts) +{ + int64_t time_since_last_kick; + + counter_u64_add_protected(tx->stats.tx_timeout, 1); + + /* last_kicked is never GVE_TIMESTAMP_INVALID so we can skip checking */ + time_since_last_kick = gve_seconds_since(&tx->last_kicked); + + /* Try kicking first in case the timeout is due to a missed interrupt */ + if (time_since_last_kick > GVE_TX_TIMEOUT_KICK_COOLDOWN_SEC) { + device_printf(priv->dev, + "Found %d timed out packet(s) on txq%d, kicking it for completions\n", + num_timeout_pkts, tx->com.id); + gve_set_timestamp(&tx->last_kicked); + taskqueue_enqueue(tx->com.cleanup_tq, &tx->com.cleanup_task); + } else { + device_printf(priv->dev, + "Found %d timed out packet(s) on txq%d with its last kick %jd sec ago which is less than the cooldown period %d. Resetting device\n", + num_timeout_pkts, tx->com.id, + (intmax_t)time_since_last_kick, + GVE_TX_TIMEOUT_KICK_COOLDOWN_SEC); + gve_schedule_reset(priv); + } +} + +static void +gve_tx_timeout_service_callback(void *data) +{ + struct gve_priv *priv = (struct gve_priv *)data; + struct gve_tx_ring *tx; + uint16_t num_timeout_pkts; + + tx = &priv->tx[priv->check_tx_queue_idx]; + + num_timeout_pkts = gve_is_gqi(priv) ? + gve_check_tx_timeout_gqi(priv, tx) : + gve_check_tx_timeout_dqo(priv, tx); + if (num_timeout_pkts) + gve_handle_tx_timeout(priv, tx, num_timeout_pkts); + + priv->check_tx_queue_idx = (priv->check_tx_queue_idx + 1) % + priv->tx_cfg.num_queues; + callout_reset_sbt(&priv->tx_timeout_service, + SBT_1S * GVE_TX_TIMEOUT_CHECK_CADENCE_SEC, 0, + gve_tx_timeout_service_callback, (void *)priv, 0); +} + +static void +gve_start_tx_timeout_service(struct gve_priv *priv) +{ + priv->check_tx_queue_idx = 0; + callout_init(&priv->tx_timeout_service, true); + callout_reset_sbt(&priv->tx_timeout_service, + SBT_1S * GVE_TX_TIMEOUT_CHECK_CADENCE_SEC, 0, + gve_tx_timeout_service_callback, (void *)priv, 0); +} + +static void +gve_stop_tx_timeout_service(struct gve_priv *priv) +{ + callout_drain(&priv->tx_timeout_service); +} + static int gve_up(struct gve_priv *priv) { @@ -149,6 +218,9 @@ gve_up(struct gve_priv *priv) gve_unmask_all_queue_irqs(priv); gve_set_state_flag(priv, GVE_STATE_FLAG_QUEUES_UP); priv->interface_up_cnt++; + + gve_start_tx_timeout_service(priv); + return (0); reset: @@ -164,6 +236,8 @@ gve_down(struct gve_priv *priv) if (!gve_get_state_flag(priv, GVE_STATE_FLAG_QUEUES_UP)) return; + gve_stop_tx_timeout_service(priv); + if (gve_get_state_flag(priv, GVE_STATE_FLAG_LINK_UP)) { if_link_state_change(priv->ifp, LINK_STATE_DOWN); gve_clear_state_flag(priv, GVE_STATE_FLAG_LINK_UP); diff --git a/sys/dev/gve/gve_sysctl.c b/sys/dev/gve/gve_sysctl.c index f7c7b5803865..661f61918853 100644 --- a/sys/dev/gve/gve_sysctl.c +++ b/sys/dev/gve/gve_sysctl.c @@ -168,7 +168,7 @@ gve_setup_txq_sysctl(struct sysctl_ctx_list *ctx, &stats->tx_delayed_pkt_tsoerr, "TSO packets delayed due to err in prep errors"); SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, - "tx_mbuf_collpase", CTLFLAG_RD, + "tx_mbuf_collapse", CTLFLAG_RD, &stats->tx_mbuf_collapse, "tx mbufs that had to be collapsed"); SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, @@ -187,6 +187,10 @@ gve_setup_txq_sysctl(struct sysctl_ctx_list *ctx, "tx_mbuf_dmamap_err", CTLFLAG_RD, &stats->tx_mbuf_dmamap_err, "tx mbufs that could not be dma-mapped"); + SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, + "tx_timeout", CTLFLAG_RD, + &stats->tx_timeout, + "detections of timed out packets on tx queues"); } static void diff --git a/sys/dev/gve/gve_tx.c b/sys/dev/gve/gve_tx.c index b667df4ca06e..84e3a4c4eb9f 100644 --- a/sys/dev/gve/gve_tx.c +++ b/sys/dev/gve/gve_tx.c @@ -173,6 +173,8 @@ gve_tx_alloc_ring(struct gve_priv *priv, int i) } com->q_resources = com->q_resources_mem.cpu_addr; + tx->last_kicked = 0; + return (0); abort: @@ -218,6 +220,7 @@ gve_tx_clear_desc_ring(struct gve_tx_ring *tx) for (i = 0; i < com->priv->tx_desc_cnt; i++) { tx->desc_ring[i] = (union gve_tx_desc){}; tx->info[i] = (struct gve_tx_buffer_state){}; + gve_invalidate_timestamp(&tx->info[i].enqueue_time_sec); } bus_dmamap_sync(tx->desc_ring_mem.tag, tx->desc_ring_mem.map, @@ -344,6 +347,30 @@ gve_destroy_tx_rings(struct gve_priv *priv) return (0); } +int +gve_check_tx_timeout_gqi(struct gve_priv *priv, struct gve_tx_ring *tx) +{ + struct gve_tx_buffer_state *info; + uint32_t pkt_idx; + int num_timeouts; + + num_timeouts = 0; + + for (pkt_idx = 0; pkt_idx < priv->tx_desc_cnt; pkt_idx++) { + info = &tx->info[pkt_idx]; + + if (!gve_timestamp_valid(&info->enqueue_time_sec)) + continue; + + if (__predict_false( + gve_seconds_since(&info->enqueue_time_sec) > + GVE_TX_TIMEOUT_PKT_SEC)) + num_timeouts += 1; + } + + return (num_timeouts); +} + int gve_tx_intr(void *arg) { @@ -396,7 +423,10 @@ gve_tx_cleanup_tq(void *arg, int pending) if (mbuf == NULL) continue; + gve_invalidate_timestamp(&info->enqueue_time_sec); + info->mbuf = NULL; + counter_enter(); counter_u64_add_protected(tx->stats.tbytes, mbuf->m_pkthdr.len); counter_u64_add_protected(tx->stats.tpackets, 1); @@ -685,6 +715,8 @@ gve_xmit(struct gve_tx_ring *tx, struct mbuf *mbuf) /* So that the cleanup taskqueue can free the mbuf eventually. */ info->mbuf = mbuf; + gve_set_timestamp(&info->enqueue_time_sec); + /* * We don't want to split the header, so if necessary, pad to the end * of the fifo and then put the header at the beginning of the fifo. diff --git a/sys/dev/gve/gve_tx_dqo.c b/sys/dev/gve/gve_tx_dqo.c index 8a1993c3e712..bbf2ee1b0324 100644 --- a/sys/dev/gve/gve_tx_dqo.c +++ b/sys/dev/gve/gve_tx_dqo.c @@ -527,6 +527,8 @@ gve_alloc_pending_packet(struct gve_tx_ring *tx) tx->dqo.free_pending_pkts_csm = pending_pkt->next; pending_pkt->state = GVE_PACKET_STATE_PENDING_DATA_COMPL; + gve_set_timestamp(&pending_pkt->enqueue_time_sec); + return (pending_pkt); } @@ -539,6 +541,8 @@ gve_free_pending_packet(struct gve_tx_ring *tx, pending_pkt->state = GVE_PACKET_STATE_FREE; + gve_invalidate_timestamp(&pending_pkt->enqueue_time_sec); + /* Add pending_pkt to the producer list */ while (true) { old_head = atomic_load_acq_32(&tx->dqo.free_pending_pkts_prd); @@ -939,6 +943,29 @@ gve_handle_packet_completion(struct gve_priv *priv, return (pkt_len); } +int +gve_check_tx_timeout_dqo(struct gve_priv *priv, struct gve_tx_ring *tx) +{ + struct gve_tx_pending_pkt_dqo *pending_pkt; + int num_timeouts; + uint16_t pkt_idx; + + num_timeouts = 0; + for (pkt_idx = 0; pkt_idx < tx->dqo.num_pending_pkts; pkt_idx++) { + pending_pkt = &tx->dqo.pending_pkts[pkt_idx]; + + if (!gve_timestamp_valid(&pending_pkt->enqueue_time_sec)) + continue; + + if (__predict_false( + gve_seconds_since(&pending_pkt->enqueue_time_sec) > + GVE_TX_TIMEOUT_PKT_SEC)) + num_timeouts += 1; + } + + return (num_timeouts); +} + int gve_tx_intr_dqo(void *arg) { @@ -960,8 +987,11 @@ gve_tx_clear_desc_ring_dqo(struct gve_tx_ring *tx) struct gve_ring_com *com = &tx->com; int i; - for (i = 0; i < com->priv->tx_desc_cnt; i++) + for (i = 0; i < com->priv->tx_desc_cnt; i++) { tx->dqo.desc_ring[i] = (union gve_tx_desc_dqo){}; + gve_invalidate_timestamp( + &tx->dqo.pending_pkts[i].enqueue_time_sec); + } bus_dmamap_sync(tx->desc_ring_mem.tag, tx->desc_ring_mem.map, BUS_DMASYNC_PREWRITE); diff --git a/sys/dev/gve/gve_utils.c b/sys/dev/gve/gve_utils.c index 4e9dd4625e2f..707b8f039d88 100644 --- a/sys/dev/gve/gve_utils.c +++ b/sys/dev/gve/gve_utils.c @@ -439,3 +439,46 @@ gve_mask_all_queue_irqs(struct gve_priv *priv) gve_db_bar_write_4(priv, rx->com.irq_db_offset, GVE_IRQ_MASK); } } + +/* + * In some cases, such as tracking timeout events, we must mark a timestamp as + * invalid when we do not want to consider its value. Such timestamps must be + * checked for validity before reading them. + */ +void +gve_invalidate_timestamp(int64_t *timestamp_sec) +{ + atomic_store_64(timestamp_sec, GVE_TIMESTAMP_INVALID); +} + +/* + * Returns 0 if the timestamp is invalid, otherwise returns the elapsed seconds + * since the timestamp was set. + */ +int64_t +gve_seconds_since(int64_t *timestamp_sec) +{ + struct bintime curr_time; + int64_t enqueued_time; + + getbintime(&curr_time); + enqueued_time = atomic_load_64(timestamp_sec); + if (enqueued_time == GVE_TIMESTAMP_INVALID) + return (0); + return ((int64_t)(curr_time.sec - enqueued_time)); +} + +void +gve_set_timestamp(int64_t *timestamp_sec) +{ + struct bintime curr_time; + + getbintime(&curr_time); + atomic_store_64(timestamp_sec, curr_time.sec); +} + +bool +gve_timestamp_valid(int64_t *timestamp_sec) +{ + return (atomic_load_64(timestamp_sec) != GVE_TIMESTAMP_INVALID); +} From nobody Wed May 21 01:37:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2DZN4j84z5wZGG; Wed, 21 May 2025 01:37: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 4b2DZN3vR5z3tMn; Wed, 21 May 2025 01:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747791468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ihMzx579138MppWs15Z1Bttqs//6eDbuG/ukU0BweYg=; b=GxyJ7dch8VSBGSwbGN/vfiQSaqKxYNUvrSuiIhN0Y94VYjYdOSifTIUpsZmU6qIsGbDVOj iSm+V2m4QN75jsCo6CZTM1QtKrqQBntg16/XyZND+u9xXDTGaQRufL8FHSmAd4LWuHRu8E qyCHY8hReV6YBJCwp/m/17aOr7xiR9oB8kJWS1U5Otjg20p3+wzRgDANmNPiVUimUuP8TJ k9YPYcAmWSL4AYCQ6qYYnNkiTgHvLAVIV5LDF7EvGfyrjHFb4X+Bkmz+euQ7DB44Prt6aQ hADJAx6GTQfpKhgHnFngToNScfkX/2njdqp4iFyMrP2WrXSc4cbPzM5GVnfsKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747791468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ihMzx579138MppWs15Z1Bttqs//6eDbuG/ukU0BweYg=; b=PI3vFO9hfml5c+Ng/5qhoGU7ObjQcnmorZYIgyaJuukd+AyTktk/wBU9DpclXt6tXwx5u2 7SeV9OrqpBMlly6Fp8qmX6pZmzMlgKvWZzrCZcmEEzWTobptQQDJk7J9aa137UwX4Qf/Zj rEB6/dyWSwYXp6J5QdnbB5aCu5G/jH6yTC3LF3wUp5uFmdNzEzPuYRRLARgUZNe5S+sB1+ fnJ3JwUMUynxrLQkvY0dMypM0lCL5waj8C3SiQGRWIU/XYo/TZXFF0DAgGlksuQgJCM92t XNABRFWt/HWV0OWyN4huswDwot5VOHuqKycK6Gk/FCo0Dg8tGrP1pfijJhRzzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747791468; a=rsa-sha256; cv=none; b=Hy5WdWF8BvmV2aLa2N9a9a0FZrUmW9LzEljOqFNhkLfyDJ6emVixB+7vov8s0BUdziuAn7 F/DVHYrEXoYyNGlpxtuaYkDTusH/ULzJHiOY89rUJXuA98BLYBOavLyci+cOz9NBaBSwL/ 6fB1v77Tx2ATEtyBO9utxYUVmqXiF0SJdcqpV6JHe9a5+mtGqoE7FO9dj+1wa7ZFKEBVz/ 5IaIGqPDXor8FXGmOqTPTfYygAt8TE7zG8aaU35WUJGl1X6dcgPv8p8I63FQ6URiTX7ufs IdXlaHqlvi6XSGE42I5hJbsIZ/UnYgUk64fBkO9L4P3yLm+miRu9eI7CRXdM+A== 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 4b2DZN3Vcnz1V; Wed, 21 May 2025 01:37: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 54L1bmUi052623; Wed, 21 May 2025 01:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54L1bmpr052620; Wed, 21 May 2025 01:37:48 GMT (envelope-from git) Date: Wed, 21 May 2025 01:37:48 GMT Message-Id: <202505210137.54L1bmpr052620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 137de4b34d45 - main - Merge commit '2a7e45eef31292cf9dd82caf3346eb2acb5b6225' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 137de4b34d45192985e21f6d6163533da547fbac Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=137de4b34d45192985e21f6d6163533da547fbac commit 137de4b34d45192985e21f6d6163533da547fbac Merge: 3d2957336c7d 2a7e45eef312 Author: Kyle Evans AuthorDate: 2025-05-21 01:36:07 +0000 Commit: Kyle Evans CommitDate: 2025-05-21 01:36:07 +0000 Merge commit '2a7e45eef31292cf9dd82caf3346eb2acb5b6225' Update wireguard-tools to the latest version, which has some stubbed out support for incremental Allowed-IPs updates that we would need to add kernel support for. contrib/wireguard-tools/config.c | 23 +++++++++++++++++++++++ contrib/wireguard-tools/containers.h | 5 +++++ contrib/wireguard-tools/ipc-freebsd.h | 5 +++++ contrib/wireguard-tools/ipc-uapi.h | 2 +- contrib/wireguard-tools/man/wg.8 | 8 ++++++-- contrib/wireguard-tools/set.c | 2 +- contrib/wireguard-tools/show.c | 4 ++-- contrib/wireguard-tools/version.h | 2 +- 8 files changed, 44 insertions(+), 7 deletions(-) From nobody Wed May 21 02:55:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2GJB5gN4z5wftW; Wed, 21 May 2025 02:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2GJB59KBz40T9; Wed, 21 May 2025 02:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747796138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YfeTr5MeRJIgbGaZHyl4hwo9K0AzFCC4o8fupWxdcdo=; b=kXF+3ZD95PXlkuH02/IIBXaERN6tHRseTf3SrDawIwb/bbfZiuPv5hfHvZTNkYgxiZW+/s lGfhe1ox71R1y7ZjQ+7FYs0NXxTp4TCngUncXKqz9GCzlibZjfcNPqwoIurIM/aP5AjJif HAAecczxrwgTyEO9kAZVSBLY+dxTLpJyIBEnwqNTu8LDywLSJEZb9FXuXmpBcl3W9lRSZS q2L5cgCnBv4D33oJAR1kQpJs/69CMz6OoFwT/wdMmOQFo0K18Vi2A8O4P0tv9QpMx2RneT NSZPgN9+i6gTyhzqzwHJH1EgM6JfepLX47vtHuRPftpAI1J+L/KBbyRNCBq63Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747796138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YfeTr5MeRJIgbGaZHyl4hwo9K0AzFCC4o8fupWxdcdo=; b=tEs/LWGCwGiPtQukPOt9DP3NAFCVhsh7TpfDAwGzMW/QwnPYa9PACY+TUXBSa0eaogt3mR AYvyQeohgczubLGbKIT73xr0igvWKjL5f708ES+4DErPc/yhsYlQJPPvPAH3CnTLqu8Vje f23zek/oOrmItBaqd0YO2VYay9lM8uLBTGEriJj0R4eO0ZvZaTJs+rji9/eb3XMwN8d6Ik IvH6gCi7ZqQW+de4vNXmX1rtY1pBFALabPsqDJS3RJDTB0kQqknaiKvck8KLxj8AYOkkjF CqHRgiaL9qgID2f91eXydIFZzI/ze9lfgqDafbuJPdtwHApaXl2ahCzwrxqZoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747796138; a=rsa-sha256; cv=none; b=Sf86F8Lkr9c6gGhrP5M4rgzICwvFEz0O9bLCAOVr7LryPkrVRf0BmVhFc8f4/c5jHiRENR lJ4TFgxo690WVnevidpqk5QkvHb4N8zW6X6c+8IhNMYzm1+r7UaOqJGTMKEAbmf8jqmy5l MxfiCIBjtlVfly0ybRVaBEiSJ8vNMxc9cKj/CnSwdBxvgqTn3bnt9FeeW8755B3Vn5otDo 33fO/Sk0K6Zwp9C8W8A9rgXyaVfaL1qKid/8WlZRZtYzls1ZIf5VPwH4Zh9D0O80EnNuoC t5TEDnFmwsT2szar1fjtZS61hJTbfhBKegkvBZXDk2hGlcarZooLY8WQf1nVmQ== 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 4b2GJB4Q3Xz2Fk; Wed, 21 May 2025 02:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54L2tcE5001539; Wed, 21 May 2025 02:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54L2tcGP001536; Wed, 21 May 2025 02:55:38 GMT (envelope-from git) Date: Wed, 21 May 2025 02:55:38 GMT Message-Id: <202505210255.54L2tcGP001536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d5566d755694 - main - rpc.tlsservd: fix on a machine with just one CPU List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5566d755694b0efeef9b0e0ff839ee5b3ef43bd Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d5566d755694b0efeef9b0e0ff839ee5b3ef43bd commit d5566d755694b0efeef9b0e0ff839ee5b3ef43bd Author: Gleb Smirnoff AuthorDate: 2025-05-21 00:52:44 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-21 02:54:38 +0000 rpc.tlsservd: fix on a machine with just one CPU Reported by: rmacklem Fixes: 8e5f80da89d74a5ef429b34bb9c3f8b589f8da9a --- usr.sbin/rpc.tlsservd/rpc.tlsservd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c index 438b745fb5de..f07385a2baa7 100644 --- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c +++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c @@ -167,7 +167,8 @@ main(int argc, char **argv) } rpctls_verbose = false; - rpctls_maxthreads = (ncpu = (u_int)sysconf(_SC_NPROCESSORS_ONLN)) / 2; + ncpu = (u_int)sysconf(_SC_NPROCESSORS_ONLN); + rpctls_maxthreads = ncpu > 1 ? ncpu / 2 : 1; while ((ch = getopt_long(argc, argv, "2C:D:dhl:N:n:mp:r:uvWw", longopts, NULL)) != -1) { From nobody Wed May 21 02:55:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2GJD5Hdbz5wg2X; Wed, 21 May 2025 02:55: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 4b2GJD3qGhz40FB; Wed, 21 May 2025 02:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747796140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+pjl2gWKg5dIfDD2oDdWe2yOtCkY7QvkW/8xB3zG444=; b=mXfEsh+Lw2MeZKw3a5p5tTGZvPj60b27RWxNp+GjZudy4ER4tUFHMsDRfmx9FRDEGcfevh fZXRVbyFn/3hsxvDB5cQnBVsre5Qv0u7HU8Hg3J3IYE55cmLaK9FFbjC9pLtNbmrCbNZM0 CM6hLxKb8EfJ40xxUy18VMo02GnbdHHI37EFmZyrmALOCFQmAtJdzwdfe1HMEUep0IlT32 1FGteHLhB5RMwYJEt344IuJgm1f0xSzLvi819w9Hpb7SAT+D2nxmjLvgDKm22ljavIDpRH gl9SGQ2gVat7L5JR4dWJEIW8DKPyXsWU8aGvtk+Prr1x8PDkk2jPV0qYgtUZlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747796140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+pjl2gWKg5dIfDD2oDdWe2yOtCkY7QvkW/8xB3zG444=; b=UZC7E6SOL9nJyCoqbKRd1aJiq2s5cW0Keg/+Hk9MB6qnY399VVDZVZjpYQ1skGNR2ZSaQi hOPkxApdMmaIQYV7RV5wG8pj3rqHQT7M0B8CrQFRA1gJwCUmohHksvJ3w8p8OZlg5q+SbZ 92bCkvQqOdoi5fJpCXZDrIrDyMzMPVvpEyo5BPR85oroPwHK8PTr4PmRo70+gDMI5iYhAa JaR1jiObdOl7iJT0AEvxd054zu0xd6TzMH9PpT4tE5R7xVHmTYDHaW7L6rcD+e3xRA4bMM PoQpXP6H4/9GE/AnI9jJrqWiQvd6fTN9BhIiCnqEQxdZRjwPvxGn0i7IZgB2QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747796140; a=rsa-sha256; cv=none; b=xpumTerJKXpSQwQvqRSbaZ3lnaSBRvXy9zzLyhnGAzrz5qKMPyyvi9YVfE20itv74VF0Iu MZuzW2h/ao68T3/SxAI/K0z0sJmVIYHFE3MdCcJR32p8RygWjyeb50M5Rjv3F61RMr0BcU TKB4xH4ZlptJLOOAZ7YZQKjNvjRVvEyUV5R5pW0Ive7wyFwWp+nPflkW90rtWGuHIQDLkq k0EYUVi+JaycJu86AuEC0ra1iRWepso2JIWxFLy3R0DHBCmTjP9VEDsjbcbDNPeyyhJKhL SOBkS2IrEwqhxUWF8Tfy7UnXeWVZQn8mD05PPRz8sGIufcZL6+PMomfC7Cvqzg== 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 4b2GJC4k5xz2Fl; Wed, 21 May 2025 02:55: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 54L2tdeS001574; Wed, 21 May 2025 02:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54L2tdkb001571; Wed, 21 May 2025 02:55:39 GMT (envelope-from git) Date: Wed, 21 May 2025 02:55:39 GMT Message-Id: <202505210255.54L2tdkb001571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: eafe5967ac55 - main - unix: fix EVFILT_WRITE when peer close(2)s and shutdown(2)s List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eafe5967ac558de142d91660e18e9238289890e3 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=eafe5967ac558de142d91660e18e9238289890e3 commit eafe5967ac558de142d91660e18e9238289890e3 Author: Gleb Smirnoff AuthorDate: 2025-05-21 00:30:57 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-21 02:54:51 +0000 unix: fix EVFILT_WRITE when peer close(2)s and shutdown(2)s For the close(2) case restore reporting the event with EV_EOF set. This fixes bug 286692. For the shutdown(2) case restore original behavior, but leave comment that we may want to change that. The d15792780760 was not intended to bring in functional API changes. Provide tests for both cases. PR: 286692 Fixes: d15792780760ef94647af9b377b5f0a80e1826bc --- sys/kern/uipc_usrreq.c | 16 ++++++++++++--- tests/sys/kern/unix_stream.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 0836652b6a24..164030eec7ab 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1767,16 +1767,26 @@ uipc_filt_sowrite(struct knote *kn, long hint) struct socket *so = kn->kn_fp->f_data, *so2; struct unpcb *unp = sotounpcb(so), *unp2 = unp->unp_conn; - if (SOLISTENING(so) || unp2 == NULL) + if (SOLISTENING(so)) return (0); + if (unp2 == NULL) { + if (so->so_state & SS_ISDISCONNECTED) { + kn->kn_flags |= EV_EOF; + kn->kn_fflags = so->so_error; + return (1); + } else + return (0); + } + so2 = unp2->unp_socket; SOCK_RECVBUF_LOCK_ASSERT(so2); kn->kn_data = uipc_stream_sbspace(&so2->so_rcv); if (so2->so_rcv.sb_state & SBS_CANTRCVMORE) { - kn->kn_flags |= EV_EOF; - kn->kn_fflags = so->so_error; + /* + * XXXGL: maybe kn->kn_flags |= EV_EOF ? + */ return (1); } else if (kn->kn_sfflags & NOTE_LOWAT) return (kn->kn_data >= kn->kn_sdata); diff --git a/tests/sys/kern/unix_stream.c b/tests/sys/kern/unix_stream.c index 7aedf462dcce..9f750967ebf8 100644 --- a/tests/sys/kern/unix_stream.c +++ b/tests/sys/kern/unix_stream.c @@ -279,6 +279,52 @@ ATF_TC_BODY(unconnected_writability, tc) close(s); } +ATF_TC_WITHOUT_HEAD(peerclosed_writability); +ATF_TC_BODY(peerclosed_writability, tc) +{ + struct kevent kev; + int sv[2], kq; + + do_socketpair(sv); + close(sv[1]); + + check_writable_select(sv[0], 1, false); + check_writable_poll(sv[0], 1, false); + + ATF_REQUIRE(kq = kqueue()); + EV_SET(&kev, sv[0], EVFILT_WRITE, EV_ADD, 0, 0, NULL); + ATF_REQUIRE(kevent(kq, &kev, 1, &kev, 1, NULL) == 1); + ATF_REQUIRE(kev.ident == (uintptr_t)sv[0] && + kev.filter == EVFILT_WRITE && + kev.flags == EV_EOF); + + close(sv[0]); +} + +ATF_TC_WITHOUT_HEAD(peershutdown_writability); +ATF_TC_BODY(peershutdown_writability, tc) +{ + int sv[2]; + + do_socketpair(sv); + shutdown(sv[1], SHUT_RD); + + check_writable_select(sv[0], 1, false); + check_writable_poll(sv[0], 1, false); + /* + * XXXGL: historically unix(4) sockets were not reporting peer's + * shutdown(SHUT_RD) as our EV_EOF. The kevent(2) manual page says + * "filter will set EV_EOF when the reader disconnects", which is hard + * to interpret unambigously. For now leave the historic behavior, + * but we may want to change that in uipc_usrreq.c:uipc_filt_sowrite(), + * and then this test will look like the peerclosed_writability test. + */ + check_writable_kevent(sv[0], 1, false); + + close(sv[0]); + close(sv[1]); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, getpeereid); @@ -288,6 +334,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, full_writability_select); ATF_TP_ADD_TC(tp, full_writability_poll); ATF_TP_ADD_TC(tp, full_writability_kevent); + ATF_TP_ADD_TC(tp, peerclosed_writability); + ATF_TP_ADD_TC(tp, peershutdown_writability); return atf_no_error(); } From nobody Wed May 21 03:19:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2Gr539xlz5wh7y; Wed, 21 May 2025 03:19: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 4b2Gr51wY8z42Gr; Wed, 21 May 2025 03:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747797589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3CxJY82KmTnBJx1wfwnmh3Upbkv2O2yB9aDdoLgWUHQ=; b=xGhqxGyCtLg/miMYRvLZgl9nRhqnTlmuD7hJzCiPmABREJ6LTTFsWzqCxxUOzsTLHwZh1N llWcSth/eKZfoEjVS1K1HtIG4UCRPtF02Bg/Vj8SPgJ7y7b0anS2X/O+n2hxkVB6fwTfk6 s3SEkYRspxy+nGaw6qDg+JOJ/BQUVoi6+osfXIOHeNuGlARlujd+pAN47qolHT/JAmLKyK 85uxNnIrZg8ZtGIZh5z3ZPJHk6wsn4zCCYGTGClzLdLI4d1OUi6sXBmiwOQFM10sf4Ryv2 CqBRBHypfxfsE13IO/BcXbodO2cDkBsR2flohpwMD/hmtm+tckHRG9t0KM4FnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747797589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3CxJY82KmTnBJx1wfwnmh3Upbkv2O2yB9aDdoLgWUHQ=; b=oirkI+nGjFBKyW9VGAtmDYK1v4+q662DG6f+criFQdKtB24fsLoRWhHejVa+Oo0/0ustIg OqF17JZlBpZJfbWrlmAJ4T7nf3HoMHQmWrI7HWBC1oA5S84LCs6jA3C/YKp8QgsUv2AB9B BOavFEpB6f5Qkq0iGviXHvSTGtJ32rJIrrgC/oqTrQ/FNnHAWWmJcGGtedAmJ+YcVfpGXA ocDrP484mpIF8C7rZvRdEkrO95SV4zHROpz01gtLPxvhNcZki2ZpCsVB44GCEdCuLP+pSn LLHfeiliqodZBd6asH9dZzHj3KSIdUAi1ZT3j/8J1Bc3JAUDc+uHM8qjh/Oeag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747797589; a=rsa-sha256; cv=none; b=JxyYMWvRDb8dhWtx2Sn7tbQINV5Aw6+1BFyAlZ6bmTnkwjDA3NG62xI0y6w02r7Gp+llg7 nR6ZKZZW/s2K0q2di49yDIIeqwkqzdUXMCW+Modg8FC0ztg86mdlmMRO8Bht7eOah+zf5x KC1obb7I7/Jq0WNHWdqcNhuyXzZX7+TDLr56Dr6qB6hyx0mVhGkg/Aua2zpMlpxWnfZKUn kX8DGRhZ0UXZPxaUIqAKo1ObqVZ7QbMEg8mO3TJcFnP3p/X/MpcAPisFyJqVloYShWPlmR E8Bx39PQundUA64j9tjjR5zrZ2i2FRitxLGQPn8stfhZZ9A6cwbiv4BfrDDNdA== 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 4b2Gr50ybXz237; Wed, 21 May 2025 03:19: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 54L3Jmu2043405; Wed, 21 May 2025 03:19:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54L3JmhL043402; Wed, 21 May 2025 03:19:48 GMT (envelope-from git) Date: Wed, 21 May 2025 03:19:48 GMT Message-Id: <202505210319.54L3JmhL043402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 059fbe9a716d - main - elf.5: Add NT_FREEBSD_FCTL_LA48 and NT_FREEBSD_FCTL_LA57 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 059fbe9a716d5023d559424bf2ab2aa62eae6ec8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=059fbe9a716d5023d559424bf2ab2aa62eae6ec8 commit 059fbe9a716d5023d559424bf2ab2aa62eae6ec8 Author: Ed Maste AuthorDate: 2025-05-21 01:42:15 +0000 Commit: Ed Maste CommitDate: 2025-05-21 03:19:29 +0000 elf.5: Add NT_FREEBSD_FCTL_LA48 and NT_FREEBSD_FCTL_LA57 Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50443 --- share/man/man5/elf.5 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5 index 5bd71efcb56c..bd12f5e52df0 100644 --- a/share/man/man5/elf.5 +++ b/share/man/man5/elf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 25, 2022 +.Dd May 20, 2025 .Dt ELF 5 .Os .Sh NAME @@ -1384,6 +1384,10 @@ Disable stack gap. .It NT_FREEBSD_FCTL_WXNEEDED Pq Value: 0x08 Indicate that the binary requires mappings that are simultaneously writeable and executable. +.It NT_FREEBSD_FCTL_LA48 Pq Value: 0x10 +Request 48-bit linear address space on amd64. +.It NT_FREEBSD_FCTL_LA57 Pq Value: 0x40 +Accept 57-bit linear address space on amd64. .El .El .Sh SEE ALSO From nobody Wed May 21 05:48:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2L7k2kxWz5wsl9; Wed, 21 May 2025 05:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2L7k21Nrz4JJP; Wed, 21 May 2025 05:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747806514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hv6Sq6O6sbcJS8h8rle/JCwnf6UJ5z0b69JJVR+OArQ=; b=Dx/mzNg6sQXqIXUrfbagw9xUFGOSRpKJK3yovwO9Z00f562vAwKYGV4fN8VYHay13UtksA eKyv8hGjVJmEgnSP8LI3yT4KLeZLb37DHXT9Ve2q5ot1jPSCfL0uRLeLLkDWDhUJ6PPFFN J1rzBG//oQF64d571+zHn2UkOZFkFDa6zaUJTkWlHVV15+ttL3c6go1/39YXZjR7RFfU8E EqIFObwjomECYGFCkaGjcQH2SLYTRgtADrSR97W09ot3Rr0joaGHQ7dYLncAsKxbM07VMk wO4wYAsLE3/8b2CK4vopIzj5CruIyiyTo18lzVyJXfIzYfOQToFQLKxCmxL9nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747806514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hv6Sq6O6sbcJS8h8rle/JCwnf6UJ5z0b69JJVR+OArQ=; b=Nv7AlkeplpbWGYEcZhl+wcWk4VYFG3qLI66/mPcqMY1ruy8tgn8btTQBJE6lLYqZL75cv5 7zLBFkL1I4+p8Sph/9byTf3+/XffWxVFybeoOklZBzynFHu4BXfKF1x2Z2tmkRFJKXTo95 GRPV+Sm8mOXLFY87GJhwMdo/uRXoe5NiQSI8jgri3CdrWBp716npqifwPts9XVskhAuuAH UIQlj6tF7EW2NtWHxWL9yJnG7H/3gpInrfhYNGmUMAgHc/fbpKaJi0EGlk3BunCWhUI+48 RBgEIPHOVtg+R61U/AvPpVzykZpYo3W45mEPSVwX6vTE5+MXo0L/CYn85LvTQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747806514; a=rsa-sha256; cv=none; b=Zat6k5LHrf+y5+YG7CVVzFqcF6qYwOVAcSDMqqnKh+Zn6+eCRsrESyv0NXY3e0izBa+RH5 P/x4gr4flu9Sor09EshietN3V/ikl48q63OCzBSwfOJnu+dhv5kHSa2kUpZlPNz1OlU9XH F65l9hoAmwTqAJlk+Hhv6r8Nqj/+nVR8bqwNKuzNVU2DiPZ7LiWTD0S5u6wTYmTmt4qrQk 5XaIfyRveNqlnJYKBAwqPMmhi0FfE9AnSy5jRWJ4mv3OgjbgpF/yNTN5m0UGOgrPWISbGQ xxKroQvi8d5WD3arVhJ/+GBB2uLC/0CO/KYsP/8dae8AF5jtHjy8hPALMpTa3A== 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 4b2L7k1cScz6hF; Wed, 21 May 2025 05:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54L5mYTA022944; Wed, 21 May 2025 05:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54L5mYMs022941; Wed, 21 May 2025 05:48:34 GMT (envelope-from git) Date: Wed, 21 May 2025 05:48:34 GMT Message-Id: <202505210548.54L5mYMs022941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 59ee9260e6bb - main - ifconfig: reject netmask and broadcast for inet6 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59ee9260e6bbcc3b5654126eed6e9490315c81f1 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=59ee9260e6bbcc3b5654126eed6e9490315c81f1 commit 59ee9260e6bbcc3b5654126eed6e9490315c81f1 Author: Lexi Winter AuthorDate: 2025-05-21 03:59:59 +0000 Commit: Lexi Winter CommitDate: 2025-05-21 05:46:17 +0000 ifconfig: reject netmask and broadcast for inet6 We don't support setting netmask or broadcast address for INET6 addresses, and trying to do crashes ifconfig. Handle this the same way as af_link, by rejecting attempts to configure these parameters. PR: 286910 Reported by: Hayzam Sherif MFC after: 3 days Reviewed by: zlei, kevans, des, cy Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50413 --- sbin/ifconfig/af_inet6.c | 5 +++ sbin/ifconfig/tests/Makefile | 7 ++-- sbin/ifconfig/tests/inet6.sh | 84 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index fcd04139a8c1..17dc068ee875 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -428,6 +428,11 @@ in6_getaddr(const char *addr_str, int which) { struct in6_px *px = sin6tab_nl[which]; + if (which == MASK) + errx(1, "netmask: invalid option for inet6"); + if (which == BRDADDR) + errx(1, "broadcast: invalid option for inet6"); + px->set = true; px->plen = 128; if (which == ADDR) { diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile index ff545f603085..e902f262552a 100644 --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,5 +1,8 @@ -NETBSD_ATF_TESTS_SH= nonexistent_test +NETBSD_ATF_TESTS_SH= nonexistent_test +ATF_TESTS_SH+= inet6 -.include +TEST_METADATA+= execenv="jail" +TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" +.include .include diff --git a/sbin/ifconfig/tests/inet6.sh b/sbin/ifconfig/tests/inet6.sh new file mode 100644 index 000000000000..cf7f97e01d79 --- /dev/null +++ b/sbin/ifconfig/tests/inet6.sh @@ -0,0 +1,84 @@ +#! /bin/sh +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2025 Lexi Winter + +. $(atf_get_srcdir)/../../sys/common/vnet.subr + +# Bug 286910: adding 'netmask' or 'broadcast' to an IPv6 address crashed +# ifconfig. + +atf_test_case "netmask" "cleanup" +netmask_head() +{ + atf_set descr "Test invalid 'netmask' option" + atf_set require.user root +} + +netmask_body() +{ + vnet_init + + ep=$(vnet_mkepair) + vnet_mkjail ifcjail ${ep}a + + # Add the address the wrong way + atf_check -s exit:1 \ + -e match:"ifconfig: netmask: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1 netmask 64 + + # Add the address the correct way + atf_check -s exit:0 \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1/64 + atf_check -s exit:0 -o match:"2001:db8:1::1 prefixlen 64" \ + jexec ifcjail ifconfig ${ep}a + + # Remove the address the wrong way + atf_check -s exit:1 \ + -e match:"ifconfig: netmask: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1 netmask 64 -alias +} + +netmask_cleanup() +{ + vnet_cleanup +} + +atf_test_case "broadcast" "cleanup" +broadcast_head() +{ + atf_set descr "Test invalid 'broadcast' option" + atf_set require.user root +} + +broadcast_body() +{ + vnet_init + + ep=$(vnet_mkepair) + vnet_mkjail ifcjail ${ep}a + + atf_check -s exit:1 \ + -e match:"ifconfig: broadcast: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a \ + inet6 2001:db8:1::1 broadcast 2001:db8:1::ffff + + atf_check -s exit:0 \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1/64 + + atf_check -s exit:1 \ + -e match:"ifconfig: broadcast: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a \ + inet6 2001:db8:1::1 broadcast 2001:db:1::ffff -alias +} + +broadcast_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case netmask + atf_add_test_case broadcast +} From nobody Wed May 21 10:12:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2S0Q6RgPz5x9GC; Wed, 21 May 2025 10:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2S0Q5WhMz3GhW; Wed, 21 May 2025 10:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747822358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AG7a5wHmnTI9c9Wh19N1bmNU6dWV771FjsRKzuXW57o=; b=R5B9YbjZCfoBKVVU7zU18fEJ2eN2RxUR9nPmFG3d5PwMc2Kfi/c5Kqy9KfjOyctwCE/LXt tQhR52EHj+IFurXM2A2PzIe1p8WCI41LEpow4HOZU8t8H6NX8PMexfr571qlaz5/gkkplV l7gytxTxVEneJg9UjocMRIkvkKKmC+/O9aAlzSRNuKSvfIJhpMEDkqg11CztPkr3lpYPH6 tFcAXSO1Q8PcLqxRx73fXM4ReT43xNZ+durHlo1RyxlIhIhrz+NQrV95UAexlAg/x8jOYq +o7/JNaKih9EkfHZHNu3X0Nt3i6A92p83ttG6Pj5Y9L4hv4ykq9aYp7gehicHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747822358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AG7a5wHmnTI9c9Wh19N1bmNU6dWV771FjsRKzuXW57o=; b=YBe32Zbh++f6PzheZ5R+nnAgTO0ENzB4pHlnstvdN88fYoNFrduJKAD+r8y7yzQDTWLOGi zCi2Fj6a5v1VcwdktEvBqnocOjINYXCSjxFUXu3JXeGkDZwHuzPwECBCfQL6bKQEYm40ZU yXDuFoIUv/56Kr0YXRWdGQJoT4k56rjj1XAjfHXITOv2wIN2cGtpmC/XIo3wCQrX8q0UkC e/P+BHa0pvynAciCPlanQp2dVD4dkA57J/GS4jTX2s2zX8dMru3ZDhsnOXtcLnZm2iw7NO PAa39nGg2FuQEDNXKo1o3uo1nOYP4p6Ak0sXhdIhvf+reBy/z/kFljFtCHNmKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747822358; a=rsa-sha256; cv=none; b=MrasIgaGRdVq3RmHFXOE+NvokZopmpXziMdmrdslA+4c1Rr7HAgbckQaa4JB/bR85WGIoN 75Pmzxb/JId7TeK1DGkYSzHIZULQXgAu5e8aZZJ+5oDFlWG26/hHOCaeDxIbYrwxsuNUA9 47KCSET4nEwJGvbh6/TNHtddUqzqNyzAQ/b4gnG4bFh/jwlNhdjre3uD1dCi8OtdqwqX4R uK/TtmEZaXSxXQcvqD/+uCPc35645XGOsjG/daYwr5a5FEXCQ9b+s6EzRfeTo3H3TQKkcH jBztrZbJbO97kPPMCUmQQSffdkNDAxhzsb6Ty/zbvYcGCO7Vry4oRr7Ov6fbNw== 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 4b2S0Q4xy0zVcr; Wed, 21 May 2025 10:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54LACcbs028928; Wed, 21 May 2025 10:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LACcdT028925; Wed, 21 May 2025 10:12:38 GMT (envelope-from git) Date: Wed, 21 May 2025 10:12:38 GMT Message-Id: <202505211012.54LACcdT028925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: e64fe5ad3a23 - main - netinet6: Remove a set but not used global variable in6_maxmtu List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e64fe5ad3a23a9f471ebf11e04e490588913c7af Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e64fe5ad3a23a9f471ebf11e04e490588913c7af commit e64fe5ad3a23a9f471ebf11e04e490588913c7af Author: Zhenlei Huang AuthorDate: 2025-05-21 10:09:01 +0000 Commit: Zhenlei Huang CommitDate: 2025-05-21 10:09:01 +0000 netinet6: Remove a set but not used global variable in6_maxmtu and its setter in6_setmaxmtu(). This variable was introduced by the KAME projec [1]. It holds the max IPv6 MTU through all the interfaces, but is never used anywhere. [1] 82cd038d51e2 KAME netinet6 basic part(no IPsec,no V6 Multicast Forwarding, no UDP/TCP for IPv6 yet) Reviewed by: glebius MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D49357 --- sys/netinet6/in6.c | 25 ------------------------- sys/netinet6/in6_ifattach.c | 6 ------ sys/netinet6/in6_var.h | 4 ---- sys/netinet6/nd6.c | 4 ---- sys/netinet6/nd6_rtr.c | 8 ++------ 5 files changed, 2 insertions(+), 45 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 62d00196e56b..ce0655408a28 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2112,31 +2112,6 @@ in6if_do_dad(struct ifnet *ifp) return (1); } -/* - * Calculate max IPv6 MTU through all the interfaces and store it - * to in6_maxmtu. - */ -void -in6_setmaxmtu(void) -{ - struct epoch_tracker et; - unsigned long maxmtu = 0; - struct ifnet *ifp; - - NET_EPOCH_ENTER(et); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - /* this function can be called during ifnet initialization */ - if (!ifp->if_afdata[AF_INET6]) - continue; - if ((ifp->if_flags & IFF_LOOPBACK) == 0 && - IN6_LINKMTU(ifp) > maxmtu) - maxmtu = IN6_LINKMTU(ifp); - } - NET_EPOCH_EXIT(et); - if (maxmtu) /* update only when maxmtu is positive */ - V_in6_maxmtu = maxmtu; -} - /* * Provide the length of interface identifiers to be used for the link attached * to the given interface. The length should be defined in "IPv6 over diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 11e9cba81332..1b5a38ba412a 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -70,8 +70,6 @@ #include #include -VNET_DEFINE(unsigned long, in6_maxmtu) = 0; - #ifdef IP6_AUTO_LINKLOCAL VNET_DEFINE(int, ip6_auto_linklocal) = IP6_AUTO_LINKLOCAL; #else @@ -731,10 +729,6 @@ in6_ifattach(struct ifnet *ifp, struct ifnet *altifp) else ifa_free(&ia->ia_ifa); } - - /* update dynamically. */ - if (V_in6_maxmtu < ifp->if_mtu) - V_in6_maxmtu = ifp->if_mtu; } /* diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 969625a58934..918a3abe426e 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -549,9 +549,6 @@ do { \ ((ifp)->if_afdata[AF_INET6]))->in6_ifstat[ \ offsetof(struct in6_ifstat, tag) / sizeof(uint64_t)], 1);\ } while (/*CONSTCOND*/ 0) - -VNET_DECLARE(unsigned long, in6_maxmtu); -#define V_in6_maxmtu VNET(in6_maxmtu) #endif /* _KERNEL */ /* @@ -875,7 +872,6 @@ void in6_domifdetach(struct ifnet *, void *); int in6_domifmtu(struct ifnet *); struct rib_head *in6_inithead(uint32_t fibnum); void in6_detachhead(struct rib_head *rh); -void in6_setmaxmtu(void); int in6_if2idlen(struct ifnet *); struct in6_ifaddr *in6ifa_ifpforlinklocal(struct ifnet *, int); struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, const struct in6_addr *); diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 887da1ebe21a..6ec5a8b54cf4 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -379,10 +379,6 @@ nd6_setmtu0(struct ifnet *ifp, struct nd_ifinfo *ndi) "new link MTU on %s (%lu) is too small for IPv6\n", if_name(ifp), (unsigned long)ndi->maxmtu); } - - if (ndi->maxmtu > V_in6_maxmtu) - in6_setmaxmtu(); /* check all interfaces just in case */ - } void diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 845f9094f4c4..c145af7d3ffc 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -553,12 +553,8 @@ nd6_ra_input(struct mbuf *m, int off, int icmp6len) maxmtu = (ndi->maxmtu && ndi->maxmtu < ifp->if_mtu) ? ndi->maxmtu : ifp->if_mtu; if (mtu <= maxmtu) { - int change = (ndi->linkmtu != mtu); - - ndi->linkmtu = mtu; - if (change) { - /* in6_maxmtu may change */ - in6_setmaxmtu(); + if (ndi->linkmtu != mtu) { + ndi->linkmtu = mtu; rt_updatemtu(ifp); } } else { From nobody Wed May 21 10:12:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2S0S2tnCz5x9c9; Wed, 21 May 2025 10:12: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 4b2S0S0MRrz3Gbw; Wed, 21 May 2025 10:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747822360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPdhoCPrQEcOZTImVRLqIj8HT66veCQbK/BC2feL2gU=; b=hQDmL5E2T9wRjxinvwPQT9trjoa7QRlEsqnTVHnuKQbf+7Ib+VVb3h5m8jGqLI7gGmEUkl vvIrPygw8BDVFV9yDZVXE9gVY/LbD9eHiRrdhvOx32vyxl1QFYvVug6kGpfaPcvMpybmWt GzKAQA4vjbWttllu8IM0CeXFtKD4xPlaKTKuI0LlwTnR8qklJK3KcJa5Jr26Ju93TjSWDn k1E6sQIYx7wj1hkVwktQyLJzM6ITjka61Wk43X6427VR2U/V9rguCxRbHdK9XGNKxbGGUG Q48wawU4FVDvcfgozUkAWgoU1WQ6KddDbrLVHYUOMWImjBp+5G1ZvzVkkTETTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747822360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPdhoCPrQEcOZTImVRLqIj8HT66veCQbK/BC2feL2gU=; b=WeaJA28yvY/uLaRrUAqpWtHYqnnTeH336fqamOnKVShOP62uPyHA+uKgsHPLNOxDekNk3M VE+36kvHNE0S8FHbOnhWY9D3jZe++xC2QyfxtmxelNhTik/xKQH46H5b9W7gS8qWlvHNqK HFsIMHQLy/vnACEfrgGehGz7PaFNXvTOUwdMuoeMq5ojA05gkHzmzawgny8pQOrztQACNH bNZ+NWKvwb15D9n8HV8B7uf4u2uX0C6pc4/ZnDw8TFuqJEouA+W1VE7CXbcFrNJOzTVwj7 aFniJv+SXVjgSwmPOgbNdikyc3Wkkq6mTVmuDz22G2wVfkLMHKs8dQAMcevyyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747822360; a=rsa-sha256; cv=none; b=J/kFlST/bvg/V4ABhX/HbNoe2QVAzaImdq6bOc2Q0qeOajpHC0BaMlSX4qqd9n2iE03kGI 3vMN6JoktR48JaNolaB8zratab5XQP/hzRzhgABkNYHr4cbq7TDAyWCHckn15fxrQ/0KC6 SK6WWyzcQH5Vxl3rk04RjfJ8mOj3cwkBRlPefBl97XTmxSFowPGbhk/DdYVlDHlzry/aet wdzNeX/l6oajJMc/JKLElHWi76WH9Ya1QRgvl90A4ds79Bh6Y7sR4QfGvxz8e5YX2CHjmE Xqz4PupUqGE4Vz0astzUrY/C79xWUPF8fIJ8reYMyUm1mKLEGjGquNeAWn07Vg== 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 4b2S0R6XvPzWFM; Wed, 21 May 2025 10:12: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 54LACdtC028965; Wed, 21 May 2025 10:12:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LACdV4028962; Wed, 21 May 2025 10:12:39 GMT (envelope-from git) Date: Wed, 21 May 2025 10:12:39 GMT Message-Id: <202505211012.54LACdV4028962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: c485a58f5160 - main - UPDATING: Add an entry for the removal of in6_maxmtu List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c485a58f51608e5473d8580ebd4bf9f4f42fab1a Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c485a58f51608e5473d8580ebd4bf9f4f42fab1a commit c485a58f51608e5473d8580ebd4bf9f4f42fab1a Author: Zhenlei Huang AuthorDate: 2025-05-21 10:11:03 +0000 Commit: Zhenlei Huang CommitDate: 2025-05-21 10:11:03 +0000 UPDATING: Add an entry for the removal of in6_maxmtu --- UPDATING | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/UPDATING b/UPDATING index b6597c2e11a1..c492082383f8 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250521: + Commit e64fe5ad3a23 removed in6_maxmtu and its setter in6_setmaxmtu(). + in6_maxmtu is used to store the max IPv6 MTU of all interfaces, + however it does not have any in-tree consumers since the introduction + from the KAME project. The removal should have little impact, and the + max IPv6 MTU can be easily retrieved by iterating over all the attached + interface if 3rd party modules need it. + 20250515: Commit 772258c89f28 changed the internal API between the nfscommon and nfscl modules. Both need to be built from updated sources. From nobody Wed May 21 12:56:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2Wd446vHz5vsXN; Wed, 21 May 2025 12:56: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 4b2Wd43LqGz43Zy; Wed, 21 May 2025 12:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747832168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4kU58ZCkVODAYxIvN6u1tqlWGLE3GY79lwGEjvc49HE=; b=BP5XdVEcJE4sPbBAMOpEVSNiVtHCpIwIF7BYa5qs8l5w3oRvDdySKRmte6PC47bSH/08Nd lHIhCxdSIs1WNw3T2kYWtZ89l5QnawRfLAbknhYiL4pgJBfKVO6RpcbKsKMh3s15/0g5Mx mHxy31aFuz6+5hPdUJ+4hsW9PgOvgvD4DP2/YdAV2utnSMEVexs2uop5DOuBX5GDGRMMpC KCgEPIHZzi7RLz2ZusTe0qivqNBxpDkrONsanmPUZXRrGeTkOgeoHS9PD0qvkk+m3z1sxP 1VQdxL4oWs2vdRGJVMyfpsohx3R7VXLWbZwBO5RvcN/DSTDLZnZBMXSCmH14xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747832168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4kU58ZCkVODAYxIvN6u1tqlWGLE3GY79lwGEjvc49HE=; b=YmzJS5UPZ2gVRJMr6XkOmYMo6KpUgY+mJX9lvmT/pMzuYGb+Jj6oi/zVquKpZJK6Z/KWlm 4Kwbdmjfhg7J64yImhmfi3ipn2V61ODFTnoDUtbRqb8G3WULU+N2jvB8VXSUcF2C3f+0Il oWLredJYGtCj/6daNtk/hnHP5Ddcig/HeLwJEw5loypSPXsj41Rs7bHN0SphyO9ZtjTfBP dVrEnEZgMZNYds3W8OZDkkNGCRbSyCBAE8RrRvJ3D9s4NHxQBR2jAqTY1cpI7SB257BAMm w+U00dl24RBX+gxr/202isV6KXqG4P9H7/TgSt3J/5KYWWePDq3rphuDbnz4nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747832168; a=rsa-sha256; cv=none; b=vX5cbvfKrcQEx/jSosqutQQmRkTYX/X7VTD40UQ/qvcQeFIHlyPq9NG9Deuk5zQ33mlzQ/ +oTfuBBpj9n3StQhzycVoDbYakXQLdJN4lTbLIzK1YyQ7IShPuJb6ZpQIPMKpVwZsqIZvx zlxtLmAqo4n8temDG7NbtVZf3vVDz8qXfwpoa3a6aJ0MmuY/n7qpku5P0OCo/SLfMYxQyJ gTSxw9il8Js2PwDqBpWhJkZMADa+si86TYseoM+KwecZ5UIaPbYYdaxpoWIQJMTGdFPvvL rHBzwzUFAxocl10dUsvUnvVo82od5yWDyORLoRYjq3wwIlox7I5TpOXZYWEq8Q== 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 4b2Wd42wdKzc7f; Wed, 21 May 2025 12:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54LCu8h9028453; Wed, 21 May 2025 12:56:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LCu80r028450; Wed, 21 May 2025 12:56:08 GMT (envelope-from git) Date: Wed, 21 May 2025 12:56:08 GMT Message-Id: <202505211256.54LCu80r028450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 366a9fb9e731 - main - release: Add ${PKGBASE_REPO} dependency for dvd List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 366a9fb9e7311ca96eab694e5ee0aee4ad465035 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=366a9fb9e7311ca96eab694e5ee0aee4ad465035 commit 366a9fb9e7311ca96eab694e5ee0aee4ad465035 Author: Ed Maste AuthorDate: 2025-05-20 21:39:30 +0000 Commit: Ed Maste CommitDate: 2025-05-21 12:48:50 +0000 release: Add ${PKGBASE_REPO} dependency for dvd A user may build only dvd1.iso, which would fail if the pkgbase-repo did not already exist. Builds using `make release` build disc1 before dvd1 so that case would work, but it must be possible to build only one artifact. Fixes: 62d18f8c4c10 ("release: Add -DPKGBASE option to include pkgbase packages") Sponsored by: The FreeBSD Foundation --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 578df226ff49..a5f5b65a562e 100644 --- a/release/Makefile +++ b/release/Makefile @@ -279,7 +279,7 @@ bootonly: packagesystem echo "./boot/loader.conf type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -dvd: packagesystem +dvd: packagesystem ${PKGBASE_REPO} # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ From nobody Wed May 21 16:34:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2cTF74RQz5wB5T; Wed, 21 May 2025 16:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2cTF6HWWz3VTS; Wed, 21 May 2025 16:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747845281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UhsXFtwP++9wI+JGJinHX2r6bMlsHZ1tc7bhiAEIGmM=; b=TwXXa4uxE3Tklu3mwKOYsX2PjCx+0/coahRkQrPH2p+anz5vxwcD3112irpXlQ1CpFb4/I wVTSUxOWN1JBJQeO0Mn6+Tw+AiRHGee3mmKQpiFv7grATTX5C/YNSmIwAVPQB3yjBoGzJk CQwcejZbtpWDxY3kjPDWs1j8StWP8IBjj4OC5ceNPwqc2t6tpKQnZKowC39WkU500PBKse rf30hUsNeoTFACoeRce2+2pIwfqO4gf8DCqtUA7PweRO3+I01GOh8CqWsf+Pbam9pxZ3CP GydIITOQA6TPFHq/TX7ge7QlWUf3Zqq0bGLpFaE2XNYkPY1uo0rorjxMQoQKoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747845281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UhsXFtwP++9wI+JGJinHX2r6bMlsHZ1tc7bhiAEIGmM=; b=MSzOVIN0ozbBA+xXYw7/uU4NPkcUPqQYOEHpilJ0910Eb97LWINKF0DxwMLBkzDl5skLXs DATnnTHb9DEBLt7epljtwfzLXnotYFgj0JhoeT0GxJQUe+i7kbU0ZaNdwX21cwKEovpv6I 8uaA/X77aAFDARISgfGPcNQevtgV05SooDV3aSARNWFywasbL4fUcy7vkoWYrxiWuVI9ka KYC8saj1c49iwmhLvK4Fkxj1U4ot15Y0iFkAXFdCg0l48LrtiKK81vaNjGZU9eTy84KwO8 XW1KE7dNMN5+olYBo/sbUiVAKH2bNznNME+B8Ky7xyEMd9XXNaJptIRziM6qYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747845281; a=rsa-sha256; cv=none; b=wPRLdFP1NRy7Xq4MY5ZFeEndRw8WdaknFfJQOlZ2lm7k/1IGtclWCxAgxE0128uKWhATbT jmjS2YDUoGBE0QgYD8jjul5rLl1TiS6dH1GhZ+P3ciKLbuea7AEKUxUbEpPXX1NOCy29TI rfFcJ7EtOzdHWKBMTx+qWrfTAPiInnT0yAUuJlGn6x8uRnwsXvi2m5MqKValrrJct8T+j2 K/TuCmeQA8TkzDLAhxC+pXj6S0cof/8Qz80aCZZeNhAXVrozejXnoGB1izq0ssoE50YNCr zxUg9VovwwmQNNwxkhZA+NMbwdRCpP1haDTNK3rAMlUr0vFf8IhOA0Um1JRTMw== 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 4b2cTF5rD7zjYH; Wed, 21 May 2025 16:34: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 54LGYfpJ041119; Wed, 21 May 2025 16:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LGYfpa041116; Wed, 21 May 2025 16:34:41 GMT (envelope-from git) Date: Wed, 21 May 2025 16:34:41 GMT Message-Id: <202505211634.54LGYfpa041116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 22348fb99938 - main - bhyvectl.8: Polish List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22348fb999385edaef38ce5e4308f44135f0326c Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=22348fb999385edaef38ce5e4308f44135f0326c commit 22348fb999385edaef38ce5e4308f44135f0326c Author: Alexander Ziaee AuthorDate: 2025-05-21 16:29:39 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-21 16:33:37 +0000 bhyvectl.8: Polish + Add how to find open VMs in the example, linking `apropos Pa=/dev/vmm` + Move note about additional bhyve options after options for flow + Reclaim some space by shortening to + Align options list width, tested at MANWIDTH 59 and 80 + Remove unnecessary roff quoting and tag SPDX MFC after: 3 days Reviewed by: carlavilla, markj, mhorne Approved by: carlavilla, mhorne (mentors) Differential Revision: https://reviews.freebsd.org/D48401 --- usr.sbin/bhyvectl/bhyvectl.8 | 46 ++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/usr.sbin/bhyvectl/bhyvectl.8 b/usr.sbin/bhyvectl/bhyvectl.8 index c5282a98a767..550c4f10d8e6 100644 --- a/usr.sbin/bhyvectl/bhyvectl.8 +++ b/usr.sbin/bhyvectl/bhyvectl.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2015 Christian Brueffer .\" All rights reserved. .\" @@ -22,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 4, 2020 +.Dd May 8, 2025 .Dt BHYVECTL 8 .Os .Sh NAME .Nm bhyvectl -.Nd "control utility for bhyve instances" +.Nd control utility for bhyve instances .Sh SYNOPSIS .Nm .Fl -vm= Ns Ar @@ -37,8 +40,8 @@ .Op Fl -inject-nmi .Op Fl -force-reset .Op Fl -force-poweroff -.Op Fl -checkpoint= Ns Ar -.Op Fl -suspend= Ns Ar +.Op Fl -checkpoint= Ns Ar +.Op Fl -suspend= Ns Ar .Sh DESCRIPTION The .Nm @@ -46,17 +49,8 @@ command is a control utility for active .Xr bhyve 8 virtual machine instances. .Pp -.Em Note : -Most -.Nm -flags are intended for querying and setting the state of an active instance. -These commands are intended for development purposes, and are not documented here. -A complete list can be obtained by executing -.Nm -without any arguments. -.Pp The user-facing options are as follows: -.Bl -tag -width ".Fl d Ar argument" +.Bl -tag -width "--checkpoint=" .It Fl -vm= Ns Ar Operate on the virtual machine .Ar . @@ -72,24 +66,38 @@ Inject a non-maskable interrupt (NMI) into the VM. Force the VM to reset. .It Fl -force-poweroff Force the VM to power off. -.It Fl -checkpoint= Ns Ar +.It Fl -checkpoint= Ns Ar Save a snapshot of a virtual machine. The guest memory contents are saved in the file given in -.Ar . +.Ar . The guest device and vCPU state are saved in the file -.Ar .kern . -.It Fl -suspend= Ns Ar +.Ar .kern . +.It Fl -suspend= Ns Ar Save a snapshot of a virtual machine similar to .Fl -checkpoint . The virtual machine will terminate after the snapshot has been saved. .El +.Pp +.Em Note : +Most +.Nm +flags are intended for querying and setting +the state of an active instance. +These commands are intended for development purposes, +and are not documented here. +A complete list can be obtained by executing +.Nm +without any arguments. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES Destroy the VM called fbsd10: .Pp -.Dl "bhyvectl --vm=fbsd10 --destroy" +.Dl bhyvectl --vm=fbsd10 --destroy +.Pp +Running VMs will be visible in +.Pa /dev/vmm/ . .Sh COMPATIBILITY The snapshot file format is not yet stable and is subject to future changes. Backwards compatibility support for the current snapshot file format is not From nobody Wed May 21 16:37:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2cXX5hxKz5w9sN; Wed, 21 May 2025 16:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2cXX4vzkz3Wdh; Wed, 21 May 2025 16:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747845452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BAE/C0sX1D2qOZiaoypEnha7ZTuJzrqRmpmA9JRXaOc=; b=VJia4U0XjDdY2pCEs7/WuZ2UsA3MGKhwu2bV2I8+SEPbV1b0yTfqrPcfPZXvO6orFnopgx G1zYjc3a/ZdfFpd2wabEyXlJPeAvLe6PGrXEKt+UcKaIG3ZplvHXpbq+9EJ3ERVtGbjJWY 0ONoUKNZg5bL5Oobt4Sw1qKAQVaSEOQjbXmWUh/9pENQc1DpDUVpw02H0wo/PnPWIn6/KI 4942rOqXsNyc8dD7wOOcmuGpiKi6OK2POZL458/O3H6q3zCFl1FJ6QOemyHhimJCRRN5CJ Aohkwjk9fq6IZ6weIrELIRAfO6KIUYZbPfFDuce8j7FJdfZtfWy8GetI1u7B9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747845452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BAE/C0sX1D2qOZiaoypEnha7ZTuJzrqRmpmA9JRXaOc=; b=c58+DTEnC7ESUEPp8Wn7M3ZDBp6haQa0LrqAlaj9vsfCckiBIghi4Y11BccA0QIhdwhkTa /u4Nu6DfJvziz7L6GISCKYLTHBtGeP3TWyd5UmwNdDBB3kNsM1mfHjEA4LUUMdDPqpNJGQ iGq10snQ78Qrfk8YFq9w2DfcatHufHf6wO3ogOG2Qqf6H/gcsyTG7agOEZrql5pvcPz5pE bZiFE3yEj+p0ftTHYBCWNeHrgvKHcclLFuvTG5ivRCei0slVml0VWZIE8Dt/HvkLwWOXOb ZxhB1jmIVgJ8i0tXHgs5tgBWLZqR471ajWbhAodFUQJUlzCkxgnJ/VCk6Fl+/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747845452; a=rsa-sha256; cv=none; b=kyErEv6IWtkY/bUD8p12vVi/qY+CiAN6m7/HI1jUrwTB0HFTdjeo0QgLR9QQaVs27QMzTP fc5AoVEQVlnzyLMh+zfV9IfZO7+MB07aYxoC/G3ZE+VWObYo6UXXcd4s/F8zLNuexB6bi0 zgfdtorWF3ZFRyPjRW2CHNIz5TVqYxmIQv3Os7noAGl7SEa64q5p81r9B3Pvl+61Oj9OAa Ojsq3Kgm2icMzB0ybDA57Jejos3Yt++q/bexWyZejqZWnYmLsdvfAcXm0VWJyBDJFN4JMM a8MG/DbgAaHMquue154LWQA50L45A8IK6XDGrJuI3PsfgfHD7tQH4WNzIWaghQ== 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 4b2cXX4MlMzjM6; Wed, 21 May 2025 16:37: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 54LGbWmO042058; Wed, 21 May 2025 16:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LGbWuE042055; Wed, 21 May 2025 16:37:32 GMT (envelope-from git) Date: Wed, 21 May 2025 16:37:32 GMT Message-Id: <202505211637.54LGbWuE042055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 7098712bbfd6 - main - SPDX: Tag BSD-4.3TAHOE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7098712bbfd60df9db324decbc1a5dd8f751356f Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7098712bbfd60df9db324decbc1a5dd8f751356f commit 7098712bbfd60df9db324decbc1a5dd8f751356f Author: Alexander Ziaee AuthorDate: 2025-05-15 13:53:21 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-21 16:37:10 +0000 SPDX: Tag BSD-4.3TAHOE TIL traceroute.8 has one of the oldest liceses, predating BSD-4-Clause! The SPDX tag was not even on Wikipedia. These are all the files I could find in the tree with git grep that look like the license reported on the SPDX website, including one that was misfiled. Ref: https://spdx.org/licenses/BSD-4.3TAHOE.html MFC after: 3 days Reported by: brooks Reviewed by: brooks, carlavilla, imp, ivy Approved by: carlavilla (mentor) Differential Revision: https://reviews.freebsd.org/D50362 --- lib/libc/stdtime/strftime.c | 2 ++ usr.sbin/cron/cron/popen.c | 2 ++ usr.sbin/ppp/arp.c | 2 +- usr.sbin/traceroute/traceroute.8 | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c index 5943e6387174..89c9e4cf88ff 100644 --- a/lib/libc/stdtime/strftime.c +++ b/lib/libc/stdtime/strftime.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-4.3TAHOE + * * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. * diff --git a/usr.sbin/cron/cron/popen.c b/usr.sbin/cron/cron/popen.c index 72d4afc4d1f3..abd9de198e87 100644 --- a/usr.sbin/cron/cron/popen.c +++ b/usr.sbin/cron/cron/popen.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-4.3TAHOE + * * Copyright (c) 1988 The Regents of the University of California. * All rights reserved. * diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c index ad623525ad4c..5613b345c116 100644 --- a/usr.sbin/ppp/arp.c +++ b/usr.sbin/ppp/arp.c @@ -2,7 +2,7 @@ * sys-bsd.c - System-dependent procedures for setting up * PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.) * - * SPDX-License-Identifier: BSD-1-Clause + * SPDX-License-Identifier: BSD-4.3TAHOE * * Copyright (c) 1989 Carnegie Mellon University. * All rights reserved. diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8 index a97395944b2a..f36d473f2727 100644 --- a/usr.sbin/traceroute/traceroute.8 +++ b/usr.sbin/traceroute/traceroute.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-4.3TAHOE +.\" .\" Copyright (c) 1989, 1995, 1996, 1997, 1999, 2000 .\" The Regents of the University of California. All rights reserved. .\" From nobody Wed May 21 16:42:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2cfH6S3cz5wBZD; Wed, 21 May 2025 16:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2cfH4w0Qz3XcG; Wed, 21 May 2025 16:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747845751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ghE3+sRkYNoZiXSpjDWgP2aSkFi7hLNw5kycWLacEE=; b=uIsyHTdIGF5XjSKvx/GhN1ncyAPnioKs0BM0KpuK2y4b2ivRIpfNIFnTxasU02rWvAvIJt 0RaiFcYcAnAWPpRSaIgArLMTZl0OXgjXoCTdmyaKjdk2jr+5l+uL1DiuHyKJnn/3Iq1iL2 N7uaiXBxHeyU+RmRGPwjyad9l68e0Bs2z6a8wZUE7U8PdPYQgYngRSf5CwhsqzLV0iIyYu U/0jI4/qG8i4qRqq1TNiRJT6bPRRKn6JCalJ2tsGWJV7WQgPK5GeX0mZXEZszRri63ieRO RXH7EtB/9w6RxLO4RyHR1E3B6hPOxs6YkEjCpMc0leXvhj9PlwaS6DNEgI+q7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747845751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ghE3+sRkYNoZiXSpjDWgP2aSkFi7hLNw5kycWLacEE=; b=k0iQBQkPkh4NKrLoY893h38eIcicsCFlQ9z8XVLFkuM0/QvTGNzrlMckTBiBkJ8J9t88+g 9W0W/eTwA9GK5SVZfeG1IgJrvTKFlybAQiZkSQFlMIFg1Km7IKRCus4+K6nCnvdLGbnWbm FkyoO7wWpPuQCNl8hX4m4/Tp3yLHa+oTyMyeivi6mX2MV15kPs88dnpAncWIUOLIC1uiR5 jEui6G7Savh6qLApphV0KA9eW/jB4vnRFBgdr+WeXRDqOFHfedD///NS6WorHHFQ1qZ9E/ a2CJJpPCqlRpnyK1NU3bD/P4iCve+O/JSLUajlG+UXTfEzQ0EB6fjYrQQFGgHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747845751; a=rsa-sha256; cv=none; b=k/ar6aflOSp90oT768fmy60WKZ3FwtEwy9eq1UwN81anat0G/clrGI/oEUdyee2oC9okuc 9gsVYbegFCLo7KXtIPtqUc9hr8lUTH6tk575VAmFdb594O7OSU0KoY5xS/VYpNF3VMFdnn y8vMhAyggY6nMspxKqSjdl4imLDdQmSr22DWgARyVvIlwKJ4S4Vs8mNk4qJ+qqP1ZOPOaZ IrioHTEw8Nc+YDVUW5a7j+QTv0Hz+8AifWX8mAVJta5FJj+oE5+vmqvr4s/A4eVAiK9RaT PTT8wp8jWEaif5Gt2aHTUGgN/S4ZPARybzeGBp1ZH0bSMNqBNTCI5e3pbJuMNQ== 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 4b2cfH4WHfzjjc; Wed, 21 May 2025 16:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54LGgVc1060344; Wed, 21 May 2025 16:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LGgVKp060341; Wed, 21 May 2025 16:42:31 GMT (envelope-from git) Date: Wed, 21 May 2025 16:42:31 GMT Message-Id: <202505211642.54LGgVKp060341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 1a060e4f1ba9 - main - build.7: PORTS_MODULES incompatible with pkgbase List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a060e4f1ba9b9f9363e291aba2134b37b938fae Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1a060e4f1ba9b9f9363e291aba2134b37b938fae commit 1a060e4f1ba9b9f9363e291aba2134b37b938fae Author: Alexander Ziaee AuthorDate: 2025-05-21 16:40:29 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-21 16:40:29 +0000 build.7: PORTS_MODULES incompatible with pkgbase Add a note until we can fix this. Reviewed by: carlavilla, emaste, ivy Approved by: carlavilla (mentor) Differential Revision: https://reviews.freebsd.org/D50355 --- share/man/man7/build.7 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index d66df90365e7..0aae2c42ac04 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -663,6 +663,10 @@ as part of the and .Cm installkernel process. +This is currently incompatible with building +.Pa src +into +.Cm packages . .Bd -literal -offset indent make PORTS_MODULES=emulators/virtualbox-ose-kmod kernel .Ed From nobody Wed May 21 16:45:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2cjC2LFVz5wBPl; Wed, 21 May 2025 16:45: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 4b2cjC0rvtz3YdQ; Wed, 21 May 2025 16:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747845903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JT9Yb1zm2js/eIZEMsXYe5RmNEmfcsSWclmOM+ikcvw=; b=U2hO0DL5ZImTK6eWSU3R4KjWz8J/PTO6WUclgcicmNMLDqhTF6XDsl5xlsn04TN9RFFHfT Onq05kqUtLWIbFLrj2c/fkpM0Ss97ceiTVuz31cJECapXASGJ4lt5KGDvZKHPwurfM+cFp ZxUi9dWMt8g6PwtwmnE4KDPVLX7y2Bl7BJglyr09mfPxO5Q3DXpOhj84XgxtN63g0S5Glj F9jvoP4KAKVbuiWf3MtBkeap5iA8oq3GTig8awYiPm7eH2/mEsvpv8it7c/ztvo7Jvk5rn DE9gEikMpYTSSUzPyHVp0Ptk7K4YpUzUXBX8/EVpMd0q5XHmo4UoweikA7ZE0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747845903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JT9Yb1zm2js/eIZEMsXYe5RmNEmfcsSWclmOM+ikcvw=; b=A1RVtzdAyTdut554eCecf8UnI6SJjvmukxUErR9xmDn4JRvEux0Nh5lROc1TE59z7Z9eMJ TNMN4YNIRu3GyoiDAU5DS/k1reNBhUCUs1TcNuP3+qQ4qtCxLG4411Skalx7UC7eQKjvYv OMRllwGS9+2CPGoXNP8ieOGFxD0x5M4Zxt0mQEj32c1PFVfJ0F5OXcsSv5BEaZX2zg3M9w JjphuUFUNqOI6MGaCIZcikREusJw0QIPy5oyr9MC0H7s4SPC9Y9en+aMv5jW5IyrLv+UjX zfzYPdEGu68BaO1LmT0KYELTjJ70gEpwusKQfgpxSoHyWIIfh4gF40l9tRZ1QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747845903; a=rsa-sha256; cv=none; b=VcPLqjmkhTI0d/iINnYnB693+q0371aG1TthANMiD0BTSq2HNppT8hf1gLQthiv7z8ieSW cONXWWCEzuzoaU+P94wxSXMGcs7zV0Ubf9PYzxIFrb2t7bRsUNe93C9H3AXNpQf7SrvsKX +qUytcv/EsBviHUiJFiTjC1215LLWCONDjGVfQgQ0LRd7ExjEssFFsYl95O/If4apeK9tk twi/103HGf/lIrJJjXPGHbiERLqTAFHhsv1KATL1hlXmhHh0EWlZNeqmkoqHg5KvFTM7NL EEIJaYD5+aPEEzbSiwCYiKyUyh4E6IXIU/owdL21e7b7rEWU0YXwsA3DRRagWQ== 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 4b2cjC08FlzjnT; Wed, 21 May 2025 16:45: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 54LGj2sL061281; Wed, 21 May 2025 16:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LGj2Ga061278; Wed, 21 May 2025 16:45:02 GMT (envelope-from git) Date: Wed, 21 May 2025 16:45:02 GMT Message-Id: <202505211645.54LGj2Ga061278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: bbc0b39ef7df - main - make.conf.5: add CPUTYPE?= note from UPDATING List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbc0b39ef7df3007c78eec8822213fe77aae4d41 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=bbc0b39ef7df3007c78eec8822213fe77aae4d41 commit bbc0b39ef7df3007c78eec8822213fe77aae4d41 Author: Alexander Ziaee AuthorDate: 2025-05-21 16:43:37 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-21 16:43:39 +0000 make.conf.5: add CPUTYPE?= note from UPDATING Cross-compilation needs CPUTYPE to be set with ?= to be overideable via make targets. This has historically been mentioned in the FOOTNOTES of UPDATING. Note that in the CPUTYPE documentation in make.conf(5) for discoverability. Leave it in UPDATING for now to create no regression in the doc there. MFC after: 3 days Reviewed by: carlavilla, ivy Approved by: carlavilla (mentor) Differential Revision: https://reviews.freebsd.org/D50277 --- share/man/man5/make.conf.5 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index ebf1b8a119f7..46bfa91d36ba 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -158,6 +158,15 @@ and .Va COPTFLAGS to contain the appropriate optimization directive to .Xr cc 1 . +To set the +.Va CPUTYPE +value, use +.Dq Li ?= +instead of +.Dq Li = +so that it can be overridden by +.Xr make 1 +targets. The automatic setting of .Va CFLAGS may be overridden using the From nobody Wed May 21 17:13:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2dKt4HXlz5wDn4; Wed, 21 May 2025 17:13:22 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2dKt3P2Jz3mV1; Wed, 21 May 2025 17:13:22 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=9Vx616X59hhpnVS7mqStg+Y+L5H/q9JWr5TjzfkFxAU=; b=JBC9rBXI+cNBm6D1pYVF2lwxNoMaox1lM7grwQbqcSMVDi3KSKiSxdkJdgM6lsGH0c6FnL XLBEgXv6hFIc6Jwj5hdOqtdHgyA+RUXvMb5eOlFdc8Svfcrufa8MjV3ebEjiUg2nXXgCKg JbH7GPqAYPDrHzjxsFHGHSXR95wb/1P+AnrXlcraR4CgH3P1GD+zIIS8pTLrtQxeKhbOf2 mpru30dPO1OtsBLcOi7VP5l/mS3pQ0s/sncByIavqpK/NitqoLShypGSUJnbqnznXZqCjb TWqQDGpKxppc0gcyLzYmEMSklj9cxOvEmVYt/WCkUa7/GoYCyauHFRbdnuNSCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=9Vx616X59hhpnVS7mqStg+Y+L5H/q9JWr5TjzfkFxAU=; b=TmFONoq0kZos6NhBmP60lIQak+VmIN6uyOldAz6eDGJXmhstyFd49NN0/3RCWdCcZaG6fp fKMVQa+oZSTyJKfgpPxZ0IIGlmYKIRpviz/NL5k97xccZRxo6s9tNNJ1ydEbgN2w0TBGhz abSSPy4NHKKEw1V64BSOPZ5brsR6gGbautJLESQ3R2gfrPYNXky7q4uViuPntlsk1gJxhZ HYCXYNRh1vtGOSy8Q2umzbivbtf08X7CVLk/7PrJd8jpGEGCH2vdgbYoRjeVuEXc/FG9hz lUqqqEvZZRkJGUnnF4cuGSkvYMFI7sZ2OZFjlfsWIG3KJhndD7g+3wfMwVwIZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747847602; a=rsa-sha256; cv=none; b=A12lRwfS/HmIBrepBGBMmMjjOAU+yfCEBYlirG8Tb9ZrF7sMvJ3H9NQhBd4wMof7heyamN 4bN4XFuiQCbS66HK1kghkLUNFvcRbRw1zSgpfFqwbsuiP/FEfHtVPWV0jMmVOJzwY5uoRh X6vrak/rISEI7u/zesBZaNMsNl+0KFk1pawgveMi2tdlTbZmBv7KyGpOmM/9ThD/ejNzLl 9y4Rl2pNaHAaIVryLmMVNvmSldZNIPX2KfTizT/8ZllzOm12LYJThLTu3LIP9RuIaFtVwY naHI+UIfdY8/8PnIUdpxr0B6T7fYHCJglwBmyTbsBpkunkTD+z06FBnDNadASg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2804:f1c:3c:b01:cd55:904c:d339:c978] (unknown [IPv6:2804:f1c:3c:b01:cd55:904c:d339:c978]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b2dKs4cwLz96f; Wed, 21 May 2025 17:13:21 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: <692b5cb8-be2e-4197-abec-d8889712f2a8@FreeBSD.org> Date: Wed, 21 May 2025 14:13:20 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3bcf8e6db8e9 - main - loader: loader can pick too large font (check if one side is larger) To: Toomas Soome , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505130746.54D7khTN010139__37381.4146196068$1747122471$gmane$org@gitrepo.freebsd.org> Content-Language: en-US From: Renato Botelho Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: <202505130746.54D7khTN010139__37381.4146196068$1747122471$gmane$org@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 13/05/25 04:46, Toomas Soome wrote: > The branch main has been updated by tsoome: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3bcf8e6db8e9b30af0a1d445e6e413a332066434 > > commit 3bcf8e6db8e9b30af0a1d445e6e413a332066434 > Author: Toomas Soome > AuthorDate: 2025-05-13 07:40:39 +0000 > Commit: Toomas Soome > CommitDate: 2025-05-13 07:44:35 +0000 > > loader: loader can pick too large font (check if one side is larger) > > The 5e25f7b09977 still allows one side to be too large, fix it. > --- > stand/common/gfx_fb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c > index ad38a657e233..af72ab1a4c99 100644 > --- a/stand/common/gfx_fb.c > +++ b/stand/common/gfx_fb.c > @@ -2082,7 +2082,7 @@ gfx_get_font(teken_unit_t rows, teken_unit_t cols, teken_unit_t height, > * Skip too large fonts. > */ > font = fl->font_data; > - if (height / font->vfbd_height < rows && > + if (height / font->vfbd_height < rows || > width / font->vfbd_width < cols) > continue; I still got huge fonts if I remove screen.font from loader.conf. What kind of data you want me to collect from my system to help you to get it fixed? -- Renato Botelho From nobody Wed May 21 17:18:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2dRH3Qfcz5wDs5; Wed, 21 May 2025 17:18: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 4b2dRH2fXTz3pwR; Wed, 21 May 2025 17:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LCHIB0k/bt50QHnKnL+oouxvhZWMiLZJ7eoXEhLxXhI=; b=NkRmz4lRY7hDWNmu4ZS992DWBzXtOjL1OtVNrBCtGUJNWbB01n/7hJyRDh9C/O81T5FCau 3N/9/wyxZrY5KuzdW4BP6GThvhErnggUCDNqFid5vTOJC7ITxSHBVj1FUamnuu+sSxMS+j Ai1gV5IE55kfzEoDT8YRb0GADG3fwfMcLp9vVPDmSCU9jxhiit4tFZ/gk2x2q7I+rMTAlq YtXua/81+DHro2bXpK8At4xDApeulX2GEVrM4ZesBa4SL1/pvZC9+JUgY5bmCzLPlikBC5 vB7aFF9VE+d6IECMGuK4TmcWcFPB7IhZ60T8nmw5Xti9545t7hgYsQ7cJ80OVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LCHIB0k/bt50QHnKnL+oouxvhZWMiLZJ7eoXEhLxXhI=; b=s/WvKd6dahP1ipVN2ElD8eM5oEMdgw5jmGmAZwbAmC33TtHtUtFLeFiiPh5OK15uuElT40 z+NK/P0AkEr4DRqo4D+JNTm3CA+IHEMgKfL0Zs1f+9cRHmN3d/EPyDjDDZRnlXyvJ7J5Tl dClHx2pzwgI5BcL6cZ0vdszQoMFigaN3ptIObNRIoV/OkpK6vw4DlXHsMhQB3M41jxuIrx sw3vEhNfJn6PMzOwS9nyjX9xSO8GPuNAXV9L/L1D4AVlzT28cO+UA9epBsKyyki5dJFwlY HlkJblMkClE+AW8m03/WNG5TgA/e/UC4fzZNeO+UR4nL0PmB4PU0gRL4EVOoaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747847883; a=rsa-sha256; cv=none; b=dqHAG1Ql6y4CDVhVDqHQdrMKRHCLpdaVqjDxOHb/UWf0+l6PxJmBkYrjpvzOUvlrw+KK6H QNlV9MDX150nqGouOYLkf+qV+YIsMdgriI469dni/2Gvr+TBFT9GRFIUhM3xawALi+LOmh wiy0QdfrmPu6O4M/cVO9znKLXn/F32Iyh/bL8owidxawy0i5XgfqWNH+UFMLiU644ziyS+ Y3lFu/NzUrSQXHBWBRebIqtiwYas9AWuygRia+W9tH/scGwrJWwR+NQrztSctBfyii75aQ E6/cPLbr0ZDXeCAcS6EVQjcjxaOqoReg2pC9P1tqIUFJ3XWUMgntzA8ouYgiyQ== 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 4b2dRH1y9XzkJV; Wed, 21 May 2025 17:18: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 54LHI3d6019354; Wed, 21 May 2025 17:18:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LHI3nb019351; Wed, 21 May 2025 17:18:03 GMT (envelope-from git) Date: Wed, 21 May 2025 17:18:03 GMT Message-Id: <202505211718.54LHI3nb019351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 23a0c88b0376 - main - zoneinfo: don't install version List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23a0c88b037625745b88d1661b9552f1ebe97ebc Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=23a0c88b037625745b88d1661b9552f1ebe97ebc commit 23a0c88b037625745b88d1661b9552f1ebe97ebc Author: Philip Paeps AuthorDate: 2025-05-21 09:15:50 +0000 Commit: Philip Paeps CommitDate: 2025-05-21 17:17:49 +0000 zoneinfo: don't install version The commit teaching the build to install tzdata.zi for libcxx also instals version. It turns out this makes at least one piece of third party software cry: rubygem-tzinfo expects any file in zoneinfo to be at least 44 bytes long. Clearly this is a bug in rubygem-tzinfo but since nothing actually uses version, we may as well not install it ... as we did previously. Reported by: delphij Fixes: 91506dba7f2e zoneinfo: also install tzdata.zi and version MFC after: 1 day --- ObsoleteFiles.inc | 3 +++ share/zoneinfo/Makefile | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b90ac11dfc69..8f5da0483a87 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250521: don't install zoneinfo version +OLD_FILES+=usr/share/zoneinfo/version + # 20250516: NDFREE(9) -> NDFREE_PNBUF(9) OLD_FILES+=usr/share/man/man9/NDFREE.9.gz diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index e3111c915a93..993f9abaeeb3 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -127,8 +127,6 @@ install-zoneinfo: ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${CONTRIBDIR}/zone1970.tab ${DESTDIR}/usr/share/zoneinfo/ - ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${CONTRIBDIR}/version ${DESTDIR}/usr/share/zoneinfo/ afterinstall: # From nobody Wed May 21 17:37:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2dsH1Lqhz5wG11; Wed, 21 May 2025 17:37:07 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2dsH0dS1z3y7w; Wed, 21 May 2025 17:37:07 +0000 (UTC) (envelope-from garga@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747849027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=XdqhlZIs9CPLKMD5+SjnGljdx9FT0FbL4mtwvwJZAOE=; b=xe05ti4V9QIPa0vsLTm5z76I5TcJ8EME9FA5iu7IVQYfYZKmSjo9A1TzRr3+a7j4YtH1va 7G2z0BUtIhAXqgpXO4IZFVIZt2cDzW/r0oB/4Iev7LMHzUPwD724b6pYlqHeVaWAycsS1h AVpRErT8DvHXGdOCP5aK+DkEyMbqKHNW25x5UjsVLInzHxxqY/yLMqY8N4cZh8YJUHsFTa I9DZUL4f7hvv5qlBaLcFSR3QlGV+7uNWSgsMTX7GzbzLGCjy7zG7q2j+gSR43uE03MP2AN MUUN8dk2JEY6tJJQt2NgwbI+64nXwTKpFNz3xKxRlUq2TVGO2ptW88gs6q5wsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747849027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=XdqhlZIs9CPLKMD5+SjnGljdx9FT0FbL4mtwvwJZAOE=; b=n2Xr6XCfuCeZ3Vzfr9DR6GZ+S1NL6RSXSErFwQNv7baEJEfz+nye7Xm+k2VD73LcBJq1oz mYa1CUEYn1wDPoe+8sRTwZGPL/6xlSkFL2bdCfOZl+KyR6dsqrTwoOjuI8x+p6hkRarr8J GICMNTRwp5trKU2r7deZA1fi8wymz5UwKNsRL1PGW3O4o60jQukuoVYWK2gB124i+liRme FPpgMLuJ/1Pf3xv1lvL2vNWI/EC5gj9DV11mqfeYkBDbDPknBAqLb23bH3PRQMNKFv9WXa 1F1RfffgBwE7M7dNZfYa4SbDCU1twpsbJG/6vIVgbUmIz3QjWfJeFr4WRAcrQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747849027; a=rsa-sha256; cv=none; b=ZOEgaHdehgTvpzBR4uEcxXiJtgcq7IdXsHnXcg+/tMsSkjd+wHfaucwe7m2TuSTM4s3f78 LxnLDWd443E4VWSzRrqZmXDYBZIEWdOt+e9VikFhr6/ePelWtsixujFHzjst1YzuUNem0t Hdh7goRFAwJQaI1N/ZsN/ADz5D94eVEApSKCTEx1mZuOMPDLXhzLF2hfQNo2jv9XqEqMty BCPLQTJ1etc6LgZiRCxS32Xujd/nlmgQ8jkSwPSyVdim3ZZFi6OzhSTwIRqbY5eZEk1epH 6/6+WF0s1p+3qna5FuJGo3UD539nFXhgvUSRblmW0TAxt9YzsmHZ5wYmRsE/TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2804:f1c:3c:b01:cd55:904c:d339:c978] (unknown [IPv6:2804:f1c:3c:b01:cd55:904c:d339:c978]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: garga) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b2dsF38xZz9VP; Wed, 21 May 2025 17:37:05 +0000 (UTC) (envelope-from garga@FreeBSD.org) Message-ID: Date: Wed, 21 May 2025 14:37:02 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3bcf8e6db8e9 - main - loader: loader can pick too large font (check if one side is larger) From: Renato Botelho To: Toomas Soome , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505130746.54D7khTN010139__37381.4146196068$1747122471$gmane$org@gitrepo.freebsd.org> <692b5cb8-be2e-4197-abec-d8889712f2a8__49356.5424041421$1747847616$gmane$org@FreeBSD.org> Content-Language: en-US Autocrypt: addr=garga@FreeBSD.org; keydata= xsBNBGStavwBCACjNlp/9+Y+VFe9ieR2h/WWbdvjz4Mb2z/f22bGoaskzCfvVNbo/v3i34I9 H6OdgZkGqheQEAD2jNfRbmPr4z40xDMUpYGLds+1Mvg7G3Hms3j5Ef8KaLSWUNWIfwKdfSVR Qs35ccSJxAdRW5YdI6J3xZgika+3Bc4eJ05YE/nWW+PNTYevt5rqD50N3zybVYIcLoqVPpBi AZE/sf5SLiLACIJb1t/s4x+pi8vgWevxVVT9u8V1f8zYErmHSLSqjxii0B3eRZphX9NCJOv9 +tfFZhnENInhn9gT7H4e2YumUltEy3jacONHJF3CC1pvvWEa6lEyypclMOkHQwNON7DLABEB AAHNLFJlbmF0byBCb3RlbGhvIChGcmVlQlNEKSA8Z2FyZ2FARnJlZUJTRC5vcmc+wsCXBBMB CgBBAhsDBQkFo5qABQsJCAcDBRUKCQgLBRYDAgEAAh4FAheAFiEERL7Dxegbnh7xTiQ5Ob6P xxJcZXoFAmSta78CGQEACgkQOb6PxxJcZXrYlggAgaZmr6c1yIWzN8VksHrHpwt/uxONEP+h ljy3yfrMsgfS5wx5Uzgfih1xYZUFC6jiI63CetqBqJpp3g1klRS1UWYKx2NeXphDMYZEdPm/ a6sXh4bKZbk6IE8Yn0/YiRT57d9DtbvswC7Gn7Igj/MSbhl49TvTGyvuB6juaffVoYZViomx 5zMoee8Ml2o2qj3MrCJ+/K8GU54RlpOGqGRsqdwVdr9XEWub6fF2YFwR46cjmbiU3P5urFHH nkJlBGPIwKxHimTW0lZsdx9aCKRDd/D80/WOEzXmk3k8B9lv/GsvOluHmveLhJG1R1tIJ31I f2q8dfTvqsQXnu8CcWRcgc7ATQRkrWr8AQgA1DufoxScA+CWQbUR6zExIu8wXQKrhuRt4DG2 BgynT7EMUvEBadcbQRZXsBpemNfncc9Axyut/+rWiyKJf9BLQuo/9QYmSRvW1U6+0LJUYmdg kMyBeYaPk+vnssv/u9jLuvV7FVgyE0yk1iaWIKOVDD+XrQCOvGw9uSceBrQyCyo3A/eRM/+p vnDCaywR63PKE+3axk6lfNdGK3TnaWmS30/ZDCZlNsXuqprqR4JdT5wXids5o36dsuJ5EZ20 s5hNMD34s4Yr1Y1R9elH6qBsFCpozs0+jwrArxq+UJJCR6hH5W8ZEwJtRC8tzR8mRE1WywzX BXYj0YhfGztQIxZckQARAQABwsB8BBgBCgAmFiEERL7Dxegbnh7xTiQ5Ob6PxxJcZXoFAmSt avwCGwwFCQWjmoAACgkQOb6PxxJcZXr1vgf/SKXhoZcUU5I7TqcbHg0lJz9tICTupCGHWr/s SQgjh9oEM5j1wqW7FlCGP90Tl9K0g3ow9YdbhU7VK470o6pymX9V9eLHzGgkZO/KMEtGBeK1 u+5ePjCJ/MK5B21KODLSU7WrIL1VN5ceXfQPLYt02LMLtPri+oduHD6RNBeA7US1DUzleq5F 9NHGbvV2U7BdDUezpiO8NaFjFZVB11I5d99FxUM5XGVstI3VhsRKZxjY0KnqJzaQgTFsPGmv AUfZVIN1pXgXiedhPXpr8+Y64jP+pHVwpVmh1zYWL6+q3kqFOUVP6c5iiMeoEXZvgJz7x/AC ek3X5gvu8Hpcv+MZIg== In-Reply-To: <692b5cb8-be2e-4197-abec-d8889712f2a8__49356.5424041421$1747847616$gmane$org@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 21/05/25 14:13, Renato Botelho wrote: > On 13/05/25 04:46, Toomas Soome wrote: >> The branch main has been updated by tsoome: >> >> URL: https://cgit.FreeBSD.org/src/commit/? >> id=3bcf8e6db8e9b30af0a1d445e6e413a332066434 >> >> commit 3bcf8e6db8e9b30af0a1d445e6e413a332066434 >> Author:     Toomas Soome >> AuthorDate: 2025-05-13 07:40:39 +0000 >> Commit:     Toomas Soome >> CommitDate: 2025-05-13 07:44:35 +0000 >> >>      loader: loader can pick too large font (check if one side is larger) >>      The 5e25f7b09977 still allows one side to be too large, fix it. >> --- >>   stand/common/gfx_fb.c | 2 +- >>   1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c >> index ad38a657e233..af72ab1a4c99 100644 >> --- a/stand/common/gfx_fb.c >> +++ b/stand/common/gfx_fb.c >> @@ -2082,7 +2082,7 @@ gfx_get_font(teken_unit_t rows, teken_unit_t >> cols, teken_unit_t height, >>            * Skip too large fonts. >>            */ >>           font = fl->font_data; >> -        if (height / font->vfbd_height < rows && >> +        if (height / font->vfbd_height < rows || >>               width / font->vfbd_width < cols) >>               continue; > I still got huge fonts if I remove screen.font from loader.conf.  What > kind of data you want me to collect from my system to help you to get it > fixed? > My upgrade script had a reverse logic and didn't update loader.efi. It's working as expected. Thank you! -- Renato Botelho From nobody Wed May 21 19:31:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2hPM5slrz5wPlB; Wed, 21 May 2025 19:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2hPM5RtPz3X2H; Wed, 21 May 2025 19:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747855895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kd2yIEt79rJAbix1z3B8UKy+dX+8FF7QgTmyBXzuhNw=; b=ifK4AKjup1uxESE6EHoMTGcAvbwOJoMfrQBSe7mzFr2kd8ZIhbxUBh9L+U23p1Ns/tpFuj HDkrJXBDHOQDKOYy9wyAHYKqNwIm2MwbS/d66qKwb5Jy7B3L5MMiXfvlJ4qhX36euwa1gB 7WoYnusopfbUBVsZkqw89Z0y9USMwZ69/YHpxnR8cwtVWIvAi4BAiGbBN8lEBaa7TmiHqI HBGa0gHoHMcYH9WvF8ckESuCMMSmqwy9Sc/OtCQdqDLWHj9JhJTHcT1bIm55hHv5jcH4GZ X+3vwAdZLCwSpD7f6LZ6cw6Rnv7n1vlUvkeaj4X14TzqikAShxt1dvTTuKmrXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747855895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kd2yIEt79rJAbix1z3B8UKy+dX+8FF7QgTmyBXzuhNw=; b=IgMH7bqbm+qNJV0PiSy5gS/0PC88dQdDRsPeMX/nRst+4JR4v+UCYqs6vZXUhi2SMxbPjZ gcfuwlKBCJrMUHnTRFfXxkw74enKJrZQaqtY21oTINqQwch//JlNCIYKErAN6lPWdwbkgK c30dgsqoSPmWqoirktqYpAJl88b+3khgXiUJp2FmxFX8oQwCli/wKuKbndt95RF0aZAQFP LHAzCRg3RmlsIGoUQ9XpEc3PDMX1N7mM21Uq4csTB072plPAcB8fBtql370gSTgGrir4Dp OoxhL/7j/81NE0yijnzJD+iB92TDDSOKhNFs+zjxsaDDrINPfUnt95vWotPz9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747855895; a=rsa-sha256; cv=none; b=qaGOka0UnXEkym7PgDlcYYvJVtyeTK5EtJiBB2zk4r/uLglYKsoebxcjnm0R/WXotK1X2v 1DlZUapY2qMASDZUL4IUITgxKUx5W04go1uLCVOhLF1/yOZRvKClrC1OuzeDGrrpiqABl2 MZWKkoSOIOrb+yxhJos4nScTzGr4IgR0dPpJgdXE+ZfrfI0pXHOVfixtyKQHQ/KHtowPPB B2yqb4wbr4+FhtWmBwSx1lIVh1bpxpj9bA/M51GcJ2kq5BswE77FtqtX4hrSeGX3I4uiEM XlmQUavTPR5P+7u/1yfjfmFn8mDzbkWGuOAGFAggr+847e+g2g3AX1Fgdv/hyQ== 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 4b2hPM529wzp17; Wed, 21 May 2025 19:31: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 54LJVZH4077785; Wed, 21 May 2025 19:31:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LJVZ4H077782; Wed, 21 May 2025 19:31:35 GMT (envelope-from git) Date: Wed, 21 May 2025 19:31:35 GMT Message-Id: <202505211931.54LJVZ4H077782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: ac86e65e0e25 - main - sndctl(8): Remove unnecessary val variable from sysctl functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac86e65e0e25a3e3fd6f91b17d2db874cea83c3b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ac86e65e0e25a3e3fd6f91b17d2db874cea83c3b commit ac86e65e0e25a3e3fd6f91b17d2db874cea83c3b Author: Christos Margiolis AuthorDate: 2025-05-21 19:31:17 +0000 Commit: Christos Margiolis CommitDate: 2025-05-21 19:31:17 +0000 sndctl(8): Remove unnecessary val variable from sysctl functions No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50397 --- usr.sbin/sndctl/sndctl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index f362ce840cf7..412ea33e5adf 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -662,12 +662,11 @@ 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); + n = strtol(arg, NULL, 10); if (errno == EINVAL || errno == ERANGE) { - warn("strtol(%s)", val); + warn("strtol(%s)", arg); return (-1); } @@ -699,7 +698,6 @@ 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; @@ -710,10 +708,10 @@ sysctl_str(const char *buf, const char *arg, char *var, size_t varsz) return (-1); } - size = strlen(val); + size = strlen(arg); /* Apply new value. */ - if (sysctlbyname(buf, NULL, 0, val, size) < 0) { - warn("sysctlbyname(%s, %s)", buf, val); + if (sysctlbyname(buf, NULL, 0, arg, size) < 0) { + warn("sysctlbyname(%s, %s)", buf, arg); return (-1); } /* Get size of new string. */ From nobody Wed May 21 19:31:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2hPP0Zp9z5wPc4; Wed, 21 May 2025 19:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2hPN6d9wz3X4t; Wed, 21 May 2025 19:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747855897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bKJ7ajjFFrJspkKkwY5Pva2WbBonO/+t5wLZdfvGjHw=; b=b6rl/orrk0Bm+TNiue8taQLJlzAj3WkVgOuw9OWPPZhIto6Fb4JjsIHQP2NWXQq6bg0W2a OBMAjZ+rpb4Db20xS8mqyCwcXsHlNEB31dhKqg6eMrE+IuuOGSaWUtvJ9r/Ui1fcSNV39g VIpR0wSo5d+T0Su6hqAYBiWMINCcmQk0WB9JgsR4CSEjrcXZ6KwXTMlEMzr/w+j0FAN3aI axXfoIh1UwCRqqWcWMfPU7kTO5X3FAenfqu0M289jqY1KmGi8fz86xX2SqESAC/z5susFR BwlojvcZJG4THoOs27wYwS9aoM1v5TGclRUy8qtSlI4OMLt0RQr0Xo8uSjUkIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747855897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bKJ7ajjFFrJspkKkwY5Pva2WbBonO/+t5wLZdfvGjHw=; b=meCKYRVxMqNos98z61cJz8PO6JosrzIIngaiY8QbMBYkovTQObEM86DjB2pMxBDenHUsv5 4gIpPs8+ChxL+iOXq5u0yeWL8n+9qnYzuoFLmyvEb5SSC/Ym7V/Fr5LgVTgc750g09DzI0 5Jf2D95Z73gJRYBhsNRuv2kGikfAf0l9fX5Vsuf0Q3GjPIqJZ5vQqtFAPyu87BFbyX8+F4 XGD0WeH2OXshVsBcZP99d/trfU0XUYzzmSr7P+DG5MRgbJeFzOqatZyARRybJLy9l7g7Zj IqUO5amy2CzagQOSbLg57MNHD3kCr/a8L/nkVEeBr8hDLRhxw7oJJ/2lyTeafw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747855897; a=rsa-sha256; cv=none; b=OhAmgtjcGvktAGYE+FSLS9Ha5wqsLOLgsMTK2chWj865zYfCZ/UaXfvlZwXvklejtIl509 tZQoSgQ9UwWfeTI+rgWFi1eKSHoQsi0kr+Uj+Gd3Gou2EnTZYPsKh+1QQ8OBpIHgBxu04s pJEE03sJVa9j+FSOhQxszbOLfZZcAfdiPJSBKKg9AoEvrEJXO1I8UqtHrt4N/mVvz6MBUx Kcdns/YPluCtcWoTHNSKV/u28bNUcWe9RXby/iU+OYpdXj/x3/3Q4CGHfmStM+7f3kukob 5iE4v3TUpc7N7fGAALyqof6rwatGV0nxSDVPVXdfxxVw8twONqyQi5p3bqq7VQ== 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 4b2hPN5ylFznxL; Wed, 21 May 2025 19:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54LJVasN077819; Wed, 21 May 2025 19:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LJVa0H077816; Wed, 21 May 2025 19:31:36 GMT (envelope-from git) Date: Wed, 21 May 2025 19:31:36 GMT Message-Id: <202505211931.54LJVa0H077816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 52c426327403 - main - sndctl(8): Allow read-only sysctls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52c4263274031d599aebfaed2862ae85b482953a Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=52c4263274031d599aebfaed2862ae85b482953a commit 52c4263274031d599aebfaed2862ae85b482953a Author: Christos Margiolis AuthorDate: 2025-05-21 19:31:23 +0000 Commit: Christos Margiolis CommitDate: 2025-05-21 19:31:23 +0000 sndctl(8): Allow read-only sysctls Needed by follow-up patch. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50398 --- usr.sbin/sndctl/sndctl.c | 56 +++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index 412ea33e5adf..4d3ae0cf526c 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -664,30 +664,37 @@ sysctl_int(const char *buf, const char *arg, int *var) size_t size; int n, prev; - n = strtol(arg, NULL, 10); - if (errno == EINVAL || errno == ERANGE) { - warn("strtol(%s)", arg); - 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-only. */ + if (arg != NULL) { + errno = 0; + n = strtol(arg, NULL, 10); + if (errno == EINVAL || errno == ERANGE) { + warn("strtol(%s)", arg); + 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 (arg != NULL) + printf("%s: %d -> %d\n", buf, prev, n); if (var != NULL) *var = n; @@ -708,17 +715,21 @@ sysctl_str(const char *buf, const char *arg, char *var, size_t varsz) return (-1); } - size = strlen(arg); - /* Apply new value. */ - if (sysctlbyname(buf, NULL, 0, arg, size) < 0) { - warn("sysctlbyname(%s, %s)", buf, arg); - return (-1); - } - /* Get size of new string. */ - if (sysctlbyname(buf, NULL, &size, NULL, 0) < 0) { - warn("sysctlbyname(%s)", buf); - return (-1); + /* Read-only. */ + if (arg != NULL) { + size = strlen(arg); + /* Apply new value. */ + if (sysctlbyname(buf, NULL, 0, arg, size) < 0) { + warn("sysctlbyname(%s, %s)", buf, arg); + 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. */ @@ -728,7 +739,8 @@ sysctl_str(const char *buf, const char *arg, char *var, size_t varsz) return (-1); } - printf("%s: %s -> %s\n", buf, prev, tmp); + if (arg != NULL) + printf("%s: %s -> %s\n", buf, prev, tmp); if (var != NULL) strlcpy(var, tmp, varsz); free(tmp); From nobody Wed May 21 19:31:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2hPQ109Nz5wQ00; Wed, 21 May 2025 19:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2hPQ020lz3X7D; Wed, 21 May 2025 19:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747855898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVpRgWP+q3bzmQu177tiNyXfnXB6o3Qi1VMgR/lcQ+8=; b=BwiFi8t2YmEgjuFFFIRMKgiEe1yfgjPdZ+el7NkPsVmfpcDIE+m+eYVLILqGzVT0Yvsa0s uEJYHSRj0fNTqcp7DVKVGOejM7x+ItoshkMfRph82ncJ0QN3Lnvu5fuKbppyrFc4mRAZe2 mSR1OWhtuYLf3l9+SxQaZQ4BfoOsVO/0FJ6gLjsktSfBywN8X8LZTT+tCRwVyGxW/vK43L edO+jQ6jUk9o1QlXj24sZ7Za1MwqUqWHblAoIwPG6Hry1WKcBCTHoaArGkBG5A5Veibsjf A4ZIReOlmW/Cza9tg+Aoij6ReOBylxQGr4EhQhxrlJ4Gu040553wQfV8+FhJcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747855898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVpRgWP+q3bzmQu177tiNyXfnXB6o3Qi1VMgR/lcQ+8=; b=DKucJPCHam7ZoSFOokfkdWSh1x0uuB6t0SpewIZY//T2UgYASVepzLh+iMVIQU8a0DS+F7 Y8mONiJHbABIneOLXu9pghiF0njEeupJWSlja7r799ETQn+YRyUSuwR4lNwYqtyESeZ5bg KbDM2o6IMrAkYKhTnQtZaAkxnfH3SwivmF5Dg15k7IPJWXDpGy+5RvsdiMNR2h9EwVPDkR a+h/YNfeA7ZHHLCZQKU9JNOMN9ogvZMdRpvjbEd39/+9TStOJ48IcYjXhwOZ595yBcwONq h9FLG3GCxkORAywb5vnFoSokeQ2ihsG3wxc8wouy4mIfA4pw0SXuQ2prGXrxuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747855898; a=rsa-sha256; cv=none; b=bp4f4C0tA12IVCRwogcUyC0En06VLKZflhJcy2qubvkHGltKjTgjPAmB2UjqLstaIRZEb5 sNjF1bbQ23kJPx2ASDf4wYCeP9kl9cusVmaLrzeZDWOTJUIMvYpLRdWPLx0IR8/uDA9cnB huq/wX1j3pCR8E1lHGDQMfyiBHIWaqLPX2pPafPBb0QXjmePsy+K+6tmIVQ3PHTxTPVLg/ zm2ekLf6Oj3dWna1SuwlUgAEp9ifYYZUflp7DqSIWzQrcXGvEhm+xlSk840h0HYV5gciAh 7gVgbloqq4n9mAPqkZqhY1YvpM+zST1IjfcMDHu+JHECt36BwbOx8an/obJDnA== 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 4b2hPP6d0NznrK; Wed, 21 May 2025 19:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54LJVbEx077853; Wed, 21 May 2025 19:31:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LJVbkq077850; Wed, 21 May 2025 19:31:37 GMT (envelope-from git) Date: Wed, 21 May 2025 19:31:37 GMT Message-Id: <202505211931.54LJVbkq077850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 30fd79b0c0a3 - main - sndctl(8): Fix dp->realtime List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30fd79b0c0a328536b166e7fa9170b059e711303 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=30fd79b0c0a328536b166e7fa9170b059e711303 commit 30fd79b0c0a328536b166e7fa9170b059e711303 Author: Christos Margiolis AuthorDate: 2025-05-21 19:31:28 +0000 Commit: Christos Margiolis CommitDate: 2025-05-21 19:31:28 +0000 sndctl(8): Fix dp->realtime Currently it's automatically set to 0 in read_dev() as a result of allocating dp with calloc(). Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50400 --- usr.sbin/sndctl/sndctl.c | 189 ++++++++++++++++++++++++----------------------- 1 file changed, 98 insertions(+), 91 deletions(-) diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index 4d3ae0cf526c..156c845481c5 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -333,6 +333,96 @@ bytes2frames(int bytes, int fmt) return (bytes / (samplesz * ch)); } +static int +sysctl_int(const char *buf, const char *arg, int *var) +{ + size_t size; + int n, prev; + + size = sizeof(int); + /* Read current value. */ + if (sysctlbyname(buf, &prev, &size, NULL, 0) < 0) { + warn("sysctlbyname(%s)", buf); + return (-1); + } + + /* Read-only. */ + if (arg != NULL) { + errno = 0; + n = strtol(arg, NULL, 10); + if (errno == EINVAL || errno == ERANGE) { + warn("strtol(%s)", arg); + 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); + } + + if (arg != NULL) + 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; + 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); + } + + /* Read-only. */ + if (arg != NULL) { + size = strlen(arg); + /* Apply new value. */ + if (sysctlbyname(buf, NULL, 0, arg, size) < 0) { + warn("sysctlbyname(%s, %s)", buf, arg); + 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); + } + + if (arg != NULL) + printf("%s: %s -> %s\n", buf, prev, tmp); + if (var != NULL) + strlcpy(var, tmp, varsz); + free(tmp); + + return (0); +} + static struct snd_dev * read_dev(char *path) { @@ -343,7 +433,7 @@ read_dev(char *path) struct snd_dev *dp = NULL; struct snd_chan *ch; size_t nitems, nchans, i, j; - int fd, caps, unit; + int fd, caps, unit, t1, t2, t3; if ((fd = open("/dev/sndstat", O_RDONLY)) < 0) err(1, "open(/dev/sndstat)"); @@ -456,6 +546,13 @@ read_dev(char *path) dp->autoconv = (dp->play.vchans || dp->rec.vchans) && !dp->bitperfect; + if (sysctl_int("hw.snd.latency", NULL, &t1) || + sysctl_int("hw.snd.latency_profile", NULL, &t2) || + sysctl_int("kern.timecounter.alloweddeviation", NULL, &t3)) + err(1, "%s: sysctl", dp->name); + if (t1 == 0 && t2 == 0 && t3 == 0) + dp->realtime = 1; + 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); @@ -658,96 +755,6 @@ print_dev(struct snd_dev *dp) } } -static int -sysctl_int(const char *buf, const char *arg, int *var) -{ - size_t size; - int n, prev; - - size = sizeof(int); - /* Read current value. */ - if (sysctlbyname(buf, &prev, &size, NULL, 0) < 0) { - warn("sysctlbyname(%s)", buf); - return (-1); - } - - /* Read-only. */ - if (arg != NULL) { - errno = 0; - n = strtol(arg, NULL, 10); - if (errno == EINVAL || errno == ERANGE) { - warn("strtol(%s)", arg); - 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); - } - - if (arg != NULL) - 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; - 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); - } - - /* Read-only. */ - if (arg != NULL) { - size = strlen(arg); - /* Apply new value. */ - if (sysctlbyname(buf, NULL, 0, arg, size) < 0) { - warn("sysctlbyname(%s, %s)", buf, arg); - 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); - } - - if (arg != NULL) - printf("%s: %s -> %s\n", buf, prev, tmp); - if (var != NULL) - strlcpy(var, tmp, varsz); - free(tmp); - - return (0); -} - static int mod_bitperfect(struct snd_dev *dp, void *arg) { From nobody Thu May 22 02:42:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2syZ71FLz5wx29; Thu, 22 May 2025 02:42:30 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2syZ5r8Sz3mtv; Thu, 22 May 2025 02:42:30 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747881750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aLjWoJ6YZbCeFxq88hhkdpmz0a+A0WY9zv6Zw5BL52o=; b=eb2JllwSydiQ0xBRi+LySf82YGtQvCvl/5Q4IdHYYbKYOgNRL/xaQUmz0oBG/5AizUiqnw HMIZZO5BEOV6bN7Zhc2tnx2Na7TumAHUigMDUtAecpO9UebyEpFXBSDYpUKWwrgKmSdC15 JpFNJUXgGSrW87L+YA0rhJLnDE0pCEdv/kl/+UucG9RnvgZHLYCDr0vz0WKBpmDaaoMmf/ mgA3UOAGQDwDCQRZL04CnQTTCf9n3kEhFmGnirvYtPKQL8h3pbLTWfBk611icSv3znIA8e blIc3INwTDy6OhB1lsB9202GdSS0xkFmXNKynqeStqgW6OEnMY99+x7A4ujoKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747881750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aLjWoJ6YZbCeFxq88hhkdpmz0a+A0WY9zv6Zw5BL52o=; b=JPDFqsI2j1l3N6ysHl+eMf+aaYIg8maPUt17qDL2dOGUKNixhWNOzI+849zDAfEtC4FSEI FC14OKn+4Qtr/5I2C6r6pn5TP692rbBZDcPcueiX0S/zEbzVHRELvWYZMyMq5gEHr9WCeq HnkUgQHlQl382UQ62HnmlI4kOLjmnTOALFEJpmNJy+LDTvIl6UchqE1t2hjh05bEu+IpMr iutDtG5QwCCA/hLM73y+pJPZwCL8hLXeCJG25yum4sx27HJU6SQkiW8FMHe9VIKMzMmhpb AdX9TJA+dcuyRWsckUDZiPdkXypevKeoXt6YQRlyQ5jT99mm3O2kxK6bOhA+sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747881750; a=rsa-sha256; cv=none; b=arHE8UkNu2VL6ikUYvaSQQ60VEQH+HAZjfx5tzloCtBmdg3YXbIIiYtzwGOQjFQAhM6UR8 vJAbzkwHMCesGdRYXBq/GlCwla1+GdR2nmjbM/7LNrVAB2Z6wvzrcUOego+qjSf83VzmW9 ZCwLnWtJsJlgzSn/ZAoOFMYBI8bwelAFWxa8DxlEwwPTjbHKw66ZITW4GXwdrBSFIIGp30 fOkem+JMZbZPsxKuf4M1HAjJru/mbRJK3dmUVDLc2ImazWPsZdSlDMg8FsIPA8VXi8O80s ukSrc8Dnn1BPVMRhyj6AIT9KkP+ov+87ts4ZdWu0X3UBYs24LsRmgRegNNxXvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [172.20.3.247] (unknown [50.222.117.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b2syZ4F71zMx5; Thu, 22 May 2025 02:42:30 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.97.25051816 Date: Wed, 21 May 2025 22:42:27 -0400 Subject: Re: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush From: Ravi Pokala To: Andriy Gapon , , , , Message-ID: <37BF51C0-C631-493F-B3AF-3AA9FC32551B@panasas.com> Thread-Topic: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush References: <202505201457.54KEvD1r053951@gitrepo.freebsd.org> <1a11f640-be62-4f4e-b537-70806ac54831@FreeBSD.org> In-Reply-To: List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable > Additionally, ns8250_bus_transmit uses ns8250_drain(UART_DRAIN_TRANSMITTE= R) in broken_txfifo case. FWIW, I just had to enable the 'hw.broken_txfifo=3D1' workaround on physical = hardware; see [Bug 286703]. Thanks, Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of Andriy Gapon > Date: Tuesday, May 20, 2025 at 17:12 To: >, >, >, > Subject: Re: git: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR= _TEMT for checking tx flush On 20/05/2025 21:28, Michal Meloun wrote: >=20 >=20 > On 20.05.2025 16:57, Andriy Gapon wrote: >> The branch main has been updated by avg: >> >> URL: https://cgit.FreeBSD.org/src/commit/? =20 >> id=3D0d2fd5b99c95329085d0700a4dd38507a054a50d >> >> commit 0d2fd5b99c95329085d0700a4dd38507a054a50d >> Author: Andriy Gapon > >> AuthorDate: 2024-11-10 11:15:30 +0000 >> Commit: Andriy Gapon > >> CommitDate: 2025-05-20 14:55:18 +0000 >> >> ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush >> LSR_TEMT bit is set if both transmit hold and shift registers are >> empty, but the flush command flushes only the hold register. > I don't think that's true.=20 I am not sure to which part of the commit message your "that" refers to, so= I'll=20 try to justify everything. T_H_R_E - transmitter holding register empty T_EMPT - transmitter empty All hardware documentation that I have around describes those bits like tha= t. We do not have direct control over the shift register, hardware clears it a= fter=20 sending. > Imho, ns8250_flush() is used also before changing > baud rate, so we need to ensure that all bits are flushed, including the > transmit register. That's an interesting point. My intention was actually to avoid bogus "FCR is broken" message which can=20 happen because of a race between the UART transmission and code execution. I think that LSR_THRE is proper for checking that FCR works. But to actually detect and ensure that all transmission has completed we sh= ould=20 use LSR_TEMT like you say. At the same time, this UART flush is not like stdout flush, of course, wher= e we=20 ensure that all buffered data is transmitted. For UART, we just clear the F= IFO=20 and the holding register. So, I am not sure if polling for empty transmitte= r is=20 important. Besides, I do not see the code which would flush transmitter when parameter= s are=20 changing. I can find only two places where UART_FLUSH_TRANSMITTER is passed: - ns8250_bus_attach - ns8250_bus_probe Additionally, ns8250_bus_transmit uses ns8250_drain(UART_DRAIN_TRANSMITTER)= in=20 broken_txfifo case. P.S. Maybe I don't understand the code, but UART_FLUSH_RECEIVER in ns8250_bus_at= tach=20 looks strange to me. It's one thing to flush data while in the loop-back mo= de,=20 but I think that in ns8250_bus_attach the hardware is fully set up to recei= ve=20 data from the outside world. So, how can we hope to drain all of it and to=20 reliably detect whether FIFO flushing works. I mean that something on the o= ther=20 end could be continuously transmitting. --=20 Andriy Gapon From nobody Thu May 22 06:37:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b2zB85T54z5vxf5; Thu, 22 May 2025 06:37:52 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b2zB850byz3hdq; Thu, 22 May 2025 06:37:52 +0000 (UTC) (envelope-from mmel@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747895872; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lqC3sHaFUOshDTtJKqSjmYx/3tkGLc/Pbri5hy+n2os=; b=I7nhh/HCW1vDefnaSBMZhAvRTlN0WuPguOSZXl1T/9AcOq2P5f1lM4TDt25GnUeSsVG8em 9UZYN5q0o4vJqS9EeCReVqjhDXWG08tJrXE15he6dhEV036bsnkqb8t5cQXeFHbLrZlUV7 NefLInKQ5zQsbLD9cnkNJOVAmJeZHkf3kkt9As4/LJ+sQBMdOqxqZMnYui6tnCvArO4yrs ba+Upt25HWVpIQN5xpugdoFkbvnzU9IP0wE3ErEubJEfOWY96yZ9UBzAiLxZGW8+g5OqP/ qUeB//hUgzZpgGfQkugnzkz34TiEqVMY7G5GAx1VzNa+AMeoHAPDKQ5aVgDpiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747895872; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lqC3sHaFUOshDTtJKqSjmYx/3tkGLc/Pbri5hy+n2os=; b=iqqp/jrFZLGdYa9cpYxg9NUMi1ELrzhrqxj3Iznj0ZHHew4Yh3hoaWQw2yh0XHf1yntwUe lC66QZIRPqn40rYG5F/MBlAYYgnDVlrCmMS8LsCL7fJdq9eZA+E8sv34zc6TNjpzUwegoD cHrkmmAzB7ldYW1vgY6U35SZja4yLj6cmNzJ27USvq3oXNmhvlbF6/M7q5KDofeOp5Rgix U+hQuW2G14+VmoSlrUMmRM5rEkkIR463xKJzNRPbUeteBXjTcHodgQF2V48PWVDosi8JDO 7h0uQIlCOcmEYOiW+/lH4zp4MPHBNk3en0qUt0AqstMlkFMrjsepJlUhSysRMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747895872; a=rsa-sha256; cv=none; b=PYer8OlCsUcMQMuj33/YAzicCzg6gyxtQYcdfRbbfpPrCeq3tHyHqX1nN2QkGs1wsw+rjC CiId1GKoImwbuk5OshJRHiVXiHMQ/XmGfo3cM08zdyFHBM38kCgqowmnibch6Cg+2/cJeD JNT7Un9cxzA6S6C7PlmtCtUMAe6QYEcXzHSMI7BosMJmVQDIJ4wYZnSkHTuPPdJ1jdHasa KgjhizG7zQcFsow2WpR6BlTnoWcfOSyYSS4v+73I21w08MYztIOyGaf7uCFiU4iNid5x+o ULdLydAWJf5E1M+z+rF+SMyDvKkImiej4Gqs6DoK19OkkF8bNXgafeTJF8fTzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2001:67c:14a0:5fe0:74eb:656:ad38:73a0] (unknown [IPv6:2001:67c:14a0:5fe0:74eb:656:ad38:73a0]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mmel/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b2zB76JCpzZKC; Thu, 22 May 2025 06:37:51 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Message-ID: <13b1bbfe-4a60-4c4a-aa4e-ed168cb1286a@FreeBSD.org> Date: Thu, 22 May 2025 08:37:49 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: mmel@FreeBSD.org Reply-To: mmel@FreeBSD.org Subject: Re: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush To: Ravi Pokala , Andriy Gapon , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505201457.54KEvD1r053951@gitrepo.freebsd.org> <1a11f640-be62-4f4e-b537-70806ac54831@FreeBSD.org> <37BF51C0-C631-493F-B3AF-3AA9FC32551B@panasas.com> Content-Language: cs, en-US In-Reply-To: <37BF51C0-C631-493F-B3AF-3AA9FC32551B@panasas.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 22.05.2025 4:42, Ravi Pokala wrote: >> Additionally, ns8250_bus_transmit uses ns8250_drain(UART_DRAIN_TRANSMITTER) in broken_txfifo case. > > FWIW, I just had to enable the 'hw.broken_txfifo=1' workaround on physical hardware; see [Bug 286703]. > > Thanks, > > Ravi (rpokala@) > > -----Original Message----- > From: > on behalf of Andriy Gapon > > Date: Tuesday, May 20, 2025 at 17:12 > To: >, >, >, > > Subject: Re: git: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush > > > On 20/05/2025 21:28, Michal Meloun wrote: >> >> >> On 20.05.2025 16:57, Andriy Gapon wrote: >>> The branch main has been updated by avg: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/? >>> id=0d2fd5b99c95329085d0700a4dd38507a054a50d >>> >>> commit 0d2fd5b99c95329085d0700a4dd38507a054a50d >>> Author: Andriy Gapon > >>> AuthorDate: 2024-11-10 11:15:30 +0000 >>> Commit: Andriy Gapon > >>> CommitDate: 2025-05-20 14:55:18 +0000 >>> >>> ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush > > >>> LSR_TEMT bit is set if both transmit hold and shift registers are >>> empty, but the flush command flushes only the hold register. >> I don't think that's true. > > > I am not sure to which part of the commit message your "that" refers to, so I'll > try to justify everything. > > > T_H_R_E - transmitter holding register empty > T_EMPT - transmitter empty > > > All hardware documentation that I have around describes those bits like that. > We do not have direct control over the shift register, hardware clears it after > sending. > > >> Imho, ns8250_flush() is used also before changing >> baud rate, so we need to ensure that all bits are flushed, including the >> transmit register. > > > That's an interesting point. > > > My intention was actually to avoid bogus "FCR is broken" message which can > happen because of a race between the UART transmission and code execution. > I think that LSR_THRE is proper for checking that FCR works. > > > But to actually detect and ensure that all transmission has completed we should > use LSR_TEMT like you say. > > > At the same time, this UART flush is not like stdout flush, of course, where we > ensure that all buffered data is transmitted. For UART, we just clear the FIFO > and the holding register. So, I am not sure if polling for empty transmitter is > important. > > > Besides, I do not see the code which would flush transmitter when parameters are > changing. > I can find only two places where UART_FLUSH_TRANSMITTER is passed: > - ns8250_bus_attach > - ns8250_bus_probe > > > Additionally, ns8250_bus_transmit uses ns8250_drain(UART_DRAIN_TRANSMITTER) in > broken_txfifo case. > > Oups, I take it back and apologize for the noise. The short story is that I was confused by my local uart driver changes and mistook ns8250_flush() for ns8250_drain(). The long story is that I have several control and measurement devices connected via serial port. These need a dynamic baud rate change because they communicate at a low baud rate (for robustness), but perform bulk transfers of measurement data at a higher baud rate. Because of this, I modified the uart ioctl to handle TIOCSETA/W/F/ ioctls which are, of course, implemented by ns8250_drain() and ns8250_flush(). This allows the control application to send a baud rate change message, wait for all data (including the transmit register) to be sent, and then safely change the baud rate. Again,sorry for the noise. > P.S. > > > Maybe I don't understand the code, but UART_FLUSH_RECEIVER in ns8250_bus_attach > looks strange to me. It's one thing to flush data while in the loop-back mode, > but I think that in ns8250_bus_attach the hardware is fully set up to receive > data from the outside world. So, how can we hope to drain all of it and to > reliably detect whether FIFO flushing works. I mean that something on the other > end could be continuously transmitting. > > I'm not sure if I understand you exactly, but in loop-back mode the RX input is internally connected to the TX output (i.e. disconnected from the outside world). So from that perspective, the FIFO detection and flush seems fine to me. Michal From nobody Thu May 22 08:02:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b313m498Pz5w3fY; Thu, 22 May 2025 08:02:28 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b313m3jZSz497p; Thu, 22 May 2025 08:02:28 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747900948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=kDD09aDLo5BjBMd9i+eUXw7e2OWrCxC3M55PrTK7SpM=; b=svxw9v6LILuw9FrWYJk1QR3F7gz/ZFb2PByI49F0HuHyh07oueeyxw24R+9HnDNQfnlfDk uIMGtMZ1tyh5ibG20O8U3UKX031jMTU6S0f9oCMt1MFMp8qmeOVX7rakUlNrzYz5OqRNtV hdYGwgD3bHgDzuquIo9mHmJSWpOmVPj8NsQNMOjmps9OUBfT/V7qPIqhD2ZP5ohoNRVhNV kv0BCNVnQGBWjzcbEjmjBWHFlSXhT6YJb5LUM1cRotRofl03IGKQ/2UEEufl4cTlvrCmfD ZKgkrTUOOfqvTN8NoUlM3BJVsYaRFh6A+LBtPf3iCG0okSuk6hWtRcFCZlFXsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747900948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=kDD09aDLo5BjBMd9i+eUXw7e2OWrCxC3M55PrTK7SpM=; b=HUNIKt1c9zJmpfJf6kOj14JzMsqPRNCDmQx6xmgjpuzB5muZrKj5USUj5OOpGcWHHpzr/i gqxZcYRaGl1cUhZRZcKadk2UVbm9Hg4vQxovufyuKHaeQKrqBmtqtnptJFWlvw17xr5HN0 dXZtk7aJEix+hszizWQ2dYp+1DlEg6rzB67KGSBeI01EXCz6ROGJKa6Whs4fsuj4eJKaC3 za2ZrbBz5gG0mGN5fqLHA6M2dKObiknfv2dKt2MT3ByHD8zhygnunNDBb5IFHavPEUQ/Oa wPGwr9kxBjNtMsY9BwXZ0Fy0aVlbCOxDoy6ioOqakZusSNd/bNXKvYBWXqrvfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747900948; a=rsa-sha256; cv=none; b=MpEdiKmx6yKSJM99nlwIFuSRb6DGSzlWQOfYs4Dyn2dCTQA84U4cCEmW9aTOP0inL9FkX9 ZjJotyN5+F7bu45BjNAaiwZYld+tc6QT/1msye6UrGC10/KKKKtyNC6RT5cS4C+6A4Cd/c WZlnGfWlEWlZv3SMozFvq1E958Y4CuaDJS+sxduUMpMFI5t4Rp34k3Y1doEMneJcY4acRw ik7q8g+KebSQHxgzrx5Ri9YQgyZop7U9dyhYeADELe7YJGzRbfLYOVhTWIav1aoNxeTcZP rN0CqWfpA+9lLeEBfRk7bOep/NFqNpPe6zq/8jBA/JVN+xWliX98dUMXKyA1Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.0.88] (unknown [93.188.39.137]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b313l65JGzlBT; Thu, 22 May 2025 08:02:27 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: Date: Thu, 22 May 2025 11:02:24 +0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Andriy Gapon Subject: Re: 0d2fd5b99c95 - main - ns8250: use LSR_THRE instead of LSR_TEMT for checking tx flush To: mmel@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505201457.54KEvD1r053951@gitrepo.freebsd.org> <1a11f640-be62-4f4e-b537-70806ac54831@FreeBSD.org> <37BF51C0-C631-493F-B3AF-3AA9FC32551B@panasas.com> <13b1bbfe-4a60-4c4a-aa4e-ed168cb1286a@FreeBSD.org> Content-Language: en-US Autocrypt: addr=avg@FreeBSD.org; keydata= xsDNBGcKrHEBDADRvwQOK0b/yo4ys5cs6bOQMhEh4xtfbaZ/CU00cpPgUip3sOZCdrtMWlRC g25z97prxE9pKueZi+HXDhIPpa9xl14ghqF4oYScuJ1i18HyiOH2y5Q3Vv/TtFiSzicd3EAu QgS3jVidpgDSPDdj2Yz3UxYpZ+PuFl6nOnvCvqOFcjUlzKCyPaiN2b86l1Nscmhnc+zQ/faB erUOEFEDQbWMA5YfXi8HrbeR16hfRfGt7E0aMDlIj9FIPIq71UWMN9CimPgs4+rbNr1MAlLa z4GxSDhVYZEY5rqtCzr+PLXboRQWnaUwXl0/biw9enf17NHdYv1SNAFTX2eC4dZ3qBVI74dS PgNprm+PMfz+6Hhs/dAv+Nan5nVhg3EFIjYTiy0MnjMSq8uI0v0ykpAGAcJJ5xl6d23aLxgN 6f0z6pJRCO0hGPgU7UzvFD0MxJxmbzqdT1R51KDan1oD41b+tjl2LMBuCDCoB0U44Pu0zLdp xMfFTxCXtwIYKIUxwd28jwMAEQEAAc0eQW5kcml5IEdhcG9uIDxhdmdARnJlZUJTRC5vcmc+ wsENBBMBCAA3FiEEmXvSmjiQFHPVOpLnzDOt5NLj67sFAmcKrHEFCQeEzgACGwMECwkIBwUV CAkKCwUWAgMBAAAKCRDMM63k0uPru5tSDACFK15LLbq89RSQ6QMnjiIm1t/wYJyumb519MHu Dhzxx1lbr8oghf0RHtF6kYRLQPaW2VdToi74pRobd3CN4bhZKDLSL6WfTn17RfavDjL6Njwp KBo30CkOeYKWq1mDmo0xEoQj8cc7ybEZnus+YScZOpj8Ti4EFwhRt6SHer7YDb161IHKL8m4 MsCxpFSGEjbKj8Iul3Ri/fTOO8w14ivcuEEQIvJt4/+4YV5Az8G23wKzL/3aJ7SOT3oYGmR9 atBTmVO3DlODjM+rZLegd8SfLSPTcBTHspWE5duemIzZbEX3BP77r3Qx4Fo5Tkit3bG1XVar yPQato+sFGFEGifdE9USBQoAoOaaeZevwAWjDU0TIuCT0CUe0sKtQuNP4LRq0n9EEHOXBu9a CfdMhFUSkAZnuE7miSVwgPvoVNJ1stA37EXLN/sVsWik7wslTQ5vF81VpdGFiwoQPOe2XEKh ogcwGSnXbwv1gD4x+Gz/7Y+kFyr1NY+4/nSaeXVcS2fOwM0EZwqscgEMAMQTe6ypAmQe/TFO HqKD2hfFKdksTptKi6uEh8xIwct8G/0FBldDWXo9eu8CGr/ZrDg0/bAwJxbaLRQCMH19Gq2Y hLvZ1QK5GQJVzZKcqfxbF2LiDUTs6WkdOBIhGpdDy7p1xFrvqCGCtNFYHuGYm067EozibBSF BWAPstKu2FQuVHZNMOfs7p3OIz3Yfqu9woXDeg3/8G2qVQJINe+8EwXKlhgh4CyDbq7nAZoA kIu1SE9z9u3WI5mcNy/0dFmVUsFxBqRC3ewbvzie8tKyZ9yFOlaZPT0Y4nRBXQTI3mLZ8zQ8 mtrWK5OOmrJ02kdeO9RBXe+OMaUUWMf92ZIoBFb4HP6N+B+4N1y1OwULousfl7JRoYxA4MRL ls7E2sSoJvrEBTJB3Pc34xu8rsJ1A5V3NgN6djX8yEZYpTRkcmrBeWy/ofDqZPVqneAx0LRm eldDS9msXDW4KXODyPZ+9unvmHAcoH0xaBYaSH44CDZDQDg4LNcmbOvuu1TEXBJhjQARAQAB wsD8BBgBCAAmFiEEmXvSmjiQFHPVOpLnzDOt5NLj67sFAmcKrHMFCQeEzgACGwwACgkQzDOt 5NLj67sUCAv5AXqgWnYN9EblapMbZjkiqL8pZQ0GNqh+Pg9FwbyULxjtRTO6rD4D0IxizByb ef+neeUNyYlagt5nfKMysEr0SU/gHKCi8vyTF/63ukMrGUNGmJJxrndl5ZYKC6j6eX7twrZF L1Uvlmn6FnQ22red5kHO93fDjG4zaDIZvHfwj7kzjZ4tpC7Byinf88s14mdZeScc0PnU2hj4 UGYju/wg2FF4YxaZYhcmdTiRYY0Wx85XSMZv19pnn78sadEuRvfRd4JTmw++j1xGXeqQGWzz /CTG5/Ex9GAkQ02hZbmi236byDXoet4G8TEyOph9QFVkV9bNd0jQZaFZPGEj4PSPUYGAF7s5 xJaNGgctC3aZ7WjEv1FBoo44XCU4xcjJ1wZQUrHxRhx6TW0Jtcl0U9qfKFW30TSPo6RyiXuj X4ltWKAtjoXB8nUmEJckaz7IRu2b4pXDeazZuz5JBygUs10yJjDxh2vFQZo0KaBAPx9MZlPn gpPTjT15L8xGftEjQXF6 In-Reply-To: <13b1bbfe-4a60-4c4a-aa4e-ed168cb1286a@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 22/05/2025 09:37, mmel@FreeBSD.org wrote: > I wrote: >> Maybe I don't understand the code, but UART_FLUSH_RECEIVER in ns8250_bus_attach >> looks strange to me. It's one thing to flush data while in the loop-back mode, >> but I think that in ns8250_bus_attach the hardware is fully set up to receive >> data from the outside world. So, how can we hope to drain all of it and to >> reliably detect whether FIFO flushing works. I mean that something on the other >> end could be continuously transmitting. >> > I'm not sure if I understand you exactly, but in loop-back mode the RX input is > internally connected to the TX output (i.e. disconnected from the outside > world). So from that perspective, the FIFO detection and flush seems fine to me. Right. Loop-back mode is used in probe, but in attach the UART is in normal mode as far as I can tell. -- Andriy Gapon From nobody Thu May 22 14:39:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b39tN6qJsz5wlRS; Thu, 22 May 2025 14:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b39tN6Cpfz49xW; Thu, 22 May 2025 14:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747924796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MlSEcGWGLQvSx3zHzu4fRpANuM253uAL1R9PYMOf2xM=; b=ixbuVa494rzIqwWRJ166FSZy63fmzW8/jjMIkgVR/NcmV5WRSIcx2Nchny8esW+U8mnpVD Q43BofxwNX+rEuStVnN2aTxichZugb6jN/LIvd6yOxhtij3k1XyUfBwfO2KvopQ/QK6oqS Amx9HLK3bWtJm1qB9JEgoMoZ/gP7riPxkZSZFYkdA5w1IGeBRThwN8QYrjmrMAWziXbyYC //9OnQI9d5dNs0nk/lHFrzytFAmMoQTje4UC4GCSBt7UDu1VhByR95nW0NwoPxC5w5i7Zq FK0v5+Bz0F21UReOUGtwjNLAqMqfvDMNWoAYqPiiU83uI7LseRB4YiK3xbRX6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747924796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MlSEcGWGLQvSx3zHzu4fRpANuM253uAL1R9PYMOf2xM=; b=dT6IrzGVlury1CZVv68DGSA6c3mGSfF3W93tFZudPHmstJT1HzLPh+dtzC5WTibb3loaQW xWwCuoJ4kq4rTz/keQQLeNZn4pODrlFUBYPNQC1TT09TcRFbiXI7AVJ6+gegAlZM9XXjUX BPFu1XjnXBSaPAUf0o5htbQFQoLhcN+GGvp6W0y9hGmr/GhJvC9dZxzZ7P0DtutTA4SAZh hEW4tl96GVt5vlgd2l1tNEb3Gi/fFa/Sm0VskATL1PGhQsbMT0rZBz9yjjMX70VU2LMlVK laoG/vPEdBqdpa7jciBtw1orYhOsLwJhwV7oeNT4HpjB/G7FLKnnm8g98X0Nvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747924796; a=rsa-sha256; cv=none; b=OUoyTfKvJD79ZBFfGHN6rASSrN2VYr9vQ6u0cSWmtTt6xHj7tK7svTuUnULszd62NZA1zW cM95kIP9CuVBMWqWSWaOnfEwz1cI4FoA5mzCK7d12u+AyLcOWqD4ZNJvlt55074jHq71m9 tpKcPZdnULJS1US+uRO+86RB5tCqt4bthlhwkwU1WBsbPLcNLPD5s5gJcXhLfSpaLTDmf4 fjFNxfhhJ3E83SUg8MnKnsQF1TeLbOIBimSaFd2lJcsDUMfCtA1HlobOw+jSglKxwKMMa9 /WYgSK5HhY47nEUPYfuoNWWrZxYeGfwdirdrfQnUuH+Tl3My9QqfqdZFC0hzGA== 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 4b39tN5DG7z8B7; Thu, 22 May 2025 14:39:56 +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 54MEduMt016658; Thu, 22 May 2025 14:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MEduaR016655; Thu, 22 May 2025 14:39:56 GMT (envelope-from git) Date: Thu, 22 May 2025 14:39:56 GMT Message-Id: <202505221439.54MEduaR016655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 903d29469ecb - main - vnode_if: Remove some branching around SDT probes in VOP wrappers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 903d29469ecb4212c2eed382dc0c5d4536d413b0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=903d29469ecb4212c2eed382dc0c5d4536d413b0 commit 903d29469ecb4212c2eed382dc0c5d4536d413b0 Author: Mark Johnston AuthorDate: 2025-05-22 14:37:49 +0000 Commit: Mark Johnston CommitDate: 2025-05-22 14:37:49 +0000 vnode_if: Remove some branching around SDT probes in VOP wrappers Now that SDT is implemented using hot-patching, SDT_PROBE* no longer introduces a branch instruction, so the SDT_PROBES_ENABLED() check in each VOP_*_APV() is not really worth preserving. Reviewed by: olce, kib Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50423 --- sys/tools/vnode_if.awk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 2326d0e28956..d23c2af9bd9a 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -401,13 +401,9 @@ while ((getline < srcfile) > 0) { add_pre(name); for (i = 0; i < numargs; ++i) add_debug_code(name, args[i], "Entry", "\t"); - printc("\tif (!SDT_PROBES_ENABLED()) {"); - printc("\t\trc = vop->"name"(a);") - printc("\t} else {") - printc("\t\tSDT_PROBE2(vfs, vop, " name ", entry, a->a_" args[0] ", a);"); - printc("\t\trc = vop->"name"(a);") - printc("\t\tSDT_PROBE3(vfs, vop, " name ", return, a->a_" args[0] ", a, rc);"); - printc("\t}") + printc("\tSDT_PROBE2(vfs, vop, " name ", entry, a->a_" args[0] ", a);"); + printc("\trc = vop->"name"(a);") + printc("\tSDT_PROBE3(vfs, vop, " name ", return, a->a_" args[0] ", a, rc);"); printc("\tif (rc == 0) {"); for (i = 0; i < numargs; ++i) add_debug_code(name, args[i], "OK", "\t\t"); From nobody Thu May 22 15:01:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3BLy3MyRz5wmwG; Thu, 22 May 2025 15:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3BLy0dQvz3LtQ; Thu, 22 May 2025 15:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747926074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U/GtoKQ8E6Gij/ATYPijQc6rAqHr6WME7cWY49S8ZhQ=; b=OTWxLFjif7UgZJnYOVHjw10cxwFE4Ptc+TqRj/fP2/9e6xkHy4EC2kW1zXln+6uJZaI6Nw 7nFg5BjepSBhXYcHX/lHF8GC0hUSU3R0MCj40C4SJL4mh+Xvrz+y4hFgYcg9SBFuKbAToh 21Suvpk/PtqvzJNwTzzECxBPVPDkDadpM2+yJXX7+HyM8ZcrvsOmJahPtyOn6xJNnKJmZf UsvFC16LQCLFNim5F+nSZcSfVtGm4u72NebyRsN8JthXN/4zQhof4at136Tu4G8WsSIVtd u+0gbWoInb7sZKbfiKES5JQWdj+ppuXcTVzCbAruwW3muuLXsaL1YeFQuLSlgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747926074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U/GtoKQ8E6Gij/ATYPijQc6rAqHr6WME7cWY49S8ZhQ=; b=g2kkD8C1uTHB75Vmz98fV/4FMjezPUgRQwS4zUDTlmMoG34nF+f1fMVBpKtz0N/grnuHaW /1WdY4w/Rg8CDdpHiVVAn2lrRQIziCFd8A/QikjUssqo5mq+F0rS5UiuGJz+ubIu1GHhb+ Sm4jlWFgds6AhrKgtxILh/LrQiVoB7MLoEo/xRVDDzhHt5Qhg4drHKS91rbrDf2EvP1jdK 7WVoMyJiphUxd0VF3gV5If/NMv2g+6EK1EDEgSOfebk1uKncrQ+7w3YJxsdGK8H8kFmc0C 475WcGbkMnEe73b8VlQq+h49gHO4y1nsu0/TQmm2g89VIW7DMZ3jtHZfywyM5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747926074; a=rsa-sha256; cv=none; b=QvODDmLRZEEgirvUV5BT6ImqyvKfEclxEByH14TCKRFU+zD8HEm5mvc0t+wbGbQVyhYwwt Tm5KjjhyFrratCVrYa4Il0wsp2sCtkrsUnshd+ON37BVFn8Y0vLUGGkyuoOej877apzsqp ZarOPdBZqdq/sv7MooROl1rxWvPwBykbNah+3KbImZ+/yddtAM3jFTAycJDsHn9vMSv5t0 0gLiSGrGphY1saMQduFAaMJyr4HfKcURYod5l1AFHjXzHUspfexqNBSlyMN8AH4GOOe1A1 t9/5jLb57NG/q3ayFa96vqHkUNAWk0mmweRDegF4oblzHCGZTpWB/zxj0YRyVg== 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 4b3BLy0C52z943; Thu, 22 May 2025 15:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54MF1DX2064328; Thu, 22 May 2025 15:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MF1Dxc064325; Thu, 22 May 2025 15:01:13 GMT (envelope-from git) Date: Thu, 22 May 2025 15:01:13 GMT Message-Id: <202505221501.54MF1Dxc064325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 098b5d4dc744 - main - ifnet: Initialize the address family dependent data region earlier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 098b5d4dc744283a90b2d80c11395ecc18a84084 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=098b5d4dc744283a90b2d80c11395ecc18a84084 commit 098b5d4dc744283a90b2d80c11395ecc18a84084 Author: Zhenlei Huang AuthorDate: 2025-05-22 15:00:05 +0000 Commit: Zhenlei Huang CommitDate: 2025-05-22 15:00:05 +0000 ifnet: Initialize the address family dependent data region earlier if_link_ifnet() adds the interface to the global network interface list, and it is a natural synchronization point. With this change, any threads that obtain the reference of the interface via ifunit(), ifunit_ref() etc., will be guaranteed to see the address family dependent data rightly. The issue [1] reported by Mike Belanger also hints the potential race. MFC note: this change depends on e64fe5ad3a23, as calculating the max IPv6 MTU through all the interfaces requires the current interface to be added to the global network interface list firstly. [1] https://lists.freebsd.org/archives/freebsd-net/2025-May/006817.html Reviewed by: glebius MFC after: 1 month MFC with: e64fe5ad3a23 netinet6: Remove a set but not used global variable in6_maxmtu Differential Revision: https://reviews.freebsd.org/D49358 --- sys/net/if.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 853fc3c78fce..0255c27a3136 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -946,11 +946,11 @@ if_attach_internal(struct ifnet *ifp, bool vmove) } #endif - if_link_ifnet(ifp); - if (domain_init_status >= 2) if_attachdomain1(ifp); + if_link_ifnet(ifp); + EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp); if (IS_DEFAULT_VNET(curvnet)) devctl_notify("IFNET", ifp->if_xname, "ATTACH", NULL); From nobody Thu May 22 18:26:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3GvL08DCz5x0yR; Thu, 22 May 2025 18:26: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 4b3GvK6Cz5z3Vd0; Thu, 22 May 2025 18:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747938365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXdm1wvbypzw97mNPOeT9N/PyoZjyHmeOZcuNa+6EqI=; b=ozo4NKdg5HP/nBH71oWFVM4TcB0qDAevucK54E+uLP31qr+YsaP4v7lxVXJvD/V4QmW8Pu i2279dEu1Tp4d2kmlSO9o0yDpJwJLfah1fdlMoL6XQ8k0AEwNrD4FuQGkcJ3i9oqAtnv4q Qv6AQR5AUzrjIdTPonq0sL0YqEIMHvCP3O6K4iTiUjbU4ig5AZvt0e7rBIK0OgBWs+E/9y LXlOaWvZ914zMjP0GywLWdBlZgqwYdpdfwvFNZcJvz7bbZznEhcNet244a8UUV4F4tQvQE 9tQYa7fEUQOM40pYPRn+KkxqAxIbgS5ukfQG3jJOnM5o+/GfbgOgz99VO5rTZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747938365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXdm1wvbypzw97mNPOeT9N/PyoZjyHmeOZcuNa+6EqI=; b=Un/KQ28qVgmO2O8TOaUW7qNYXNUyw5c+oGBYmKMYf1+SoeDV60yk29yQ/U/TGMeIfgcUHR usahsLx0hKXSc5RD01VVB6e7ftKL7ifHELL+kDCnx+8q7M5XYTJPrzyB50DOoVhPq4qxPH jL+Kn1LzLOvy0tBT08O2XMA7ifW0CdSPUm2Ks76JIhnuP5H043VXc0CyJkeqJnf8Mx8p/7 68H4LNEmXmlWw/x95zZ3AszO8o5X58EMpcjO5krLm8rzjLCPWoybyNiSwxJKPyMiL4D3Id 7Wc3DDbcSSUhFrt5dni3O23FNGmd3sMP1vwuOt+XSxSlGBihIUR44do0oKsfpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747938365; a=rsa-sha256; cv=none; b=QqpHPUNTVHRTEWcD5U7nTvBJN9lz1kYRkoD1rK0q+dhaK708AfNIlqiXOJuPmANi4GYDqQ BjkDNFDJH8teDS5OQWRumLkLXg8jHvCj7XtdnMOjR5DcoSfLmpa8LVMX+rJETf3hSNSVVI jP7WoyZlllZ3lEsprYsr6ZCH4PB2PzYK38NbVNKWR7vUuT4W5mM8pk9rt5/msK/vxuNoje F9ifbEJxXSosUK1KAgXXnMlGoI5pqmeiQiEVF9ULFqxvQDxP9pvjNTmsnv9lFyYnjeWNxx HiYZfKW64X2Vh7q341tvwisbZ2abtF+6WMEe+YCCzqVQ6DfF7UsZGUBAONtlew== 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 4b3GvK5q8RzY4M; Thu, 22 May 2025 18:26: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 54MIQ5XK047829; Thu, 22 May 2025 18:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MIQ5SP047826; Thu, 22 May 2025 18:26:05 GMT (envelope-from git) Date: Thu, 22 May 2025 18:26:05 GMT Message-Id: <202505221826.54MIQ5SP047826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: c8d8cac2a847 - main - mac_do(4): allow compiling into kernel List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8d8cac2a8479009bcdca6c0cb9852af514896f2 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d8cac2a8479009bcdca6c0cb9852af514896f2 commit c8d8cac2a8479009bcdca6c0cb9852af514896f2 Author: Lexi Winter AuthorDate: 2025-05-22 16:59:32 +0000 Commit: Lexi Winter CommitDate: 2025-05-22 16:59:32 +0000 mac_do(4): allow compiling into kernel The manual page says this is possible, but it's not. Make it possible. Reviewed by: olce, kevans Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50451 --- sys/conf/NOTES | 1 + sys/conf/files | 3 ++- sys/conf/options | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index e84fdcb30220..8aa0ed9dda78 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1249,6 +1249,7 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED options MAC_DDB +options MAC_DO options MAC_IFOFF options MAC_IPACL options MAC_LOMAC diff --git a/sys/conf/files b/sys/conf/files index 6ad3ea21b14e..e54eff8464a7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5203,10 +5203,11 @@ security/mac/mac_sysv_sem.c optional mac security/mac/mac_sysv_shm.c optional mac security/mac/mac_vfs.c optional mac security/mac_biba/mac_biba.c optional mac_biba -security/mac_ddb/mac_ddb.c optional mac_ddb security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended security/mac_bsdextended/ugidfw_system.c optional mac_bsdextended security/mac_bsdextended/ugidfw_vnode.c optional mac_bsdextended +security/mac_ddb/mac_ddb.c optional mac_ddb +security/mac_do/mac_do.c optional mac_do security/mac_ifoff/mac_ifoff.c optional mac_ifoff security/mac_ipacl/mac_ipacl.c optional mac_ipacl security/mac_lomac/mac_lomac.c optional mac_lomac diff --git a/sys/conf/options b/sys/conf/options index 92f3c310c77b..48018e3b6adf 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -155,6 +155,7 @@ MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h MAC_DDB opt_dontuse.h MAC_DEBUG opt_mac.h +MAC_DO opt_dontuse.h MAC_IFOFF opt_dontuse.h MAC_IPACL opt_dontuse.h MAC_LOMAC opt_dontuse.h From nobody Thu May 22 19:02:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3Hjj1WvKz5x2vT; Thu, 22 May 2025 19:02: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 4b3Hjj0FsRz3nLV; Thu, 22 May 2025 19:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747940569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3s1EPihie5sNMsC4Fqa4n/T/xUALUD+tImlKxFL574=; b=RmnMNRSbtNZinHBJT9EAItbyW3P9H6yNgLkUGa5/IB4RAeoDJYFJzKvX2pyiEQ9Nf58m7w /WMmsLqzh9NSeBqGzVslxg7XdjJIq0kMXhiL0A8W8UBI97/bWpqHsYcqNF2bIURA72b2nS t+mwJcZpAt7GL115XTUwxMq60ggx0Ok/GlGSNDTGuOJK/zjYdCh1P9nwttRwBPxqI9w/UN RkBlRE4bt92SnXMTJlknDASOm2sGpN3CBkYPfSmJKgSKUhEZw3L2h6XKp4fS+fCJllii3E U3h8au2FHFXUBBjWS4q+vmXeKYYDcpaohgWVTppF2WdleFJe3/ZeWfeMpSEb+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747940569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3s1EPihie5sNMsC4Fqa4n/T/xUALUD+tImlKxFL574=; b=MXcuNXZuKmpizrM31o3fJpjErYtVpW9Tc81aj1tTr24qGuVKiLzmQDAvEbrGaUusVtjfOI 60obxBch2gWpF+cMChmR3J8pODlI7HEoojzOQtYd/vlE3lUPHQARZ+llME6f+5PC3hKeeG z3I/zaaN6ry8cCQSjlQZB3iV4GcRvPTs96epENLhLBT5G+w8WPpoSNz11r2dvVQ9CBTVjx lXgiCHCE+FjK0YRRhPCHoSYEPey2OacaFZ9gA0MvpMd1QJZ5LapcqFL5fUti0AzbGUwsWX 6ZQwIMUL5ae34kr2S4/ws0NFNSJrnOguxmqU/i7foHse5zlULPLqrNDo9t/Ujg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747940569; a=rsa-sha256; cv=none; b=ar1Otnwi8hrsU4RVlmwZr2d/KGWolC37KfjiGvdj+OmV20NBvhv+vz8q9il0owWCmK93G2 U+aswpr+B8TmufuYAKdMqOIETROvIPtG76Ev7ZGnYqOtuHG8iXiB4XEVKkDUIsirfZc6fG mzDCkAUTUhdfiTFMv261XLg41HzmRVFRWTemK5bmqAPJkdLYKHOg2oGvxgKHmHooNoDBvE Onqzi+KOX+pt/J+XhS8w6SYjAdoW0Qb8Yb/LwX/RkzpNOH+iZ1viCVB3uMjkxI/y5UKwuR TvcV15sv8xpcnG8n/cC7rWbwKQcKVTwNO5KDvJt1eaxo5amsr8ML0RunMPpKSw== 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 4b3Hjh6kMDzZPC; Thu, 22 May 2025 19:02: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 54MJ2mmR021774; Thu, 22 May 2025 19:02:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MJ2mIH021771; Thu, 22 May 2025 19:02:48 GMT (envelope-from git) Date: Thu, 22 May 2025 19:02:48 GMT Message-Id: <202505221902.54MJ2mIH021771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3c3dd6296612 - main - bsdinstall: add pkgbase component selection dialog List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c3dd62966123b424657983d9a4d173f675ad8c7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3c3dd62966123b424657983d9a4d173f675ad8c7 commit 3c3dd62966123b424657983d9a4d173f675ad8c7 Author: Isaac Freund AuthorDate: 2025-05-05 17:44:20 +0000 Commit: Ed Maste CommitDate: 2025-05-22 18:59:47 +0000 bsdinstall: add pkgbase component selection dialog This matches the style of the component selection dialog for traditional tarball-based installations. The only difference is that there is currently no ports component offered when using pkgbase. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50178 --- usr.sbin/bsdinstall/scripts/pkgbase.in | 132 +++++++++++++++++++++++++++++---- 1 file changed, 118 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 7faeee40647b..eaed23a19548 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -7,6 +7,9 @@ -- This software was developed by Isaac Freund -- under sponsorship from the FreeBSD Foundation. +local sys_wait = require("posix.sys.wait") +local unistd = require("posix.unistd") + local all_libcompats = "%%_ALL_libcompats%%" -- Run a command using the OS shell and capture the stdout @@ -38,20 +41,122 @@ local function append_list(list, other) end end --- Returns a list of pkgbase packages equivalent to the default base.txz and kernel.txz +-- Read from the given fd until EOF +-- Returns all the data read as a single string +local function read_all(fd) + local ret = "" + repeat + local buffer = assert(unistd.read(fd, 1024)) + ret = ret .. buffer + until buffer == "" + return ret +end + +-- Run bsddialog with the given argument list +-- Returns the exit code and stderr output of bsddialog +local function bsddialog(args) + local r, w = assert(unistd.pipe()) + + local pid = assert(unistd.fork()) + if pid == 0 then + assert(unistd.close(r)) + assert(unistd.dup2(w, 2)) + assert(unistd.execp("bsddialog", args)) + unistd._exit() + end + assert(unistd.close(w)) + + local output = read_all(r) + assert(unistd.close(r)) + + local _, _, exit_code = assert(sys_wait.wait(pid)) + return exit_code, output +end + +-- Creates a dialog for component selection mirroring the +-- traditional tarball component selection dialog. +local function select_components(components, options) + local descriptions = { + kernel_dbg = "Kernel debug info", + base_dbg = "Base system debug info", + src = "System source tree", + tests = "Test suite", + lib32 = "32-bit compatibility libraries", + lib32_dbg = "32-bit compatibility libraries debug info", + } + local defaults = { + kernel_dbg = "on", + base_dbg = "off", + src = "off", + tests = "off", + lib32 = "on", + lib32_dbg = "off", + } + + -- Sorting the components is necessary to ensure that the ordering is + -- consistent in the UI. + local sorted_components = {} + for component, _ in pairs(components) do + table.insert(sorted_components, component) + end + table.sort(sorted_components) + + local checklist_items = {} + for _, component in ipairs(sorted_components) do + if component ~= "base" and component ~= "kernel" and + not (component == "kernel_dbg" and options.no_kernel) and + #components[component] > 0 then + local description = descriptions[component] or "''" + local default = defaults[component] or "off" + table.insert(checklist_items, component) + table.insert(checklist_items, description) + table.insert(checklist_items, default) + end + end + + local bsddialog_args = { + "--backtitle", "FreeBSD Installer", + "--title", "Select System Components", + "--nocancel", + "--disable-esc", + "--separate-output", + "--checklist", "Choose optional system components to install:", + "0", "0", "0", -- autosize + } + append_list(bsddialog_args, checklist_items) + + local exit_code, output = bsddialog(bsddialog_args) + -- This should only be possible if bsddialog is killed by a signal + -- or buggy, we disable the cancel option and esc key. + -- If this does happen, there's not much we can do except exit with a + -- hopefully useful stack trace. + assert(exit_code == 0) + + local selected = {"base"} + if not options.no_kernel then + table.insert(selected, "kernel") + end + for component in output:gmatch("[^\n]+") do + table.insert(selected, component) + end + + return selected +end + +-- Returns a list of pkgbase packages selected by the user local function select_packages(pkg, options) local components = { - ["kernel"] = {}, - ["kernel-dbg"] = {}, - ["base"] = {}, - ["base-dbg"] = {}, - ["src"] = {}, - ["tests"] = {}, + kernel = {}, + kernel_dbg = {}, + base = {}, + base_dbg = {}, + src = {}, + tests = {}, } for compat in all_libcompats:gmatch("%S+") do components["lib" .. compat] = {} - components["lib" .. compat .. "-dbg"] = {} + components["lib" .. compat .. "_dbg"] = {} end local rquery = capture(pkg .. "rquery -U -r FreeBSD-base %n") @@ -65,15 +170,15 @@ local function select_packages(pkg, options) if package == "FreeBSD-kernel-generic" then table.insert(components["kernel"], package) elseif package == "FreeBSD-kernel-generic-dbg" then - table.insert(components["kernel-dbg"], package) + table.insert(components["kernel_dbg"], package) end elseif package:match(".*%-dbg$") then - table.insert(components["base-dbg"], package) + table.insert(components["base_dbg"], package) else local found = false for compat in all_libcompats:gmatch("%S+") do if package:match(".*%-dbg%-lib" .. compat .. "$") then - table.insert(components["lib" .. compat .. "-dbg"], package) + table.insert(components["lib" .. compat .. "_dbg"], package) found = true break elseif package:match(".*%-lib" .. compat .. "$") then @@ -94,9 +199,8 @@ local function select_packages(pkg, options) assert(#components["base"] > 0) local selected = {} - append_list(selected, components["base"]) - if not options.no_kernel then - append_list(selected, components["kernel"]) + for _, component in ipairs(select_components(components, options)) do + append_list(selected, components[component]) end return selected From nobody Thu May 22 21:50:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3MQc6Kvcz5vyyw; Thu, 22 May 2025 21:50: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 4b3MQc3XVFz4FLb; Thu, 22 May 2025 21:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747950600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV4sm67KBGC330ohhpoXWs0MbBXm0t2WfK/aqZ8msIU=; b=PY8S1L5p5DwuMcCfSAQ8+amN9bUHj3ZMMweo0Y+s+GevFHFWW0Yu8ZU+nQ+pwHnAJ6xzOG Axb2vDHdOg0H3jbyDz996EkdYFMY7MiYMptnFgEi0QibsDyzP/Mvf8YpF6hv+ZD0bwAIcy ICsNMnLb4qVKxmoR2j5jkzdbxdVJDZi1AU2DdxX4w2iy1847MqwmdfDMrTaL/q/9Oe86pw k6LqT4R6jxNvM/QkG0pTFnvGE2Iclh2J/gjggWWXtW44a6VVVYoMRhcOYStfEkcxo6oyWW uFIqx1A+2OZARqRYjvuohmoutCE0ESTcO+28aWg5PjAriH/lJ5HRIP3gkZ5J2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747950600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV4sm67KBGC330ohhpoXWs0MbBXm0t2WfK/aqZ8msIU=; b=xRfb1EN8+PSECPCDyAKZG87n11R+cmfhGXCvNETuwrrJAbmGhlqKLpx+rj0dwpcpZ2ZzS2 Sx4Fff5YEIaprnSOImNma6bxolGnN607FOq49CuSPKc4RPhxILozb0XFPBsDgnj10Ssohs eiLgUBmXe3rKEsujmASELuDmKCI+xkqLNsNWe/ITXd4vrqJBRttpqV+PLhQMGfCYh8fbei ooW2CrTwUBG/0N+o6Qt2jW+XzgPcawnKTgg05xQcfiDMHnFpvzPLyJ7BsnH+gF6It/kPAX 1gOKhFXWwaDM+MdXzZYPtFOwntPG4Yh+gE24Cq9jk+aQMqW2XSLpitzQzXnfHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747950600; a=rsa-sha256; cv=none; b=JRM9i6/MGM7bnjjQ+CzoB74PV2BTEwCZq2TFup3lxMDxsmF7/Nf/UKO8CEfwcGYtyYVf+L ZffGTL39kcZ2nqY2fTwbL5cNN1BHWxRCrprdtOH/jgF91loxb7lxhiYWAtWDqesD09wKFN oNTeAtAb+kIUEINDSkzGtLNVRs4mL9u4AqCiXZj0zUibK/orIX1TWO24bBp8r+HIZ0/7Sf OOBQ1SYpiev2o+zVDJ3oAhX9t+X6htt6Ytfkc5IN2ji2BdJJJAif8mx2kUFotDk29waQpF lCr5h869Xc+7O4ZONl9rs4tU8Aj3FapqvDlwDqyM87KBsFzUcbaF12f8pUxJfA== 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 4b3MQc2KZrzf1m; Thu, 22 May 2025 21:50: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 54MLo0ug023482; Thu, 22 May 2025 21:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MLo0Dw023479; Thu, 22 May 2025 21:50:00 GMT (envelope-from git) Date: Thu, 22 May 2025 21:50:00 GMT Message-Id: <202505222150.54MLo0Dw023479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 4814de3243e0 - main - unix/stream: fix bugs in sendfile(2) operation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4814de3243e091c48453b4fd6c818437ac1985f7 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4814de3243e091c48453b4fd6c818437ac1985f7 commit 4814de3243e091c48453b4fd6c818437ac1985f7 Author: Gleb Smirnoff AuthorDate: 2025-05-22 21:47:41 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-22 21:49:37 +0000 unix/stream: fix bugs in sendfile(2) operation - In send(2) don't update sb_acc if appending behind uxst_fnrdy - In recv(2) don't read beyond uxst_fnrdy - In the debug code allow ready, but blocked mbufs beyond uxst_fnrdy --- sys/kern/uipc_usrreq.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 164030eec7ab..3181868175a8 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1012,7 +1012,7 @@ uipc_stream_sbcheck(struct sockbuf *sb) if (d == sb->uxst_fnrdy) notready = true; if (notready) - MPASS(d->m_flags & M_NOTREADY); + MPASS(d->m_flags & (M_NOTREADY|M_BLOCKED)); if (d->m_type == MT_CONTROL) dctl += d->m_len; else if (d->m_type == MT_DATA) { @@ -1246,7 +1246,8 @@ restart: cmc.mc_len = 0; } sent += mc.mc_len; - sb->sb_acc += mc.mc_len; + if (sb->uxst_fnrdy == NULL) + sb->sb_acc += mc.mc_len; sb->sb_ccc += mc.mc_len; sb->sb_mbcnt += mc.mc_mlen; STAILQ_CONCAT(&sb->uxst_mbq, &mc.mc_q); @@ -1397,11 +1398,13 @@ restart: * last == NULL - socket to be flushed * last != NULL * lastlen > last->m_len - uio to be filled, last to be adjusted - * lastlen == 0 - MT_CONTROL or M_EOR encountered + * lastlen == 0 - MT_CONTROL, M_EOR or M_NOTREADY encountered */ space = uio->uio_resid; datalen = 0; - for (m = first, last = NULL; m != NULL; m = STAILQ_NEXT(m, m_stailq)) { + for (m = first, last = sb->uxst_fnrdy, lastlen = 0; + m != sb->uxst_fnrdy; + m = STAILQ_NEXT(m, m_stailq)) { if (m->m_type != MT_DATA) { last = m; lastlen = 0; From nobody Thu May 22 22:48:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3NkC2Mx8z5w2ww; Thu, 22 May 2025 22:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3NkC1ll6z3gfw; Thu, 22 May 2025 22:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747954115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kknLfD/6WDMKnyz4iTvyAHMawVIgqSftf20mpkPzye0=; b=GOyR1i2fOIP+BEy6whABYC3wexKHJp/C/C2jIjA3Icw96n0/zigzRu9kUA/IFA/49f2GPM 2zzS/c/xO2w4Sgci5YC5biAk6E45rW6RQHEcOObhgxapNQa20/4GVvu/YuXcQS75EXwAUw uev7pUBAQJAPCDiuu3Aii80hy5iS4gMPn4/pAou7GEmt0CYiBgjnkH64990cjAJvKWUKmB f9DFtvgnZBx5KlQpymvwQKQE9w3nt2g24pHpU8nD7SAsv5RE81+N3lmFNT0mzPZJJf+dnJ Wz3lU9czxQYJRKLZsT5DN/e5QPuCYVX1HU/6xB1FKx5VARLF2/IKY7vawiXyjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747954115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kknLfD/6WDMKnyz4iTvyAHMawVIgqSftf20mpkPzye0=; b=tr2bT1Ab/KLJv0pxUFvjrG3ET9htO7t/v1p10EYscnsnfG6Gs6kqzqOFkxkbNB1AvQdx5+ iYr6dNSce5w2NYcxACu45qsoh3RQs6Qnps9BvArEDIu5ZI7y6EhzGCAe0uIKoBpvqrZwFm mktaPLnFvc/oESKWTIFr+xb7tnRT/6FkXLNn+sjjphrMp3/IIlm4WU0KoRgkVFLwOykFo/ LIMPeqlcwhTYie2lLYT6s5TZeDZKXz6+GE1Qcr4VGOHl9+B128iNAJi9P8Ah/q8tFYTsPN LQWG3J9OEs6d+RVTbfUoxZgE2SoqNYVtdMP4rMVijXNJEgeHAcMGeX5DQvb80Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747954115; a=rsa-sha256; cv=none; b=PbvuxdLwKNxsUQUuRAIIem2ZwbxwaYNJBB0Gxc0HWHB5+WbTm+fknBaBl9hw+sxiY4N8GP ddci22p8b6f/794HuxTWGiuvpn+FhJpfblc98EHBufekduzIeIWcx8cB4Vvi6gu47qNvMM fKWtGBcs48wWJqaD3ta1j6Koe3SI/c3e4CCiJqczZtZcrKtRev0aAPfXU8R/E+WXdttWep wzany88y69gKMyoxIfoLU5L1a6cviU6KeuGYoVKKp/8YVI0gvyzaGO1RQgTy8id24Zbe3T D70CNTpNDzu04iJa10vnD5mjy8rqAHVGaA+gHb2jSQWp6m6uEjKcZ/ffaKXUQQ== 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 4b3NkC0Tnpzfxn; Thu, 22 May 2025 22:48: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 54MMmYFI036060; Thu, 22 May 2025 22:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MMmYDc036057; Thu, 22 May 2025 22:48:34 GMT (envelope-from git) Date: Thu, 22 May 2025 22:48:34 GMT Message-Id: <202505222248.54MMmYDc036057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 2982c7085239 - main - stand allow for local.defs.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2982c70852395fad40959072ed90c8676a4b9a1c Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2982c70852395fad40959072ed90c8676a4b9a1c commit 2982c70852395fad40959072ed90c8676a4b9a1c Author: Simon J. Gerraty AuthorDate: 2025-05-22 22:47:21 +0000 Commit: Simon J. Gerraty CommitDate: 2025-05-22 22:47:21 +0000 stand allow for local.defs.mk This allows us to change the VERSION_FILE used for loaders as well as set NEWVERS_DATE and BUILD_UTC to reflect the publish date of loaders for secure-boot. Sponsored by: Juniper Networks, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50478 --- stand/common/newvers.sh | 6 +++++- stand/defs.mk | 2 ++ stand/efi/loader/Makefile | 2 +- stand/i386/loader/Makefile | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stand/common/newvers.sh b/stand/common/newvers.sh index c244e718c041..8541d61ed76c 100755 --- a/stand/common/newvers.sh +++ b/stand/common/newvers.sh @@ -50,13 +50,17 @@ if [ -n "$SOURCE_DATE_EPOCH" ]; then exit 1 fi else - t=`date` + t="${NEWVERS_DATE:-`date`}" fi r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` bootprog_info="FreeBSD/${3} ${2}, Revision ${r}\\n" if [ -n "${include_metadata}" ]; then bootprog_info="$bootprog_info(${t} ${u}@${h})\\n" + if [ -n "$BUILD_UTC" ]; then + # We can use what(1) to extract BUILD_UTC + bootprog_info="$bootprog_info\\0@(#)BUILD_UTC=$BUILD_UTC" + fi fi cat > $tempfile <" $$path ; \ ln -fns $$path ${.TARGET} .endif # !NO_OBJ + +.-include "local.defs.mk" .endif # __BOOT_DEFS_MK__ diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 2dae035f04a8..ae2ffc475730 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -87,7 +87,7 @@ CFLAGS+= -DEFI_SECUREBOOT .endif NEWVERSWHAT?= "EFI loader" ${MACHINE} -VERSION_FILE= ${.CURDIR}/../loader/version +VERSION_FILE?= ${.CURDIR}/../loader/version HELP_FILENAME= loader.help.efi # Always add MI sources diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index e1f0298403b3..96ad50a75509 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -16,7 +16,7 @@ LOADER?= loader_${LOADER_INTERP} PROG= ${LOADER}.sym INTERNALPROG= NEWVERSWHAT?= "bootstrap loader" x86 -VERSION_FILE= ${.CURDIR}/../loader/version +VERSION_FILE?= ${.CURDIR}/../loader/version # # There's 640k - 40k maximum space, less however much memory the BIOS uses. A # non-random survey suggests that 20k-25k is a good value for 'most' machines. From nobody Fri May 23 07:50:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3clT2HFTz5wvHG; Fri, 23 May 2025 07:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3clT0Nbxz42V1; Fri, 23 May 2025 07:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747986629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ELVMgj9yCh/75bNsoJDxkjIkp5oTENsNcfIfFLrSBOk=; b=ixuJrSF1Z0CzaT0dpwbpCSOrftWEJWwYIz+CEovYifbbucqcRd3ZmuMe130jbTDIizar1U fsZyxX0nxj5+BCpg8PrzXNoDu3FX8PHfPxY/LVqr4uh62hnVBcuhuHi/5I+WPm+bUqG9N3 pNymqJVQSUoRBqZqdXwQhpW7ign2TMb09Gg5Z41wtwWVMHNK+WFPIYW7rCn+1RI04M2i2H d+TgOCHHW7NYiVpkYbYAcVO0UHHvegjPFlkKh/hf2ZG+yHCBwYw40CdBTUf4M/ry0VHzAn lm9y3Yl51pZTVXPiUtSpYlSCoSOxzXLo/xZy1nBwynOJONKTkkstP0eaQLy4AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747986629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ELVMgj9yCh/75bNsoJDxkjIkp5oTENsNcfIfFLrSBOk=; b=B9hHjaENLUBXPzUX8g2S66KO/eL78I+2eFSOKA+AWhxpfaDHEcItI41YYN6TxMrKbMhdHW W24RuP0+M8xWk2rsYl3Xj+Bbex1A+0C95s6hWmS7v3x07lbVSeq3yLY4qduE0KhMYhnbZx oyr0+VlhenluR0K66FzD2M7G1tRpnsGTOBfjcxWHCRnYqEklnu4m9MOHArW7M/ZPwh6htp rixvKV+Zgd8XR0X4EtorDLGXU/vkruG+3uM8C75OYuFiNKJHhnvSKhSQh6WWJsc3QrDwrc fe2Hm4/73MWO9FG3H7VrE73kl9tyG56Uu9U/MSprXrwkCAhaGECqrWy9Pmwalw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747986629; a=rsa-sha256; cv=none; b=ALq+NaExNcxK0QXoty89rJPENxNwU/AEyPjSkIq+6Rhe3jWp4Xmd14x2IKvk/J09LX0Dx3 ZVqCacLX3giYk8MMwoAusXLxdDUC/MRN6vvRD6gXv7szVm/IMU0UNYlQVKSFxQcBTAt+W4 RNrOyGhRuzwRR6b1RKw8WoXm8b2tOVEqrubtSTQGCA3dO5TB+Lnj6dtOiP+4YaRxk658OB a8KGU+PO8gadWKWweUsYtHgtq3qGPIa/4sGqy6W1970AGKZsjfuWusJKuaAx9kfZaPkUkq NPkmAvUtlWBSLghLkx3rerFQbA5xWsVVkP8XS6alhm5h/Ue0LICcquRW5bzkkA== 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 4b3clS75ZhzxXR; Fri, 23 May 2025 07:50: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 54N7oSmn055612; Fri, 23 May 2025 07:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54N7oS5J055609; Fri, 23 May 2025 07:50:28 GMT (envelope-from git) Date: Fri, 23 May 2025 07:50:28 GMT Message-Id: <202505230750.54N7oS5J055609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: fb1749cc6468 - main - wtap(4): Clean up includes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb1749cc6468220a69a8fdc7a2d0aac51ada598a Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=fb1749cc6468220a69a8fdc7a2d0aac51ada598a commit fb1749cc6468220a69a8fdc7a2d0aac51ada598a Author: Li-Wen Hsu AuthorDate: 2025-05-23 07:48:12 +0000 Commit: Li-Wen Hsu CommitDate: 2025-05-23 07:49:50 +0000 wtap(4): Clean up includes Sponsored by: The FreeBSD Foundation --- sys/dev/wtap/if_wtap.c | 3 --- sys/dev/wtap/if_wtap_module.c | 35 +---------------------------- sys/dev/wtap/if_wtapioctl.h | 2 +- sys/dev/wtap/if_wtapvar.h | 28 ----------------------- sys/dev/wtap/plugins/visibility.c | 40 +-------------------------------- sys/dev/wtap/plugins/visibility_ioctl.h | 2 -- 6 files changed, 3 insertions(+), 107 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 2b098bcc3dda..dd332c538c8f 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -33,11 +33,8 @@ */ #include "if_wtapvar.h" #include /* uio struct */ -#include #include -#include -#include #include "if_medium.h" #include "wtap_hal/hal.h" diff --git a/sys/dev/wtap/if_wtap_module.c b/sys/dev/wtap/if_wtap_module.c index 52a371fd4b8f..6b5f8502bd08 100644 --- a/sys/dev/wtap/if_wtap_module.c +++ b/sys/dev/wtap/if_wtap_module.c @@ -28,52 +28,19 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. */ + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include -#include #include -#include -#include #include -#include -#include - -#include -#include - -#include - -#include -#include /* cdevsw struct */ -#include /* uio struct */ #include -#include #include "if_wtapvar.h" #include "if_wtapioctl.h" diff --git a/sys/dev/wtap/if_wtapioctl.h b/sys/dev/wtap/if_wtapioctl.h index 6cde392ab7c1..05f88a5dcb81 100644 --- a/sys/dev/wtap/if_wtapioctl.h +++ b/sys/dev/wtap/if_wtapioctl.h @@ -40,7 +40,7 @@ #ifndef _DEV_WTAP_WTAPIOCTL_H #define _DEV_WTAP_WTAPIOCTL_H -#include +#include #include #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) diff --git a/sys/dev/wtap/if_wtapvar.h b/sys/dev/wtap/if_wtapvar.h index 4a7336368843..0cc0fd487a1c 100644 --- a/sys/dev/wtap/if_wtapvar.h +++ b/sys/dev/wtap/if_wtapvar.h @@ -34,46 +34,18 @@ #include #include -#include -#include -#include -#include -#include #include -#include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include -#include #include -#include -#include #include -#include #include #include -#include - -#include - -#include -#include - #if 0 #define DWTAP_PRINTF(...) printf(__VA_ARGS__) #else diff --git a/sys/dev/wtap/plugins/visibility.c b/sys/dev/wtap/plugins/visibility.c index 2ff695fba5f1..1e6a9057728f 100644 --- a/sys/dev/wtap/plugins/visibility.c +++ b/sys/dev/wtap/plugins/visibility.c @@ -28,52 +28,14 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. */ + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include /* cdevsw struct */ -#include /* uio struct */ - #include -#include #include "visibility.h" diff --git a/sys/dev/wtap/plugins/visibility_ioctl.h b/sys/dev/wtap/plugins/visibility_ioctl.h index b9c43984b4f5..a5c09e6af22a 100644 --- a/sys/dev/wtap/plugins/visibility_ioctl.h +++ b/sys/dev/wtap/plugins/visibility_ioctl.h @@ -36,8 +36,6 @@ #ifndef _VISIBILITY_IOCTL_H #define _VISIBILITY_IOCTL_H -#include - struct link { int op; //0 remove, 1 link int id1; From nobody Fri May 23 13:04:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3lk63k10z5xDMJ; Fri, 23 May 2025 13:04: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 4b3lk62Hkcz47nN; Fri, 23 May 2025 13:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748005486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJbtihOrTT02LOg2BKpl/Mw4LYr5gip1jYi36Vv0zSA=; b=bW9vGMadoqXjaP7r6RWAr5cpUwF+qhLaA5wcmntiEznB3I46FSjiMyvBGDtQsVUVth7o5e 2wBmqOvSaNYH4KMh6o17fdoaagN0qS+mFveZMP+WHJTYj3QLrPegn+fSsuVAxVv75APiu3 DzrntruxvyqTAgI5okdDYny9g3ZqVdXGr5xgOiuoELqv4ob14+St71lMLeqHEdv7zvFIqo aFeM/Y7HPecuDSL+3whMsNf9luG21/Im6WhYPMVndFjZQ0Vp+g1uro34cV/NdBGSsSCEvc jUvvH8/SDCDjOyaOv3fvtXE0MNhE6YO7Na9JT/JQer+V0BvmJIIww3xAXKNzdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748005486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJbtihOrTT02LOg2BKpl/Mw4LYr5gip1jYi36Vv0zSA=; b=RA2dxWsSxi1Yn9H9PXiHlxyAeOXN9zS6fHTwV/1Rmj28wlXFqTcyWiLg/KGh68VBT2NpBi zD4smaU2rL2bRHtBhKJCtOzgRbxq4wvi2THPS4/6nvk8MhH00FypyLtygRxJLrcxNiN/6E 8VUlm77qU1kTcATQJGlwxgTQFTLyym2/vTCUvGOJ5Qa5GWf/h8PmVRoyMUmRiA0+rU9fex 3us8Wfg0M0MThbWO397BQq0cu2Uj1PE/ulyKK7CEmhYsevbpQO6802feASDf1koySgHJfK XoRMztCCSNPxDzGy1Wnoai+WWsURWCTaeipaXBFXD1mEHZbzT0l/5EyKX8jE4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748005486; a=rsa-sha256; cv=none; b=xpq7zfKtGVwGVuLpWzLxzznXKXeYnHDQuVezhgQxhCr7TGxiCrxDYvw+1M1ooMVfDdo9/9 E/WKqvgu3lLYNkHU66OnpY7PZujyzhaf0otRE7nq5z6Q7Ou677y6im9Aoidfdf5HM1rixE xLKLcTZRHd2wUobta3JNUS74LNSmRsYFalCJeQn0S4SHQSJQ4/fU8oPXpime7DxLGtsql7 3ToBRke9LX4Bed/5b5HPNsLmcXhN/zvFoCK4gR4wcwwmiNZmbDARzWs15Vq3yuI38atlPH 0TtGxRTvbO//RQBBARmM983qAjGxbM/YnHbpR78TU9FdL+usCwEWeWP6nQa4Gw== 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 4b3lk61BHHz16ST; Fri, 23 May 2025 13:04: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 54ND4jv8044849; Fri, 23 May 2025 13:04:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54ND4jMD044846; Fri, 23 May 2025 13:04:45 GMT (envelope-from git) Date: Fri, 23 May 2025 13:04:45 GMT Message-Id: <202505231304.54ND4jMD044846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7587f6d4840f - main - namei: Make stackable filesystems check harder for jail roots List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7587f6d4840f8d363e457cddc14c184cf1fe7cc1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7587f6d4840f8d363e457cddc14c184cf1fe7cc1 commit 7587f6d4840f8d363e457cddc14c184cf1fe7cc1 Author: Mark Johnston AuthorDate: 2025-05-23 12:52:24 +0000 Commit: Mark Johnston CommitDate: 2025-05-23 13:03:38 +0000 namei: Make stackable filesystems check harder for jail roots Suppose a process has its cwd pointing to a nullfs directory, where the lower directory is also visible in the jail's filesystem namespace. Suppose that the lower directory vnode is moved out from under the nullfs mount. The nullfs vnode still shadows the lower vnode, and dotdot lookups relative to that directory will instantiate new nullfs vnodes outside of the nullfs mountpoint, effectively shadowing the lower filesystem. This phenomenon can be abused to escape a chroot, since the nullfs vnodes instantiated by these dotdot lookups defeat the root vnode check in vfs_lookup(), which uses vnode pointer equality to test for the process root. Fix this by extending nullfs and unionfs to perform the same check, exploiting the fact that the passed componentname is embedded in a nameidata structure to avoid changing the VOP_LOOKUP interface. That is, add a flag to indicate that containerof can be used to get the full nameidata structure, and perform the root vnode check on the lower vnode when performing a dotdot lookup. PR: 262180 Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50418 --- share/man/man9/namei.9 | 9 +++++++++ sys/fs/nullfs/null_vnops.c | 28 ++++++++++++++++++---------- sys/fs/unionfs/union_vnops.c | 21 +++++++++++++++++++++ sys/kern/vfs_cache.c | 11 +---------- sys/kern/vfs_lookup.c | 41 ++++++++++++++++++++++++++++++----------- sys/sys/namei.h | 5 ++++- 6 files changed, 83 insertions(+), 32 deletions(-) diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9 index 3f2f43e94cd1..5bdffce8c360 100644 --- a/share/man/man9/namei.9 +++ b/share/man/man9/namei.9 @@ -281,6 +281,15 @@ The flag is used to implement .Dv O_RESOLVE_BENEATH flag for .Xr openat 2 . +.It Dv NAMEILOOKUP +The component is embedded in a +.Nm +lookup structure, and the +.Fn vfs_lookup_nameidata +function can be used to obtain that structure. +This can be useful in +.Xr VOP_LOOKUP 9 +implementations which need to obtain extra lookup metadata. .El .Sh PARAMETERS DESCRIPTORS FLAGS These flags are used for several purposes. diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index a6b15c1dfa78..8608216e10e5 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -403,17 +403,25 @@ null_lookup(struct vop_lookup_args *ap) /* * Renames in the lower mounts might create an inconsistent - * configuration where lower vnode is moved out of the - * directory tree remounted by our null mount. Do not try to - * handle it fancy, just avoid VOP_LOOKUP() with DOTDOT name - * which cannot be handled by VOP, at least passing over lower - * root. + * configuration where lower vnode is moved out of the directory tree + * remounted by our null mount. + * + * Do not try to handle it fancy, just avoid VOP_LOOKUP() with DOTDOT + * name which cannot be handled by the VOP. */ - if ((ldvp->v_vflag & VV_ROOT) != 0 && (flags & ISDOTDOT) != 0) { - KASSERT((dvp->v_vflag & VV_ROOT) == 0, - ("ldvp %p fl %#x dvp %p fl %#x flags %#jx", - ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, (uintmax_t)flags)); - return (ENOENT); + if ((flags & ISDOTDOT) != 0) { + struct nameidata *ndp; + + if ((ldvp->v_vflag & VV_ROOT) != 0) { + KASSERT((dvp->v_vflag & VV_ROOT) == 0, + ("ldvp %p fl %#x dvp %p fl %#x flags %#jx", + ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, + (uintmax_t)flags)); + return (ENOENT); + } + ndp = vfs_lookup_nameidata(cnp); + if (ndp != NULL && vfs_lookup_isroot(ndp, ldvp)) + return (ENOENT); } /* diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index e1048e4ba7ab..a930e3921ab3 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -76,6 +76,21 @@ VNASSERT(((vp)->v_op == &unionfs_vnodeops), vp, \ ("%s: non-unionfs vnode", __func__)) +static bool +unionfs_lookup_isroot(struct componentname *cnp, struct vnode *dvp) +{ + struct nameidata *ndp; + + if (dvp == NULL) + return (false); + if ((dvp->v_vflag & VV_ROOT) != 0) + return (true); + ndp = vfs_lookup_nameidata(cnp); + if (ndp == NULL) + return (false); + return (vfs_lookup_isroot(ndp, dvp)); +} + static int unionfs_lookup(struct vop_cachedlookup_args *ap) { @@ -149,6 +164,12 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) goto unionfs_lookup_return; } + if (unionfs_lookup_isroot(cnp, udvp) || + unionfs_lookup_isroot(cnp, ldvp)) { + error = ENOENT; + goto unionfs_lookup_return; + } + if (udvp != NULLVP) dtmpvp = udvp; else diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index ff671e80b803..f2368877ec93 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5276,7 +5276,6 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) struct componentname *cnp; struct namecache *ncp; struct vnode *dvp; - struct prison *pr; u_char nc_flag; ndp = fpl->ndp; @@ -5288,15 +5287,7 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) /* * XXX this is racy the same way regular lookup is */ - for (pr = cnp->cn_cred->cr_prison; pr != NULL; - pr = pr->pr_parent) - if (dvp == pr->pr_root) - break; - - if (dvp == ndp->ni_rootdir || - dvp == ndp->ni_topdir || - dvp == rootvnode || - pr != NULL) { + if (vfs_lookup_isroot(ndp, dvp)) { fpl->tvp = dvp; fpl->tvp_seqc = vn_seqc_read_any(dvp); if (seqc_in_modify(fpl->tvp_seqc)) { diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 127d068f1fff..86c7bdaa02c0 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -611,12 +611,12 @@ namei(struct nameidata *ndp) } #endif ndp->ni_cnd.cn_cred = td->td_ucred; - KASSERT(ndp->ni_resflags == 0, ("%s: garbage in ni_resflags: %x\n", + KASSERT(ndp->ni_resflags == 0, ("%s: garbage in ni_resflags: %x", __func__, ndp->ni_resflags)); KASSERT(cnp->cn_cred && td->td_proc, ("namei: bad cred/proc")); KASSERT((cnp->cn_flags & NAMEI_INTERNAL_FLAGS) == 0, - ("namei: unexpected flags: %" PRIx64 "\n", - cnp->cn_flags & NAMEI_INTERNAL_FLAGS)); + ("namei: unexpected flags: %#jx", + (uintmax_t)(cnp->cn_flags & NAMEI_INTERNAL_FLAGS))); if (cnp->cn_flags & NOCACHE) KASSERT(cnp->cn_nameiop != LOOKUP, ("%s: NOCACHE passed with LOOKUP", __func__)); @@ -862,6 +862,30 @@ bad: return (error); } +struct nameidata * +vfs_lookup_nameidata(struct componentname *cnp) +{ + if ((cnp->cn_flags & NAMEILOOKUP) == 0) + return (NULL); + return (__containerof(cnp, struct nameidata, ni_cnd)); +} + +/* + * Would a dotdot lookup relative to dvp cause this lookup to cross a jail or + * chroot boundary? + */ +bool +vfs_lookup_isroot(struct nameidata *ndp, struct vnode *dvp) +{ + for (struct prison *pr = ndp->ni_cnd.cn_cred->cr_prison; pr != NULL; + pr = pr->pr_parent) { + if (dvp == pr->pr_root) + return (true); + } + return (dvp == ndp->ni_rootdir || dvp == ndp->ni_topdir || + dvp == rootvnode); +} + /* * FAILIFEXISTS handling. * @@ -1020,7 +1044,6 @@ vfs_lookup(struct nameidata *ndp) char *lastchar; /* location of the last character */ struct vnode *dp = NULL; /* the directory we are searching */ struct vnode *tdp; /* saved dp */ - struct prison *pr; size_t prev_ni_pathlen; /* saved ndp->ni_pathlen */ int docache; /* == 0 do not cache last component */ int wantparent; /* 1 => wantparent or lockparent flag */ @@ -1206,13 +1229,9 @@ dirloop: goto bad; } for (;;) { - for (pr = cnp->cn_cred->cr_prison; pr != NULL; - pr = pr->pr_parent) - if (dp == pr->pr_root) - break; - bool isroot = dp == ndp->ni_rootdir || - dp == ndp->ni_topdir || dp == rootvnode || - pr != NULL; + bool isroot; + + isroot = vfs_lookup_isroot(ndp, dp); if (__predict_false(isroot && (ndp->ni_lcf & (NI_LCF_STRICTREL | NI_LCF_STRICTREL_KTR)) != 0)) { if ((ndp->ni_lcf & NI_LCF_STRICTREL_KTR) != 0) diff --git a/sys/sys/namei.h b/sys/sys/namei.h index bbaa71f629e6..4a16ec923bd8 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -152,6 +152,7 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define LOCKSHARED 0x0100 /* Shared lock leaf */ #define NOFOLLOW 0x0000 /* do not follow symbolic links (pseudo) */ #define RBENEATH 0x100000000ULL /* No escape, even tmp, from start dir */ +#define NAMEILOOKUP 0x200000000ULL /* cnp is embedded in nameidata */ #define MODMASK 0xf000001ffULL /* mask of operational modifiers */ /* @@ -249,7 +250,7 @@ do { \ NDINIT_PREFILL(_ndp); \ NDINIT_DBG(_ndp); \ _ndp->ni_cnd.cn_nameiop = op; \ - _ndp->ni_cnd.cn_flags = flags; \ + _ndp->ni_cnd.cn_flags = (flags) | NAMEILOOKUP; \ _ndp->ni_segflg = segflg; \ _ndp->ni_dirp = namep; \ _ndp->ni_dirfd = dirfd; \ @@ -286,6 +287,8 @@ do { \ int namei(struct nameidata *ndp); int vfs_lookup(struct nameidata *ndp); +bool vfs_lookup_isroot(struct nameidata *ndp, struct vnode *dvp); +struct nameidata *vfs_lookup_nameidata(struct componentname *cnp); int vfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, bool refstart); From nobody Fri May 23 13:06:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3lmg40Fdz5xD9p; Fri, 23 May 2025 13:06: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 4b3lmg1N2Nz48ld; Fri, 23 May 2025 13:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748005619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Um5cdMCERLdTjN0m+jcDjx087vdtTglCVStatOk3Hbg=; b=BAIhnnQ0zJ7mjpnLmUbbbfAFVb6YQl5hDzwFfl6ID7sC6rxkfN6swczvghzXUd7VJB9aF2 P1S+69ew3dedYpzyUIBNyco7Xpj7SZrAExeHlDpg2/jiiBdGIeEqsXiFmuzaEolz9JYHl4 2/9xTkVU1vLltG/r+dp0TnZ+YYuZZYv3CJgNKKvtPX6S3hZUHVpfu3s0QZ8rrwYQZ6Iw+9 uFSfzf5YrKO5QRFCkL6cg+GBBEK/Yrtb3D3F08IoT9fZB7zTCWQl9Kvj4zw2BbUw2GisNz 6BoTtDdoXx678/6XF997RMk6WfucDJivUz2j2mKn4fR2YMffovskrY8k4Pi3Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748005619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Um5cdMCERLdTjN0m+jcDjx087vdtTglCVStatOk3Hbg=; b=EHVM5O/TVQfCgVl6bMwq62dE+IPbP9LANZgC8eaUiiS+X6UC0ATyBrS04XiK1nhlWqv1mr 6r8XM/WCA358KHx/aUKHfH3a3u3KXUfJLOrqDezxQls/HWsK158X7yVL1U3g41YiN56nST XClQc1uQc5JiunVyFY/8S5cTxqAdevO/OFeKt03Z3m6bLyESdR8MD8FMLjth0qcazrGcur 3FDsdjw/eYskes9ZirAFvsa2UducYpamChqYtRkUnkbF+4752Wyy6p5wjnOk4LOObYzyKf IRKc7WCYkSh8r9sw+f3IXCwts+/Uye/svI/M5WOdbN0GvFRHsP9uXivRQHLEWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748005619; a=rsa-sha256; cv=none; b=IYIYiCaknmOH+2xSUUsYvi3fNlqSO7+uEaadCD/+f2tgRZwFl2yRg0uRvpOXno7iFSPxXJ tD+nllUwYQNLBspfccg+0TmXJ0gm9caVZ9ofjbClQ3JuHncTTX66SmbioJfpF38jvN+POW x/uUj92/B8W5kM0t1oNo7gb/L/EY0Dl1IMF6U6zGdWDbuBhtaxPGZE0rHJ6uhcFaeBmeZE FD4mgrcQvQGORKNJ9hBJKdFSSnnfUeFWAtzcLm9MjEpPk74jLjsMT7CFJ7Rdvh94Sy7cQ8 DWU9bEyd/w4Dx0lWtY1vTi/KVToiOxr77t2icMVnTiSwyCKVBh03QsN8v6C9Hg== 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 4b3lmg0yzWz16YZ; Fri, 23 May 2025 13:06: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 54ND6x7J045738; Fri, 23 May 2025 13:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54ND6xFU045735; Fri, 23 May 2025 13:06:59 GMT (envelope-from git) Date: Fri, 23 May 2025 13:06:59 GMT Message-Id: <202505231306.54ND6xFU045735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0a16f62701f1 - main - icmp6: zero out pad space List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a16f62701f163f85449ad6c6dcf742b5247e8d2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0a16f62701f163f85449ad6c6dcf742b5247e8d2 commit 0a16f62701f163f85449ad6c6dcf742b5247e8d2 Author: Kristof Provost AuthorDate: 2025-05-22 09:23:59 +0000 Commit: Kristof Provost CommitDate: 2025-05-23 13:06:33 +0000 icmp6: zero out pad space In icmp6_redirect_output() we potentially add padding, but failed to clear this memory. This triggered a KMSAN panic during the sys/netinet/carp:unicast_v6 test. Reviewed by: zlei Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D50461 --- sys/netinet6/icmp6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 764e57ef9b76..eaf8514fd5cf 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2605,6 +2605,7 @@ nolladdropt: /* pad if easy enough, truncate if not */ if (8 - extra <= M_TRAILINGSPACE(m0)) { /* pad */ + bzero(m0->m_data + m0->m_len, 8 - extra); m0->m_len += (8 - extra); m0->m_pkthdr.len += (8 - extra); } else { From nobody Fri May 23 13:40:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3mWM4HVGz5xGLm; Fri, 23 May 2025 13:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3mWM3lGLz4NBJ; Fri, 23 May 2025 13:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748007631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FToX3JidRlQpYUtAF4ruujcO+5VyZUlJb6R6Dlcz6Y=; b=GuGHtEdHi5S+TYv2UvUikQOVHeMJAUUKZfNqidQy0LtbYOhG1VHq3KHIXWHutx1Hp/BRT5 qlXlhJQ7WQYy9aqcgRwIGxxwkf/SW0DNbv4AjsOf0JFGz7I5pCg3Y88WjiR/az3WngjAKt h2yo/B6NwEOKmPJugTt375XppMXlun0RdHGIvhBewR2euLXRVLFEVC+tVk4VywbGcd8lBY Y48dMR2bbTLHay2Oaj9zLql4jpouT7JwLztP9kkeN4hMaShmp8uEo+YvCHDtfh85ZpYjbQ e1cZaNmv87rW3jbZEkClinXrD3QCeiIpyykRdsSuHWJB3e7YNlzn79kPm8rfjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748007631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FToX3JidRlQpYUtAF4ruujcO+5VyZUlJb6R6Dlcz6Y=; b=PWnlpyF7VoO4ZMf5I5EXpFJi6y2hjVx7PYlH0y03TXpJLEJ91UcgQyVRCwhr0lDQN8MZYj ZQSjUia90xJtGyuyEhupEgEpAcgxS+VByrODpyA+yusGKg9IWfLk99mWMbk5AXRyiTaedj STW+soJB8Lt6ayt1Tgsuoq0zadbMLqC7QwgthZGozRlwdEHui6FSQ2//SEO6XjjYEE/tRK Jg0s0RPMQhY2rvWcxqnoql2GzxhvDMUre8KeoV3I17GmrW27FnQmrIp6woPMpNotwZW2mQ 4xkU61eU0ORxwqoeRXccav2F0yIZlzP6L9IjFq5o3qZ9A0ow998ydIuynmxlnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748007631; a=rsa-sha256; cv=none; b=XSqrdYAkHmrKXtvpXq1gPILeim+PB1aMuT5C7vsjKJ/146osRHijml6bRiTDfc0PERhY5p AfSYzhDIjfHmsx85mZhis2xrQNxtk21YFH/Scb0dE1zhX9Z6hzwpTR+wP3lwve0zfZN3ii T4AJ/UMlEgH7cZZctCeSX1vv2zaEtvfiOAPkhvuQEBU4UJSj26p5fzGICw1T01rJwwczUm 55wrZznwvJUlz7kTeCRwbhemdh+s/4o0DrXiAgZz7/DgNkvE+ZqiwOvmPf+8PXA848xPX1 rcPL48Aas/nF8zpO9gIKMFuvH6zSii4BHH1Z49fV6KvHBo0Z76fROgIXdD2uHw== 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 4b3mWM3GYYz173X; Fri, 23 May 2025 13:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NDeV2p011022; Fri, 23 May 2025 13:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NDeVXQ011019; Fri, 23 May 2025 13:40:31 GMT (envelope-from git) Date: Fri, 23 May 2025 13:40:31 GMT Message-Id: <202505231340.54NDeVXQ011019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0bfa8a459626 - main - bsdinstall: improve pkgbase target retry prompts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bfa8a45962644947e17b5262c5d0efa36d3f4d9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0bfa8a45962644947e17b5262c5d0efa36d3f4d9 commit 0bfa8a45962644947e17b5262c5d0efa36d3f4d9 Author: Isaac Freund AuthorDate: 2025-05-09 12:21:01 +0000 Commit: Ed Maste CommitDate: 2025-05-23 13:40:12 +0000 bsdinstall: improve pkgbase target retry prompts These now use bsddialog rather than prompting the user for input on the console. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50270 --- usr.sbin/bsdinstall/scripts/pkgbase.in | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index eaed23a19548..1ff93afe817b 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -23,18 +23,6 @@ local function capture(command) return output:match("(.-)\n$") or output end -local function prompt_yn(question) - while true do - io.write(question .. " (y/n) ") - local input = io.read() - if input == "y" or input == "Y" then - return true - elseif input == "n" or input == "N" then - return false - end - end -end - local function append_list(list, other) for _, item in ipairs(other) do table.insert(list, item) @@ -73,6 +61,18 @@ local function bsddialog(args) return exit_code, output end +-- Prompts the user for a yes/no answer to the given question using bsddialog +-- Returns true if the user answers yes and false if the user answers no. +local function prompt_yn(question) + local exit_code = bsddialog({ + "--yesno", + "--disable-esc", + question, + 0, 0, -- autosize + }) + return exit_code == 0 +end + -- Creates a dialog for component selection mirroring the -- traditional tarball component selection dialog. local function select_components(components, options) @@ -254,7 +254,6 @@ local function pkgbase() while not os.execute(pkg .. "update") do if not prompt_yn("Updating repositories failed, try again?") then - print("Canceled") os.exit(1) end end @@ -263,7 +262,6 @@ local function pkgbase() while not os.execute(pkg .. "install -U -F -y -r FreeBSD-base " .. packages) do if not prompt_yn("Fetching packages failed, try again?") then - print("Canceled") os.exit(1) end end From nobody Fri May 23 13:42:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3mYk28n6z5xGBP; Fri, 23 May 2025 13:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3mYk18LQz4PJm; Fri, 23 May 2025 13:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748007754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xApy3CWU0UailbHTXiSaPNkVPKWdI00eDj1cYcMYNaQ=; b=xJztcu0+EiSGbWNoy6yqBXGWmtu0tW2flDaXlPHTJaWROrDz1Kj/dRQe0YKqZYlNEPNli5 Z39NobMjzY/dC2BYahvLJqLDk9Dvvar9oFu26i6LkXJigWUojuB9TRDfVVGnqh2eziIZLh fe+UKZ47NndAlKb/220RweV5o6GQRH6BQGMbXO+ZjuLUrlqtlmT3ZzLrhsEYp4/0HAwAUc eSXBzMsk2vgkQXOm8fT5DXHrMjZDye173C8w1GM0/WWk1N1Fkes11GNVscciGMdp3Nxfs6 T1smSnX5aHdglpcMwWSJSUG0KaSCTBN7baMcHaeqcJMOx06v1DhMT+V3Hp2OXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748007754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xApy3CWU0UailbHTXiSaPNkVPKWdI00eDj1cYcMYNaQ=; b=YFOzLQPC4sHaq8F6/ik5GuYimAvThzzQ3okKukCuDkZeSEvQIMCJOQyi7KBgJl3sHkJPZA ch1be2i0KybmPvoQw2rRKJndY3FNvm695Z2iHVm6yNwWsl+aK+X+Lq6zUfk9KPkc1RPHD9 mocNx5vNr9yACGGDq214kUWv52b87LxRKNVeFrfpN0S4UjknKlfLSbCrP4OA49KvPHrSr/ voQh1m8FupeVI/chUW34nqGDDqBKlsGyhc4ik91tG59NTmNg4/5eTlAO/URJ1F5BB7Y61Z FehTuNPUb/qaCb4eaENKHPdHehZR0iG6/6WvTal0UvCgKS399LZS9qbMiiM/Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748007754; a=rsa-sha256; cv=none; b=Vga5+y2ROza3mNiHWpCbBDLz9W2OHm1HFCuFeVruLUCyHJNI5aQP7GWb5jiMDFZGpdORy+ lixmkRwwFzzjqW7rpeZPyW8qnkSVrmLqGZZNb7flbV1T92ikedciEhWU7rtaF0jMgLTA/x HvDaHxhfvWXJLCZTZ3UKKIFceoKaTTzx2x96ZmRepgikQpqpK7HaMpPmszBnC/JK1XsFq0 TottvsKhKv1IWKSzDJkrUDcRZbVRf54MtWZg9DOjMcpZ1RowNaTBur8VmES4Q9Hnpq0DT4 kNYiCtv2oS4I+FbEgsRFtqNQUNJpvgA9ay9vtdHMCIgY34PEN2B3gFap8FbYQw== 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 4b3mYk0kHYz16tk; Fri, 23 May 2025 13:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NDgXoq018584; Fri, 23 May 2025 13:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NDgXKt018582; Fri, 23 May 2025 13:42:33 GMT (envelope-from git) Date: Fri, 23 May 2025 13:42:33 GMT Message-Id: <202505231342.54NDgXKt018582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0a86a8ace333 - main - bsdinstall: support offline pkgbase installation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a86a8ace33374b1dcf7b43eab85db2f76537522 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0a86a8ace33374b1dcf7b43eab85db2f76537522 commit 0a86a8ace33374b1dcf7b43eab85db2f76537522 Author: Isaac Freund AuthorDate: 2025-05-10 22:51:06 +0000 Commit: Ed Maste CommitDate: 2025-05-23 13:41:49 +0000 bsdinstall: support offline pkgbase installation Reviewed by: bapt, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50347 --- usr.sbin/bsdinstall/scripts/auto | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 75bff522a63f..fa67dbf671cc 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -161,10 +161,22 @@ if [ $? -eq 1 ]; then fi if [ "$PKGBASE" == yes ]; then - bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" \ - --msgbox "Installation of base system packages currently requires internet access. The next few screens will allow you to configure networking." 0 0 - bsdinstall netconfig || error - NETCONFIG_DONE=yes + if [ -f /usr/freebsd-packages/repos/FreeBSD-base-offline.conf ]; then + bsddialog --backtitle "$OSNAME Installer" --title "Network or Offline Installation" \ + --yes-label "Network" --no-label "Offline (Limited Packages)" --yesno \ + "Would you like to fetch packages from the internet or use the limited set of packages included in this installation media?" 0 0 + if [ $? -eq 1 ]; then + export BSDINSTALL_PKG_REPOS_DIR=/usr/freebsd-packages/repos/ + else + bsdinstall netconfig || error + NETCONFIG_DONE=yes + fi + else + bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" \ + --msgbox "No base system packages are included in this installation media. The next few screens will allow you to configure networking." 0 0 + bsdinstall netconfig || error + NETCONFIG_DONE=yes + fi else export DISTRIBUTIONS="${DISTRIBUTIONS:-base.txz kernel.txz}" if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then From nobody Fri May 23 14:30:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3ndQ2H5mz5xJRw; Fri, 23 May 2025 14:30:50 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3ndQ05bkz3WlV; Fri, 23 May 2025 14:30:50 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748010650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xXQiZabMc2DwMtLBsbmyN9Lqz/ilH3r4grkU9MAUO2g=; b=BDBw1D42oHYmITKm7/FzCsuR7+I44ABVqBv5N4WxeYSUEvGSGLN7roS2MzBxMu+06hFsPX V7UPwYSr2ACymtRbc4JgN5sz7jUQE5lyh9Susgr9UmzS5ytqg1O2Mz6BDWchRPZ3UeirDP PYzCwq+ELuj8B1zrzZM71kOcf+cFHvVytucb48PWkX2/OuUzbtswmDefZDyhbzkOcfcw4U vbykCoPXeGcIiAxS8fBf025S1ys9wiG+Y3PFQh0YghI/vdxu97V5FYS19kSQViwT4jw3C8 qg+5OXcQnJmX5WuInypKuFwluc1gN702cVziBKHFxbyKwCIE2HNSaro6JZXeUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748010650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xXQiZabMc2DwMtLBsbmyN9Lqz/ilH3r4grkU9MAUO2g=; b=MYLN9gZXNfAEv/NBw13GeK2IAb/UK82edRHtlrfbnfgDAHEUjLLyWP+pl1YxUiSpfu+Oq6 JOhuHhez9HvEmVV+9p9mR1XkbcXwxXG72or8I+CO/pcTM0pO24JCv1XgDtbKV6uneYczN0 SyyaReeE1yW1wW5BL8U0EMHd31Tx2B/TEKdYNjyxRTzBNxzDtIf3RrQJNViwksxPT3HXPo ET0EjuP3xn0ICimSb15foyTH7FUfteDmznYs6q51alR4SI9jQd1b/j1RHzSNHy86JFhSNh z2BC+NH0SwVOKyxDmlz02Hs/WZnvY4E7IGzxl9xPFToyJbB2+NLaWGLOKBDemw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748010650; a=rsa-sha256; cv=none; b=CqXPEsL1zkkXDKK2Tu/UpVkIS/pwRt4Kh0pd5+L+uFpjgraljgO/JWSvBQ9E++vgcE7Rt7 pq6KMDweQfA/vA6fR9397U0MfwBA7CzJfZMXAw/ra2zxMimDWp5zlYcazN6G5sTiJrnTUc L5dw09aZVl+LCoBR89hXE2Licn7BgfQwlHZBqD6j2yfQJ7YlTG+8bpTe02f0aO9m5gQutB ZNG49hQx+riBljGTRXVmp6N1ckBVaQUWHJNRWoq8c3RGpX3ZkdClLtXVedXPP7iaSr8/3b YQMFfn5QzFZTpPKI0FB8cYvQB/+jH3BadyBJiLIHgacrutdzkAlVAkQ8qhg6AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from b.nours.eu (b.nours.eu [IPv6:2001:41d0:303:5e39::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b3ndP66tnz8mW; Fri, 23 May 2025 14:30:49 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by b.nours.eu (Postfix, from userid 1001) id A8C53D11C9; Fri, 23 May 2025 16:30:46 +0200 (CEST) Date: Fri, 23 May 2025 16:30:46 +0200 From: Baptiste Daroussin To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 7587f6d4840f - main - namei: Make stackable filesystems check harder for jail roots Message-ID: References: <202505231304.54ND4jMD044846@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202505231304.54ND4jMD044846@gitrepo.freebsd.org> On Fri 23 May 13:04, Mark Johnston wrote: > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7587f6d4840f8d363e457cddc14c184cf1fe7cc1 > > commit 7587f6d4840f8d363e457cddc14c184cf1fe7cc1 > Author: Mark Johnston > AuthorDate: 2025-05-23 12:52:24 +0000 > Commit: Mark Johnston > CommitDate: 2025-05-23 13:03:38 +0000 > > namei: Make stackable filesystems check harder for jail roots > > Suppose a process has its cwd pointing to a nullfs directory, where the > lower directory is also visible in the jail's filesystem namespace. > Suppose that the lower directory vnode is moved out from under the > nullfs mount. The nullfs vnode still shadows the lower vnode, and > dotdot lookups relative to that directory will instantiate new nullfs > vnodes outside of the nullfs mountpoint, effectively shadowing the lower > filesystem. > > This phenomenon can be abused to escape a chroot, since the nullfs > vnodes instantiated by these dotdot lookups defeat the root vnode check > in vfs_lookup(), which uses vnode pointer equality to test for the > process root. > > Fix this by extending nullfs and unionfs to perform the same check, > exploiting the fact that the passed componentname is embedded in a > nameidata structure to avoid changing the VOP_LOOKUP interface. That > is, add a flag to indicate that containerof can be used to get the full > nameidata structure, and perform the root vnode check on the lower vnode > when performing a dotdot lookup. /home/pkgbuild/worktrees/main/sys/kern/vfs_cache.c:5276:24: error: variable 'cnp' set but not used [-Werror,-Wunused-but-set-variable] it breaks the build, Best regards, Bapt From nobody Fri May 23 16:08:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3qp43kszz5vxBD; Fri, 23 May 2025 16:08: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 4b3qp435XCz3Hkx; Fri, 23 May 2025 16:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748016508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPm1fehvjTz30GhhbWzyMTdkZ0rLfsxEY/f92mS0OYs=; b=FJd1R/2keZJhoYpTRorp2XKCD/4oShERV+9RWVODiXSZmgqKUxs+z25ulbtESzkQD+FI8G fKPhmMfsYyPY+OV1mOjpP1YhNl0ToKWvdhxPoWCst6EFaSe6cKqCCeVSQ+sRL8xkBHrTJv GPKiYFqnogUwSvGS0SkiOVEB7OvgUGCKFgcfdjVCj6pKBpXP++6nPdd5ji6d3m4EjyYwXj WCnTvigxG/oRXlLcTTHlkSLFTqTRiRzpK0OAanhnVKUbAv3OaqQjmFHyPJr57Iu8EliWK1 6d/m3effWwEbw7HpJedX1uXqZS/kpeAoJ3nEVbvdqImZR5ZztxqDw5t60qhEAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748016508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPm1fehvjTz30GhhbWzyMTdkZ0rLfsxEY/f92mS0OYs=; b=Y+SQxCOrBJrYi4JDXS6ft7vKid3iEh8NWhDJ8eRLjZUv6Yt4r1B1+CdwkwlctlG1ine82F OJ4dF9De6jdXCtF9xM5shRHAh8orZSCTB4ztV29j6c9cl4I/CCCO/Zjg7YwVC3NJiB6wr5 Oi/eoGbkeYkpKuvCREAV5J2KMg3w9epiejCHb7EaBbIh8Uc9w8P1ZkXhHlcb/7cQ3Q7K4n eiIMl3vMX60D4reddjJX3kUTJdaIPRvtn1SjTTYU6maZqmZHo02SVZgjr0l6hLOov6T9tP U8Je8t6zCDid9Z+MgY8JUHHNVeSjugK0EoR7cUgjuHeOhrtxKTESvENHaUQNXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748016508; a=rsa-sha256; cv=none; b=EFsSLv/RVtPwj/O4JwHt0KdcpfAmqe6tIlIctPsBlXoBJyXCF7+F7D32vQsJz1wFTSwxdO LVayF2VB+InOzVLGha5YS+kSjw0ql7g5wBMU37tFoNnM8uR92Cw0CwZnzG1XwS9sj4JCeF VTdMmWPoLn8DdTx78GHGzWeKLIAbg/2cjp4tMWX41oa+Rvp8UUKk0mF6IUh21hwgvWclh7 v8wux538mPrEcsvGwbqyVuOx2sBWF6OiJPY8w0K7DhalyBhm5FIzZp4CDcg6RfNXN/wfUm WkBITOxpgwlRlMEQ3c/+h2xYxB8UqlggpmMhF4fdEcFZ30LKNomX+Bg03QiOdQ== 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 4b3qp42SGdz1Bfw; Fri, 23 May 2025 16:08: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 54NG8SKd084135; Fri, 23 May 2025 16:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NG8SlC084132; Fri, 23 May 2025 16:08:28 GMT (envelope-from git) Date: Fri, 23 May 2025 16:08:28 GMT Message-Id: <202505231608.54NG8SlC084132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 14ec281a09d7 - main - namei: Remove a now-unused variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14ec281a09d7818def2083ef0c3e28f8101f4268 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14ec281a09d7818def2083ef0c3e28f8101f4268 commit 14ec281a09d7818def2083ef0c3e28f8101f4268 Author: Mark Johnston AuthorDate: 2025-05-23 15:35:05 +0000 Commit: Mark Johnston CommitDate: 2025-05-23 16:08:21 +0000 namei: Remove a now-unused variable Reported by: bapt Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") --- sys/kern/vfs_cache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index f2368877ec93..69de06cff193 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5273,16 +5273,14 @@ static int __noinline cache_fplookup_dotdot(struct cache_fpl *fpl) { struct nameidata *ndp; - struct componentname *cnp; struct namecache *ncp; struct vnode *dvp; u_char nc_flag; ndp = fpl->ndp; - cnp = fpl->cnp; dvp = fpl->dvp; - MPASS(cache_fpl_isdotdot(cnp)); + MPASS(cache_fpl_isdotdot(fpl->cnp)); /* * XXX this is racy the same way regular lookup is From nobody Fri May 23 17:06:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3s4X1NMJz5w2CH; Fri, 23 May 2025 17:06:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3s4W6c2Rz3kFl; Fri, 23 May 2025 17:06:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748019963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sRsfBWe66dI7Fmh5Ne6H/01bGLV9fJXNyyMInT31PDU=; b=uQCAGGFAqL5plKZEf/xrdxBQlwPjSZ7N0RCRYNiD3hi9EVKu1D8SptlBxAMRsaaizhPnTS WdLOBaoxYAJPDIUkh0QIdn0ob8UKHoZzYEbol5r1Nnjnt20hYYj+jmI+Z3woF48kuLj0s5 wZvPaJqjxTGQrLgoYLgJf4kQWvtcwfDoMBFADBrBCrDaSMEfaAXdcrqIamUfwNTzFZ/Yg5 lwfqAXc3lpeIihr0KPdCoh97qM9yXeLIhmVfPqFExcPR3GO/DC/vPREOTWNxQsCtfvSwT4 mCHZyjz7JRVNUT5M/qJIHXavb7jkiEDrAc0pmbaam4NHY8i/moWv5iaDW4fqSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748019963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sRsfBWe66dI7Fmh5Ne6H/01bGLV9fJXNyyMInT31PDU=; b=LzoyaHo1WuWDK3D+JZdQJ6fRcia7hVjQ0gcS86WsBfg3OEoiWv0UBso46ac+s0G2KivC8o +u+o5hfYLOUOG00eBJJt1DWGU0snnB0QkmsQBl4YA4mLI4pbAD4lExoXN2bAZf1csTHCF9 1bxFRT5aN0XjUNgquQ57EcpxKByVSt8m+Li7Kpos25G0ctjcvkHWzhLOnCzJYsAiPf4nhe bhkcDmodDv9tTUkLoWHMuViQziZ3YXMKbuEbkaJjWhIPk2ftFT5Sa2ZbqIyx2Ujr9l4YbW jQ/TJc7Ibh+n5Burbr4tcPVogwMg8U5ZVQuUXUitiGzplSu8YDmccMRNRbrGHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748019963; a=rsa-sha256; cv=none; b=KBblxmgeQgMp4L0dVtPMwNF1Z7FewKMLDWouRkuI5GMoC8MmYwK8yZ7u6/WPmCcubsEOMv 3vTTNR4k9s88UfC30UXnZ1OTW7HHTpO/sYZSgcAJw6FMH7JcPqbHPMei8waHt5gTJX7+j/ hzn/SniLa/kxqfXwwNSMat323/Oc886SIC+NAShLOJZEzW+duPRLiweEzCO/k0FIydzkeM x1p2KpIPNK3j3H+tvFxEyUOvBT/pXl3SyHIeVRHPuinTBSj6C/iVk3EQnuPnbibDMnm1jA acNIHfZJ8wbQBQ+g77jN2ejaNsCn0oMC9L+FO0aq2EhcXlEhscviQEFchZRtWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [172.16.15.198] (astound-64-85-238-171.ca.astound.net [64.85.238.171]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4b3s4W2MbRzDHF; Fri, 23 May 2025 17:06:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org> Date: Fri, 23 May 2025 10:06:01 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: ac62b97951c2 - main - openssh: Add ${SKSRCS} to libssh Content-Language: en-US To: Jose Luis Duran , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/20/25 18:59, Jose Luis Duran wrote: > The branch main has been updated by jlduran: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ac62b97951c25a33ec0880e574ccff31be7452f7 > > commit ac62b97951c25a33ec0880e574ccff31be7452f7 > Author: Jose Luis Duran > AuthorDate: 2025-05-20 22:58:23 +0000 > Commit: Jose Luis Duran > CommitDate: 2025-05-20 22:58:23 +0000 > > openssh: Add ${SKSRCS} to libssh > > sshkey.c references sshsk_sign(), which is defined in ${SKSRCS}. > > Due to how FreeBSD builds libssh, or put differently, due to upstream > not building a shared libssh.so, we need to partially revert > 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere"), and > add ${SKSRCS} back, to avoid linking problems, especially when building > with GCC: > > /usr/local/bin/ld: > /usr/obj/usr/src/amd64.amd64/secure/lib/libssh/libprivatessh.so: > undefined reference to `sshsk_sign' > collect2: error: ld returned 1 exit status` > > Put the sources in a separate line, to maintain line-by-line > compatibility with upstream Makefile.in > > PR: 286580 > Reviewed by: emaste > Approved by: emaste (mentor) > Fixes: 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere") > Differential Revision: https://reviews.freebsd.org/D50020 Shouldn't we revert all the other Makefile changes that added SKSRCS in the consumers of libssh? -- John Baldwin From nobody Fri May 23 17:16:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3sK36Sgcz5w2xV; Fri, 23 May 2025 17:16:55 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-yw1-f177.google.com (mail-yw1-f177.google.com [209.85.128.177]) (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 4b3sK330L0z3pFJ; Fri, 23 May 2025 17:16:55 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-70b684670e7so110967b3.2; Fri, 23 May 2025 10:16:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748020614; x=1748625414; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Sjaq06qjLIpwspsrMrSWbV6h41r+Oc2+IoZMXixDHFU=; b=ORJR6jiAPTExRA/DTYazOAPnx0AzrqOu1Qn9ensvPS6g9JZSenHcD7NyJRpiF18SOq zDau0GDR2yeZqd1va80L8yKXet7SEsP28WrgY99NYxKo3OeaDl4XzAzkps+1deZwqY3s 2wJcftHHfCfjm9Xd8QnvHKIm59UmdUrhWrZGTWJ2RGHtYpVbZJTUHDLS7R5aKds7PBDH UFjvf284Oi9bHEqr68c0YYDitoNIMYnHdr76sXbRpm0ThzlpWQXVbvRB8k1cdAeRkk6A vM8OSlNf4Qp2LBtxhAXVl4zSkWM81cCOJS78bOflj1bpb7zFAXlreUgYWnETz05RwkOZ Kjhw== X-Forwarded-Encrypted: i=1; AJvYcCUDFRwySZIy429C2/iT5J3opwCVoACS5KjWEGuiOuLDDjcOaGDUA9AYIbeyX/V4UPnMZHbZ/pA0w5jsuctqZ7vwm1lM@freebsd.org, AJvYcCVgNo3WSr9XLrRYPn6GP6s8ZBbOmEUyyCZk5X/IIG9oaQH34G/eALUtGAlNxVfrDAiYMgz0QfQFf3IwdNbJvRdYaxt+3Hw=@freebsd.org X-Gm-Message-State: AOJu0YxKr8KIxDjGidi8OjZaaOn5uzMg6o/vPb/NTGzd7lJuXuIzfXv4 b5aWVSY5IJdos1veBNcYeKv4A2lDRt+nNdXbhPD0mBOhLQqXtMeJCf5VtByH/w== X-Gm-Gg: ASbGnctvSAXWBfCYov8qAXqx2B6e5aRj+vAc0GmzjdagdtrvJNKj9ogUmLC7MQ63G8d XHw9aiUBB/jy/8XMMy4OJK5TOSfM/WF4XJqlyufbqoUZr30kVCfiRxyxezOvzQxMHPGOx6hC7CI ETfLoEskmE6+IgpbXHRrxBMcq050AUYhH6bRqChDJPHeYYCdW95RG9+CF5entTNlr16Fbnewlij fRITLc0F+3v1cGSxwFaP4TCLusJa1CAdBDLod9jo00E76BRdBhphVgdhU1v0tl8j/WG47axFBw3 ynRmDvn402+h/AVDss3rbjT35PBI7rm6Ik4lcBXReB0eue4bFDIg2EuSaiXi9mGuHS9QL8Xad6H ZWXb7k8qku66QQarM X-Google-Smtp-Source: AGHT+IEJ/CaroW3YVlYUw7y6WhAWJU3Fs42GEBLBJGtxaS5EP6CPyeaLFkMdLktREdsB2smIDfVquA== X-Received: by 2002:a05:690c:386:b0:70e:d35:fbf7 with SMTP id 00721157ae682-70e1b5c3092mr17409867b3.5.1748020613898; Fri, 23 May 2025 10:16:53 -0700 (PDT) Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com. [209.85.219.179]) by smtp.gmail.com with ESMTPSA id 00721157ae682-70e1d423473sm3307877b3.22.2025.05.23.10.16.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 May 2025 10:16:53 -0700 (PDT) Received: by mail-yb1-f179.google.com with SMTP id 3f1490d57ef6-e7d8f68d5eeso13633276.0; Fri, 23 May 2025 10:16:53 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVlJuka8cioQbohYSNVXkixquARrAUhTijyKL9ez7RseFLEYdSAjUs+zKVUQmYw9y80C/h6fsrdHt6PXMmn5eglPsZD@freebsd.org, AJvYcCWECZ0cXJo6GFnewL2lBKbwZ05x1RgCm3lGoFJSr01Cb9ni48U9RZyEJOfNI9MracxSWh8k8zRSNv5vHP1k65OxEnQwdvk=@freebsd.org X-Received: by 2002:a05:6902:10c2:b0:e7d:763c:a19f with SMTP id 3f1490d57ef6-e7d91a1b019mr188623276.2.1748020613228; Fri, 23 May 2025 10:16:53 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org> In-Reply-To: <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org> Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Fri, 23 May 2025 12:16:41 -0500 X-Gmail-Original-Message-ID: X-Gm-Features: AX0GCFssxRzRAE3DILjg3xR5vJ20lOzoc4ECZZvoKzAL_3cVdubM26sSFaiHpls Message-ID: Subject: Re: git: ac62b97951c2 - main - openssh: Add ${SKSRCS} to libssh To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4b3sK330L0z3pFJ 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:209.85.128.0/17, country:US] X-Spamd-Bar: ---- On Fri, May 23, 2025 at 12:06=E2=80=AFPM John Baldwin wro= te: > > On 5/20/25 18:59, Jose Luis Duran wrote: > > The branch main has been updated by jlduran: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dac62b97951c25a33ec0880e5= 74ccff31be7452f7 > > > > commit ac62b97951c25a33ec0880e574ccff31be7452f7 > > Author: Jose Luis Duran > > AuthorDate: 2025-05-20 22:58:23 +0000 > > Commit: Jose Luis Duran > > CommitDate: 2025-05-20 22:58:23 +0000 > > > > openssh: Add ${SKSRCS} to libssh > > > > sshkey.c references sshsk_sign(), which is defined in ${SKSRCS}. > > > > Due to how FreeBSD builds libssh, or put differently, due to upstr= eam > > not building a shared libssh.so, we need to partially revert > > 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere"= ), and > > add ${SKSRCS} back, to avoid linking problems, especially when bui= lding > > with GCC: > > > > /usr/local/bin/ld: > > /usr/obj/usr/src/amd64.amd64/secure/lib/libssh/libprivatessh.s= o: > > undefined reference to `sshsk_sign' > > collect2: error: ld returned 1 exit status` > > > > Put the sources in a separate line, to maintain line-by-line > > compatibility with upstream Makefile.in > > > > PR: 286580 > > Reviewed by: emaste > > Approved by: emaste (mentor) > > Fixes: 65d8491719bb ("secure: Adapt Makefile to ssh-sk-client eve= rywhere") > > Differential Revision: https://reviews.freebsd.org/D50020 > > Shouldn't we revert all the other Makefile changes that added SKSRCS in t= he > consumers of libssh? I would be inclined to just revert a098111a28ed, and leave the others "as is", just to "match" the SRCS line, which was the underlying original motivation. > -- > John Baldwin > --=20 Jose Luis Duran From nobody Fri May 23 20:03:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3x1J2YVlz5wFbj; Fri, 23 May 2025 20:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3x1J20mNz3LDj; Fri, 23 May 2025 20:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748030612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ogF1/uNumgOgDPpKSmjF52jSx/C7maFKY7C5AZirUyw=; b=eLY/uSj8DjkfR2JxPa8GakpHYGDTn0bdymWJuDAS0nRemz2JeLb9WnfAOQBa3XW+i/BNud L4RZiZMajs8vv0ujCiGRCHEv9NllzFVPDV598VxcFb2LphUm08MYfCBi1oJH0o+UzOU+de 0w4kTRM9sCghDTsFxQczBuij2vKjnWgaLElm3lwpiUs0UmwfZRRw6PE67TaxufRI5PsOVf 6/UDV1CS1LHtAPMQa93DObYt2Cb0exSN0Ci7ungt6WEdZikCxHEV19bylQoLtnkrrqn9VP 1jYpKxEWh+XcdDQB5IdeJtFTYJXLvfgneqRM7CJXoywGS+/nGdhGt2V6veZ/nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748030612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ogF1/uNumgOgDPpKSmjF52jSx/C7maFKY7C5AZirUyw=; b=DsvQGw+cjHOv3awVwMNaOtb0OIBSsWLWKTZQtC7N2Ohj6YUECa/ko0zgGJ3e2Gw5kkljtG eKiOgjnrR/C/bkoSEdoTCLRZYidCI4wkfhXP6OpT/g361AZvBJgG+UFrRXEBDjBfUU1+kO +21M85VlS6HgJiJxSYct7KNMjLk91e3Gp1Io50aqY7nL0sDdcP34e7OWdPMBmCYjvTG2yu XqEA8TSX9+mEfzbq0CTALSCetz8PWr9QZlB9IG5SU2BsPMDUXvYrn1FszCS1FV9eKA+vso JS4813073CyXYTOExK8odCEluX8vTRQ06UF4Rtt7KFrNsFZRNBI52EEY1e31kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748030612; a=rsa-sha256; cv=none; b=ldzYk2W5V8GqGIH11QP7zd/1qqijqwDRzue55iXvJXUFbkW9PthHmC4+UFIHOW0qvCeVVx MJWBSjK6cS60i0IYKZkLsYw0oBv1LnsdgJl9roZM0DMnTzIT/GVgV3+wmiYiffqKDBmYDy bg7LZbUtrKd8Pkc51px2zK+YesOoe5Nv0GQaynvelFntaOxSjc/lM3fHvp3q9T2rFEfGgK f6C/WxSiXSC6Y1156LOMXpp8C/rTwnPtfScgjzU91vHq+CcE2KUitzpSdSNqIRssze0A2L NLyNoWaILdfqmazzVa/gVltrBhfgbqrxDEI1AT2euUIApMkVpnx3WsRcUbidFg== 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 4b3x1J1Yrxz1Jrt; Fri, 23 May 2025 20:03: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 54NK3WuQ031519; Fri, 23 May 2025 20:03:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NK3WUN031516; Fri, 23 May 2025 20:03:32 GMT (envelope-from git) Date: Fri, 23 May 2025 20:03:32 GMT Message-Id: <202505232003.54NK3WUN031516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: da2dbdc297c9 - main - bridge: check allow_llz_overlap before member_ifaddrs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da2dbdc297c948d5923812e3d3b777b790d3bf43 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=da2dbdc297c948d5923812e3d3b777b790d3bf43 commit da2dbdc297c948d5923812e3d3b777b790d3bf43 Author: Lexi Winter AuthorDate: 2025-05-23 18:08:14 +0000 Commit: Lexi Winter CommitDate: 2025-05-23 18:08:14 +0000 bridge: check allow_llz_overlap before member_ifaddrs When adding a new interface to a bridge and allow_llz_overlap=0, which is the default value, if_bridge checks if the interface has IPv6 link local addresses assigned, and if it does, it calls in6_ifdetach() to remove all IPv6 addresses from the interface. This means it was possible to do this: % ifconfig bridge1 create inet6 -ifdisabled auto_linklocal up % ifconfig epair20 create inet6 -ifdisabled auto_linklocal up % ifconfig bridge1 addm epair20a ... with the result that the link-local address on epair20a would be removed, then the interface would be added to the bridge. If member_ifaddrs=0, which is also the default value, this no longer works: % ifconfig bridge1 addm epair20a ifconfig: BRDGADD epair20a: Invalid argument This is because the member_ifaddrs check runs before allow_llz_overlap does its thing, and returns EINVAL since the new interface has IP addresses on it. To restore the previous behaviour, reverse the order of these two checks, so the IPv6 addresses are removed before we check whether the interface has IPv6 addresses. MFC after: 1 week Reviewed by: kevans, kp Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50477 --- sys/net/if_bridge.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 475977adf68a..9338d28437d0 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1329,25 +1329,6 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg) return (EINVAL); } - /* - * If member_ifaddrs is disabled, do not allow an interface with - * assigned IP addresses to be added to a bridge. - */ - if (!V_member_ifaddrs) { - struct ifaddr *ifa; - - CK_STAILQ_FOREACH(ifa, &ifs->if_addrhead, ifa_link) { -#ifdef INET - if (ifa->ifa_addr->sa_family == AF_INET) - return (EINVAL); -#endif -#ifdef INET6 - if (ifa->ifa_addr->sa_family == AF_INET6) - return (EINVAL); -#endif - } - } - #ifdef INET6 /* * Two valid inet6 addresses with link-local scope must not be @@ -1386,6 +1367,26 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg) } } #endif + + /* + * If member_ifaddrs is disabled, do not allow an interface with + * assigned IP addresses to be added to a bridge. + */ + if (!V_member_ifaddrs) { + struct ifaddr *ifa; + + CK_STAILQ_FOREACH(ifa, &ifs->if_addrhead, ifa_link) { +#ifdef INET + if (ifa->ifa_addr->sa_family == AF_INET) + return (EINVAL); +#endif +#ifdef INET6 + if (ifa->ifa_addr->sa_family == AF_INET6) + return (EINVAL); +#endif + } + } + /* Allow the first Ethernet member to define the MTU */ if (CK_LIST_EMPTY(&sc->sc_iflist)) sc->sc_ifp->if_mtu = ifs->if_mtu; From nobody Fri May 23 20:36:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3y1V1s98z5wJdw for ; Fri, 23 May 2025 20:48:46 +0000 (UTC) (envelope-from celina.jones@quicklogowebsitedesigning.com) Received: from host.quicklogowebsitedesigning.com (host.quicklogowebsitedesigning.com [103.133.214.27]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3y1R43Pxz3lPp for ; Fri, 23 May 2025 20:48:43 +0000 (UTC) (envelope-from celina.jones@quicklogowebsitedesigning.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=quicklogowebsitedesigning.com header.s=202407 header.b=wSv7csAi; spf=pass (mx1.freebsd.org: domain of celina.jones@quicklogowebsitedesigning.com designates 103.133.214.27 as permitted sender) smtp.mailfrom=celina.jones@quicklogowebsitedesigning.com; dmarc=pass (policy=none) header.from=quicklogowebsitedesigning.com Received: from quicklogowebsitedesigning.com (localhost [IPv6:::1]) by host.quicklogowebsitedesigning.com (Postfix) with ESMTPA id 46B7210E518 for ; Sat, 24 May 2025 02:06:42 +0530 (IST) DKIM-Filter: OpenDKIM Filter v2.11.0 host.quicklogowebsitedesigning.com 46B7210E518 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicklogowebsitedesigning.com; s=202407; t=1748032602; bh=h3Re4ZyxmIjLjbC3kGNe4/eRd55jarqXuwjXB2zIetQ=; h=Date:From:To:Subject:From; b=wSv7csAiOwGjou7eGQxkw4wKd+YLZyDFh45T2DwDSR8ny+yjojLW9MScXYK/OmM7h jRVqBDdFjXQPhG3XWEr6QPbgOYvUWsD//Yfjkm1iUFQcqsjhwKDkZZpPJom+s/SlWN sYh5G6wkjCOANR0m0tzDgvnz//uO4FiCZ1xSujW/6nLAhG8Bw+XTD2vjOBKapQ27/Q wPlxEU8Dc8N0atLP5UNKDUPmzsaMT4aAa+APl4LmMeZGjpyOhapSCLPsVZaw9/X8o8 /MQhNzXqsw6MNINlmyeHUNEOSHKk4/+5vHcd2Byk0iBLhmmDhuSOPthKpzlYVB0TLG FQi8sgLV2QXQQ== List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Date: Sat, 24 May 2025 02:06:42 +0530 From: celina.jones@quicklogowebsitedesigning.com To: dev-commits-src-main@freebsd.org Subject: Audio & Video Transcription / Translation Service at 70 cents/min Message-ID: <4eae5ba80eaa84d5c4834d8231c76300@quicklogowebsitedesigning.com> X-Sender: celina.jones@quicklogowebsitedesigning.com Disposition-Notification-To: celina.jones@quicklogowebsitedesigning.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4b3y1R43Pxz3lPp X-Spamd-Bar: / X-Spamd-Result: default: False [0.56 / 15.00]; RBL_VIRUSFREE_BOTNET(2.00)[103.133.214.27:from]; NEURAL_HAM_SHORT(-0.93)[-0.928]; NEURAL_HAM_MEDIUM(-0.46)[-0.462]; NEURAL_HAM_LONG(-0.25)[-0.253]; ONCE_RECEIVED(0.20)[]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_ALLOW(0.00)[quicklogowebsitedesigning.com,none]; DKIM_TRACE(0.00)[quicklogowebsitedesigning.com:+]; R_DKIM_ALLOW(0.00)[quicklogowebsitedesigning.com:s=202407]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MISSING_XM_UA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:133643, ipnet:103.133.214.0/24, country:IN]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_DN_NONE(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(0.00)[+a]; FROM_NO_DN(0.00)[]; MIME_TRACE(0.00)[0:+] Hello, Are you looking for a transcriber / translator for transcribing your audios / videos ? Many researchers / students are not aware of who to reach out to get their research audios and videos transcribed with confidentiality. We have been working for university students across the globe for over 10 years now and provide transcription service to students, researchers, coaches, news agencies / reporters, writers at a very reasonable cost and quick turnaround. Whether it's interviews, podcasts, meetings, or lectures, we can quickly and accurately convert your audio / video into a written format. Our rates start at USD 0.70 per audio / video minute for up to 3 different voices in the audio / video. Should you be interested, please do feel free to reach out for a free sample transcript of any audio / video of your choice. In addition, we also provide service for logo / graphic designing, website designing and development or any kind of software development as well. Please feel free to ask for our portfolio. Regards, Celina Jones From nobody Fri May 23 21:50:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3zP84QY6z5wdZt; Fri, 23 May 2025 21:50: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 4b3zP83LDCz3CST; Fri, 23 May 2025 21:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748037052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6knaCGSrnI6TYbJGYu9C0KGPBttwV82+tm1rvl38jSo=; b=DygYJGVV/rj3y2oDlmByh8jOGHniXhlgMF4TvgzhfM7rLr+ufkQBX01jVMV1GyWwpUJeWx BhfnDmFh2TDkSWIiixG4lg9vHvR6NCXnwy90iSB2TPEnbUx2m/IqZ+OOFJ95m/GghehvJH 3vxO6ByMPmsKS6mgsqZYqLseMP+Qi3lRW7BDu1ipDsR3OPfI2Ncosqb3OcTA385gzbne1H EkfcYNZBKOnw2TpU4Sn2+0jyPlOIXnANfXIl0zqktFgR1cSeHDyuRW+S0dleVXTmQ2zrMm Xd0exOj86mv6B/Y61ANXbZ2yBo7TmRvZxSp7nkaCZk63m9cJCBDgSX77nnBeJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748037052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6knaCGSrnI6TYbJGYu9C0KGPBttwV82+tm1rvl38jSo=; b=Scts7pxe/V6OHuDFPfSYdddGiOCbG45gNuAiqHekmeVEQ2vE8twwvpFpEX0Yyv6VnQyklb 5QqWBHLxiTu/Zm87XoocM26PJpuXFKWj1GPBzG2WqNVNzD8V+IvbOkSsIVwoPS7ixpq12q 5QO3iqoc9Qch9A4bbGadjsIU8qDnrH+8VdkianYOL07Xi3r82jQA8+75WTGNubez7NE4xp HHd2TBFj/r3+KculXu5WhJxEP68gdotPmVIYm+94Xf/bCghVxubEnYtbp63j35ARql2O6Y Su6oQT6WFMf1nTtOVLHATItlbhUxXiEun4bNJ3mVNqdZz3PUwNrqhwg3N0ebWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748037052; a=rsa-sha256; cv=none; b=p0T/4ZJ52PA04h8iD2vwAYNtb/beYFJX28VrLkh4Wgw2lppag1SBOp0nXIwHme85r2V8Th 7NbrmQjOfRGnPX+gt8mu2U5KpNBwe+1bl4v9cm5Oxz2j2eGYFmi9PMAR2NAESbXjuioiit 6Nctj3iXik/C3BHqaphnPDDVADnOvlrp5hNaLnbG9v7clTMy0N6UQEN4dQKdLHZkh2hNuQ k70w1mZz/PjflmA9AhH7LcPQMNQMuAQa4OlwLjdq3axtZfw6dXT0uUjLJGM5yxJK0YwHZe jFcVPGuKX+Ya1kCBnyFr/IGTdoimy5Jdu7bTjoTE67D7jOHIfpMyaI1Pko75LQ== 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 4b3zP82x3Rz1MY8; Fri, 23 May 2025 21:50: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 54NLoqE7031147; Fri, 23 May 2025 21:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NLoq4m031144; Fri, 23 May 2025 21:50:52 GMT (envelope-from git) Date: Fri, 23 May 2025 21:50:52 GMT Message-Id: <202505232150.54NLoq4m031144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 26064d3e7463 - main - Makefile.inc1: Remove unused non-NO_ROOT support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26064d3e74639fbaa5b2b1cef7ea9c344db4caeb Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=26064d3e74639fbaa5b2b1cef7ea9c344db4caeb commit 26064d3e74639fbaa5b2b1cef7ea9c344db4caeb Author: Ed Maste AuthorDate: 2025-05-15 13:36:48 +0000 Commit: Ed Maste CommitDate: 2025-05-23 21:50:38 +0000 Makefile.inc1: Remove unused non-NO_ROOT support As of commit 41adc5f29ba6 ("release: Always use NO_ROOT for distribute* and package*") this packagekernel code path is never used, so remove it. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50361 --- Makefile.inc1 | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ebba0ccd9f5e..60010da6ad50 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1938,7 +1938,6 @@ distributekernel distributekernel.debug: .PHONY .endif packagekernel: .PHONY -.if defined(NO_ROOT) .if !defined(NO_INSTALLKERNEL) cd ${DESTDIR}/${DISTDIR}/kernel; \ ${TAR_CMD} cvf - --exclude '*.debug' \ @@ -1965,30 +1964,6 @@ packagekernel: .PHONY .endif .endfor .endif -.else -.if !defined(NO_INSTALLKERNEL) - cd ${DESTDIR}/${DISTDIR}/kernel; \ - ${TAR_CMD} cvf - --exclude '*.debug' . | \ - ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz -.endif -.if ${MK_DEBUG_FILES} != "no" - cd ${DESTDIR}/${DISTDIR}/kernel; \ - ${TAR_CMD} cvf - --include '*/*/*.debug' $$(eval find .) | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz -.endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} - cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - ${TAR_CMD} cvf - --exclude '*.debug' . | \ - ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz -.if ${MK_DEBUG_FILES} != "no" - cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - ${TAR_CMD} cvf - --include '*/*/*.debug' $$(eval find .) | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz -.endif -.endfor -.endif -.endif stagekernel: .PHONY ${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} DISTDIR=. distributekernel From nobody Fri May 23 21:59:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3zbP4Dgsz5wdts; Fri, 23 May 2025 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3zbP0sQnz3Js0; Fri, 23 May 2025 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748037585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d74ojpSJ2X4SIKRs8c0UNfG6ouecaqZzQSrfNT0ThDU=; b=yBTA4l1b+3YWW/JmjDMngmTnJcBdckfxbB1w0xrdTYMAhValtKM3Vo2I3FOKpVZlgj9ZKW FvL+RcLmm0jtHW8ArJk9m3IWRSUZ2lo7UqrCI0Fjg/rtBvjnPyyK8m8CmmGnBH1AmSpBpE 14juIh+mRVuPYOa7MGa/1aJmytfEq1Sc8wpMXVryxiaqz9IzO89i1FKJi645TEmvsuPHqD tu2ngLcbE/idsF1Erct2BwA33T6O3kiU1myAA8lCBd7MAYfqe/3fcPsMF0XJS1z9Jzy3OB BvYIF6WUKfOqU0PmZ6X5d2o/jJRWgT9NO1O01thUNg6VXActqfEc1ji7rh4o4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748037585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d74ojpSJ2X4SIKRs8c0UNfG6ouecaqZzQSrfNT0ThDU=; b=NjDR3qtZrEeXjEobBoBVpztZDCYidWx0hZLAoPfaGa4WbZwPh42ki5mAkYQda1JAr+cztz fmmxwRztjeHAA8H5L5uEjmV+qnkSkvV7JdTFr4o/e/C6dTCep4FIjHgDEgAjJV1JHWDJ9B x9o/+bGX3V8RcbBZhUO1nbb4YEnMyUfOUUeomYBuowprn5Ks3PNrbZLP/M5+OUyvu0JAFT UBQl/sPLj3L6tFlZ9qJVhWNvueKgW5dBLS4+mqyoy+eIzl1CIHHX3mYGxmreyGD6Dx5fDb bpjQATEza15PR6wYhRDwKipx9kzUuo5LRxy9ysGiosV9jQDA6LFF7LMgJ+oyoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748037585; a=rsa-sha256; cv=none; b=uWj4YwMywoNfLG/yzNwJHXT9EHgSDsg7gbmoqLj85uxLH2vF0WJMDwe0h7vezoGbjGTbhl bKUoCOypAvzmytdY+/d5dAUUlr0XOusIovVPuM3R0Vq9s6enfizlsQ+xIARyOenlS8Vp7f +dOX5Wv+AYvB/hEkidTANvk80Fi1yij7zX2iAdS4TzLHJFdOE9Kc6+wYWakHWrMuJ1FLbG lXLxfe2dPrIdtm0dv+3KDbqLQq/iaUP5chxW+YJgQ4F6eCe8wSi+DQGO76t3XOtE4+f1rJ IJZBUtSdQN3UPzvBGywE/EwjYNXmD/9NThisTbhP5uEiQeJz4BAzTqdKAFflBQ== 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 4b3zbP05Ncz1Mng; Fri, 23 May 2025 21:59: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 54NLximQ039543; Fri, 23 May 2025 21:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NLxi2X039540; Fri, 23 May 2025 21:59:44 GMT (envelope-from git) Date: Fri, 23 May 2025 21:59:44 GMT Message-Id: <202505232159.54NLxi2X039540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 9a79f1b8c342 - main - Remove vestiges of keyserv(8) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a79f1b8c342730653030c1df177b24a144c53b7 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9a79f1b8c342730653030c1df177b24a144c53b7 commit 9a79f1b8c342730653030c1df177b24a144c53b7 Author: Lexi Winter AuthorDate: 2025-05-23 21:58:28 +0000 Commit: Lexi Winter CommitDate: 2025-05-23 21:59:33 +0000 Remove vestiges of keyserv(8) This daemon has been removed; also remove things which reference it. Reviewed by: manu, des, emaste Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50441 --- lib/libc/rpc/rpc_secure.3 | 3 +-- libexec/rc/rc.conf | 2 -- share/man/man5/rc.conf.5 | 18 +----------------- targets/pseudo/userland/Makefile.depend | 1 - 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3 index 11b871b5c99d..ce59bba7115f 100644 --- a/lib/libc/rpc/rpc_secure.3 +++ b/lib/libc/rpc/rpc_secure.3 @@ -266,8 +266,7 @@ Inverse of .Fn netname2user . .Sh SEE ALSO .Xr rpc 3 , -.Xr xdr 3 , -.Xr keyserv 8 +.Xr xdr 3 .Pp The following manuals: .Rs diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index cfb4fa09b1c1..f88bd3919f8b 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -396,8 +396,6 @@ rpcbind_enable="NO" # Run the portmapper service (YES/NO). rpcbind_program="/usr/sbin/rpcbind" # path to rpcbind, if you want a different one. rpcbind_flags="" # Flags to rpcbind (if enabled). rpc_ypupdated_enable="NO" # Run if NIS master and SecureRPC (or NO). -keyserv_enable="NO" # Run the SecureRPC keyserver (or NO). -keyserv_flags="" # Flags to keyserv (if enabled). nfsv4_server_enable="NO" # Enable support for NFSv4 nfsv4_server_only="NO" # Set NFS server to NFSv4 only nfscbd_enable="NO" # NFSv4 client side callback daemon diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 4b15db07a129..2fd63e4f743d 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 11, 2025 +.Dd May 21, 2025 .Dt RC.CONF 5 .Os .Sh NAME @@ -2713,22 +2713,6 @@ is set to these are the flags to pass to the .Xr rpcbind 8 daemon. -.It Va keyserv_enable -.Pq Vt bool -If set to -.Dq Li YES , -run the -.Xr keyserv 8 -daemon on boot for running Secure RPC. -.It Va keyserv_flags -.Pq Vt str -If -.Va keyserv_enable -is set to -.Dq Li YES , -these are the flags to pass to -.Xr keyserv 8 -daemon. .It Va pppoed_enable .Pq Vt bool If set to diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend index 080dcf46eb1f..5f72461ab12e 100644 --- a/targets/pseudo/userland/Makefile.depend +++ b/targets/pseudo/userland/Makefile.depend @@ -566,7 +566,6 @@ DIRDEPS+= \ usr.sbin/jls \ usr.sbin/kbdcontrol \ usr.sbin/kbdmap \ - usr.sbin/keyserv \ usr.sbin/kldxref \ usr.sbin/lastlogin \ usr.sbin/lmcconfig \ From nobody Fri May 23 22:52:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b40mf6FF1z5whLx; Fri, 23 May 2025 22:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b40mf5LNjz3ssw; Fri, 23 May 2025 22:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IA8e1PcoElAy27jc+TTul5I7zSDeCFJniDdJ6sAFHqw=; b=YcH8fsDc51bF3pEGATUNGj1bZNDyA2Hf5by/9WKkxzYv3bUr3LjGN6whk2x/ri8S9Z9csk Ydc3GkQUCMIJrpIfo3GVxvse3S3IrQ+IWnsS/mQoRCUHlyYdU46Dg9nabbTHDbyONdJe7A NXMawY7z097iovLnCQuRtcYtg019qE/of0eKjhkXU+ZVvOYHEIU7rmXxdyqY0+05xaHJBD 9cfL5ZXrrctjoC+2vS8suadqSClamDu1ButVFnEnxFZ9CTSYlJ+1dkZlHEMLOR9OXCLVh1 bWfdPVZzb/Q5mQmUPf5rwflXRoV2qmxvHB8Hj+ohG6FZsPqesTrnFGLL/B6KKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IA8e1PcoElAy27jc+TTul5I7zSDeCFJniDdJ6sAFHqw=; b=sx4q9uox4o2GjLGznOSwcFhFjL2+WNLPQaV6tcon+xaL+HmSlxRLcVSsX/pbTqmrhoOJ+0 4MeuOApsMlyxMCtSOl6fIX+cLVN4Cunj+2UKjc+I4x2yNhnKrehjhkP10jUG2Lb60RPkAC SSmq/wVKccCVYcZ3wnrFWocpQPqD/5N/pdbVDyw8dFVBjtjpJPJ2w7JEaDrAYeI0ripHyz HS6umxU8BpSPOAMLlJEaAegEWrgBDiwE1cX4/kQC2gV39NhR4gfBeEIScqy5FaYK7uYnCn K9SYgEadxANH/IaPFjXt785gJG8efVBdHBFLDO8zC25wS/9d2hjTUYRsByVjKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748040770; a=rsa-sha256; cv=none; b=ci3I8KwSjciTeoGxYZ1PC/eoaG+GTEJW40DFBf73Nwb0yNuwhOZtP7o92lPt7yyrjRNFVu tXx6XmW9XChi+rrhNnUkfr7WsTApmefPjDv+cPk3fBV8nxlEkY3yVz0NJIUdoHWtb5Gsvs Rfo3ncy46vvDrcnSG4xEA3krYYyVs/j+mLL9ptGbm/5T0C4wyIgHLw7/TH5Xsj446aeY4j vKw9AHUyRb3EXblgEKQkQ0Sc0x3xHbnWjolKWlY14osgHmda1pCyJH/PN0q7prbDQBt3uU Reggk2bdLltVIPmytUsES+ZMREhKlkWDFtfouwd9QkaeYIu7fgnaTKdABpkunA== 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 4b40mf4rpmz1NxC; Fri, 23 May 2025 22:52: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 54NMqoI3050656; Fri, 23 May 2025 22:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NMqoI9050653; Fri, 23 May 2025 22:52:50 GMT (envelope-from git) Date: Fri, 23 May 2025 22:52:50 GMT Message-Id: <202505232252.54NMqoI9050653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0b52d6c6cc4a - main - unix/stream: factor out uipc_wakeup() from pr_soreceive method List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b52d6c6cc4a0b3c6e04d114c57df2b1c1e098ae Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0b52d6c6cc4a0b3c6e04d114c57df2b1c1e098ae commit 0b52d6c6cc4a0b3c6e04d114c57df2b1c1e098ae Author: Gleb Smirnoff AuthorDate: 2025-05-23 20:19:09 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-23 22:04:38 +0000 unix/stream: factor out uipc_wakeup() from pr_soreceive method It is also needed for shutdown(2). No functional change. --- sys/kern/uipc_usrreq.c | 62 +++++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 3181868175a8..a855c47d2e5a 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1304,6 +1304,43 @@ out: return (error); } +/* + * Our version of sowakeup(), used by recv(2) and shutdown(2). + * + * @param so Points to a connected stream socket with receive buffer locked + * + * In a blocking mode peer is sleeping on our receive buffer, and we need just + * wakeup(9) on it. But to wake up various event engines, we need to reach + * over to peer's selinfo. This can be safely done as the socket buffer + * receive lock is protecting us from the peer going away. + */ +static void +uipc_wakeup(struct socket *so) +{ + struct sockbuf *sb = &so->so_rcv; + struct selinfo *sel; + + SOCK_RECVBUF_LOCK_ASSERT(so); + MPASS(sb->uxst_peer != NULL); + + sel = &sb->uxst_peer->so_wrsel; + + if (sb->uxst_flags & UXST_PEER_SEL) { + selwakeuppri(sel, PSOCK); + /* + * XXXGL: sowakeup() does SEL_WAITING() without locks. + */ + if (!SEL_WAITING(sel)) + sb->uxst_flags &= ~UXST_PEER_SEL; + } + if (sb->sb_flags & SB_WAIT) { + sb->sb_flags &= ~SB_WAIT; + wakeup(&sb->sb_acc); + } + KNOTE_LOCKED(&sel->si_note, 0); + SOCK_RECVBUF_UNLOCK(so); +} + static int uipc_soreceive_stream_or_seqpacket(struct socket *so, struct sockaddr **psa, struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, int *flagsp) @@ -1448,35 +1485,14 @@ restart: MPASS(sb->sb_mbcnt >= mbcnt); sb->sb_mbcnt -= mbcnt; UIPC_STREAM_SBCHECK(sb); - /* - * In a blocking mode peer is sleeping on our receive buffer, - * and we need just wakeup(9) on it. But to wake up various - * event engines, we need to reach over to peer's selinfo. - * This can be safely done as the socket buffer receive lock - * is protecting us from the peer going away. - */ if (__predict_true(sb->uxst_peer != NULL)) { - struct selinfo *sel = &sb->uxst_peer->so_wrsel; struct unpcb *unp2; bool aio; if ((aio = sb->uxst_flags & UXST_PEER_AIO)) sb->uxst_flags &= ~UXST_PEER_AIO; - if (sb->uxst_flags & UXST_PEER_SEL) { - selwakeuppri(sel, PSOCK); - /* - * XXXGL: sowakeup() does SEL_WAITING() without - * locks. - */ - if (!SEL_WAITING(sel)) - sb->uxst_flags &= ~UXST_PEER_SEL; - } - if (sb->sb_flags & SB_WAIT) { - sb->sb_flags &= ~SB_WAIT; - wakeup(&sb->sb_acc); - } - KNOTE_LOCKED(&sel->si_note, 0); - SOCK_RECVBUF_UNLOCK(so); + + uipc_wakeup(so); /* * XXXGL: need to go through uipc_lock_peer() after * the receive buffer lock dropped, it was protecting From nobody Fri May 23 22:52:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b40mh0l4Nz5whkp; Fri, 23 May 2025 22:52: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 4b40mg6CXFz3tBs; Fri, 23 May 2025 22:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4fD5/iE5Op1CpTPwI989fOzIfw3QD+bHyAnDLGrCOc=; b=Gy4lajzQSUdTXPTS8VOD3v4Z35BKSfTzZ5vwo3Ulk+e+v5waXikPSTgxGTUUZ2gVVwG4lZ yunL5KFILi2qF0K6vD5dpA8kP2ecPgI1x0/5ndzpvYhtTtFHOXn6YdpJ87AJbyZH8ojcAQ YXygQWRWZ1uI8wys326Cxzw12DDttx+NQNT0MoiDezN36l2A48/oVfbsIAqcR85JbULwKB CG69Dyb1mSg3CbWrk4JpW8PZFT4jB/AbzXjaBZjF7L1H+6mfYo1S1pT0oki7I3hpOvtmuF oUXfflkx6MPhRs3LT/zQJafI4TaQwNVKRyjpUoosHpefRm66V5maOeQ6rN7whA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4fD5/iE5Op1CpTPwI989fOzIfw3QD+bHyAnDLGrCOc=; b=CToX19xRCRg78MLwb2eA6Xc8ajwToOYHzfxLWhkph0E3rcO5yLYSgEC4B82eRMzX6rjZWR 57mUztdJpQo9gQ1EqgCtnwYmNvD7Vb5UEMDO6lHvxNnRpozkBaTAvvblAEiJvx5rRRaao8 ZEWZhiIVWodMkE+AXvlomDh3PTZQnEMkDK3+3BOCPUquvE0l2WR9tupwvny9v6tGYurCTP yi6S6rraKqFEKY0MObkV1tlMTMntIWaMN7QWEgHeAexF3TGuNtQqWabgeU1L4GL2Vpgeu2 cMK7zoWfnM6dlOdZQz9Kkee0FUngxVOWCA2+A90eWMnFiOaZi+uiEZ6x6zLu+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748040771; a=rsa-sha256; cv=none; b=gHBb2N34emUoy9LzBQPQDzgge7Eb9wlJ3ctrHZ8E0cCG07Vt1LSjAqK/kGVWJNGxNp2aou UePQ7s5A7HYxiVmnwCqzONyF4CyVCmeitqvD+HxrZKqdPvenegvBCzAuorM/Z9suHztOMp Re8gj/g9ouJldaLAhFPDp+E8gwDFryJ4mWckcJraC00BbJSEd9KQU7PsE6dLsV92dkbC6n xqBtw68pVqUgyAX8jomk3G8i64iRBH0U+EudVLPLnE0Hkl30ZhvEQZKhjO54g5Qg8HQirW XLavGaoFXjYstS4PJWqVyeB1uL6NI3vL54UReNSEWZOUT5eBp3YXs/SvSHVuEQ== 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 4b40mg5pDxz1Ntb; Fri, 23 May 2025 22:52: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 54NMqpoC050692; Fri, 23 May 2025 22:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NMqp9f050688; Fri, 23 May 2025 22:52:51 GMT (envelope-from git) Date: Fri, 23 May 2025 22:52:51 GMT Message-Id: <202505232252.54NMqp9f050688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c44d6f43a68f - main - unix/stream: provide uipc_cantrcvmore() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c44d6f43a68f6bb39b92df85c5ba90a9b0feee15 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c44d6f43a68f6bb39b92df85c5ba90a9b0feee15 commit c44d6f43a68f6bb39b92df85c5ba90a9b0feee15 Author: Gleb Smirnoff AuthorDate: 2025-05-12 18:12:09 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-23 22:04:38 +0000 unix/stream: provide uipc_cantrcvmore() and use it the pr_shutdown method. While unix/dgram can still use generic socket socantrcvmore(), the stream versions need a specific one. This fixes a panic reported by syzkaller. While here inline unp_shutdown() into uipc_shutdown(). Reported-by: syzbot+86c18f0886f70a3509c6@syzkaller.appspotmail.com --- sys/kern/uipc_usrreq.c | 52 +++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index a855c47d2e5a..0f730cf9424b 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -299,7 +299,6 @@ static int unp_connectat(int, struct socket *, struct sockaddr *, static void unp_connect2(struct socket *, struct socket *, bool); static void unp_disconnect(struct unpcb *unp, struct unpcb *unp2); static void unp_dispose(struct socket *so); -static void unp_shutdown(struct unpcb *); static void unp_drop(struct unpcb *); static void unp_gc(__unused void *, int); static void unp_scan(struct mbuf *, void (*)(struct filedescent **, int)); @@ -1341,6 +1340,18 @@ uipc_wakeup(struct socket *so) SOCK_RECVBUF_UNLOCK(so); } +static void +uipc_cantrcvmore(struct socket *so) +{ + + SOCK_RECVBUF_LOCK(so); + so->so_rcv.sb_state |= SBS_CANTRCVMORE; + if (so->so_rcv.uxst_peer != NULL) + uipc_wakeup(so); + else + SOCK_RECVBUF_UNLOCK(so); +} + static int uipc_soreceive_stream_or_seqpacket(struct socket *so, struct sockaddr **psa, struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, int *flagsp) @@ -2646,18 +2657,28 @@ uipc_shutdown(struct socket *so, enum shutdown_how how) switch (how) { case SHUT_RD: - socantrcvmore(so); + if (so->so_type == SOCK_DGRAM) + socantrcvmore(so); + else + uipc_cantrcvmore(so); unp_dispose(so); break; case SHUT_RDWR: - socantrcvmore(so); + if (so->so_type == SOCK_DGRAM) + socantrcvmore(so); + else + uipc_cantrcvmore(so); unp_dispose(so); /* FALLTHROUGH */ case SHUT_WR: - UNP_PCB_LOCK(unp); - socantsendmore(so); - unp_shutdown(unp); - UNP_PCB_UNLOCK(unp); + if (so->so_type == SOCK_DGRAM) { + socantsendmore(so); + } else { + UNP_PCB_LOCK(unp); + if (unp->unp_conn != NULL) + uipc_cantrcvmore(unp->unp_conn->unp_socket); + UNP_PCB_UNLOCK(unp); + } } wakeup(&so->so_timeo); @@ -3380,23 +3401,6 @@ SYSCTL_PROC(_net_local_seqpacket, OID_AUTO, pcblist, (void *)(intptr_t)SOCK_SEQPACKET, 0, unp_pcblist, "S,xunpcb", "List of active local seqpacket sockets"); -static void -unp_shutdown(struct unpcb *unp) -{ - struct unpcb *unp2; - struct socket *so; - - UNP_PCB_LOCK_ASSERT(unp); - - unp2 = unp->unp_conn; - if ((unp->unp_socket->so_type == SOCK_STREAM || - (unp->unp_socket->so_type == SOCK_SEQPACKET)) && unp2 != NULL) { - so = unp2->unp_socket; - if (so != NULL) - socantrcvmore(so); - } -} - static void unp_drop(struct unpcb *unp) { From nobody Fri May 23 22:52:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b40mj3vL9z5whxC; Fri, 23 May 2025 22:52: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 4b40mj0Pc0z3svm; Fri, 23 May 2025 22:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qCNeiO25FW9X3NL6BT20cm6h7bSnHORaIWJeUw48veM=; b=q5ZNRqhmJl0HwkuFVekiJ/B6c2MvjeKlPKzjdQDEMdEjXIjpnUf/4ao0BHwSLi0wpxWPyk T88RnUABTXvhLQcTpc+7qRPA5EyqnEtT7sYaWtK7UrLanOn9yMHEQB5MiLtCakvWq18Ec7 SQz7iMDIwQK3rG2D6/29kF3KQKf8g1BJnF3jOsSeSwedDobDh6JDKC1bm3A21Kx2wxdvSS GkK+a1dd7UCXNQYskPhepu21V4fWVBoIQDu/kWakVBdpsW+a6KaPRnVBVJ4NAiHtv+AiiG WSIRDPV7LGDG29QPq25m44p1nj/q5SaMsSDQU+q8gh9ww5VWyFoiDhQrWVEkMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qCNeiO25FW9X3NL6BT20cm6h7bSnHORaIWJeUw48veM=; b=xEgk3IezVepBiKiPK9O1wN/MjiLSpWFIbmgZwZ0s7hTADyGz9SSvGJ6V1X2HRIhQz9VN/Q 4bbMf0GEZ1t4CfZ/3GdloEBiI1p/ebjcxB1ceIz7FWaIo03qowFr4cIhAP9EBghSmeiXoX ULedbLnjd4bAzgWXgmE3POAMYxuhSZzETYnF5Fl04lbmHlZ/WFkNsr07kpwrP+68h0kZKw qh/qox+xoZSYBTsPEm07FBmKbjkZuvBnGuecYy4qkkUXt61XGboPrpOVdHtirhbQkzRYNx BLr256hwNdbZquyW8B50kop5eOVRbZH/a+onwm4AbZn5fik+eCgQo2SAn8nG9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748040773; a=rsa-sha256; cv=none; b=WghNRfPlS4Ay3PSACs3VtZBpHZhePgAJlfq7dePmA2XkfeEuwwt8mFDS60ECWqr0CKlm2U 0c1KGU1E2DZai9FRJ+d6+gGIYfgoZYqqOGYiZElmykpP/vptF+RR4X4tbOsmmDVna4mD/u VFj4iq72Npo90zC9ip42RM5UFZvJb8EhuryPyBmS4vKybRFYkAUd0WNnIMghZyfbCQEZtA YkJupy+823SxIv8Tcd/VA8xrJDqmDddtu61jfXciqYicEJaAuiN02mutl5AMdoLYdFf+YR kc2aUt8YTMTNZArWWETeTn2GlOOy6VnwGcYc+6z+vCgKrXCgBWVzPN/Qg55edQ== 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 4b40mh6lCmz1NrH; Fri, 23 May 2025 22:52: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 54NMqqKG050732; Fri, 23 May 2025 22:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NMqqMP050729; Fri, 23 May 2025 22:52:52 GMT (envelope-from git) Date: Fri, 23 May 2025 22:52:52 GMT Message-Id: <202505232252.54NMqqMP050729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 46c644620117 - main - tests/unix_seqpacket: add couple tests for shutdown(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46c64462011716213f15c20b1c027cd85cb8bd14 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=46c64462011716213f15c20b1c027cd85cb8bd14 commit 46c64462011716213f15c20b1c027cd85cb8bd14 Author: Gleb Smirnoff AuthorDate: 2025-05-12 16:32:23 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-23 22:04:38 +0000 tests/unix_seqpacket: add couple tests for shutdown(2) - A test against recent syzkaller discovery. - A test that remote peer shutdown(2) will unblock our recv(2) --- tests/sys/kern/unix_seqpacket_test.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/sys/kern/unix_seqpacket_test.c b/tests/sys/kern/unix_seqpacket_test.c index 058c931163a1..b9a6be015241 100644 --- a/tests/sys/kern/unix_seqpacket_test.c +++ b/tests/sys/kern/unix_seqpacket_test.c @@ -894,6 +894,38 @@ ATF_TC_BODY(shutdown_send_sigpipe, tc) close(s2); } +/* + * https://syzkaller.appspot.com/bug?id=ac94349a29f2efc40e9274239e4ca9b2c473a4e7 + */ +ATF_TC_WITHOUT_HEAD(shutdown_o_async); +ATF_TC_BODY(shutdown_o_async, tc) +{ + int sv[2]; + + do_socketpair(sv); + + ATF_CHECK_EQ(0, fcntl(sv[0], F_SETFL, O_ASYNC)); + ATF_CHECK_EQ(0, shutdown(sv[0], SHUT_WR)); + close(sv[0]); + close(sv[1]); +} + +/* + * If peer had done SHUT_WR on their side, our recv(2) shouldn't block. + */ +ATF_TC_WITHOUT_HEAD(shutdown_recv); +ATF_TC_BODY(shutdown_recv, tc) +{ + char buf[10]; + int sv[2]; + + do_socketpair(sv); + ATF_CHECK_EQ(0, shutdown(sv[0], SHUT_WR)); + ATF_CHECK_EQ(0, recv(sv[1], buf, sizeof(buf), 0)); + close(sv[0]); + close(sv[1]); +} + /* nonblocking send(2) and recv(2) a single short record */ ATF_TC_WITHOUT_HEAD(send_recv_nonblocking); ATF_TC_BODY(send_recv_nonblocking, tc) @@ -1310,6 +1342,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, implied_connect); ATF_TP_ADD_TC(tp, shutdown_send); ATF_TP_ADD_TC(tp, shutdown_send_sigpipe); + ATF_TP_ADD_TC(tp, shutdown_o_async); + ATF_TP_ADD_TC(tp, shutdown_recv); ATF_TP_ADD_TC(tp, eagain_8k_8k); ATF_TP_ADD_TC(tp, eagain_8k_128k); ATF_TP_ADD_TC(tp, eagain_128k_8k); From nobody Fri May 23 22:52:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b40mk3jrlz5wj3y; Fri, 23 May 2025 22:52: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 4b40mk1NvFz3st8; Fri, 23 May 2025 22:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvKaEuYP+xQYwm/b9WdZi3/hrvaF5cP1XGp5CKgaCUo=; b=Aq4/RLE6L0pdMursVUwnVeXXAyvnVhrQwQhxJ55DPPMKv1HcSXJuH9DgtVc/NTSkW8ZI3B PFpHB7IZDJxKV8vbuU4d5KJAgSYXN9XF7krHw8Xw3YDwUvexSe//wPTcI5dOFBoTDuYTDm qCWhU/r0sWZvYi5S3pxTVSlHO4Kn9U6XuZNWoq6MZVctIuUbz1Gv7/LcNZVVkKSpFcxBfG x0UV/OhE461RxqUJCo8rwm4lzxgILrs+doqWFYQJhokQMtlkPBdRxZ21g1/e3YP5/QylkK uAgpSn24gKs5tSSMGafVN7/+ZSYm8VuSRhZYopcRyDwuSHtvO1NX/o+JvKVhdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvKaEuYP+xQYwm/b9WdZi3/hrvaF5cP1XGp5CKgaCUo=; b=CyfzIZNkXZPL9Z3wSgci+vgkNiMBnc4NisxPVUdWMFvvbNgtCoYh6sQG38qX5qOZy96Oc1 z/WCcF+OgD9+L/8bMd3TRvVOMHeQJ4JJSiq0aJJuk9tmlWTEiRQHZhB8AQ136z+vg3D1x4 FYluKdYKmhmd3sp836NpcbOoZySB2xsAMtWk2GbpB6XUKf83H5AKUyAMQGOEa1rqbdvIIo 2e0NN77L5MT8oEzrEsMfln0zKSbmkmM84k4NmJ5PSgHoWVDGipjVFWM8HLis+g9KoIH4wM /wNIerpjmkeiqMLF44qya1gFUbFdvfOgNqxz0w9+emMkM1kLV4TsOh402uUS5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748040774; a=rsa-sha256; cv=none; b=RvL4H01zE8P2FkYj9+TiapgaYpjItooEb1tTvgEE8dewCXS3Jywb3iVc7bwiQzEa5hMta6 2mUOMg7jM3sHcA3NCdpbLMfihsGat7CG6/f6BHwrLvxLbawDxeGwDB2r6UxTzNH3zbM2yj UP0UngHHi/dp/MpQhlSQFhQZVpZjS1+1c0cYuDzbMuar4GGsQFXbPiNQ8FOBCXw/kZlm8e 9wAyOE1wdvyrxthp+ykmDzFbv3h/10P+DSHmoAsPr3kgol33kiv0sbQlioF9h6T+HxzYjG alML00dtJ84hs9WjEpOT5OXZPUqFAc+NgjpuKvNwwnvDUtcy6qngrmI05G9wxA== 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 4b40mk0ZK7z1Ntc; Fri, 23 May 2025 22:52:54 +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 54NMqrlW050767; Fri, 23 May 2025 22:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NMqrsN050764; Fri, 23 May 2025 22:52:53 GMT (envelope-from git) Date: Fri, 23 May 2025 22:52:53 GMT Message-Id: <202505232252.54NMqrsN050764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 51ac5ee0d57f - main - unix/stream: refactor sendfile(2) logic to work without M_BLOCKER flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51ac5ee0d57f178882af4b40d36089e2069704e4 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=51ac5ee0d57f178882af4b40d36089e2069704e4 commit 51ac5ee0d57f178882af4b40d36089e2069704e4 Author: Gleb Smirnoff AuthorDate: 2025-05-23 21:55:56 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-23 22:04:39 +0000 unix/stream: refactor sendfile(2) logic to work without M_BLOCKER flag This flag was initially an INVARIANT thing back in 2014, but we got stuck with it until today. A bug with sendfile(2) headers/trailers fixed as a side effect of refactoring. --- sys/kern/uipc_usrreq.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 0f730cf9424b..5b1b8443f8e6 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1008,10 +1008,10 @@ uipc_stream_sbcheck(struct sockbuf *sb) dacc = dccc = dctl = dmbcnt = 0; STAILQ_FOREACH(d, &sb->uxst_mbq, m_stailq) { - if (d == sb->uxst_fnrdy) + if (d == sb->uxst_fnrdy) { + MPASS(d->m_flags & M_NOTREADY); notready = true; - if (notready) - MPASS(d->m_flags & (M_NOTREADY|M_BLOCKED)); + } if (d->m_type == MT_CONTROL) dctl += d->m_len; else if (d->m_type == MT_DATA) { @@ -2471,15 +2471,21 @@ uipc_sendfile(struct socket *so, int flags, struct mbuf *m, sb->sb_mbcnt += mc.mc_mlen; if (sb->uxst_fnrdy == NULL) { if (notready) { - sb->uxst_fnrdy = STAILQ_FIRST(&mc.mc_q); wakeup = false; + STAILQ_FOREACH(m, &mc.mc_q, m_stailq) { + if (m->m_flags & M_NOTREADY) { + sb->uxst_fnrdy = m; + break; + } else { + sb->sb_acc += m->m_len; + wakeup = true; + } + } } else { - sb->sb_acc += mc.mc_len; wakeup = true; + sb->sb_acc += mc.mc_len; } } else { - STAILQ_FOREACH(m, &mc.mc_q, m_stailq) - m->m_flags |= M_BLOCKED; wakeup = false; } STAILQ_CONCAT(&sb->uxst_mbq, &mc.mc_q); @@ -2504,24 +2510,22 @@ out: static int uipc_sbready(struct sockbuf *sb, struct mbuf *m, int count) { - u_int blocker; + bool blocker; /* assert locked */ - blocker = (sb->uxst_fnrdy == m) ? M_BLOCKED : 0; + blocker = (sb->uxst_fnrdy == m); STAILQ_FOREACH_FROM(m, &sb->uxst_mbq, m_stailq) { if (count > 0) { MPASS(m->m_flags & M_NOTREADY); - m->m_flags &= ~(M_NOTREADY | blocker); + m->m_flags &= ~M_NOTREADY; if (blocker) sb->sb_acc += m->m_len; count--; - } else if (blocker && !(m->m_flags & M_NOTREADY)) { - MPASS(m->m_flags & M_BLOCKED); - m->m_flags &= ~M_BLOCKED; - sb->sb_acc += m->m_len; - } else + } else if (m->m_flags & M_NOTREADY) break; + else if (blocker) + sb->sb_acc += m->m_len; } if (blocker) { sb->uxst_fnrdy = m; From nobody Fri May 23 23:48:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b420n6J1Yz5wmhr; Fri, 23 May 2025 23:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b420n5c1pz41GP; Fri, 23 May 2025 23:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4i0m+ryU54JXcBdPsZShm0Xm8Ukz7mj1mJ6/s1RaK3o=; b=F4xwntiYL1bN7jhGdgC6ARSsNnT05j8GSs3SUR0k4UYMZ6cHVRbjcjCP0DWx08JhrURFlk oOPW/Gt3v01PmlO2OZRMj/9VjU/DiEFZqKilfijSQo/ryGX/qv6u14UyZL0gx4niA/pBxK YeIez6GhNGNXa2ax1Ay3gYW61UehXzCOywPdQvBHwP4pTorAWOASqee2EIt8qi4KKt7Ajj QK5/2EKk0jtYSSZtrPz31ovo7QXQCvbgeicHZ8F/M3bNf5pL8Me6ILXG/vVFrAxP3bs4pL dB+zD/8nt+ctvBrYOEvksF84Ia/b8rQkIJM6lny2/3tZj+fE86eOwesyHEYhNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4i0m+ryU54JXcBdPsZShm0Xm8Ukz7mj1mJ6/s1RaK3o=; b=N6ix4bK8txni4n5EcVtIUULlrMkFOTwKh2Omm/TQUxUObRczB6O707FfKH8maZ07y87PlW UNSI3Cd2BJpKs7yeVQDfmtxzzkXGU5xyjk20eRx+IPNfDNNTIEwsvURKrPPclX49F5i6Q1 PMin3G5cTDwjy8ER3CXl+iKhfsMTLXwrZ9xrFfLyJieymib94+OIDf4CxJMzKZ2povf6R/ OjAWMMlmbmjPy0gwj89rjt0A8aqFwic/mTr+jhqiObhhvJWUssoo0aBmyy8IVomQstsz8b ElQPO20ahCAh/6UzpfOJvnFXGH+9Wnq9GC/yOrIgNwOLTvU+MvQpa/jvSHMW1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748044105; a=rsa-sha256; cv=none; b=wbUc/icOkyAhGcxWRqLhJV1dpYtP4Cv+Zd2MWCLSUkQipjYJOQry1b2qz8ddrEv2nEPaiP 6kLSCaJfIFyo+T1lKZIZxA1iqqKaH2Z4P/Yu5GLN2LxYPHfVc+qdqk3wiqcpvXOZpEoiZz f1iFxIon1tnFFZvhxNhc8COoUQx6m5b76/A+ZKicYxhSNy2/OZ7216vsjbjCZYBYs0JRYw HveGDvLZV1uIbZp91KV+FyjLIFbYqRGliBiXZAettqpTK1HdbTA+U5WnJXqenHJZMfKpnc 7e5ob8RCl3NpbU/+KFmRi0ad/AWQU3sxYIekBQLzRtoAT6kFSoMM1HGWWySH+Q== 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 4b420n5BDwz1QMr; Fri, 23 May 2025 23:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NNmPUs046715; Fri, 23 May 2025 23:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NNmPEH046712; Fri, 23 May 2025 23:48:25 GMT (envelope-from git) Date: Fri, 23 May 2025 23:48:25 GMT Message-Id: <202505232348.54NNmPEH046712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 83812c4eccb3 - main - bsd.suffixes-extra.mk: rewrap long lines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83812c4eccb3c81e0fe97e9a5b325409ef8ba2ce Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=83812c4eccb3c81e0fe97e9a5b325409ef8ba2ce commit 83812c4eccb3c81e0fe97e9a5b325409ef8ba2ce Author: Brooks Davis AuthorDate: 2025-05-23 23:32:05 +0000 Commit: Brooks Davis CommitDate: 2025-05-23 23:32:05 +0000 bsd.suffixes-extra.mk: rewrap long lines Group CFLAGS variables together either on one line or all separate depending on length. Reviewed by: jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50463 --- share/mk/bsd.suffixes-extra.mk | 49 +++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/share/mk/bsd.suffixes-extra.mk b/share/mk/bsd.suffixes-extra.mk index 629c3177cec7..680abfc88eb4 100644 --- a/share/mk/bsd.suffixes-extra.mk +++ b/share/mk/bsd.suffixes-extra.mk @@ -11,32 +11,47 @@ PICFLAG?=-fpic PIEFLAG?=-fpie .c.pico: - ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CC} ${PICFLAG} -DPIC \ + ${SHARED_CFLAGS} ${CFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .c.nossppico: - ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} -c ${.IMPSRC} -o ${.TARGET} + ${CC} ${PICFLAG} -DPIC \ + ${SHARED_CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} \ + ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .c.pieo: - ${CC} ${PIEFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CC} ${PIEFLAG} -DPIC \ + ${SHARED_CFLAGS} ${CFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .cc.pico .C.pico .cpp.pico .cxx.pico: - ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CXX} ${PICFLAG} -DPIC \ + ${SHARED_CXXFLAGS} ${CXXFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} .cc.nossppico .C.nossppico .cpp.nossppico .cxx.nossppico: - ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} ${CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} -c ${.IMPSRC} -o ${.TARGET} + ${CXX} ${PICFLAG} -DPIC \ + ${SHARED_CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} \ + ${CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//} \ + -c ${.IMPSRC} -o ${.TARGET} .cc.pieo .C.pieo .cpp.pieo .cxx.pieo: - ${CXX} ${PIEFLAG} ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CXX} ${PIEFLAG} ${SHARED_CXXFLAGS} ${CXXFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} .f.pico: ${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} ${CTFCONVERT_CMD} .f.nossppico: - ${FC} ${PICFLAG} -DPIC ${FFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} -o ${.TARGET} -c ${.IMPSRC} + ${FC} ${PICFLAG} -DPIC \ + ${FFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ + -o ${.TARGET} -c ${.IMPSRC} ${CTFCONVERT_CMD} .s.pico .s.nossppico .s.pieo: @@ -45,31 +60,39 @@ PIEFLAG?=-fpie .asm.pico: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PICFLAG} -DPIC \ - ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CFLAGS} ${ACFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .asm.nossppico: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PICFLAG} -DPIC \ - ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ + ${ACFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .asm.pieo: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PIEFLAG} -DPIC \ - ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CFLAGS} ${ACFLAGS} \ + -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .S.pico: - ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \ + ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC \ + ${CFLAGS} ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .S.nossppico: - ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} ${ACFLAGS} \ + ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC \ + ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ + ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .S.pieo: - ${CC:N${CCACHE_BIN}} ${PIEFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \ + ${CC:N${CCACHE_BIN}} ${PIEFLAG} -DPIC \ + ${CFLAGS} ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} From nobody Fri May 23 23:48:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b420q1NJrz5wmc0; Fri, 23 May 2025 23:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b420p6fJvz41GQ; Fri, 23 May 2025 23:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9aI2oNS3BXfMGYW1AKdzRSvqt54nHL0jyXrcJ6Lno/g=; b=Aq7wNp80WkNs27MW7yGlEJbO+unDBDMWygpcY6tAequkFIV/TBehieyBt9JReDpUzWmnXf tC7ZmE3WKDjDxFBIc9yt/r9EI6yL/mWOEAyfMolspscWqqG9T0mx/cUv/kibvSfARMcYz/ /aGGYDwK24ZYKHyzEFCwrkM+lT9msuDGjkKb986j9jciN2ckuSz+f02otURuThTB+1qWRB VqjiggHIVt3hkjhWL5I6YfS4JZf74tQvoXRSSsAfm41U2KQ5GO9JcLt8c0HSaHugFO1IZU RNl2L0mHDWVCtawsCvk7lLRu4AjmGgPObUoOPsc82EPVMy0kyqiuF0uL9iQbsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9aI2oNS3BXfMGYW1AKdzRSvqt54nHL0jyXrcJ6Lno/g=; b=fKuUhahAxwkBIWQauCatS6boob88gZ4G5aiikFXYuZDVM5ttaC/h1Ld/Rvtkl4MhjJ6NsI K4nzHJk/DEpumf3MWhYqUNvqL23JEePbwdvE9ldUAEs4N8dqyh09tlZKa2uIv5DU/OSVEF 2UspdWYSa7+hrL1v7vqAVjLynTqv5FE40OFsVedo9oacGO6evK7mK99SqjvdexAoTmSJq/ LEu8M4T0aFg/9LpRPigEbFRKqaR3HEVwGTFFUfNfa8BqWHrpkbWU6ia5hVpMyrc5etdjRj 0G41H8Pf0AohQAtaFItTWuXBZHI61n94LlMc6E1krnrXmYFkwX8CqLzbL++ujg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748044106; a=rsa-sha256; cv=none; b=H5GsQ5iqEPpYHmM722KwN2BvfG2XAjZkVx0Mo4D7/E+oTA+b3bMg6tBd5kX61/E2lQNKNg ExbXIkXY2fEv0ADItrnKMlVNx4qh56wUQkQREQsKRrpo9Qho8G2uzf9BYOGpTYWKfrnxI3 Ossf8So/uZV7zpZqmXNK6W+nL3QpnOte292D0dgrySchi6Er5y7H3kJ4l9xO2DXGjBpJGR GUatPa7AaSYT1IM1tffCjPS6AMs213ZpTfYiqTh10SaniSPMUsEYX+CvGlSopFJLYDuzt7 0H6hi9+icDzdB3ouC1Z9RP7tKirwMu2mSU9NhSaJ9nmj+fytujcw3/TuMicU9w== 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 4b420p6528z1QXS; Fri, 23 May 2025 23:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NNmQk1046748; Fri, 23 May 2025 23:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NNmQMa046746; Fri, 23 May 2025 23:48:26 GMT (envelope-from git) Date: Fri, 23 May 2025 23:48:26 GMT Message-Id: <202505232348.54NNmQMa046746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b15f5c8fa584 - main - src.libnames.mk: add LIBSYS_PIC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b15f5c8fa584720e01f8a1b9320b5c9063e9c5a9 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b15f5c8fa584720e01f8a1b9320b5c9063e9c5a9 commit b15f5c8fa584720e01f8a1b9320b5c9063e9c5a9 Author: Brooks Davis AuthorDate: 2025-05-23 23:33:27 +0000 Commit: Brooks Davis CommitDate: 2025-05-23 23:33:27 +0000 src.libnames.mk: add LIBSYS_PIC Make it possible to find libsys_pic.a. Reviewed by: jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50474 --- share/mk/src.libnames.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 57b694ed5122..a3b38db570bf 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -702,6 +702,9 @@ LIBWPAWPS?= ${LIBWPAWPSDIR}/libwpawps${PIE_SUFFIX}.a LIBC_NOSSP_PICDIR= ${_LIB_OBJTOP}/lib/libc LIBC_NOSSP_PIC?= ${LIBC_NOSSP_PICDIR}/libc_nossp_pic.a +LIBSYS_PICDIR= ${_LIB_OBJTOP}/lib/libsys +LIBSYS_PIC?= ${LIBSYS_PICDIR}/libsys_pic.a + # Define a directory for each library. This is useful for adding -L in when # not using a --sysroot or for meta mode bootstrapping when there is no # Makefile.depend. These are sorted by directory. From nobody Fri May 23 23:48:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b420r6QcDz5wmc1; Fri, 23 May 2025 23:48: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 4b420r31d5z41Gm; Fri, 23 May 2025 23:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mTcR2+Br+VcJ5xiDQm48NL+MJ8mQEe0YBrOkbWYLkY8=; b=ohoufHO1F2hMEYvbPUflOvMawLJCC67Z97SdV51jgEDe3zzOGI53+sfUEk7NGA43Gp9AQw EBcgAVvTMI38jPtRtYKIjK8uvaSdfZcaNsl0+rHwVfdkcdwQwtazA3zYL4D15k2QRQ3SoR Vfg+hXEVMkTKmU0nXKE8x/tl6vHY+VFAGFCwJx1SVdozjhdXrwSaYHZpLIEjamyCKC0Dep DE54n48P8F8O8GUVbir2qtQdYC37dVP6o0vWtaAJMbGmzD6Kq/fCK0MAocvM20Afpnzmhq Tsl+nZiBlhsH4519b+ElmmsU1g6LoWRZDt6ONGKC4odtbsjCdRa4OND10biNDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mTcR2+Br+VcJ5xiDQm48NL+MJ8mQEe0YBrOkbWYLkY8=; b=e/FhtGZGIqlyIFWbB6q7G8gGG1ZncnnK6q3+lTa5hmODsrU4NK3nruttgrePeRhZ7uSZ8R hTaW2qLkqb9pKqawrWLpFVqjmwvi25Nvwg/GyJnfKmIKAgObuHZHblQS4oreWgcBk+AANC TTT1McpxncrrwvTQ2gZXtWZ0T/3kvxrBoYLtjl2ulPGn14PNunnlLZsCwbfk60IvkxdNoH R3QvSSwx5ysGnjbaE/YY88l1oazJAroj+9mteIoMqSkCQN7Vi5j9tfMZGbxkZKdefPFMg5 CE7nfyyOMvIWnI5GCfXJwDsbZDUn9EXks7To6XWXbzgvM5RrK2ievEwxXNx0AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748044108; a=rsa-sha256; cv=none; b=LfS45ik2S8zl6jTm5VnXO/deCW02UqwhOfawF22IDdmykda5iHlmUGJQgrxskMdeoIz4e5 1VH0i4w9n/SQbSHkT6F3fGHZL+SDN2ljXiubeJmQ4f0ERLj8Yle/nQ5f6pDEq75xpn9SRa h0oN2nNAkI0SliIS77AmDJdhlWc7/p/Rfqj9fmcWvaOmhNDwmMFt/C0VegqH667Ycs+AEA /j1v7VFLLtqcLSru3Sg5BM5Ziyck2Si+qNXsp5+B5reoX90plIpsVQz60Tx1OCTXa5MCb+ SVBvO/HFZWtA/dZDGnvyxn/feyKUs2XeVOLjJWV6z2HzY7R87K5+ZbBtjHVlJA== 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 4b420q73N0z1QXT; Fri, 23 May 2025 23:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NNmRtA046781; Fri, 23 May 2025 23:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NNmRG3046778; Fri, 23 May 2025 23:48:27 GMT (envelope-from git) Date: Fri, 23 May 2025 23:48:27 GMT Message-Id: <202505232348.54NNmRG3046778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 387783da979e - main - rtld: get syscall implementations from libsys List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 387783da979eb5862f8453e15505c240cbfe28ce Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=387783da979eb5862f8453e15505c240cbfe28ce commit 387783da979eb5862f8453e15505c240cbfe28ce Author: Brooks Davis AuthorDate: 2025-05-23 23:33:51 +0000 Commit: Brooks Davis CommitDate: 2025-05-23 23:37:17 +0000 rtld: get syscall implementations from libsys When I added libsys I failed to update rtld's reuse of object files from libc to use ones from libsys instead. This would have turned up as a broken system in d7847a8d35143, but SHARED_CFLAGS is not being applied to assembly files. PR: 286975 Reviewed by: jrtc27, jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50475 --- libexec/rtld-elf/rtld-libc/Makefile.inc | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc index 79d68a1e803c..b16f84f398d0 100644 --- a/libexec/rtld-elf/rtld-libc/Makefile.inc +++ b/libexec/rtld-elf/rtld-libc/Makefile.inc @@ -52,22 +52,23 @@ CFLAGS.strspn.c+=-Wno-sign-compare CFLAGS.strstr.c+=-Wno-cast-qual -Wno-sign-compare CFLAGS.strtok.c+=-Wno-cast-qual -# Also use all the syscall .o files from libc_nossp_pic: -_libc_other_objects= sigsetjmp lstat stat fstat fstatat fstatfs syscall \ +# Also use all the syscall .o files from libsys_pic (libsys is always NO_SSP): +_libsys_other_objects= fstat fstatat fstatfs syscall \ cerror geteuid getegid sigfastblock munmap mprotect \ sysarch __sysctl issetugid __getcwd utrace getpid \ thr_self thr_kill pread mmap lseek _exit \ getdirentries _close _fcntl _open _openat _read \ - _sigprocmask _write readlink ___realpathat _setjmp setjmp setjmperr + _sigprocmask _write readlink ___realpathat +# A few other bits from libc_nossp_pic: +_libc_other_objects= sigsetjmp lstat stat _setjmp setjmp setjmperr - -# Finally add additional architecture-dependent libc dependencies +# Finally add additional architecture-dependent libc and libsys dependencies .if ${LIBC_ARCH} == "arm" # ARM needs aeabi_unwind_cpp for _setjmp _libc_other_objects+=aeabi_unwind_cpp .elif ${LIBC_ARCH} == "i386" # i386 needs i386_set_gsbase for allocate_initial_tls() -_libc_other_objects+=i386_set_gsbase +_libsys_other_objects+=i386_set_gsbase .elif ${LIBC_ARCH} == "powerpc" || ${LIBC_ARCH} == "powerpcspe" # ppc needs __syncicache and abs for reloc.c _libc_other_objects+=syncicache abs @@ -76,23 +77,30 @@ _libc_other_objects+=syncicache abs _libc_other_objects+=syncicache .endif -# Extract all the .o files from libc_nossp_pic.a. This ensures that -# we don't accidentally pull in the interposing table or similar by linking -# directly against libc_nossp_pic.a +# Extract all the .o files from libc_nossp_pic.a and libsys_pic.a. This +# ensures that we don't accidentally pull in the interposing table or +# similar by linking directly against libc_nossp_pic.a _rtld_libc_objs= .for _obj in ${_libc_other_objects} _rtld_libc_objs+=${_obj}.nossppico CLEANFILES+=${_obj}.nossppico # LDFLAGS+= -Wl,--trace-symbol=${_obj} .endfor +_rtld_libsys_objs= +.for _obj in ${_libsys_other_objects} +_rtld_libsys_objs+=${_obj}.pico +CLEANFILES+=${_obj}.pico +# LDFLAGS+= -Wl,--trace-symbol=${_obj} +.endfor # LDFLAGS+= -Wl,--trace # We insert all the .o files from libc_nossp_pic.a into a new rtld_libc.a file # to ensure that only .o files that are actually used end up being included. -rtld_libc.a: ${LIBC_NOSSP_PIC} ${SRCTOP}/libexec/rtld-elf/rtld-libc/Makefile.inc +rtld_libc.a: ${LIBC_NOSSP_PIC} ${LIBSYS_PIC} ${SRCTOP}/libexec/rtld-elf/rtld-libc/Makefile.inc @rm -f ${.TARGET} ${AR} x ${LIBC_NOSSP_PIC} ${_rtld_libc_objs} - ${AR} cr ${.TARGET} ${_rtld_libc_objs} + ${AR} x ${LIBSYS_PIC} ${_rtld_libsys_objs} + ${AR} cr ${.TARGET} ${_rtld_libc_objs} ${_rtld_libsys_objs} CLEANFILES+=rtld_libc.a LDADD+=${.OBJDIR}/rtld_libc.a beforelinking: rtld_libc.a From nobody Fri May 23 23:48:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b420t3RB7z5wmpZ; Fri, 23 May 2025 23:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b420t2CtRz41Xg; Fri, 23 May 2025 23:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIJWsaN4pQBNai+t2PKg+gCoUR3KWUEVQIrpLB0siXQ=; b=OeaahR6VHyZi7Uf0k/ZOLSB9DhIEye/NWIfJbADl2Bc5ZE/n87jCPA0Gi6WMcTKa3M5F2E 8CICJswuCSU+k5XlNHfLyGOan+E/fmX8qY5Kw+HSx3zVPuhH+8MRbaOqCEmt8aEZDt3Sxg aGnMC5PjBKZMtV+tzgpK8sWeuF2kdFkEXQUctF6QutNC8OnEmOUjgwM9rVT6e1EHWPwn7f KKe21WINSDZI3w5G0Q81Uz/KblVmH77JPNH+3OzsNrATmtcoA+h34etXkHiNfT6QwIHbnj hPAWw4P8DTbXaGNv7B0fVgcSu4OegOElOpa+SgKv3HD1lHEjabSNRVfa096Znw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIJWsaN4pQBNai+t2PKg+gCoUR3KWUEVQIrpLB0siXQ=; b=kXnvTHYs2GSZq7HJOsleM15kj/mSCUaFtXVpVpURdAEk3Q3hkYNGLfCeiWn0nIn/Ra1eZr kvVBPo7onwGa1AHmU9ipPc1eGCgYFewWhqLexEyeHJhNP3hs0BrC9fLO/1yS5wi1/41+Eg 9rQYfPBgM+O3wgoZUD1B2q78S5/nvmb4xsB0Dha/TVQLqBlOt36q/8adzW0suvhRekMCgZ 2XqpdjoQN3tH53+5kzXCf2rcEd0qcGyjX0V1L0yRFsxsmK7dE0Nuuy9Uw54818hn7ipo0Q Jrv+kfi5kKX5VUI8ma/omx93haT/82O8orSab0Y1MQ3vJwokH5jA6NETOqKuvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748044110; a=rsa-sha256; cv=none; b=BZE9e6Y7yqmfjjS9xFCw7ChvM1sgSdu9CKPh4mnBXHduk72WaFsLce8CTBqfnqgVq2TpU3 jbYuaLf1dVLVLpyz4KjkYrwUkrvKrqsBDRd+GurwGUtaD8iolA6D2KY9aPpx2zMV5DW5Qw Vdl+Quu/LLzRcBox/1IY6H9RhoHU/HKOUEH6tOJCtGV8v2po84IBlxZzw9omkc46j3+stU XxVtczcCUuBqA5ZLzENtpm0jvIzPtVy823CV+xjkW0P9amh6epz0qs//AXF65PXhU/Y2zX 2uND7cdM5I3rUb5i2nNHijVmtvS0C6e2Vmeg8+EeHxInTml1OV9CYydp2ToaJA== 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 4b420t1hhKz1QGp; Fri, 23 May 2025 23:48:30 +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 54NNmU0D046853; Fri, 23 May 2025 23:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NNmUql046850; Fri, 23 May 2025 23:48:30 GMT (envelope-from git) Date: Fri, 23 May 2025 23:48:30 GMT Message-Id: <202505232348.54NNmUql046850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: cba6bf5d954f - main - share/mk/bsd.README: refer to the linker, not the loader List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cba6bf5d954f500a921b967c1e4e3e71ecd63bef Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cba6bf5d954f500a921b967c1e4e3e71ecd63bef commit cba6bf5d954f500a921b967c1e4e3e71ecd63bef Author: Brooks Davis AuthorDate: 2025-05-23 23:35:01 +0000 Commit: Brooks Davis CommitDate: 2025-05-23 23:37:50 +0000 share/mk/bsd.README: refer to the linker, not the loader We're invoking the linker to create programs or libraries from one or more object files not the loader to load them in to memory. Reviewed by: jhb, emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50481 --- share/mk/bsd.README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 03cb996f0f67..c2326a17f03c 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -175,7 +175,7 @@ DPADD Additional dependencies. Usually used for libraries. Dependencies on shared libraries should be only on the library version numbers. -LDADD Additional loader objects. Usually used to add libraries. +LDADD Additional linker objects. Usually used to add libraries. For example, to load with the compatibility and utility libraries, use: @@ -184,8 +184,8 @@ LDADD Additional loader objects. Usually used to add libraries. LDADD.${.TARGET:T} Loader objects dependent on output file name. -LDFLAGS Additional loader flags. Passed to the loader via CC, - since that's used to link programs as well, so loader +LDFLAGS Additional linker flags. Passed to the linker via CC, + since that's used to link programs as well, so linker specific flags need to be prefixed with -Wl, to work. LDFLAGS.${.TARGET:T} Flags dependent on output file name. From nobody Fri May 23 23:48:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b420s4rcGz5wmmL; Fri, 23 May 2025 23:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b420s1gscz41Bj; Fri, 23 May 2025 23:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20L/O1n9jI+IBYal7irVkDDGnPVEbKw7goYlUowLrno=; b=Tr0+UZQ/spHZvOzQs9MPpxgJBa9yjT2iSrxSa60iX7Qo2KrdG6QGSVcbhRpR0zb9fADVyk 0ed1iCpQ1tTRF2k83sG5kQsh27KWth1LKsZ2CzxfaB+0Hfnoe5Jf06S8jkCHN6qnPxGUpx TtFVxzS5FKn9DMFEOm3utoJfeCrNev9pZqxLwUv+rtN9WgYQkGgvERyNek8K8csQLOS1QE k0Vq5o6B95ZCfHVBDKddOaZSNNN7wFhwPOycixyv/I6eSFt4F2p5+3rsZ1M/jiie4TzrIv cdO9wi7IBqhCoudFwZi1XVtap53E9D9QAeT/NZ3Dif4PJWBB0EIO6bC8uFjMQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=20L/O1n9jI+IBYal7irVkDDGnPVEbKw7goYlUowLrno=; b=k4ghKKeJ08qrHdjvkkSD/PHlsumZTOR7nr/pOgV6dC78MAfqBie0nkzUSn23ciHjm8T0zr 1PQ0t8qVHDSyqCCWRZ43z50ufwN5ry+lCSIZHjxfGqydSpKhgTYWQvPJUYCk7+Z7p7muzG u6ud7K4T3RUA37c1rjZX24m3HK3JEyy9NIfzNJ+24/+aX17sGN7OcHCIY7nZbYIgLcKIDJ 9/fdaosUFyX4FOjI4exOfRk7gaVRAYvFwBj132zlspXkEliPbaaE3mhhUCpAZTjqAMvu8c UdMl0jY0+kcodAp7nzFPwx/ttDGMksyN3mcLKQaKChospBOjb1YA6s9yoxfZUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748044109; a=rsa-sha256; cv=none; b=f0V4mj4AwYNiiFLFUb6wtu4bqS6c2VkzLJYKolxd9tskCAqDu7A92U2XXLWWqCpG/ncgiy M+b1/iu47NprwgdwDiUsxTdsVuLB6mIVvJa79t0usVjjp91ie76kx/KvrsMDLVmfMAtFpP oxuRA8dGqIU3WcHT+Va5B9DSg8DzedrFPVlm+smv/kqqxhaMOsVkYNSVabXF4soHsAqREI NS+fFDYYjzwPz8Ke8hyQuw0BwSIGRkULXcZyqOm+y/mJgsaQaNPBfNZwvAHP1yvD2l9hyd JtAl9guCWtePvgLv/e/DjSSmQud9nCwoq5AFnh6G/4duU37rQF3kEXn5XlAMUQ== 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 4b420s0tZxz1QGn; Fri, 23 May 2025 23:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NNmTv3046818; Fri, 23 May 2025 23:48:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NNmTjR046815; Fri, 23 May 2025 23:48:29 GMT (envelope-from git) Date: Fri, 23 May 2025 23:48:29 GMT Message-Id: <202505232348.54NNmTjR046815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: fbfc85d9e81f - main - share/mk: make *ADD and *FLAGS descriptions common List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbfc85d9e81f751c52f3ded445d4ae03b8307667 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=fbfc85d9e81f751c52f3ded445d4ae03b8307667 commit fbfc85d9e81f751c52f3ded445d4ae03b8307667 Author: Brooks Davis AuthorDate: 2025-05-23 23:34:26 +0000 Commit: Brooks Davis CommitDate: 2025-05-23 23:37:50 +0000 share/mk: make *ADD and *FLAGS descriptions common Move ACFLAGS, AFLAGS, CFLAGS, CXXFLAGS, DPADD, LDADD, LDFLAGS, and LIBADD descriptions into the common section since they aren't limited to bsd.progs.mk. Mostly just relocated, but updated the DPADD text to reflect its relocation. Reviewed by: jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50479 --- share/mk/bsd.README | 114 +++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 60 deletions(-) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 6bab0effbcf4..03cb996f0f67 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -120,14 +120,20 @@ stack smashing protection and without sanitizer instrumentation. The following variables are common: -AFLAGS.${SRC} - Flags dependent on source file name. -AFLAGS.${.TARGET:T} - Flags dependent on output file name. +ACFLAGS Flags to the compiler when preprocessing and + assembling .S files. ACFLAGS.${SRC} Flags dependent on source file name. ACFLAGS.${.TARGET:T} Flags dependent on output file name. + +AFLAGS Flags to the assembler when assembling .s files. +AFLAGS.${SRC} + Flags dependent on source file name. +AFLAGS.${.TARGET:T} + Flags dependent on output file name. + +CFLAGS Flags to the compiler when creating C objects. CFLAGS.${SRC} Flags dependent on source file name. CFLAGS.${.TARGET:T} @@ -139,6 +145,7 @@ CFLAGS.${MACHINE_ARCH} CFLAGS_NO_SIMD Add this to CFLAGS for programs that don't want any SIMD instructions generated. It is setup in bsd.cpu.mk to an appropriate value for the compiler and target. + CXXFLAGS.${COMPILER_TYPE} Flags dependent on compiler added to CXXFLAGS. CXXFLAGS.${MACHINE_ARCH} @@ -147,6 +154,49 @@ CXXFLAGS.${SRC} Flags dependent on source file name. CXXFLAGS.${.TARGET:T} Flags dependent on output file name. + +DPADD Additional dependencies. Usually used for libraries. + For example, to depend on the compatibility and utility + libraries use: + + DPADD=${LIBCOMPAT} ${LIBUTIL} + + There is a predefined identifier for each (non-shared) + library and object. Library file names are + transformed to identifiers by removing the extension and + converting to upper case. + + There are no special identifiers for shared libraries + or objects. The identifiers for the standard + libraries are used in DPADD. This works correctly iff + all the libraries are built at the same time. + Unfortunately, it causes unnecessary relinks to shared + libraries when only the static libraries have changed. + Dependencies on shared libraries should be only on the + library version numbers. + +LDADD Additional loader objects. Usually used to add libraries. + For example, to load with the compatibility and utility + libraries, use: + + LDADD=-lutil -lcompat + +LDADD.${.TARGET:T} + Loader objects dependent on output file name. + +LDFLAGS Additional loader flags. Passed to the loader via CC, + since that's used to link programs as well, so loader + specific flags need to be prefixed with -Wl, to work. +LDFLAGS.${.TARGET:T} + Flags dependent on output file name. + +LIBADD Additional libraries. This is for base system libraries + and is only valid inside of the FreeBSD tree. + Use LIBADD=name instead of LDADD=-lname. + +LIBADD.${.TARGET:T} + Libraries dependent on output file name. + COMPILER_FEATURES A list of features that the compiler supports. Zero or more of: @@ -281,19 +331,12 @@ It has seven targets: It sets/uses the following variables: -ACFLAGS Flags to the compiler when preprocessing and - assembling .S files. - -AFLAGS Flags to the assembler when assembling .s files. - BINGRP Binary group. BINMODE Binary mode. BINOWN Binary owner. -CFLAGS Flags to the compiler when creating C objects. - CLEANDIRS Additional files (CLEANFILES) and directories (CLEANDIRS) to CLEANFILES remove during clean and cleandir targets. "rm -rf" and "rm -f" are used, respectively. @@ -310,54 +353,11 @@ DIRS A list of variables referring to directories. For example: will be created before the files are installed and the dependencies will be set correctly. -DPADD Additional dependencies for the program. Usually used for - libraries. For example, to depend on the compatibility and - utility libraries use: - - DPADD=${LIBCOMPAT} ${LIBUTIL} - - There is a predefined identifier for each (non-shared - library and object. Library file names are - transformed to identifiers by removing the extension and - converting to upper case. - - There are no special identifiers for shared libraries - or objects. The identifiers for the standard - libraries are used in DPADD. This works correctly iff - all the libraries are built at the same time. - Unfortunately, it causes unnecessary relinks to shared - libraries when only the static libraries have changed. - Dependencies on shared libraries should be only on the - library version numbers. - FILES A list of non-executable files. The installation is controlled by the FILESNAME, FILESOWN, FILESGRP, FILESMODE, FILESDIR variables that can be further specialized by FILES_. -LDADD Additional loader objects. Usually used for libraries. - For example, to load with the compatibility and utility - libraries, use: - - LDADD=-lutil -lcompat - -LDADD.${.TARGET:T} - Loader objects dependent on output file name. - -LDFLAGS Additional loader flags. Passed to the loader via CC, - since that's used to link programs as well, so loader - specific flags need to be prefixed with -Wl, to work. - -LDFLAGS.${.TARGET:T} - Flags dependent on output file name. - -LIBADD Additional libraries. This is for base system libraries - and is only valid inside of the /usr/src tree. - Use LIBADD=name instead of LDADD=-lname. - -LIBADD.${.TARGET:T} - Libraries dependent on output file name. - LINKS The list of binary links; should be full pathnames, the linked-to file coming first, followed by the linked file. The files are hard-linked. For example, to link @@ -568,16 +568,10 @@ the BSD tree. It sets/uses the following variables: -LDADD Additional loader objects. - LIB The name of the library to build. Both a shared and static library will be built. NO_PIC can be set to only build a static library. -LIBADD Additional libraries. This is for base system libraries - and is only valid inside of the /usr/src tree. - Use LIBADD=name instead of LDADD=-lname. - LIBDIR Target directory for libraries. LIBGRP Library group. From nobody Fri May 23 23:48:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b420v5K8Rz5wmmM; Fri, 23 May 2025 23:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b420v3q30z41Y1; Fri, 23 May 2025 23:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I735hNm5VJdMCvfcGBi7yjXiEJAYnrQHsMVSjUFIbLM=; b=XyB+gawlGoW+mED9dpHdIMzk0c/7lGpugH5NF9ToA0HqSMuCCY48r+gMGwwC/T3Liay4c9 xdcUnNHuGHvhoB/sj8//ReWpFRDuU/8thFKhOvR+lxSuwEvzVq0Vt1Mz6S4pacwUR+hlnq SFg3aDRsqws/Doew2OnojkkVg1pIVMvtwnVQo+jHLCGAZ87j5MvkSFlFASEuvr9GiYvYoW kCPIvBue3DlfpA5isuyb/VCPUVBggZuPOg6CnPBYYWh5F5IZNW1MHYdZaB3z9J+glma4GY t1dRxKSH4wuavqZ42GJI0qR6xllYvBVJbmaOWc2i3R4yf03MJBchrpBU9YXFsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748044111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I735hNm5VJdMCvfcGBi7yjXiEJAYnrQHsMVSjUFIbLM=; b=IHbAxrWxb7q1oPlrtDoYfSQtEvq8Uw5Ktbv+OlI911AaKI+f+96GWBGWk2qYifLG348Ydp uWncaPv65B7mJgye8wBm3jD0G9Ef8Ll96t1aAKGW0tIvSJDFcA6N0M+cB9vA3LVeJhr/0r QEGAIGvsmamCeLteCtxZFJCAXebZSvpPa+DZBntUgBax0xTW5PCL8EhceLoQJSzOM9i0Sz Jp0DVUGm1XsPQOLSI/EPx4mMUPvQzU84ZhD0MizdIIjV+cDwmlsu5qboCwDGU7XX+cWPm+ vZh+gRsB2nteBvSYHJsRAxaUB5Zxl/sdj4SESKKW1tNnNYap03oCX0zGAQqGfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748044111; a=rsa-sha256; cv=none; b=V89l+5elBImT9TcysUu4KDn9Yn5sZOM9Zs08A07xNJL9tTp3l07zhS4tJZw0DZuNEBnf8V 8lij5jY11nZxwGdRoaK7eqM/crxZK1Oyw3tGmtKvtmvtyQazP1fEGJ1SJ7DjS8y/e5FOvz okGwEmAfbNsh4lAgfiYVx8N8/8p1dtt8y4VH3AlL5e83aRTFjS/Qc+g1L5AkarfcS641HS drOGMhOuawHVtygj9DDJ7jnF6G9zDjwVecHRimMLDSMBv8lU4n7NBXr8SwziChHqVMaKR7 eEphFGIaJnNjyMzwn3bB17B/zJ1OqnyI1aZoDi1v6wA9uoCztp+m4fTq/A5hgw== 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 4b420v2dqKz1QMs; Fri, 23 May 2025 23:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NNmVFV046886; Fri, 23 May 2025 23:48:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NNmV5G046883; Fri, 23 May 2025 23:48:31 GMT (envelope-from git) Date: Fri, 23 May 2025 23:48:31 GMT Message-Id: <202505232348.54NNmV5G046883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 9c2001036185 - main - share/mk: pass SHARED_CFLAGS to PIC and PIE from assembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c20010361854a6034595fdb13cd3583ea13f289 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9c20010361854a6034595fdb13cd3583ea13f289 commit 9c20010361854a6034595fdb13cd3583ea13f289 Author: Brooks Davis AuthorDate: 2025-05-23 23:35:21 +0000 Commit: Brooks Davis CommitDate: 2025-05-23 23:38:06 +0000 share/mk: pass SHARED_CFLAGS to PIC and PIE from assembly This matches what we do with C sources. Document SHARED_CFLAGS. PR: 286975 Reviewed by: jhb, emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50466 --- share/mk/bsd.README | 3 +++ share/mk/bsd.suffixes-extra.mk | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index c2326a17f03c..4820bf12c72d 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -197,6 +197,9 @@ LIBADD Additional libraries. This is for base system libraries LIBADD.${.TARGET:T} Libraries dependent on output file name. +SHARED_CFLAGS Additional compiler flags used when creating shared or + position independent object files. + COMPILER_FEATURES A list of features that the compiler supports. Zero or more of: diff --git a/share/mk/bsd.suffixes-extra.mk b/share/mk/bsd.suffixes-extra.mk index 680abfc88eb4..e27c9ad318e6 100644 --- a/share/mk/bsd.suffixes-extra.mk +++ b/share/mk/bsd.suffixes-extra.mk @@ -60,12 +60,13 @@ PIEFLAG?=-fpie .asm.pico: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PICFLAG} -DPIC \ - ${CFLAGS} ${ACFLAGS} \ + ${SHARED_CFLAGS} ${CFLAGS} ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .asm.nossppico: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PICFLAG} -DPIC \ + ${SHARED_CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} @@ -73,18 +74,19 @@ PIEFLAG?=-fpie .asm.pieo: ${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PIEFLAG} -DPIC \ - ${CFLAGS} ${ACFLAGS} \ + ${SHARED_CFLAGS} ${CFLAGS} ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .S.pico: ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC \ - ${CFLAGS} ${ACFLAGS} \ + ${SHARED_CFLAGS} ${CFLAGS} ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .S.nossppico: ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC \ + ${SHARED_CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ ${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \ ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} @@ -92,7 +94,7 @@ PIEFLAG?=-fpie .S.pieo: ${CC:N${CCACHE_BIN}} ${PIEFLAG} -DPIC \ - ${CFLAGS} ${ACFLAGS} \ + ${SHARED_CFLAGS} ${CFLAGS} ${ACFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} From nobody Sat May 24 08:23:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4FQr39Fbz5xJlC; Sat, 24 May 2025 08:23: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 4b4FQr0LTsz3syM; Sat, 24 May 2025 08:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748074996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RfeVhQYdznf4nGlPTlsIBPjXK1oFxA+d5uP2hmdYZPE=; b=Vvif7+u0BNTbOdmoAbdNTHxYIeZtXYVw1dt+5Ms8my1/yhuYiW/Oqo1rjMLGvyzbsB4iES ii7BOQOK9XtaF87bAq4+WyxcGwtwUo66jdlD/gSoTLGuBRgFJ43QushzZdPIMulzqPxaq8 pgCWNP8AHGUr2g1iInA1r4wRfz3C0w/lEhTzTDKfPvzxdIcq/ycxsBOxnfKp6fKjY8sQJa 6ctUVSNTv1pwIt5PYhIYXTAkCi3Yz2kP41hIllp6NgHrIChmeMTKQlpQ4Qp9KQj6Re9ZOr asUdy96IPJfRvWoxx6D6RvprZZZn/6XD4zMwLzUf8YJt6L5kGW/JpXwKrbN57A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748074996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RfeVhQYdznf4nGlPTlsIBPjXK1oFxA+d5uP2hmdYZPE=; b=D8jRMOMHnYDXKsE79v+5NpJYvooZlOSoBpFgJdmzLFYeNmpO+NMDI7IvOLkUYtWeryLfkr 8cFGU+wHPf5W6FJ5hWdOi47hveCUGs5ONsmnUE/Zk4DyY7uvtMDAAyQYCmpa3LYPEEjFcH E4g4FXfyembhnfu0mGnWKyuf0w7qMWr8DEHGEg/M7c3XkFENj1MG8aLXjWkAd7tPmsdrGs EKvJOuMnvhlOJ5tm5+hEp96YR8un4ay9sXFa0+QYzWnx1oW34EeaQ54junanEGBbV4qswl /gWjs51kaX5/ejKOB66ZRauiN+E5WQuraa294QzckPoEUa1Vv8WukTcxP99+HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748074996; a=rsa-sha256; cv=none; b=ASxwGCKSdu/7ZKQkHvMFtKcV+zHZc6+P5WPdj6qli+O1DdiDr3oaiNBsUDQzcYIlrtk+U0 zTBQIU5nwBXwhQA0KZsIWsYdHHRv+yHKqK5uS7nyF7e8iRBmYrLjGGXYjE55p/haxajFyM k8jWl0TqvD6x2uJi8JbOnt+bJMZvpw+pj7PT7D9MmMsmkrwFCfabeV4ymXEmnoYIg7jFck kD/s+MjI5/jcsQZDPxj9SyzQ7kYUl1cNEYsHaYMfdwDiDbtAqr2347fT/JqHyPTOX9AlmB eJl/c5JDHIixin+MPeuaZZgMHbfUhvpnVlcC3HhyamX7ek4LVGno+OYWZRoSow== 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 4b4FQq71f5zCQ5; Sat, 24 May 2025 08:23: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 54O8NF7P020310; Sat, 24 May 2025 08:23:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54O8NFQD020307; Sat, 24 May 2025 08:23:15 GMT (envelope-from git) Date: Sat, 24 May 2025 08:23:15 GMT Message-Id: <202505240823.54O8NFQD020307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 6a97fbe6fcb3 - main - carp: fix mbuf_tag usage in carp_macmatch6 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a97fbe6fcb3f9d413384c6b3594346aebc42e59 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=6a97fbe6fcb3f9d413384c6b3594346aebc42e59 commit 6a97fbe6fcb3f9d413384c6b3594346aebc42e59 Author: Andrey V. Elsukov AuthorDate: 2025-05-24 08:18:31 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-05-24 08:18:31 +0000 carp: fix mbuf_tag usage in carp_macmatch6 carp_macmatch6() had two issues that affect IPv6 processing: 1) it returns sc->sc_addr pointer that might become invalid after softc destroying. 2) carp_output() expects carp vhid to be stored in the mtag, not the pointer to softc. Fix these issues. Allocate enough space in mtag to keep both vhid and mac address. Copy vhid first to fix issue with carp_output(), then copy sc_addr and return pointer to this copy. mtag will be alive until mbuf is used. This fixes problem when IPv6 packets originated from CARP IPv6 address use incorrect mac address due to mbuf_tag has invalid data. Reviewed by: zlei, kp, glebius Obtained from: Yandex LLC Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D50455 --- sys/netinet/ip_carp.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 0ead7149c1e2..d3d7957cf087 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -206,8 +206,6 @@ struct carpkreq { * * Known issues with locking: * - * - Sending ad, we put the pointer to the softc in an mtag, and no reference - * counting is done on the softc. * - On module unload we may race (?) with packet processing thread * dereferencing our function pointers. */ @@ -1688,6 +1686,7 @@ char * carp_macmatch6(struct ifnet *ifp, struct mbuf *m, const struct in6_addr *taddr) { struct ifaddr *ifa; + char *mac = NULL; NET_EPOCH_ASSERT(); @@ -1698,18 +1697,26 @@ carp_macmatch6(struct ifnet *ifp, struct mbuf *m, const struct in6_addr *taddr) struct m_tag *mtag; mtag = m_tag_get(PACKET_TAG_CARP, - sizeof(struct carp_softc *), M_NOWAIT); - if (mtag == NULL) - /* Better a bit than nothing. */ - return (sc->sc_addr); + sizeof(sc->sc_vhid) + sizeof(sc->sc_addr), + M_NOWAIT); + if (mtag == NULL) { + CARPSTATS_INC(carps_onomem); + break; + } + /* carp_output expects sc_vhid first. */ + bcopy(&sc->sc_vhid, mtag + 1, sizeof(sc->sc_vhid)); + /* + * Save sc_addr into mtag data after sc_vhid to avoid + * possible access to destroyed softc. + */ + mac = (char *)(mtag + 1) + sizeof(sc->sc_vhid); + bcopy(sc->sc_addr, mac, sizeof(sc->sc_addr)); - bcopy(&sc, mtag + 1, sizeof(sc)); m_tag_prepend(m, mtag); - - return (sc->sc_addr); + break; } - return (NULL); + return (mac); } #endif /* INET6 */ From nobody Sat May 24 10:03:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4Hfr4nDtz5vx0N; Sat, 24 May 2025 10:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b4Hfr3hjnz423w; Sat, 24 May 2025 10:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748081028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dO6UuuI8INePnlsWdDqFgWZM+55uqqSVc2GpS8y19EQ=; b=GL4QOHFLsfM6Q3wZ1rVeyCv4CbTEZap6OupSDLliASyILdGDkgtJk4SUiK31B1y1HhTb9n 0tx9RTz2j5W8TptkRP3kzjFHPTec/+dZbR0cWpvbFkUALNPUpWDuwJF047a4QwI9wb+lM1 26VZW/NeSw4Ce58Guv9M6KoSS8fbK0rIC+QdihC82Ey8MYNqdBk6mAbNIIbLi/dnyJ1FcN K+kGOkb+7W6exLyzSulvNslxot1JqbNaAfSoV9gwDXezXVhlKxTox0JhKxBE5Wbcxq66Vf 0vTk9EYfjQYLnF+9RXTYsAAPjuxO3RPGvpMBMfkbtwiQ07OPDgRkFFc6Nh0AGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748081028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dO6UuuI8INePnlsWdDqFgWZM+55uqqSVc2GpS8y19EQ=; b=inncVcp4vDseC4jk9sUJl/gAd3DdmqcxseHRpLxACF7htnSiUiePgcfM/0t/xncEoFlKD0 i/j+FlXo/tj/QQAMYjjspT1WMifFnNWAUMVtrGLxZ8BT2Do2+ILVU4ru8UbwQLp/GpWXny z969qUkcMzgGEfKOgnQvrDliNn1ieSXP5oHKxXbdM8neG4YeezOt7AQPSAKFnXNxLSHs9g Zdpw0Sl10YKBL4HaARLRg2lp+MjdkhESjpWAptOm1GRoo8f2sCs5Ds87XdPcB9ZTqLV2Mz DDMTpPYUrL9HqEt3cX75eTJXJpTGcFaEQdApRoNR8pDdGZKHWMEThEvQEyBrGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748081028; a=rsa-sha256; cv=none; b=RM99jWP+1mLfFaPvLeVdRWbFc+uULuP8WLTp0ERrij6+lSB5oKWWnHmXGmFcG9VeoKjjM/ zDSAGoaplkn4jknUj4AbERT6C3kGIC0Rflep7bUOwj2pLI9TwSkXnuEB+nC2yUJJYA8JQ1 +SKWXCAdJr/0SomuK024EtQ8wcnlX7RXo8gGGD8K36W1m5aXR5EzvOpI62sV+JIsYLDUUd z5XRnxVed9Y1UQNsK5p30utlwW23jnHwcliBzapmkDcjWlNVj/ixLgFZ9KA84x3m3arN0W qSwJKBdhMqjVLngd/fqO91CPLD4FUqJ0FY655Gh2skOGd5s0qVYbBantXx8MaQ== 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 4b4Hfr2wYZzXWm; Sat, 24 May 2025 10:03: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 54OA3me5007357; Sat, 24 May 2025 10:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54OA3mKU007354; Sat, 24 May 2025 10:03:48 GMT (envelope-from git) Date: Sat, 24 May 2025 10:03:48 GMT Message-Id: <202505241003.54OA3mKU007354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1a6a36a98ad5 - main - atf: Don't be deterred by weird umasks. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a6a36a98ad5dc86862541b91686b00cf88e9f76 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1a6a36a98ad5dc86862541b91686b00cf88e9f76 commit 1a6a36a98ad5dc86862541b91686b00cf88e9f76 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-24 10:03:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-24 10:03:39 +0000 atf: Don't be deterred by weird umasks. If the current umask is weird, ATF goes to great lengths to tell us that it can't possibly work in these conditions, instead of just dealing with it. This makes it unreasonably hard to use ATF to test how our own code handles unusual umasks. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: igoro, kevans, ngie Differential Revision: https://reviews.freebsd.org/D50267 --- bin/cp/tests/cp_test.sh | 11 +---- contrib/atf/atf-c/check_test.c | 8 +--- contrib/atf/atf-c/detail/fs.c | 91 ++++-------------------------------- contrib/atf/atf-c/detail/fs_test.c | 44 ++++++++--------- contrib/atf/atf-sh/atf-check_test.sh | 24 +++++----- 5 files changed, 44 insertions(+), 134 deletions(-) diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index 29dce783ffe2..bb45cc2484f5 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -563,17 +563,8 @@ dstmode_body() mkdir -m 0755 dir echo "foo" >dir/file umask 0177 - #atf_check cp -R dir dst -#begin - # atf-check stupidly refuses to work if the current umask is - # weird, instead of just dealing with the situation - cp -R dir dst >stdout 2>stderr - rc=$? + atf_check cp -R dir dst umask 022 - atf_check_equal 0 $rc - atf_check cat stdout - atf_check cat stderr -#end atf_check -o inline:"40600\n" stat -f%p dst atf_check chmod 0750 dst atf_check cmp dir/file dst/file diff --git a/contrib/atf/atf-c/check_test.c b/contrib/atf/atf-c/check_test.c index adaca649be25..06e2fad2d9a4 100644 --- a/contrib/atf/atf-c/check_test.c +++ b/contrib/atf/atf-c/check_test.c @@ -458,8 +458,7 @@ ATF_TC(exec_umask); ATF_TC_HEAD(exec_umask, tc) { atf_tc_set_md_var(tc, "descr", "Checks that atf_check_exec_array " - "correctly reports an error if the umask is too " - "restrictive to create temporary files"); + "works regardless of umask"); } ATF_TC_BODY(exec_umask, tc) { @@ -473,10 +472,7 @@ ATF_TC_BODY(exec_umask, tc) argv[2] = NULL; umask(0222); - atf_error_t err = atf_check_exec_array(argv, &result); - ATF_CHECK(atf_is_error(err)); - ATF_CHECK(atf_error_is(err, "invalid_umask")); - atf_error_free(err); + RE(atf_check_exec_array(argv, &result)); atf_fs_path_fini(&process_helpers); } diff --git a/contrib/atf/atf-c/detail/fs.c b/contrib/atf/atf-c/detail/fs.c index 5ff7648c3c7e..6ea825aa8e56 100644 --- a/contrib/atf/atf-c/detail/fs.c +++ b/contrib/atf/atf-c/detail/fs.c @@ -54,71 +54,13 @@ * Prototypes for auxiliary functions. * --------------------------------------------------------------------- */ -static bool check_umask(const mode_t, const mode_t); static atf_error_t copy_contents(const atf_fs_path_t *, char **); -static mode_t current_umask(void); static atf_error_t do_mkdtemp(char *); static atf_error_t normalize(atf_dynstr_t *, char *); static atf_error_t normalize_ap(atf_dynstr_t *, const char *, va_list); static void replace_contents(atf_fs_path_t *, const char *); static const char *stat_type_to_string(const int); -/* --------------------------------------------------------------------- - * The "invalid_umask" error type. - * --------------------------------------------------------------------- */ - -struct invalid_umask_error_data { - /* One of atf_fs_stat_*_type. */ - int m_type; - - /* The original path causing the error. */ - /* XXX: Ideally this would be an atf_fs_path_t, but if we create it - * from the error constructor, we cannot delete the path later on. - * Can't remember why atf_error_new does not take a hook for - * deletion. */ - char m_path[1024]; - - /* The umask that caused the error. */ - mode_t m_umask; -}; -typedef struct invalid_umask_error_data invalid_umask_error_data_t; - -static -void -invalid_umask_format(const atf_error_t err, char *buf, size_t buflen) -{ - const invalid_umask_error_data_t *data; - - PRE(atf_error_is(err, "invalid_umask")); - - data = atf_error_data(err); - snprintf(buf, buflen, "Could not create the temporary %s %s because " - "it will not have enough access rights due to the current " - "umask %05o", stat_type_to_string(data->m_type), - data->m_path, (unsigned int)data->m_umask); -} - -static -atf_error_t -invalid_umask_error(const atf_fs_path_t *path, const int type, - const mode_t failing_mask) -{ - atf_error_t err; - invalid_umask_error_data_t data; - - data.m_type = type; - - strncpy(data.m_path, atf_fs_path_cstring(path), sizeof(data.m_path)); - data.m_path[sizeof(data.m_path) - 1] = '\0'; - - data.m_umask = failing_mask; - - err = atf_error_new("invalid_umask", &data, sizeof(data), - invalid_umask_format); - - return err; -} - /* --------------------------------------------------------------------- * The "unknown_file_type" error type. * --------------------------------------------------------------------- */ @@ -162,14 +104,6 @@ unknown_type_error(const char *path, int type) * Auxiliary functions. * --------------------------------------------------------------------- */ -static -bool -check_umask(const mode_t exp_mode, const mode_t min_mode) -{ - const mode_t actual_mode = (~current_umask() & exp_mode); - return (actual_mode & min_mode) == min_mode; -} - static atf_error_t copy_contents(const atf_fs_path_t *p, char **buf) @@ -189,15 +123,6 @@ copy_contents(const atf_fs_path_t *p, char **buf) return err; } -static -mode_t -current_umask(void) -{ - const mode_t current = umask(0); - (void)umask(current); - return current; -} - static atf_error_t do_mkdtemp(char *tmpl) @@ -794,11 +719,10 @@ atf_fs_mkdtemp(atf_fs_path_t *p) { atf_error_t err; char *buf; + mode_t mask; - if (!check_umask(S_IRWXU, S_IRWXU)) { - err = invalid_umask_error(p, atf_fs_stat_dir_type, current_umask()); - goto out; - } + mask = umask(0); + umask(mask & 077); err = copy_contents(p, &buf); if (atf_is_error(err)) @@ -814,6 +738,7 @@ atf_fs_mkdtemp(atf_fs_path_t *p) out_buf: free(buf); out: + umask(mask); return err; } @@ -823,11 +748,10 @@ atf_fs_mkstemp(atf_fs_path_t *p, int *fdout) atf_error_t err; char *buf; int fd; + mode_t mask; - if (!check_umask(S_IRWXU, S_IRWXU)) { - err = invalid_umask_error(p, atf_fs_stat_reg_type, current_umask()); - goto out; - } + mask = umask(0); + umask(mask & 077); err = copy_contents(p, &buf); if (atf_is_error(err)) @@ -844,6 +768,7 @@ atf_fs_mkstemp(atf_fs_path_t *p, int *fdout) out_buf: free(buf); out: + umask(mask); return err; } diff --git a/contrib/atf/atf-c/detail/fs_test.c b/contrib/atf/atf-c/detail/fs_test.c index 7812be0334b8..a9cc34a4f48b 100644 --- a/contrib/atf/atf-c/detail/fs_test.c +++ b/contrib/atf/atf-c/detail/fs_test.c @@ -896,25 +896,25 @@ ATF_TC_BODY(mkdtemp_err, tc) static void do_umask_check(atf_error_t (*const mk_func)(atf_fs_path_t *), - atf_fs_path_t *path, const mode_t test_mask, - const char *str_mask, const char *exp_name) + atf_error_t (*const rm_func)(const atf_fs_path_t *), + atf_fs_path_t *tmpl, const mode_t test_mask, + const char *exp_name) { - char buf[1024]; - int old_umask; + atf_fs_path_t path; + int pre_mask, post_mask; atf_error_t err; - printf("Creating temporary %s with umask %s\n", exp_name, str_mask); + printf("Creating temporary %s with umask %05o\n", exp_name, test_mask); - old_umask = umask(test_mask); - err = mk_func(path); - (void)umask(old_umask); + RE(atf_fs_path_copy(&path, tmpl)); - ATF_REQUIRE(atf_is_error(err)); - ATF_REQUIRE(atf_error_is(err, "invalid_umask")); - atf_error_format(err, buf, sizeof(buf)); - ATF_CHECK(strstr(buf, exp_name) != NULL); - ATF_CHECK(strstr(buf, str_mask) != NULL); - atf_error_free(err); + pre_mask = umask(test_mask); + err = mk_func(&path); + post_mask = umask(pre_mask); + + ATF_REQUIRE(!atf_is_error(err)); + ATF_CHECK_EQ(post_mask, test_mask); + RE(rm_func(&path)); } ATF_TC(mkdtemp_umask); @@ -929,11 +929,11 @@ ATF_TC_BODY(mkdtemp_umask, tc) RE(atf_fs_path_init_fmt(&p, "testdir.XXXXXX")); - do_umask_check(atf_fs_mkdtemp, &p, 00100, "00100", "directory"); - do_umask_check(atf_fs_mkdtemp, &p, 00200, "00200", "directory"); - do_umask_check(atf_fs_mkdtemp, &p, 00400, "00400", "directory"); - do_umask_check(atf_fs_mkdtemp, &p, 00500, "00500", "directory"); - do_umask_check(atf_fs_mkdtemp, &p, 00600, "00600", "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00100, "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00200, "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00400, "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00500, "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00600, "directory"); atf_fs_path_fini(&p); } @@ -1039,9 +1039,9 @@ ATF_TC_BODY(mkstemp_umask, tc) RE(atf_fs_path_init_fmt(&p, "testfile.XXXXXX")); - do_umask_check(mkstemp_discard_fd, &p, 00100, "00100", "regular file"); - do_umask_check(mkstemp_discard_fd, &p, 00200, "00200", "regular file"); - do_umask_check(mkstemp_discard_fd, &p, 00400, "00400", "regular file"); + do_umask_check(mkstemp_discard_fd, atf_fs_unlink, &p, 00100, "regular file"); + do_umask_check(mkstemp_discard_fd, atf_fs_unlink, &p, 00200, "regular file"); + do_umask_check(mkstemp_discard_fd, atf_fs_unlink, &p, 00400, "regular file"); atf_fs_path_fini(&p); } diff --git a/contrib/atf/atf-sh/atf-check_test.sh b/contrib/atf/atf-sh/atf-check_test.sh index 9542dfb0bd9f..91d024a85bcd 100644 --- a/contrib/atf/atf-sh/atf-check_test.sh +++ b/contrib/atf/atf-sh/atf-check_test.sh @@ -389,21 +389,19 @@ stdin_body() atf_fail "atf-check does not seem to respect stdin" } -atf_test_case invalid_umask -invalid_umask_head() +atf_test_case unusual_umask +unusual_umask_head() { - atf_set "descr" "Tests for a correct error condition if the umask is" \ - "too restrictive" + atf_set "descr" "Tests that atf-check doesn't care about unusual umasks" } -invalid_umask_body() +unusual_umask_body() { - umask 0222 - ${Atf_Check} false 2>stderr && \ - atf_fail "atf-check returned 0 but it should have failed" - cat stderr - grep 'temporary.*current umask.*0222' stderr >/dev/null || \ - atf_fail "atf-check did not report an error related to the" \ - "current umask" + for mask in 022 027 0222 0177 0777 ; do + umask $mask + ${Atf_Check} true || \ + atf_fail "atf-check failed with umask $mask" + done + umask 022 } atf_init_test_cases() @@ -435,7 +433,7 @@ atf_init_test_cases() atf_add_test_case stdin - atf_add_test_case invalid_umask + atf_add_test_case unusual_umask } # vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 From nobody Sat May 24 13:17:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4MyJ5VFGz5w9f3; Sat, 24 May 2025 13:17: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 4b4MyJ2xvHz3hTs; Sat, 24 May 2025 13:17:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748092648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ycCYPIqajJOIJm8X612vFBuM7fzF5WugEpm3WY8oxc=; b=NNZUIZx+LiP4VK3HpvkCBsYmn8r0Em0r8WsvBMz8C7zV6/ko68zbjNl2nKq8W0qGafw3fX jbF1wQXIVALtMDGyPcswTJxgJmex8L06udtMx8wxIql/zsfoCUcI2tkfoeJJOp0IBiZ+yg faOSo9WUzMWijuY6ukF7KOo3LrO7Klxh9L/S70UPz79NGqICpi4sh4BWAuIEmRmPzfRS7G SMhC3KN+0yy7AiM8DDANeTNzUg8SgZM9PDY+NmD8LT36dywwXG/V22Sochd24YYbBCCxk0 y5TYsBHJRrDiHxuQHGt0OFyhvRcnugqmDFWeVBu7iAgyE8wu7prRxzpXjiVzmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748092648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ycCYPIqajJOIJm8X612vFBuM7fzF5WugEpm3WY8oxc=; b=GnsIcg2pNqtJBxEuRrVrBMEDsocCwFpgeMX4VPWn29UbeGGYUuAIsf1gTxfmY/2mKdyhaM 8oLGSS4jo6gxzwUM9/OjeefAq5gCrH24D0ZNiMvJ+bYR/cVqx0Li+8TukVBxYkpZ+eoDfX SriahsgcTdFoaT9X30gog72OT84u6d+uJAwAhDzPP31C1Y9JGYlu0YZoyOF7hVBxBVa7SS w1vy3lpYxbrt/4VkVIf6/xbUO58SZ85dQc+oqS9vU+H5zY31Bfw84bZr63YlUWeDufiaPt N9O3KZFhceDw90qyv7GdEUupZPD06M1Z08QpJo5m2VlxZF8SmrM5uqmiTYfYFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748092648; a=rsa-sha256; cv=none; b=cVUm08SBS5xkEUe7bWulWwmFtPTxhzru+0e9Y8OAZSqneBROETa0x+30abl1krN5wKj5DZ DoEuVreo8GqpHaP+5ApepnEMyiAVnMgU3OGDY5bB7hhLtp02OLbK4uOUcJSyYt04uapKnL TjsBmiQd+qdyPOk0O1Was0EmeOg0gd4JsMMWw0e6uoIZdxGw1opP8yT4UhpouOb8yXUwbj MbEyTVUW6xQx7YEGccBMwjrEeeDI6DhTVXYZA0WvzTVy9sD9IM/d+myhd7SjPB6/1c33IW TuQuh83mDFp9HPW9V9PWxFop0KIxO68SBWJvlkdmS5CcWvsKDWkI6Dj3yzBIyA== 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 4b4MyJ2Lmhzdl7; Sat, 24 May 2025 13:17: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 54ODHSUF063700; Sat, 24 May 2025 13:17:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54ODHSF2063697; Sat, 24 May 2025 13:17:28 GMT (envelope-from git) Date: Sat, 24 May 2025 13:17:28 GMT Message-Id: <202505241317.54ODHSF2063697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: eba403923626 - main - libc: set close-on-exec for temp socket used to detect IPv6 support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eba403923626f2ecfd724e131da992a7c3cb7240 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eba403923626f2ecfd724e131da992a7c3cb7240 commit eba403923626f2ecfd724e131da992a7c3cb7240 Author: Konstantin Belousov AuthorDate: 2025-05-24 11:27:29 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-24 13:17:09 +0000 libc: set close-on-exec for temp socket used to detect IPv6 support Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50509 --- lib/libc/gen/sysconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c index be42dd238b56..6a838ddd58d8 100644 --- a/lib/libc/gen/sysconf.c +++ b/lib/libc/gen/sysconf.c @@ -567,7 +567,7 @@ yesno: case _SC_IPV6: #if _POSIX_IPV6 == 0 sverrno = errno; - value = _socket(PF_INET6, SOCK_DGRAM, 0); + value = _socket(PF_INET6, SOCK_CLOEXEC | SOCK_DGRAM, 0); errno = sverrno; if (value >= 0) { _close(value); From nobody Sat May 24 15:44:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4RD16tjGz5wZnj; Sat, 24 May 2025 15:44: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 4b4RD15dTVz3RMk; Sat, 24 May 2025 15:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748101473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPXUAM4yY7PJ984OVFg74qzHf3ljyeOigOYFyKgEFZE=; b=bkRam0rrmI0Oy0vobKa+ROuZh9GCXJYsqsyqqLJkoAEiUXFmdAknMYoIRKjysKAKuwy64e gNL8jffJfkr190jhwTmjdpuZGVzehCBIvXOFpia/oCqXolGot65ki0Z1oK8XAKdo8KHnCn yFXpD6hjFhmIgE2RMSGJWuew7dxDvUdVkcuEkpyqtiadgZ/PsKZAF8vbCtjqMKYCzin2ms gdsge8mV7ARX7ka5L3XUxf3piyH1L2+bz3DeYNm29UfIgU0qhhjZ8f9JXxCc8RvI2gYkhD U2kytGIwb9temZUnwu4x6hCNXs8MCu+p+YME1FMB4+ZC+FndRVILuBMx9Cd77w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748101473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPXUAM4yY7PJ984OVFg74qzHf3ljyeOigOYFyKgEFZE=; b=dwfSSb8VSJDDRMDWyKKi+cOhisRGd6AXJL4es32QemmgirVjK9kzjpPc94Ksp1UGjcRJJ8 O9TLnEWJ1f7ejepHmfAP2TBdbiskSsJoAAff+ZvzjqhPa2DoHD/BxYSq4NytjcD+6cVrki oYbOHwegZOtqDg5Cqu2kHIpuxqFIgi/+IySBD3D9G9UVkB8MhqYmezeJbcXoP/RPGaU3cT 7/Tq2lTzL0bjfFkQ5DIDKWbydQWhmUIVYOsweTJNvD9AqtvpKy5XZkUYhFZNg6uQB73EtN JJePHeu3GxfRV3iKq12Knihsjpt0LqEaBBgm95VamL34iZdbV4h1UEYZ8FvfQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748101473; a=rsa-sha256; cv=none; b=m5X56b2ArVZwVC8m+OIRBUbZU85jrGJILqBHkpfvs/z6fOOJkpOLlq84jBmAcG+ts2fDn5 0iZNw/01CobS1vd+xZteZsZ210lm+Jd+oKraey5G3HcLirE/p5Xy8yjamBYPaEkSDf6kh4 3qWh1xijtw+2CCtBt9EI6lLpIxUb7CRM9eGpozRacQFIkPHex4oUyIGyPveu2JsQie4ZT5 LKf/tkxlt/VLlWsKLE6dYYoqActmMROAYkXrHU4q8vijlLAZVxNmuDZHnAAzZNK7TPDLHz uIQWOCRMFcak6+TJNWOZ5NujZeEcsbeeIU9R1FhlgkMNQ4fE02NyjFHl+qQkUg== 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 4b4RD14xwwzjRk; Sat, 24 May 2025 15:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54OFiXxg042328; Sat, 24 May 2025 15:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54OFiXS0042325; Sat, 24 May 2025 15:44:33 GMT (envelope-from git) Date: Sat, 24 May 2025 15:44:33 GMT Message-Id: <202505241544.54OFiXS0042325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4eabcb77d5bb - main - elf.5: Document .init_array and .fini_array List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4eabcb77d5bbf418aa86efae6523375d28150d4d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4eabcb77d5bbf418aa86efae6523375d28150d4d commit 4eabcb77d5bbf418aa86efae6523375d28150d4d Author: Ed Maste AuthorDate: 2025-05-16 16:20:10 +0000 Commit: Ed Maste CommitDate: 2025-05-24 15:43:34 +0000 elf.5: Document .init_array and .fini_array And note that .init and .fini are legacy interfaces. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50380 --- share/man/man5/elf.5 | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5 index bd12f5e52df0..5f1aad2298c0 100644 --- a/share/man/man5/elf.5 +++ b/share/man/man5/elf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 20, 2025 +.Dd May 24, 2025 .Dt ELF 5 .Os .Sh NAME @@ -915,7 +915,7 @@ This section is of type The attribute used is .Sy SHF_ALLOC . .It .fini -This section holds executable instructions that contribute to the process +This legacy section holds executable instructions that contribute to the process termination code. When a program exits normally the system arranges to execute the code in this section. @@ -925,6 +925,19 @@ The attributes used are .Sy SHF_ALLOC and .Sy SHF_EXECINSTR . +.It .fini_array +This section holds pointers to finalization routines. +When a program exits normally +.Xr rtld 1 +executes the code referenced by this section. +This section is of type +.Sy SHT_FINI_ARRAY . +The attributes used are +.Sy SHF_ALLOC . +Refer to +.Dv NT_FREEBSD_NOINIT_TAG +.Pq below +for a description of how initialization and finalization code is invoked. .It .got This section holds the global offset table. This section is of type @@ -937,7 +950,7 @@ This section is of type The attribute used is .Sy SHF_ALLOC . .It .init -This section holds executable instructions that contribute to the process +This legacy section holds executable instructions that contribute to the process initialization code. When a program starts to run the system arranges to execute the code in this section before calling the main program entry point. @@ -947,6 +960,20 @@ The attributes used are .Sy SHF_ALLOC and .Sy SHF_EXECINSTR . +.It .init_array +This section holds pointers to initialization routines. +When a program starts to run +.Xr rtld 1 +executes the code referenced by this section before calling the program entry +point. +This section is of type +.Sy SHT_INIT_ARRAY . +The attributes used are +.Sy SHF_ALLOC . +Refer to +.Dv NT_FREEBSD_NOINIT_TAG +.Pq below +for a description of how initialization and finalization code is invoked. .It .interp This section holds the pathname of a program interpreter. If the file has From nobody Sat May 24 16:57:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4Srb4v7gz5wfHL; Sat, 24 May 2025 16:57: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 4b4Srb2n9Dz41V2; Sat, 24 May 2025 16:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748105871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNNr/bgbxmtq0PD01UuPW+Tug07hEivu1boFMah6BlQ=; b=e6GYIKDjQ59c5Xl3ePjWeOzHryUAaqMhuoVc0moj0goJzGhNzY8Dvu6xhGwbZyGClnRl7L at5rGcBE4FQ+Apy+TeSH3NhkcUX6iE2xjmhjHdbr+RInHn4q/PZmUiNNGn/ZkiV09B6yVh dA2PXJC5FRcJQ8TuNI/SmMhElGokdwdKy5fhgFUCG58XEawMdUvmjfnXbQXmL+wHFAjb49 GbyI28e/ppfuad9+4828OEuI6ddySG8jIslQtoq5df6+6H18gHOxPoGcnYy1DcBOBz9jaF aCP//K4RDlFAp0N/tnmzULhk6zQPhIE3i3Hc51MlhXNwJcQHxLPI53vnJ8LJgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748105871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNNr/bgbxmtq0PD01UuPW+Tug07hEivu1boFMah6BlQ=; b=mO3HBsBdIHp1v0qTBlYSqa9kYUuhtDE76VXUBqf9+xoQz6wbExfLIUSWXB4sqxfqGXeJJG /73HHwfs1MzPEw4pblYMHxNJMOgQb0qHlRnzy6h8qbV2Q5zWMQg2KwZRRY4rH2LgZTgKNm vaMVDwsIgMh4WUEhGnbaeRwjZ8lEDeXJzxEac6IxQx7pbEeyFlQTQ1NcMf91NSu70JDJ+l fI8Smt6wDxGU9wHxVUQykErHN+ZdUqXrwh51QxPrJth+S7Fqp/46A9Iert7NzXm59NNdXD XvzOTL3/JCjM09b8CoKG3+DMwIQLioaT0PSZkrxS4KDppVL8tp3l+x3Rsc/wmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748105871; a=rsa-sha256; cv=none; b=VnDwx/e05RFMSwxjdjDyP9qdwaw4gqNTdF9pwTVA1SZTCZ/xeUZtALn2Z3wNvp7NsobkDd /LvdPDrpcLVlC+bvyRjxGyya/IPGXhYalDbu/G5GLkCDT43wxX/z8bSgmjB4UtDM3I5tkK tR+4ChXkfZgOzLIlqgBmba/JHWN4CKGTA7ajrXYJSFA7xn0dRKyZh33MyAudr7GP7ybfU4 TH/lFO1/SHIv9zXFRyWDbFMLcDr1hVdmNN1fkZ66EEd4IGpxGOvVFV0s7iUXo2k6xVmxe8 IYuKhQLC53T8NuX0hnhmhRIvmq5qp8DkjECLNQr7cR8s2FNwU5OkjGYYHGSegQ== 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 4b4Srb23f2zlVR; Sat, 24 May 2025 16:57: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 54OGvpxf075692; Sat, 24 May 2025 16:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54OGvpKP075689; Sat, 24 May 2025 16:57:51 GMT (envelope-from git) Date: Sat, 24 May 2025 16:57:51 GMT Message-Id: <202505241657.54OGvpKP075689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ac196a584575 - main - m4: Allow empty base argument in eval() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac196a5845757a4d92cdfc4927170576dce5de9d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ac196a5845757a4d92cdfc4927170576dce5de9d commit ac196a5845757a4d92cdfc4927170576dce5de9d Author: Eric Blake AuthorDate: 2025-05-23 14:37:20 +0000 Commit: Ed Maste CommitDate: 2025-05-24 16:57:24 +0000 m4: Allow empty base argument in eval() POSIX specifies "The second argument, if specified, shall set the radix for the result; if the argument is blank or unspecified, the default is 10." Previously we reported an invalid PR: 287015 Reviewed by: emaste --- usr.bin/m4/eval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index 82218eb9ba1c..3170d52bfe2a 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -181,7 +181,7 @@ expand_builtin(const char *argv[], int argc, int td) int maxdigits = 0; const char *errstr; - if (argc > 3) { + if (argc > 3 && *argv[3] != '\0') { base = strtonum(argv[3], 2, 36, &errstr); if (errstr) { m4errx(1, "expr: base is %s: %s.", From nobody Sat May 24 17:28:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4TXB6KyLz5whMx; Sat, 24 May 2025 17:28: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 4b4TXB3NqXz3FGZ; Sat, 24 May 2025 17:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748107722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKASr4oa0BYpYvmanlLWNfozSMrlo8CR/I378wnkIFg=; b=wQBYbSZ58thnhKVAyFqdC4GfXYk9P3dy3GXasLSdzAWyF/43zEd1n4Oi7coGLujL7sIEbG f9Xm6X72fqnns0MSDQ0vSJ8FFwsaTlnX2m38YwnJET5bMCMOb7v1gwQBSsPTS+xfH4IXGE nG4HA6IkTZDT49VhcM0tO+3aVcawhgPWZzY5rS8skBRLLdYtIFcuyTWq25VnvaPE1wG/nt dGhsiDGvP46bTCvg6hovn4aQFrDvl2EAtPjzwCJ6dLeb+F/zg+5Ddj10BzShcl+BtkDXIO gKMyZ6aCmOKuL9vMulFj+t52YiGmel0QoUH/zpJ4qOwg5d2IG9Oae7utcNVkUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748107722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKASr4oa0BYpYvmanlLWNfozSMrlo8CR/I378wnkIFg=; b=jvXhhmPm6zo/cCf+/JscD/4W4yjsIc5b5/gs1l+mc032x7xrL3PF3ByLbqaCqRJY+Qxfnp Uy2V0Xn2nyDu0WQwiTl6inpFLduRj87zUJKtrrpSXgrB8QQXJiDyfS6p/5MX7njvFqRKjx hK82qb8zs+SdohSrWarcl1DtLEsGVguV4GYHNcymlhGJm69YuCkF5bO2966+icGRtg4jbo NHrYUETZCIrLJImSrg7e+yPndhFEeiyzAm2piCrChvZGfnsPA4Q5xguXwsBhbOOYEyf2yO 2LHN8jeWJbbmrLYEzBdbXvE02o7vrCsn8LxELWM7QZ8+d0bD3x/I1IZoW40AQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748107722; a=rsa-sha256; cv=none; b=FY8utGsX4da8mW8cyXrxdmgeDovaFv4kReT4Hi6cAZQP0rmC0oXLlyvqjrSSDCQ6Y1UmwM +f30FsvtNi3NipCdApCixLxdWNWKWR/WglCxwrvJZpXLnELMl8BPGUVcLsxnMa7XpvinP4 /zkHf7Fd3ZIQCWttAmOXpgLWKy6yQeQftEgquakHnxvKsOP/A8xN+kwxAG45lx0G7012KK WzgN/10nrzX3/IjiRyvttOJGbAAreqp4OPkHvUgKnONMLZ9nPZdOWe8Z3voD2RpzIaTn/F D+MLM8KRS5ODc4xdewkZ6iXaVhbOs5Dmv5vuZHx7tGMkBUGf+T11yjpNPdoLgg== 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 4b4TXB2zrDzlZb; Sat, 24 May 2025 17:28: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 54OHSgKu031930; Sat, 24 May 2025 17:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54OHSg6h031927; Sat, 24 May 2025 17:28:42 GMT (envelope-from git) Date: Sat, 24 May 2025 17:28:42 GMT Message-Id: <202505241728.54OHSg6h031927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ab4edcd552c9 - main - m4: Fix OOB access displaying MIN_INT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab4edcd552c967a400e85afc0fd3e6729fa9ee2c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ab4edcd552c967a400e85afc0fd3e6729fa9ee2c commit ab4edcd552c967a400e85afc0fd3e6729fa9ee2c Author: Eric Blake AuthorDate: 2025-05-24 17:21:38 +0000 Commit: Ed Maste CommitDate: 2025-05-24 17:26:47 +0000 m4: Fix OOB access displaying MIN_INT Previously displaying INT_MIN resulted in an out of bounds access to digits[-8]. In twos-complement -INT_MIN is still negative. PR: 287013 Reviewed by: emaste --- usr.bin/m4/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index d641ec56afeb..1870323ccb30 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -121,7 +121,7 @@ void pbnumbase(int n, int base, int d) { static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; - int num; + unsigned int num; int printed = 0; if (base > 36) From nobody Sat May 24 18:14:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4VYH2qzqz5wlF1; Sat, 24 May 2025 18:14: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 4b4VYG3kZfz3c7V; Sat, 24 May 2025 18: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=1748110482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68XvkUlk5MedEROXhyK7YsDDBADK2eFN++LRhbtIrKE=; b=rBI3zlUh3hUw/5rU75rUe0cWVp3fiDED0Xj1o/pde3MuzsdRRU7R0ZQH4S2z1uPjKuGaXn UkrwftKPh0wT2NP6WjShs5Tv2xMgbXq6sMkjRwPVq32LXxgMp3ubIWzKkvg9942VdYJ99Z OnNtP9xhLmOYBDfalO9YAIAlaEzIdaYeJe4X1EMixsAzSOr4HZySvVSqZXEfjkRPrldFGY x+kfs/WKycyqq73xAtVsUA7pvtVH75QP3z4PFhdoJGYFnSgtxZcGHgoBQrufD4kQYQrlok De5uxBos8o/gGHu0HT0GOt8dZNmtP4Vtg75XfT2Y/OgZfAOkW2CtEnI5pk18mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748110482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68XvkUlk5MedEROXhyK7YsDDBADK2eFN++LRhbtIrKE=; b=l6ybkIXvuTQtEFZVZZsXa8VPIaLvMWz9tgVP1Ci8p1ikyu7SbuckVz95AtADQSYghwuWtr 07QxT+zevtei4DwkYHX0YKlZCec/B5JDqQC+bJDC8sQktlGH6dSWzMmqL47JD0JVaTVDaj KXHH/8grRGKKDRvuN3dQbkkiWlhAwY7fbqMtnwSEac9KE3qa93CnR0WixUAueoZwKWMvjV 5NkF7grHeAQi2xZNWnZM8B54mpWSiU1TqgruWs34PFKET2Nqha5th9x86vtDzfUdsGttf1 LkXeOrJ0tLogFbb925xAsozlg85CD8onO5hy3KEpY9Bn016h+BRQvIUDQUXBsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748110482; a=rsa-sha256; cv=none; b=d2jv1c25Aek/oRCF+v9jPdDX7+1DXoCAxqnnm4uA8Iwoy3BnX9mHNrCldC8we+ftrEC6BW 2frJ+x0xjWlL4nOZPqPRIzJZKm0zesy1FfnOvV/6pKjsPLtBkNWyoDNewWnNdtY1sLw6Ut +Wpxc3H+1P/CDrba0ITnVhQjQ5cy5UEGmZEEkceyFFSDNotul1yoZyXCHoz4XTBvi/0Cs3 ncB2R0JUf5g0rjFX5q29kuIjyuQ3p21nNlSEnCkvub1nQKFl4InK8fcwgeW5rZC7RINS5i h/CF2fUGDpSXiWUSxTr9zE17tLccYfxsAX0xSe6E1ZS7ezvSQd6t6uTC+rtPuQ== 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 4b4VYG38qjzmpZ; Sat, 24 May 2025 18: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 54OIEgj1025141; Sat, 24 May 2025 18: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 54OIEgPR025138; Sat, 24 May 2025 18:14:42 GMT (envelope-from git) Date: Sat, 24 May 2025 18:14:42 GMT Message-Id: <202505241814.54OIEgPR025138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: cd240957d7ba - main - netinet: Disallow connections to INADDR_ANY List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd240957d7ba43d819e9d59c6f6517fe915102c7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cd240957d7ba43d819e9d59c6f6517fe915102c7 commit cd240957d7ba43d819e9d59c6f6517fe915102c7 Author: Ed Maste AuthorDate: 2024-11-25 14:07:11 +0000 Commit: Ed Maste CommitDate: 2025-05-24 18:13:09 +0000 netinet: Disallow connections to INADDR_ANY Previously connect() or sendto() to INADDR_ANY reached some socket bound to some host interface address. Although this was intentional it was an artifact of a different era, and is not desirable now. In 417b35a97b76 markj added support to disallow connect() to INADDR_ANY. Take the next logical step and disable it by default. PR: 280705 Reviewed by: markj, jhb, zlei Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47740 --- sys/netinet/in_pcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 3774f73a7a8f..bccd4b84561a 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -235,7 +235,7 @@ VNET_SYSINIT(in_pcbhashseed_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, in_pcbhashseed_init, NULL); #ifdef INET -VNET_DEFINE_STATIC(int, connect_inaddr_wild) = 1; +VNET_DEFINE_STATIC(int, connect_inaddr_wild) = 0; #define V_connect_inaddr_wild VNET(connect_inaddr_wild) SYSCTL_INT(_net_inet_ip, OID_AUTO, connect_inaddr_wild, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(connect_inaddr_wild), 0, From nobody Sat May 24 18:21:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4VjN1Xwxz5wm7Q; Sat, 24 May 2025 18:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b4VjN0F84z3gQV; Sat, 24 May 2025 18:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748110904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ro4mJgHKc3oa2XSXHvYW/jhWKhSFldNBvzEi6HINz0A=; b=sw2pyE6gfceC6YvY38/G1HuacN097I2ONp90gslpBH8FucdnzoxBTMOMBeePwtS6hYdtGv uT7FRcZe82ZlKxhSI4F84exqwVd+XVkP+dn3841UsDJUKwawzJaw7d2DfFXb0oyYmtf9EQ deFWGfuZ92TnWjkvwVpRNexkU1lqsoOFNe/kNVAtAOul+JLHkI+uFWpx2tzVb/RLdloEcD 9kJ84iN2W4bJoue6XW4WtyyCdH/96e35EqWpwtGUfTiRSpLuIIJIS/Xm2mvj3D7eic6sCn KOLffEuHnlqxgzOQciGud5nHOh3u3JrF1Rr/MByCXgUeAoZrKhe9AKEcA5gzTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748110904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ro4mJgHKc3oa2XSXHvYW/jhWKhSFldNBvzEi6HINz0A=; b=nepK3OV25g0aeBgyHI7ic4PgjYbwB4FYR6hodmkAs/5fFvgmgdJNoQnxscIrD+GbJQuwCR 4MN8i7dfrMCU9dwzOW6kSwiwH7hhjpV2CL2DJPuVzzDQTQ9LgpkUCJ4QrFXN/IODwtocwY 8fCKvJxvl6x6AZgLuEvsQx03Joh365hWM4EhhoHOHN/bwJ4L6W7mobF37Q+f01qE19Hc2n abxF/q2kEyQ0UYHD2of2e8YzRoA9cjqkq8FlUoxmnyQMe1XuGt1O+PlqVwd42Z5ykZqUyd k07GLES6X/p+OdFLcvmPVq4t38hgzY1bh0o2DHUdTku5B5VTISKzr6ifzbhGZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748110904; a=rsa-sha256; cv=none; b=ydBgF6TnDdUt6/FGMRBTcvc7yzhX1ouNa6S95/Bwkhpxlh7S+sX/XgZS0Ie3Ptdd5TGWAT 6Z39dl7m1+eqPPr/XHnRUSadbfJzQoFgqg0dLlzfg2Gdm3MKvaVDtvLSv4MF3ww0BT9szZ mv/2s3oCTBIdTi6KUYFVnLL0zC1p9LNftnamC9JbjzPGmIJdI+Zms0ySEL41eKXCiH677W 0+T6nYykoKi9Jfkmj9+nX5FC0CpGS+Ql6AoWCFYrytNCl5GGysTH14XaONOqACTji0cwAx 8u5zwxCyxecmtIAr1/dczjMdxH/9xr5Pr7CE9G477xh+BB2AVOy/GIoxIx0KKw== 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 4b4VjM6mNJzmq4; Sat, 24 May 2025 18:21: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 54OILhHV039837; Sat, 24 May 2025 18:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54OILhi8039834; Sat, 24 May 2025 18:21:43 GMT (envelope-from git) Date: Sat, 24 May 2025 18:21:43 GMT Message-Id: <202505241821.54OILhi8039834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b6dd8c5ee3c0 - main - RELNOTES: Add note for INADDR_ANY change List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6dd8c5ee3c0b0e906b350401754589972c76a6e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b6dd8c5ee3c0b0e906b350401754589972c76a6e commit b6dd8c5ee3c0b0e906b350401754589972c76a6e Author: Ed Maste AuthorDate: 2025-05-24 18:20:17 +0000 Commit: Ed Maste CommitDate: 2025-05-24 18:21:22 +0000 RELNOTES: Add note for INADDR_ANY change Ref commit cd240957d7ba ("netinet: Disallow connections to INADDR_ANY") --- RELNOTES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELNOTES b/RELNOTES index 19e2c07b1c4b..efac884e45f5 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,11 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +cd240957d7ba + Making a connection to INADDR_ANY (i.e., using INADDR_ANY as an alias + for localhost) is now disabled by default. This functionality can be + re-enabled by setting the net.inet.ip.connect_inaddr_wild sysctl to 1. + 4d618f6ced86 The bridge(4) sysctl net.link.bridge.member_ifaddrs now defaults to 0, meaning that interfaces added to a bridge may not have IP addresses From nobody Sat May 24 19:28:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4XBl1rmpz5wqRl; Sat, 24 May 2025 19:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b4XBk6tVDz49Nd; Sat, 24 May 2025 19:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748114927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wET0crNavKLOWfYentutFell9GY0prjv+txYQExDpb0=; b=W8QEtFG20H5h5uDRvalRtqaSCUPV5KYd1rR7mp+ATggwyM42p73j32z18Gj530g9grHHt8 7MIRjT9AHWTBzT+Nsw+NzeoM6DLEMLCEDjrI6keQ3j6nVM7NyOJEJ7NrnfbwZk4UwaQ9BH 3YxBHddeYLMwjqnJjgBg6NKPVTr5XtvTi/tt0PJqLaWs+GtWSWHCMsri3R3f1F7S57VAX5 KnlSa2LAyog006CTJUUysdmkRajrMMIBPJEpLXYJcb84nuTsx7BqowoYeyy/TUHt7daSE5 tpNQCUQ25n7O6hDQhVVbLm5V9xXQBnSXh54RcGoJOD0QiTzHkjGlobqid7JTtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748114927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wET0crNavKLOWfYentutFell9GY0prjv+txYQExDpb0=; b=xYZhsMmNyW57L6WKXZK7+HmekbcyraC6GopyRknJg3978K3yRHvk0u9orq0HNpUW2fSEFl Nl6dEkxJky8sOnLIUArniuaT/wycj67bF6L845b5TCLZRr/BDUtWDZJBH8wtcqe7fdN0us sybQR+KZdizdTXIRA6ItEo4tamubHvSQQGaQvylpDdT/QCYyWK/BYKJxO7E2yn70e/dF7r VbFaQhV3d0fVkrF1A5TSG8cnvhZNOR3ndZqnsbGvgmk945cz11t30BM9bYNszp7bVy0zBO gciXYVfsdO5kndOHBJLZO5lt2aJ+Afebgi1hv+bVzMNAfnfacU/5NcL1l9/oiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748114927; a=rsa-sha256; cv=none; b=KuZPY8IuLrWqko5U8jxJWqFxkFSALdNPiKl3K0UCdYXd1+rh4xrMiCMLbzj2NqTAPfQFwz YKpZxyzrGz5DRwqScWXZDM8Qk/plumg7+TOysB9eHyhB6Cbz7BCIEpb3FhfKqwlSPajLWz RAk9n6mzOVKFMOZm3UANRA9STb2qYCYRmPwhqsjvGAi07ZaijRAGNO/FQgWuqvR4UIe19c Ye00IXFwCWWPoTDXp3BjcQEWaSUCdgUZSBgmo455W919uU17Z8VOuUVbfu4dl2KaXvZhde eg0PJv+TjPy2zNurVhrM/NErrbO7jKCqnMCPxi2h/YN8J+Jzkd+XzFvsmR28SA== 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 4b4XBk6TpRzpJK; Sat, 24 May 2025 19:28: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 54OJSk1E057403; Sat, 24 May 2025 19:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54OJSkT3057400; Sat, 24 May 2025 19:28:46 GMT (envelope-from git) Date: Sat, 24 May 2025 19:28:46 GMT Message-Id: <202505241928.54OJSkT3057400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: a8b9eea5c5b5 - main - ddb4: improve formatting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8b9eea5c5b5ec507be7e5e78a4b7a9a1a945dc1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a8b9eea5c5b5ec507be7e5e78a4b7a9a1a945dc1 commit a8b9eea5c5b5ec507be7e5e78a4b7a9a1a945dc1 Author: Michael Tuexen AuthorDate: 2025-05-24 19:25:17 +0000 Commit: Michael Tuexen CommitDate: 2025-05-24 19:28:33 +0000 ddb4: improve formatting Improve the consistency of the formatting. Reviewed by: ziaee MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50514 --- share/man/man4/ddb.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index b3fc3231f6b4..4f6304e88114 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -24,7 +24,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd November 10, 2022 +.Dd May 24, 2025 .Dt DDB 4 .Os .Sh NAME @@ -590,7 +590,7 @@ Prints the address of the thread whose kernel-mode stack contains if any. .Pp .It Ic show Cm active trace -.It acttrace +.It Ic acttrace Show a stack trace for every thread running on a CPU. .Pp .It Ic show Cm all procs Ns Op Li / Ns Cm a From nobody Sat May 24 23:26:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4dT215Gzz5vvwk; Sat, 24 May 2025 23:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b4dT20TqTz466P; Sat, 24 May 2025 23:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748129190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQC9UMU9SYXAOhOJCKGXAhlIhYzoXUcqYyBpLgmmiVw=; b=e8oIB8zhrlKdPI0v58ea/B9bBY2gwVkZBzCxISZuSRuJfMhaseain/R9Ks6Ibg65m2HChb pr6kNSPiEsZYFuDmVFq0MZM3DSK3CQytyzTqN2haqihQVriblBV7Yv9nLpm6uAOUimCYUU Gce9MmrDHEKPyIbSqG7/RuLijjykdHTjIZEy2MZ8iqvCx+xHAVJOZZ/C3vG6gKwgPjLhFQ ORo1g1xMTFCV7z/MpBbNbDzP7Qa2tgvAEmLiLYehS1j+OUkzDHHAL18DTXRLH9v1sRtEtt ZHoaim+JLTtWYcBwtjJCJiV7Ev3pecSURjGXtiQzCybjLVl/+LS8HdJlNEJyrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748129190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQC9UMU9SYXAOhOJCKGXAhlIhYzoXUcqYyBpLgmmiVw=; b=UlVOge4oUmtWYt7SAecdRFG7hUiw9CmHwsq44KDI7nMycitfLZEa2uFh4vEYyxFFdkNoFH j1gC3R54pvHtdMfwP15r0HUlyMC1PGZTP8BvA4g0qHNLL0lz+AMj8SPUdvtDOfXviXeGIZ mZYUWjMBWcGpWtoNxqeP3Xn58W0lCa0h5s7mZkyVuYjCHONlcvW81dsN811LE3/hwnbnX+ 49LgXSWOsO/HXXHscuPnrxUZ0H8xga9FVYCViKPWbWB2SNyLTLyPq/rw9G//G0w9t1Wyy6 9PfoJvW423uNcEEu0bAt0nxC/oxvIQX9BNY9881dIPNTnRdrCm12JujNCTkncA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748129190; a=rsa-sha256; cv=none; b=uKmWzFfTCb81NoV9Lp78ctAaQQd/bx1E/tBgnM9wMQzD9rTggXBw4e/YAb2o/4XQQ2fiF1 6aGt7R0KploMDkS6HOHQGH3ur+yYkquQ6bBAbPqF33ZPxcwdhKkc895VPGzgtF8MVUJaq7 vbU6ow6qzF/ZI8UWujiAzhXVBv85VLgDq+rxjl+Xu2RosDy4Alm+Yv0Pq782N2WuzTqayd FYOkkzT019ZyP+MZcnKqAhEbTjZQ8nCiu/0dVACiP7HJy6BiY0q1/GcVlAyW4rqPfX3Sne 2y0IeFGUcG+gbd+ChsLzeLeulTtQe/0SPOdig+bQoqbBAPRb0SM/wXK6SQgmpg== 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 4b4dT16fjbzwJ5; Sat, 24 May 2025 23:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54ONQTgg002392; Sat, 24 May 2025 23:26:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54ONQTBY002389; Sat, 24 May 2025 23:26:29 GMT (envelope-from git) Date: Sat, 24 May 2025 23:26:29 GMT Message-Id: <202505242326.54ONQTBY002389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: bada3811884c - main - nfs_clvnops.c: Add an initialization mistakenly removed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bada3811884cb22d088c8b8e4dbc39227682ce48 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=bada3811884cb22d088c8b8e4dbc39227682ce48 commit bada3811884cb22d088c8b8e4dbc39227682ce48 Author: Rick Macklem AuthorDate: 2025-05-24 23:23:52 +0000 Commit: Rick Macklem CommitDate: 2025-05-24 23:23:52 +0000 nfs_clvnops.c: Add an initialization mistakenly removed Commit e4c7b2b6053f mistakenly removed an initialization of "newvp", which could result in crashes. This patch puts the initialization back in. Reported by: cy Tested by: cy Fixes: e4c7b2b6053f ("nfsv4: Add support to NFSv4 for named attributes") --- sys/fs/nfsclient/nfs_clvnops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 20603d376901..c2185992f994 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1421,6 +1421,7 @@ nfs_lookup(struct vop_lookup_args *ap) NFSUNLOCKMNT(nmp); #endif + newvp = NULLVP; NFSINCRGLOBAL(nfsstatsv1.lookupcache_misses); nanouptime(&ts); error = nfsrpc_lookup(dvp, cnp->cn_nameptr, cnp->cn_namelen, From nobody Sun May 25 13:06:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4zgP3Smjz5xXVv; Sun, 25 May 2025 13:06: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 4b4zgP22ZSz44Q8; Sun, 25 May 2025 13:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748178401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2mdj58xDIV7f7hZpXuIn/bCPLNcTwQia01TUoJcyaI=; b=hcNwmDWHslkTWkUlKxxnALPsRosnp2Z24BFLnzXSGh5iBcEcEd+YnHXEGzTohv9WALmddW uecBTDfaF9aOSKulRYuvg6RKxg6VNrqu3m5zgiXlkhxPojAHXEOCaq6OZSgspCq5954imM WEHjn5jeiDzJHyYwFrJ4Ix9wUC3GKSY37JZDEr6XaRkV147B7p+TD6WfCrrPyLGWJdXNHa 2kRbjWTFO0SGED/wcthzBFRH+wvwB2BmWBsQ0FEZmOY1+ejP/DVv0ZyeCxTRLa/ygUhlH9 +w0pDi3+P+4aA0wgYmWga8MWelyWhteUBr18z5b17dOM22nFp1sm9YyOvQ/j2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748178401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2mdj58xDIV7f7hZpXuIn/bCPLNcTwQia01TUoJcyaI=; b=QiOYSw3XJyKJZB9nLCYDFNqrlENCNN3VZ18lK96Knk9FSzhCMKW2gRRzkttmc5MWSPyjvI ilMGw45x6hx8wnfLytPDsUdKyBo9vO38C+kp2M4pDuO+1rWnW4yL34I7u4ACjjzRtphONh i/wnzaKPZ7GzUdgU/iQnandvj54S9uzUwp94GZNYLbA0+zY5GrZHp40aeCR779qlstmunO imgzCi1sqhIxlJAVUVjqzz9VeUPezbc9usTV3UfXWJiOQ4PZ/6UW3M3pDLB8SLkPvg0KQ8 FUNnodvLWiER7c/SfJbBudcvp4Z7dsLCvkxEBrejq0tOxJAhhkTYNs9Zg9oN1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748178401; a=rsa-sha256; cv=none; b=jR8+/lPaHIlD2GvwV3svwxWTOmYi0GD1wrLjX2nH0lSOYkQ8jKjTXWYzmp4wBaW7VYSjYu CB3xwD1ylgIcO0s/4KyqtLKxQwjrycalKqt9nF6QK1S1zDXCbtZJUR2eNjYOSLsoW9MK0O BjM9V8iVTpEWBo5ZJPhZwN3uGpL38l0y6GS3OjVpxpkMGZqhYL0ez1MgwgwjAM9kc4iGsH lIs2A7l+97N6Ge/fxxh4ASYGhCKIGK/NXFdykBGCEutciWAbl63g6dv/p58ETsNYXegtoJ kqq9OEkQ8JLqbQjV9JBL3/oITEZstmmf9+dRj7b9aC52sNzh455rQujHzebvaA== 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 4b4zgP1Zn5z7WG; Sun, 25 May 2025 13:06: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 54PD6flr071079; Sun, 25 May 2025 13:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PD6fbG071076; Sun, 25 May 2025 13:06:41 GMT (envelope-from git) Date: Sun, 25 May 2025 13:06:41 GMT Message-Id: <202505251306.54PD6fbG071076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 7866f1270fd2 - main - bsd.own.mk: Introduce TAR_XZ_CMD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7866f1270fd2214f18efadc65482c6ef6dee253d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7866f1270fd2214f18efadc65482c6ef6dee253d commit 7866f1270fd2214f18efadc65482c6ef6dee253d Author: Ed Maste AuthorDate: 2025-05-22 18:48:13 +0000 Commit: Ed Maste CommitDate: 2025-05-25 01:00:41 +0000 bsd.own.mk: Introduce TAR_XZ_CMD It is TAR_CMD with -J added, and can be used to avoid a tar | xz pipe that could mask errors. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50473 --- share/mk/bsd.own.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 0c47ba9af5c4..00a048fedc1d 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -272,8 +272,10 @@ XZ_THREADS?= 0 .if !empty(XZ_THREADS) XZ_CMD?= xz -T ${XZ_THREADS} +TAR_XZ_CMD?= ${TAR_CMD} -J --options xz:threads=${XZ_THREADS} .else XZ_CMD?= xz +TAR_XZ_CMD?= ${TAR_CMD} -J .endif PKG_CMD?= pkg From nobody Sun May 25 13:06:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b4zgQ3vXzz5xXbR; Sun, 25 May 2025 13:06: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 4b4zgQ2p7yz44HP; Sun, 25 May 2025 13:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748178402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uD4F7fDQuid/LHsbrDPAWs3afnE0VX36yS9ZJg1VTuQ=; b=RSCadujg/VHwtkHqPERwN3+u55U0vj5X3AGaz5dZQUrYQzpg18r+dIehqI9QYNpUfdHRcN wI6YuV/XCoLVgqDtKEb6wdmEHDLznz8DfMoOSVRMUm9TlmvzSH1eyPB2wC+eSVKBl6SWd1 B5r8f2A7LdMGgI6m5ENVPIgFl/UsBQieFmqGFocPo3s3gGHG477KtuoQnX323AIw8+p73X kwuu9HjeI2JjiiFr8mIK23kAz1JOXGW5bWBzHP7rVs1JhRFuj1p8wcDbhnY/ImwdIsbTth B7chCX6WIARlyXWDVyeWO3buOpdSZ/vXmG/qAH3Cbl/UjsLIEnGggHsItdESzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748178402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uD4F7fDQuid/LHsbrDPAWs3afnE0VX36yS9ZJg1VTuQ=; b=KbdFdmf6fYbjOFND/ROilog+syfNaJte0oo9mODj4B5W0yFHVEIiEr8l56NIth3d+Aqhhv f35c/EV0CQ4hEw1rGviWJkETFuDANHbX+AZhUYGOHkw6T3m7RU6KTDxJ+T/prQmeAmzQh3 8W269NA8MJQpA3OJrgN1tTr1DtT/PLzZEkE2/2gpshaj0LRl4YfP7YNe8EIVQgsA8V6kop 3fmCRP9W2mUgQoUag0NXi8sXmN7BOpDzJwg3i3EceirbyR/VngIC9YD6EbShrKegOtluC2 4uVw1kwyWijRJnM7qjYqUBbuwK7bkL9hdqyUeRVZ8T04XmTN/u0udovUvUp2eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748178402; a=rsa-sha256; cv=none; b=gyDJwMzuqVpsPy3miMwRzTJj7M8hkvJza6bVeh2VWNBxsztAMIYFP9yUu1pv/mMAolC2+k Gu/abG0QXeT3joJ/AjbGIAhn2WsUAPZjNVkWf5pu5RxKnWtGEH9T3DgEymPzGLBERcA+qq IHlZ0uA0j+G2Zw/8m3a8OYWy1NLQNuGidml8QDTQj8MpVZO1MSb9nQEqusX1m97kPJGw3g lMi79ghbDcoU0OA/6Ge85PMsRFNEnmgwY5ylQPp/de87h5//O6FwJKXz/fHrgVugPItOqz 0BWrU1poUiCewRjj+Ldkauuz1v76mH6aRsrmxgyhfXWPc9cW+sFeGppJWkfhhw== 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 4b4zgQ2J5Qz78B; Sun, 25 May 2025 13:06: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 54PD6gbx071113; Sun, 25 May 2025 13:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PD6gCV071110; Sun, 25 May 2025 13:06:42 GMT (envelope-from git) Date: Sun, 25 May 2025 13:06:42 GMT Message-Id: <202505251306.54PD6gCV071110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a28f7eb863d5 - main - release: Avoid pipe in tarball creation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a28f7eb863d52140088c4956797d97a207ac7e6e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a28f7eb863d52140088c4956797d97a207ac7e6e commit a28f7eb863d52140088c4956797d97a207ac7e6e Author: Ed Maste AuthorDate: 2025-05-22 18:52:34 +0000 Commit: Ed Maste CommitDate: 2025-05-25 01:00:41 +0000 release: Avoid pipe in tarball creation Previously errors from invoking tar for src.txz or ports.txz were eaten by the pipeline. If something fails in creating these tarballs we want the build to fail rather than producing subtly broken artifacts. Use ${TAR_XZ_CMD} to add -J to tar's commandline rather than | xz. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50459 --- release/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/release/Makefile b/release/Makefile index a5f5b65a562e..cf941534995b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -158,19 +158,18 @@ kernel.txz: src.txz: mkdir -p ${DISTDIR}/usr ln -fs ${WORLDDIR} ${DISTDIR}/usr/src - ( cd ${DISTDIR} && ${TAR_CMD} cLvf - --exclude .svn --exclude .zfs \ + ( cd ${DISTDIR} && ${TAR_XZ_CMD} -cLvf ${.OBJDIR}/src.txz \ + --exclude .svn --exclude .zfs \ --exclude .git --exclude @ --exclude usr/src/release/dist \ - --exclude usr/src/release/obj usr/src | \ - ${XZ_CMD} > ${.OBJDIR}/src.txz ) + --exclude usr/src/release/obj usr/src ) ports.txz: mkdir -p ${DISTDIR}/usr ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports - ( cd ${DISTDIR} && ${TAR_CMD} cLvf - \ + ( cd ${DISTDIR} && ${TAR_XZ_CMD} -cLvf ${.OBJDIR}/ports.txz \ --exclude .git --exclude .svn \ --exclude usr/ports/distfiles --exclude usr/ports/packages \ - --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \ - ${XZ_CMD} > ${.OBJDIR}/ports.txz ) + --exclude 'usr/ports/INDEX*' --exclude work usr/ports ) .if defined(PKGBASE) PKGBASE_REPO= pkgbase-repo From nobody Sun May 25 14:20:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b51JB5rq6z5xbvr; Sun, 25 May 2025 14:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b51JB4jHxz3XTL; Sun, 25 May 2025 14:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748182810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MBcZWRti/yj5g21k1YRxwOvJ8VN1VkSK/Aydk+6WlR8=; b=eePnGpPCcO3Fk1hYZHXqlddL3nCdMKnca6f4cEayZewWfrFWNXXJZBSU7KgoMDqzC7SGwk OEoqQCli4XCUufO9b5VHaTK8O6BemG46vOMiWUcL8uVGKwu30R6ZVR4gf9Z+zH7h0381Pd Tz2RuW5M08CAS5z9ih8AenKI4+cyz4hmwmBCB6idR1xZnZed05igVaa9XqgOnU4lgZMglZ MhV5Yen8SDqR1R3ExHJ0JN2Cint+AbJ93G/tYSTuCUja++jIm4FGZeuJ/qSm24Jd+m2CfW GzZIZR0wz739sua+ljHeGM03iNEKnPZTUpomkkGaLdGrGpYlvdIoa0xcGOdHPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748182810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MBcZWRti/yj5g21k1YRxwOvJ8VN1VkSK/Aydk+6WlR8=; b=ENsgw63aagUQ62DAk94/Jb9Qd5hDlGw+TwKmESlXeT8yN632gV6zrKOGl23+E8Dz9LgLxz 593AZCHOaC4vjl08IBIN1tJcnvbgQYfOtpr9sVGcOTPvQa2Biwxz7QV4GMiMvkKLMEdjyG xumgweCfmLrEdu48YG88zFW2O4dBfrzYFN/P33rJ4HdiwK3XNEt+mbEDcx4Ee7sNX17O/e o37iOTpBnWzgX/zrzsploWB5UzwhCT/4HHoWl/GcJF1Gn6mCWgoHR5pymNpthhO9UpojoN jm/t5oMYD/lrfroUsxWPzKoDOq+uqOEf5A5+QG1tbWhhMyryBAmRdrR006HJqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748182810; a=rsa-sha256; cv=none; b=RJSkfo/y3Zj1qvi7rHVKjjzEvW6jD3iCAnsdn6ggbOJLX5Mq3ysDomplVAN2boImvRSkrs veXedzdjYMR/nAblqO4PH4nd0S+xWYOjOtK/WwnETXqiib1uaTZcasnRS/YUTc+1jcNd8c 0jSA7/Kesjwv+n9r/sA+rjsUx1ijbcL1U2EcDBvmrbVrOTzXAQeR2NpGTGsysR8OeOVEYr e/sg6FDUUIwIM+UGtPPKmIwTUHdF9hH3zLBlNQVbkMPb37p4xqt42aupMpvDnr1RIIHh6l OdgRb0jrCAS7Kk7m+QF3JTn26YxxpOqEqZpzWtzfdvFKktyqy9Dv+fRnYQ2SLw== 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 4b51JB40RXz8gL; Sun, 25 May 2025 14:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54PEKAS6006764; Sun, 25 May 2025 14:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PEKABs006759; Sun, 25 May 2025 14:20:10 GMT (envelope-from git) Date: Sun, 25 May 2025 14:20:10 GMT Message-Id: <202505251420.54PEKABs006759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 259eac0149f0 - main - efivar: Kill needless sys/cdefs.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 259eac0149f0d2c01e1fcbeba3be1ba6fca6f8e1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=259eac0149f0d2c01e1fcbeba3be1ba6fca6f8e1 commit 259eac0149f0d2c01e1fcbeba3be1ba6fca6f8e1 Author: Warner Losh AuthorDate: 2025-05-01 22:25:16 +0000 Commit: Warner Losh CommitDate: 2025-05-25 13:49:32 +0000 efivar: Kill needless sys/cdefs.h Sponsored by: Netflix --- lib/libefivar/efivar-dp-format.c | 1 - lib/libefivar/efivar-dp-parse.c | 1 - lib/libefivar/efivar.c | 1 - lib/libefivar/uefi-dputil.c | 1 - 4 files changed, 4 deletions(-) diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index 3fa2833a7e7a..f2dcf1b91c01 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -28,7 +28,6 @@ * this file is taken from EDK2 and rototilled. */ -#include #include #include #include diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index 3382666730c4..51c134692f1e 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -28,7 +28,6 @@ * this file is taken from EDK2 and rototilled. */ -#include #include #include #include diff --git a/lib/libefivar/efivar.c b/lib/libefivar/efivar.c index a7cf13055bfe..c91bf5ea71bb 100644 --- a/lib/libefivar/efivar.c +++ b/lib/libefivar/efivar.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libefivar/uefi-dputil.c b/lib/libefivar/uefi-dputil.c index 7969054e2ce2..6e8f3aeca2ce 100644 --- a/lib/libefivar/uefi-dputil.c +++ b/lib/libefivar/uefi-dputil.c @@ -28,7 +28,6 @@ * this file is taken from EDK2 and rototilled. */ -#include #include #include #include From nobody Sun May 25 15:24:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b52kJ44jDz5xfkn; Sun, 25 May 2025 15:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b52kJ3TkMz3vHP; Sun, 25 May 2025 15:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOcfrMwgJfuggWkcrkiNeKiXBASNGMsrKl9PFt/O6iA=; b=JhtQYFsBNU91q0n7HV+auY2laWlf8078jqXv7q6F4KtLWAeoLepFG2C64H3oab/QhayoeV efmbNgpDgP0VixBmlnXJHcRgO0RIeLjU+zNuDtgQhzk5ArGv1ZOwGHMjxbGgC5zRUckb7a LHlPUqGQBDBnC3ceAEXVE7f2gtImtDVHRdNeALHuG7ao1lrf23XxzofJZ43qha14dkvmiA 4jW0dQXkQaVJPldhC5jhlh4jwWX6inWgqnOGQxfHZ0NVI/0yQRHkppXQAtfmVWf4VLGIMO bSGtEoN971eC2FIWlnfsZJe52e3rkwQYD9PZcffBmkEPhKPqTxYm8Bw6nDyL2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOcfrMwgJfuggWkcrkiNeKiXBASNGMsrKl9PFt/O6iA=; b=XjbTlODeNufS1fK1n/qIDeNJgxIbnk2tEnOIjBg2eUwSS9pbE/XFEz0mNMu53ZFeSzzDq2 Z/PW74RVqE7vzfiK5Klg0N0KLrOvEzorzLgfbfIAfUFHzAy1XrrZuHta6Ns/C5XJOr9x9C CeYZ7Nvf2ZMjAiS0JrcUIUb4c4pqWJWJUC33zrQsefH98xruZKqe6i/KPj0K40sfcBBiM3 XU+y4rWlS8tfKKOdpD0aH8OehwfMX4Nqxqg9XSMcH5xpaIDfYzoVClAzB81CeWzSqxnT1D 0MVz30OV7xXce23h0T6OCUKhX/PS3/RTPQhGClE/hMgXyjOMOmWxjCnWfKK3cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748186664; a=rsa-sha256; cv=none; b=Rxd/IzqUMGcRqtUwXCQ3RwqmHYDTOZKIpgQT+l93QLb0uX7cG+EPvfZZyKsDBSZZbFZMG/ BPaWfG20AelYj0kUaKHCN+mTBwa2P2pzgdVY/j76dQKELz9LQU+GhW/3OAlayrt46SbUVN j2ic51Kgm41WW0+x8NYqpVAXW/629qVsB6I3nk59ViBfzYCQT/mpPD7u+6MulveJ5tBGz8 ZS9mL8kLKbf/2I7vKA8agwVvoOO5DfoZy7ha/wSqCwf34CVFG0askooYP+ok7m1Z3H1RS8 lGe317dGFSFBWxnzh5ONS/2D1Aos98v8obQg/e+ctQ2i6tjTYe7Dx9wKMA6Zyw== 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 4b52kJ32YlzBfT; Sun, 25 May 2025 15:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54PFOOst031763; Sun, 25 May 2025 15:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PFOOqR031760; Sun, 25 May 2025 15:24:24 GMT (envelope-from git) Date: Sun, 25 May 2025 15:24:24 GMT Message-Id: <202505251524.54PFOOqR031760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: e035e8661c37 - main - net80211: move references to IF_LLADDR() into ieee80211_freebsd.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e035e8661c37b9f0669d31e146ec4afb73f4f435 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=e035e8661c37b9f0669d31e146ec4afb73f4f435 commit e035e8661c37b9f0669d31e146ec4afb73f4f435 Author: Adrian Chadd AuthorDate: 2025-04-25 18:27:29 +0000 Commit: Adrian Chadd CommitDate: 2025-05-25 15:23:02 +0000 net80211: move references to IF_LLADDR() into ieee80211_freebsd.c * Move references to IF_LLADDR() into ieee80211_freebsd.c * Add a comment on one that I need to verify before I move it * Implement ieee80211_vap_sync_mac_address() which syncs the VAP mac address from the network interface MAC address. This uses FreeBSD-isms (network epoch, IF_LLADDR()) so it shouldn't be in net80211 itself. Differential Revision: https://reviews.freebsd.org/D50023 --- sys/net80211/ieee80211.c | 3 ++- sys/net80211/ieee80211_freebsd.c | 44 ++++++++++++++++++++++++++++++++++++++++ sys/net80211/ieee80211_freebsd.h | 3 +++ sys/net80211/ieee80211_ioctl.c | 18 +--------------- sys/net80211/ieee80211_sta.c | 4 ++-- 5 files changed, 52 insertions(+), 20 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index dbc7023c7fee..e64568abb024 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -722,7 +722,8 @@ ieee80211_vap_attach(struct ieee80211vap *vap, ifm_change_cb_t media_change, ifp->if_baudrate = IF_Mbps(maxrate); ether_ifattach(ifp, macaddr); - IEEE80211_ADDR_COPY(vap->iv_myaddr, IF_LLADDR(ifp)); + /* Do initial MAC address sync */ + ieee80211_vap_copy_mac_address(vap); /* hook output method setup by ether_ifattach */ vap->iv_output = ifp->if_output; ifp->if_output = ieee80211_output; diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index 6979e601ce41..5098529beb47 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -1192,6 +1192,50 @@ ieee80211_debugnet_poll(struct ifnet *ifp, int count) } #endif +/** + * @brief Check if the MAC address was changed by the upper layer. + * + * This is specifically to handle cases like the MAC address + * being changed via an ioctl (eg SIOCSIFLLADDR). + * + * @param vap VAP to sync MAC address for + */ +void +ieee80211_vap_sync_mac_address(struct ieee80211vap *vap) +{ + struct epoch_tracker et; + const struct ifnet *ifp = vap->iv_ifp; + + /* + * Check if the MAC address was changed + * via SIOCSIFLLADDR ioctl. + * + * NB: device may be detached during initialization; + * use if_ioctl for existence check. + */ + NET_EPOCH_ENTER(et); + if (ifp->if_ioctl == ieee80211_ioctl && + (ifp->if_flags & IFF_UP) == 0 && + !IEEE80211_ADDR_EQ(vap->iv_myaddr, IF_LLADDR(ifp))) + IEEE80211_ADDR_COPY(vap->iv_myaddr, IF_LLADDR(ifp)); + NET_EPOCH_EXIT(et); +} + +/** + * @brief Initial MAC address setup for a VAP. + * + * @param vap VAP to sync MAC address for + */ +void +ieee80211_vap_copy_mac_address(struct ieee80211vap *vap) +{ + struct epoch_tracker et; + + NET_EPOCH_ENTER(et); + IEEE80211_ADDR_COPY(vap->iv_myaddr, IF_LLADDR(vap->iv_ifp)); + NET_EPOCH_EXIT(et); +} + /* * Module glue. * diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index ed913f7b3661..bdc78fe99d36 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -540,6 +540,9 @@ struct debugnet80211_methods { #define DEBUGNET80211_SET(ic, driver) #endif /* DEBUGNET */ +void ieee80211_vap_sync_mac_address(struct ieee80211vap *); +void ieee80211_vap_copy_mac_address(struct ieee80211vap *); + #endif /* _KERNEL */ /* XXX this stuff belongs elsewhere */ diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 6c30325e5e32..d70004c0fb7a 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -3631,24 +3631,8 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) IEEE80211_UNLOCK(ic); /* Wait for parent ioctl handler if it was queued */ if (wait) { - struct epoch_tracker et; - ieee80211_waitfor_parent(ic); - - /* - * Check if the MAC address was changed - * via SIOCSIFLLADDR ioctl. - * - * NB: device may be detached during initialization; - * use if_ioctl for existence check. - */ - NET_EPOCH_ENTER(et); - if (ifp->if_ioctl == ieee80211_ioctl && - (ifp->if_flags & IFF_UP) == 0 && - !IEEE80211_ADDR_EQ(vap->iv_myaddr, IF_LLADDR(ifp))) - IEEE80211_ADDR_COPY(vap->iv_myaddr, - IF_LLADDR(ifp)); - NET_EPOCH_EXIT(et); + ieee80211_vap_sync_mac_address(vap); } break; case SIOCADDMULTI: diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 887eb81dd3c4..0dd007fef508 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -634,10 +634,10 @@ sta_input(struct ieee80211_node *ni, struct mbuf *m, * XXX process data frames whilst scanning. */ if ((! IEEE80211_IS_MULTICAST(wh->i_addr1)) - && (! IEEE80211_ADDR_EQ(wh->i_addr1, IF_LLADDR(ifp)))) { + && (! IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr))) { IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, bssid, NULL, "not to cur sta: lladdr=%6D, addr1=%6D", - IF_LLADDR(ifp), ":", wh->i_addr1, ":"); + vap->iv_myaddr, ":", wh->i_addr1, ":"); vap->iv_stats.is_rx_wrongbss++; goto out; } From nobody Sun May 25 15:24:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b52kM0qk9z5xfyc; Sun, 25 May 2025 15:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b52kL5Yhjz3vFF; Sun, 25 May 2025 15:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IwoaiDJeyt2hQ2JTJlhIsQWT6XjTLoJYJIJ32rkWeM=; b=jNUWbxkqRXcgqbPOLpCZAFOk+OgE8lrKORd2REye6/ikZIB1Imnxx+RfFoSkW4Ge4XhcsG qMgtxlPLZPobuxQLS5wWfpfsS6igw539T7C6ZdWjKNLq2tP6/uO9GWXbnowQn7wq1IHCYw MkJbVCLU6heAxF2MSdifJM+jm5svwlWqIS2i8BvbwASgkAidFpo9kJENQ4OhlyMgeSP7Qe mI1kJdiNTeU8iDhY5mM3YolkvQkT+9MBc3m0hSdDZ4S2LR0mZy6AXAjttCjkR+rk1JUyuU MlGzzQwBccQdvokRgPIo9Wt13Bd194rtBZ/1hiRsUM5+V/IRC0gBMEIOPt7gGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IwoaiDJeyt2hQ2JTJlhIsQWT6XjTLoJYJIJ32rkWeM=; b=u/ZY3va2c2P5DvEVcPwyYkW+FEzqiIW4PYbKeIAc5R/lluKamMKo6PvMqJddbn5IUPrjRe 7Ume71OTSsu/rYrIWi59gxPFHtPEfcayhVkNHJTU5GnyXZJn3PTVWFe5Owigd/lKT4GqZ3 dfKWdoYGRciHYXOsxEJZrboJKh1mxsCqHw6/olfvVTo/77d1ySmy4kD7mEcTADd8FBgaUN gO6DPdWHGlhw9320P8nu772Fnlpudcdr8HEmrGk+Lvmv2lqm80bISbYeZMWZiXZEjVE6TE eFcff82BwjfFgL5mt2x00HajMMvKAkjhjeFlH2McnW5FxlmUmzOKG14m/ivL9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748186666; a=rsa-sha256; cv=none; b=CA37D7Vw8GqvxLRmg7bwzpTLzTsLCC9Xo0lnvCGV5sKAm4BLz3wM4jZieynqV9hPcdzx1r qwSmjsjRL9QkRab/22ytgQ6b7+dpyazOreQXxaAWpo/B9/G7Xp46VL5tpa3U9XbsxUS8uN bZtyWJ6MuE5QS98Rsmp31fggW4tt9GLl9qylseiAD1wzc8H8UU1+Q/ocANt29e7ORPmDIe gNqFGPzvz/MHxXHP0Sqp2Opeyjz+gTMKfw3Zv4ePoflb4Scb6tyQrH5s2e/VNlNOmtcikV OjqxbIftYigZKToBhDAb3LpXgbyz3s5QZll7bZTGJo5GTdV6caPZqDllVH950A== 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 4b52kL4znLzC14; Sun, 25 May 2025 15:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54PFOQIQ031836; Sun, 25 May 2025 15:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PFOQ2t031833; Sun, 25 May 2025 15:24:26 GMT (envelope-from git) Date: Sun, 25 May 2025 15:24:26 GMT Message-Id: <202505251524.54PFOQ2t031833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: ed987e16887b - main - net80211: migrate if_flags, if_drvflags out of most source files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed987e16887b968210b69de6caf50a91f7d020e9 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ed987e16887b968210b69de6caf50a91f7d020e9 commit ed987e16887b968210b69de6caf50a91f7d020e9 Author: Adrian Chadd AuthorDate: 2025-05-18 04:32:36 +0000 Commit: Adrian Chadd CommitDate: 2025-05-25 15:23:34 +0000 net80211: migrate if_flags, if_drvflags out of most source files Migrate both if_flags and if_drvflags out of most source files. Ideally it'd only be referenced in ieee80211_freebsd.c, but for now it also ignores references in ieee80211_ioctl.c. * migrate if_flags set to if_setflags * migrate if_flags get to if_getflags * migrate if_drvflags get to if_getdrvflags * add ieee80211_vap_ifp_check_is_monitor() and ieee8021_vap_ifp_check_is_simplex() to abstract out the IFF_MONITOR and IFF_SIMPLEX flag checks. * add ieee80211_vap_ifp_check_is_running() and ieee80211_vap_ifp_set_running_state() to represent what IFF_DRV_RUNNING means (ie, mark the underlying OS network interface as active and inactive.) Notably this doesn't yet clear up OACTIVE; I need to better describe that. Differential Revision: https://reviews.freebsd.org/D50405 Reviewed by: bz --- sys/net80211/ieee80211.c | 2 +- sys/net80211/ieee80211_freebsd.c | 57 ++++++++++++++++++++++++++++++++++++++++ sys/net80211/ieee80211_freebsd.h | 10 ++++--- sys/net80211/ieee80211_ioctl.c | 2 +- sys/net80211/ieee80211_output.c | 2 +- sys/net80211/ieee80211_proto.c | 11 ++++---- sys/net80211/ieee80211_sta.c | 4 +-- 7 files changed, 74 insertions(+), 14 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index e64568abb024..e4de0b439ac0 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -564,7 +564,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, ifp = if_alloc(IFT_ETHER); if_initname(ifp, name, unit); ifp->if_softc = vap; /* back pointer */ - ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; + if_setflags(ifp, IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST); ifp->if_transmit = ieee80211_vap_transmit; ifp->if_qflush = ieee80211_vap_qflush; ifp->if_ioctl = ieee80211_ioctl; diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index 0a51063e1d9a..aa3ae82d089f 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -1257,6 +1257,63 @@ ieee80211_vap_deliver_data(struct ieee80211vap *vap, struct mbuf *m) NET_EPOCH_EXIT(et); } +/** + * @brief Return whether the VAP is configured with monitor mode + * + * This checks the operating system layer for whether monitor mode + * is enabled. + * + * @param vap the current VAP + * @retval true if the underlying interface is in MONITOR mode, false otherwise + */ +bool +ieee80211_vap_ifp_check_is_monitor(struct ieee80211vap *vap) +{ + return ((if_getflags(vap->iv_ifp) & IFF_MONITOR) != 0); +} + +/** + * @brief Return whether the VAP is configured in simplex mode. + * + * This checks the operating system layer for whether simplex mode + * is enabled. + * + * @param vap the current VAP + * @retval true if the underlying interface is in SIMPLEX mode, false otherwise + */ +bool +ieee80211_vap_ifp_check_is_simplex(struct ieee80211vap *vap) +{ + return ((if_getflags(vap->iv_ifp) & IFF_SIMPLEX) != 0); +} + +/** + * @brief Return if the VAP underlying network interface is running + * + * @param vap the current VAP + * @retval true if the underlying interface is running; false otherwise + */ +bool +ieee80211_vap_ifp_check_is_running(struct ieee80211vap *vap) +{ + return ((if_getdrvflags(vap->iv_ifp) & IFF_DRV_RUNNING) != 0); +} + +/** + * @brief Change the VAP underlying network interface state + * + * @param vap the current VAP + * @param state true to mark the interface as RUNNING, false to clear + */ +void +ieee80211_vap_ifp_set_running_state(struct ieee80211vap *vap, bool state) +{ + if (state) + if_setdrvflagbits(vap->iv_ifp, IFF_DRV_RUNNING, 0); + else + if_setdrvflagbits(vap->iv_ifp, 0, IFF_DRV_RUNNING); +} + /* * Module glue. * diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index 442c5edef52d..449ff8f05202 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -262,9 +262,9 @@ void ieee80211_flush_ifq(struct ifqueue *, struct ieee80211vap *); void ieee80211_vap_destroy(struct ieee80211vap *); const char * ieee80211_get_vap_ifname(struct ieee80211vap *); -#define IFNET_IS_UP_RUNNING(_ifp) \ - (((_ifp)->if_flags & IFF_UP) && \ - ((_ifp)->if_drv_flags & IFF_DRV_RUNNING)) +#define IFNET_IS_UP_RUNNING(_ifp) \ + (((if_getflags(_ifp) & IFF_UP) != 0) && \ + ((if_getdrvflags(_ifp) & IFF_DRV_RUNNING) != 0)) #define msecs_to_ticks(ms) MSEC_2_TICKS(ms) #define ticks_to_msecs(t) TICKS_2_MSEC(t) @@ -543,6 +543,10 @@ struct debugnet80211_methods { void ieee80211_vap_sync_mac_address(struct ieee80211vap *); void ieee80211_vap_copy_mac_address(struct ieee80211vap *); void ieee80211_vap_deliver_data(struct ieee80211vap *, struct mbuf *); +bool ieee80211_vap_ifp_check_is_monitor(struct ieee80211vap *); +bool ieee80211_vap_ifp_check_is_simplex(struct ieee80211vap *); +bool ieee80211_vap_ifp_check_is_running(struct ieee80211vap *); +void ieee80211_vap_ifp_set_running_state(struct ieee80211vap *, bool); #endif /* _KERNEL */ diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index d70004c0fb7a..7e698ba5cdb8 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -3619,7 +3619,7 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) wait = 1; ieee80211_start_locked(vap); } - } else if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + } else if (ieee80211_vap_ifp_check_is_running(vap)) { /* * Stop ourself. If we are the last vap to be * marked down the parent will also be taken down. diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 1f726f75b6c6..1b5b3373685f 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -777,7 +777,7 @@ ieee80211_output(struct ifnet *ifp, struct mbuf *m, if (error) senderr(error); #endif - if (ifp->if_flags & IFF_MONITOR) + if (ieee80211_vap_ifp_check_is_monitor(vap)) senderr(ENETDOWN); if (!IFNET_IS_UP_RUNNING(ifp)) senderr(ENETDOWN); diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 823f1ab3f486..14c0d2beaad5 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1976,7 +1976,6 @@ ieee80211_start_reset_chan(struct ieee80211vap *vap) void ieee80211_start_locked(struct ieee80211vap *vap) { - struct ifnet *ifp = vap->iv_ifp; struct ieee80211com *ic = vap->iv_ic; IEEE80211_LOCK_ASSERT(ic); @@ -1985,7 +1984,7 @@ ieee80211_start_locked(struct ieee80211vap *vap) IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG, "start running, %d vaps running\n", ic->ic_nrunning); - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + if (!ieee80211_vap_ifp_check_is_running(vap)) { /* * Mark us running. Note that it's ok to do this first; * if we need to bring the parent device up we defer that @@ -1994,7 +1993,7 @@ ieee80211_start_locked(struct ieee80211vap *vap) * through ieee80211_start_all at which point we'll come * back in here and complete the work. */ - ifp->if_drv_flags |= IFF_DRV_RUNNING; + ieee80211_vap_ifp_set_running_state(vap, true); ieee80211_notify_ifnet_change(vap, IFF_DRV_RUNNING); /* @@ -2099,7 +2098,6 @@ void ieee80211_stop_locked(struct ieee80211vap *vap) { struct ieee80211com *ic = vap->iv_ic; - struct ifnet *ifp = vap->iv_ifp; IEEE80211_LOCK_ASSERT(ic); @@ -2107,8 +2105,9 @@ ieee80211_stop_locked(struct ieee80211vap *vap) "stop running, %d vaps running\n", ic->ic_nrunning); ieee80211_new_state_locked(vap, IEEE80211_S_INIT, -1); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; /* mark us stopped */ + if (ieee80211_vap_ifp_check_is_running(vap)) { + /* mark us stopped */ + ieee80211_vap_ifp_set_running_state(vap, false); ieee80211_notify_ifnet_change(vap, IFF_DRV_RUNNING); if (--ic->ic_nrunning == 0) { IEEE80211_DPRINTF(vap, diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 0dd007fef508..062b5610d082 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -681,7 +681,7 @@ sta_input(struct ieee80211_node *ni, struct mbuf *m, } resubmit_ampdu: if (dir == IEEE80211_FC1_DIR_FROMDS) { - if ((ifp->if_flags & IFF_SIMPLEX) && + if (ieee80211_vap_ifp_check_is_simplex(vap) && isfromds_mcastecho(vap, wh)) { /* * In IEEE802.11 network, multicast @@ -716,7 +716,7 @@ sta_input(struct ieee80211_node *ni, struct mbuf *m, vap->iv_stats.is_rx_wrongdir++; goto out; } - if ((ifp->if_flags & IFF_SIMPLEX) && + if (ieee80211_vap_ifp_check_is_simplex(vap) && isdstods_mcastecho(vap, wh)) { /* * In IEEE802.11 network, multicast From nobody Sun May 25 15:24:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b52kN1J2Bz5xfYR; Sun, 25 May 2025 15:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b52kM687Yz3vKW; Sun, 25 May 2025 15:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdAH7ragRJYLQE/p3eQuDgzfskicSmFMi8/TAb1vxY0=; b=qelZ5t1jJz9M15hw99nIsZMG1ve1i6AgiNiA9XF1zEcvYjCMT9SY6EMB6M7o6ZBcNRHUCV bYXZIVR5k2ssuIBDGjMCi3LjoPvQfcB1p37I+VxUH9jMHjAlbQDKFBGrPqFb/kF01HM1hu O6bRkqVjATzURzyawToTP1BFx4iBDQqZFu/NIkPXGWhWVPh0ejN8bzyMB5CC8o9P6pHLcX cfMCbhXCOpqPGA35/rdYW03kPhYAcZ9k0a+y54WMv4TOe/meBDQuj2gJ0yFDRLVcgPE40W OzmDJGFD+p2PqPmcFMgQjGsE/4SGsNO8mE6b4JjuYPFT03q9NEXP30Y9rjNdTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdAH7ragRJYLQE/p3eQuDgzfskicSmFMi8/TAb1vxY0=; b=XQU5r+AYrtOrC73Eix4uPkb+nYVRY7Q+faY7/Ot36ONHtTnB3OIS4VsYquQWwf7y7rsQYq XbofW2Ps/eIsJQo/0cH2evwQBmTkB/+K52FOkbRY/nu+NNjFxZG8n3d5ZiQAjW0DfEqwGf qFJMMU2fhpMN2UX+msqmjxG/SCSqCB4slnA6CmR+totFU8pzZTBmq38RPnm9nv0R1vG8e2 6oI3MGfgTD0Kqxipbp298/VW0itVCGetMl+nKX9Zofi2a7XSNKMfAoHgxQAOjxctS0SCpU JL4Acz822m9VvmcGqILB4ouSHJ8bRKBC4bOjZnfJ2mT+NbAzsxPWaYzyfN5gcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748186667; a=rsa-sha256; cv=none; b=HfUDekkqD5imvjsRO5PD+eTI64BgtTxeHprV6tXPSvMQhgnb75rq7/N9+e+neF6NXWGgdm rDnPbvUbDGCHMHcIx8GCOQXMexh2Ewdy06ZWw5H8L16FJYuuNrD9cDsWejdlxoNRQsr18b iEJpaAQMmQ2pOWdg1qP+FBFyG7IkzcyHbW3EYLpDbAOeKQlQTOVfz0wS2DJx31kZgrOZ1G aFupzw6/mpg6n1mvzjt6U2VtOeozdeZZVpS3PmpZw0sbxXc9a+Wr1Mzuac/cjqlpQFt8or 6wxIpDGXX2EOfqkv7RBVgbyXJPFCc/CGVchXse119StS4t6eZg1ySH/27sE3kg== 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 4b52kM5lQVzBVf; Sun, 25 May 2025 15:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54PFORgm031872; Sun, 25 May 2025 15:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PFORu8031869; Sun, 25 May 2025 15:24:27 GMT (envelope-from git) Date: Sun, 25 May 2025 15:24:27 GMT Message-Id: <202505251524.54PFORu8031869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: a278d11a60e0 - main - net80211: refactor out ifp->if_broadcastaddr into ieee80211_freebsd.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a278d11a60e05d62ab91a6fe0fc3aedbee2bb295 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=a278d11a60e05d62ab91a6fe0fc3aedbee2bb295 commit a278d11a60e05d62ab91a6fe0fc3aedbee2bb295 Author: Adrian Chadd AuthorDate: 2025-05-18 04:44:29 +0000 Commit: Adrian Chadd CommitDate: 2025-05-25 15:23:55 +0000 net80211: refactor out ifp->if_broadcastaddr into ieee80211_freebsd.c * create ieee80211_vap_get_broadcast_address() to fetch the broadcast MAC address for the given VAP * refactor references to ifp->if_broadcastaddr -> ieee80211_vap_get_broadcast_address() Differential Revision: https://reviews.freebsd.org/D50406 Reviewed by: bz --- sys/net80211/ieee80211_adhoc.c | 3 ++- sys/net80211/ieee80211_freebsd.c | 12 ++++++++++++ sys/net80211/ieee80211_freebsd.h | 1 + sys/net80211/ieee80211_hostap.c | 9 +++++---- sys/net80211/ieee80211_ioctl.c | 6 ++++-- sys/net80211/ieee80211_output.c | 4 ++-- sys/net80211/ieee80211_scan_sw.c | 11 ++++++----- sys/net80211/ieee80211_wds.c | 3 ++- 8 files changed, 34 insertions(+), 15 deletions(-) diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c index 210c9fc75bd9..5f5642884726 100644 --- a/sys/net80211/ieee80211_adhoc.c +++ b/sys/net80211/ieee80211_adhoc.c @@ -395,7 +395,8 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m, (subtype == IEEE80211_FC0_SUBTYPE_BEACON || subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP)) && !IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && - !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) { + !IEEE80211_ADDR_EQ(bssid, + ieee80211_vap_get_broadcast_address(vap))) { /* not interested in */ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, bssid, NULL, "%s", "not to bss"); diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index aa3ae82d089f..d0aa47859a3a 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -1314,6 +1314,18 @@ ieee80211_vap_ifp_set_running_state(struct ieee80211vap *vap, bool state) if_setdrvflagbits(vap->iv_ifp, 0, IFF_DRV_RUNNING); } +/** + * @brief Return the broadcast MAC address. + * + * @param vap The current VAP + * @retval a uint8_t array representing the ethernet broadcast address + */ +const uint8_t * +ieee80211_vap_get_broadcast_address(struct ieee80211vap *vap) +{ + return (if_getbroadcastaddr(vap->iv_ifp)); +} + /* * Module glue. * diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index 449ff8f05202..5afc093ba90c 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -547,6 +547,7 @@ bool ieee80211_vap_ifp_check_is_monitor(struct ieee80211vap *); bool ieee80211_vap_ifp_check_is_simplex(struct ieee80211vap *); bool ieee80211_vap_ifp_check_is_running(struct ieee80211vap *); void ieee80211_vap_ifp_set_running_state(struct ieee80211vap *, bool); +const uint8_t * ieee80211_vap_get_broadcast_address(struct ieee80211vap *); #endif /* _KERNEL */ diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index e9105f2e7505..1b246c428411 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -557,9 +557,10 @@ hostap_input(struct ieee80211_node *ni, struct mbuf *m, * Validate the bssid. */ if (!(type == IEEE80211_FC0_TYPE_MGT && - subtype == IEEE80211_FC0_SUBTYPE_BEACON) && + subtype == IEEE80211_FC0_SUBTYPE_BEACON) && !IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && - !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) { + !IEEE80211_ADDR_EQ(bssid, + ieee80211_vap_get_broadcast_address(vap))) { /* not interested in */ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, bssid, NULL, "%s", "not to bss"); @@ -1654,7 +1655,6 @@ static void ieee80211_deliver_l2uf(struct ieee80211_node *ni) { struct ieee80211vap *vap = ni->ni_vap; - struct ifnet *ifp = vap->iv_ifp; struct mbuf *m; struct l2_update_frame *l2uf; struct ether_header *eh; @@ -1669,7 +1669,8 @@ ieee80211_deliver_l2uf(struct ieee80211_node *ni) l2uf = mtod(m, struct l2_update_frame *); eh = &l2uf->eh; /* dst: Broadcast address */ - IEEE80211_ADDR_COPY(eh->ether_dhost, ifp->if_broadcastaddr); + IEEE80211_ADDR_COPY(eh->ether_dhost, + ieee80211_vap_get_broadcast_address(vap)); /* src: associated STA */ IEEE80211_ADDR_COPY(eh->ether_shost, ni->ni_macaddr); eh->ether_type = htons(sizeof(*l2uf) - sizeof(*eh)); diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 7e698ba5cdb8..a72568e559aa 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -510,7 +510,8 @@ ieee80211_ioctl_getstainfo(struct ieee80211vap *vap, struct ieee80211req *ireq) error = copyin(ireq->i_data, macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; - if (IEEE80211_ADDR_EQ(macaddr, vap->iv_ifp->if_broadcastaddr)) { + if (IEEE80211_ADDR_EQ(macaddr, + ieee80211_vap_get_broadcast_address(vap))) { ni = NULL; } else { ni = ieee80211_find_vap_node(&vap->iv_ic->ic_sta, vap, macaddr); @@ -1371,7 +1372,8 @@ setmlme_dropsta(struct ieee80211vap *vap, int error = 0; /* NB: the broadcast address means do 'em all */ - if (!IEEE80211_ADDR_EQ(mac, vap->iv_ifp->if_broadcastaddr)) { + if (!IEEE80211_ADDR_EQ(mac, + ieee80211_vap_get_broadcast_address(vap))) { IEEE80211_NODE_LOCK(nt); ni = ieee80211_find_node_locked(nt, mac); IEEE80211_NODE_UNLOCK(nt); diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 1b5b3373685f..9466b4851881 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -3659,7 +3659,6 @@ ieee80211_beacon_alloc(struct ieee80211_node *ni) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; - struct ifnet *ifp = vap->iv_ifp; struct ieee80211_frame *wh; struct mbuf *m; int pktlen; @@ -3761,7 +3760,8 @@ ieee80211_beacon_alloc(struct ieee80211_node *ni) IEEE80211_FC0_SUBTYPE_BEACON; wh->i_fc[1] = IEEE80211_FC1_DIR_NODS; *(uint16_t *)wh->i_dur = 0; - IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr); + IEEE80211_ADDR_COPY(wh->i_addr1, + ieee80211_vap_get_broadcast_address(vap)); IEEE80211_ADDR_COPY(wh->i_addr2, vap->iv_myaddr); IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid); *(uint16_t *)wh->i_seq = 0; diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index e1d6b2779cf0..f64730ce852f 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -526,7 +526,6 @@ ieee80211_swscan_probe_curchan(struct ieee80211vap *vap, bool force __unused) { struct ieee80211com *ic = vap->iv_ic; struct ieee80211_scan_state *ss = ic->ic_scan; - struct ifnet *ifp = vap->iv_ifp; int i; /* @@ -542,13 +541,15 @@ ieee80211_swscan_probe_curchan(struct ieee80211vap *vap, bool force __unused) */ for (i = 0; i < ss->ss_nssid; i++) ieee80211_send_probereq(vap->iv_bss, - vap->iv_myaddr, ifp->if_broadcastaddr, - ifp->if_broadcastaddr, + vap->iv_myaddr, + ieee80211_vap_get_broadcast_address(vap), + ieee80211_vap_get_broadcast_address(vap), ss->ss_ssid[i].ssid, ss->ss_ssid[i].len); if ((ss->ss_flags & IEEE80211_SCAN_NOBCAST) == 0) ieee80211_send_probereq(vap->iv_bss, - vap->iv_myaddr, ifp->if_broadcastaddr, - ifp->if_broadcastaddr, + vap->iv_myaddr, + ieee80211_vap_get_broadcast_address(vap), + ieee80211_vap_get_broadcast_address(vap), "", 0); } diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c index 19827e78706a..0bb9271693db 100644 --- a/sys/net80211/ieee80211_wds.c +++ b/sys/net80211/ieee80211_wds.c @@ -487,7 +487,8 @@ wds_input(struct ieee80211_node *ni, struct mbuf *m, } /* NB: the TA is implicitly verified by finding the wds peer node */ if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr) && - !IEEE80211_ADDR_EQ(wh->i_addr1, ifp->if_broadcastaddr)) { + !IEEE80211_ADDR_EQ(wh->i_addr1, + ieee80211_vap_get_broadcast_address(vap))) { /* not interested in */ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr1, NULL, "%s", "not to bss"); From nobody Sun May 25 15:24:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b52kP2tn0z5xg1s; Sun, 25 May 2025 15:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b52kN75jSz3tqD; Sun, 25 May 2025 15:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avZ4awH42imDlCuYy0UZP0l8PnIRmu9jvbDvKFeJq+I=; b=iBq1wD3bRBrEtPVRt5hn7FLt7kzyDs7HMI1g3Qfbg3oNwuiyINPy7bj+m2eqofP1+DZouH xQ763vcQ0+BPQ0JL2m4ZjaxDiPOY5XCNPsU2B5E+BFCsucS763S3k70Zfi5J30VAEVOFdQ 3sQlSzI4wQyKt+5aSc7EbhAkss5q3p1PeeuNaOP4VNQSFYNKNE52+LlOc+/SSqNGmtBOeS PMCpawmBqOkwQFSL1DeJbceMlpr1xzST+cbdrejfEAYspeRNQkPzeiLYy/7vqvASuiikpo 7Pw24XST0AczKsRrx61E8MZz9KjkK2ucb0xXUTfZMoy+Npec2duNFwlXBDeQNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748186669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avZ4awH42imDlCuYy0UZP0l8PnIRmu9jvbDvKFeJq+I=; b=T4HHufZHJRPMwp15bp2YFJkTWc3NkiGIBcd9NDsKN2XePwL/wxtpTd10BYxgBRvq8iner/ uv49mmusQoGmBYkUJKNcChxyXSVbUAtDxyxjtLSI4kMFmzE4mBIJnv0GHh3VwveOFvJjJT iH8hpIvsiJpGvTyB6Z/nRFYpmGjdR4hx2O5WHQXa/+CwT+SKmpzmFDQG4Pjtm2rMRCRB5Y uQp39TyqQqdhQZiS98NlDD3xfRLTbgDl7xSueIUm1PyWnl//zoZ1WSC0f2ycN0gJN/cjV7 jTfhs0Jo2+2V15N5NARwH951ABpptYk1cJ3TIt8fsN5g4ksIIg7fQ+cVFeoj6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748186669; a=rsa-sha256; cv=none; b=umrSg6VsLjg2GBmccho2OYRU6xHUTz/9CaDtuuKDkxgLN6W8/+XajH4yVSbWR5d61LKFmm niPYOm2mgbPxenpPAc9vq7UOCEShV76heCQ7hBg8MByStHEySvvt27E9cPybbJ4EM4+HFf cHAY1ujdawe4j9UDP80nUg/80y3aFN08/mccV3zIKagkLdZM/gQbNmacSf14hQfFs8L+Ow 3A+0QhOdHd87SYOkwZGQkmG7q0hGCLQ6hLaqpgZhgyzHrApPXYUG5WV3nB82iZhOXz8EIj 2s4LnN7HWcgvDwRcXogeXhLmBwguZjxgAEyDsj2rtqy3KFX5BeK7W4+0chulTg== 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 4b52kN6j26zC6D; Sun, 25 May 2025 15:24: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 54PFOSDf031905; Sun, 25 May 2025 15:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PFOSae031902; Sun, 25 May 2025 15:24:28 GMT (envelope-from git) Date: Sun, 25 May 2025 15:24:28 GMT Message-Id: <202505251524.54PFOSae031902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 249f14c87fd5 - main - net80211: remove direct references to ifp->if_xname List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 249f14c87fd5ad232d5058db40db48c009e235c5 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=249f14c87fd5ad232d5058db40db48c009e235c5 commit 249f14c87fd5ad232d5058db40db48c009e235c5 Author: Adrian Chadd AuthorDate: 2025-05-18 04:58:25 +0000 Commit: Adrian Chadd CommitDate: 2025-05-25 15:24:10 +0000 net80211: remove direct references to ifp->if_xname * change ieee80211_get_vap_ifname() to use if_name() * migrate the other references of ifp->if_xname to ieee80211_get_vap_ifname() Differential Revision: https://reviews.freebsd.org/D50407 Reviewed by: bz --- sys/net80211/ieee80211_freebsd.c | 2 +- sys/net80211/ieee80211_scan.c | 4 ++-- sys/net80211/ieee80211_wds.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index d0aa47859a3a..5c7ebd7c727c 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -1141,7 +1141,7 @@ ieee80211_get_vap_ifname(struct ieee80211vap *vap) { if (vap->iv_ifp == NULL) return "(none)"; - return vap->iv_ifp->if_xname; + return (if_name(vap->iv_ifp)); } #ifdef DEBUGNET diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c index 04fee33f48f1..02cad610ee8e 100644 --- a/sys/net80211/ieee80211_scan.c +++ b/sys/net80211/ieee80211_scan.c @@ -245,10 +245,10 @@ ieee80211_scan_update_locked(struct ieee80211vap *vap, "%s: current scanner is <%s:%s>, switch to <%s:%s>\n", __func__, ss->ss_vap != NULL ? - ss->ss_vap->iv_ifp->if_xname : "none", + ieee80211_get_vap_ifname(ss->ss_vap) : "none", ss->ss_vap != NULL ? ieee80211_opmode_name[ss->ss_vap->iv_opmode] : "none", - vap->iv_ifp->if_xname, + ieee80211_get_vap_ifname(vap), ieee80211_opmode_name[vap->iv_opmode]); } #endif diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c index 0bb9271693db..98eb7f78c58d 100644 --- a/sys/net80211/ieee80211_wds.c +++ b/sys/net80211/ieee80211_wds.c @@ -169,7 +169,7 @@ ieee80211_create_wds(struct ieee80211vap *vap, struct ieee80211_channel *chan) IEEE80211_DPRINTF(vap, IEEE80211_MSG_WDS, "%s: station %s in use with %s\n", __func__, ether_sprintf(vap->iv_des_bssid), - ni->ni_wdsvap->iv_ifp->if_xname); + ieee80211_get_vap_ifname(ni->ni_wdsvap)); /* XXX stat? */ } else { /* From nobody Sun May 25 18:30:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b56rr3VRtz5wbsw; Sun, 25 May 2025 18:30: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 4b56rr2vJMz4CtP; Sun, 25 May 2025 18:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748197820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nWsOPoO+BXuexEWlDYDbsbVv76640k9300iSJdD1gJk=; b=tlJmFbiLTzNPIt6PnZxeqo5qNIqo+o/jL6gkzLTCPIDdWaX8sbBqCUG8k81ZzKqMX/TG2J dsAHil42tyN1QMqFDTj1LPYMGEKeNYWoCMS/IYeOxHUts04cw98qkCXPezSLITkD6NW69o n/apZBgNe9L41/jU+XcZrzR9OVj3FPHhE8UD3pD1RAYEgnFOyj6AR4VXs29x7QCRl0DO4H /qkjUkLQZdWZROXdu9XINJ2tIQHMz9rHvhoKam7V/POK9f/i2/5Fk43H2aVsPkGHZX8NeK tQ0dR1yC+nwrWTeu1Ph9Vv4aV2fYGxYU1CBntvxFZ9qkqj2Y9G3ayvMKvIE/8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748197820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nWsOPoO+BXuexEWlDYDbsbVv76640k9300iSJdD1gJk=; b=Dow/KiOtRDCr6Rni2NTDJfI6TEBDWvduDGnqwyZSGu53IiAUCOSBw0CZ7GoPH2vofHiGv0 v6R+843zkAm/kHmq1W2iv314s3PBgRufHsfxVEOn3So+mC4UEsV8b+gbmvviSPT9SWkYcw 8ZUyNNmcxYv1QRIG2hct9KhqoueeHlD7/5R1OeQL1seqaUPF/Hp3O+hSr1/4OkYi0qUR7o ARRS9IUEYLJYKC4M5h+3mK5L5LfCwI7xfoxkgxh5U9xlAAI20PNylRKvYgHy899P5ER1QE q0kSODpMrReXw5S7miZCfED6UWMeQxUizn9f5naWoUo9jQiRXy0CXNP6dnL9fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748197820; a=rsa-sha256; cv=none; b=p4P3eipmMazj/ThjLbiOhFJAwZp6eEgUhgI54PlX20Kt+XYDgYQ1rnhWgKfyxpVQRfHKzt 6DSuou7UpddX7AWArJq/Svrs9GS+DWhv22yvy1SHYmUW2gm1TWVPHBBmyzg8i4oVkNIjUp GpMdOtCs0clIwQgDwZ4mzfu3sdH0ylvFvJVCH0yFqyt83eTKUtzpHvuts5PzEVa8CmW8O4 uwTKYPvnBuA5ZxF80Sh9WkVCqk6+PKtItf0DFDw0iBHbiB3paKI1iuB71u6sj3WZErKIP0 aUTCrrDhafnog429sxeE/rttlbHreIX6hdiroFgF3Ogwv4++XYNOuCst5Osh2g== 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 4b56rr20F2zZ1w; Sun, 25 May 2025 18:30: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 54PIUKnH078653; Sun, 25 May 2025 18:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PIUKtd078650; Sun, 25 May 2025 18:30:20 GMT (envelope-from git) Date: Sun, 25 May 2025 18:30:20 GMT Message-Id: <202505251830.54PIUKtd078650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 8aad1e6148d3 - main - systat/top: Update ZFS sysctl names List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aad1e6148d3389df100bb0391e2d3a909f26ecf Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=8aad1e6148d3389df100bb0391e2d3a909f26ecf commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf Author: Alexander Motin AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin CommitDate: 2025-05-25 18:23:54 +0000 systat/top: Update ZFS sysctl names Some of ARC statistic sysctls changed years ago, but those tools are still using legacy shims, that are going to be removed. MFC after: 3 days --- usr.bin/systat/main.c | 6 +++--- usr.bin/top/machine.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index 33fc187e1ab6..dbb82ebbb1c0 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -301,9 +301,9 @@ display(void) size_t size = sizeof(arc[0]); if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc[0], &size, NULL, 0) == 0 ) { - GETSYSCTL("vfs.zfs.mfu_size", arc[1]); - GETSYSCTL("vfs.zfs.mru_size", arc[2]); - GETSYSCTL("vfs.zfs.anon_size", arc[3]); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc[1]); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc[2]); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc[3]); GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); GETSYSCTL("kstat.zfs.misc.arcstats.bonus_size", arc[6]); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index a76d77a80ce4..07a7119ad0c2 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -537,11 +537,11 @@ get_system_info(struct system_info *si) if (arc_enabled) { GETSYSCTL("kstat.zfs.misc.arcstats.size", arc_stat); arc_stats[0] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mfu_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc_stat); arc_stats[1] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mru_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc_stat); arc_stats[2] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.anon_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc_stat); arc_stats[3] = arc_stat >> 10; GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc_stat); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc_stat2); From nobody Sun May 25 20:32:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b59Z12nxSz5wkjb; Sun, 25 May 2025 20:32: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 4b59Z11sJxz3rFH; Sun, 25 May 2025 20:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748205161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oK1/wKsJAZe5QZTxJFiQSOfpmTOnKCrzf4wg7GngVeg=; b=Nl0aHnASWMRiWzU98AA3cpyuVd67669nqjh94TxmLVSM6H35Kp4wXPB6MHX58AIypPEvm3 EhgqhcHd94aP+1X/tEWf2d3E8zfu+gn3NZsH3APkrLK6MyZof9DkN/rcyIfuQitCAD1Xpj 4NcetZICt3m5jLDX76WQZRpXjp0e8ijLWD7hQ/h3qEf3pV3d4IOzN21ww5GtGttK18FNi/ hTgFbiHeYtmm+pf0hQNMSJ1JjF2j5u5D9QGluSiMIzB25cmm75+ubtYWP6V/MyY9g1YmCS WK+Rb4ANhJP5awChmCXDVlyUTfitg+r4DRQawaRbRlcnddCRuTrXvETQj9aFcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748205161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oK1/wKsJAZe5QZTxJFiQSOfpmTOnKCrzf4wg7GngVeg=; b=kxRzlOJA+YcyUhXhzLW4D6oDsApT5OAMe8zEF+VMaFwV20z0jTxeH/4zMwckqtuNAuQ6wv qF5wlgvEMlS6GtzV62PdO6xtomhpQ2zkHgIPr7YdmW+DshH5rq41kT6JLpfFOEJcTfy/ed fwV2fxSi916spv435BTnYHCrwhZ0frTCVgUJhI5OsJg+QXGxRPnizI26YJck+435/ZP7Tf a6IZFQ2gt77z4L+M7Ea3YYrrBpwCrVOIBBYt6Bmhcm1D8F87lUwKpCbgUyEPQ9NvHvUD2P SKSaF+6ZnYSibb7ZK/YCibOJrpQ8hpbeqc64IwRG5c7HKxktxCTI1lmiNL3P5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748205161; a=rsa-sha256; cv=none; b=DSllQ3UkQ1VBjKbEsPXcbvz/7rdXcWZfwfH465l4grphYC4/jYU3DKVTestSUZ5ncBmWo2 e+T/HjTvkrKlNODQn6QQDQhehyizdQUXG/dQRpm1IvIl1XXOHclLXOalHETJ1GZfBQTDQk kp6xafpJbiOWMWdUNRR3VCu3eIqs4+KEbYj/eBI0b2CC/elMhKSUy/kVH98JdlOcPHWVcC GQAkX2La9C6DkvrDM2zKKmpKaZ7E/jQyDP3DXhneIzJAghmEMnEH9FTD9ZAh9kfICamtXB Vl08qLDq+po8RaZz7gdVkRjRkZLEEM2nGZNCDzSH/MnS319WcgJnVUh0WQKR3A== 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 4b59Z11RF5zdf3; Sun, 25 May 2025 20:32: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 54PKWfl7011718; Sun, 25 May 2025 20:32:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PKWfOC011716; Sun, 25 May 2025 20:32:41 GMT (envelope-from git) Date: Sun, 25 May 2025 20:32:41 GMT Message-Id: <202505252032.54PKWfOC011716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fae33d1d12a5 - main - open.2: add a note about conversion of a file descriptor into O_PATH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fae33d1d12a51ca2bbdc7f5f189f7a4362fb48f7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fae33d1d12a51ca2bbdc7f5f189f7a4362fb48f7 commit fae33d1d12a51ca2bbdc7f5f189f7a4362fb48f7 Author: Konstantin Belousov AuthorDate: 2025-05-25 16:32:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-25 20:32:26 +0000 open.2: add a note about conversion of a file descriptor into O_PATH Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D50511 --- lib/libsys/open.2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libsys/open.2 b/lib/libsys/open.2 index d8540637b690..6200723ed85c 100644 --- a/lib/libsys/open.2 +++ b/lib/libsys/open.2 @@ -464,6 +464,13 @@ flag for .Xr fstatat 2 and related syscalls. .Pp +Conversely, a file descriptor +.Dv fd +referencing a filesystem file can be converted to the +.Dv O_PATH +type of descriptor by using the following call +.Dl opath_fd = openat(fd, \[dq]\[dq], O_EMPTY_PATH | O_PATH); +.Pp If successful, .Fn open returns a non-negative integer, termed a file descriptor. From nobody Sun May 25 21:15:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5BWb4JgGz5wnSL; Sun, 25 May 2025 21:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5BWb1GpDz3HWr; Sun, 25 May 2025 21:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748207739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4bHmGfnkhE2Z+znKQHN0BnFQRgO4uJ6H/TXHWAGmlow=; b=CK7TKFZcxRZ9zAOcaPcblNqxPnZIY+BHCD2pRqfs/pgc+WqE7R14xiH6rmEE8pAmNEpeeK XT4+Ux4f1hvnLBP23DKY8ulO8cbOYsxx78A8YC+XeEQ3qgVozTnUjXF+NWm0Srssu8u+Vx dxYqE7gPU6lzNHVv68fGwMrkxsfWI4T0H4X5JtMPkZ1Qcol8cTo+mxj1YJ0ssGe1Rd9L2O 0wuCdvFjWckHHLGzb9knjotKaHzLXVBfW4c1TmSaQ8U+TLC15o31oReBntReOglElV6z/u Tn2sHMHWWZWmE8lM06Rl7FEZF7CPcYMvAY2SiAL8HMFp0PV+bjzrHcHiZrkiWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748207739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4bHmGfnkhE2Z+znKQHN0BnFQRgO4uJ6H/TXHWAGmlow=; b=ll/fg4tMeOjJWm8popRUHDTlNjpO6NKBqAeyg9kYiWBNOeEyPzXwtqBHF311W0Oil0flMG mWWTzMjOl7kAppksOUPQPIeJ0KKWiIB3Of0OdN6JqOGWFxXxXyEaFZWMxIPwQqJmGJkfFC gn/ezKDE2eVYtqXA8RM/YXRdTVvFrSp3kOOYutOTHeEHbV+MboDwQMD9uF5p8o6SsyrPI/ GyFphw1J4ywUFxbU6DGUKbLfcXSRZ+9hn6iLSF8Z279y8NgFW8/NXVFqM9Mft016uuJeAE Ik668J6PzXFQZuvjoFsjreXR/6TN7KhRcNgr3awxKKXsxca+EuIb00HoDAvN3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748207739; a=rsa-sha256; cv=none; b=MXTYp3fEcaE6YZLtOJkIoni3mV8IQh5jBJcR0eRyAHww2xeZSzA0Z3nBY1uZLAWhWEk429 b7DZ+jFDiYkctTK3qHNeeAOALO8DTPjAl5ipFucH9DXSFVZ0/URJMe4Cb9gTDRYP4wNUwL Tl0eip+gAsLwAICdPlxKJF1x8fXBGLvwHVeqxXzx0UGZK0tWdC6Bw0X6A4XFtfFqcD1DCA 34o9xURwFWw5R6ZunBRZ0ygb7LEBTdUcJk2pLg/I9Aqudr7uEvMJkUowKC+T61qsrFO3Dz 5sUQtfiv3oPKOBHsppxcyNErVDsQEn91mvHr3c1pDYZ/VmNcmxWVZ8LR1dX9Vg== 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 4b5BWb0cVxzfGk; Sun, 25 May 2025 21:15: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 54PLFdId088249; Sun, 25 May 2025 21:15:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PLFdQI088246; Sun, 25 May 2025 21:15:39 GMT (envelope-from git) Date: Sun, 25 May 2025 21:15:39 GMT Message-Id: <202505252115.54PLFdQI088246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 142bcdad1f67 - main - vm_page: drop mpred from grab_valid_iter() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 142bcdad1f67f8f6de04ebc27d8dbba56c39c788 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=142bcdad1f67f8f6de04ebc27d8dbba56c39c788 commit 142bcdad1f67f8f6de04ebc27d8dbba56c39c788 Author: Doug Moore AuthorDate: 2025-05-25 21:13:28 +0000 Commit: Doug Moore CommitDate: 2025-05-25 21:13:28 +0000 vm_page: drop mpred from grab_valid_iter() Variable mpred in vm_page_grab_valid_iter() has become a write-only variable. Drop it. In grab_valid_iter(), drop a pctrie_iter_reset() call already handled in vm_page_alloc_iter(). Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D50424 --- sys/vm/vm_page.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index ea6fbdbc6386..a3ebc92175f8 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4880,7 +4880,7 @@ int vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex, int allocflags, struct pctrie_iter *pages) { - vm_page_t m, mpred; + vm_page_t m; vm_page_t ma[VM_INITIAL_PAGEIN]; int after, i, pflags, rv; @@ -4924,14 +4924,12 @@ retrylookup: *mp = NULL; return (VM_PAGER_FAIL); } else { - mpred = vm_radix_iter_lookup_lt(pages, pindex); m = vm_page_alloc_iter(object, pindex, pflags, pages); if (m == NULL) { if (!vm_pager_can_alloc_page(object, pindex)) { *mp = NULL; return (VM_PAGER_AGAIN); } - pctrie_iter_reset(pages); goto retrylookup; } } @@ -4941,7 +4939,7 @@ retrylookup: after = MIN(after, VM_INITIAL_PAGEIN); after = MIN(after, allocflags >> VM_ALLOC_COUNT_SHIFT); after = MAX(after, 1); - ma[0] = mpred = m; + ma[0] = m; pctrie_iter_reset(pages); for (i = 1; i < after; i++) { m = vm_radix_iter_lookup(pages, pindex + i); @@ -4952,7 +4950,7 @@ retrylookup: break; } else if (vm_page_any_valid(m) || !vm_page_tryxbusy(m)) break; - mpred = ma[i] = m; + ma[i] = m; } after = i; vm_object_pip_add(object, after);