From nobody Mon Sep 2 04:29:36 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wxwl46k1wz5TqkW;
Mon, 02 Sep 2024 04:29:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wxwl44Lbyz4qYn;
Mon, 2 Sep 2024 04:29:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725251376;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=cXT/lMZxdth9550ksvPs3Xtk2T60AQGU9aQaS6gs61g=;
b=D79KNVzx3xfDS1E9xalDuWY25AB9PxJ7RyUx7akckCKphSkVn355rWCw0/tqot6x/GFjH+
THvgalLlS6N35ClvhIw3O58CZP86HHfhhpoPOV9pTn9Y02RWivhMG7xY5QRiujLnrbpbm2
GRtXle/T4ji6dNkZZdUKIx+l89GXa2cuGxNx1XLPjQZ9UFmz994qoeeP12P+wyix7rfnhO
bMkjYnmYYsUZFjnXssyjL7r2U1zi8domDyDkwLYtLEBwI+QOcyTJ42ikG0zgPH782m+3Jf
G9gnIOANZw3l3uN/fd876DkDm1he6DTiNScNWwlA8TcYy3pP+g4CFo1L/IvSYw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725251376; a=rsa-sha256; cv=none;
b=Kr88ep24gyC6caP8sQpGLJW3K7x2ZrZqfYl6Dva69xyHTOVj36IjjHit5GRTx6MlIlzk+T
0B58Alya/nm+XFu9YDgDT8rITRLD7MbPaxPxeQUG0uzDJerL66IPUdc0t/m6f+WHEGcr93
/eLiAkXV1CAVYSPMAUkuWpiqYblwUMIgHF0oA3Og4wnPQYi+wqoYaKraRMhP87DT27JZnN
ZWs40KY1PhdlN25nRLxcGEySMpFcOxCDG4ouIhZVdYCK3G/p3LXRj2berHGunw8hAXMOGo
KvFQ4L13OH/w94rHMMLACKvfxYrTEyjWTkB6lwvIV9fHmsgEZTCs6wbbub9eMg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725251376;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=cXT/lMZxdth9550ksvPs3Xtk2T60AQGU9aQaS6gs61g=;
b=acASS+Yv7twz1mikmraQK5BVc37NxZ919gOU4N0kM36uwP1Gq0WzkVLYHD7N3aFPixmZMw
iQwnay/wMIpAC38QIuNkoheSBmCUIzX+bgINxKbpNL+HniYMZKgnYpatriD3zSQcZ+wu5T
R5XjwpJGwHXv4ESbqLeUeqOKSn5JCEu5JY2sVcoV2MQ05IWq5sTQ3aFCmRGXhFPYxZ+yjg
DOGp5NsaholwrP15eD0uz89vX67qvLtiy8+08NxB9E/O4tmHJqHlWh6lowoqKajiGoB1rA
7z8RVvC8Cz/SLnUuW3be49z9f64cWYbmkHg56bLwaHO9sCDuUy3HDclT+R7DUg==
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 4Wxwl43gdhzxxW;
Mon, 2 Sep 2024 04:29: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 4824TaTs056160;
Mon, 2 Sep 2024 04:29:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4824TaE0056157;
Mon, 2 Sep 2024 04:29:36 GMT
(envelope-from git)
Date: Mon, 2 Sep 2024 04:29:36 GMT
Message-Id: <202409020429.4824TaE0056157@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: e15b5ba77d69 - main - kernel: Fix defining of .init_array
and .fini_array sections
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: e15b5ba77d693609c9a452d1b0a1cdd5eb29350d
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=e15b5ba77d693609c9a452d1b0a1cdd5eb29350d
commit e15b5ba77d693609c9a452d1b0a1cdd5eb29350d
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-02 04:26:47 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-02 04:26:47 +0000
kernel: Fix defining of .init_array and .fini_array sections
These input sections can have decimal numbers as the priority suffix.
Clang emits the '%u' form, while SORT is an alias for SORT_BY_NAME,
hence will result in wrong order of constructors / destructors in
output sections. Fix by using the correct sorting command
SORT_BY_INIT_PRIORITY instead [1].
The functions referenced by section .fini_array is in the normal order,
but been executed in the reverse order. The order is same with
.init_array section.
Currently these sections are not used, there should be no functional
change.
Note: As for the .ctors and .dtors sections, both Clang and GCC emit
the priority suffix in the form of '%05u', so there is no semantic
difference between SORT_BY_NAME and SORT_BY_INIT_PRIORITY for those
sections [2].
This fix is extracted from a bigger patch [3] of hselasky, with
additional fix for .fini_array section.
1. https://sourceware.org/binutils/docs/ld/Input-Section-Wildcards.html
2. https://reviews.llvm.org/D91187
3. https://reviews.freebsd.org/D40467
Reviewed by: imp (previous version)
Obtained from: hselasky
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45194
---
sys/conf/ldscript.amd64 | 4 ++--
sys/conf/ldscript.i386 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64
index b3286612b41a..1c7fde2eada0 100644
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -93,15 +93,15 @@ SECTIONS
.init_array :
{
PROVIDE_HIDDEN (__init_array_start = .);
- KEEP (*(SORT(.init_array.*)))
+ KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*)))
KEEP (*(.init_array))
PROVIDE_HIDDEN (__init_array_end = .);
}
.fini_array :
{
PROVIDE_HIDDEN (__fini_array_start = .);
+ KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*)))
KEEP (*(.fini_array))
- KEEP (*(SORT(.fini_array.*)))
PROVIDE_HIDDEN (__fini_array_end = .);
}
_start_ctors = .;
diff --git a/sys/conf/ldscript.i386 b/sys/conf/ldscript.i386
index 66bdbc4a80cb..467cba24d43f 100644
--- a/sys/conf/ldscript.i386
+++ b/sys/conf/ldscript.i386
@@ -87,15 +87,15 @@ SECTIONS
.init_array :
{
PROVIDE_HIDDEN (__init_array_start = .);
- KEEP (*(SORT(.init_array.*)))
+ KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*)))
KEEP (*(.init_array))
PROVIDE_HIDDEN (__init_array_end = .);
}
.fini_array :
{
PROVIDE_HIDDEN (__fini_array_start = .);
+ KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*)))
KEEP (*(.fini_array))
- KEEP (*(SORT(.fini_array.*)))
PROVIDE_HIDDEN (__fini_array_end = .);
}
_start_ctors = .;
From nobody Mon Sep 2 09:56:27 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wy40C2JsMz5MvHv;
Mon, 02 Sep 2024 09:56: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 4Wy40C1WFRz4KbG;
Mon, 2 Sep 2024 09:56:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725270987;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ohAQ8V2+mfrqAoJsTkQCXskZqjxsA26JW6n4WF4IXWA=;
b=W43CR67Wo9wllD9ljIQ8Lqyc2ghljmWTe1plbjnls360JbIczZFCKEYNvvCZzezn5zEfOL
Qtsk2hEFp5tZYFDYdEb9TB0r7PzdkSEWFdJpA/oD17sA7hXmV3TdmU1Jom+tTt55gJsI71
BZAuU/6qCf1K7U0bLQpCwRCTBGFmfNtnrfQFh6rbHd9NsdoDDjooQytX6YIKPbRBxcLtGd
drqjtRkAvUAsDH1+wdUL0Hk/lGAFugnaEQmQUGnhN+Bn1GrIuwK8QfiWGPhBY8eNwVpEKc
xXCabLWMtS6CerO4qPy52yf5ZjpxDTx+Zc+VUyRu+AI72FWvUk+V146VUlME2Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725270987; a=rsa-sha256; cv=none;
b=v04Zweg4wGB84yOZkNe+uaSAKjK2AAa/S+4TFMOW62+RrvllgHc+THCDA7K9k7D6riq1R+
l91Rho2LJHCahTOrYhs3Ryr2MlM2OCEKprNeCrPiz7D6tMJB4WnbaNovma943xLQ8T1TK/
IxPWHAcyg1qn3RBriGQOlgRFsC7aXrELOzrkuoxt8N/tBPqzqwP6uRB17aos5PqYzigWJ3
u8hw8hKnLjJtEs2KuumVIio5u92FxWkJK9VxYwM1Faoz9yopgd/Um1hUCWDA9CjorRkT9z
QUcsSysVjOUXv2GNmbicmBSynzQZj1FmYtC5UqOUwYtz6ZMXlmfk/RkYXX1rQQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725270987;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ohAQ8V2+mfrqAoJsTkQCXskZqjxsA26JW6n4WF4IXWA=;
b=pczDzEq843XzvQZnzR19BtTcqyu8LL7WRc1DbLvY0pYLRILZcdOQee1ambn4YB2vGW7dCe
O+RyaAx/ApC9Oa9DaNqNwTae9C0HDXumarXfRZ46MZtPuvj5J771/HXC/WrbxNEDZIYvv0
ZrMgoaCPOEaZvLWuzeToyKTNijlw06VPw/xSi9eD+9MymCURaXAf/W8B5MALlW20IIhwU9
IcJfNXQFafhBJ/AWuXFVDk1qEi3muAp6MRp4iv/1G8Ca8maB+32Twju0RFLkvSKxm1fCgl
rsiu3f3Nxb16+iDE0kUFjKI40c8OaKchUC3dOP7wfb6skO8dnsm6bGwziimeyw==
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 4Wy40C14PXz17Fc;
Mon, 2 Sep 2024 09:56: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 4829uR74018132;
Mon, 2 Sep 2024 09:56:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4829uRjl018129;
Mon, 2 Sep 2024 09:56:27 GMT
(envelope-from git)
Date: Mon, 2 Sep 2024 09:56:27 GMT
Message-Id: <202409020956.4829uRjl018129@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Wolfram Schneider <wosch@FreeBSD.org>
Subject: git: 9867b4af50c6 - main - Makefile.inc1: show time for
`make installworld'
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: wosch
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 9867b4af50c627586c68b26ddc5a7344286eefaf
Auto-Submitted: auto-generated
The branch main has been updated by wosch:
URL: https://cgit.FreeBSD.org/src/commit/?id=9867b4af50c627586c68b26ddc5a7344286eefaf
commit 9867b4af50c627586c68b26ddc5a7344286eefaf
Author: Wolfram Schneider <wosch@FreeBSD.org>
AuthorDate: 2024-09-02 09:55:10 +0000
Commit: Wolfram Schneider <wosch@FreeBSD.org>
CommitDate: 2024-09-02 09:55:10 +0000
Makefile.inc1: show time for `make installworld'
For years we display the time in seconds how long it takes to
run `make buildworld' (see PR 224433). Now we will display the
time for "installworld" and "installkernel" as well.
e.g.:
--------------------------------------------------------------
>>> Installing everything completed on Sun Jul  7 16:11:37 UTC 2024
>>> Install world completed in 110 seconds, ncpu: 2, make -j2
--------------------------------------------------------------
This is an improved version of commit e5a0202f96948a95bf1b879727e155a4f1d1da93
PR: 280187
Differential Revision: https://reviews.freebsd.org/D45912
---
Makefile.inc1 | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 5400cb5e734a..a4e2889004b7 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1241,11 +1241,19 @@ WMAKE_TGTS+= build${libcompat}
.endif
WMAKE_TGTS+= everything
-# record buildworld time in seconds
+# record buildworld / install time in seconds
.if make(buildworld)
_BUILDWORLD_START!= date '+%s'
.export _BUILDWORLD_START
.endif
+.if make(reinstall) || make(restage)
+_INSTALLWORLD_START!= date '+%s'
+.export _INSTALLWORLD_START
+.endif
+.if make(*installkernel*)
+_INSTALLKERNEL_START!= date '+%s'
+.export _INSTALLKERNEL_START
+.endif
buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue .PHONY
.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
@@ -1313,11 +1321,11 @@ kernel-toolchain: ${KERNEL_TOOLCHAIN_TGTS} .PHONY
installcheck: _installcheck_world _installcheck_kernel .PHONY
_installcheck_world: .PHONY
@echo "--------------------------------------------------------------"
- @echo ">>> Install check world"
+ @echo ">>> Install check world started on `LC_ALL=C date`"
@echo "--------------------------------------------------------------"
_installcheck_kernel: .PHONY
@echo "--------------------------------------------------------------"
- @echo ">>> Install check kernel"
+ @echo ">>> Install check kernel started on `LC_ALL=C date`"
@echo "--------------------------------------------------------------"
#
@@ -1641,6 +1649,8 @@ restage reinstall: .MAKE .PHONY
.endfor
@echo "--------------------------------------------------------------"
@echo ">>> Installing everything completed on `LC_ALL=C date`"
+ @seconds=$$(($$(date '+%s') - ${_INSTALLWORLD_START})); \
+ echo ">>> Install world completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
@echo "--------------------------------------------------------------"
redistribute: .MAKE .PHONY
@@ -1873,6 +1883,9 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)"
@echo "--------------------------------------------------------------"
+ @seconds=$$(($$(date '+%s') - ${_INSTALLKERNEL_START})); \
+ echo ">>> Install kernel(s) ${INSTALLKERNEL} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
+ @echo "--------------------------------------------------------------"
.endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
.for _kernel in ${BUILDKERNELS:[2..-1]}
@@ -1887,6 +1900,9 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
@echo ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=C date)"
@echo "--------------------------------------------------------------"
.endfor
+ @seconds=$$(($$(date '+%s') - ${_INSTALLKERNEL_START})); \
+ echo ">>> Install kernel(s) ${BUILDKERNELS} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
+ @echo "--------------------------------------------------------------"
.endif
distributekernel distributekernel.debug: .PHONY
From nobody Mon Sep 2 10:15:56 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wy4Qh2nvZz5PQKb;
Mon, 02 Sep 2024 10:15: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 4Wy4Qh1yKDz4MGZ;
Mon, 2 Sep 2024 10:15:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725272156;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=VzptZCq+CmywKLYWVUAOnENmjhkGLR3YzKylF2eAsvc=;
b=H1r6GDEaj4KGhypL+r92fPmZohjGEtJXyhvvyccJ4l2kVISKXLfL4BEzda5rjetVopraAf
pLqIryEEFKxXl/ZHNulcmnuy8OCfCZojErbCRG00hyTbAIoYfmlfnKqXE0zdlojm7+456l
0unt06xa8bvzEdS5jMy1OAabdzXv7EfgVWGTKFM6uCMQyN4jIC6H0MQvqjgoqsMqPTQUc8
MsyEoNNrLCbj0DVoUqE3m8OXKUYHM3sY4At0ziraDCHKrKaRAkQOBdUF8N/oZ7vbuLcxXr
7eTiGAM8jSOzPa2KB2Z7Wg6f1A5RPlG6XaQZObPNEoQgSMe8lqcTBUVfUiJKxQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725272156; a=rsa-sha256; cv=none;
b=fKTsgSuCfVz8JUuzdAUnhfC102Bx0YxsDSL9l4rS9HIm26GljlSjaLYv/j/Npff//KBtey
SoLMe3W6IAgAG8NcccDIlQCHtGvHuN3WOEcNKvt5y6M/qrvMlkc+uQtsHTpgPzAf3n17nK
6DwBvHvgfsEMyAe/9Rmx1PWLnKWn2rdPsCbn6uaAvQWm49ocMSD2WQ0Qbfb3x/pMOCkKr5
BGqM38CpWaOuudVlGmfTW9A97v3PRDXpjYd/EYaZcnoVP++k1SFZ3oazjo2NZyk+KVv5Uo
pIcx1kDygpU4Jug+GFfc4EREHYeSiB93VLkec1USKxlJp6r5CeozGzds3UDKhg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725272156;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=VzptZCq+CmywKLYWVUAOnENmjhkGLR3YzKylF2eAsvc=;
b=TG8FHXbJpuA8bU+XQXT8015c1zYF4r5ToJr5WONaEXQznZLECHEbgf3ePHGntqAEq03mfr
3NR8tLLh5KvZTLo5ursdroFFBarfJ94BKxMp+dwC/9+3P78Gc/lcINeZWgwILvYbi9oLjE
kP8/hm8vC7159SAi1oIdD3OU7c3oVj48S2lUeImdp3c3MhTF9ImZBZwdzCeaezx9cfvVDF
FzmGNm6Qv1i5ZonIHsCVm2cOWFJoBEs3iYIGrSQj3QEQj3JvfN/0STQygSfvb2O7WfcO4x
DXGBPGfew0gwlcVD6+XfGvaW5UnhXCPPawC6by4nQR1ll4XvZ10gwJ/vu1Bgnw==
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 4Wy4Qh1Xnvz175m;
Mon, 2 Sep 2024 10:15: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 482AFurR052361;
Mon, 2 Sep 2024 10:15:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 482AFuQU052358;
Mon, 2 Sep 2024 10:15:56 GMT
(envelope-from git)
Date: Mon, 2 Sep 2024 10:15:56 GMT
Message-Id: <202409021015.482AFuQU052358@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 209905ec384e - main - ndp: Fix libxo formatting for
the header of neighbor cache
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 209905ec384eedd58f1b9b7ab774029d22787dfb
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=209905ec384eedd58f1b9b7ab774029d22787dfb
commit 209905ec384eedd58f1b9b7ab774029d22787dfb
Author: Helge Oldach <freebsd@oldach.net>
AuthorDate: 2024-09-02 10:12:43 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-02 10:15:15 +0000
ndp: Fix libxo formatting for the header of neighbor cache
PR: 272749
Reviewed by: zlei
Fixes: e1c7783e220b ndp(8): add structured output formatting via libxo
Fixes: 91fbe0819bb9 ndp: convert ndp(8) to netlink
MFC after: 3 days
---
usr.sbin/ndp/ndp.c | 2 +-
usr.sbin/ndp/ndp_netlink.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 637aac2823ed..7c7bc60451c8 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -633,7 +633,7 @@ dump_rtsock(struct sockaddr_in6 *addr, int cflag)
if (!opts.tflag && !cflag) {
char xobuf[200];
snprintf(xobuf, sizeof(xobuf),
- "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:%%1s} {T:%%5s}\n",
+ "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:/%%1s} {T:/%%5s}\n",
W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF);
xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags");
}
diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c
index e18d64175619..bafa9f2a143d 100644
--- a/usr.sbin/ndp/ndp_netlink.c
+++ b/usr.sbin/ndp/ndp_netlink.c
@@ -341,7 +341,7 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag)
if (!opts.tflag && !cflag) {
char xobuf[200];
snprintf(xobuf, sizeof(xobuf),
- "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:%%1s} {T:%%5s}\n",
+ "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:/%%1s} {T:/%%5s}\n",
W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF);
xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags");
}
From nobody Mon Sep 2 20:45:23 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyLNz6C5Mz5V1dl;
Mon, 02 Sep 2024 20:45:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyLNz5JJQz4LfD;
Mon, 2 Sep 2024 20:45:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725309923;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=VIYIYlXSDvzJlJlzH6EuCgMeiNTQrcykm2DCjPoTkSc=;
b=M/yaUjjOROeLDcHm40ULvTwrmyd+tcLfpwolrLKooMseOqi4+Emo8NhjscRQ+FLYTWXtiz
HfTgp5/iCDMDfsFFdbFcHM4yTyZSWiHAlmufmpfUSX5TXV5BQCZ5xF8E1dNdCpFIuYCsMo
23dIr0gA9H5nnKR0dw4pDUmOIYVB+V/vXf5OIG8CwtIFOXKiAGKpfnM4QwjJhZojR1P5H3
pNDjhp47ccEUgWaqEw+nRJYUSl7LHWDRa2WhDdQX+3Qm8sl/fVWp2L5T5l45L2PscFPnPm
wS6wkb4kB5aDUJSBKvpPo2TkXM7nFnQQTnHcnotn6iEFM9SO/+QzuhqkYNipJg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725309923; a=rsa-sha256; cv=none;
b=iYkzqdptTigc7ij106ygU8zQUhjJEUwKqlDtFIDpqdkAoK9O/uDYolFuv92C1BJbLqLvjG
MsPEwn3CG7nwtP8ukrLzHs2UcwdGT/zJ+N9iHScGSMRf6dy9AmXt284kE8nE2gXNvYsf7t
msiLtmawUYJMVXY81fj0TY6kCgeoVV2VHauA1yj5rWal/nrD+yi0He77btIx0G8opilMvF
gEguIavdVhxw1YP+Yq1NGUQ4e8lins9GVBoSoYeni/t1V0z6uXLRcBENct+drncyAKYnnQ
tGfuwF4lLLdVvcB645WrEZDO0AXThaMFiXR39tcwRoqVjh6T4Flb83yKSYEd2A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725309923;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=VIYIYlXSDvzJlJlzH6EuCgMeiNTQrcykm2DCjPoTkSc=;
b=iJTG5tzO4dDIZ7hRUKzNQ+02dtGbikCTj0Udung9TN/tc8daKK4jXkSj2vHPTq+ovLUAK6
gKTCiOhoN6nXrZEOcH7DQ9x8CHm0AMGgm1cN6wks4tqIf7N9UZRhqO9qNSu+wzKCFjph6N
T38/yGlJsgVSIbQ+2EV022Ync0MUGF0o+bOFMRiJv6RSWF8p1SNa40yXSgxYd176SLAf3F
jkS9ISm6dblhRVvYBeGo/hHS4BKHQvZWY+28DnuG4Y9fIC3PXgpd3X0kfJIU3PudtSMCcv
7f5wpLENdFZdaqiex948s9/PJuuhlJ9IyHSFI11x5O+HA/sFYoyecutNsSgIyg==
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 4WyLNz4lhSz1RBB;
Mon, 2 Sep 2024 20:45:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 482KjNYF019420;
Mon, 2 Sep 2024 20:45:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 482KjNjk019417;
Mon, 2 Sep 2024 20:45:23 GMT
(envelope-from git)
Date: Mon, 2 Sep 2024 20:45:23 GMT
Message-Id: <202409022045.482KjNjk019417@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 1a19741860d7 - main - UPDATING: remove 20240813 DMAR
entry
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 1a19741860d777bea1b7fe000f87136538020c3b
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=1a19741860d777bea1b7fe000f87136538020c3b
commit 1a19741860d777bea1b7fe000f87136538020c3b
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-08-29 12:43:16 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-02 20:44:55 +0000
UPDATING: remove 20240813 DMAR entry
The associated commit has been reverted and DMAR is not enabled by
default any longer.
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46474
---
UPDATING | 5 -----
1 file changed, 5 deletions(-)
diff --git a/UPDATING b/UPDATING
index bbcbdad9bfd7..cffafdb5d247 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,11 +27,6 @@ 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".)
-20240813:
- DMAR is now enabled by default on Intel. If your system crashes in the
- dmar code on boot, please set 'hw.dmar.enable=0' in /boot/loader.conf
- and file a bug.
-
20240729:
The build now defaults to WITHOUT_CLEAN - i.e., no automatic clean
is performed at the beginning of buildworld or buildkernel. The
From nobody Mon Sep 2 22:22:04 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyNXY0gZhz5V935;
Mon, 02 Sep 2024 22:22: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 4WyNXY0FZ6z4TKY;
Mon, 2 Sep 2024 22:22:05 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725315725;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=h2Ze1E629sPEQKjQxUjZ6BL/FZMqX0rrvhpXmpdyPX4=;
b=DBkx/Dc5FrbiSkGoubSRstsLaLoOSJLUtRLyXloWcfzc/ByLiE8hlvoePBPCThbLL2Xbns
RMQj0e9yB6JSwi5p0A37XDV9r3/aJGTF7rf/0tvnb58pMQ6rKWkEqoSOsXJP5+W91TfV1r
iGzJtrxpsPflr2Rs6f21MEscrpAdspYX0mhZ9XTWNHx1xKaLe90d8AOmnr1qVK0K737oVc
wF4ov+gBNEZeFKbdIo3kN1eE4ZIeIfmt4PdqcQQ9UCqFLFMwGwuVx7RiHoIqciPgjkIsJ8
eonP1mbTbeZHQd7PUXm32lc0WcTA6Id9DhwBdyg9CnyBlw+dPmqr03ipOZWmtg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725315725; a=rsa-sha256; cv=none;
b=nQIzrjujnFBfiR+/R+lfdiGhwvs0AQmUDdoIfLxBVzZA/gAJbtvPH6oArfG3ikRQv+QiQe
aSzVG5Z77sDvnuv2vPD8udl6Ub0uniLHYa/426EhyjgMgbD+jKAYb8u5K3Q8QgZIPq0B+3
BQDMxpF3T5bZGgAeMZBbuLMlaFCB8wlUIe7HnlT6hCIsmhTogaG+b3+e/XE1AgfIa0cy+q
OLSWA9MUlJlLbTr8KkF/8EAVfPlZi6J57T/loz/I5ZqLus5aJ+OnerATsH6nRpcjhMKN6Y
YEiH7+FUlTTARv3PRvC333mPHb6aNvAm47WBYN1uR8E0UBfqpgeBgoy0ESlPxA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725315725;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=h2Ze1E629sPEQKjQxUjZ6BL/FZMqX0rrvhpXmpdyPX4=;
b=wY9T/QzTfZXs1zLeYmt6xH3x+2tsX1iZIwuIxlyYOQRbtmod1IBClaprQQFGNsfUTDMs6w
JFx4HQxL6ED2TTyi5xFmeb4SqgKWK/qyHWN8a/IwBGOuIJ4ziA/RwPOFPwpUr0L9wmjPzs
sH9R/RcEtUbK9hz9kAFnEU77us5gHo1999wNlLjyP/LrfMGLq1J8kNXgmJErUuvqKI24M4
r7Lrsfrpd287plMv+DJtYM3UhdPjUgevyuLK2WyKZ8v/wWLZHJu06ziRYDHDrpP5yTZnqN
CVYzZaVofOIZ3aT3ONvQ6m1UJFpHNUnDclG7q+Gi842Elo2/YkG8RGtyGUh6zA==
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 4WyNXX6yn8zFT4;
Mon, 2 Sep 2024 22:22:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 482MM4Ta082708;
Mon, 2 Sep 2024 22:22:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 482MM43B082705;
Mon, 2 Sep 2024 22:22:04 GMT
(envelope-from git)
Date: Mon, 2 Sep 2024 22:22:04 GMT
Message-Id: <202409022222.482MM43B082705@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: b162fc3f3094 - main - gpart: Add u-boot-env alias for
U-Boot's environment GPT partition UUID
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrtc27
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: b162fc3f3094c50c8ed47ab50981c5448cf0052c
Auto-Submitted: auto-generated
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=b162fc3f3094c50c8ed47ab50981c5448cf0052c
commit b162fc3f3094c50c8ed47ab50981c5448cf0052c
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-09-02 22:21:18 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-09-02 22:21:18 +0000
gpart: Add u-boot-env alias for U-Boot's environment GPT partition UUID
This is a platform-independent UUID, and this is the name U-Boot uses.
MFC after: 1 week
---
lib/geom/part/gpart.8 | 7 ++++++-
sys/geom/part/g_part.c | 1 +
sys/geom/part/g_part.h | 1 +
sys/geom/part/g_part_gpt.c | 2 ++
sys/sys/disk/gpt.h | 3 +++
5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8
index fa0b247c6174..121e6d6a5119 100644
--- a/lib/geom/part/gpart.8
+++ b/lib/geom/part/gpart.8
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd July 26, 2023
+.Dd September 2, 2024
.Dt GPART 8
.Os
.Sh NAME
@@ -1008,6 +1008,11 @@ A illumos/Solaris partition dedicated to reserved space.
The scheme-specific type is
.Qq Li "!6a945a3b-1dd2-11b2-99a6-080020736631"
for GPT.
+.It Cm u-boot-env
+A raw partition dedicated to U-Boot for storing its environment.
+The scheme-specific type is
+.Qq Li "!3de21764-95bd-54bd-a5c3-4abe786f38a8"
+for GPT.
.It Cm vmware-vmfs
A partition that contains a VMware File System (VMFS).
The scheme-specific types are
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c
index f0807c83dacf..d72efa09c46d 100644
--- a/sys/geom/part/g_part.c
+++ b/sys/geom/part/g_part.c
@@ -130,6 +130,7 @@ struct g_part_alias_list {
{ "solaris-home", G_PART_ALIAS_SOLARIS_HOME },
{ "solaris-altsec", G_PART_ALIAS_SOLARIS_ALTSEC },
{ "solaris-reserved", G_PART_ALIAS_SOLARIS_RESERVED },
+ { "u-boot-env", G_PART_ALIAS_U_BOOT_ENV },
{ "vmware-reserved", G_PART_ALIAS_VMRESERVED },
{ "vmware-vmfs", G_PART_ALIAS_VMFS },
{ "vmware-vmkdiag", G_PART_ALIAS_VMKDIAG },
diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h
index ffeeca9022fe..13bbb1e4126a 100644
--- a/sys/geom/part/g_part.h
+++ b/sys/geom/part/g_part.h
@@ -103,6 +103,7 @@ enum g_part_alias {
G_PART_ALIAS_SOLARIS_HOME, /* A Solaris /home partition entry. */
G_PART_ALIAS_SOLARIS_ALTSEC, /* A Solaris alternate sector partition entry. */
G_PART_ALIAS_SOLARIS_RESERVED, /* A Solaris reserved partition entry. */
+ G_PART_ALIAS_U_BOOT_ENV, /* A U-Boot environment partition entry. */
G_PART_ALIAS_VMFS, /* A VMware VMFS partition entry */
G_PART_ALIAS_VMKDIAG, /* A VMware vmkDiagnostic partition entry */
G_PART_ALIAS_VMRESERVED, /* A VMware reserved partition entry */
diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c
index b269faee276c..a856a34f99d9 100644
--- a/sys/geom/part/g_part_gpt.c
+++ b/sys/geom/part/g_part_gpt.c
@@ -223,6 +223,7 @@ static struct uuid gpt_uuid_solaris_var = GPT_ENT_TYPE_SOLARIS_VAR;
static struct uuid gpt_uuid_solaris_home = GPT_ENT_TYPE_SOLARIS_HOME;
static struct uuid gpt_uuid_solaris_altsec = GPT_ENT_TYPE_SOLARIS_ALTSEC;
static struct uuid gpt_uuid_solaris_reserved = GPT_ENT_TYPE_SOLARIS_RESERVED;
+static struct uuid gpt_uuid_u_boot_env = GPT_ENT_TYPE_U_BOOT_ENV;
static struct uuid gpt_uuid_unused = GPT_ENT_TYPE_UNUSED;
static struct uuid gpt_uuid_vmfs = GPT_ENT_TYPE_VMFS;
static struct uuid gpt_uuid_vmkdiag = GPT_ENT_TYPE_VMKDIAG;
@@ -295,6 +296,7 @@ static struct g_part_uuid_alias {
{ &gpt_uuid_solaris_home, G_PART_ALIAS_SOLARIS_HOME, 0 },
{ &gpt_uuid_solaris_altsec, G_PART_ALIAS_SOLARIS_ALTSEC, 0 },
{ &gpt_uuid_solaris_reserved, G_PART_ALIAS_SOLARIS_RESERVED, 0 },
+ { &gpt_uuid_u_boot_env, G_PART_ALIAS_U_BOOT_ENV, 0 },
{ &gpt_uuid_vmfs, G_PART_ALIAS_VMFS, 0 },
{ &gpt_uuid_vmkdiag, G_PART_ALIAS_VMKDIAG, 0 },
{ &gpt_uuid_vmreserved, G_PART_ALIAS_VMRESERVED, 0 },
diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h
index 596a5cba1681..426ae835c0c1 100644
--- a/sys/sys/disk/gpt.h
+++ b/sys/sys/disk/gpt.h
@@ -259,6 +259,9 @@ CTASSERT(sizeof(struct gpt_ent) == 128);
#define GPT_ENT_TYPE_HIFIVE_BBL \
{0x2e54b353,0x1271,0x4842,0x80,0x6f,{0xe4,0x36,0xd6,0xaf,0x69,0x85}}
+#define GPT_ENT_TYPE_U_BOOT_ENV \
+ {0x3de21764,0x95bd,0x54bd,0xa5,0xc3,{0x4a,0xbe,0x78,0x6f,0x38,0xa8}}
+
/*
* Boot partition used by GRUB 2.
*/
From nobody Tue Sep 3 01:22:48 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WySY46Wvdz5VPF2;
Tue, 03 Sep 2024 01:22: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 4WySY44VTkz4t3V;
Tue, 3 Sep 2024 01:22:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725326568;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XgGbLL/nSsjeMBU766Hz65/wJj3ZoKQJkYkdlmtEcpk=;
b=ccSCkSfvK29jCIht8ctdY+mVXfshm3sGqpERq/lUvT3yzI1/4UcbJZg14yYpZHufh1Q6Z+
a4RWiIODFre/wiIvtL5icZBLsG4yoscBd2RpXMSGWsgAuKOqbQ93qV34J+jNvlvX4KSAdl
Y5cM4s1Qnn9jMAXCOCKqX5XbcnxgfZGKKjSXcHmtqoED0KhY0KSysDLVYUgRst5uPUZfQO
45LcHu9uqKa/T0QgX24Vog+IoT6WeuG8aL+yS2jpTjg/EPsqlhfyoyzPNjm1vMIICnI05n
QTamE03oB2EqkGU/FwPUu3IhDfo7c72heV3gddE2hI6mqi0GtWe+/kSCG3lx3Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725326568; a=rsa-sha256; cv=none;
b=KcDjAzjtNo7B3T5Q8K2ZYOhgkDwV9PtY26DCgBIQISygUyxeYT2lUxR0d1OlwDjCAfji8N
3T9NtV1X4GyISgjK5KeqIElX6QPa2edm7XDbuFp/8jIl3ICTfmbxZROzLoq20X/BSOUxAz
bf7VBNZYXIGPf+a3JKC+4D414lCoNFYatJAQLG4eup03SJR9M/9c1jiJ3rrqNDxwyH7uZN
ltDRU14fNZ9pMvSsR3K94ynpBoJm89jB9M+wpXjrsbsTw17wkM5HFXmUFBQrB6n/f/EH5K
p81P/PVBP82ZBXkuSbiZg8e24fMxhtUfaaC11FWF3zbRP7g11XynbjOxwgMFZA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725326568;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XgGbLL/nSsjeMBU766Hz65/wJj3ZoKQJkYkdlmtEcpk=;
b=H4Y2jx5j8iJPaYLjn2RJH1ZwbTmFtHDYDbM2tN36tnG6qT9Rq0yZcumuUAqqcQdaMTNktw
k0/npf1alJLvOwK/k2ml+eSZaQz40kdOQ/vqKxiKt8QhA/71liPYT5ZDuWJ0i1AcUMn7IN
yfWF1AwJcLI3jfWfTjyThqcEf4rfWX8H911Ru1W9YoYGp01U+/6tBibVs/bLlJdaWojOir
SU0W9aAofCLPQTbg6soI+VQ3J+dFtBHk2gcifakFB9vxy4j2YlNHxlg8Z/m3uBYS1pD35u
XaoDer8dsTXWmKzjkKHZiqoOLG69o2CSz1AvhSnbXq5e1qIFwguXAmhpchGXIw==
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 4WySY43j8hzL1L;
Tue, 3 Sep 2024 01:22: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 4831MmFK091683;
Tue, 3 Sep 2024 01:22:48 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4831MmOO091680;
Tue, 3 Sep 2024 01:22:48 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 01:22:48 GMT
Message-Id: <202409030122.4831MmOO091680@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: c7dd97ec9968 - main - vmstat: Add root element to
libxo output
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: c7dd97ec99687996de49ec0b1a23bf007e5199b9
Auto-Submitted: auto-generated
The branch main has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=c7dd97ec99687996de49ec0b1a23bf007e5199b9
commit c7dd97ec99687996de49ec0b1a23bf007e5199b9
Author: Bram Ton <bram@cbbg.nl>
AuthorDate: 2024-07-17 07:23:30 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-09-03 01:22:14 +0000
vmstat: Add root element to libxo output
Current libxo output does not have a root element. Valid XML requires a single
root element. This commit adds this root element.
The libxo output version bumped accordingly.
PR: 254635
MFC after: 1 week
Pull Request: https://github.com/freebsd/freebsd-src/pull/1330
---
usr.bin/vmstat/vmstat.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 21068d632a8c..e7790ad6e2f6 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -66,7 +66,7 @@
#include <libutil.h>
#include <libxo/xo.h>
-#define VMSTAT_XO_VERSION "1"
+#define VMSTAT_XO_VERSION "2"
static char da[] = "da";
@@ -282,6 +282,7 @@ main(int argc, char *argv[])
argv += optind;
xo_set_version(VMSTAT_XO_VERSION);
+ xo_open_container("vmstat");
if (!hflag)
xo_set_options(NULL, "no-humanize");
if (todo == 0)
@@ -383,6 +384,7 @@ nlist_ok:
dointr(interval, reps);
if (todo & VMSTAT)
dovmstat(interval, reps);
+ xo_close_container("vmstat");
xo_finish();
exit(0);
}
From nobody Tue Sep 3 05:48:22 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyZRW0Tsjz5W07G;
Tue, 03 Sep 2024 05:48:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyZRW013qz4LZN;
Tue, 3 Sep 2024 05:48:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725342503;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=RM30ponjqAxqwmj9jj30h35EnI5FMSAc4ycJB6DKZx4=;
b=DEpBiaDu2NBWgnOZDrmqUKteQ8uTT415g4G9OkSbL5bVnBHl7LoN83MPOUpWgrCM0nTVTF
L8ov+eSStJ6OfPHyG3JcFU/0QMlFLfvtuO5iFPJIOqPk72qr3p4487BIDJ+B0YpCEXCjOW
HzG+tPvycfliZX5a9DeRtZ6eYVCY0KJjCQzTuDmgRKlnFS1KZFAUPJNpojWMYtqX9i9N8H
sHrxHmec0wAoPf7KTBloFPVxX011DQnzp0T4kOFFMh2FjUaNKS88QiPK/HGMKniVryJwSu
M1OaTABYQYahbcLr8jX6NbeVSI+72UdH5ShiJXooEXRYlgl4jwV7rJO7Fdi67A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725342503; a=rsa-sha256; cv=none;
b=eAOK8bVN3IeZgnu5V1W251H3Kz8N1VKX7BllqgzWPwNhBHMYZOdhZ7v+Q+l5ljWyc2gxv8
NU2qOY0uuA0IOgo/YmMn+lm76C5JSROWGTE9MMSj9DyE8dfVD4HZ18AnW5AD1sIYdYCSA+
zknRkJclvPF9C0AlHCTyqcNIQFbH0PHm+OlC6MjRb9fIhBXRfg91FpFaicETim0cVTA8JX
n6v8KlCZmYnmm9KE2UQ+lvE4i14PgIrN9sGQv79xpnzRbbybVkc8cej4VHMILuAnfGYsGa
8V42TyPGNmUaJsY9+2bKwcZy40hc8Xpwh0sNggugBGAUfl9XoGYCYHCMLmlyow==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725342503;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=RM30ponjqAxqwmj9jj30h35EnI5FMSAc4ycJB6DKZx4=;
b=bOxJ6x0fo75fvnRu+FxdHoNSdUr9N2bm+46vsXL/BNBgJUwvBgyoUNH/qeLspDwjptvhDi
AFqbFI4hwBEWywxhNipSZdUgYiw0zVss1c6xXNL+Asmcz/glGsEZ2dPy6GDcEt1233EGdM
tN8HQg6FMLmNzczBo3A+r767GVwjAoJYBF1DfiMPhtBSyBx1ZuG5UccQGO6wYkFRTq+nza
X28G0TyrRcpXB+YLH9AKGuk37hMUar9rZc45yLbSJySRvz2VholuMeku31faKvTMfNuRkU
L83bMNX5/QtyKsbqPews4JeMBtawCov69vntzv+yYqZW+yerBUauXL58ud7UHw==
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 4WyZRV6c60zS80;
Tue, 3 Sep 2024 05:48:22 +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 4835mMWx033076;
Tue, 3 Sep 2024 05:48:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4835mMPs033073;
Tue, 3 Sep 2024 05:48:22 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 05:48:22 GMT
Message-Id: <202409030548.4835mMPs033073@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: bac98f86c984 - main - mfiutil: Handle potential
ioctl(2) failures in mfi_flash.c
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: bac98f86c98421f6153c749b6c77995ef778e2fb
Auto-Submitted: auto-generated
The branch main has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=bac98f86c98421f6153c749b6c77995ef778e2fb
commit bac98f86c98421f6153c749b6c77995ef778e2fb
Author: WHR <whr@rivoreo.one>
AuthorDate: 2024-09-03 05:12:20 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-09-03 05:46:51 +0000
mfiutil: Handle potential ioctl(2) failures in mfi_flash.c
The return value of function 'mfi_dcmd_command' should always be checked for
the potential ioctl(2) failure.
PR: 281158
MFC after: 1 week
Pull Request: https://github.com/freebsd/freebsd-src/pull/1403
---
usr.sbin/mfiutil/mfi_flash.c | 39 ++++++++++++++++++++++++++++-----------
1 file changed, 28 insertions(+), 11 deletions(-)
diff --git a/usr.sbin/mfiutil/mfi_flash.c b/usr.sbin/mfiutil/mfi_flash.c
index 2fbfc978edac..4d1930af4941 100644
--- a/usr.sbin/mfiutil/mfi_flash.c
+++ b/usr.sbin/mfiutil/mfi_flash.c
@@ -129,9 +129,15 @@ flash_adapter(int ac, char **av)
/* First, ask the firmware to allocate space for the flash file. */
mbox_store_word(mbox, sb.st_size);
- mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_OPEN, NULL, 0, mbox, 4, &status);
+ if (mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_OPEN, NULL, 0, mbox, 4,
+ &status) < 0) {
+ error = errno;
+ warn("Failed to allocate flash memory");
+ goto error;
+ }
if (status != MFI_STAT_OK) {
- warnx("Failed to alloc flash memory: %s", mfi_status(status));
+ warnx("Failed to allocate flash memory: %s",
+ mfi_status(status));
error = EIO;
goto error;
}
@@ -148,19 +154,26 @@ flash_adapter(int ac, char **av)
nread = read(flash, buf, FLASH_BUF_SIZE);
if (nread <= 0 || nread % 1024 != 0) {
warnx("Bad read from flash file");
- mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_CLOSE, NULL, 0,
- NULL, 0, NULL);
+ if (mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_CLOSE,
+ NULL, 0, NULL, 0, NULL) < 0) {
+ warn("Failed to discard flash memory");
+ }
error = ENXIO;
goto error;
}
mbox_store_word(mbox, offset);
- mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_DOWNLOAD, buf, nread,
- mbox, 4, &status);
+ if (mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_DOWNLOAD, buf, nread,
+ mbox, 4, &status) < 0) {
+ error = errno;
+ warn("Failed to download firmware");
+ goto error;
+ }
if (status != MFI_STAT_OK) {
- warnx("Flash download failed: %s", mfi_status(status));
- mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_CLOSE, NULL, 0,
- NULL, 0, NULL);
+ warnx("Failed to download firmware: %s",
+ mfi_status(status));
+ mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_CLOSE, NULL,
+ 0, NULL, 0, NULL);
error = ENXIO;
goto error;
}
@@ -171,8 +184,12 @@ flash_adapter(int ac, char **av)
/* Kick off the flash. */
printf("WARNING: Firmware flash in progress, do not reboot machine... ");
fflush(stdout);
- mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_FLASH, &dummy, sizeof(dummy),
- NULL, 0, &status);
+ if (mfi_dcmd_command(fd, MFI_DCMD_FLASH_FW_FLASH, &dummy, sizeof(dummy),
+ NULL, 0, &status) < 0) {
+ error = errno;
+ printf("failed:\n\t%s\n", strerror(error));
+ goto error;
+ }
if (status != MFI_STAT_OK) {
printf("failed:\n\t%s\n", mfi_status(status));
error = ENXIO;
From nobody Tue Sep 3 10:26:43 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcg4NQxz5MkL9;
Tue, 03 Sep 2024 10:26: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 4Wyhcg3t3Dz4rlr;
Tue, 3 Sep 2024 10:26:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359203;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2F5EywPFcMd4t3CyuZfHUbw2TAvQwyflDGlDk0AAn7I=;
b=UOcDPdbZVyZd1DbJunTJZoI6d1WMCmxbQhqZ14HVDqjVFVo+cmbDxsH8eGEoz7bgcGVEOQ
F+jVMmd7zf8L+KiTt7FiB4202rYjjVdDXkx2OqsTvlKKsrTDppUBimEYhnhvSt0aGO4C6i
h3W4Lbgthqrlm2ZvxzN/JODGSqGvr2gCrXfZ8v+/m5ZE8zCKURvA+dMrqPOfzErPzivCX9
7EVyvaeGFxb//kX3TymipWju3MYK+q+p5dVldB5XisAkgO8uwkvXxcg6WHXr70aVV8RTmp
GvD6HCRxc5IcZ01b7H6Xh507wR7Hy6jmsrYl9K/blMRCB+Amsm1sCHJAwICClg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359203; a=rsa-sha256; cv=none;
b=ZvhrtBy67T/Kt07+c87tqzxm8ZHqANkHY3SEKEnr5s+9Ho0byQLLDllAxgeBWTzIdfc2SP
6PVyPuTkX8J2iWJZdx9+oKDhfNL55F8afbN90B61vVxyKFhM/gqOSAf33G6T6mUEcDSUwb
bFPCu2v7H2321UP+OqclD81CzDdxUQRgPKC86hcH6JELpG3oomjw3sF68BpwlqP7a/NmyS
oeyVjuarNYoZsGE8g0ARPmV2KIGmTCzwvvYmXVdwIfUamYbt/1vaIcuDpn4CxLohLggfDk
47FcTlEO99wLPKtqEfN3STd0gC7001FIQeCHCttr3fZT2CvKEMfmSyocTNtmag==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359203;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2F5EywPFcMd4t3CyuZfHUbw2TAvQwyflDGlDk0AAn7I=;
b=pVPca0iNWcv37JFvJhGn/bjNV8vOF6O8/ix12MskCKDkDor5i+81DVrA72gD4InxMzQvq8
+n0iB9iqcEKsFY2fCCTWDgz0NFXH9KHSH9XPVDD7xTVIaMSUH+qcHDKc+rgZmeIhvG5PWp
g1P1gt0I0DZMRnK3U+noEhZi/L0vAU/1AYW9DEWFX7+rnPg3hoPgG2EK76agZc+5ywS7DV
PgNn7WDtisZyE8ib/TtgPXwzkvWi+6zSHz13wx6wv827viw9JzHmmldbP4dfaUVAf8BDMX
DzbCBrCJJrYdw4ji0YwaiLBDcTre8TTJg48O3hkRFT16x6aHyQKZYRHgQnezGg==
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 4Wyhcg3TnTzcJs;
Tue, 3 Sep 2024 10:26: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 483AQhrt008713;
Tue, 3 Sep 2024 10:26:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQhUJ008710;
Tue, 3 Sep 2024 10:26:43 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:43 GMT
Message-Id: <202409031026.483AQhUJ008710@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 6a2a385507c7 - main - kern_fail: Stop checking for
failures from fp_malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 6a2a385507c79abaa9db9eabfdd827362f3dc7ed
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=6a2a385507c79abaa9db9eabfdd827362f3dc7ed
commit 6a2a385507c79abaa9db9eabfdd827362f3dc7ed
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:16 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:16 +0000
kern_fail: Stop checking for failures from fp_malloc(M_WAITOK)
`fp_malloc` is defined as a macro that redirects to `malloc`.
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/kern/kern_fail.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c
index 883b664aef0d..258268bb874f 100644
--- a/sys/kern/kern_fail.c
+++ b/sys/kern/kern_fail.c
@@ -479,11 +479,10 @@ fail_point_init(struct fail_point *fp, const char *fmt, ...)
/* Allocate the name and fill it in. */
name = fp_malloc(n + 1, M_WAITOK);
- if (name != NULL) {
- va_start(ap, fmt);
- vsnprintf(name, n + 1, fmt, ap);
- va_end(ap);
- }
+ va_start(ap, fmt);
+ vsnprintf(name, n + 1, fmt, ap);
+ va_end(ap);
+
fp->fp_name = name;
fp->fp_location = "";
fp->fp_flags |= FAIL_POINT_DYNAMIC_NAME;
From nobody Tue Sep 3 10:26:44 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhch5PZ2z5MkJS;
Tue, 03 Sep 2024 10:26: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 4Wyhch4kqhz4rrL;
Tue, 3 Sep 2024 10:26:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359204;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WzycGuoTX+NaoyQSW/ys9kO/J251hQi6BQMEUQjX+mg=;
b=Ivayvj0Vn6VJ+5/WxB9HbBxXMWaF9YbEVm9chYq92KPQafw/+GzXNn7mRLMe/q3cXFUx3D
CE9vW992knnqbZQ9SbB0/SlmfolItdKZ7nv95tAjMPlv7g0VB5HTeJPWvGGwI8xEaXuD/a
I46tjSMqn+LF2nStEW+iHuDCTGYhjkMXAxKbDNgHGCpuHLeK4Qb4Qa/+z1Jldm1Pc126/S
iNAXxihVqUSusiCLXPBu94jL0pl6FTwyxj8ef8zrubt2KXFmJ8lfxdldCTmodfCOQUMbjB
pY8D7bu8PjKHqtULTt7hCV4CGwUh19k2EfxuEtpkIAA0U8N18i93wvAFPgaHuw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359204; a=rsa-sha256; cv=none;
b=mH37DcFsl3Ed8pT2EzagCIB7XQCOqM7BTjGAiZbrmTSscn2h1QwRWaCdsxALfViEy69pIe
HEzHeqANo+WYvWPNpcTq7KIER9zedH0FXmiMbmVMD6hrmk1Am7gu0aimvFdKZl8dis2enn
NT1DfyN5l+X+vtXkjYyD9ocBLX/IUQhLJ85LVJs6tlQukOnTvFsM7tjlzZVLQoijTgM8d+
S6GAL8tilkqdg1P9JcTQk+d5BzhKtW4hVrsIC9ei5t9L0nzhwutNmLfd8SEccCVK+Ka18Q
sEGEYNP/BxWjGKNDqiu8UaK8A77cui9Boe3AqzC8UYxQ/f2XwIbVmUcAJKzldQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359204;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WzycGuoTX+NaoyQSW/ys9kO/J251hQi6BQMEUQjX+mg=;
b=Y1ZWUuLTj2Xp/AhXO/c3/8NnPIUZnpssSH/mv9oks2COpgXZat9uoi5nDdYEz9xRSghsAw
bMl01NYfTcD5aWLHsxAokFhNBCfNKuc4lSR4HgIFbO3R17MTfEFXC376gYgneLEuzvX5Ss
fVSiU+dWsGkc/AxdiDnLwfQAxG4WNrROS1rCC5z+z6kEOArDRtCkV6T7TGupBPw6SgT3Gl
iVZJtoyyJqBzxjhSZkKNrEvpgn7FZ46ITC1kME8u6sxwBeYoujuIKYHQAjGlWZ9z2oDyRz
cm4eAb6KTWR/8+mmEblgDJvNjBIvdiZh2bTxymeMoVe9c6TmAZPwlp84ZZKS8g==
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 4Wyhch49DpzcnB;
Tue, 3 Sep 2024 10:26:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483AQi2l008761;
Tue, 3 Sep 2024 10:26:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQiC5008758;
Tue, 3 Sep 2024 10:26:44 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:44 GMT
Message-Id: <202409031026.483AQiC5008758@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: f444db950e87 - main - boottrace: Stop checking for
failures from realloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: f444db950e877596805aed897c3fbb975be28711
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=f444db950e877596805aed897c3fbb975be28711
commit f444db950e877596805aed897c3fbb975be28711
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:17 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:17 +0000
boottrace: Stop checking for failures from realloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/kern/kern_boottrace.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c
index 1b097e7378ad..5516f3160587 100644
--- a/sys/kern/kern_boottrace.c
+++ b/sys/kern/kern_boottrace.c
@@ -561,9 +561,6 @@ boottrace_resize(u_int newsize)
}
rt.table = realloc(rt.table, newsize * sizeof(struct bt_event),
M_BOOTTRACE, M_WAITOK | M_ZERO);
- if (rt.table == NULL)
- return (ENOMEM);
-
rt.size = newsize;
boottrace_reset("boottrace_resize");
return (0);
From nobody Tue Sep 3 10:26:45 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhck04VNz5MkT4;
Tue, 03 Sep 2024 10:26: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 4Wyhcj5Jhtz4rrh;
Tue, 3 Sep 2024 10:26:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359205;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=aWhRh3IHIhR9EJIB1bNvgdBV1Fbs755RpaxrVFmEIWc=;
b=wC33yW1OX5k3e2BSx15zfac7he9ZAWkRcJ8DS12YqOU86SwxXmgIK1ND3y/DMKKfLk3NBV
3Nk5HcPZMfbRCT5Df4c44tCbK8Q4TFh9rmfOOUceLIWI1i1I0iAGyGExPArtBHuW6lcpn5
qT9UdoZEoU9Vp4V9T7YT7DkbuG7VghYXHElWyffVBW1RZYi7k6M+xcx+q1FMo/CVzQscEQ
RTrkw3m4bu8iaGnppzQ74Nptg4NUm8HDfKNneJnIKDM2rjJ7jTDuAyT9HuKFNfRuxQx/tt
WBr3W959IBltTwu9k9vZ4qLG3dHGkHV7mi3iH4yt9f9wWgP7lESyaR4giew5Hw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359205; a=rsa-sha256; cv=none;
b=EoNkbl8i6ldT5NrINn5ZyyW02//cl6jZ2OKgB7H2LYWDOca4k84BS6t8t51n/AE7doMFKk
d3UY9JHtuXevEVFrfsB4QIQ3HC0JM0n8Sf2/dZpL6kuldE05XLQ5YSux/+Cx19VaHs1zGC
nmGU8TxaGnRV5AIAd7JWVnkT7nL/yYXU/VICkq1Asaf09Fh/ZrD6NDxA6gjLsiJshVzKPM
vdRcyDGhqkYaumXrolHQj2zUmt8Nj8ZehYjZFFkk7jWyKVKS5OdHdRh86RvrfCvhfJcBTw
va173okwJEb9CsD7KQZ2js3aztkWf6cxRqteZSdhdZowtv2TF+TbIo0eym5lCg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359205;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=aWhRh3IHIhR9EJIB1bNvgdBV1Fbs755RpaxrVFmEIWc=;
b=rvfLAOIMKUgOieuxBRxHoaDex3DR4c134gKvW2SbMHRQgoxS9lHk3isBR75fiASvY2stLT
jmRQtE1brNYUe5xy0CgWB9n1yWix031rOvbpXTw9ud+uFMK58y8z04hbVIyiLux2comLxh
GZg6jC+GLDdbk+C+LiGLzRuiDYvNW6/683KYUNMf18GqS+6ZgXRo94/QKa8r3TlHkwWRsz
AOIxpMjxCYGrmUiKFJGF2dRnNv2lveo49i+Rnv6tdYOfLHkmr9S1KjQWO2TCd59/TYCMRm
PokdXRjQyBtuh8o2ZUEogltlIdAo1y0wzecjwzPvyhTORatCA+H2CXkeOuc47w==
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 4Wyhcj4vYGzcxk;
Tue, 3 Sep 2024 10:26: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 483AQjI6008809;
Tue, 3 Sep 2024 10:26:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQjCF008806;
Tue, 3 Sep 2024 10:26:45 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:45 GMT
Message-Id: <202409031026.483AQjCF008806@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 99e3bb555cb1 - main - subr_bus: Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 99e3bb555cb1ef5572de54be0ffed2aa6fc080cd
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=99e3bb555cb1ef5572de54be0ffed2aa6fc080cd
commit 99e3bb555cb1ef5572de54be0ffed2aa6fc080cd
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:17 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:17 +0000
subr_bus: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/kern/subr_bus.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 71d04e483d4d..7fe46995ee54 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -5422,8 +5422,6 @@ sysctl_devices(SYSCTL_HANDLER_ARGS)
* Populate the return item, careful not to overflow the buffer.
*/
udev = malloc(sizeof(*udev), M_BUS, M_WAITOK | M_ZERO);
- if (udev == NULL)
- return (ENOMEM);
udev->dv_handle = (uintptr_t)dev;
udev->dv_parent = (uintptr_t)dev->parent;
udev->dv_devflags = dev->devflags;
From nobody Tue Sep 3 10:26:46 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhck6nTlz5MkJT;
Tue, 03 Sep 2024 10:26: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 4Wyhck67btz4rkX;
Tue, 3 Sep 2024 10:26:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359206;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ZKBNWY4sA/RHucHULsNjttc3Tt4PyrIDZrkhwHbl6ZM=;
b=SFRxudQJFCFGA3vQse5wlSgRe4KuP4unyzgVVtP8BPoZx9IMfA5GXCnekj91T/kKyfFZ7i
pW56W5lXlzKuyxHhAvh3lkASlJxWkB9+Iz2TGJLmIOfbHEE4y9DQDY72r9uPEAL7LVZ8F2
unsT4vLxNplPPtTkxjwINTWeb9K0OhehwiqcZpLa2w53esA3z9f2fEwv77PIC4Xd21ILfV
YIRnq1rM9SRtMmv7RMXOL7kzYvEDEROJO5/CcUwrrRIDfeu4JI9c5+47tmETzpYgDEsl80
WRe43gMRxUU1VRQ20keUaEwdYV89bxnpQ2SNYFF4hD36UD0aM9vgbk/y83rv9w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359206; a=rsa-sha256; cv=none;
b=NsAuB+vS1Me9JzssBPlXKLPQoqTD3Zn7kPqSj4w1y62Gm+lxsF3kdu9Fn/5fgRbSKiA8d2
tTA0qruYPhFg4/RY5wIwm+jJch7mNBMmi4uIPxNPzC3yUZXKNBZFxd7QL02IRb7aL65dk3
3AfPa0neib74003pz/TlrT4jPvClHuxAQOicPUIRsItpzqxFQyRM9NVCfZMFg6DcW0tQAG
fU3Ok7KwDvKEk7oX4jl9EDEJPORUviH1d7lVKn6A1DtA5r53VpDm9/IqblL1thDma6DkcJ
WvsDS/gzcomj1ksPdewPFIKmvqLg0Q9Oeafk1el9icAsPUauWW0EPB27H9tRKQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359206;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ZKBNWY4sA/RHucHULsNjttc3Tt4PyrIDZrkhwHbl6ZM=;
b=Y7k+6Cjf6qIv5+MrejCykm53bcN/kxJsaMf+DE2JOnOOAxNIJzSzqH1l2rF8rsX3/AMe23
llGIiKyuwriMtT37bB0NTt/jOcaqgX4pIYrE8jxACaJXyjR490FnxkNMhVp9uWaXzl+pzu
FdoW11CpckrOGCBZunvZ3hGwkEor//7xeWgKXhBmWSpxJdKx4efTxrhg7pm4pCDezsTvrT
eKnRjpTAFFzUQZXQpRtHVyxHi5jkP4LXD1sRkeuegs3r+kg/y2zijS3aA3+rK9oDN1Vgtf
bgGM7HFmnAss5vIM7aV5wWwPBz7kWuQxn8p0Qaf+ea6vR89W8Ul/ZRTPdgJcgQ==
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 4Wyhck5lmGzcnC;
Tue, 3 Sep 2024 10:26: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 483AQkqo008857;
Tue, 3 Sep 2024 10:26:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQkq1008854;
Tue, 3 Sep 2024 10:26:46 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:46 GMT
Message-Id: <202409031026.483AQkq1008854@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 8e6dd4185871 - main - ctl: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 8e6dd4185871cd9b785869178ab2191a0d6c0b53
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=8e6dd4185871cd9b785869178ab2191a0d6c0b53
commit 8e6dd4185871cd9b785869178ab2191a0d6c0b53
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:18 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:18 +0000
ctl: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/cam/ctl/ctl.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 845cffe77a5d..82420396aca1 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -2687,12 +2687,6 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
}
entries = malloc(ooa_hdr->alloc_len, M_CTL, M_WAITOK | M_ZERO);
- if (entries == NULL) {
- printf("%s: could not allocate %d bytes for OOA "
- "dump\n", __func__, ooa_hdr->alloc_len);
- retval = ENOMEM;
- break;
- }
mtx_lock(&softc->ctl_lock);
if ((ooa_hdr->flags & CTL_OOA_FLAG_ALL_LUNS) == 0 &&
From nobody Tue Sep 3 10:26:47 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcm5B90z5MkW8;
Tue, 03 Sep 2024 10:26: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 4Wyhcm07Bhz4rpW;
Tue, 3 Sep 2024 10:26:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359208;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=SnvByBTQI9/2d8bQkLMCKOPXCa2nnZnkOoJcBYwmTr8=;
b=J7RFlx4wy/9g7C5p3WfNFwr//cX7xoHM9B2+zLKnPngNaO01sEzK9L+XNaqYsO5z4PczoQ
B8yZLJgiG4kd3x55F3PNvgerx84sGgWFF/B+VfUyvcaJS5EWQ5gdwP6wD0qPc8HpxNzw+7
j1zD2E0vv+O8g0k9AAyFN31Mj6CMiwyV4O9L/pwAbO/aTfVfrRJrXMw44mhb76N6T32CcB
rUv5khj/o42K43o7psiY6ODInx/9815tD6LioPjXPvED/J8aqWG+POigxoFabsgbF/COYP
a/zMaOXNiK7OTkDXTab2ST3VaZVk56Zgr2w75dZREtblmL6/+BizGKnDqdsXjQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359208; a=rsa-sha256; cv=none;
b=chNKogM2NDbct7PlsuAuoUhZeuc5ZGK12Xn87uGOESqH212JcftKk64JzDl7B7v/hMmpZD
/UAqzG8kNZozhp4Iu9bQOzRthur79faiABsEmWgmGKHOSDYv1Dm/G3Smbjm7vyxfDeC7gK
R7vi07FjoSfizpLYfblxhdTw0Kgz88ax4Zou0qmBgGdhWRKDFwd8QBZHXfhxhJi3KRq8LZ
gVwkKovzeHR8M1mm5XHlQZh/AbpcWJogJqmiOYMW51Csr21HB0bKSjQ3LfFzCJfSQ2sowU
WxAlZHZIQKyWjE87l7v4npQp7K5Qa/dScVtd2VMW111Ab+Pydeu7tKDm10i+UQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359208;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=SnvByBTQI9/2d8bQkLMCKOPXCa2nnZnkOoJcBYwmTr8=;
b=LlYjzf7TgqQyXYNjUeLF3fIU3rBr1du7NzIcMSW0BmFegaGbH6QflnrdgNgzd+sNJB/CsO
wuek8TeQIGHc8Lg+4VTiv7D+rOhepvDzP2o7WJ/jGiwk3B4YIh6Ulx7QNwzQx2aIiCWWJ1
xNe1OxjFAgZOcwEQr7PXdqHsmAY0/eUVgbeMCbmq2aPncK0Q1N4odG94DT2JBZk90DZbQA
59tqDmzWVYPqDI2hFNp/PjHSE+KgDJ12l2d+roDkoBWLZGa0u0EevENDBYdT3Z6gE6Uv6p
FMrV3JiHrUE9l+BnDfgYWJgpLpCCrBmsgd+Oxro0EKPEydgbzzPZVQdlpB+ukQ==
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 4Wyhcl6mmBzcsq;
Tue, 3 Sep 2024 10:26: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 483AQlYF008909;
Tue, 3 Sep 2024 10:26:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQlYm008906;
Tue, 3 Sep 2024 10:26:47 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:47 GMT
Message-Id: <202409031026.483AQlYm008906@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 3feb35dc465a - main - udf: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 3feb35dc465a8247d70e50792680c230954ef1c1
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=3feb35dc465a8247d70e50792680c230954ef1c1
commit 3feb35dc465a8247d70e50792680c230954ef1c1
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:18 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:18 +0000
udf: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/fs/udf/udf_vnops.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index f230ca0c72fa..98a779280690 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -800,8 +800,6 @@ udf_readdir(struct vop_readdir_args *a)
*/
ncookies = uio->uio_resid / 8;
cookies = malloc(sizeof(*cookies) * ncookies, M_TEMP, M_WAITOK);
- if (cookies == NULL)
- return (ENOMEM);
uiodir.ncookies = ncookies;
uiodir.cookies = cookies;
uiodir.acookies = 0;
From nobody Tue Sep 3 10:26:50 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcp4mggz5MkWF;
Tue, 03 Sep 2024 10:26: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 4Wyhcp29gzz4rpv;
Tue, 3 Sep 2024 10:26:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359210;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0zpUAu+ymUwSwvLxTkFzfrUKGJgEZ1kSEfnWQG6BvRk=;
b=CqCQ+L1H8lvs+IuQW0e3bXeO5h9G1UA3KTzkfxIs92CJKXGbK2PkPb8I7RVehmhfFeLPfo
8S4KPuR+lOo0g9EI1h2rd6IYuHrXl5MNYgErtbmnU0adwy73SS1naUHFsqP4m69fHNIoUp
djiC/iuxPMNZlFSlACn702/sM8Pif6J7696GsE6RgcjZpF1t7kvqXYMNqt3UbSkXaK5wBL
I+aybnaXmqf9x8BdbefYk7lf0ItW5YJYaHcpA1Nvmhv7SEUR5v9FgKeNE88gkYJ/fb0cA8
Z0s8MXdyT28bMaDWrl4w4/CzIv75SGDIR/e738+gMdNs+VNyaISHuhP2NNtSRw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359210; a=rsa-sha256; cv=none;
b=NUKFDm6hqZwURnPe9bi2BZTIK8iTtNv5bO79vfvkpIqvB5fbf4nD9tsN2CLFDMKBHLbEtr
2J824sDNvwdRnaQ3YOaz0i+CsoyLG88ICRvCBsxSD52qf8dZwTqAIo5mEnUpcqVpXZb7aR
oiqoTpx9yv99eNj+hA6U2ZuvlY+K4XO+tKwyhA9SsWZwl/TQuePeouMY46uuuovWFSRC/w
YVgkwrQ71RB4mmaGN0HDmzX3gCnanCfuYFTA0H42w+9olvPJnaGtpWR60LMbqmi1/Zx6vV
zfe+l8ADDr/FPqZhWT/nKCcDgxJhAWnDvRusAmG06t/lPlexHSPQt28mSzm6iQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359210;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0zpUAu+ymUwSwvLxTkFzfrUKGJgEZ1kSEfnWQG6BvRk=;
b=emBwxy5IvlZHzI4UiDUqC+9TOLuWOeeNrwkKHTlidfrTTQQaacT4rZQ3gpYZY9+ydwC9Ez
WopGn6EYLezAJ0kbjxDEs8KAHLpEbmB9EA3zjhevNHXm7y1atG6TupS+aMo6ACXroF8SKE
VcNc9F/qazRYSl1N6GkXHLybIG4h+yggQvaHJOXkT2503Az/VWegNf0ocPHkuPzlLp9yNL
/TM8On7txgCHX4zydbiabrmifdZMnl3h5m060mJN15ZqWyNaO4aR/D1VuKce2KeyzzIzVg
iivLYKHBcemvV4sWjuXO9C9d9jGQX2cfFqnqHSWBLznCMgMw3jKOHTsqgwMtrw==
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 4Wyhcp1gPhzcxl;
Tue, 3 Sep 2024 10:26: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 483AQoMc009012;
Tue, 3 Sep 2024 10:26:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQoVE009009;
Tue, 3 Sep 2024 10:26:50 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:50 GMT
Message-Id: <202409031026.483AQoVE009009@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 07b16b1e2aea - main - if_vlan: Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 07b16b1e2aeab0b30f68a013de31a4c322a61246
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=07b16b1e2aeab0b30f68a013de31a4c322a61246
commit 07b16b1e2aeab0b30f68a013de31a4c322a61246
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:19 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:19 +0000
if_vlan: Stop checking for failures from malloc(M_WAITOK)
Fixes: b08d611de835 fix vlan locking to permit sx acquisition in ioctl calls
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/net/if_vlan.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index a30db9173383..774298d4a53a 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -509,11 +509,6 @@ vlan_growhash(struct ifvlantrunk *trunk, int howmuch)
return;
hash2 = malloc(sizeof(struct ifvlanhead) * n2, M_VLAN, M_WAITOK);
- if (hash2 == NULL) {
- printf("%s: out of memory -- hash size not changed\n",
- __func__);
- return; /* We can live with the old hash table */
- }
for (j = 0; j < n2; j++)
CK_SLIST_INIT(&hash2[j]);
for (i = 0; i < n; i++)
From nobody Tue Sep 3 10:26:48 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcn51jxz5MkLH;
Tue, 03 Sep 2024 10:26: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 4Wyhcn14Qyz4rds;
Tue, 3 Sep 2024 10:26:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359209;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2+PrYPFYhE89ZGoWrTRH3XeVhPSxj9Ndt+NuzW6kf08=;
b=mNH6VvvKmOoum9HaQvlkTF0hms1bOHiKIDCqomheMKbRnew4yeYMOYqs6nq+A5j3CxXULW
Z9S5AyserFa29csYhVZVDAaMFvInEiHbS8tqE/IrtV/nhl7BJRolRsH6sUX4O1JoEWOeRc
U0AzC5CZf5QXGGIbskGUH/TdqkkCsX9Jd/80c0uQzjJXweZ3yARgCEFYfrDl7ipD0KclRR
LB0m7Jb9wtwlMisEMqryOa3sAFNWYgSEBn34KHi/aqZad+WPkN69EX3PeRSAxzusqIzoqO
nxTufA8UZCt/HjQkqZa8KZvVXdfzJeSqsPnW3m36al/XRhzTh8kWMTfDHgoc4w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359209; a=rsa-sha256; cv=none;
b=qtc2LT2JFIda1o53fjQxJs1LXLEzjyECYHFCVzRIdqbMvfnAstwCpglt1/aYZXrxrdCn+9
8WLgJYojIle56b3ax1TDDOSk7l9tMcL12de33ORuO3Y38vveo2oEtD1Py6a8on/qEuP7iL
2U4RkSvDhyNGiy2ZHqBVrx6bSkQzLrKkBebpyNCrPwxXq7r8TjXl0QptHh14Gl5KlWk3N7
mo5hEAeUZ80nIxlbrDqRvf1IOkJVt/Ih++g+TlfA5S2rBHjU3eDZ6bRTYj4gqCYppKLxko
DeK1dhBOLA73P3EI9IVZVWA1nP2MbeYTPgPTJ9+SOtb34fxTrl8QAUrKNStRPw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359209;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2+PrYPFYhE89ZGoWrTRH3XeVhPSxj9Ndt+NuzW6kf08=;
b=LZtw2cgytf1lL90VVaCcQ/BWPpiFJgaWajYCIZoU+whPJPatOoIh2j34Mp7pMmyxeC1ipJ
zWNWGGyOpH5knLd6OhxhGZdFHTKVD437gl4H2gqYGWVntlqq0Wn/Mo4/khDbU1/bDIVVn7
uw/A2S4cwV8Ic2VbOLmJUwVTtwdoyPwbuPkKd11NEMINgjd26ud6tDXzkjKKBqdIrWErRw
hq2WIrx4LwBbvlhyJTUIKWZDtKL7NVqmoQqkjMvRSan0dc5u5YGVngZ1u8WHQ0ZdhcqpnK
JzX5V/eQnsGl9K6Mc4BiR0rrw28UR2gYRqV0I+FQ4HMR+T9H7SELVxJ5I2KxxQ==
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 4Wyhcn0g0VzcJt;
Tue, 3 Sep 2024 10:26: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 483AQmdr008964;
Tue, 3 Sep 2024 10:26:48 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQmB0008961;
Tue, 3 Sep 2024 10:26:48 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:48 GMT
Message-Id: <202409031026.483AQmB0008961@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 2a119886630b - main - altq: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 2a119886630bb5fe8283e20db5acb7c0cdba31c3
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=2a119886630bb5fe8283e20db5acb7c0cdba31c3
commit 2a119886630bb5fe8283e20db5acb7c0cdba31c3
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:19 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:19 +0000
altq: Stop checking for failures from malloc(M_WAITOK)
While here, prefer malloc(M_ZERO) over bzero().
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/net/altq/altq_subr.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c
index 3ade724818dd..534841289611 100644
--- a/sys/net/altq/altq_subr.c
+++ b/sys/net/altq/altq_subr.c
@@ -1327,12 +1327,7 @@ acc_add_filter(classifier, filter, class, phandle)
return (EINVAL);
#endif
- afp = malloc(sizeof(struct acc_filter),
- M_DEVBUF, M_WAITOK);
- if (afp == NULL)
- return (ENOMEM);
- bzero(afp, sizeof(struct acc_filter));
-
+ afp = malloc(sizeof(*afp), M_DEVBUF, M_WAITOK | M_ZERO);
afp->f_filter = *filter;
afp->f_class = class;
From nobody Tue Sep 3 10:26:51 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcq6wvWz5MkLP;
Tue, 03 Sep 2024 10:26:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhcq36TCz4rhH;
Tue, 3 Sep 2024 10:26:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359211;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=e9uCwRm4T9EyDLb3h0uteOIx6RYCnAEKW+UdnAAs3ts=;
b=pG0RfAspWc/sZbQmZBwByhutExCJcK42gNCoMjErPTKMA21Ydn5fY4/wDOH7np0cRXjh5m
6cyTdmgzwDJ2SHUvkU432nj5FRXLwB+irZvl++Z8sDHH8CdrPRd0G2txGg4TrHt+jUFEjl
H+UAMODsX3pOTIljV+19kvcNeBFVVDOncjZuKiFR95JAAS6zaMR30zCA2xpjGNECmYx0Dz
akHxvTdzrVr07GNBWYlVUyg8RyG355oj5NsWh+FSjgcqQjc0C0c/wRLEQTYLPGwJpufbGr
PMZDI//boFRfsYE5IIAc2I+d1j7ODtjuivPKhG5jNgmOm5/XFgBcwnJ9zuilWQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359211; a=rsa-sha256; cv=none;
b=w6XNanf+lD3JQbAFpNQ2DN7C2+PsCuuvVMzot/6EpOzZ+gXV8skjX7uMX3QrNBGqJoBa4P
FSADIvlz9BYH06cnb39eqazB2OUu76965PG2WoGGUt6w6hnsRp0mz53892tf1kfsKF94JL
YiKVNodaae2dUiu9AFazjqwA5nQgnP7pitj9RFJrd5LkpxyZqrpHgAmfLkXUUnrj2H72WW
TVOGu+azbANCFIDdATHW9z8ZnxZ+xxfiByzr1FimEh1IpxGK3p3Pvm1dAUnt+zXZNkRbNI
GBgdz2zqgvDWLVl06CbMeXvcoWatW/fzCuRECPcGlkmy1m+5417Xh3mkecftqw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359211;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=e9uCwRm4T9EyDLb3h0uteOIx6RYCnAEKW+UdnAAs3ts=;
b=u+ikqIvFwQmD+x/GC0e3hGtAKYIlryKGKQ4YnMJrUWzpVRCUjUTzrfe9o5Pf67YaRkfcqe
LaJLtE4Pqp3Gj073b1p3iNYcfc4a/sz3Xpb1oRCHwCGLHVAXzf3GC2nbtIfkNi9Wd83097
ppsFTbX4YerBLQ9ZRzXpmy1l4iUnm4TR6t+9shr5k9xDEeBBg3XhemSRIm5lQG4DM1JS5e
pmmNx5Syuc1CqTzgEXla4XCFYOIkzP18H56pwO4kYalS4rD29KoJnuZlgcS5Ogo2Sx24+L
RotbF2NdrwLKIoeP+HWprwgyMlWGYm5Cxpi6Mf8Ygz/qahZGA+n0NFkXJN+lRw==
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 4Wyhcq2W11zcLD;
Tue, 3 Sep 2024 10:26: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 483AQpW4009060;
Tue, 3 Sep 2024 10:26:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQpDs009057;
Tue, 3 Sep 2024 10:26:51 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:51 GMT
Message-Id: <202409031026.483AQpDs009057@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 5b00557330b3 - main - pf: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5b00557330b3b69db84969e33f2e201288208dd9
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=5b00557330b3b69db84969e33f2e201288208dd9
commit 5b00557330b3b69db84969e33f2e201288208dd9
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:20 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:20 +0000
pf: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/netpfil/pf/pf_ioctl.c | 32 --------------------------------
sys/netpfil/pf/pf_syncookies.c | 3 ---
2 files changed, 35 deletions(-)
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index d22ffc2245cb..64086bf08871 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -2823,9 +2823,6 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
/* Copy the request in */
packed = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (packed == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, packed, nv->len);
if (error)
ERROUT(error);
@@ -2903,9 +2900,6 @@ DIOCGETETHRULES_error:
ERROUT(ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
@@ -3003,9 +2997,6 @@ DIOCGETETHRULE_error:
ERROUT(ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
@@ -3036,8 +3027,6 @@ DIOCGETETHRULE_error:
}
rule = malloc(sizeof(*rule), M_PFRULE, M_WAITOK);
- if (rule == NULL)
- ERROUT(ENOMEM);
rule->timestamp = NULL;
error = pf_nveth_rule_to_keth_rule(nvl, rule);
@@ -3136,9 +3125,6 @@ DIOCADDETHRULE_error:
ERROUT(ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
@@ -3214,9 +3200,6 @@ DIOCGETETHRULESETS_error:
ERROUT(ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
@@ -3409,9 +3392,6 @@ DIOCADDRULENV_error:
/* Copy the request in */
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
@@ -6003,9 +5983,6 @@ pf_keepcounters(struct pfioc_nv *nv)
ERROUT(ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
@@ -6131,9 +6108,6 @@ pf_killstates_nv(struct pfioc_nv *nv)
ERROUT(ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
@@ -6192,9 +6166,6 @@ pf_clearstates_nv(struct pfioc_nv *nv)
ERROUT(ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
@@ -6253,9 +6224,6 @@ pf_getstate(struct pfioc_nv *nv)
ERROUT(ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- ERROUT(ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c
index c5ee64c6aed0..538ab1dfd94c 100644
--- a/sys/netpfil/pf/pf_syncookies.c
+++ b/sys/netpfil/pf/pf_syncookies.c
@@ -201,9 +201,6 @@ pf_set_syncookies(struct pfioc_nv *nv)
return (ENOMEM);
nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK);
- if (nvlpacked == NULL)
- return (ENOMEM);
-
error = copyin(nv->data, nvlpacked, nv->len);
if (error)
ERROUT(error);
From nobody Tue Sep 3 10:26:52 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcr75Zsz5MkT7;
Tue, 03 Sep 2024 10:26: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 4Wyhcr41Ssz4rqR;
Tue, 3 Sep 2024 10:26:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359212;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=h70JcTIDxO1yrZdSbpc7bhFs7iDj0ceT0X7ow9mKUUY=;
b=jTmMZ3Qfm+C80fDJeevVDGdGiTRSsywOERuNv0BPbqFDMoJC9T7XBFuJv0OZiBlSuHi2UB
R60RqKe2Z6wjuUosBqDhso3PMuaLqoDvk7u7B41cVeRhc0zD/HsMFbhwLRK9gL6SpFjg5B
NCHmhJ681fTDmm1jhkqp1rWtD1zvkNLeFwSsOMRzOObD8aFjJGauLrj57QV8ZThIGoWPAN
LXBGj58/+zhqY5GUW77GAxkBnbBI8Z5KaBo03hJkx5HAHSyrRxYO7AgOpaRjADK/ORHqmc
imijbENjHEH2ryIXIupKdkXH2pOIzfNZ4F+mV1ehDPrk0LhfBBevWeELj0pjEA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359212; a=rsa-sha256; cv=none;
b=D5PqNebOyzmcMrdhJzjRUYKBE21ipJIxycucaDVuQCxRW8UDTCO2uvo74GDfKCcK7IYduP
0sE68HgeSp1pB2RyfZCLoI4OA7DyAuaPbrs9q1RzdfMDcv4POsB1zL21EpvuCj1+a8Xon8
M9PCKM3JrHKJDr1bNYMjqQNy12aCqhTtAslERrioaGJ1t9125wZuAxilb9Wj/NgcAaX1HL
CQ0vCrSublbebqSwKaUPx/JxM1w5fHPGRNdkm/S14fsIOmvC6ArjhFuplAlcTjxZtaZIfL
C+/JpdsPDy1QsilU4ZmS/ilUPZc47gJZJcs4a3BzaCoAFkYTGjoBjYCfam9OGA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359212;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=h70JcTIDxO1yrZdSbpc7bhFs7iDj0ceT0X7ow9mKUUY=;
b=c0LJINP/6+HrnR9QdXnyXl9xpVHp9L/kLShrnPav60pvBYVnW85kHbTCtMicn5JoCwBj7P
6DN5lHM4P1pSVygT9Km0EYXRhU2I6s1iV+vvn1whvWW46vLZ6ohTA+kjp29EX7Q0zTfL8t
FWiOK4AmLV7RCtrKZ5SbR/EJvOL0ErAo+SEZajo+zHQOF0TdIPcxucstsLZIG6tcXOdjV7
sPK6s8OQEXKEqrnYL5+xQTqEzhZXK/QN5TLMdAvs0ekd2jkJgEsiwc1xVAFZTLFBb/t3Ef
h6uB5J+zjFaXRJ3esF91W7Rgxblt2FWjKWZcXqBAWuTNZ0XKSkImaf33RpHKPw==
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 4Wyhcr3d17zcxm;
Tue, 3 Sep 2024 10:26: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 483AQqcU009109;
Tue, 3 Sep 2024 10:26:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQqWY009106;
Tue, 3 Sep 2024 10:26:52 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:52 GMT
Message-Id: <202409031026.483AQqWY009106@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 6e50988cf822 - main - netsmb: Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 6e50988cf822f87a524b8da2fdc35b234078cc2f
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=6e50988cf822f87a524b8da2fdc35b234078cc2f
commit 6e50988cf822f87a524b8da2fdc35b234078cc2f
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:20 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:20 +0000
netsmb: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/netsmb/smb_rq.c | 4 ----
sys/netsmb/smb_subr.c | 2 --
2 files changed, 6 deletions(-)
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index a33598489aa1..b2642f1aaa6d 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -64,8 +64,6 @@ smb_rq_alloc(struct smb_connobj *layer, u_char cmd, struct smb_cred *scred,
int error;
rqp = malloc(sizeof(*rqp), M_SMBRQ, M_WAITOK);
- if (rqp == NULL)
- return ENOMEM;
error = smb_rq_init(rqp, layer, cmd, scred);
rqp->sr_flags |= SMBR_ALLOCED;
if (error) {
@@ -376,8 +374,6 @@ smb_t2_alloc(struct smb_connobj *layer, u_short setup, struct smb_cred *scred,
int error;
t2p = malloc(sizeof(*t2p), M_SMBRQ, M_WAITOK);
- if (t2p == NULL)
- return ENOMEM;
error = smb_t2_init(t2p, layer, setup, scred);
t2p->t2_flags |= SMBT2_ALLOCED;
if (error) {
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index fbb951a37cef..68469cf5cc35 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -149,8 +149,6 @@ smb_memdup(const void *umem, int len)
if (len > 8 * 1024)
return NULL;
p = malloc(len, M_SMBSTR, M_WAITOK);
- if (p == NULL)
- return NULL;
bcopy(umem, p, len);
return p;
}
From nobody Tue Sep 3 10:26:53 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhct1Q0pz5MkWL;
Tue, 03 Sep 2024 10:26: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 4Wyhcs5XjJz4rqh;
Tue, 3 Sep 2024 10:26:53 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359213;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=q3h4g3PxTwSchPhU7Zv5h4bjo8PbqKTPBrxfYcGLUwE=;
b=B/zm+NVxP+WPertStdIKq/UDnDs8T0PUs84M7h4QOBzYqSM0KOVg4j71cQHILayZbwl+FX
BrZAqQA2mTjY16KImqrxMH1UP0im06mvuU+Y9P0X3JjO22w+oLj9C+H8cCN/795r9zebrz
btR2mcV0kWDbl/9KNfLYwD95jBX3MvX7hMiN/ZURreATzDjVpKeYcm6CMTL+pIiCIGvisg
Dfg6Io5wdXM/gApv2Un8dVtmMY1Ho91scO7gs2umYnTQITnnufs9ruywLqbckZja4s4rGz
GTY0Ym1xlgUYnPVAyFLxawxX2qQenauxqxcE40d1wxrQel85qTPOwDq9Fks4yA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359213; a=rsa-sha256; cv=none;
b=VivaYjI/oWa3X4jAlnIYHlE4pjdbWIYrzhmZWlXeAbmmo7s+as/oVCeMpUT+dCDJQ1ynH3
yShcOWdZINcbMbbIFNIRBl4xBlhfHZYmr9mtm4U/jB3vBirRq0wbOCvvPD3hyjhDXfXd3O
nfqNvJ85QssOzkyk8kgPvOBTSX/WLCVNgluRVhDeHl6ti4FqeaKPnc5j6JbzPFskKLU9Br
xuLTi09wy1TbPYslgmebU1Kqe+LsPYFppYpCg6VZihKeByQs7rHVgzsJ6jplEkSvDSyFLM
DWyI/5Tp8G8Yz1eP31hm0+8EvPsaoBoAfOKushK7I4lcfqZrU30L1IDePqZiyQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359213;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=q3h4g3PxTwSchPhU7Zv5h4bjo8PbqKTPBrxfYcGLUwE=;
b=lZfvkDdkp26OUMqp2MPpbKN5TS5kqVF62a1PdMW2SntZ8PEC2tOIHsptnIeekolqB42og6
1yYFdiqrssq8FhsjZpDvxYubnDRemHyCu6dRzBp+ZebkezBS8XCknItoIF6SkvVU93pTWK
6vLQuk7/mYEmkzetisfhcegjMTxYzpjjiPHEIRALXx9dZr9ltchnA97uoAbxWpF3Oajhf1
VHohtSRf21rYZeFi/QBOteDEyWEyKMEp1JMnjjCNr2AzUcWLu00qwBkobuf9u/tm8xwpYv
5rlVP/moFxtnhJ1yOoWX4SF+s6kECpR//Xt+Vf0gwm+air8W0FbgPQ99s+Jk/g==
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 4Wyhcs4fmhzcxn;
Tue, 3 Sep 2024 10:26: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 483AQrlo009163;
Tue, 3 Sep 2024 10:26:53 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQr23009160;
Tue, 3 Sep 2024 10:26:53 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:53 GMT
Message-Id: <202409031026.483AQr23009160@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 7a720bf67d73 - main - xdr: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 7a720bf67d73ba565a0a1130065f798870eb5faa
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=7a720bf67d73ba565a0a1130065f798870eb5faa
commit 7a720bf67d73ba565a0a1130065f798870eb5faa
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:20 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:20 +0000
xdr: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/xdr/xdr_sizeof.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sys/xdr/xdr_sizeof.c b/sys/xdr/xdr_sizeof.c
index 6b4ee0352c9e..bcacf918f4fd 100644
--- a/sys/xdr/xdr_sizeof.c
+++ b/sys/xdr/xdr_sizeof.c
@@ -94,10 +94,7 @@ x_inline(XDR *xdrs, u_int len)
/* Free the earlier space and allocate new area */
if (xdrs->x_private)
free(xdrs->x_private, M_RPC);
- if ((xdrs->x_private = (caddr_t) malloc(len, M_RPC, M_WAITOK)) == NULL) {
- xdrs->x_base = 0;
- return (NULL);
- }
+ xdrs->x_private = malloc(len, M_RPC, M_WAITOK);
xdrs->x_base = (caddr_t)(uintptr_t) len;
xdrs->x_handy += len;
return ((int32_t *) xdrs->x_private);
From nobody Tue Sep 3 10:26:54 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcv1vYQz5MkLc;
Tue, 03 Sep 2024 10:26:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhct6RL1z4rys;
Tue, 3 Sep 2024 10:26:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359214;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=KovJX751ir8Agnl2AB4hfK3sJw2pC86gINKMyV5DjiE=;
b=r+0fxYyGpPOhbbZBiqUPUDb5KHXQ1t1joqEYkO3FY/GyV3q0NviNSw0k3R3V/suT/fCqqD
Bcd6i3Khbg39Hf/tTn6Klx8YvxrQ2Ar7rmR3XyHu2BZM6EJWd9aHxPXApTM0jEOd6ym1l8
HGNN/dRtZq/MMCpOl7WGPUztJ8OiDA5N/uN6jEp/NxlUmeXOGdo9tLjtVMIGDwqJIEkZy0
C1K5nwNpoRBhV3umlPyPQrHp90PSHHKK7zxov9N4xwpq42WF042OXzUxZgyJ2D8+AiiR7X
xIZWVhiQhp+Ua61Gweg7GI1yb3aU8MTqlh8kBp4aM6Y57VWezh/r9xVb3ad28A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359214; a=rsa-sha256; cv=none;
b=RYEV3qISgRm3Jz4rgC6NOC+D7V//Ir8KCD+msaEpRyQWJz6absBU0HMRQ1p6odkNMr9Dis
nd7NNq83tJB7mqo0B28md1oLYqxjAU95BiKcbPLtDA+QRgM40bFRx0vZaBKgB+fPLQAxZP
vdMVZCiL55CxhbUHC1dNvmJXV3MeHB6Fs/ey1fQluD3derslVkRi3cH7xm4At7vWNyAyNJ
1RTjtPtJneYtuJ1+f5Oaytpm8SdGkzh4UdxUyc2E9y0iRWxlU4DWkedqoSDPzCheXREBTD
jfHVVstp3MdNUtAS8iqweYbHLNy72za5dd0tlEf37PatihMBgkmUwPOyKBi+EA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359214;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=KovJX751ir8Agnl2AB4hfK3sJw2pC86gINKMyV5DjiE=;
b=vta01l18GObNynlCTAPwtlYqex4kL+GqnNMJRL4d77AZzj+aeMpRXcE7U/DFL1raDl7m01
xkxnS++LyJBDaTVh1VMxE87i8qBuvAht8R5l80lPM4nw8M3NnR4kQ1ZJyBkJ4gLaxptHWR
FaCLA/fuawsX2q4b5RbC9wmIuqiGAmw5vF1HIofLn2/GiK/ttDHo0NtBhfW+UTPzNBdeyu
F4JAd37VTWeXrmkFYpZ+xR0wWqFm1grqZOtx+NYefatKKXO1sEdOz7j7/zXqEd0HxcciQv
OVuMIUYasDJYc8VhJY3AnsKmrK0ddPN08s9XVkhMUgAa8+pgdMOGqoDyG8UD7Q==
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 4Wyhct5gmyzcFc;
Tue, 3 Sep 2024 10:26: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 483AQsdb009220;
Tue, 3 Sep 2024 10:26:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQsha009217;
Tue, 3 Sep 2024 10:26:54 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:54 GMT
Message-Id: <202409031026.483AQsha009217@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 7bcb1228558b - main - LinuxKPI: 802.11: Stop checking
for failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 7bcb1228558b4325fab39616e2e3b2573a9e7da6
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=7bcb1228558b4325fab39616e2e3b2573a9e7da6
commit 7bcb1228558b4325fab39616e2e3b2573a9e7da6
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:21 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:21 +0000
LinuxKPI: 802.11: Stop checking for failures from malloc(M_WAITOK)
As a consequence lkpi_ieee80211_ifalloc() now does not fail. Remove
unneeded NULL check.
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/compat/linuxkpi/common/src/linux_80211.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
index b46e56133725..a2791d20a727 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -4401,8 +4401,6 @@ lkpi_ieee80211_ifalloc(void)
struct ieee80211com *ic;
ic = malloc(sizeof(*ic), M_LKPI80211, M_WAITOK | M_ZERO);
- if (ic == NULL)
- return (NULL);
/* Setting these happens later when we have device information. */
ic->ic_softc = NULL;
@@ -4454,10 +4452,6 @@ linuxkpi_ieee80211_alloc_hw(size_t priv_len, const struct ieee80211_ops *ops)
/* BSD Specific. */
lhw->ic = lkpi_ieee80211_ifalloc();
- if (lhw->ic == NULL) {
- ieee80211_free_hw(hw);
- return (NULL);
- }
IMPROVE();
From nobody Tue Sep 3 10:26:55 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcw3zxLz5MkQn;
Tue, 03 Sep 2024 10:26: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 4Wyhcv6h7qz4s1t;
Tue, 3 Sep 2024 10:26:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359215;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gkLF24+DwR6EfaNjO9keDKhQzjvtnxIhBqNCDbvwpbk=;
b=sCcj9OKCb/vMYFazrIyUe7w/nBRrK+CdCIUySwUhoCrs0J1nhGDM0hiedO2yqPebKxcmDy
lC/CgQAsQTmzBc4FxyZo+NBysIlwrhJc8cQRUckLAyskhMAgwNIble4Ree8SLxW1kcKmAl
MZlMPnjdZ4MblSRgCV6jAjgQVRXhBrsMoS5RPeA/U8M2xq37jiBM+FanRmraSGPKjRXDgJ
9Sfsz7+6FOFk2FcErTVvyyjX48SUYrv0+RodYL9FUAxmRFeeJIMdUyVBOJ2Oe7rIh0LCRx
xGlDla5jlnFCpHYXkYMMF2peBHbtKhVT2rORTX3XWAI6NJpQtMWsPNO3/huzKw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359215; a=rsa-sha256; cv=none;
b=tH3BICPddn86dOuG/u5cTFKDBULxfFuVWAt5En+VlIEARxJvaou16mWnVDHq3d4FGUkL+C
BomcbFkublDwJJCwYWSXg2mKfeg4JLCi8GpECKYEY3NTHMwzrKN1n5QZ9lgot0W+IFEqMg
RQTgcGLFfcTrmxDgggLPaJjB8+2DF3uDw6mH2UR8eg53T/jPAWkfOzu07LITRUtwC5vWle
dPBTdml4aXgonM4RnU7IiavuiFoJJlAICxiVdFcJaRfrNg+3v48UpAWYDI9VxMroRb3qBo
r58PMnFT2ddyt7hG0WwBElzACH7V2L+AhrhvvaxgBnTO1X/RjayHlmBSbvjkVQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359215;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gkLF24+DwR6EfaNjO9keDKhQzjvtnxIhBqNCDbvwpbk=;
b=Zai09Puge7+z6i/fHtZDeFxake1MwL1VNNL9r+4GONWr5wjA07EX3mZ1ToRB0gXRfUWoeQ
pb2yNN+Sxu82qvsHfOzwOWpa4k0955VxFAIwsRURoswqBxc8S4aGEfRVjxUGhSlcduqcKQ
0ZcoVCCgquQyuts706VKXtxq8nTKwNYLli6C07CNmeM/n7+i3O4ctH4SpD5PBcmKnMbQ+5
qWTMpdDdOwpeyFw0r85kW2rnYfRNcMBumkh0BSI0ALMdZ8v0pB92Y45ZAQbnCsRlhz1nO5
0yb//UDik3jQC5vgfTygOfoJ8Ca3vcVM/q/2Hj3rs2ztZvF/N9aoHA4kITIMvg==
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 4Wyhcv6JXbzcLF;
Tue, 3 Sep 2024 10:26: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 483AQtk7009268;
Tue, 3 Sep 2024 10:26:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQtJd009265;
Tue, 3 Sep 2024 10:26:55 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:55 GMT
Message-Id: <202409031026.483AQtJd009265@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 66c35a6675ff - main - krping: Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 66c35a6675ff987b52a2018871231658b1980a6c
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=66c35a6675ff987b52a2018871231658b1980a6c
commit 66c35a6675ff987b52a2018871231658b1980a6c
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:21 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:21 +0000
krping: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/contrib/rdma/krping/krping_dev.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sys/contrib/rdma/krping/krping_dev.c b/sys/contrib/rdma/krping/krping_dev.c
index eea3c772ea4f..59aa19672443 100644
--- a/sys/contrib/rdma/krping/krping_dev.c
+++ b/sys/contrib/rdma/krping/krping_dev.c
@@ -174,12 +174,7 @@ krping_write(struct cdev *dev, struct uio *uio, int ioflag)
char *cp;
krping_t *krpingmsg;
- krpingmsg = malloc(sizeof *krpingmsg, M_DEVBUF, M_WAITOK|M_ZERO);
- if (!krpingmsg) {
- uprintf("Could not malloc mem!\n");
- return ENOMEM;
- }
-
+ krpingmsg = malloc(sizeof *krpingmsg, M_DEVBUF, M_WAITOK | M_ZERO);
cp = krpingmsg->msg;
while (uio->uio_resid) {
amt = MIN(uio->uio_resid, remain);
From nobody Tue Sep 3 10:26:56 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcx2Q97z5MkNJ;
Tue, 03 Sep 2024 10:26: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 4Wyhcx0YbFz4s0P;
Tue, 3 Sep 2024 10:26:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359217;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=nRYcuNCh3MACQZVpbyN2lvsQ46OzBS4zm198iIiOKV4=;
b=COhKEhOTUqeBO2X2rFB+p0EbqsOzHpwrq5fa1K+Cu2PbBUzuoar+BlJdIiTZvi8uaNUeFx
DUBfoVLevTXReg8C3FSaqiN+QT5Grx88a/0zmCZ1zU/lUG785egJWkvCNluY6GvJ2ckbCY
fQUwqHEJo/hsjGsQHDuToHKM5wwpC9R+AmYoLtpg0lhFhpFb4RLS+27YGRBU99jk0AkSse
LWzdvbm5zY/cCTnmO0Ymn6dbWIHW4/KHzqFD3bRGFXTfFKYlRbFOAmEiGfkmag/KiJKB1i
m4i/qNo22rNh20aWE74aNCitHX8AjFHpyJikEuAK7KviZHUNz9MN2SBUIVJeCQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359217; a=rsa-sha256; cv=none;
b=jL3SGeH1+WBS7aRGSnPqER3u2xW6CpSZkcFnQa5/nNAO3QW772lmpwjrGVUe4IhDcJ2EpF
w4LZsnszwfn+jFx79by1mR5KVftcaUeLQN5l322E14qnvWBxd5nPKLmZW0x7z1grl8AW9G
n7jo9KyeC30J8z/jiZO9Dc/dklTKyKylmvh6qbtsdDfDtZDB2VENKbskL3xeO6A+Q9BEiP
i3Wh0ZVvutMDLGzrioZord2gTFLu1tvnJyU+UeFFyq/ILg1w5OlWLtGURrgt+U56U7aRHF
rzclT4a9CM9GTD/1H5U0y6XUHTaWg3c06QZ3Q9ka8rynIz9Cj8QiZPFzWxUtYQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359217;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=nRYcuNCh3MACQZVpbyN2lvsQ46OzBS4zm198iIiOKV4=;
b=Sa0TgObNKhBJY2viwTfva9PSl7KTtSAnmZBab3iySDwbEdBgVW5e7UvkE3c3QNOBQxTIos
E5n2NWgvL7ofix42+f31lSJw9ca1lB2TgJqHoFBATfrY/IsoKXXJR5oEvAL0tKlqMDk0uW
dKXNIadYv02MvHR5LgIp1Pj3eDNmqt87GJ3J2Z1LPjuyjksqF6T+KDqJEquM01G9wYnNl8
H8YeS/lOJDR8xQ6EVPL1Avt0gLbHj4CdCazUyvbb3YEacdhU4YybSTvYSraUFoFfUV8lF0
2xrIuy2WTZv8b0TsoSrs7ZNZSq7HlY9hhrZk4laTfoiqkTRa4RHX758lTCD6tA==
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 4Wyhcx0B7szcVP;
Tue, 3 Sep 2024 10:26: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 483AQuvn009316;
Tue, 3 Sep 2024 10:26:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQuRF009313;
Tue, 3 Sep 2024 10:26:56 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:56 GMT
Message-Id: <202409031026.483AQuRF009313@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: aac6c41d4ba9 - main - tests: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: aac6c41d4ba9b0a1aef561f6c4bfd284ab369ebf
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=aac6c41d4ba9b0a1aef561f6c4bfd284ab369ebf
commit aac6c41d4ba9b0a1aef561f6c4bfd284ab369ebf
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:21 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:21 +0000
tests: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/tests/framework/kern_testfrwk.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/sys/tests/framework/kern_testfrwk.c b/sys/tests/framework/kern_testfrwk.c
index 19691f1febfc..949300290b9d 100644
--- a/sys/tests/framework/kern_testfrwk.c
+++ b/sys/tests/framework/kern_testfrwk.c
@@ -192,10 +192,6 @@ kerntest_execute(SYSCTL_HANDLER_ARGS)
}
/* Grab some memory */
kte = malloc(sizeof(struct kern_test_entry), M_KTFRWK, M_WAITOK);
- if (kte == NULL) {
- error = ENOMEM;
- goto out;
- }
KTFRWK_LOCK();
TAILQ_FOREACH(li, &kfrwk.kfrwk_testlist, next) {
if (strcmp(li->name, kt.name) == 0) {
@@ -244,10 +240,6 @@ kern_testframework_register(const char *name, kerntfunc func)
return (E2BIG);
}
te = malloc(sizeof(struct kern_test_list), M_KTFRWK, M_WAITOK);
- if (te == NULL) {
- error = ENOMEM;
- goto out;
- }
KTFRWK_LOCK();
/* First does it already exist? */
TAILQ_FOREACH(li, &kfrwk.kfrwk_testlist, next) {
From nobody Tue Sep 3 10:26:58 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcy47Gkz5MkQq;
Tue, 03 Sep 2024 10:26:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhcy1JWkz4s6j;
Tue, 3 Sep 2024 10:26:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359218;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=7wxfPr0BcKNbQ7aFxiekFpCzDqzM43XFcnliugXvXrg=;
b=x/6geADeQDpqrQQH8DfMObykDwk0IUCcUcxhvvw6EqQ3ejtlnqj68R7LiWJaijbz/dOlAl
Fx7gs6qA3VDwugiKfPf59UCFUHruL3XEk0nGsz0be/M/ZnVHu2MPJz4h7evKrly+sYdIrR
R9sGLL+RywbyxULhLVjzpv4Qymro+oqP0ql0aKpIRw41ydYbSF34Uies8k71wqcpoiU4H6
E/DF5RRPeNdLkUkpMYYhTqctTGRrrk4vvT9izJ3D6s6bAPRwhrp0QGUP8vitE6j2QkRex0
LbIdJZquuYP4Ypy+0cTwZq3PUPRPtWSWsncU/LNAr8BTLJOPXAaydVPSjowbCQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359218; a=rsa-sha256; cv=none;
b=kdUzDqM0VVYHhYo12AbuWGBbnf62dQW3IRPminEFQrDm5M9C/042v4xOLZlp8rsIz5V6oG
xGOEc/fNxXGBUb9cNkpFPZoDCK6ydTEEibuvbzHIFb0lndvv1BCPmFxS0YGReZcB+Z4I6s
2crXTXp88EOsuJfQ8jf3AhpglR0BPRlibIPm7yksSJ5vMWSH8IeXchTXbsEac4hCDwSNYi
c/TR7YxrKu0GBBlRHlDAD+X5vriync3Cvt4qApBGUgkVIz+rPYKXIyey4RRlFjWyeaVcnw
onZ184YqPjHzFvUWw0BBYXnrZROv7kfZoSH6HvQl3J+e870YFlj2FETCf7hOtA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359218;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=7wxfPr0BcKNbQ7aFxiekFpCzDqzM43XFcnliugXvXrg=;
b=dZchhSNEseLZNRRsQThXUhUgPgILyzGZNHBkZ6gA2lPVVG0ZOD36nKfIsmqlTjTqsYzXhW
TgQujCGPtqRwCOHTpDBEeM1j8ScYtbvkqPpuG6JGxN+7lMwHKt2JZEpb0p99X62qXGJNcc
xfX2Zu0ebEeFPR02crsuQmj/3v0azmOrZ3RUeFOsKUX46Kz8PPlhhKLk/+Ohv9h3NMXNKu
H5d5N+kWCWKX4rNdeLPV0ufFCrhnBuhUic457DZ9tMa8PsrHdhcN+dks7nOcQvH70JCpNi
lApuB2aztJ+IRC4it5FxMIb9TQHSq5BZVTcoSaZuoVmhbS11CLFfD4tR1WxXjA==
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 4Wyhcy0vwszcxp;
Tue, 3 Sep 2024 10:26:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483AQw1b009367;
Tue, 3 Sep 2024 10:26:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQwYC009364;
Tue, 3 Sep 2024 10:26:58 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:58 GMT
Message-Id: <202409031026.483AQwYC009364@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: fe6985ef87e1 - main - arm ti: Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: fe6985ef87e1aedf8e5c9b3b959c7dd54a03e2fe
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=fe6985ef87e1aedf8e5c9b3b959c7dd54a03e2fe
commit fe6985ef87e1aedf8e5c9b3b959c7dd54a03e2fe
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:22 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:22 +0000
arm ti: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/arm/ti/ti_pruss.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
index 85d075419fe8..b7a04f2cfb42 100644
--- a/sys/arm/ti/ti_pruss.c
+++ b/sys/arm/ti/ti_pruss.c
@@ -184,9 +184,6 @@ ti_pruss_irq_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
sc = dev->si_drv1;
irqs = malloc(sizeof(struct ctl), M_DEVBUF, M_WAITOK);
- if (!irqs)
- return (ENOMEM);
-
irqs->cnt = sc->tstamps.ctl.cnt;
irqs->idx = sc->tstamps.ctl.idx;
From nobody Tue Sep 3 10:26:59 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhcz5VSpz5MkYY;
Tue, 03 Sep 2024 10:26: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 4Wyhcz2pDHz4s5K;
Tue, 3 Sep 2024 10:26:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359219;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sPkUsLLelb1WbRu1JKBEMLAOiMvIc9ms3zuw+GhXwY8=;
b=jMuMbd49tZ6YIgceVvWgNzsCZEKu81RpCzRsFyB+LtoaVU+EpWrHkYv0nE7XEmQ+thjG5f
HhBrFB5/ePrXSZvVX1uy99cCZgyW0OrEbND5o/i7CF3P2C9NNCGMuIt1nnLxbBNxH/5Ph9
OUeopmrVE+CmOoGJr9V/u6G8A+aZP4tCHpUFYsAoruPPHuKr11aFo0z/g/OPoqPaMOYdd8
FTrLBrm3orIg6pbU7Ov9pVpjP9Uih8iGY0SYZlDLPy9AOURYhj5iGcpboDoqyg+DLkV4Sw
FTV70RR/UZJ/U+xuNZgC/ULH/KF3QDKjoLMY1RvonLTUEQPnZOx7X0PxezPM8A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359219; a=rsa-sha256; cv=none;
b=ZjveKVMp3dmwtJzKzx/uKS/clB53tE0yQIzqG9LlupuCBAQjEzO4bEyNbXY5hqy3Q403c9
HqPDMNMFIwHX9MddPmxt1c7A300lgViE8KWQNHpOcYyZVoub5Kry+QELLFj4LnLiYWgMzm
2aZodZpTdY4o1Vd4hEI2AAlJnnC+28Hb+kQGY8EAu8m9yAMhpn9uIhQHf7fxtKkSY3yULg
Hn8xgFHn93vK8cBZnAQ0osym/ZLUDyF4EO70ZutJAqk3ClKxHPFHlwxqKh+IOOsc8Gzav2
h6wyDwldsGBrHVCG8+CubIT9t08LaKVfWW5XlbvcbRZctfiCn/L6Zx2ztANVvw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359219;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sPkUsLLelb1WbRu1JKBEMLAOiMvIc9ms3zuw+GhXwY8=;
b=S9jGFKPXD6XAFrVGPm3SR5y+YkJZvzEMFVMq5tUsJBYLzBFNqxSfsBXctxK6ePPcy426Xq
vwvhlSuXOkpPrY8CDEgVfwoLIQRFGEkRzeEH7xM3HXB2mpubt3kULs+vDZX72yUGR3ngIn
Ep7xubrLffFWpnqKbx9gmYREPK/7wD0OohtcFvQqj9fg/F28SRGOcTC15SL7khpDAT7B1L
G5LrurfNmqwzuilXOqBu4zxDjq+Vqdc+T/U1nvf5sH6aG+j1WKNfo118ZOOBhC+aTsxhox
1NWiDPbyT2YT7q3tpE0EkvrxSZS8+I0IyxMlSX1/UQHL2XeR+2/N1EC4SYfEmQ==
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 4Wyhcz2JnRzcnD;
Tue, 3 Sep 2024 10:26: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 483AQxR9009416;
Tue, 3 Sep 2024 10:26:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AQxmO009413;
Tue, 3 Sep 2024 10:26:59 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:26:59 GMT
Message-Id: <202409031026.483AQxmO009413@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 1d321c1907c2 - main - cmn600: Stop checking for
failures from malloc/mallocarray(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 1d321c1907c210a33192ff5293f5c23554c96867
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=1d321c1907c210a33192ff5293f5c23554c96867
commit 1d321c1907c210a33192ff5293f5c23554c96867
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:22 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:22 +0000
cmn600: Stop checking for failures from malloc/mallocarray(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/arm64/arm64/cmn600.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/sys/arm64/arm64/cmn600.c b/sys/arm64/arm64/cmn600.c
index 4e3be8fee40e..530cdcdc3d06 100644
--- a/sys/arm64/arm64/cmn600.c
+++ b/sys/arm64/arm64/cmn600.c
@@ -332,9 +332,6 @@ cmn600_create_node(struct cmn600_softc *sc, off_t node_offset,
int i;
node = malloc(sizeof(struct cmn600_node), M_DEVBUF, M_WAITOK);
- if (node == NULL)
- return (NULL);
-
node->sc = sc;
node->nd_offset = node_offset;
node->nd_parent = parent;
@@ -399,8 +396,6 @@ cmn600_create_node(struct cmn600_softc *sc, off_t node_offset,
node->nd_children = (struct cmn600_node **)mallocarray(
node->nd_child_count, sizeof(struct cmn600_node *), M_DEVBUF,
M_WAITOK);
- if (node->nd_children == NULL)
- goto FAIL;
for (i = 0; i < node->nd_child_count; i++) {
val = node->nd_read8(node, child_offset + (i * 8));
node->nd_children[i] = cmn600_create_node(sc, val &
@@ -420,9 +415,6 @@ cmn600_create_node(struct cmn600_softc *sc, off_t node_offset,
break;
}
return (node);
-FAIL:
- free(node, M_DEVBUF);
- return (NULL);
}
static void
From nobody Tue Sep 3 10:27:00 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd05sCbz5MkLv;
Tue, 03 Sep 2024 10:27: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 4Wyhd04N7Kz4sG7;
Tue, 3 Sep 2024 10:27:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359220;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=nU+lp8k+LV1c3yYym7YcUY4XB5JfKLUrMwyk5m/gKAw=;
b=VnKIdL8pPEI+tLAXYf22BagtopCahn94mNdeenvIGyzvpyx7fvOUClZCuCRpbFf7fjLQ0C
bMwiGM7KPcjqQC+5ExO6Q0Z4xgULQW+vixaweVhiOhcmiEO8ziyqdUjjcoohhBC53zGKmz
acPL0hWRuVnFUTss+9x72kBiMPuFxllTmnQb2OZaEw79Ragiw2UBokfUkfIkzwlWj84A8c
oc3oI8NA5S6+rS+KEooV6s52AmE2eqy8A3WzyaAV+nacpJuqYeRJuoMKT1dEPSD7PAFcDZ
a7vNjczbnSC//5WyGzFVN3jYI5RpF3h3F1THuwqF5lBnXf+PD+QYvMHRILHJeQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359220; a=rsa-sha256; cv=none;
b=QzfJknG+9i6cbZRcbYotAi1sA5Q48l6mJ0djPrdj1cR9x5WMHvM4V48+gxxbEVZaMWUBoI
yfQtdN/kmIdbGp+ap+PC8Nusu6m8k03p+Ev3qPnsTDW400fU0t2e91xS7gi0DjAs0INPTF
JZFaWfDjqCqjXEZgUMNVOOj3cxQxEeGSKH6qXhQk+P65YM5OmqNBFB1C3r3PkDOsG/GWET
bcW72sWZCjMWH8ufVIWa7dHpjvO3MQTIvnz+/lbzMeLheL2tcT0JJMNFSwz7YJxWlmZboU
jF4xpW0zbxojbrW8MVsRM/Vc56c5KMk3ZSmJ7rBsQwpt88yeTEyqeoVsXmASqQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359220;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=nU+lp8k+LV1c3yYym7YcUY4XB5JfKLUrMwyk5m/gKAw=;
b=OSc6lSek9KqAkOjWn0M2g5UjRzLCt8Njm59DxfqkNUIq1phGQJ8a30D335Z3E+WkAWAUam
XoeGxpNvWdgHc9XYMTvWKDCLJHsg/bN9OyYmSsx763E8Yc01Lb6nwd7RFZitKEQSCvmhq7
cw/Oc4C5m6az6Z5knD4b8+ueOQeBS41trrTf1Ye6ucNJuM2wOQ5OHgYVygLeiEWXjjT+E7
gMgOMJfGiYPVkqePSjm3cPaiNManOgIQ+geB83Dust8nhWmEtBGZW8HJoW5gRkIs5YW4Vs
ICjr1uNSbjroa2A00n62wLiJhb1KibwcM+usy1pRCPFujdqP7RyqdFoKYaKEhQ==
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 4Wyhd03Smgzcsr;
Tue, 3 Sep 2024 10:27: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 483AR01W009476;
Tue, 3 Sep 2024 10:27:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR0Ed009473;
Tue, 3 Sep 2024 10:27:00 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:00 GMT
Message-Id: <202409031027.483AR0Ed009473@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: f75ceecad215 - main - smmu: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: f75ceecad2157a0d3aca61a4893ab78f2dec21ee
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=f75ceecad2157a0d3aca61a4893ab78f2dec21ee
commit f75ceecad2157a0d3aca61a4893ab78f2dec21ee
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:23 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:23 +0000
smmu: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/arm64/iommu/smmu.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c
index 93b0cbb7c8e4..a832f6a6ec70 100644
--- a/sys/arm64/iommu/smmu.c
+++ b/sys/arm64/iommu/smmu.c
@@ -960,10 +960,6 @@ smmu_init_strtab_2lvl(struct smmu_softc *sc)
sz = strtab->num_l1_entries * sizeof(struct l1_desc);
strtab->l1 = malloc(sz, M_SMMU, M_WAITOK | M_ZERO);
- if (strtab->l1 == NULL) {
- free(strtab->vaddr, M_SMMU);
- return (ENOMEM);
- }
reg = STRTAB_BASE_CFG_FMT_2LVL;
reg |= size << STRTAB_BASE_CFG_LOG2SIZE_S;
From nobody Tue Sep 3 10:27:01 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd15Tlyz5MkJv;
Tue, 03 Sep 2024 10:27:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhd14n1sz4s2t;
Tue, 3 Sep 2024 10:27:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359221;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WAimFSsosdG+ZKS9aUVF6OYxdRPMzobc7MjAh6Zcv4g=;
b=bUWmh9BlYMT8x5PFU8Z5EMOUOTGUSwf2tcb2rRButNX5cKhjGAhLmpg6H4S8SFH72V6fBQ
Dl45Gpm6bYmWRw0vAXA7Mq/pOJCnJQTa9wOTKJtovV8OdH6waYkGjp5rC19Noh5JkvjPiN
79ZPknxvVYRcfXFUdC9iIKh37f99VCuolL1GjBYjldChfDFwxhUpxQcHoeOApU7DrcjHHA
h7C2WAIPxdxAo07PUjj/rtHHMXZozuszlJcUXuzrUeWQ3E/hOe1Q7CkMBUdLfo8Vc95XEd
T3ZWSIaXRgCIcps/HnIZHUtMmmBSTx7v3/uNRqyAHF1doiiWhq0o7v7tsxzPig==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359221; a=rsa-sha256; cv=none;
b=eRkUOiP6idZL06HcmQlXGlNCeHbwPLuzC6EWWH1ay7XNlr+GktIaf0B8a3ccDrox7WUB4w
YsS47zl7uRRg+dxHi338kOnOytwhgX6UrInZd8dWmQm8hMISqcw6FNXw/UzBKsE0PlZbP6
2UcXeHXuU3n7tQiyGkWGs/bEte+row3wwTJ/sQiKCjqoHYM5UTFzQ8Xi1+xdKetvHGemfW
PMu4Ht7lZf61Bn5tkhXF6iwuXmKcfZCp7C4FkyrRenwJ8gneX/c8AxES6ZbI0Eb4hyvo/b
wl5JQfnweTm/UMTDamSkhJFywj/Unl+Wbr1u//G51t8XDQaujxT1/xpzQ1R/EQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359221;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WAimFSsosdG+ZKS9aUVF6OYxdRPMzobc7MjAh6Zcv4g=;
b=nt0R1E+gZxFcpFmEsHGg8qceRKFpy6z/B+pKQimg5/6Vj0X1DE1BnmLcMK4xq5APRTop1N
+eVZJt7+kU4mzU6kpigIXf3LVljTf/175j2hUT7davQWG9eHbzCIiuKLTNf7YUtEgmGIlI
jpKZEQWGYh/fbmPSik/yJ3ktzHMYp5XvS3uF5iSyzxjrM49V3jq+3p8aN7U5rPrOVVpyJy
LzLQr33k943HW6xDP30+zKsll/XF+Rg9/XbHMfgCHeWHYzKMsjKzFQbb7RRWpQM15B5BPB
Wja1k0uKu2XLIc0xRIXLQsAnuvHTVkmYx7oloYWEC1Z6WCodU94nL1ybgldiqA==
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 4Wyhd14H2PzcJv;
Tue, 3 Sep 2024 10:27: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 483AR1dp009524;
Tue, 3 Sep 2024 10:27:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR1iM009521;
Tue, 3 Sep 2024 10:27:01 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:01 GMT
Message-Id: <202409031027.483AR1iM009521@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 00ae9c1be02e - main - al_eth: Stop checking for
failures from malloc/buf_ring_alloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 00ae9c1be02e2db6ede1abd5b787bb9a3fbd76b0
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=00ae9c1be02e2db6ede1abd5b787bb9a3fbd76b0
commit 00ae9c1be02e2db6ede1abd5b787bb9a3fbd76b0
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:23 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:23 +0000
al_eth: Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/al_eth/al_eth.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/sys/dev/al_eth/al_eth.c b/sys/dev/al_eth/al_eth.c
index b8dd95e7ca58..e12c8dfcc281 100644
--- a/sys/dev/al_eth/al_eth.c
+++ b/sys/dev/al_eth/al_eth.c
@@ -2004,14 +2004,6 @@ al_eth_enable_msix(struct al_eth_adapter *adapter)
adapter->msix_entries = malloc(msix_vecs*sizeof(*adapter->msix_entries),
M_IFAL, M_ZERO | M_WAITOK);
-
- if (adapter->msix_entries == NULL) {
- device_printf_dbg(adapter->dev, "failed to allocate"
- " msix_entries %d\n", msix_vecs);
- rc = ENOMEM;
- goto exit;
- }
-
/* management vector (GROUP_A) @2*/
adapter->msix_entries[AL_ETH_MGMT_IRQ_IDX].entry = 2;
adapter->msix_entries[AL_ETH_MGMT_IRQ_IDX].vector = 0;
@@ -2299,9 +2291,6 @@ al_eth_setup_tx_resources(struct al_eth_adapter *adapter, int qid)
size = sizeof(struct al_eth_tx_buffer) * tx_ring->sw_count;
tx_ring->tx_buffer_info = malloc(size, M_IFAL, M_ZERO | M_WAITOK);
- if (tx_ring->tx_buffer_info == NULL)
- return (ENOMEM);
-
tx_ring->descs_size = tx_ring->hw_count * sizeof(union al_udma_desc);
q_params->size = tx_ring->hw_count;
@@ -2324,10 +2313,6 @@ al_eth_setup_tx_resources(struct al_eth_adapter *adapter, int qid)
mtx_init(&tx_ring->br_mtx, "AlRingMtx", NULL, MTX_DEF);
tx_ring->br = buf_ring_alloc(AL_BR_SIZE, M_DEVBUF, M_WAITOK,
&tx_ring->br_mtx);
- if (tx_ring->br == NULL) {
- device_printf(dev, "Critical Failure setting up buf ring\n");
- return (ENOMEM);
- }
/* Allocate taskqueues */
TASK_INIT(&tx_ring->enqueue_task, 0, al_eth_start_xmit, tx_ring);
@@ -2476,9 +2461,6 @@ al_eth_setup_rx_resources(struct al_eth_adapter *adapter, unsigned int qid)
size += 1;
rx_ring->rx_buffer_info = malloc(size, M_IFAL, M_ZERO | M_WAITOK);
- if (rx_ring->rx_buffer_info == NULL)
- return (ENOMEM);
-
rx_ring->descs_size = rx_ring->hw_count * sizeof(union al_udma_desc);
q_params->size = rx_ring->hw_count;
From nobody Tue Sep 3 10:27:02 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd30bLqz5MkR4;
Tue, 03 Sep 2024 10:27: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 4Wyhd264XJz4sGP;
Tue, 3 Sep 2024 10:27:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359222;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ymxQFqvsMpubtCu2ikT5jCpg0GFOkVQGEjADwGNWJ4I=;
b=fJOsLH0tgBAxz0BTxQyvwpqoo5pfmidYaUOxvIf1Stgfq3Fp8ZeNdDCSl8vnY5aPBpVJKX
udilLB7EOWuXNV36EEP1jXPW1AGBw+kBEVTgbC3Y+DAy6TMrOK9A5uJ1ebj468Z5R9F/AA
L/j7gmtVHoaaJc3l2Yrb+0ezaaAtEPDxtsss9m5vssYXmZAdj3YgU2HNjkp+hj64sUyxoV
JVz3DqYuBD3OGpxrxei/zQdo9bYR/zQzoPCHy8XmDpP1WzgJFmBELVt5H/jqGEHv6dOqXR
+ekL1h2p/0swxNmBB816v/B4h1PRl45witrNBO+EiHTPGrke7xd5nC1M5ynHBw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359222; a=rsa-sha256; cv=none;
b=kK+FIUS20hgV1WvAWkcTmuxjkdkyXbvjBCuwMEpp1eT0xEWfZO47N7wPMFaHm7jfgoFrJh
vfHWKgkS6Ybsnli15wiZkLwxbchsJQx+ELvGaubA4hLuGzgRjIdkbS5RuttM2fMewfB9Vq
HXqF3lbzHSA4UfEHnMVVUHb6qVE/e4+Sh/hYR3kvnDPxQSwCOdbGzFirf9lP/ooVIv3tds
nOucrFo151r2Uz2VWOZQu5hAi9j/27lqVmuPm31QoiPmJwWB7fndMHPsr4PsWteVbHh7to
ZbTMp+3OWPRRfdLrpfgp7pHtCZNca+Ol3cmoCdo4NZmGzMiUhdfWCqkg+cQYvQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359222;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ymxQFqvsMpubtCu2ikT5jCpg0GFOkVQGEjADwGNWJ4I=;
b=m+ciY+OpUIj6i0x706eBXlz3/gTLk8RXwYQpAglhsGgW490/EbcbXzU58emNzx7xBZREji
oL+VxelgkXPama9UhyIpj3gqTqFnInJ5qh/7h8aY9f3xChlTo6xWH3UZKh07JeJxfLzqNd
bSby2IfeZUROcnjXn6b/LAIXc+wQ2/oRXV0EtNKIe8kjMWJvPm93gnr0b6J0fc76QnRRDy
f0wrlzEVekr8O7iQz+L5HxSKPquC0wqiFQ3ppWifpoNGccumZ/ymmmTwq0QRin9yjHdURP
ELBoIHtZxls/5m7B1atsDjF8HlWG7nFMaf4rTYhAjh5dbX/W3vIlBX8M/xqJqQ==
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 4Wyhd25jDnzcb3;
Tue, 3 Sep 2024 10:27:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483AR24I009572;
Tue, 3 Sep 2024 10:27:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR2E3009569;
Tue, 3 Sep 2024 10:27:02 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:02 GMT
Message-Id: <202409031027.483AR2E3009569@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: e06e2c840747 - main - altera: Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: e06e2c84074740a0087193d5929d09f1bc7e1c4b
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=e06e2c84074740a0087193d5929d09f1bc7e1c4b
commit e06e2c84074740a0087193d5929d09f1bc7e1c4b
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:24 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:24 +0000
altera: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/altera/msgdma/msgdma.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sys/dev/altera/msgdma/msgdma.c b/sys/dev/altera/msgdma/msgdma.c
index bb35d7315b6c..c5c75a5fb5e1 100644
--- a/sys/dev/altera/msgdma/msgdma.c
+++ b/sys/dev/altera/msgdma/msgdma.c
@@ -356,11 +356,6 @@ msgdma_desc_alloc(struct msgdma_softc *sc, struct msgdma_channel *chan,
/* Descriptors. */
chan->descs = malloc(nsegments * sizeof(struct msgdma_desc *),
M_DEVBUF, (M_WAITOK | M_ZERO));
- if (chan->descs == NULL) {
- device_printf(sc->dev,
- "%s: Can't allocate memory.\n", __func__);
- return (-1);
- }
chan->dma_map = malloc(nsegments * sizeof(bus_dmamap_t),
M_DEVBUF, (M_WAITOK | M_ZERO));
chan->descs_phys = malloc(nsegments * sizeof(bus_dma_segment_t),
From nobody Tue Sep 3 10:27:03 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd42jsCz5MkWl;
Tue, 03 Sep 2024 10:27:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhd36xz4z4sKN;
Tue, 3 Sep 2024 10:27:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359224;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XbN/JETQK4s4R887eJsjnhwPQ4dFtXuyyNSa+LhVlsg=;
b=Hg4QB32H0jaqT4O3mtKmCFu2xm+xAjNeKutYREDeJwQR0DsCO2pnEKUfq0ernUo1I/OqkC
dZSeF+zfkspmQaud2a7wLlVavjt8753gUrtpIjlPNS1YZed4MyWfC0xP6zO40fE9ZEbEPE
FR6XnJKH4vQYOo+gjlMBlNKp/bVHU6exNpXLB/HlHf7j5fIDw8WK7RYxky1RRHvYcPyYvE
6B/QwlNAysGmbmw2aiZdax+denyUn1a+4fwSttL/rhVaGBZRb2uDFGuq5WUM4VQ8bx1+7r
jhbFEwMqVoq+dCdyzvtxKNM1MyDzNPJXxdeZXPql2Ayo1wVg+mmbvpGKf76zzg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359224; a=rsa-sha256; cv=none;
b=uJXLanu+4CB4skXWmwfGS0D6aLj3l0XkyYRGOYzvcXzQRV4kDPI/Oce6NKu/+KBZXFNjXq
YQyt/8gj51JoeX2hzeP5L7WVgqcoo4eKyItsWZSUcTnK0MmUI1mJ95ZcBS/9lupTbwLKt2
gOJAC9BeFrFinYFNetjMnxH0wMcq2N303VtoZJa8J448LNXAzm2FEh/xGkccc69MOOMrxB
4FAOTncJqiEMqfnTp7rJqbSD4BZDQEZv30jKNcjzS0adFgNbMUHRidjUpBfoadXB5ysfIP
5YGX8T4U6wVfVzGngiInxhsS05M0/hLI4soC0LbCwvZnljGlQ7lIv3aUpDM/cQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359224;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XbN/JETQK4s4R887eJsjnhwPQ4dFtXuyyNSa+LhVlsg=;
b=H4L2zUONB1mJPFbQLR9+lDMS16Z6y47ga1dkxUv22zpLYLaxf1Ujx1Ag/TwVA2aWLcufVO
JB0C5HrQR5HLqi74fNY2t/6g8/FlG8p6pzt6MH5Sge9uuZCfqIeyQh4XaeydWN7AXM05Xp
1eGnKw+2JxAXC0iRYxjcnNNSI8WW/rbZuqcbHBDjU6k0LSkwL8fgSWOEsJNIkGXEkXxrj6
3lXsZvhlvMMXsQzYmQGI6PUNrGaJOOuhorvolX5e/Dra78jC5E+r5BZerbPOa7Jqu42wxx
OxvxpBSri/ouZVxz5W6UFqDKzQJQwPl/cUnQFC841Xc3DvvHIiTsd4Xfykjd2A==
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 4Wyhd36YyZzcss;
Tue, 3 Sep 2024 10:27: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 483AR3hj009626;
Tue, 3 Sep 2024 10:27:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR3LO009623;
Tue, 3 Sep 2024 10:27:03 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:03 GMT
Message-Id: <202409031027.483AR3LO009623@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 3fdf587ab02f - main - ath(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 3fdf587ab02f33018bd042094e3d0bd4169352ed
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=3fdf587ab02f33018bd042094e3d0bd4169352ed
commit 3fdf587ab02f33018bd042094e3d0bd4169352ed
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:24 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:24 +0000
ath(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/ath/if_ath_lna_div.c | 6 ------
sys/dev/ath/if_ath_pci.c | 5 -----
sys/dev/ath/if_ath_spectral.c | 7 -------
3 files changed, 18 deletions(-)
diff --git a/sys/dev/ath/if_ath_lna_div.c b/sys/dev/ath/if_ath_lna_div.c
index 1b20591fc64e..0755bb667716 100644
--- a/sys/dev/ath/if_ath_lna_div.c
+++ b/sys/dev/ath/if_ath_lna_div.c
@@ -96,12 +96,6 @@ ath_lna_div_attach(struct ath_softc *sc)
ss = malloc(sizeof(struct if_ath_ant_comb_state),
M_TEMP, M_WAITOK | M_ZERO);
- if (ss == NULL) {
- device_printf(sc->sc_dev, "%s: failed to allocate\n",
- __func__);
- /* Don't fail at this point */
- return (0);
- }
/* Fetch the hardware configuration */
OS_MEMZERO(&div_ant_conf, sizeof(div_ant_conf));
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index 72f0a802aa5f..a242eab7a694 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -269,11 +269,6 @@ ath_pci_attach(device_t dev)
__func__, fw->data);
sc->sc_eepromdata =
malloc(fw->datasize, M_TEMP, M_WAITOK | M_ZERO);
- if (! sc->sc_eepromdata) {
- device_printf(dev, "%s: can't malloc eepromdata\n",
- __func__);
- goto bad4;
- }
memcpy(sc->sc_eepromdata, fw->data, fw->datasize);
firmware_put(fw, 0);
}
diff --git a/sys/dev/ath/if_ath_spectral.c b/sys/dev/ath/if_ath_spectral.c
index 58f21b526e93..951d66605981 100644
--- a/sys/dev/ath/if_ath_spectral.c
+++ b/sys/dev/ath/if_ath_spectral.c
@@ -112,13 +112,6 @@ ath_spectral_attach(struct ath_softc *sc)
ss = malloc(sizeof(struct ath_spectral_state),
M_TEMP, M_WAITOK | M_ZERO);
-
- if (ss == NULL) {
- device_printf(sc->sc_dev, "%s: failed to alloc memory\n",
- __func__);
- return (-ENOMEM);
- }
-
sc->sc_spectral = ss;
(void) ath_hal_spectral_get_config(sc->sc_ah, &ss->spectral_state);
From nobody Tue Sep 3 10:27:04 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd52852z5MkcR;
Tue, 03 Sep 2024 10:27:05 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhd514L4z4sMp;
Tue, 3 Sep 2024 10:27:05 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359225;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Kq6tYe4ztHlNPh7QK/j/QCVpUY3wYsOPLg2CF5TsbaU=;
b=Rgpo5vN0nALnMUMcnNfcDE3eW+BhRs7uXGk62qv40kPr1xv9CiTDP+/k5Qv/vWiErRz9Jx
C5Kutyav+w8nb+lvRm47DUC5+G3Fple9cv3aRbR7vFrpEoaZRQDBlnjBI+h9xJEXr55EPI
c3PrRIqBqAa61d5WUh/czTkMjj8dOxGBW9IkG20oQsoulAhyAdAk2b0C6GsNH7u5h8B+91
Mt9PKpJfIkzjnVhkOxNrFXzbjgpbLEKuEOS2xPyydANpcRXloEwdcvnAM7PDOCB4e0ESUn
m0dMwYaikFshLydGLuSBpnTNwAl5CE60WFtiLqUPmRgFpcSGrZkSXhr05wZtWg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359225; a=rsa-sha256; cv=none;
b=YsDtq3NpOZ7fvDE2Pdau1LJ+KtBxWTf2cSPL93iA6QEQ2Adn52/ez5SOGq3tsHy9qrsrTu
iVzYb6AqrQMYHxEGmaTvJPs3h8AB8eXEFWkYoBqszQBGE/KH9MMKpOyK0h30PQIX2dh0/G
o1zAbjGHRh8t85pf51HE6OFbAFeg+mkdGE3kqCMn+FgLCDugTk9D14BEDYAwKX1UJj8ke5
SEogMLz7/4yEMY8nkmoR3CgRpQiJuIGCQugp8ToQOFvVJEj7arY9V5DENZrLsQNRETtgoU
41S9YN+7dHR7jbKm1uSrXRIQN9yj7Yqfvk0Tfv/FPW0wqd/X155Po0JS7oYl7w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359225;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Kq6tYe4ztHlNPh7QK/j/QCVpUY3wYsOPLg2CF5TsbaU=;
b=NtmhxMiFEc8t2qBraYBV3SACBcxeDudD2/bstd3p8I7M8zhlRcX+bCTU1C2kz2Fa5F1Wdb
1tIQkEGycJ5lyRgl7kFdgUXOgV+Fqa3Fbxv+iA8ZWnI0FPNkHvATLD0gJnItqzIoCHymId
1+pRNy7/R8ipBZQSbVIHHb3aTbQo2z8b8/VWDQ+kR/WcYRVvbQiRq+hVnmyh+PnwEn7/D3
WHbjUy4m3ab9Yj7cJ/vN5PaOdZFrWeLze9lnGsufbI2Hc3OBHVma604TtEdyId66+nZhwd
m45MzYmfXK7H3Vm6EUkBFbm9N8wxwHMpcbhacqGuaTm+BoRkEJrpgoNue6ijNA==
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 4Wyhd50g1WzcnF;
Tue, 3 Sep 2024 10:27:05 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483AR4Dm009677;
Tue, 3 Sep 2024 10:27:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR4rf009674;
Tue, 3 Sep 2024 10:27:04 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:04 GMT
Message-Id: <202409031027.483AR4rf009674@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: ab0b996bddd9 - main - axgbe: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: ab0b996bddd96300d56b7d2aa830e2479cdfa92b
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=ab0b996bddd96300d56b7d2aa830e2479cdfa92b
commit ab0b996bddd96300d56b7d2aa830e2479cdfa92b
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:25 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:25 +0000
axgbe: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/axgbe/xgbe-phy-v2.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/dev/axgbe/xgbe-phy-v2.c b/sys/dev/axgbe/xgbe-phy-v2.c
index 5b39d61694e6..8c6069f83076 100644
--- a/sys/dev/axgbe/xgbe-phy-v2.c
+++ b/sys/dev/axgbe/xgbe-phy-v2.c
@@ -3771,8 +3771,6 @@ xgbe_phy_init(struct xgbe_prv_data *pdata)
return (ret);
phy_data = malloc(sizeof(*phy_data), M_AXGBE, M_WAITOK | M_ZERO);
- if (!phy_data)
- return (-ENOMEM);
pdata->phy_data = phy_data;
phy_data->port_mode = XP_GET_BITS(pdata->pp0, XP_PROP_0, PORT_MODE);
From nobody Tue Sep 3 10:27:06 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd66jc4z5MkYt;
Tue, 03 Sep 2024 10:27:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhd62VkYz4sPp;
Tue, 3 Sep 2024 10:27:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359226;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=TlSiW4OB6Wh1wa/6DypqGKEHReHAqX3DOQsmjJnXDyc=;
b=MxKGiSbQ6SvybPGM5c00A8maGRrPtWS6htIkFOtI32a6Q6n1Q0bpoldVftlhZ2APFYv3io
KVhsOmtUG5o90D8QE4iSSUhRC5wVqX13DFD7XX3VhPm+n34z59kaxmuTBCXruGdITxELE5
1m6TdkTgdELO0gKaV5IGIBFE9rTW/GarAE71yy0gdxxzTL7WXnVByJhEiasUlmqYH8I5Ap
1gYZBhSbVJdOzhEbAX51oseyqyfDlS8sjSmPzJSr471GFeEX/MxgxZSYqXJduKUSHm7bny
ujulbxvNpU9ICW2a91+cOFOZcoKwPsyJH1qrcgSyRHIxl9GoJ8zgxIjlzQVqfg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359226; a=rsa-sha256; cv=none;
b=XaBXGv3TeO33CaXcFgIFjfVHecMzx6kgjHqQnJndwuTTlkYezsTf3wNg9UV7LcGvYHml2t
FZFtak/xx39iZotFWh1c2ozyblLrQ0HS0wnpej1LaRJzRQsNUQoeinnfdAYTkdbB3hha+o
bTdi5/miBlMSjpoVSunjpBkpJcwiqHBhHcrBlEbRhTQjI0N8wNJKVLpQ5wjXDjnr/7W8lV
3OrAmlGoXVqXDWk8IKzvq2wOGW9HnEr1NGyHv2E5SpgugT6v9EPyJsrrFOZL1V50XQPQ7o
vGEQ7W1ttiMQLe70F3zKwesQmYUSDuVNkIQ5qnFTt7MMD30xoh+y32Ut8Z1yxA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359226;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=TlSiW4OB6Wh1wa/6DypqGKEHReHAqX3DOQsmjJnXDyc=;
b=fslX2D7ZGkbKDeNQYgaaMTPXyt5z3PZi6A+ghnWulLxmg2gf+jxuTbANsIA3LEDxlPx0t3
9bPrwN2J9+1IXneuyGGils0F6VKOT9WmaAsrilupDRHzevNTV1PQpN4Bdyivrtjq+1n6Yd
V5ipzOwFPS9wDsfzA0iADsE1RHaOwTGOii57qhtvp9yaj/VdztE5Xp7yzy8vTqw/1W6fdO
hsJ//lynTj3o36nU9euPEpYeWVJENqoGzTvweIbWhzusVMsH8LxFbJWnTmUw219vLVtAlm
KKV6qVtq5dEFruAw/zR6pI+QAL+uOG24OvcR98nd8s66sOCxI+Mk0sp7/3j+6w==
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 4Wyhd61PsJzcnG;
Tue, 3 Sep 2024 10:27: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 483AR6JZ009731;
Tue, 3 Sep 2024 10:27:06 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR6Go009728;
Tue, 3 Sep 2024 10:27:06 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:06 GMT
Message-Id: <202409031027.483AR6Go009728@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: dcd387aaa5d4 - main - bnxt(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: dcd387aaa5d4409a7e99376e0254029fce1a48a8
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=dcd387aaa5d4409a7e99376e0254029fce1a48a8
commit dcd387aaa5d4409a7e99376e0254029fce1a48a8
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:25 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:25 +0000
bnxt(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/bnxt/bnxt_en/bnxt_mgmt.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c b/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c
index 2f82580352cb..72704c3db452 100644
--- a/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c
+++ b/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c
@@ -205,19 +205,7 @@ bnxt_mgmt_process_hwrm(struct cdev *dev, u_long cmd, caddr_t data,
}
req = malloc(msg_temp.len_req, M_BNXT, M_WAITOK | M_ZERO);
- if(!req) {
- device_printf(softc->dev, "%s:%d Memory allocation failed",
- __FUNCTION__, __LINE__);
- return -ENOMEM;
- }
-
resp = malloc(msg_temp.len_resp, M_BNXT, M_WAITOK | M_ZERO);
- if(!resp) {
- device_printf(softc->dev, "%s:%d Memory allocation failed",
- __FUNCTION__, __LINE__);
- ret = -ENOMEM;
- goto end;
- }
if (copyin((void *)msg_temp.usr_req, req, msg_temp.len_req)) {
device_printf(softc->dev, "%s:%d Failed to copy data from user\n",
@@ -237,12 +225,6 @@ bnxt_mgmt_process_hwrm(struct cdev *dev, u_long cmd, caddr_t data,
(num_ind * sizeof(struct dma_info));
msg2 = malloc(size, M_BNXT, M_WAITOK | M_ZERO);
- if(!msg2) {
- device_printf(softc->dev, "%s:%d Memory allocation failed",
- __FUNCTION__, __LINE__);
- ret = -ENOMEM;
- goto end;
- }
if (copyin((void *)mgmt_req.req.hreq, msg2, size)) {
device_printf(softc->dev, "%s:%d Failed to copy"
From nobody Tue Sep 3 10:27:07 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd74pZbz5MkRC;
Tue, 03 Sep 2024 10:27:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhd72vyLz4sL0;
Tue, 3 Sep 2024 10:27:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359227;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=b65/+IakpNO18QWJY5byk1MARlBeW2r8AweoAw4SZsA=;
b=IsFtKu46IOKVo3nlHw949wnbToEgsr940pL97ou5pAPnV5SzhD/nugf42XZxFh+0cSXkJI
4nCeLZVyIHtIGJZ09qwayD6Xc8Ry/T4Prr1Cjjx0RCSHWCmku0a+LWdRshWEHtU7Dp4O3G
NBDpy6JYXOOWjWd3a78L9ddqwNzPSF8P2KKuy3aJhVt5X58upAQr7gpjs8wVZwvX0ZPO7/
DI7EnJtWIxfO8NwNcIGcw+T7bG36FViYE+N7hYDgheokYnwB49cWAwSsWxTK+KYIP+1kvF
eMirQmsa5aY67hKNAtVJh29zLXg4rAnfT4B20OwjZecbOjEvza3atG0IOODeoQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359227; a=rsa-sha256; cv=none;
b=mvarakxIuQUM2TStn4Y5cChd3cob1SFImWARY34yQhrj4aCSCq8mcDdPQ5mHL65Ddv2w+x
6d/7JHXsqLbXi+f2yUa+i9++CYkw6vTpFeXvfs3bVnYfwEpVpZ96XMuvYtp7eFwOycm4OE
4uR98TfgfSeR15F7dGwtKDYIuAVL8Ti4EyCQEdAHki4i0h8AQ0yibD+NGpDbsxxV4RDt9O
icxFsmorEbuA+lQ9lPWopiiwTG/7EddbEDxYXHgFvZrbqeO7R6QMdM2+fM7vM79qWG+O1l
jAjocO5SP4D1Rwp97dBHalLixPZOf/DXb/6WBv2g/SjeQgxe/LXCojCfxjeVSg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359227;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=b65/+IakpNO18QWJY5byk1MARlBeW2r8AweoAw4SZsA=;
b=OkkTkYhnofVnpT3jDgYqZLb7t+P7r51hymaUoiLr8vIdSnBwJQatw8vdFp84HjhWzldEab
/kcPVyEklVhgcctTkIu3mE+tWeDDu4yHPz83e1rH3/4cVyfpeDY9O4EMC5wnBJMn8SUJ2T
3lj0r6RfwCLnPMqVElzZ8FfZb7nk4++lPcnXfJiZ/mCoC383mIxNPYoMyuo6c/96utaurp
Ws5MfpgWVChnxfGbWukOqmUsaijq+IZYaE3r9y7lcY0KKkFgYXIZ1dP7tuWd3Crc6/aIFR
7vTE57c28BIqyz0E5H7pKRhNr+WnUu+SMr6Dwrqkg2yXnAqET7eu28YHD4johg==
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 4Wyhd72RBSzcb4;
Tue, 3 Sep 2024 10:27:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483AR7bG009779;
Tue, 3 Sep 2024 10:27:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR7Dv009776;
Tue, 3 Sep 2024 10:27:07 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:07 GMT
Message-Id: <202409031027.483AR7Dv009776@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: bb51f7c8a48a - main - cxgb(4): Stop checking for
failures from malloc/buf_ring_alloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b
commit bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:25 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:25 +0000
cxgb(4): Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/cxgb/cxgb_main.c | 4 +---
sys/dev/cxgb/cxgb_sge.c | 7 ++-----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 9bcdb86312c4..4d754aa8b1b7 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -2472,9 +2472,7 @@ set_eeprom(struct port_info *pi, const uint8_t *data, int len, int offset)
aligned_len = (len + (offset & 3) + 3) & ~3;
if (aligned_offset != offset || aligned_len != len) {
- buf = malloc(aligned_len, M_DEVBUF, M_WAITOK|M_ZERO);
- if (!buf)
- return (ENOMEM);
+ buf = malloc(aligned_len, M_DEVBUF, M_WAITOK | M_ZERO);
err = t3_seeprom_read(adapter, aligned_offset, (u32 *)buf);
if (!err && aligned_len > 4)
err = t3_seeprom_read(adapter,
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index 1b82f2ebcaae..52ffa5cdaffa 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -2419,11 +2419,8 @@ t3_sge_alloc_qset(adapter_t *sc, u_int id, int nports, int irq_vec_idx,
q->port = pi;
q->adap = sc;
- if ((q->txq[TXQ_ETH].txq_mr = buf_ring_alloc(cxgb_txq_buf_ring_size,
- M_DEVBUF, M_WAITOK, &q->lock)) == NULL) {
- device_printf(sc->dev, "failed to allocate mbuf ring\n");
- goto err;
- }
+ q->txq[TXQ_ETH].txq_mr = buf_ring_alloc(cxgb_txq_buf_ring_size,
+ M_DEVBUF, M_WAITOK, &q->lock);
if ((q->txq[TXQ_ETH].txq_ifq = malloc(sizeof(struct ifaltq), M_DEVBUF,
M_NOWAIT | M_ZERO)) == NULL) {
device_printf(sc->dev, "failed to allocate ifq\n");
From nobody Tue Sep 3 10:27:08 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd84gwRz5MkcX;
Tue, 03 Sep 2024 10:27: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 4Wyhd83XTMz4sbH;
Tue, 3 Sep 2024 10:27:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359228;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=I8v98jDd30Hm6ZmS9vjXszGztSS881o1Gv5v1licQIQ=;
b=Scd0GSLrBuncAHgLUerWkj/+Bi4frNivaHFhcy+JCPK/9v+TxGBk5PFqyMoIq3tl8aAtsv
ml4Z2AmlMDkzgP2oKkiGw+Rg8eY8JYlzDO/I3sW03LXLI61CTBHLTt4YiWUaAbMZGYBUxK
I8QArFjE1NKgOJfOi6e6Mxxi92In9HwWxe5OrAHdpzIBDhJSWVxN0OfTA/ARCssad82PQz
hqVqeUnfktl4+aNhDbfku+rsAb7kpIkrC/W20IooxpYnNw02SY0HgNXKPdZ+Mil0Fnf1wK
+kCFF/wT/zbdJYKMSTQUb9cj3SL4GHmJY++xV/u6KJeBZPSC8lsyJQkptfyODQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359228; a=rsa-sha256; cv=none;
b=JCrFEm/adz8uFhubzskw7PTmczqb/r4kpX407xyxnETTZ91J2QPVGiyYa5Q5Yup7Jg88wy
Z6XZXgqV9/XaZpvqbqbP4m0N8rGpOybTF1jMCznG4wsLYV6AU++ZBXuinHi3BeatvU7frN
/071yhqgOcMJm3HoBUME6TKDZcC6UlSK+J1ev13VbmJ02glVn8peyI7Zy/qVTLd/eP9Hb7
bhJC1qCeQlVYwk99gITUe//lgsg1R+1uWWjf0bGhHqKoJm62bTS+noADYo+SAbE8ZTHi3f
/FzpfApni6mu3d/Jtahq3txmTsuJKVLFL5hZod60okvN2BAipRvZpWlXh4eYgw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359228;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=I8v98jDd30Hm6ZmS9vjXszGztSS881o1Gv5v1licQIQ=;
b=NS3AgV/Y3QZP5wjToOEHHAgXmjmZhH2l2yRS664qtNDdnByL/9rAD+LHkrhYnf3P4xbBOC
DmOFRMzpYkFD/lUGn2Jl+4hImebEYsj4lR8luTeIAwZRSArtS4/kIdo+fiIpy7AEkm5mRo
k2WUSzVNuhKW+GqBsCE7XvdO2EOyeoJ7alDMnBgXO89ohH+eTRRfMb3nyt06oYlLvzSN54
gSm9ox2/lNAMuoj2yEWCptuJFjS0HD74tEjLgk5l1LlzxThSvQblwE3+FjD0bRjDLcEOXS
FtFz/jxKrUrYt18BkzR6XCBFYfsltWxSic8JpF9Sd/+/dEmKEEb/yF/dRzGFWA==
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 4Wyhd83932zcFd;
Tue, 3 Sep 2024 10:27: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 483AR8w4009827;
Tue, 3 Sep 2024 10:27:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR81f009824;
Tue, 3 Sep 2024 10:27:08 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:08 GMT
Message-Id: <202409031027.483AR81f009824@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 955b380365af - main - cxgbe(4): Stop checking for
failures from malloc/mb_alloc_ext_pgs(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 955b380365af174b3d35905b7b8afae97506a0bd
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=955b380365af174b3d35905b7b8afae97506a0bd
commit 955b380365af174b3d35905b7b8afae97506a0bd
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:26 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:26 +0000
cxgbe(4): Stop checking for failures from malloc/mb_alloc_ext_pgs(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/cxgbe/cxgbei/cxgbei.c | 3 ---
sys/dev/cxgbe/tom/t4_cpl_io.c | 5 -----
2 files changed, 8 deletions(-)
diff --git a/sys/dev/cxgbe/cxgbei/cxgbei.c b/sys/dev/cxgbe/cxgbei/cxgbei.c
index 04454a98e247..ccca45f5f761 100644
--- a/sys/dev/cxgbe/cxgbei/cxgbei.c
+++ b/sys/dev/cxgbe/cxgbei/cxgbei.c
@@ -842,9 +842,6 @@ cxgbei_activate(struct adapter *sc)
/* per-adapter softc for iSCSI */
ci = malloc(sizeof(*ci), M_CXGBE, M_ZERO | M_WAITOK);
- if (ci == NULL)
- return (ENOMEM);
-
rc = cxgbei_init(sc, ci);
if (rc != 0) {
free(ci, M_CXGBE);
diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
index cb229d327386..0a40bbda3f3f 100644
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -2127,11 +2127,6 @@ alloc_aiotx_mbuf(struct kaiocb *job, int len)
break;
m = mb_alloc_ext_pgs(M_WAITOK, aiotx_free_pgs);
- if (m == NULL) {
- vm_page_unhold_pages(pgs, npages);
- break;
- }
-
m->m_epg_1st_off = pgoff;
m->m_epg_npgs = npages;
if (npages == 1) {
From nobody Tue Sep 3 10:27:10 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdB74ldz5MkGD;
Tue, 03 Sep 2024 10:27: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 4WyhdB5mMtz4sQk;
Tue, 3 Sep 2024 10:27:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359230;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ODWryf/qjU14nDtYgh2aWWh3ndiVVrwv5VK7V71fmWY=;
b=tJCoOQQ8ILe+m01jWq4R3udyv5r0nCZT6l0qWXvwCibAlzXxbhn/Oq8vMjJ8kOxN+WW1Mc
auiF3UlsH0CctI1+kbr4dMZMIxzGo8qOirqnTPezZJPXXQl4ynPu095sN2CTLRfZ5nPs2k
dfnuCCB9mJJus4+0RqSb5HJd8bzMuzydnQtNmct/I18r0pYiXovgH8VWNAVdno7afF+1tE
zeeLEv1dgPnwbxgedkfVk0PAehg5P8WzqllzTxhzesXwBaLA0IDTUL7HdWQRzPbXuhYm2e
Aa3EYuyDtfl458MORnXmwTnS4nty2tBmKp8qRSPEH1UdnXDFSYR/KBIHSr99oQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359230; a=rsa-sha256; cv=none;
b=c3etPXx3UtZLVbhj0cppMnKN+IQredZHI+MLIvviWZVEHJEHjt3Ofvw59uBcAmQ54yL2vt
fgAbGlW442AqT4TsZQLX+SPINaR/p+b6Syec1V7mUWYqb/gKFqDdOpndeA8iaNe945/R8C
gtr6YTXZjc37t48eR/9VA6Wf+rDxg6Pu4EYsiLV9JYUplafCxVxFUZ4ZIF+eduhvCq6TLa
S10/S9No8uY/sbdSjp/tbUbs5HqcCj1KmB9Hg2jKc1YkVLpGLgd1Lvk4D08FKZzc4PLnRW
QkayYtoJFb40sRfLGqqRT8+yEyH5bsu0ILuF5hFaNNwoZt5Mmzc4Vm9y28D+VQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359230;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ODWryf/qjU14nDtYgh2aWWh3ndiVVrwv5VK7V71fmWY=;
b=D+7ZGr7xHAYTS1SQ+hwB+5MQ/trFNclw14aSJfZuWNFAWV13nC3fD3RTnA1xCo89rbfOTW
RthlTuJoQpjbHb9jvPc5h/UAaNWPYtxQ4eR7JkVZCWmT3ihNmwNDzBatzKvKHsGZmCL50/
l64NAy8AygaPrNFaj9iO8HqFCl/eKPu9Hl2DeCL4Ru9ORdTrPMqPAv+bHtPSSVRjV7y3hT
pmqpoZh+LsU5/zrzzaPztKtLlnj4S/p0S76GVKSOWitenVyVHqg0jcRmJJm/+FrEjW3C5+
BHVJW+AA74HX6WnWPmVGHbJDPJHWnfHAJBrVabxUyBHPz8X1qGNjkj8xRGwrMQ==
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 4WyhdB5Nf4zcb5;
Tue, 3 Sep 2024 10:27: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 483ARA54009923;
Tue, 3 Sep 2024 10:27:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARA3t009920;
Tue, 3 Sep 2024 10:27:10 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:10 GMT
Message-Id: <202409031027.483ARA3t009920@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 51971340bd3f - main - ena(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 51971340bd3ff41591adbbfca68e9e753f6eb135
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=51971340bd3ff41591adbbfca68e9e753f6eb135
commit 51971340bd3ff41591adbbfca68e9e753f6eb135
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:26 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:26 +0000
ena(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/ena/ena_rss.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sys/dev/ena/ena_rss.c b/sys/dev/ena/ena_rss.c
index d90a7fbb253a..41fa9c62f94a 100644
--- a/sys/dev/ena/ena_rss.c
+++ b/sys/dev/ena/ena_rss.c
@@ -279,12 +279,9 @@ ena_rss_indir_init(struct ena_adapter *adapter)
struct ena_indir *indir = adapter->rss_indir;
int rc;
- if (indir == NULL) {
+ if (indir == NULL)
adapter->rss_indir = indir = malloc(sizeof(struct ena_indir),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (indir == NULL)
- return (ENOMEM);
- }
rc = ena_rss_indir_get(adapter, indir->table);
if (rc != 0) {
From nobody Tue Sep 3 10:27:09 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhd968Jhz5MkRG;
Tue, 03 Sep 2024 10:27:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhd94xSXz4sgs;
Tue, 3 Sep 2024 10:27:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359229;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2Ndm46BPlhpyFl+hJRalpfXcNCZ3T2PGCR1EvodDNOY=;
b=JqnJnW7cnmrkaZ7vtgW27+kolyvGsO61nf4wdEJBUYUbS1l+CZiMZ6iw/DKYXh1HPrGuzV
ZSkFTGJicMUzRg86oVNHARO6mvG5UfmFnVYlT2QSEd7u6BIB/UqB15JiRo1be0kHJ9QRMl
Ov70ulyhbnk8ev2a7scKaQHv1hK6JXaZ+/4+hDESJZt41BR3pIfB51wnqcZ/o3AT9JTmye
kKNAm47sc6EjQnzg8eLkLbpNq4y4IMFVu7EFIPdghwGSliay1s83nz9aRLBKiS2XO929c3
pBZsBVb3T9NGvZhkinoYvXUHE4Tzyga6/CsRB42c5rmjJ8srf0G1spIlNtwpfA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359229; a=rsa-sha256; cv=none;
b=sqw1UI2cnK3osDZH+Klw+g47b0oEUu7gj6pJlncGi7J213OM+3csI922rfdanuWGyiZgvj
KUb1YjRyjTAuE5QqCASiS4zwci4XKF/RdYvtzKFRQ0zxcYg2qtz8HnIx//dkkcMZWprwLj
uelS5ESG9i1+2IBcWr51QIOpciTuxDjPcgOJMImjfRX3lx4pYk3wxmFEnJiJspG5xHiiJb
ZlBLHDV7ZFs0maWCnnrETpcO333minS2pu0HSX8GhryTkRrcVdD3WaM8R1gYf+maLDLoqg
w6VFW7k6iHLc3RSRnue+ihvsy/4/LUyLYH0ISUdtusADKbErQvSqXT9CIUBzcQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359229;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2Ndm46BPlhpyFl+hJRalpfXcNCZ3T2PGCR1EvodDNOY=;
b=VuH4goek8my1JLeRPcbnL1lqPUbPEIvBAjGKPloDxsJ7tFFSFg9IXjLBfCqJoyJWTfJpW6
emuXjINdYMr4fCliOOZrk9AMQJGMJLG9ZQMqnRNMZG3cxHj9fTv63VFaFCGqQW1zETH/Le
d3I20rnqGwZq6M2dXERQ7uFh3SfOjDtIDCeRp7QEbV7l21kPB75VwWGDRwOdwxkvTJIqGW
U2Q2WNCtvblRL7GMocHb7Bs9lsnKzPHT/O6XHZqJsGNcYq0lKJ5zRAIt7XkeBE7IebkvuU
3KexZl2KAhuXhOUrs12YWTTUx2W1rao79Y1HG5Y1aJlQtxiqnNJ1B3+hEzH9fA==
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 4Wyhd94FwCzcst;
Tue, 3 Sep 2024 10:27:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483AR9nD009875;
Tue, 3 Sep 2024 10:27:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR9Xj009872;
Tue, 3 Sep 2024 10:27:09 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:09 GMT
Message-Id: <202409031027.483AR9Xj009872@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 6dbf3aca4f5c - main - drm2: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 6dbf3aca4f5c4f7287f186360c2391f2adfea8d6
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=6dbf3aca4f5c4f7287f186360c2391f2adfea8d6
commit 6dbf3aca4f5c4f7287f186360c2391f2adfea8d6
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:26 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:26 +0000
drm2: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/drm2/drm_buffer.c | 30 -----------------------------
sys/dev/drm2/drm_crtc.c | 45 +------------------------------------------
sys/dev/drm2/ttm/ttm_object.c | 5 -----
3 files changed, 1 insertion(+), 79 deletions(-)
diff --git a/sys/dev/drm2/drm_buffer.c b/sys/dev/drm2/drm_buffer.c
index 8a674397262e..8069f2c8c4c6 100644
--- a/sys/dev/drm2/drm_buffer.c
+++ b/sys/dev/drm2/drm_buffer.c
@@ -50,45 +50,15 @@ int drm_buffer_alloc(struct drm_buffer **buf, int size)
* variable sized */
*buf = malloc(sizeof(struct drm_buffer) + nr_pages*sizeof(char *),
DRM_MEM_DRIVER, M_ZERO | M_WAITOK);
-
- if (*buf == NULL) {
- DRM_ERROR("Failed to allocate drm buffer object to hold"
- " %d bytes in %d pages.\n",
- size, nr_pages);
- return -ENOMEM;
- }
-
(*buf)->size = size;
for (idx = 0; idx < nr_pages; ++idx) {
-
(*buf)->data[idx] =
malloc(min(PAGE_SIZE, size - idx * PAGE_SIZE),
DRM_MEM_DRIVER, M_WAITOK);
-
-
- if ((*buf)->data[idx] == NULL) {
- DRM_ERROR("Failed to allocate %dth page for drm"
- " buffer with %d bytes and %d pages.\n",
- idx + 1, size, nr_pages);
- goto error_out;
- }
-
}
return 0;
-
-error_out:
-
- /* Only last element can be null pointer so check for it first. */
- if ((*buf)->data[idx])
- free((*buf)->data[idx], DRM_MEM_DRIVER);
-
- for (--idx; idx >= 0; --idx)
- free((*buf)->data[idx], DRM_MEM_DRIVER);
-
- free(*buf, DRM_MEM_DRIVER);
- return -ENOMEM;
}
EXPORT_SYMBOL(drm_buffer_alloc);
diff --git a/sys/dev/drm2/drm_crtc.c b/sys/dev/drm2/drm_crtc.c
index b9415082e7a1..a163c7455773 100644
--- a/sys/dev/drm2/drm_crtc.c
+++ b/sys/dev/drm2/drm_crtc.c
@@ -662,13 +662,6 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,
plane->funcs = funcs;
plane->format_types = malloc(sizeof(uint32_t) * format_count,
DRM_MEM_KMS, M_WAITOK);
- if (!plane->format_types) {
- DRM_DEBUG_KMS("out of memory when allocating plane\n");
- drm_mode_object_put(dev, &plane->base);
- ret = -ENOMEM;
- goto out;
- }
-
memcpy(plane->format_types, formats, format_count * sizeof(uint32_t));
plane->format_count = format_count;
plane->possible_crtcs = possible_crtcs;
@@ -725,8 +718,6 @@ struct drm_display_mode *drm_mode_create(struct drm_device *dev)
nmode = malloc(sizeof(struct drm_display_mode), DRM_MEM_KMS,
M_WAITOK | M_ZERO);
- if (!nmode)
- return NULL;
if (drm_mode_object_get(dev, &nmode->base, DRM_MODE_OBJECT_MODE)) {
free(nmode, DRM_MEM_KMS);
@@ -1009,9 +1000,6 @@ int drm_mode_group_init(struct drm_device *dev, struct drm_mode_group *group)
group->id_list = malloc(total_objects * sizeof(uint32_t),
DRM_MEM_KMS, M_WAITOK | M_ZERO);
- if (!group->id_list)
- return -ENOMEM;
-
group->num_crtcs = 0;
group->num_connectors = 0;
group->num_encoders = 0;
@@ -1997,10 +1985,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
connector_set = malloc(crtc_req->count_connectors *
sizeof(struct drm_connector *),
DRM_MEM_KMS, M_WAITOK);
- if (!connector_set) {
- ret = -ENOMEM;
- goto out;
- }
for (i = 0; i < crtc_req->count_connectors; i++) {
set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
@@ -2522,11 +2506,6 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
}
clips = malloc(num_clips * sizeof(*clips), DRM_MEM_KMS,
M_WAITOK | M_ZERO);
- if (!clips) {
- ret = -ENOMEM;
- goto out_err1;
- }
-
ret = copy_from_user(clips, clips_ptr,
num_clips * sizeof(*clips));
if (ret) {
@@ -2773,15 +2752,10 @@ struct drm_property *drm_property_create(struct drm_device *dev, int flags,
property = malloc(sizeof(struct drm_property), DRM_MEM_KMS,
M_WAITOK | M_ZERO);
- if (!property)
- return NULL;
- if (num_values) {
+ if (num_values)
property->values = malloc(sizeof(uint64_t)*num_values, DRM_MEM_KMS,
M_WAITOK | M_ZERO);
- if (!property->values)
- goto fail;
- }
ret = drm_mode_object_get(dev, &property->base, DRM_MODE_OBJECT_PROPERTY);
if (ret)
@@ -2907,9 +2881,6 @@ int drm_property_add_enum(struct drm_property *property, int index,
prop_enum = malloc(sizeof(struct drm_property_enum), DRM_MEM_KMS,
M_WAITOK | M_ZERO);
- if (!prop_enum)
- return -ENOMEM;
-
strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN);
prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0';
prop_enum->value = value;
@@ -3103,9 +3074,6 @@ static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev
blob = malloc(sizeof(struct drm_property_blob)+length, DRM_MEM_KMS,
M_WAITOK | M_ZERO);
- if (!blob)
- return NULL;
-
ret = drm_mode_object_get(dev, &blob->base, DRM_MODE_OBJECT_BLOB);
if (ret) {
free(blob, DRM_MEM_KMS);
@@ -3433,10 +3401,6 @@ int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
crtc->gamma_store = malloc(gamma_size * sizeof(uint16_t) * 3,
DRM_MEM_KMS, M_WAITOK | M_ZERO);
- if (!crtc->gamma_store) {
- crtc->gamma_size = 0;
- return -ENOMEM;
- }
return 0;
}
@@ -3631,13 +3595,6 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
mtx_unlock(&dev->event_lock);
e = malloc(sizeof *e, DRM_MEM_KMS, M_WAITOK | M_ZERO);
- if (e == NULL) {
- mtx_lock(&dev->event_lock);
- file_priv->event_space += sizeof e->event;
- mtx_unlock(&dev->event_lock);
- goto out;
- }
-
e->event.base.type = DRM_EVENT_FLIP_COMPLETE;
e->event.base.length = sizeof e->event;
e->event.user_data = page_flip->user_data;
diff --git a/sys/dev/drm2/ttm/ttm_object.c b/sys/dev/drm2/ttm/ttm_object.c
index 8c373618d7ac..31af15cf4c56 100644
--- a/sys/dev/drm2/ttm/ttm_object.c
+++ b/sys/dev/drm2/ttm/ttm_object.c
@@ -282,11 +282,6 @@ int ttm_ref_object_add(struct ttm_object_file *tfile,
if (unlikely(ret != 0))
return ret;
ref = malloc(sizeof(*ref), M_TTM_OBJ_REF, M_WAITOK);
- if (unlikely(ref == NULL)) {
- ttm_mem_global_free(mem_glob, sizeof(*ref));
- return -ENOMEM;
- }
-
ref->hash.key = base->hash.key;
ref->obj = base;
ref->tfile = tfile;
From nobody Tue Sep 3 10:27:11 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdD1hwTz5MkRK;
Tue, 03 Sep 2024 10:27:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyhdC6xZNz4skr;
Tue, 3 Sep 2024 10:27:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359232;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=tyLEp43Yrz1iu7VF5bl3uO4oQGLnh8nIrNUYcXg9stc=;
b=uo+GeeAtfG2XaiVeJQAdnH13t539dMpdyuj4r5/rkOS6BKSWb+eJJkGtrY0E1Jd+gGarmr
EMxTH/SHPutw8S0UyzriQQVhF9gLOyvNBn7SjDSnr6rVhu6sXNnZ3OiYeO+2FtYygtd0kM
y9/rF3L9SaULxkGP2Tf8vJBAojQIx8zKJOmCw2D2UIU6rwT5E4RZ5UNjqBArbrGJc1chzn
ayfmE5sFfWdUQdb8+6/T0h1oORSXs0HK//GizYv5Mnx04iGk7mHVvyoQC3D2Sdpju+YO81
DCadZZ+TUkEee2PQzlzEkePcEP+QCG7WmIKYX4/6pbakaoV/Zds9xPsQzc9bnQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359232; a=rsa-sha256; cv=none;
b=mjE94q8D/9+H9S193V421AscybRqMrUHeRrSivbEugEm9HaPQ2pVNOwfNJdMt22Zzzp7Wa
eKmZY/hNX5DCZG99VCAylzOlQnEem99Y+Bts/ENTm99jvq62yPTPUark8rTUQpIjXe8T4x
WbxdXgUeX6tOBo6h/L9/FVz9oCWgNvNwf65ycEmIkWgCoYvi9YJZ/gU/ztOyNvr/H+k+fJ
DErZ/7wOCueseIqeGrzpxKiFGR+cIxrw4l/jwcxD5snROiU4ejceFVGk7IPAaucEHxZVpF
BGmTj4J/O9pDfGCKKsOk8axklky3VTyEVqN879DEKSmfiLwBo1yX0uPi7gJwPg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359232;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=tyLEp43Yrz1iu7VF5bl3uO4oQGLnh8nIrNUYcXg9stc=;
b=fTSovKTMw/+4vi3Z0xtRa2GeRazMArROcTjX9sbgVaPd+9Geo3/e44GvHxudt6s0ggB+H3
b4LAHise8XvfegLnZUfBCmlftOqaZquFKmxgcm7wSUA2fcUO5BBOVYrXUVvVQ/oRa0Y+Jp
VrPStcw2kV/EZ9Fk0SyLmZQUX1/z/xlnSZSCWZr71wLJQz9aGbUlepn939CANroUNdUGAu
tifvME0QZkk6rHRG6749z2pBjfUIWNwwBoQJpjE5J31Jl/KOb8CGiw2RNtQkiMpRuCaVMP
5pgYPFh61BJpik1W7BX43eDge3FhgZmeET1lNxjCNww7guJkYYTW3IpezqWVdQ==
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 4WyhdC6NfpzcVQ;
Tue, 3 Sep 2024 10:27: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 483ARBEc009979;
Tue, 3 Sep 2024 10:27:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARB4A009976;
Tue, 3 Sep 2024 10:27:11 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:11 GMT
Message-Id: <202409031027.483ARB4A009976@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 48741f4ceca7 - main - etherswitch: Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 48741f4ceca71523aa1fa8da3bb78b184fad4aca
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=48741f4ceca71523aa1fa8da3bb78b184fad4aca
commit 48741f4ceca71523aa1fa8da3bb78b184fad4aca
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:27 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:27 +0000
etherswitch: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/etherswitch/infineon/adm6996fc.c | 22 ++++------------------
sys/dev/etherswitch/micrel/ksz8995ma.c | 22 ++++------------------
2 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c
index 2c6c83a4388d..64f61df93db1 100644
--- a/sys/dev/etherswitch/infineon/adm6996fc.c
+++ b/sys/dev/etherswitch/infineon/adm6996fc.c
@@ -179,10 +179,6 @@ adm6996fc_attach_phys(struct adm6996fc_softc *sc)
if_initname(sc->ifp[port], name, port);
sc->miibus[port] = malloc(sizeof(device_t), M_ADM6996FC,
M_WAITOK | M_ZERO);
- if (sc->miibus[port] == NULL) {
- err = ENOMEM;
- goto failed;
- }
err = mii_attach(sc->sc_dev, sc->miibus[port], sc->ifp[port],
adm6996fc_ifmedia_upd, adm6996fc_ifmedia_sts, \
BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0);
@@ -255,12 +251,6 @@ adm6996fc_attach(device_t dev)
sc->portphy = malloc(sizeof(int) * sc->numports, M_ADM6996FC,
M_WAITOK | M_ZERO);
- if (sc->ifp == NULL || sc->ifname == NULL || sc->miibus == NULL ||
- sc->portphy == NULL) {
- err = ENOMEM;
- goto failed;
- }
-
/*
* Attach the PHYs and complete the bus enumeration.
*/
@@ -281,14 +271,10 @@ adm6996fc_attach(device_t dev)
return (0);
failed:
- if (sc->portphy != NULL)
- free(sc->portphy, M_ADM6996FC);
- if (sc->miibus != NULL)
- free(sc->miibus, M_ADM6996FC);
- if (sc->ifname != NULL)
- free(sc->ifname, M_ADM6996FC);
- if (sc->ifp != NULL)
- free(sc->ifp, M_ADM6996FC);
+ free(sc->portphy, M_ADM6996FC);
+ free(sc->miibus, M_ADM6996FC);
+ free(sc->ifname, M_ADM6996FC);
+ free(sc->ifp, M_ADM6996FC);
return (err);
}
diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c
index e512a86202c6..ccd7dbffa9e9 100644
--- a/sys/dev/etherswitch/micrel/ksz8995ma.c
+++ b/sys/dev/etherswitch/micrel/ksz8995ma.c
@@ -225,10 +225,6 @@ ksz8995ma_attach_phys(struct ksz8995ma_softc *sc)
if_initname(sc->ifp[port], name, port);
sc->miibus[port] = malloc(sizeof(device_t), M_KSZ8995MA,
M_WAITOK | M_ZERO);
- if (sc->miibus[port] == NULL) {
- err = ENOMEM;
- goto failed;
- }
err = mii_attach(sc->sc_dev, sc->miibus[port], sc->ifp[port],
ksz8995ma_ifmedia_upd, ksz8995ma_ifmedia_sts, \
BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0);
@@ -305,12 +301,6 @@ ksz8995ma_attach(device_t dev)
sc->portphy = malloc(sizeof(int) * sc->numports, M_KSZ8995MA,
M_WAITOK | M_ZERO);
- if (sc->ifp == NULL || sc->ifname == NULL || sc->miibus == NULL ||
- sc->portphy == NULL) {
- err = ENOMEM;
- goto failed;
- }
-
/*
* Attach the PHYs and complete the bus enumeration.
*/
@@ -339,14 +329,10 @@ ksz8995ma_attach(device_t dev)
return (0);
failed:
- if (sc->portphy != NULL)
- free(sc->portphy, M_KSZ8995MA);
- if (sc->miibus != NULL)
- free(sc->miibus, M_KSZ8995MA);
- if (sc->ifname != NULL)
- free(sc->ifname, M_KSZ8995MA);
- if (sc->ifp != NULL)
- free(sc->ifp, M_KSZ8995MA);
+ free(sc->portphy, M_KSZ8995MA);
+ free(sc->miibus, M_KSZ8995MA);
+ free(sc->ifname, M_KSZ8995MA);
+ free(sc->ifp, M_KSZ8995MA);
return (err);
}
From nobody Tue Sep 3 10:27:12 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdF1tGjz5Mkfd;
Tue, 03 Sep 2024 10:27: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 4WyhdF0bKbz4sc7;
Tue, 3 Sep 2024 10:27:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359233;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=vKkmutQweM84wV++iPj0ZYQGmckerRFDUOuZBhjOBoY=;
b=pMVfF8hAm3BJnONpBu0pKTRxWeQcSP1PUSAbR/wCRUBLa/AZCr0SBoTYHJ/2kbQiC2k4g5
pvL8Vc6jDWpQAx+1yUSdXv1RkWRmMbudaXd1r9I4rMlg9i8MZVWW9OjB4PUGA5rmHLMe/3
/kHvzh5gE41e0zHsovgO65/YGP/khfPRVfRvIvxkr+RamYo6S32yUsVqa2MiRCnyW9Ik0E
xD3jQooa5YLhKvDMXo3EBg++B14FlnDiO3u0o4a6inRla0IXaccwEPKSFTjkixrI9FPFdK
Eewlu93tcm6JvRMnorUXVN2kFcVCNh9AJS0ZmpBEIlVUmYub5s3bpgNYkzEPhg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359233; a=rsa-sha256; cv=none;
b=FnEol6GoUH2zUKOomGVCZneaXL805j9Bq2zqEhCeoe1Cndyy1csKoSmTkJZK3SKChL1U0M
Xz/N/zwRAuntP4FFMCBz1/5pfe759f0o38UxVkypm8ixwrK2/2gHFVihjkuueqGa7d6OKD
0kKKVTcdpj6Mt5YtpjJPeKX7kpMy4P2g51AS3T0cgPPEb8ffpFkS7xYOXRUqR7wFXPLvRd
jN/rU8BlwXGeHjF5B35ms5EtiQDCv82oOtRhYLH1TRHNM+prS8kuc+GSVUTcRDWKohsEuE
C/KHs8/E+1PVw9wd6uMKOE7Nt3kyhO+/KV1+6DYBCMQ863L+1WPjUpbB4+aJnw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359233;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=vKkmutQweM84wV++iPj0ZYQGmckerRFDUOuZBhjOBoY=;
b=vjSnaQmICt7sNF6PeVw19l8L7yvaXFMLuThs/YPFXmCgMuxyXZf3QssGpb1y2VOfGZwEQb
GvtZ70S2F/8lGcrupAGodN+ihsBti9Q4xBsmYFRfnIFxy7bgjTvMeu7n+kqSxuLRJiE4N1
Yhs8NbzKajPmhf9vv8hCBiU1QCwuAiYhaMzxglVIW1cbzthLeOXgIwSGasrrCzFPZQP/3Z
O+rzjeL0MlACuGcYNgklSV9GuvWtHOagOxgnluMF4ObpC+LZBl1Z3JIifGcSlPiQFake0e
KlJijXwWDKQNXB5+Q0GoH7sNQMhdEAU2R8t1ZLtKRGEP8olSi2ReM5mm5ZPlQA==
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 4WyhdF03KnzcVR;
Tue, 3 Sep 2024 10:27: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 483ARC9f010040;
Tue, 3 Sep 2024 10:27:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARCjh010034;
Tue, 3 Sep 2024 10:27:12 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:12 GMT
Message-Id: <202409031027.483ARCjh010034@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: d1a89bd9b6eb - main - flexspi: Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: d1a89bd9b6eb1524902b619fa092c7d6de63e623
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=d1a89bd9b6eb1524902b619fa092c7d6de63e623
commit d1a89bd9b6eb1524902b619fa092c7d6de63e623
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:27 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:27 +0000
flexspi: Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/flash/flexspi/flex_spi.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/flash/flexspi/flex_spi.c b/sys/dev/flash/flexspi/flex_spi.c
index 766a1cfaa332..9382b237ee71 100644
--- a/sys/dev/flash/flexspi/flex_spi.c
+++ b/sys/dev/flash/flexspi/flex_spi.c
@@ -781,12 +781,6 @@ flex_spi_attach(device_t dev)
}
sc->buf = malloc(sc->erasesize, SECTOR_BUFFER, M_WAITOK);
- if (sc->buf == NULL) {
- device_printf(sc->dev, "Unable to set up allocate internal buffer\n");
- flex_spi_detach(dev);
- return (ENOMEM);
- }
-
/* Move it to per-flash */
sc->disk = disk_alloc();
sc->disk->d_open = flex_spi_open;
From nobody Tue Sep 3 10:27:14 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdG46z5z5Mkcm;
Tue, 03 Sep 2024 10:27: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 4WyhdG1r09z4scC;
Tue, 3 Sep 2024 10:27:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359234;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=LUdg2It9loqIGAMlkEmeu6c38m10eoDbNcgo/zi16ho=;
b=foV07igcUyOOxNrFIBAIeQhen3PMZ0NyDAIah+eEOfCIv+NJf6fbEd6GYeql4JPaXtsCpf
l4bF4dgaAUQhI5JjhLxinwycjwNxQQYOehtv0SydLcc9yxO5vrCZnaduF8sChl4oERaWdH
Ly3k88A9Kqcnc1qBKd9V8aRbqUa7+EYK5dorhj2XtlWGjTbq/9pSlbiRfOvNZOhXkqDneF
RhDF+FqGt93jEWz0ahDcMPC9oVUqUmkSjSwwTQp/UArV3e9xjodeoeNCk1gnGfXj4/w2Da
v7PIQyMzqhP1FfUkVECGsZ9TCbR2Gk5Zd7dXb15frSBWgNQmOFFdkBnVIdqISA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359234; a=rsa-sha256; cv=none;
b=b55ExUXJmFipvBcw7FE+oacg4bJFciFrpbJ7zp7DxUMgEMR4tuk0HE9xOiHzoRwISdNlN7
1kIcJmpFzM2+sz2J5Umccu1lvJW7zX4oMLGe9ToF2vU6jRw1Yu1Sp7Gox4j+HfeKJtqG/I
550Jzc8coDOeOjljlRbXszDROi/e7d0vYUxhaScvqql8qxTB+Sbp0+qHP4nzv2mBGjwwJ6
aQ4I+TCSMIR7bhbevV0odUmbdAK3+m3lhUtDn7uwpQ4XlcpJuu/TUrDe4NKcV/DgHYEdRX
m7ecAb9erkN8TEu+LZWe/iIqtMBJwRytm9nj8HvqMfaQPBBQf3bZZdd1QzU2tQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359234;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=LUdg2It9loqIGAMlkEmeu6c38m10eoDbNcgo/zi16ho=;
b=shbxsWuxQmX3i8RFR/B4E1XnIyun3TTaqckAqSKpjPIAosxlfiXknuKbmjhkuDfqneQYBs
hNg8nmDjYhN8AlxJqkbibqfcBrBIkChZQ7fIKQxfuHkuDORTwHMdMJ6jTmBtB4laX6HJL5
9F62navnDGgh+XvLm+pFe0fziG90Uk5Dw8p9WNj+mf6amBN70Q5jLVwKhdG0GIBZc9I76e
b8k3M+7aAwhfxTmf57EaXi4yyCwMrMQgzxMMJBfm8wT0hez2aXSFHb2IOxZ/CGDvW/omOa
gOtLgGPRsyFNJn0jKRgll7TD6Q1epejiHL4uS+rwyUT2M6xqfvslcJnoJJjXKg==
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 4WyhdG1SY8zd14;
Tue, 3 Sep 2024 10:27: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 483AREAL010088;
Tue, 3 Sep 2024 10:27:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AREXx010085;
Tue, 3 Sep 2024 10:27:14 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:14 GMT
Message-Id: <202409031027.483AREXx010085@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 4d47c7ca7baa - main - fwip(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 4d47c7ca7baa1ae76cc1fc72ec85b475f1efd41d
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=4d47c7ca7baa1ae76cc1fc72ec85b475f1efd41d
commit 4d47c7ca7baa1ae76cc1fc72ec85b475f1efd41d
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:28 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:28 +0000
fwip(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/firewire/if_fwip.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 6350ec9cb56e..41143e2e59d4 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -304,13 +304,9 @@ fwip_init(void *arg)
xferq->psize = MCLBYTES;
xferq->queued = 0;
xferq->buf = NULL;
- xferq->bulkxfer = (struct fw_bulkxfer *) malloc(
+ xferq->bulkxfer = malloc(
sizeof(struct fw_bulkxfer) * xferq->bnchunk,
M_FWIP, M_WAITOK);
- if (xferq->bulkxfer == NULL) {
- printf("if_fwip: malloc failed\n");
- return;
- }
STAILQ_INIT(&xferq->stvalid);
STAILQ_INIT(&xferq->stfree);
STAILQ_INIT(&xferq->stdma);
From nobody Tue Sep 3 10:27:15 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdH5Zd5z5Mkh6;
Tue, 03 Sep 2024 10:27: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 4WyhdH3FX6z4sg5;
Tue, 3 Sep 2024 10:27:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359235;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=CTtaKgVhwStt4k2yZsFWZ2Mfy7IxpzC0sf9+Opz9JKU=;
b=r6hx8TgelJ/zEtIrXQTHGix1pzqa6bbN0xeBv+cG0g5KuCAdLgm34VsounSkvzYY+0YBW0
BZ1/Tt4AM/WWl0W2gnZRZxE3y1rUXn2639pgMuwckxbzwv2gP0zJIbLBk4fNejtMbNl5HK
MAIw16fHld2nIi8kiJnQt0RfIfG6IEUlVYFz24a2Gc+v1R9Km7Pb6sSuNl9jh4oNb3AkbU
e2KmMFvMFJNSjPgfAsw657WG9NXNzfzbFmJp24+0Hc9zCLM5mRZfxyFTtLs02y0e3XnPy8
mK90THg0zLgRxv4nGLg3xNjIOvHlhxFEWw0/5Xn75qhKonApdB9EEUUUvGGntw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359235; a=rsa-sha256; cv=none;
b=u6jICHZFAmBGXbGrSEc/xSp0QoMXPazxadaAF0sCrwbKWq7PWzmB5mvc1AojwXRIOJc1hq
EYt9yjaGI8d+Cbm0ZaUaj/s5n7WImaSJhH98Db4SdWEuy/LslS7IeOXQxkgdzT/g8tPAUs
8v++9xUfeB5gidNLy7Mx8v9fNeeArH7uXFxvuFLDn5tAd80KzAdkpmLnygiuoRoJEJnEKu
qAw70qmO+iHhDY6azE4Mv2LKFskUo6ko/LTD7vTMCVRxHUMkug6IL6NhyLalCWPQfssnNs
4bWvqCTORQGsvmB7vNwAo0u2elVcwijDNGfTh1sYSsDTk5bpa9jijFKZmmZKJA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359235;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=CTtaKgVhwStt4k2yZsFWZ2Mfy7IxpzC0sf9+Opz9JKU=;
b=oABoibiMtMy/821BAzY3k/Xc+2IjsKNHvYqaWPjvvvP3BPpkLsw8dQuUuLUnL3oFs0pJy7
Ku+pmDzeYFRaKPDoAjaGnabcT9O9H3hpaEddAoiC90mnmUT8xP3/BCx+rtAVwckm7pozPS
Z6gvVogIEwYfle3j/HzAfMQBUhsEuxxhA0PVCb7SvTXc67AuWJGZR9ZYuknxj1GNHWaeDs
R0BvRS+r0Fdf/EQjvcn/hxpx14nCfUMiNjtJQULsB7fBCwXwUiD2ij8VKcg7ZfXewFwW1o
bQBxvA904q6yUVtisq6o5bdogn4KFYbDHYYJ9esI9ZhcrzLZAEKkvxFJth3MTg==
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 4WyhdH2fSYzcnH;
Tue, 3 Sep 2024 10:27: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 483ARFpo010136;
Tue, 3 Sep 2024 10:27:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARFJM010133;
Tue, 3 Sep 2024 10:27:15 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:15 GMT
Message-Id: <202409031027.483ARFJM010133@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 28e413a69983 - main - hpt27xx(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 28e413a699838df6fa5b0504c9ceb92a515037d9
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=28e413a699838df6fa5b0504c9ceb92a515037d9
commit 28e413a699838df6fa5b0504c9ceb92a515037d9
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:28 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:28 +0000
hpt27xx(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/hpt27xx/hpt27xx_osm_bsd.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
index 225c91b44f21..e086a1554940 100644
--- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
@@ -94,9 +94,6 @@ static int hpt_attach(device_t dev)
size = him->get_adapter_size(&pci_id);
hba->ldm_adapter.him_handle = malloc(size, M_DEVBUF, M_WAITOK);
- if (!hba->ldm_adapter.him_handle)
- return ENXIO;
-
hba->pcidev = dev;
hba->pciaddr.tree = 0;
hba->pciaddr.bus = pci_get_bus(dev);
@@ -114,10 +111,6 @@ static int hpt_attach(device_t dev)
if (!ldm_register_adapter(&hba->ldm_adapter)) {
size = ldm_get_vbus_size();
vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK);
- if (!vbus_ext) {
- free(hba->ldm_adapter.him_handle, M_DEVBUF);
- return ENXIO;
- }
memset(vbus_ext, 0, sizeof(VBUS_EXT));
vbus_ext->ext_type = EXT_TYPE_VBUS;
ldm_create_vbus((PVBUS)vbus_ext->vbus, vbus_ext);
@@ -168,7 +161,6 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_ext)
f->tag, f->count, f->size, f->count*f->size));
for (i=0; i<f->count; i++) {
p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK);
- if (!p) return (ENXIO);
*p = f->head;
f->head = p;
}
@@ -1109,10 +1101,6 @@ static void hpt_final_init(void *dummy)
for (i=0; i<os_max_queue_comm; i++) {
POS_CMDEXT ext = (POS_CMDEXT)malloc(sizeof(OS_CMDEXT), M_DEVBUF, M_WAITOK);
- if (!ext) {
- os_printk("Can't alloc cmdext(%d)", i);
- return ;
- }
ext->vbus_ext = vbus_ext;
ext->next = vbus_ext->cmdext_list;
vbus_ext->cmdext_list = ext;
@@ -1327,18 +1315,13 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru
if (ioctl_args.nInBufferSize) {
ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK);
- if (!ioctl_args.lpInBuffer)
- goto invalid;
if (copyin((void*)piop->lpInBuffer,
ioctl_args.lpInBuffer, piop->nInBufferSize))
goto invalid;
}
- if (ioctl_args.nOutBufferSize) {
+ if (ioctl_args.nOutBufferSize)
ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO);
- if (!ioctl_args.lpOutBuffer)
- goto invalid;
- }
hpt_do_ioctl(&ioctl_args);
From nobody Tue Sep 3 10:27:17 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdL1BBFz5MkPQ;
Tue, 03 Sep 2024 10:27:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyhdK51wsz4sqx;
Tue, 3 Sep 2024 10:27:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359237;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=nwJjeN5OpHYSN/OVy9CNTIJChYEraCGfmdtDpqG+l1g=;
b=lJJQCxQA3S4HKuFssa7M0WFI8uJR2DsoAb+qTcyldaVsF3OsfxnpPl0/SYLdvGw2BHALsR
HS8AbsP7ETrkyPSb4m/7bjwsTADwH1R4J01N3UQxbZhlEXHEJW6qiexDvFiBoq0Bn7xDbn
Yz36S5yhHGXDa9y1tmiTmzJgfUeKmjpYJiW127XisICcxx/WX9T4810ttYtmWqheUJDz6W
rYGfLffaNgmwkiEF6HaD5mjkg7oc/AEXh/UHEKTAS9f97HS43x+Q3zdP3P3rruanSUOtdx
RoN0TFb4x3XFMz6exvhFlXdLkD3CWOSHYx4K8TRJVmej2QHRRmMEIO/sYbfn5g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359237; a=rsa-sha256; cv=none;
b=mTsSHw2FZKVU99erL3Av1D60njeEkhl7OcXGMYHCcth1fYdmwuyzja0y9OC5E2Sfwp5dio
EmP7Xr86S3zIg2LJxOUEJhnk4fgin0m6tsV6j0KxwTwR8G/Ltxp9W1VkFBtmywt7BP98+2
y6tiQDObcooV/S3hlHQWNG++BLELh0bTedi2HKFPRHjmbeohHUn2NcehQEgOUaGnQl7JhX
vc4rL8LY7Sjz4aLTi34lrU+KeoenPOeEx6QLaa1geTsOG35npmC2NK4AzdyYO7xY93hx9f
38WG5IeoOxFbsSeEf6fnsJnqBh/J1oXiLrWwCavZhT5z4GslrXBlBQGHodjK3g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359237;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=nwJjeN5OpHYSN/OVy9CNTIJChYEraCGfmdtDpqG+l1g=;
b=lRx2y3R+cUbwBfDkwvgJj9o4DLJjetjCLoUX+ST0XVSwgcLMhhevRwO7+TZMS9WYCJ6k2Y
hd6Gczm0pOj0UZDWoIz7ItU7DrAwOTrTURAg2D7OrOBQdgPzC3bGX/ReEGxSvoZAO+WOqx
ipZvrgtZiqip3/nDnSwujDiEK/GBqtcidmDLXbs9eVahw1QrQ5o7ZVh5b9yx2DGhVnUcC5
6UxoLbmvyIIn5UvaYeAqUoL3G35M+wDWC2jbKupe1zsqSVNT7RuANb5ZJM6TK/lJSwuYh7
lnrE44mCI2yq7t6PkOrBh/f/dCKKARnM32lcAbFqba+Csa/1EZT5117EXAFZGA==
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 4WyhdK4dMVzcFf;
Tue, 3 Sep 2024 10:27: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 483ARHn6010238;
Tue, 3 Sep 2024 10:27:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARHva010235;
Tue, 3 Sep 2024 10:27:17 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:17 GMT
Message-Id: <202409031027.483ARHva010235@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 92b0370ec65d - main - hptrr(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 92b0370ec65d5287a1deec84fd513e320a8da736
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=92b0370ec65d5287a1deec84fd513e320a8da736
commit 92b0370ec65d5287a1deec84fd513e320a8da736
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:29 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:29 +0000
hptrr(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/hptrr/hptrr_osm_bsd.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c
index 68e9af3aff02..42866c1d4297 100644
--- a/sys/dev/hptrr/hptrr_osm_bsd.c
+++ b/sys/dev/hptrr/hptrr_osm_bsd.c
@@ -1032,10 +1032,6 @@ static void hpt_final_init(void *dummy)
for (i=0; i<os_max_queue_comm; i++) {
POS_CMDEXT ext = (POS_CMDEXT)malloc(sizeof(OS_CMDEXT), M_DEVBUF, M_WAITOK);
- if (!ext) {
- os_printk("Can't alloc cmdext(%d)", i);
- return ;
- }
ext->vbus_ext = vbus_ext;
ext->next = vbus_ext->cmdext_list;
vbus_ext->cmdext_list = ext;
@@ -1252,19 +1248,14 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru
if (ioctl_args.nInBufferSize) {
ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK);
- if (!ioctl_args.lpInBuffer)
- goto invalid;
if (copyin((void*)piop->lpInBuffer,
ioctl_args.lpInBuffer, piop->nInBufferSize))
goto invalid;
}
- if (ioctl_args.nOutBufferSize) {
+ if (ioctl_args.nOutBufferSize)
ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO);
- if (!ioctl_args.lpOutBuffer)
- goto invalid;
- }
-
+
hpt_do_ioctl(&ioctl_args);
if (ioctl_args.result==HPT_IOCTL_RESULT_OK) {
From nobody Tue Sep 3 10:27:16 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdK0Lz5z5MkVL;
Tue, 03 Sep 2024 10:27:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyhdJ40zrz4scb;
Tue, 3 Sep 2024 10:27:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359236;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=hGTGHlf/jGA5DKRujz4ZUNNAFGl+6eE3q5M/RLTBY90=;
b=fdgzFnN+hCU4yG2fxl6H5tkttTp+PkQd/DU5Qd+HtaOuqRQ9v1Rg5kBFxaAIjbS2rWTfUY
sCzH9BNIpkyYZX/Ge8EE6ylPorIeV+U6DrOIVhgNE5Xl2NqCaCZrrEtFzi4Vhgmg0rAyAD
ZJVRHq3SDs0L58S7oKVH/5NHdlwMpmSUS2SFSK+WpevtfFZcPXdsxW8x9d83HZkSSU+28o
xDgfN3qD5gsVXWCOXq75wx7wpVrYbN1dkpBXCHdzEmuwfK8TyjwStBBiNYJYD0XfWhQTZB
bOnYNysOxKFAGdqOrMhj6DsQyue053C+LDE/usakXzIE54ZknVWxNJAcOr5RbA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359236; a=rsa-sha256; cv=none;
b=VtDQ5QYpmBdx8ZBP/yMVPOqzFcl5cYUsU5kvPcGkjNRcrQcS9Atlavz3I9xjjRhWKa7myq
8ZTAtNMb1/Us5x3IqvX3GMNSsHMCe36srVSE5y7I6+g0kB3beKsGOpHLYyYnS7pBhvF9S1
wrfKevP71us5YYYJyqcPm2rjZ68x2ZKHjcAFOn0ouP0mQ3TZOdHgDYZK4zm4LCuMAuDur0
mu/fZwjVmx+QoGZoV5ULKmnv+ASGxJhUMXpjkv+b5LCJqou/nKnHCi0HusFJIeEDN0Qqey
VD3GCl+I+uXpbaH4Om5kuhVQHK7atodfT5RCT6x40WL9jUMdH8n6qVA02F2aaw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359236;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=hGTGHlf/jGA5DKRujz4ZUNNAFGl+6eE3q5M/RLTBY90=;
b=pjj/lqI1grm8wYud/TmTaj8MBExYlExffJVzrvpuRb3k+1jLO68bUelmu9RTo2Wt5CPuJB
hHMxRPE7qs4BaS4kawi09BW/n12+uMpN1fVg7C+DbhxTl6OGHKutzCcVy7xa1XLacHpTV/
ZEZHBGqhhVgLla9jOT6vxvpAFeSXtmzltWcdqoJ1bdLFqhCjtHwiqLdAaDFQA9oXNnBQGR
JrspKgVua/Njto53/XWAGiOBt6UW9LPjMLT0yL0YT9CHbdFwRtKw8ANsmXhlp3V5h9dzsI
4ibJlGEE499isV/yTCcXqDnncbC5xOia2cYj+B+BmnRJJQETT3RCOPNLwmezEw==
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 4WyhdJ3ddLzcb6;
Tue, 3 Sep 2024 10:27: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 483ARGkg010184;
Tue, 3 Sep 2024 10:27:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARGQ3010181;
Tue, 3 Sep 2024 10:27:16 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:16 GMT
Message-Id: <202409031027.483ARGQ3010181@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: a3ec5d3ee757 - main - hptnr(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a3ec5d3ee7579a26790a86ca4c074512946ab964
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=a3ec5d3ee7579a26790a86ca4c074512946ab964
commit a3ec5d3ee7579a26790a86ca4c074512946ab964
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:29 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:29 +0000
hptnr(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/hptnr/hptnr_osm_bsd.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c
index a8ac77c5ad5a..7426873964fb 100644
--- a/sys/dev/hptnr/hptnr_osm_bsd.c
+++ b/sys/dev/hptnr/hptnr_osm_bsd.c
@@ -165,7 +165,6 @@ static int hpt_alloc_mem(PVBUS_EXT vbus_ext)
f->tag, f->count, f->size, f->count*f->size));
for (i=0; i<f->count; i++) {
p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK);
- if (!p) return (ENXIO);
*p = f->head;
f->head = p;
}
@@ -1389,10 +1388,6 @@ static void hpt_final_init(void *dummy)
for (i=0; i<os_max_queue_comm; i++) {
POS_CMDEXT ext = (POS_CMDEXT)malloc(sizeof(OS_CMDEXT), M_DEVBUF, M_WAITOK);
- if (!ext) {
- os_printk("Can't alloc cmdext(%d)", i);
- return ;
- }
ext->vbus_ext = vbus_ext;
ext->next = vbus_ext->cmdext_list;
vbus_ext->cmdext_list = ext;
@@ -1610,19 +1605,14 @@ static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, stru
if (ioctl_args.nInBufferSize) {
ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK);
- if (!ioctl_args.lpInBuffer)
- goto invalid;
if (copyin((void*)piop->lpInBuffer,
ioctl_args.lpInBuffer, piop->nInBufferSize))
goto invalid;
}
- if (ioctl_args.nOutBufferSize) {
+ if (ioctl_args.nOutBufferSize)
ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO);
- if (!ioctl_args.lpOutBuffer)
- goto invalid;
- }
-
+
hpt_do_ioctl(&ioctl_args);
if (ioctl_args.result==HPT_IOCTL_RESULT_OK) {
From nobody Tue Sep 3 10:27:18 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdM2xjXz5MkjC;
Tue, 03 Sep 2024 10:27:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyhdL6Gjfz4sp7;
Tue, 3 Sep 2024 10:27:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359238;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=cANU/sqJymckDMTDZfeRXN5Inxu9BwtfL+2Djc/OwMc=;
b=n1HI6LqN3iS1AQqES/QJ1kiKpGuQf8UaisY1aAshFyALb/yzeKasvMx2TEXKVoDhYODwqK
YXuBB8uPpM2UlpjU0T6E9EWRnQ7eYBPlx+QuwnFDPsyK2bN/0qbJdPWETMLKqnmj1SDrF6
VtNod4ZrZX3r8hvPo5qQS9+adKaJUgBFK/CN+HzVm8kCL3eKuJ4F1Z59jJwiKrUzghEMCe
u76FFO0IhdGnbULdJlwbzt40kstxcZzEj3+T+1O1p6iHJaxV0Q8eu5Abqhhb4DI47DLTa6
9+08UzwstMV5rz7hTWz2iKm394nnmdMcYTsZDayl9OZUqhV9UfTHoqp/ZZAxiw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359238; a=rsa-sha256; cv=none;
b=p7vSrZVWfxz+A1t1pSGrRM5lS1bsg1q5OP+yW2T+ofgM9rC76Pt3q+jhLi1RhFNANaZ9u7
1QnldG78zdC67dKzZ79YpP0mgB0xNI8WxRipSlG1WujxNGVF8/cXu4/6EKhgTNHCg13Gqw
Uda8Uo6N7y/VG4XG8YqIPDLhWsIj+TbhSW9bTEVRTaT1RYTRoZlKnPL/skEQdc+e+sdCYw
eCOtKhhSUz/FQ1BEbGK9zxyPKrmbV2HW60YGLV8OHkqtuKQ0Gu1uEbmk0tFTQx78MjZosb
3kzNXMNM8cUruSRsg9yU7krJKN56tlBrgdZoohmfep/1/70bvcqqmDdy+H0Jkw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359238;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=cANU/sqJymckDMTDZfeRXN5Inxu9BwtfL+2Djc/OwMc=;
b=U9GcFQzVrRmlgMUIwU2cYrYiW6RyOz3v5wMgRo7HDfX57/Y+YN6JoxQp1P2VMWHBae1xN3
dx1ypRdvFkvJxPLcwEBcwg/+todoa/VCOCuzk8y0HVjazOYYm3u6bY+Eyp/fdx6RMtLmaI
qza/OU4le5qQIQOFhrr+LhRRT+tdqAuFGpZrKnoHUkofKNaHpP9dCJz6S5Uxwx/MZS+r48
RZASKsOQ3AFRiEJyiEIi4/Cs0bCclmhRIDbNA+MwGurGI8GInMmGEgnSwSPJ5y6FBGF3Dl
QYlmmzOWGNebUEQfCbA3hM/Os9yRUfkvehF84ohEvG6BkYyQ9ui6uvOA99txug==
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 4WyhdL5rJwzcb7;
Tue, 3 Sep 2024 10:27: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 483ARIjk010289;
Tue, 3 Sep 2024 10:27:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARIHD010286;
Tue, 3 Sep 2024 10:27:18 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:18 GMT
Message-Id: <202409031027.483ARIHD010286@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 5f97656fa334 - main - ice(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5f97656fa334b494d70866cb1bfff406d3efd92d
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=5f97656fa334b494d70866cb1bfff406d3efd92d
commit 5f97656fa334b494d70866cb1bfff406d3efd92d
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:29 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:29 +0000
ice(4): Stop checking for failures from malloc(M_WAITOK)
As a consequence now ice_alloc_vsi_qmap() does not fail. Remove unneeded
error checks.
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/ice/ice_lib.c | 24 +++---------------------
sys/dev/ice/ice_lib.h | 2 +-
sys/dev/ice/if_ice_iflib.c | 13 ++-----------
3 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c
index 659412450fce..7077859cc877 100644
--- a/sys/dev/ice/ice_lib.c
+++ b/sys/dev/ice/ice_lib.c
@@ -426,31 +426,21 @@ ice_setup_pf_vsi(struct ice_softc *sc)
* all queues for this VSI are not yet assigned an index and thus,
* not ready for use.
*
- * Returns an error code on failure.
*/
-int
+void
ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues,
const int max_rx_queues)
{
- struct ice_softc *sc = vsi->sc;
int i;
MPASS(max_tx_queues > 0);
MPASS(max_rx_queues > 0);
/* Allocate Tx queue mapping memory */
- if (!(vsi->tx_qmap =
- (u16 *) malloc(sizeof(u16) * max_tx_queues, M_ICE, M_WAITOK))) {
- device_printf(sc->dev, "Unable to allocate Tx qmap memory\n");
- return (ENOMEM);
- }
+ vsi->tx_qmap = malloc(sizeof(u16) * max_tx_queues, M_ICE, M_WAITOK);
/* Allocate Rx queue mapping memory */
- if (!(vsi->rx_qmap =
- (u16 *) malloc(sizeof(u16) * max_rx_queues, M_ICE, M_WAITOK))) {
- device_printf(sc->dev, "Unable to allocate Rx qmap memory\n");
- goto free_tx_qmap;
- }
+ vsi->rx_qmap = malloc(sizeof(u16) * max_rx_queues, M_ICE, M_WAITOK);
/* Mark every queue map as invalid to start with */
for (i = 0; i < max_tx_queues; i++) {
@@ -459,14 +449,6 @@ ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues,
for (i = 0; i < max_rx_queues; i++) {
vsi->rx_qmap[i] = ICE_INVALID_RES_IDX;
}
-
- return 0;
-
-free_tx_qmap:
- free(vsi->tx_qmap, M_ICE);
- vsi->tx_qmap = NULL;
-
- return (ENOMEM);
}
/**
diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h
index cfd848d370bb..6c010cffc0fd 100644
--- a/sys/dev/ice/ice_lib.h
+++ b/sys/dev/ice/ice_lib.h
@@ -830,7 +830,7 @@ void ice_free_bar(device_t dev, struct ice_bar_info *bar);
void ice_set_ctrlq_len(struct ice_hw *hw);
void ice_release_vsi(struct ice_vsi *vsi);
struct ice_vsi *ice_alloc_vsi(struct ice_softc *sc, enum ice_vsi_type type);
-int ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues,
+void ice_alloc_vsi_qmap(struct ice_vsi *vsi, const int max_tx_queues,
const int max_rx_queues);
void ice_free_vsi_qmaps(struct ice_vsi *vsi);
int ice_initialize_vsi(struct ice_vsi *vsi);
diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c
index 4e451bf3fb55..3de79787f6e8 100644
--- a/sys/dev/ice/if_ice_iflib.c
+++ b/sys/dev/ice/if_ice_iflib.c
@@ -631,12 +631,8 @@ reinit_hw:
*/
ice_setup_pf_vsi(sc);
- err = ice_alloc_vsi_qmap(&sc->pf_vsi, scctx->isc_ntxqsets_max,
+ ice_alloc_vsi_qmap(&sc->pf_vsi, scctx->isc_ntxqsets_max,
scctx->isc_nrxqsets_max);
- if (err) {
- device_printf(dev, "Unable to allocate VSI Queue maps\n");
- goto free_main_vsi;
- }
/* Allocate MSI-X vectors (due to isc_flags IFLIB_SKIP_MSIX) */
err = ice_allocate_msix(sc);
@@ -3518,12 +3514,7 @@ ice_setup_mirror_vsi(struct ice_mirr_if *mif)
mif->vsi = vsi;
/* Reserve VSI queue allocation from PF queues */
- ret = ice_alloc_vsi_qmap(vsi, ICE_DEFAULT_VF_QUEUES, ICE_DEFAULT_VF_QUEUES);
- if (ret) {
- device_printf(dev, "%s: Unable to allocate mirror VSI queue maps (%d queues): %s\n",
- __func__, ICE_DEFAULT_VF_QUEUES, ice_err_str(ret));
- goto release_vsi;
- }
+ ice_alloc_vsi_qmap(vsi, ICE_DEFAULT_VF_QUEUES, ICE_DEFAULT_VF_QUEUES);
vsi->num_tx_queues = vsi->num_rx_queues = ICE_DEFAULT_VF_QUEUES;
/* Assign Tx queues from PF space */
From nobody Tue Sep 3 10:27:20 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdP4hMZz5MkVS;
Tue, 03 Sep 2024 10:27:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyhdP0RVrz4t0b;
Tue, 3 Sep 2024 10:27:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359241;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=BXo68YeQAE+4AB4unaznuq4c8favXiybtQOQvy264AY=;
b=T9hTyLNaKnbLa/DF7fhhOLjBsOevZozVPxx0IAX2j3K+KAONNxOGI2rUsAheG/lgnlqmKs
ezhh5PFGTz12WnxMiTLeUkcAqLovy6Y+0t24xT8UNmE7aMCEqb4BzsU1C+vx3Th8O3uxJM
/JRa4qYPJ4hQwHoOhp1OQTuwEJ4b1uoeAYrPnG+xSZ4/ZTSO+CJDXKaSQhvwCzhXHA7osl
R+/JDbmt5LWNZIHbwDHRmYlCChvF56LCBezf6b0Xrgo8BX/vJfTLssUoHJegAK0FLDr8Vz
881huvjjc2CxAMmMD0GB8ZZtWCOoDXXCcvsFC+skSQL4N9yI+UeBF9ugjB7Q6g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359241; a=rsa-sha256; cv=none;
b=VFCVLle/fDnN9qqnkI7bxI97kQylgPA2VupOwfV+K4bufoGiYEVnsdwfGcS6R41JkyUxzf
LEtl26lImUNWEi9AcV1XYE1QeWiahjrbUejOzxfiwNMtE6vTCpWQsp8250Op02txI/SPr2
vAtPA2ZWz4LKeXML1YYbb3CZfdFAmde7EkKqMS9U5JUHmypk8h+PWJIq8V962EH0Tvwnof
8icdZcSf7fElv/9nhUmKfs+ZIIld9X+KSvwYiby3Hh38WUqBfKvSewdJf/iIB9qMcVG8mp
4d2OoiZ0riGA3nsFZ5/58jlneBu1VH/qiq6XS6jQIxIMVYyXBV5U8uMwdryvHg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359241;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=BXo68YeQAE+4AB4unaznuq4c8favXiybtQOQvy264AY=;
b=d2j+KV2wRuZM0KC7JJxsPVO2zrJx2ZS9kRe2SUXFD758uUO9lq2m82vRbWy0LJJrquoJla
uA+zMjvy+h0sfYr1JRcVXDbTaxciCVSYRvYxbLVFjJVI7ThwfZm4z9+CgnORWzCPNnchhq
4UdPFww4+QsjiP3Q+taUyHQE4lxuRnysQraq0cpHMqKawNn/BZAuNtKfcA+kbgixkETupF
3/rqCp3ZWwJ4OVFKqIQnoOQRzTRwqZw42YK+qG5zgO/BRN5faYbL83s3eJC+9QNetGjx8l
DZ8jmUGFGpQ6zSYjUA4Avk37nj2GbkKGkXv0oxcrsr4O+8M9eTiOvLEd+lWhhA==
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 4WyhdP03Pmzd15;
Tue, 3 Sep 2024 10:27: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 483ARK7C010385;
Tue, 3 Sep 2024 10:27:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARKpj010382;
Tue, 3 Sep 2024 10:27:20 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:20 GMT
Message-Id: <202409031027.483ARKpj010382@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 1dc7a7b74b5a - main - mana: Stop checking for failures
from malloc/mallocarray/buf_ring_alloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 1dc7a7b74b5ad37ff7c8dc22f1a710460a5f1dcd
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=1dc7a7b74b5ad37ff7c8dc22f1a710460a5f1dcd
commit 1dc7a7b74b5ad37ff7c8dc22f1a710460a5f1dcd
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:30 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:30 +0000
mana: Stop checking for failures from malloc/mallocarray/buf_ring_alloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/mana/gdma_main.c | 19 -------------------
sys/dev/mana/hw_channel.c | 17 -----------------
sys/dev/mana/mana_en.c | 41 -----------------------------------------
3 files changed, 77 deletions(-)
diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c
index 6f3e182ba1eb..13f2617ad7d4 100644
--- a/sys/dev/mana/gdma_main.c
+++ b/sys/dev/mana/gdma_main.c
@@ -868,9 +868,6 @@ int mana_gd_create_hwc_queue(struct gdma_dev *gd,
int err;
queue = malloc(sizeof(*queue), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!queue)
- return ENOMEM;
-
gmi = &queue->mem_info;
err = mana_gd_alloc_memory(gc, spec->queue_size, gmi);
if (err)
@@ -962,9 +959,6 @@ mana_gd_create_dma_region(struct gdma_dev *gd,
}
req = malloc(req_msg_size, M_DEVBUF, M_WAITOK | M_ZERO);
- if (!req)
- return ENOMEM;
-
mana_gd_init_req_hdr(&req->hdr, GDMA_CREATE_DMA_REGION,
req_msg_size, sizeof(resp));
req->length = length;
@@ -1008,9 +1002,6 @@ mana_gd_create_mana_eq(struct gdma_dev *gd,
return EINVAL;
queue = malloc(sizeof(*queue), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!queue)
- return ENOMEM;
-
gmi = &queue->mem_info;
err = mana_gd_alloc_memory(gc, spec->queue_size, gmi);
if (err)
@@ -1056,9 +1047,6 @@ int mana_gd_create_mana_wq_cq(struct gdma_dev *gd,
return EINVAL;
queue = malloc(sizeof(*queue), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!queue)
- return ENOMEM;
-
gmi = &queue->mem_info;
err = mana_gd_alloc_memory(gc, spec->queue_size, gmi);
if (err)
@@ -1480,9 +1468,6 @@ mana_gd_alloc_res_map(uint32_t res_avail,
r->map =
malloc(n * sizeof(unsigned long), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!r->map)
- return ENOMEM;
-
r->size = res_avail;
mtx_init(&r->lock_spin, lock_name, NULL, MTX_SPIN);
@@ -1616,10 +1601,6 @@ mana_gd_setup_irqs(device_t dev)
gc->irq_contexts = malloc(nvec * sizeof(struct gdma_irq_context),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!gc->irq_contexts) {
- rc = ENOMEM;
- goto err_setup_irq_release;
- }
for (i = 0; i < nvec; i++) {
gic = &gc->irq_contexts[i];
diff --git a/sys/dev/mana/hw_channel.c b/sys/dev/mana/hw_channel.c
index 7a40a28894fb..5904389596a3 100644
--- a/sys/dev/mana/hw_channel.c
+++ b/sys/dev/mana/hw_channel.c
@@ -416,8 +416,6 @@ mana_hwc_create_cq(struct hw_channel_context *hwc,
cq_size = MINIMUM_SUPPORTED_PAGE_SIZE;
hwc_cq = malloc(sizeof(*hwc_cq), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!hwc_cq)
- return ENOMEM;
err = mana_hwc_create_gdma_eq(hwc, eq_size, ctx, callback, &eq);
if (err) {
@@ -438,10 +436,6 @@ mana_hwc_create_cq(struct hw_channel_context *hwc,
comp_buf = mallocarray(q_depth, sizeof(struct gdma_comp),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!comp_buf) {
- err = ENOMEM;
- goto out;
- }
hwc_cq->hwc = hwc;
hwc_cq->comp_buf = comp_buf;
@@ -476,8 +470,6 @@ mana_hwc_alloc_dma_buf(struct hw_channel_context *hwc, uint16_t q_depth,
dma_buf = malloc(sizeof(*dma_buf) +
q_depth * sizeof(struct hwc_work_request),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!dma_buf)
- return ENOMEM;
dma_buf->num_reqs = q_depth;
@@ -560,8 +552,6 @@ mana_hwc_create_wq(struct hw_channel_context *hwc,
queue_size = MINIMUM_SUPPORTED_PAGE_SIZE;
hwc_wq = malloc(sizeof(*hwc_wq), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!hwc_wq)
- return ENOMEM;
err = mana_hwc_create_gdma_wq(hwc, q_type, queue_size, &queue);
if (err)
@@ -669,8 +659,6 @@ mana_hwc_test_channel(struct hw_channel_context *hwc, uint16_t q_depth,
ctx = malloc(q_depth * sizeof(struct hwc_caller_ctx),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!ctx)
- return ENOMEM;
for (i = 0; i < q_depth; ++i)
init_completion(&ctx[i].comp_event);
@@ -719,9 +707,6 @@ mana_hwc_establish_channel(struct gdma_context *gc, uint16_t *q_depth,
gc->cq_table = malloc(gc->max_num_cqs * sizeof(struct gdma_queue *),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!gc->cq_table)
- return ENOMEM;
-
gc->cq_table[cq->id] = cq;
return 0;
@@ -782,8 +767,6 @@ mana_hwc_create_channel(struct gdma_context *gc)
int err;
hwc = malloc(sizeof(*hwc), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!hwc)
- return ENOMEM;
gd->gdma_context = gc;
gd->driver_data = hwc;
diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c
index 961399172688..90db036ff59b 100644
--- a/sys/dev/mana/mana_en.c
+++ b/sys/dev/mana/mana_en.c
@@ -921,13 +921,6 @@ mana_init_port_context(struct mana_port_context *apc)
apc->rxqs = mallocarray(apc->num_queues, sizeof(struct mana_rxq *),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!apc->rxqs) {
- bus_dma_tag_destroy(apc->tx_buf_tag);
- bus_dma_tag_destroy(apc->rx_buf_tag);
- apc->rx_buf_tag = NULL;
- return ENOMEM;
- }
-
return 0;
}
@@ -1156,8 +1149,6 @@ mana_cfg_vport_steering(struct mana_port_context *apc,
req_buf_size = sizeof(*req) + sizeof(mana_handle_t) * num_entries;
req = malloc(req_buf_size, M_DEVBUF, M_WAITOK | M_ZERO);
- if (!req)
- return ENOMEM;
mana_gd_init_req_hdr(&req->hdr, MANA_CONFIG_VPORT_RX, req_buf_size,
sizeof(resp));
@@ -1325,8 +1316,6 @@ mana_create_eq(struct mana_context *ac)
ac->eqs = mallocarray(gc->max_num_queues, sizeof(struct mana_eq),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!ac->eqs)
- return ENOMEM;
spec.type = GDMA_EQ;
spec.monitor_avl_buf = false;
@@ -2043,8 +2032,6 @@ mana_create_txq(struct mana_port_context *apc, if_t net)
apc->tx_qp = mallocarray(apc->num_queues, sizeof(struct mana_tx_qp),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!apc->tx_qp)
- return ENOMEM;
/* The minimum size of the WQE is 32 bytes, hence
* MAX_SEND_BUFFERS_PER_QUEUE represents the maximum number of WQEs
@@ -2141,14 +2128,6 @@ mana_create_txq(struct mana_port_context *apc, if_t net)
txq->tx_buf_info = malloc(MAX_SEND_BUFFERS_PER_QUEUE *
sizeof(struct mana_send_buf_info),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (unlikely(txq->tx_buf_info == NULL)) {
- if_printf(net,
- "Failed to allocate tx buf info for SQ %u\n",
- txq->gdma_sq->id);
- err = ENOMEM;
- goto out;
- }
-
snprintf(txq->txq_mtx_name, nitems(txq->txq_mtx_name),
"mana:tx(%d)", i);
@@ -2156,13 +2135,6 @@ mana_create_txq(struct mana_port_context *apc, if_t net)
txq->txq_br = buf_ring_alloc(4 * MAX_SEND_BUFFERS_PER_QUEUE,
M_DEVBUF, M_WAITOK, &txq->txq_mtx);
- if (unlikely(txq->txq_br == NULL)) {
- if_printf(net,
- "Failed to allocate buf ring for SQ %u\n",
- txq->gdma_sq->id);
- err = ENOMEM;
- goto out;
- }
/* Allocate taskqueue for deferred send */
TASK_INIT(&txq->enqueue_task, 0, mana_xmit_taskfunc, txq);
@@ -2353,9 +2325,6 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx,
rxq = malloc(sizeof(*rxq) +
RX_BUFFERS_PER_QUEUE * sizeof(struct mana_recv_buf_oob),
M_DEVBUF, M_WAITOK | M_ZERO);
- if (!rxq)
- return NULL;
-
rxq->ndev = ndev;
rxq->num_rx_buf = RX_BUFFERS_PER_QUEUE;
rxq->rxq_idx = rxq_idx;
@@ -2808,12 +2777,6 @@ mana_probe_port(struct mana_context *ac, int port_idx,
*ndev_storage = ndev;
apc = malloc(sizeof(*apc), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!apc) {
- mana_err(NULL, "Failed to allocate port context\n");
- err = ENOMEM;
- goto free_net;
- }
-
apc->ac = ac;
apc->ndev = ndev;
apc->max_queues = gc->max_num_queues;
@@ -2892,7 +2855,6 @@ mana_probe_port(struct mana_context *ac, int port_idx,
reset_apc:
free(apc, M_DEVBUF);
-free_net:
*ndev_storage = NULL;
if_printf(ndev, "Failed to probe vPort %d: %d\n", port_idx, err);
if_free(ndev);
@@ -2915,9 +2877,6 @@ int mana_probe(struct gdma_dev *gd)
return err;
ac = malloc(sizeof(*ac), M_DEVBUF, M_WAITOK | M_ZERO);
- if (!ac)
- return ENOMEM;
-
ac->gdma_dev = gd;
ac->num_ports = 1;
gd->driver_data = ac;
From nobody Tue Sep 3 10:27:23 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdR4xzWz5MkPl;
Tue, 03 Sep 2024 10:27:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyhdR2L9nz4sxP;
Tue, 3 Sep 2024 10:27:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359243;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=1VxNtUW+YJvMq+5ZjSaH5xL3UI4aTBEl5lM2MAUM9z8=;
b=PuMw7IcvCKVWNIQVrjy1+NxCr3G8IhJxfP3k3GI84fl0hWp79VoFjX1f2T8j1zYhg002kh
PKf+8n3kqNI4L8YlaC/0A+ZL89J24pCJw7j2cYyuYBBW7mduVsIQAXAi/K4rnmJhK9WYZH
xa+1sM6NJUMWl/XUcyOqAVPFJAp3fnq8TSrIpMedl/cmvqEDhWlDOfof7ciM+DzxxyxDKP
Pe93tXZ4pFK+3aiRpXKZRyiLYmQN5zCcL2Y/BWYWuUhWPlEh/YJ66F/mrEcEHfRtz02ddB
57FhVMHtqOXM6oeOLzlEMl3SR8GeU+x9+C4lEOF2z1Y+9fQUjzSFrGZ+Io/SWQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359243; a=rsa-sha256; cv=none;
b=NGWBEM/v6Up1Xl6XixqsJ+uk7yW7LFMTjVaHkh7ltiOTIZY865PVGykEG2CiyA0PdIDqhe
4yRoyqtSLqWCnkI8TswNh6yFkd/zUYTDMhLY2X3Nzcf4M0BAEwrQrzg6erwGu6svq6VXFv
+ddiLLUCu4M7y8R34NJDvrBjYP4vq1NxY+ddoBxImCisZvnoNES6a2P6DiSFqnyyIz12CJ
4KJ58A3FQ4/sTXmBworXsSgsvHz1vSFF204Bd6Owg2cKd7Q+paeEbgHW+4qNViRfEH6O/j
t3Pkx4HlFiy8PAK1oihSmWZuDwF1XHuK78zY/MQXpfWsd1GuGdaZUsMKjh+MZg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359243;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=1VxNtUW+YJvMq+5ZjSaH5xL3UI4aTBEl5lM2MAUM9z8=;
b=RKyQzWCLuIPuLc7oZJDwkS0e+24i9DVhkxrKuL7di9ijHp8S3YQK+sQ5JYlTQElXGRkflf
eQ70dnc6pkpWEFHoZYguw8mliH6BQKeGTGtjOytYTANge+cV6RRDxJ/Ey7b5I7FYIIcnJq
njzxExIjBYj+LjUei7goYcyl3XmtQ33w8TLdsDXwln5B3UXAiDN9vQA5E6gHqz24UoVBFM
jFWWUU4FM2U/GiypGgid2lKcyswASq1UALG94OqXRQvN0Xzp76hu9ui0MD4tYxm9RI4eG+
Ha0Im8qDCPTO3XXeLuUOz8906U+cLXVTyqdbAOJLL1tGv/xVy8ggsCAf10GPTA==
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 4WyhdR1xYWzcb9;
Tue, 3 Sep 2024 10:27:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483ARNNi010501;
Tue, 3 Sep 2024 10:27:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARNvp010497;
Tue, 3 Sep 2024 10:27:23 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:23 GMT
Message-Id: <202409031027.483ARNvp010497@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 556cd18fb076 - main - mlx(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 556cd18fb07604e3442819b221afb2a19b924dbd
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=556cd18fb07604e3442819b221afb2a19b924dbd
commit 556cd18fb07604e3442819b221afb2a19b924dbd
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:31 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:31 +0000
mlx(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/mlx/mlx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index 8e86a00222da..7e4cb443894a 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -2075,8 +2075,8 @@ mlx_user_command(struct mlx_softc *sc, struct mlx_usercommand *mu)
goto out;
}
MLX_IO_UNLOCK(sc);
- if (((kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK)) == NULL) ||
- (error = copyin(mu->mu_buf, kbuf, mu->mu_datasize))) {
+ kbuf = malloc(mu->mu_datasize, M_DEVBUF, M_WAITOK);
+ if ((error = copyin(mu->mu_buf, kbuf, mu->mu_datasize))) {
MLX_IO_LOCK(sc);
goto out;
}
From nobody Tue Sep 3 10:27:22 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdQ2swlz5MkZL;
Tue, 03 Sep 2024 10:27:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyhdQ1dQ7z4t5D;
Tue, 3 Sep 2024 10:27:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359242;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=+DpiEWPEJCWGTb97kqj00S0EPHi6+Ak++p18poskGzg=;
b=FSaH/lHZqpNBpfVxCP4VJzY85wHHdzR/1YyVgfQN3ofz1PccsKtGcHLY9qi2Yec05nFUCR
bj/cAU7mxtMi1MuY1aejvtmCixKkHnpfIoRAE8n+louw2llsVHSe96wF1vPsDtaZSnAZBW
JBbt4oPhEIb66zD2V/yAAThwlzjGUPCMcbl3///qwC0c5HWcQognEqCHS/Dj9CVdowE30w
wqzFoS7LHJGgURgiOVPSk+pfmBO8gl3XHA8um4K6MFdQSldPtwdzD8dlGMCcS51ti2vRLs
X5InZUqeN82mu0DfvMACH54pSb5P+cBj4Qq4cdZ3Sdy6i2qvnpl86D8BtG1RlQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359242; a=rsa-sha256; cv=none;
b=p2D+x279jjzqEmstXwwr29rtwBTc3VAB0XFNnyc3+xiHjIRsxONf4UTMnvsfWD6xVm2Fex
VXi4LoqYMklSOhtJpshD8xDDktFb3Qt3hFtJitnIXNaptTfvRHdXtTZFM2R17YdcyacThf
kAZH5Eucz59xOzWb/we66ncXDvDG3wslbzaFlrUy52rkneUQckTq+DVHrelLUCY26bVyLt
QmlWK4JHXJtIqQ+fn7VLp389levCoK1Lq2/tRVY5Ctkko55MNTZZu+pZH3QEs0KFNYhb8p
HuWx5bfcuDDUZcxgQ3wpg+uhQFzGxBm5d0MQgBu4C7ROFVmuMbxT+bUzuLbd3A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359242;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=+DpiEWPEJCWGTb97kqj00S0EPHi6+Ak++p18poskGzg=;
b=xc1GxxlIniwkOM8icYprirhNBeC1mjS31caDk+UIi1mpjXrZYtfvCos8GJfc4cm4pkZjSt
r5tIcHd2Lb7VGsRaG9fdVffJaGNgCuE0wzFY6ryzIe7SDUsqUOTvI0t3vzpJ66VxWZ9m74
bKG/8yk6sxOiwwxPuJKcJO9YaOW3QaRPJRBV0VSJW6I5y9aCNPisZr4rA6fjn/6iB9BgQZ
4aJZCcgkHTwmW+pJtFtcXlRfJ9ThuXnY8cEbWpUPbCbBsCm1ATekHhweTIselg8vSAfUHE
WZUDneOTi3W++aToUICvyqhine0EMzXM2Mg/Vz2QRaQj1lYW9xsaeUELBfLtvQ==
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 4WyhdQ1DKRzcFg;
Tue, 3 Sep 2024 10:27:22 +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 483ARMca010436;
Tue, 3 Sep 2024 10:27:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARMCN010433;
Tue, 3 Sep 2024 10:27:22 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:22 GMT
Message-Id: <202409031027.483ARMCN010433@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 701308ef404f - main - mfi(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 701308ef404f552034f8c3e3e912b41bfef28ee6
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=701308ef404f552034f8c3e3e912b41bfef28ee6
commit 701308ef404f552034f8c3e3e912b41bfef28ee6
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:31 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:31 +0000
mfi(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/mfi/mfi.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 2885bd695f50..328118ef9596 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -3633,11 +3633,8 @@ out:
mfi_aen_entry = malloc(sizeof(struct mfi_aen), M_MFIBUF,
M_WAITOK);
mtx_lock(&sc->mfi_io_lock);
- if (mfi_aen_entry != NULL) {
- mfi_aen_entry->p = curproc;
- TAILQ_INSERT_TAIL(&sc->mfi_aen_pids, mfi_aen_entry,
- aen_link);
- }
+ mfi_aen_entry->p = curproc;
+ TAILQ_INSERT_TAIL(&sc->mfi_aen_pids, mfi_aen_entry, aen_link);
error = mfi_aen_register(sc, l_aen.laen_seq_num,
l_aen.laen_class_locale);
From nobody Tue Sep 3 10:27:25 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdV0lbSz5MkRy;
Tue, 03 Sep 2024 10:27:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyhdT43hTz4sxw;
Tue, 3 Sep 2024 10:27:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359245;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=6boHawjXqzgJfUlCfphdj5aMt7O0ob6ZvAvdgb/N+oo=;
b=vfaWRfSqeoyPnQJfknofLF1BN9Q6pk4kb5W9QDcb/PgJlvpzHsxZl/YJa6eM432CR+GXEt
Zi3A/J4xI8qQcKHGffSzg0Ts6Byrsp8nhBhig62j0SmMspxEvLMze+NZEALvdGMKDcZ3dU
U2kABQyTGFKrSP4Anl3j/bLbfGNg6257foCwKJ3mCYgJkKYQ93Cj41MYdrycRYSPk8eFZh
WL7gZ2XcYyorJlatcAXDVFJRTkPgYUTfkoxnvnaUCWbjBughfrTG+jKJgX8zVbG1KtStb1
PyfGfJmDmXSBDjQc7eGEpbs+Lf+KIjQgAs5P2+vpn3EzmAM6BlY9nBwQ/Wwx/g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359245; a=rsa-sha256; cv=none;
b=nNd4fo0LDgD9VkK9IBEr6P0dnsTuy10Qz6vFttJ/4H1GjkqNywKltLUvEAczqkvNno5euS
IikGllPw/Z3t78v8ofK3tjZb5beapY6Y7SJLi1zaS7TjKyKSmuRfDYE6hL+hksUThZgntX
0WGPyHh2TA5DpQgtLdrMZxGL869fLYslk+dUqdKfhq/CqYUvFurLzvSFpC9LTy0AfjnYA4
xAUe5uI+7nKjGRVfPv+7vxD0d/7D3r71SjLwhXlOAxiP69X+XtFJyZTRV/jM6o7kZLGLde
Biz+8LrL3Fcgqwmx/1IxdW1megwZXIalOxmwR3sMpfJ2RAxq3HylPR70Dx5LuA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359245;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=6boHawjXqzgJfUlCfphdj5aMt7O0ob6ZvAvdgb/N+oo=;
b=hEuOz2ZtO/jp+96kxYHX2ELj6E24j7Fd7dQwwMjfDEBnpspMtnRpxaWkuF0bfv9QYrE3ov
r+IHA9hohZXp5Ao6cBA1NqtnP/o5uflR3PI2r9rwp0/QqJY6A0owu6lNq+G7SxnGd6MzGl
y0sTkvbfbHIJx/i9Q+DvaJxY3TFYItdSTUot/MW34H7i1FIpNC30BtK1Ug+9H9b8Q6t+Hw
gZ1xlif8S/m1Sh83vO1lhobESsLIywyMOW4kbSEE9XPpy+Xj48ZwBj4nmT0AIkgdmfc7un
FVT8hPvhLoDiqy7UsuZkO0L4EG/I8qEjdu7PCZ0RciHCzTNN+uKVru9j8n5MhA==
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 4WyhdT3g0fzcsv;
Tue, 3 Sep 2024 10:27: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 483ARPl7010607;
Tue, 3 Sep 2024 10:27:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARP2p010604;
Tue, 3 Sep 2024 10:27:25 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:25 GMT
Message-Id: <202409031027.483ARP2p010604@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: a38d9ad47312 - main - mrsas(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a38d9ad473123dca86108651ba10740055720777
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=a38d9ad473123dca86108651ba10740055720777
commit a38d9ad473123dca86108651ba10740055720777
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:32 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:32 +0000
mrsas(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/mrsas/mrsas_ioctl.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/sys/dev/mrsas/mrsas_ioctl.c b/sys/dev/mrsas/mrsas_ioctl.c
index 74eacfbeb9fa..8a85544604a4 100644
--- a/sys/dev/mrsas/mrsas_ioctl.c
+++ b/sys/dev/mrsas/mrsas_ioctl.c
@@ -462,13 +462,6 @@ mrsas_user_command(struct mrsas_softc *sc, struct mfi_ioc_passthru *ioc)
kern_sge[0].length = 0;
} else {
ioctl_temp_data_mem = malloc(ioc->buf_size, M_MRSAS, M_WAITOK);
- if (ioctl_temp_data_mem == NULL) {
- device_printf(sc->mrsas_dev, "Could not allocate "
- "%d memory for temporary passthrough ioctl\n",
- ioc->buf_size);
- ret = ENOMEM;
- goto out;
- }
/* Copy in data from user space */
ret = copyin(ioc->buf, ioctl_temp_data_mem, ioc->buf_size);
@@ -483,12 +476,6 @@ mrsas_user_command(struct mrsas_softc *sc, struct mfi_ioc_passthru *ioc)
*/
passcmd = malloc(sizeof(struct mrsas_passthru_cmd), M_MRSAS,
M_WAITOK);
- if (passcmd == NULL) {
- device_printf(sc->mrsas_dev, "Could not allocate "
- "memory for temporary passthrough cb struct\n");
- ret = ENOMEM;
- goto out;
- }
passcmd->complete = 0;
passcmd->sc = sc;
passcmd->cmd = cmd;
From nobody Tue Sep 3 10:27:24 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdT00Ylz5MkjP;
Tue, 03 Sep 2024 10:27: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 4WyhdS3KHCz4svb;
Tue, 3 Sep 2024 10:27:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359244;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=lE0hFGgUbLaQkLIU5BrCsLvB7OxTtd9nf+CqIqiL9qc=;
b=Wiajt/1WH2odqpzMzayL77UFy8l51NGIJf7yVZpIO4tQwDNSL3UlKEmUu8EqGAYS7TMdaO
77gOW4mappZx1sMod4FFVm0D59ds8FBSMKgBYpKO1aprpEdbYtblEDy4lZdf0FH1GWUrMt
owOjMx55xgktSzC4M/BM07aJvkZhg5GbE8JinXsCe9LsSbomdGx2NX0ewbZahr+wylnfwJ
YDGgj8hTKSRlsHZN8zptl+da39hlRwaCsxqubE1CmqQ1kDRf2SKTYm4jEfDhospnK1hbQK
hxvnOlek6LMn8w8v8OeZ+L9ioDo5cvfXP4gF+5/gIiqEecBZ11/VNmdL0s7fgw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359244; a=rsa-sha256; cv=none;
b=GxtdS7jJcMRbS0vPf7005zROuxEqe9OavJ7ZGvGrDmrlcv/eWoHh2eBNGOP2sU66B5vqSo
9hB/7UFir50zyQtbIrjO1H8PEWXMz7UWe7C033/xHFzZjLnh156xUC5QLulrkpZ6g+5t3K
bIaYc3AF8jtgVjsZD+WpoZR5S2za71c/B5GB55Jx60dzv6QAWq3Il2bVWZui+WPwiaUybq
1xL+8vh4EPxQX0Z1Fo9K0RIoVfhDtgXr/RILjvpM3ZTOby8tY8UaUReGa2t60Ji0Xm+ZUP
ScchdIh6fMj0JAwF9cex8tpKqS1Syseumab7MXOuHJY1msUG1AHRtC/dcNqENA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359244;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=lE0hFGgUbLaQkLIU5BrCsLvB7OxTtd9nf+CqIqiL9qc=;
b=Wzh2GHo+En7G2oAUlIfmGYfEiKDxbQPt7e45GOc9JTZkXr6QA3ltNd4GYXb23af/po6h84
VWd1Vd87KY/xktUNOeoJt2KwCQ00kNekVhemnvJv9x3j8ofP+fHNdIvDfZEDA9n5UBU6QI
uxMOnGUouO1s4VdUETuxj94yL3C+9sIu6p1+ClrCsZJWqU2x41qcFYLu5HnC3wQcv2tm4I
0HDpxSJld3Z+tkS5m20VRMNsxrijPqpAyFRrPFb2gzTnpgcm9pdrpHKlxsfD1cs4BfR7et
7oAsVqD7masZjU4zqI00BQppeqYxCdOtbjELV3BiceLgSa5STPgNudUlCfgxEg==
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 4WyhdS2xNdzcLG;
Tue, 3 Sep 2024 10:27: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 483AROWw010558;
Tue, 3 Sep 2024 10:27:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARORl010555;
Tue, 3 Sep 2024 10:27:24 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:24 GMT
Message-Id: <202409031027.483ARORl010555@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 849f9ac370bd - main - mpi3mr(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 849f9ac370bd66993ce5cc6fca0d2ef9bd03c2c9
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=849f9ac370bd66993ce5cc6fca0d2ef9bd03c2c9
commit 849f9ac370bd66993ce5cc6fca0d2ef9bd03c2c9
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:31 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:31 +0000
mpi3mr(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/mpi3mr/mpi3mr_cam.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c
index e00d61073d96..b4999e204ab7 100644
--- a/sys/dev/mpi3mr/mpi3mr_cam.c
+++ b/sys/dev/mpi3mr/mpi3mr_cam.c
@@ -2098,12 +2098,6 @@ mpi3mr_cam_attach(struct mpi3mr_softc *sc)
mpi3mr_dprint(sc, MPI3MR_XINFO, "Starting CAM Attach\n");
cam_sc = malloc(sizeof(struct mpi3mr_cam_softc), M_MPI3MR, M_WAITOK|M_ZERO);
- if (!cam_sc) {
- mpi3mr_dprint(sc, MPI3MR_ERROR,
- "Failed to allocate memory for controller CAM instance\n");
- return (ENOMEM);
- }
-
cam_sc->maxtargets = sc->facts.max_perids + 1;
TAILQ_INIT(&cam_sc->tgt_list);
From nobody Tue Sep 3 10:27:26 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdW161Xz5MkhS;
Tue, 03 Sep 2024 10:27: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 4WyhdV4fDhz4tDX;
Tue, 3 Sep 2024 10:27:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359246;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=JkShlhYlyzGMrEEaIsBE7kMg7MromkueJvfeYOWQmk8=;
b=XfJsZm9Mlx0CBvs0X5gMBw5rcmgMOqOc6KvRVWRZV6qgfIT4Rcvoh21B0hP92i7lMLjS+1
kQYNsB0B3NwhOzO8BOM3FrsLc9X6T7eeVgTYku4GrEQ8Njw7GP77/QCvNPvTxz1ebKZ7Hw
JpHryhx3fJMGICA6MQ1bAp4c0UYGRDblqfXF/O6t+oREF8iCa/WvJ0I3QuP6eQ4JIziBrY
cMx3wLQQ12LStutWGBVt+dSJCkvcTGqQQEfKEFqPpbVLl+AqdAnA9nGVfjoEOxo+3l4Zca
dkl6noTfbfwF+TMFBAH5eEMDnqtkzcrol6ku8F5hXaJFlS0W7OPH0uvj+AN5Gw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359246; a=rsa-sha256; cv=none;
b=o1PZozC3F5S78hOVJxasij7F7IctzHxeXDQmV7sVM9kkKLPf99LFDkZpv2blKKQTQZLHRO
HgvQzBL1VQNDJ6r/PWxvWQJGn7HHwho6AN3fntbVovMCc1V5fBQiCN6qX/jx8xCbugL85l
vggOdzPA+12S47OAqHr9hPQD1dXTKN0CHeuT27it5jiSK1utQUNIiiQ5utFiG10rjgZc5Q
GT/uxwvkLgxQspKl5h07ayXmrhUz3YcxVnKxWpq2pQSuwfvt0UyTJdQDXirocOhf2y600W
asRjFIWOp0z0+esiY6BBKm3Ztu3apnp74BbbO3AYEfAF8L4TLhpxRPtrNru0yA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359246;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=JkShlhYlyzGMrEEaIsBE7kMg7MromkueJvfeYOWQmk8=;
b=ULFM0bgq/jjTaW2/Pd+EHifn0VuD7stMD4Rakk42uqh8Y6bXh4H8/v2pN480YGYPansHpg
azSN6+/XopAzqC5tukYgKiFTtcyPxhvj6ZY0fgM5bSmDa9lmZ+e6Crdw9b8ecy0pRDVaAf
rXQiLk75c6CxwuqT3jC8eufDX6loo0U9GrUZsayVq2qYBq85sa35Gr2cntSjgcsKxOOQmP
85HQ+4kUucQS888cmvl0b6+kfSLczvg47Z7Pd/tEfHbwZsFMJMk+ydiqaHK8p/CytWGowG
6/LWRrAWtMwEbjoXSSOMroaRcUfhS2b+S4L+65PXLnKdGMpLYwnYOVL73zxnHA==
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 4WyhdV4GL3zcxq;
Tue, 3 Sep 2024 10:27: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 483ARQfe010656;
Tue, 3 Sep 2024 10:27:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARQwi010653;
Tue, 3 Sep 2024 10:27:26 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:26 GMT
Message-Id: <202409031027.483ARQwi010653@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 4fb8a80a78aa - main - pms(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 4fb8a80a78aa65e0b30bd5a74373512c678841c9
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=4fb8a80a78aa65e0b30bd5a74373512c678841c9
commit 4fb8a80a78aa65e0b30bd5a74373512c678841c9
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:32 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:32 +0000
pms(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/pms/freebsd/driver/ini/src/agtiapi.c | 38 +++-------------------------
1 file changed, 4 insertions(+), 34 deletions(-)
diff --git a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
index c8c9eb8c8dd8..cd1b80c3d712 100644
--- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
+++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
@@ -318,13 +318,6 @@ int agtiapi_getdevlist( struct agtiapi_softc *pCard,
sizeof(void *) );
AGTIAPI_PRINTK("agtiapi_getdevlist: portCount %d\n", pCard->portCount);
devList = malloc(memNeeded1, TEMP2, M_WAITOK);
- if (devList == NULL)
- {
- AGTIAPI_PRINTK("agtiapi_getdevlist: failed to allocate memory\n");
- ret_val = IOCTL_CALL_FAIL;
- agIOCTLPayload->Status = IOCTL_ERR_STATUS_INTERNAL_ERROR;
- return ret_val;
- }
osti_memset(devList, 0, memNeeded1);
pPortalData = &pCard->pPortalData[0];
pDeviceHandleList = (bit8*)devList;
@@ -970,13 +963,8 @@ static int agtiapi_attach( device_t devx )
}
else
{
- pmsc->pPortalData = (ag_portal_data_t *)
- malloc( sizeof(ag_portal_data_t) * pmsc->portCount,
+ pmsc->pPortalData = malloc( sizeof(ag_portal_data_t) * pmsc->portCount,
M_PMC_MPRT, M_ZERO | M_WAITOK );
- if (pmsc->pPortalData == NULL)
- {
- AGTIAPI_PRINTK( "agtiapi_attach: Portal memory allocation ERROR\n" );
- }
}
pPortalData = pmsc->pPortalData;
@@ -1227,32 +1215,14 @@ STATIC agBOOLEAN agtiapi_InitCardHW( struct agtiapi_softc *pmsc )
pmsc->flags |= AGTIAPI_SYS_INTR_ON;
numVal = sizeof(ag_device_t) * pmsc->devDiscover;
- pmsc->pDevList =
- (ag_device_t *)malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK );
- if( !pmsc->pDevList ) {
- AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d DevList ERROR\n", numVal );
- panic( "agtiapi_InitCardHW\n" );
- return AGTIAPI_FAIL;
- }
+ pmsc->pDevList = malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK );
#ifdef LINUX_PERBI_SUPPORT
numVal = sizeof(ag_slr_map_t) * pmsc->devDiscover;
- pmsc->pSLRList =
- (ag_slr_map_t *)malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK );
- if( !pmsc->pSLRList ) {
- AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d SLRList ERROR\n", numVal );
- panic( "agtiapi_InitCardHW SLRL\n" );
- return AGTIAPI_FAIL;
- }
+ pmsc->pSLRList = malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK );
numVal = sizeof(ag_tgt_map_t) * pmsc->devDiscover;
- pmsc->pWWNList =
- (ag_tgt_map_t *)malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK );
- if( !pmsc->pWWNList ) {
- AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d WWNList ERROR\n", numVal );
- panic( "agtiapi_InitCardHW WWNL\n" );
- return AGTIAPI_FAIL;
- }
+ pmsc->pWWNList = malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK );
// Get the WWN_to_target_ID mappings from the
// holding area which contains the input of the
From nobody Tue Sep 3 10:27:27 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdX2YhJz5MkhT;
Tue, 03 Sep 2024 10:27: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 4WyhdW5zdFz4t8P;
Tue, 3 Sep 2024 10:27:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359247;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Lo2Eyw6gDTtNEGQ2oipgxL/KJneIufdg5olvRjBkpB8=;
b=Q8CQbTS7N4bJepKyPCpRcYDczXz0wI9cRlwQ6PbJ/6VIV+xDIBuXmfPuJUy1TFw2btyTsb
4ktXq2aBL5FGF8YV9Qa+S4oIsL35lIBlaZB0jSqhenAc7OtA+Jrs9BjNkNvpt8HN4KRBjJ
sD7GiwVboJ07SiyrmtWq4ce8n8nkT6sxgFTsTQSpv/4/7CIPOcOCPbIW1vtZFBT92VODeJ
JzEMa2drP8xDbS1MLThOAnjZx6u8gWIGgmgWT4MdJc4IFJXYPjlIjWl132TIdnlJ+afaGu
RqUD31KgBsWboJHYtkGbxx1DUY3kvpZHIo4xSiru8RDUBjJjz5/KNIOr7aGkng==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359247; a=rsa-sha256; cv=none;
b=P8gMlu+hx4CYUeClmPl8/teKjWV+nsr6PH0TRwMvTzUzMPcUcyu3TB/LASi8izgpryK3k/
/7harwcgemF0V8FYyJhAoCQS25sOsGlnqiyAYwrHAziq7hS2NzVIpHe+0fzhHtnqsCwrQn
n/8BwERWjObsqCC3v5N0YOa8vArEHcVvRI9Hlfhbru5ucacl38q8SYEeRwrc5rj2ZYKMch
7UJLingBnx3q55mAJ04kZ8Ip7p+STNO+3tvexTWX8I4SzqETmYrUzLQf8fkqckgfsJYZfV
K6eQFKYcj60OZV2dZZikM5oFVpe6bngBMflOeH44s0eUzjTbAfqwCGKtb4Na4A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359247;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Lo2Eyw6gDTtNEGQ2oipgxL/KJneIufdg5olvRjBkpB8=;
b=Msg5b5cAsZu+13g5mttORjtwi+In0mH9xfck3+IATjZ9l1UNzdQMZTPCOWFqEptR9sLVSh
c39b+LF9QE+LHoFtRfcJP7R5tvUo7IdN3r5pFy+Bhwg16UULk2qGzNf2F8svuZsO9160SM
8BvX3D58R1I/raVo7wSu5cg3rHfQU55RoqNXvL/ngwuHzyuy6bXuvktOgeLhcfZ0aAHHDC
nSEw3JneejMwaSUYUDaLEoPZwHfRttNDP8vyq431sUNPT6tY30j33Kmw9V/VAqrepf0L1p
C1NCLsluBmEPguMjnXF9gm/OKnmRaaTxBG1IgMQ1CNnYA78K6NUyAbLyDcIePw==
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 4WyhdW5WHwzcxs;
Tue, 3 Sep 2024 10:27: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 483ARRBS010705;
Tue, 3 Sep 2024 10:27:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARRbC010702;
Tue, 3 Sep 2024 10:27:27 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:27 GMT
Message-Id: <202409031027.483ARRbC010702@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 866dc4bd8139 - main - qat(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 866dc4bd81398b478daefe4b7447b92422b4a06c
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=866dc4bd81398b478daefe4b7447b92422b4a06c
commit 866dc4bd81398b478daefe4b7447b92422b4a06c
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:32 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:32 +0000
qat(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/qat/qat_common/adf_freebsd_dev_processes.c | 8 --------
sys/dev/qat/qat_common/adf_freebsd_uio.c | 8 --------
sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c | 3 ---
sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c | 5 -----
4 files changed, 24 deletions(-)
diff --git a/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c b/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c
index b8a17344bdea..a70f25d57dcb 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c
@@ -146,8 +146,6 @@ adf_processes_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
return ENXIO;
}
prv_data = malloc(sizeof(*prv_data), M_QAT, M_WAITOK | M_ZERO);
- if (!prv_data)
- return ENOMEM;
INIT_LIST_HEAD(&prv_data->list);
error = devfs_set_cdevpriv(prv_data, adf_processes_release);
if (error) {
@@ -573,14 +571,8 @@ adf_state_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
int ret = 0;
prv_data = malloc(sizeof(*prv_data), M_QAT, M_WAITOK | M_ZERO);
- if (!prv_data)
- return -ENOMEM;
entry_proc_events =
malloc(sizeof(struct entry_proc_events), M_QAT, M_WAITOK | M_ZERO);
- if (!entry_proc_events) {
- free(prv_data, M_QAT);
- return -ENOMEM;
- }
mtx_lock(&mtx);
prv_data->cdev = dev;
prv_data->cdev->si_drv1 = prv_data;
diff --git a/sys/dev/qat/qat_common/adf_freebsd_uio.c b/sys/dev/qat/qat_common/adf_freebsd_uio.c
index c109fc79b0f4..64efde72b4b8 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_uio.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_uio.c
@@ -199,10 +199,6 @@ adf_alloc_bundle(struct adf_accel_dev *accel_dev, int bundle_nr)
accel = accel_dev->accel;
handle = malloc(sizeof(*handle), M_QAT, M_WAITOK | M_ZERO);
- if (!handle) {
- printf("ERROR in adf_alloc_bundle %d\n", __LINE__);
- return ENOMEM;
- }
handle->accel = accel;
handle->bundle = bundle_nr;
@@ -294,10 +290,6 @@ adf_uio_mmap_single(struct cdev *dev,
/* Adding pid to bundle list */
instance_rings =
malloc(sizeof(*instance_rings), M_QAT, M_WAITOK | M_ZERO);
- if (!instance_rings) {
- printf("QAT: Memory allocation error - line: %d\n", __LINE__);
- return -ENOMEM;
- }
instance_rings->user_pid = curproc->p_pid;
instance_rings->ring_mask = 0;
mutex_lock(&bundle->list_lock);
diff --git a/sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c b/sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c
index 6fb4cf0bf2f7..954e31c683ce 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c
@@ -123,9 +123,6 @@ get_orphan_bundle(int bank,
orphan_bundle =
malloc(sizeof(*orphan_bundle), M_QAT, M_WAITOK | M_ZERO);
- if (!orphan_bundle)
- return ENOMEM;
-
csr_base = accel->bar->virt_addr;
orphan_bundle->csr_base = csr_base;
orphan_bundle->bank = bank;
diff --git a/sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c b/sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c
index 05a99ae43ab7..9b66ae4b2370 100644
--- a/sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c
+++ b/sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c
@@ -117,11 +117,6 @@ adf_attach(device_t dev)
}
/* Allocate and configure device configuration structure */
hw_data = malloc(sizeof(*hw_data), M_QAT_4XXXVF, M_WAITOK | M_ZERO);
- if (!hw_data) {
- ret = -ENOMEM;
- goto out_err;
- }
-
accel_dev->hw_device = hw_data;
adf_init_hw_data_4xxxiov(accel_dev->hw_device);
accel_pci_dev->revid = pci_get_revid(dev);
From nobody Tue Sep 3 10:27:29 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdZ3ZRnz5MkS8;
Tue, 03 Sep 2024 10:27: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 4WyhdZ0kD0z4tBb;
Tue, 3 Sep 2024 10:27:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359250;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2Xm4RfxI5hLSYKNG0lf7KGeHKEAJ1YveqBKR0CJQZ9U=;
b=EGUdFvkyoGBr6vXiX4q6nE5nZBR30RX3eK6EZTkrvM92QxXWpnv1bRwHAuD4XW1sf3G8DQ
fLxUAI7UESyelHQ95A8If3bE1iAqc2MKjwNxY1VQrdzWZGlGJXgQmmP3jnVQWAUUVy0G5O
ez+wIvUXXuYHEEyQuQARmeBzi2jTBbY1C+ifv5JaNK1IJ3A5qZVh0i42MDrKG4nApTXOYq
FRInVcl9JlGIbDVmKumpe4bzrPpOeMtt/lwsLGEo8EhPP6asJ8PfSlOGuLkmC4OZXF2goT
Spafy3RNcHJiSEe85+5wQdZSYjXQEtH/MtuMtvvgkWdk2X03OX4bqgKyJZ6A3A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359250; a=rsa-sha256; cv=none;
b=J/pOUm4MGjLp/L1HuCrHkm31bMPI2hZvDtqM/WzFgsJd1DYhuPIjYiS8W2/wQRkkM+o0bM
JYnHvByS2j6bAmkpyFbbIbOj6tK4oMigQJY2kWZq7kHmWpOdqlwWhSd14siVlMXgl8Fibp
sv5l7RIgBjip3OH36xrjzQNJi+HRyy3ghHXg588Nn/AKEqsXbgNySOrk+5o8UoxPIz8NIC
baAKDIQ7R80VOgZNXnAsd7suRMwafRWxHEtA/OG0/eWJvWoqrZ4tAGEKDaxRfK3e62nKrC
5WNmc3R/bkdd0yFGks7F5C1iVkm0IZBw6ZZQBaJM0ZZvZ1qzanEamT4jqMSH/w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359250;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2Xm4RfxI5hLSYKNG0lf7KGeHKEAJ1YveqBKR0CJQZ9U=;
b=LVcfyur/gCfC3ldPKvdoxYQj4iGJ4IKhFa1Hfo5KU8LEtwxajLNSe6sFwqMx7vkVT3Sv8N
ZvQo9WWuUeWgPeY5Pl5w+jAj44t9zSpgCZUm0TGzbdOO2XfaNFa3yNmsr1fJvFKNkqaG+4
TYtX+WpTxNICYfNS3slxDSEO6uB4sDRjNXtz0jk0Gj+P1RSRvwDVdjngYI2XP816yv1UXC
tqkF58q3xAozZM6SWoquVMhij2I2P6Vt5yBIaxIm20sAZx4zU+gzKUJM73NNwf/1t1zY1e
/lwod7UxNt8wPDKDOxyz7VLcWWKHUpqX0mZUU5hn6CGnXjGTY8pYATAoydt/mQ==
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 4WyhdZ03hvzcLJ;
Tue, 3 Sep 2024 10:27: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 483ART79010812;
Tue, 3 Sep 2024 10:27:29 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARToa010809;
Tue, 3 Sep 2024 10:27:29 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:29 GMT
Message-Id: <202409031027.483ARToa010809@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 59121599bbda - main - sound: Stop checking for failures
from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 59121599bbda1e4c3fc3c6e887cd48cd5e3afc70
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=59121599bbda1e4c3fc3c6e887cd48cd5e3afc70
commit 59121599bbda1e4c3fc3c6e887cd48cd5e3afc70
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:33 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:33 +0000
sound: Stop checking for failures from malloc(M_WAITOK)
Reviewed by: emaste
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/sound/macio/i2s.c | 6 ++----
sys/dev/sound/usb/uaudio.c | 44 +++++++++++++++++++-------------------------
2 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c
index 5f8cb3aa15f7..647d66c27bba 100644
--- a/sys/dev/sound/macio/i2s.c
+++ b/sys/dev/sound/macio/i2s.c
@@ -241,10 +241,8 @@ i2s_attach(device_t self)
* Register a hook for delayed attach in order to allow
* the I2C controller to attach.
*/
- if ((i2s_delayed_attach = malloc(sizeof(struct intr_config_hook),
- M_TEMP, M_WAITOK | M_ZERO)) == NULL)
- return (ENOMEM);
-
+ i2s_delayed_attach = malloc(sizeof(struct intr_config_hook),
+ M_TEMP, M_WAITOK | M_ZERO);
i2s_delayed_attach->ich_func = i2s_postattach;
i2s_delayed_attach->ich_arg = sc;
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 166af8a0857d..0a8878c072d2 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -2687,8 +2687,6 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b,
DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size);
ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO);
- if (ch->buf == NULL)
- goto error;
if (sndbuf_setup(b, ch->buf, buf_size) != 0)
goto error;
@@ -3256,31 +3254,27 @@ uaudio_mixer_add_ctl_sub(struct uaudio_softc *sc, struct uaudio_mixer_node *mc)
malloc(sizeof(*p_mc_new), M_USBDEV, M_WAITOK);
int ch;
- if (p_mc_new != NULL) {
- memcpy(p_mc_new, mc, sizeof(*p_mc_new));
- p_mc_new->next = sc->sc_mixer_root;
- sc->sc_mixer_root = p_mc_new;
- sc->sc_mixer_count++;
+ memcpy(p_mc_new, mc, sizeof(*p_mc_new));
+ p_mc_new->next = sc->sc_mixer_root;
+ sc->sc_mixer_root = p_mc_new;
+ sc->sc_mixer_count++;
- /* set default value for all channels */
- for (ch = 0; ch < p_mc_new->nchan; ch++) {
- switch (p_mc_new->val_default) {
- case 1:
- /* 50% */
- p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2;
- break;
- case 2:
- /* 100% */
- p_mc_new->wData[ch] = p_mc_new->maxval;
- break;
- default:
- /* 0% */
- p_mc_new->wData[ch] = p_mc_new->minval;
- break;
- }
+ /* set default value for all channels */
+ for (ch = 0; ch < p_mc_new->nchan; ch++) {
+ switch (p_mc_new->val_default) {
+ case 1:
+ /* 50% */
+ p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2;
+ break;
+ case 2:
+ /* 100% */
+ p_mc_new->wData[ch] = p_mc_new->maxval;
+ break;
+ default:
+ /* 0% */
+ p_mc_new->wData[ch] = p_mc_new->minval;
+ break;
}
- } else {
- DPRINTF("out of memory\n");
}
}
From nobody Tue Sep 3 10:27:28 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyhdY2Cnrz5MkjY;
Tue, 03 Sep 2024 10:27: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 4WyhdX71lgz4tFG;
Tue, 3 Sep 2024 10:27:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359249;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=1yhe4ayfJfp/x+wB593vOt5mSwzGDnnKT1LUZTbU02E=;
b=iG9otWBPEFsOD9JBQYADDa64+fa422CnXB8nj5wEWEdyvhF83HN9fg7JK+teKs/iYX8mYV
siOH+TYncUVBw3cgS1bHMmqhdW+44ryls7dCWshxhoR2uQgU7YJv64Q3kHknXfP5BQOmPy
d3+C5rEZuojSkwrLeAmiSWDYmU42CzSIR2FCvzGAggFwDOEDasdxH5Xiti6oRFxoTz91mC
+pGuzaqQmuhZ/roKDLdLZMCu+/mYDG0yO5kbsRyo5jey7Lp56ufkqPG8A9HITGrO4fGWLY
u9yQSLCSkmwEg/z2KZ5e8AECHKVrQknWoJf8npgrVkRs+4jq9UDkuOT0HiSuAA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359249; a=rsa-sha256; cv=none;
b=u4gUVfSu+Zwx7NS5AZv7sg8cL/B3AeWX+yeZTLTJPB9nDV9HNpG3vrHhAnf6FIYYqPrYDT
idO7HsJ0NKmZucIo9aApKJFb1U5/SNJcE+KtWkRkB/hfosqrqgmidTaG7QcEurent/MwG4
Z0GQHWG9wyF+nc6Q7LPPdW6hmellFLbaIcRhb+kgdK0rbMWX1HAF3deI/sJR7qCRKQT0CA
dpQGo4zpNQ5GaPDkQN71gBByw0QTChjnpzRdFWsV8rdDhmPILLhEYwBNSggwLkaSLEY5Na
PoJCmmNKAUYpla5sH4Rw/ree8v5KvZu0TVadsU3nxwyjNLj3J6EcSBJtSEiCLg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359249;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=1yhe4ayfJfp/x+wB593vOt5mSwzGDnnKT1LUZTbU02E=;
b=nxR+eFUoi2LyJn32Dys8mMDQPcnHpiTvkA5YmeLA6Om20XYFYT5kCQUKjRI1ZCZOyT+EOF
mgkcCOT5JAqRkrFQUchypU4wVfO5F3K7fI9LyFNNQZCEFb2X3HyvPZMgOxikjdE6VUUDiK
DJXFi5KOPextSNFYK5kmHx35QWDI+Va16KZUvBRpf5dvVKzL66vxoXuE8LRUcaNgog6bjN
24FR1rD2IXKZ3RHVkvX/gLmQaxmq50fnHvTPcVEIcJJmWCiybd9vMJoCLnneAbRY+IKdAo
lYyITB4NCrHo3qYne0s7D9c+nrFxjdQeOFQMMxkxc5kMF9Fl495nntjCdEzZoQ==
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 4WyhdX6WfrzcbD;
Tue, 3 Sep 2024 10:27: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 483ARSYv010760;
Tue, 3 Sep 2024 10:27:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARS8K010757;
Tue, 3 Sep 2024 10:27:28 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:28 GMT
Message-Id: <202409031027.483ARS8K010757@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 761339c5544a - main - sume(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 761339c5544a360df9d3bab70675fea246eb6a83
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=761339c5544a360df9d3bab70675fea246eb6a83
commit 761339c5544a360df9d3bab70675fea246eb6a83
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:33 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:33 +0000
sume(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/sume/if_sume.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/sys/dev/sume/if_sume.c b/sys/dev/sume/if_sume.c
index 319853ac3c7a..7b2a27135e43 100644
--- a/sys/dev/sume/if_sume.c
+++ b/sys/dev/sume/if_sume.c
@@ -1195,16 +1195,11 @@ sume_probe_riffa_buffer(const struct sume_adapter *adapter,
{
struct riffa_chnl_dir **rp;
bus_addr_t hw_addr;
- int error, ch;
+ int ch;
device_t dev = adapter->dev;
- error = ENOMEM;
*p = malloc(SUME_RIFFA_CHANNELS * sizeof(struct riffa_chnl_dir *),
M_SUME, M_ZERO | M_WAITOK);
- if (*p == NULL) {
- device_printf(dev, "malloc(%s) failed.\n", dir);
- return (error);
- }
rp = *p;
/* Allocate the chnl_dir structs themselves. */
@@ -1212,11 +1207,6 @@ sume_probe_riffa_buffer(const struct sume_adapter *adapter,
/* One direction. */
rp[ch] = malloc(sizeof(struct riffa_chnl_dir), M_SUME,
M_ZERO | M_WAITOK);
- if (rp[ch] == NULL) {
- device_printf(dev, "malloc(%s[%d]) riffa_chnl_dir "
- "failed.\n", dir, ch);
- return (error);
- }
int err = bus_dma_tag_create(bus_get_dma_tag(dev),
4, 0,
From nobody Tue Sep 3 10:27:31 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdb4VX8z5Mkjb;
Tue, 03 Sep 2024 10:27: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 4Wyhdb1zx7z4tKw;
Tue, 3 Sep 2024 10:27:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359251;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=/5PEn4sXzDlva9VUdImCIsYPcSVNjW4N5O6+KnWFHrg=;
b=JS1/O8NLPbOjfvEGEJkUEaHwm3LiT7JpLK2VThaugBZPXP0SyQu0k8gft2wjV475gqY7la
2EUWep1Yz8k2DioSZq4Nhf7lW+gMbwuVXIZuMlac/0FfBafuRYGWTn/nobu2s+S3Jd8jY0
RHC7Rtr/6V6JtCcIOvoJOWccdWC6H/I5/5zlrvEcda50FJbjGpVfluSMllzb4fwtZWO821
4XdoM699iDeQeYOpVRI83x1D+uLDlZnngibIF8vLMmlASIfXFiuM/F+IxOG4bCF74IWKIs
8YVLEBbDgQfodVfHP61QcP4TRkJm8xf/SKMy4hCnYx9Ea1cTl5HGNJ5iB+Nu/A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359251; a=rsa-sha256; cv=none;
b=V+9SP5L6OKqbjwsOQgunaScDELN7Zgr2UlSH/8P1qW+ZqFobbLFtMaiRD+HNY2dt7YY6uX
/W3XgW7Fhhjxn978ktmeePoXk9WtC/HckgaEP6YKK7GQECE7gKp/W78iNCJARQf9WfPHC3
JLngiPmBtJItvD/ieF9XheTymbnN63GCxtCJDKPIBFs1ElB5g2UvtSAYKLwXgvD4PjFKgl
phxzE+PdBiMYv5EM0zwfJfCss8r3svq6/mUwZpKmwLfgoYejfihZcQhPYLUCfOy5/3tLrg
LPPUAJiCK2LuvmyBsI4dgiMGJ8EIccQXk5euYvkiDq/gFxHcpVRTj+4Y+UbJCg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359251;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=/5PEn4sXzDlva9VUdImCIsYPcSVNjW4N5O6+KnWFHrg=;
b=ZvSaNT6ZhOwly/1wXfMzu8TNjApFqR/Vxvj91ja2mGcSANQEu845abQh+UMpYd55/TzYhR
lvb6WpbyQR5Wm7lajfKIH58cr3gMoQrqvhZl0iaGt1CCgI12kx/yk0mRzOqgP91GF4EUVJ
OkSFyuGyVXEO8hn6oWHW4ah7GgH917ZByx2qMWuE2WBGopF2+8t3pfnPnv+gqapycxcb1L
yU8g6Ny8X0mw8a9+yF0u+Hr02XqkobVKCZBp/OGHrYCx2ZTCxh/IBPIYqgEG0Z4ckpw5Ga
vfzjk6TOJvG56tYygzCh704RNd+rL5SCvZY7cdywnFTD9AccaKYbXRXPrRGqnQ==
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 4Wyhdb13hhzcbF;
Tue, 3 Sep 2024 10:27: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 483ARVhS010860;
Tue, 3 Sep 2024 10:27:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARVf7010857;
Tue, 3 Sep 2024 10:27:31 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:31 GMT
Message-Id: <202409031027.483ARVf7010857@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: f80483cdd58a - main - sdhci(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: f80483cdd58a032ae2cfb2b9119824e9badc2c91
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=f80483cdd58a032ae2cfb2b9119824e9badc2c91
commit f80483cdd58a032ae2cfb2b9119824e9badc2c91
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:34 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:34 +0000
sdhci(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/dev/sdhci/sdhci_xenon_acpi.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/dev/sdhci/sdhci_xenon_acpi.c b/sys/dev/sdhci/sdhci_xenon_acpi.c
index 01b6c14dc5f2..3e8b2c4a349c 100644
--- a/sys/dev/sdhci/sdhci_xenon_acpi.c
+++ b/sys/dev/sdhci/sdhci_xenon_acpi.c
@@ -86,8 +86,6 @@ sdhci_xenon_acpi_attach(device_t dev)
memset(&mmc_helper, 0, sizeof(mmc_helper));
slot = malloc(sizeof(*slot), M_DEVBUF, M_ZERO | M_WAITOK);
- if (!slot)
- return (ENOMEM);
/*
* Don't use regularators.
From nobody Tue Sep 3 10:27:32 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdc4bbFz5MkSN;
Tue, 03 Sep 2024 10:27: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 4Wyhdc1v75z4tC2;
Tue, 3 Sep 2024 10:27:32 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359252;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=yiShXwFClzYpxq+4VNFKVqBq/kUC9qqSm2ICnt3SNQU=;
b=Y0ySTZ0tCkLxV5ObT1qShmaxBrlOeN3DhsAp1ijsVT1oUXc1sp+U3vdisy3ZhkVZDh/5JO
mT17cSX2WKkfns4DgC6/2xVuA0091VS5KJfWozyWzRQqEaNQ4cQOvi/S/Ko3l69vrNJoyh
hTb1gsl7u3qiTJLu8lELHGg4/xtwNjKRy5b64Hu5sQy9hRQQk7kZmXlQCXMS9Uqo4+NjSn
HekAN1U7ZBdvsfvk/zEshmr1k19D3dLNFEJzoH+rTvNEYz9RNuO1YS8LYhtzGJ37htcqLP
mGa75eyx6j4yYoMIc/gs4YuvIxseQOGtQVShZPTtzWDWSvkZUqPaJB/wv0z9xA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359252; a=rsa-sha256; cv=none;
b=MWIyP2hyDwebuEq5Zb0yr1UrNIB52CmDr2s5/dYp3epfLeyDGD6yKTXU89Uwp7vSFSXIXc
8bjWkCf1AdqS+868peXP+dU0Gwj1dc8laftW3MyECWyY8DAetLu+JZCduWYRBnhvHinyeo
6NqnZWuQ2BjM3c0hwT/X0YIVAMhseQhIX7YMS63n2tsFJTKHoprpUnkybnYtTi26t1XWgh
BNtd8KkTPjiFjibyB2vCT2iHbEbVX0UOn68cTfa+q46aTRdFlQQtaPFGx72Zk15pjI9NBL
YkhCwIGT7UfkknFFeTFByd84P8+3DWTh5a5YZ6bG6mOySRP+4FY5a0gB7xo38A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359252;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=yiShXwFClzYpxq+4VNFKVqBq/kUC9qqSm2ICnt3SNQU=;
b=p6KlMlKwEGjEzU9/I02aOUHnS3loG++ZroQXPoUkE+t1L+1lwTfycWrMN0UMhXRacXVTDM
SzPBpD9x9jvSTCPRfgyNs+gh7TMQmUYMfFoBt7UkWe8lpCaivSTlI3kGnV2Ne+uO0kU0/Y
df4/bT/i/yko87iZCTpdUTxy2sffB3bjkTULmqRwnRNDy11wB5dRmfytvvbT3Z35lyE53N
Bapd8OfTVvxXCNviqJ4+hfIuZi1lvg9dz3OGbYnf+NQkvWbxZJpfoM+8q/roJsrLqX/Z5N
D8Gx8v5eYBS7WHlHxdjVE2DewnrzFOjWLUTLa4CbCbatylK06UU59/eLMkcu5w==
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 4Wyhdc1W6LzcVT;
Tue, 3 Sep 2024 10:27: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 483ARWIc010908;
Tue, 3 Sep 2024 10:27:32 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARWFP010905;
Tue, 3 Sep 2024 10:27:32 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:32 GMT
Message-Id: <202409031027.483ARWFP010905@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 778ea7ed5a23 - main - vchiq(4): Stop checking for
failures from malloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 778ea7ed5a23db9c4f9d8dc43a5cea26ded6231c
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=778ea7ed5a23db9c4f9d8dc43a5cea26ded6231c
commit 778ea7ed5a23db9c4f9d8dc43a5cea26ded6231c
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:34 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:34 +0000
vchiq(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
---
sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
index 279aacd0880a..ab8981e25cb2 100644
--- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
@@ -278,8 +278,6 @@ vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, VCHI_MEM_HANDLE_T memhandle,
WARN_ON(memhandle != VCHI_MEM_HANDLE_INVALID);
bi = malloc(sizeof(*bi), M_VCPAGELIST, M_WAITOK | M_ZERO);
- if (bi == NULL)
- return VCHIQ_ERROR;
ret = create_pagelist((char __user *)offset, size,
(dir == VCHIQ_BULK_RECEIVE)
From nobody Tue Sep 3 10:27:33 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdf00XWz5MkpG;
Tue, 03 Sep 2024 10:27: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 4Wyhdd3FbFz4tLK;
Tue, 3 Sep 2024 10:27:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359253;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=qRCXzmu4dDlICYzptiFg2o8WZX/HWhAsbIP+OarBiTs=;
b=rqHWpAJru3W6H1j1K6WqmMFfaCF/veu6GjOPcPnoznx0f1bWd/8z17AIpPX8Qh7WlGqd7m
t+/asWQBsmtaUofjb1cXOV/uHN+rDmawz5LMrlzgNhQC7QJ7iZ5/xuE+hvD6yAndlztGFU
XuZJDDlvtGM7dGhY8NbaSB7K3zx2H4v/s5DNxoxVazLp7toumR7QNH9e8AAWZ8PpfoUj8g
u0VsSXDXpBiva//dzHtoHSEdk57BELIjzlRDwPI9gmvaAamhQXELtp417rjsNK0kFeNflk
77yG25E/WgcJiGxK0gkUDTHfii/xhXgVJYuYcAM/1kUtt6yN5Caei2/UzwLzSA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359253; a=rsa-sha256; cv=none;
b=ZpMf/1UFtEgLpht1Za+5uOBluw0+wKt/ZpYPOjzuDktfzfVfqmRa/prw/Gu1GnLZ4HLkB/
ePDMNrvr7SdC+acvvfdyovY/ZyKG6QVHzYmt0stlzel4H/p1KfE/PrG5p2RHHVh3s49PMf
5iexg2v+1TMRNXF8YshYcgUV9Ek/WM7JgQfyVY3252vGv2cj23w1qcuHd2qTqdP747F4ni
B7fv4LgESaO4N8dfJIJF60K+rj6uMZIlRbY5H0iya4SV8BDZkdX7jZ723/us620OJ9YFj5
S2oCHE70ll7SyU9XYhX1xMRFSFZBG4YCFMVr/ceJ0BWfM/wKOqY2D55y3zLWSA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359253;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=qRCXzmu4dDlICYzptiFg2o8WZX/HWhAsbIP+OarBiTs=;
b=IX5MDDbOKNJNNuDRgRx9svuaAptxNp/NecLVqsZQlxjVs512w2AhWttY8QbHEdEc1gIAs1
iRlfkaNcNOIx/jtqsANadlUZT6SIcMYC0FzU2MZnqoaHdvGAu1Ptl0iT8dLyG6PlnEDbWj
hlOPf9R6kBCiK3oPsXaXhcjGK24BekKgM32eVFkZ/tXqL9Pqk45D8krZ73IDl+tXg5EGLl
C3wb2454VYggGeduqyZqjmlZ/DwBPsQrDoQJb92oEMJDJIFVf/fIFDR9QKagrmCx10VVXs
X2xvkuwrYgiOdsSazcoLoguygAvi8tU2pytQ+nuCLI7bRXOg+vKhXdWJ/Hdq2g==
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 4Wyhdd2p9gzcFh;
Tue, 3 Sep 2024 10:27: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 483ARX8l010958;
Tue, 3 Sep 2024 10:27:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARXk7010955;
Tue, 3 Sep 2024 10:27:33 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:33 GMT
Message-Id: <202409031027.483ARXk7010955@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 3f3f3ca25bc4 - main - ae(4): Stop checking for failures
from taskqueue_create_fast(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 3f3f3ca25bc453315c6a1f5d16bfcc1189d41bdd
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=3f3f3ca25bc453315c6a1f5d16bfcc1189d41bdd
commit 3f3f3ca25bc453315c6a1f5d16bfcc1189d41bdd
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:34 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:34 +0000
ae(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/ae/if_ae.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c
index e424e1bd0e76..adbb3e48a4e3 100644
--- a/sys/dev/ae/if_ae.c
+++ b/sys/dev/ae/if_ae.c
@@ -362,12 +362,6 @@ ae_attach(device_t dev)
*/
sc->tq = taskqueue_create_fast("ae_taskq", M_WAITOK,
taskqueue_thread_enqueue, &sc->tq);
- if (sc->tq == NULL) {
- device_printf(dev, "could not create taskqueue.\n");
- ether_ifdetach(ifp);
- error = ENXIO;
- goto fail;
- }
taskqueue_start_threads(&sc->tq, 1, PI_NET, "%s taskq",
device_get_nameunit(sc->dev));
From nobody Tue Sep 3 10:27:34 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdf6yWPz5Mkjt;
Tue, 03 Sep 2024 10:27: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 4Wyhdf3VGdz4tCQ;
Tue, 3 Sep 2024 10:27:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359254;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=L/UMDa9ir1YuAOdB0OJysmsk8ZHyhWtjFjlFybudK9k=;
b=fJNlhcNFZV9+s/U2BE5X0rhhB2EcBJnjZJkopxVusFJOu7p59sxydXBQYl9JiNIluigSur
N0aFmM8ARN8R/3oioep4mdBsO9an+nsDvlJ1VXtjWCkDu+YrzBFUVFVUrPDZpAYGwTAXA/
axzupZaexsgqcqF7cNPjBASWbJ1Q8y/vMcEGsGXtp3jTfWCX7JYtTp54BY50E+MpGPMGjs
9W5FQttREgJNoBWWLqpgM0qK36NbwKMVJjZtrQh2wzanaJ1k4Lv0Ho9AKT/+B0sKfo1HFG
Hr57oh8/2iAUtQna+Na0763OldLaH2Uc07HI281FNASytHtyhYWZGfKsrEFOIw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359254; a=rsa-sha256; cv=none;
b=w+Cz1Hlpbg6e7hs7ETvUueEPAXlHUPoB9wckUC2FfulSCFXf5G7NvckGLERKYxj1IJRqRN
l46L/E8YpL9i9dd7XrQ75UTEXjbykCpkjzFYpp/Ez5Axiop+KQoN2ZMISaP5uZJzEKzeV7
/fjF5FA5n8zCn/gCHHdRG5TtOZhG6P5oRshHqAn94BlS9BsRj4PEE4ntZGL85dRruCni/x
uMKWbk59ptCSfW6yFFhDWnluEtiYTSOO/JemBZSGHANeJ+x57CBgblJWPbYbjE+iDQA7rH
6E69XhvKhIUgvXhd5H0Pw06knVNI6CIdUAzuejSO84KGcFv2ZSIpRUeuoKCuAQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359254;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=L/UMDa9ir1YuAOdB0OJysmsk8ZHyhWtjFjlFybudK9k=;
b=ZF7g4tkTwIk1MLw9Taff2t2wnbO02YYUcUjB/DsZkaDp0CEsfi1LLeIZo5z80VVaDCwfBe
2dSwTsM64BcY8cbwaMMHIjVbNYaNucidtkaCNPOoZSXN7mFJXf8nfiJnSPveZZJ36hts9s
ASzYXgnH7WlTSIKx12e5s0jb3RwATsc9pl5PJ49U9C7tvzLYBN8WOPVKHXZ/+RjYw+PTjk
5WKztvmYU912bffTRasXmk/IrT94yDC20Qyi03wTjcv1Z0TjJdEe10hjIMZYR2cga/VQUr
7tv5SrD/k7HjUPHpNjIBCWCPrjU9kzoRuRRF7FjWwUmv7UDZhbdJLEJ35vDuPg==
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 4Wyhdf35J7zct0;
Tue, 3 Sep 2024 10:27: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 483ARYAb011012;
Tue, 3 Sep 2024 10:27:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARYND011009;
Tue, 3 Sep 2024 10:27:34 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:34 GMT
Message-Id: <202409031027.483ARYND011009@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 5cece2c24bfa - main - age(4): Stop checking for
failures from taskqueue_create_fast(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5cece2c24bfa618091e778df488fb2380fcecafe
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=5cece2c24bfa618091e778df488fb2380fcecafe
commit 5cece2c24bfa618091e778df488fb2380fcecafe
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:35 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:35 +0000
age(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/age/if_age.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c
index 6630f2cf782d..10f99129401a 100644
--- a/sys/dev/age/if_age.c
+++ b/sys/dev/age/if_age.c
@@ -628,12 +628,6 @@ age_attach(device_t dev)
/* Create local taskq. */
sc->age_tq = taskqueue_create_fast("age_taskq", M_WAITOK,
taskqueue_thread_enqueue, &sc->age_tq);
- if (sc->age_tq == NULL) {
- device_printf(dev, "could not create taskqueue.\n");
- ether_ifdetach(ifp);
- error = ENXIO;
- goto fail;
- }
taskqueue_start_threads(&sc->age_tq, 1, PI_NET, "%s taskq",
device_get_nameunit(sc->age_dev));
From nobody Tue Sep 3 10:27:35 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdg6JWLz5Mkjw;
Tue, 03 Sep 2024 10:27: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 4Wyhdg4sm3z4tHs;
Tue, 3 Sep 2024 10:27:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359255;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WGUGdKER1SjdnM5If6/CB+gObyV9O2prkDPXnTh+CfE=;
b=jz1tM0ZlmfJUXOadd/PKty5SHH6N8juhbHTjFL1Ah410nWpGIbYna/unf90tlNQWB3wbCZ
ymsb4jkLjnua3t/Yv8TaSlw8nsb2bxz/TnR+7ZZ9ERL4I+N/cwVqqnUcMrktubnmmzeTbv
xmInh1bgBRiWmUNLcTgKlRT9eEEMYTWViSmrkVvBRKYCh+jZa6SPANwjUB6nS5XVDVUMp/
zmFVmnuvdGkLwquBf41xO1nUVrb8Sbinr0Lxj0NDHyTm3uhVtUvanMUPJxFdj8JdE7x3Lk
ULBbFCD8o/lXGWu0M2fJqu6vgx2Ve4I8wfxdpaZ2Hi8yozlkjDpFQqJCIhvt0w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359255; a=rsa-sha256; cv=none;
b=SoVRwDwpv1jkM/TPCPpyp+MXZ2encHN8+RlKp2BxpicIb3cb/kvkLaQDlXoUBWwtJH3bkG
MZ64IULZU1MQoWiC+TFfRRvnwoE72gQydmTketM26VGuc+Z+rbv/YNv2xte7KvYFPu6YlY
wGt48+NIcvJuSi76QMz7tAa5laU2hqeq1PPvC+h7A5qeavWerAGY2ELRPi28LLSO9wDdYO
iM1HD6gk1G6/UgoajaWtU2w1XVGqPRIN9JbkQ39De14L/dt73Npwf5OLkXygVLK1r9LZ+K
b0gnVVXLkBlud57QN7fk0hFPhjItRCBufqc/XPBEWHazwkM4CQDlVmUy7afH2A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359255;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WGUGdKER1SjdnM5If6/CB+gObyV9O2prkDPXnTh+CfE=;
b=J2DXNEft6H2Z7m2IxgMzOUCy52mYbhQRKRcsn1p+JkDXolt8cPlMDfUdI/Fk4U1l2nyWfO
BgRxnj3m/0Ag8XQE3T9elAw/YgSU5ZpKoG9otxU9mFcogZvrkCWpB2hOSuvS42Ce3x0j6N
XgQDGFIZv6pHSeoeQfn0a7h7Qv7iJS7d/aT6vonJzLdrzEZCIOa584XJkdZBjgeELcibjM
XjUe+VvMSo+yEQEaGuku8HfIBD/GwUYrr1VqK2SXuiGzHOsA0WU85E3f8F36mOKSobItXQ
2aZP03kw4k/u2uGvQvumFzXi/l0STJ4NgQedcH3spi3epxSTIFsRqtsN3uzvSg==
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 4Wyhdg4QFWzcxt;
Tue, 3 Sep 2024 10:27: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 483ARZKB011064;
Tue, 3 Sep 2024 10:27:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARZEG011061;
Tue, 3 Sep 2024 10:27:35 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:35 GMT
Message-Id: <202409031027.483ARZEG011061@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 0cd3976d0762 - main - alc(4): Stop checking for
failures from taskqueue_create_fast(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 0cd3976d076218ea10761dc3f38ecf8549768ad5
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=0cd3976d076218ea10761dc3f38ecf8549768ad5
commit 0cd3976d076218ea10761dc3f38ecf8549768ad5
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:35 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:35 +0000
alc(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/alc/if_alc.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c
index 859d1214b46a..07ba02c33c88 100644
--- a/sys/dev/alc/if_alc.c
+++ b/sys/dev/alc/if_alc.c
@@ -1639,12 +1639,6 @@ alc_attach(device_t dev)
/* Create local taskq. */
sc->alc_tq = taskqueue_create_fast("alc_taskq", M_WAITOK,
taskqueue_thread_enqueue, &sc->alc_tq);
- if (sc->alc_tq == NULL) {
- device_printf(dev, "could not create taskqueue.\n");
- ether_ifdetach(ifp);
- error = ENXIO;
- goto fail;
- }
taskqueue_start_threads(&sc->alc_tq, 1, PI_NET, "%s taskq",
device_get_nameunit(sc->alc_dev));
From nobody Tue Sep 3 10:27:36 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdj2HVZz5MkZt;
Tue, 03 Sep 2024 10:27: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 4Wyhdh5yQqz4tRL;
Tue, 3 Sep 2024 10:27:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359256;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=OEfdkK3GCsBWzEqfkuO5FOhVxA9vkQxINewBMvOX33M=;
b=jcolKhgX8cub/eL0+dj3wVyooaTv5IpGBu5StGw8qLiBONiW3GSc3InUOr43tV4St1qAD3
3sMZYDYIL0k5a02bnVFsfyjLTLsJdkvL0l6j2t4LjzRp7dQSackAi169o0bR8vwber/WaI
8nX9gqQUTW2XFKvrg4u2zNawB1HU3Bo88apMl1f3Y/Ym64GV4+O/urdvHo8LQELuTT8j1c
OLdDoJJXAdVX4zmd1XeCVi8wtGFEp8PuOHJI63LrrZsFCTanKIfdDeQ9v+geuRmP513Ytr
wmhcibArT5FM1dw/pEXWgrTbpiU8k4nEJ2WmQaTgGT7MRkFm/WJhQJHUTf489w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359256; a=rsa-sha256; cv=none;
b=q0M1F0YtF35wRgAV/YVOBmURp72m1+clOu58tStgM60SFm4cZhfQw6iVyaJRZB7PSdp1ZL
03f7A2GCgrKZtStsSJjsv0kLD0q67qFaLkGBLcF5t/HByTNfov3XNKYn2De7yBirhXgsmZ
RwDjYaCxSIRXx/SJ9x+9XUP/GaNUbRxH6OIbtctnYB77trnvV59GRYCiJBUzJHknE2NFdS
nVX/Ex2f5JrcLtDACwv9LzcBRs85xZtdgxr7Fz1IzzMOUCRIlP7YENMvw61I4HZWr0WYo2
X3AtWl5xb2P/thsiGybDnHa+0xWaASabQgGMWUksjvFKfGqLIHIX7+ac6HxBTQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359256;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=OEfdkK3GCsBWzEqfkuO5FOhVxA9vkQxINewBMvOX33M=;
b=Gbhk5d9x/fkYRxzKnWLpeMrbfPiupQNsZqt9LjCLKm1nk8+tBt42ANK8OuHZ+qt2pQ0R5P
gtB78zbonqd0vt/aXwPuAbCRpDNODS6hXRreFxD9DqZ06hKqJRh4BKXe411UjEhE2deNbq
SsjRyLaopxbLqdrLMbOGlzB51rPAD30fTu56Vq755B2S8otpZxQujotGOf/eoFWL40G3qI
y7cOuxLAAA8THG0LnZx2u0GOPpasgts2XceS0jUuKACOJ0fKvqfZqbrfxMAA6XUUrKhLdw
9dsooL4uJ600MznhKzeiXej8AT4kExXZJpLBZel5JKnU2acafrIXGJPSnC1bdw==
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 4Wyhdh5X12zcbG;
Tue, 3 Sep 2024 10:27: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 483ARamc011115;
Tue, 3 Sep 2024 10:27:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARaw9011112;
Tue, 3 Sep 2024 10:27:36 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:36 GMT
Message-Id: <202409031027.483ARaw9011112@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: f5524be39e26 - main - ale(4): Stop checking for
failures from taskqueue_create_fast(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: f5524be39e26e3d7fb774ffe7711602c676a8b9e
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=f5524be39e26e3d7fb774ffe7711602c676a8b9e
commit f5524be39e26e3d7fb774ffe7711602c676a8b9e
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:35 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:35 +0000
ale(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/ale/if_ale.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c
index 5b3ae438810c..e4d61e636f8b 100644
--- a/sys/dev/ale/if_ale.c
+++ b/sys/dev/ale/if_ale.c
@@ -655,12 +655,6 @@ ale_attach(device_t dev)
/* Create local taskq. */
sc->ale_tq = taskqueue_create_fast("ale_taskq", M_WAITOK,
taskqueue_thread_enqueue, &sc->ale_tq);
- if (sc->ale_tq == NULL) {
- device_printf(dev, "could not create taskqueue.\n");
- ether_ifdetach(ifp);
- error = ENXIO;
- goto fail;
- }
taskqueue_start_threads(&sc->ale_tq, 1, PI_NET, "%s taskq",
device_get_nameunit(sc->ale_dev));
From nobody Tue Sep 3 10:27:37 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdk1RQ2z5Mkm2;
Tue, 03 Sep 2024 10:27: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 4Wyhdk02G6z4tTl;
Tue, 3 Sep 2024 10:27:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359258;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=suDeeFlsKcEcZ81H9V69TQc3GVhtoIF5tQ6qVSRoMMw=;
b=q11fdhoxhn2Xvk6PmqmbGoJzbaWV9e53T59hcyXACxtfBM11KnM+IjRhYsRkhox9izccyo
PlBNj7XOWggCZ3wSK1jZmS+u0vKjicTtituNGnW8XVgUHJ3I5KtPgnwTkV7iPQ8Qd/MNz0
vLjlChE3Z1V2E0SZl6ObPTakAowi0X7/SAri0PlLheNUr0XTFeMNkh8uzxdkTx6xoANrDB
zg3DF0KSF/HAGq74YimdOzuK5nuMnWcMs1fsmnCBEgjhGYXjPwgZHzAW5Ee7tOc17nShGl
a2yKSXZh9pyVEe7Ry47uG+fk1HNJPm9vJO6kCooBTL7rBNdKM8fLnfS44pwssw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359258; a=rsa-sha256; cv=none;
b=ngz+UT/ZIoATljvERl+2d7IUgp+3XkLbflvOG9GVHupNHfFIHrZhpQnPAa0sg5hDPyGG0S
gVgbmmbwAafZV7vEzEXNlHg4kuwbgPOFgAyWm8shuV5YwV0mahsXsMHBgcjTke8CRQm32C
pVTWbM9uAJ7qed4nAa2wIk0Jj5e3avFN50W7fAM2RqdQSIvaQOqZZLYiQxS1/nYvIqpkce
Ah6M0HI5sJI5OHalBxiKrIOmFfgAXF65NKRIuSOx/zxcUs0075UIRWFDwyKCNAq1FGAeVz
mVXv/5hNSlVvysRmX7Lt8LqZyxyOE+P5cT00+FQRWfvopIYelzjIA7TGHYFhig==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359258;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=suDeeFlsKcEcZ81H9V69TQc3GVhtoIF5tQ6qVSRoMMw=;
b=XYLoNhzxMAcYJLzjQpli8JefKHHT6uf3SSG/u+zLz/1VMKFkTFY9mYszTz/4BxpW2Nsu+t
B8Q1zY+lOflOPGtJz7oBHAhKGD4lZNCN0P5MgzhygMjrqYQJZ95PArBjM+SXsNXHgjNnFj
eyGwGKO0C49xS/rXtzNxlaFpsxgOFLWHFB7iJ5Go+JW/2T/9BQp37DgUkTUg8cWqfePBCU
0YSTe6LNUYyfaNOnE+nm/kWGpPzNucNp86O2wqHCLpznQEYjuOZLcX8p2uUXCbkPWD49Q8
HpyEi6R7HXltN4vcpAOwsrpqqSqoT/kXUORDe5M6IzCZCTtIpCb+8DmvXCIyiw==
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 4Wyhdj6h0Gzd17;
Tue, 3 Sep 2024 10:27: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 483ARbEt011163;
Tue, 3 Sep 2024 10:27:37 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARbec011160;
Tue, 3 Sep 2024 10:27:37 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:37 GMT
Message-Id: <202409031027.483ARbec011160@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: b29adaaf44f6 - main - axgbe: Stop checking for failures
from taskqueue_create(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: b29adaaf44f6cf9433c782bbeeefd12d74d395a5
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=b29adaaf44f6cf9433c782bbeeefd12d74d395a5
commit b29adaaf44f6cf9433c782bbeeefd12d74d395a5
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:36 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:36 +0000
axgbe: Stop checking for failures from taskqueue_create(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/axgbe/if_axgbe_pci.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c
index 320799e77188..d3078a1c33c1 100644
--- a/sys/dev/axgbe/if_axgbe_pci.c
+++ b/sys/dev/axgbe/if_axgbe_pci.c
@@ -561,11 +561,6 @@ axgbe_if_attach_pre(if_ctx_t ctx)
/* create the workqueue */
pdata->dev_workqueue = taskqueue_create("axgbe", M_WAITOK,
taskqueue_thread_enqueue, &pdata->dev_workqueue);
- if (pdata->dev_workqueue == NULL) {
- axgbe_error("Unable to allocate workqueue\n");
- ret = ENOMEM;
- goto free_channels;
- }
ret = taskqueue_start_threads(&pdata->dev_workqueue, 1, PI_NET,
"axgbe dev taskq");
if (ret) {
@@ -581,8 +576,6 @@ axgbe_if_attach_pre(if_ctx_t ctx)
free_task_queue:
taskqueue_free(pdata->dev_workqueue);
-
-free_channels:
axgbe_free_channels(sc);
release_bus_resource:
From nobody Tue Sep 3 10:27:38 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdl4XVlz5Mkrv;
Tue, 03 Sep 2024 10:27: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 4Wyhdl12w8z4tDJ;
Tue, 3 Sep 2024 10:27:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359259;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=v5mwdZaHnNZ9VogacJknWUdGk1VEF/nnC85AkPf9YdM=;
b=XJcIajLsPhRT2GlbGD6xiIMAen0vBmwq46lI1qt1oy/4RvNY/TVahWUHJXU8410faawLsX
cFQjbs/wnSce+65j5NZe9Q4IT/rjR1ecuPKDDkHAPa7MprLQFCx9MJIRATS2quDwihD3o2
KYdTc4A6+1tZLunmsMK9q7fTV7CC6iNgZ6QkGZPKBse6Hg5SHEjhhLztUwOLHLU/FQZKsI
tKzq0v9YQ26/8jUmyTX8DbmO67cMoOwDCOECEExaW1jaJcKR2BRRBqv/2+Hy0aXNriWj5I
PQwPHdMj8nYjbqX36dsPtf6t6lzFzPqRmc51+zIi1aMI/ajNZhdyy07mAXZMYg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359259; a=rsa-sha256; cv=none;
b=d4cO8o5iOdPgSNCfZuYNp8Rj4zgfcqxHkJCFvVdrVTpTuUqEJPCXKGW53oC/oP61+3IDb1
3sjwxSgDiyIqog60jzROf9OI6o3iQ12d8AICPo2zg5YpIsdWcwOeEC7zlAko9rMnZrlbYJ
oyc8qTia3+FTDpv0QEVwBxOz58QutNs99laUt136oKWO/6We+c7u6DnHsmHDkzyHt6nhkY
y+UXrCXj7+pK0ncdHhqJBznzO+ek9CCrIJdmH14I6L4fKM+XbKnZMG8IB6p2RVaRsgV1It
o3F/VkMTa1ouAy6/KkECerafnJRUnRoA8xFoRJqQrFVTlEVpfHKyKtxZN1+g8Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359259;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=v5mwdZaHnNZ9VogacJknWUdGk1VEF/nnC85AkPf9YdM=;
b=d+zlZ/jDHb6qZGCsS/iE1G23FZJEB0BHoC6QpymAGUPglpTgPVMS+e6FWfSazvFjDArh9O
e0C91z8M6TgZrVZHRziKjqQmEK6ky/mEg1DChJ/XI2T4EshyONpP/q9hFdgGB9TKVVp4AF
+5z982LfR7LPSiTxOY2fwd7GTp4PwNhFnG1M0TF6TIlUUI+916DLdKV74/7ak4HeEWj5WG
1JTvoBDtcJ7naKZwBKC/TSl3tF0x29wlnfWBIEb/DfcxwnGi7FwPTb8YgSUCrE85i+MedT
+nXnDzMd7kZt80ufgAYjnZy0H7x4Yky4SWJ5vN3GWP0wXqbi55L2tgLOvO+nvw==
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 4Wyhdl0Ld7zct1;
Tue, 3 Sep 2024 10:27: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 483ARc3u011211;
Tue, 3 Sep 2024 10:27:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARcbw011208;
Tue, 3 Sep 2024 10:27:38 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:38 GMT
Message-Id: <202409031027.483ARcbw011208@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: d44bc2f07b97 - main - bge(4): Stop checking for
failures from taskqueue_create_fast(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: d44bc2f07b971fe1f451a1fff0389650a2502422
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=d44bc2f07b971fe1f451a1fff0389650a2502422
commit d44bc2f07b971fe1f451a1fff0389650a2502422
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:36 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:36 +0000
bge(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/bge/if_bge.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 23259179cc62..6c3301b1473a 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -3890,12 +3890,6 @@ again:
~BGE_MSIMODE_ONE_SHOT_DISABLE);
sc->bge_tq = taskqueue_create_fast("bge_taskq", M_WAITOK,
taskqueue_thread_enqueue, &sc->bge_tq);
- if (sc->bge_tq == NULL) {
- device_printf(dev, "could not create taskqueue.\n");
- ether_ifdetach(ifp);
- error = ENOMEM;
- goto fail;
- }
error = taskqueue_start_threads(&sc->bge_tq, 1, PI_NET,
"%s taskq", device_get_nameunit(sc->bge_dev));
if (error != 0) {
From nobody Tue Sep 3 10:27:40 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdm4XxCz5Mkdm;
Tue, 03 Sep 2024 10:27: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 4Wyhdm1v65z4tPs;
Tue, 3 Sep 2024 10:27:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359260;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XR4urAIyGNEGjlOS4vr2Vrrl5jSANKLiFuCOgvvA0+o=;
b=T2WvJjnHbbYdcWqkzM9Cjxc8mNH5GWhcsx/fqPYbxPugR7QN8cv1wIHKzTZEVxFl6zcP2Z
wChOZDQsq0WU1+vD/t9Q/TlD7GhtY5hRcyirRrqQCC+O7BPX5dE3CMjp7UQAVi/mhBmE2o
XXjD603V8Pyw6CVEyhVKg0GTAD0umncngr4YH7qdoviBmRHBijRJrTq68GvUJiJsujvg7r
5OCR3cfnzlYIOwOFhGFdB8W/C8Ng4oYJYztKZkOkXE/WZ6nnn5qhc/ZOB0I7gioL1Y875Z
07PcsrNk3OU2rhERl4w5ajs50KGHJq7oXnfqyz+VznU1HJELakdoZtbEJG1S2w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359260; a=rsa-sha256; cv=none;
b=gvMNxzNtmi/sp6Ueq5BrQZRa41+e4R9/4mQdkLwvoxS/xtbzQ1ecKX/HorDyrjqUuDT4Ds
oriT5YhKwnzbqLnS1bVqM38z6joOleDluUcCvq+8nbjJV7kWo2QKx3IOfXX4NKRS/LKXAL
XKAOjqfKhs66a0YTJxWKKL6jq+r5TcQOuzZyyUPNGDOp+IeiUIJ/TaCfAOpeowKU26+SUv
kwZYFbq0Tfe9HFhiD31p9oqGB0D9EvbmPE1ki/8771Y0+f+IU/i+zU1f/Q0GQUnGHon7dZ
w8s51zHHe+YBWi5crHdZIg27sfLQijB9Em8+Sr1PFGhzSOH1ydqX0cdtQUgRrw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359260;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XR4urAIyGNEGjlOS4vr2Vrrl5jSANKLiFuCOgvvA0+o=;
b=yK58myp8pJ3hFHN3FKKcQ1w1Sy4XUs9b1d96dZqrrjC3PhEOX07lr6y40tYbB9M7dn0UTf
jPJN49rBaK95RHfAlr84RqKLkPw7er6/YueoQLkNdyrItpc3UMEkIqWwjGmF8RvQyzCLKS
vt7VWsLw0oapgOerQ6yuFy/dJV7fzET2de67YX7bBSDHqIf8RcAvST6EBi0+9Xg0eWpFq5
RhUEhBblaz4gfvssqO03SxZdbVSKK2EhVHSUiRqJ4lWPp4SkAuvWil6v0yiAucfAeBTeL6
OZ+nbtDdUagi79WTNTF+v2aRBU25q6kXS9Ep/07PN8YZDk1EyFHcy2talr8Fqw==
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 4Wyhdm1N2HzcbH;
Tue, 3 Sep 2024 10:27:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483ARemI011268;
Tue, 3 Sep 2024 10:27:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AReH1011265;
Tue, 3 Sep 2024 10:27:40 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:40 GMT
Message-Id: <202409031027.483AReH1011265@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: af28fc3c191c - main - cas(4): Stop checking for
failures from taskqueue_create_fast(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: af28fc3c191cf572f7def767c60fff59d48947df
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=af28fc3c191cf572f7def767c60fff59d48947df
commit af28fc3c191cf572f7def767c60fff59d48947df
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:37 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:37 +0000
cas(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/cas/if_cas.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index 76d1b713e5bb..1f684097bd3a 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -205,11 +205,6 @@ cas_attach(struct cas_softc *sc)
TASK_INIT(&sc->sc_tx_task, 1, cas_tx_task, ifp);
sc->sc_tq = taskqueue_create_fast("cas_taskq", M_WAITOK,
taskqueue_thread_enqueue, &sc->sc_tq);
- if (sc->sc_tq == NULL) {
- device_printf(sc->sc_dev, "could not create taskqueue\n");
- error = ENXIO;
- goto fail_ifnet;
- }
error = taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq",
device_get_nameunit(sc->sc_dev));
if (error != 0) {
@@ -462,7 +457,6 @@ cas_attach(struct cas_softc *sc)
bus_dma_tag_destroy(sc->sc_pdmatag);
fail_taskq:
taskqueue_free(sc->sc_tq);
- fail_ifnet:
if_free(ifp);
return (error);
}
From nobody Tue Sep 3 10:27:41 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdn4SD1z5Mkm8;
Tue, 03 Sep 2024 10:27: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 4Wyhdn2RvJz4tSG;
Tue, 3 Sep 2024 10:27:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359261;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=KdSGyUtfQ7uPC0Div044p4o7SSJsbld0ZiH5rOFkvnA=;
b=QhkzwK48iRaC4EidziSc1O4Kw3MqOPfhdPy0NdxBHp8+AXPgwGt1zwSooCQ7XScWqaLW7C
tlrE4sDlzlWMkXvcQtb4V2Yyc5skFUTF9vyrSXCbgBh5K4nd0Q5+nwvbpxL/FiMa1WkABv
Bdv+RqF5i/pHubQD0U48voz/oA8KzskH+j5PozFC0fuZPxCgdqF2wy6NzOnu5HgnChdtPr
JeDLykjB9PI6cvahKcd3LmtxqLDodahiD0ojF/+mpZoyvjJwOXRpFKZ6g/AwVMhbgFfTb9
3wy8Iw1m0NkY2YHv2/156aPcriYvpC4HaRnjOLTO3kop899zBC7WEdo0qaJEbA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359261; a=rsa-sha256; cv=none;
b=bF9y4ixhak5nUGqyov/wuaGlpf/qABIHkg5ailqMGqA65v58y5ZQSAtM3G0E6AvHGjDkax
C/w2ue3xa23pg15/MBq2Tur1GaOzqw/36AZF14Qer6hEu0PZY6A4LScFgzE2K95QQsSVvJ
MaOnOWAQ/cjivxo9cMfz5BLdu1spYhFi6YW4ZZy4LobetIcVIgb+Yf4Dl14lE90+JEb/Qs
uQyIX3bpWhG9eWOsxyvz0IHyyDjIQ0rdUmHlQvvR6c/vKYPDZ6toyxD90usJ0CrN8k5R2/
qx3GZR5ZbujQ/1e7zJDYfi4vjr8XvITrDfGam29fw71XQDjvdS2pc3Blal3NQw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359261;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=KdSGyUtfQ7uPC0Div044p4o7SSJsbld0ZiH5rOFkvnA=;
b=mYp84xTkAs1kTMoJubw7yzaR8yBeeXs4ZcheA65jSXUXSpmQ4DFGvC97B12dtZKuw/HAo8
MdZZAqqg5epABc7JKrvYpjidqZpnfHBmpw2wCIVffrnWawVf2TAYKBjghVwhPY4e9C6Htb
K1Tzg4QmnqnuJoPDOoCLNNNc0TVY3oKXsFGWmV+qKK10PTDLsk05ro8iNwTb61wZbIaCt/
pmgS/C5v/P8qJAs8jaTcy30KGlWnFhHw6HmcujUync4z81GlPYL7pDKSVnc8zqW5+rxEnK
PNhvlDIgRLo6nuJkUmL3gvCkMuYqsGNXMnmBKFry8ouf2zKoW64hwEWhFZqpbg==
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 4Wyhdn21NwzcbJ;
Tue, 3 Sep 2024 10:27: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 483ARfKN011316;
Tue, 3 Sep 2024 10:27:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARffk011313;
Tue, 3 Sep 2024 10:27:41 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:41 GMT
Message-Id: <202409031027.483ARffk011313@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 36ef39831fe0 - main - dpaa2: Stop checking for failures
from malloc/taskqueue_create(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 36ef39831fe0e89f0b1672340a44c4ac1183158e
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=36ef39831fe0e89f0b1672340a44c4ac1183158e
commit 36ef39831fe0e89f0b1672340a44c4ac1183158e
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:37 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:37 +0000
dpaa2: Stop checking for failures from malloc/taskqueue_create(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/dpaa2/dpaa2_channel.c | 7 -------
sys/dev/dpaa2/dpaa2_mc.c | 2 --
sys/dev/dpaa2/dpaa2_ni.c | 15 ---------------
3 files changed, 24 deletions(-)
diff --git a/sys/dev/dpaa2/dpaa2_channel.c b/sys/dev/dpaa2/dpaa2_channel.c
index 87b76923a16d..654c6f2baf70 100644
--- a/sys/dev/dpaa2/dpaa2_channel.c
+++ b/sys/dev/dpaa2/dpaa2_channel.c
@@ -146,12 +146,6 @@ dpaa2_chan_setup(device_t dev, device_t iodev, device_t condev, device_t bpdev,
}
ch = malloc(sizeof(struct dpaa2_channel), M_DPAA2_CH, M_WAITOK | M_ZERO);
- if (ch == NULL) {
- device_printf(dev, "%s: malloc() failed\n", __func__);
- error = ENOMEM;
- goto fail_malloc;
- }
-
ch->ni_dev = dev;
ch->io_dev = iodev;
ch->con_dev = condev;
@@ -281,7 +275,6 @@ fail_dma_setup:
/* taskqueue_drain(ch->cleanup_tq, &ch->cleanup_task); */
/* } */
/* taskqueue_free(ch->cleanup_tq); */
-fail_malloc:
(void)DPAA2_CMD_CON_DISABLE(dev, child, DPAA2_CMD_TK(&cmd, contk));
fail_con_enable:
(void)DPAA2_CMD_CON_CLOSE(dev, child, DPAA2_CMD_TK(&cmd, contk));
diff --git a/sys/dev/dpaa2/dpaa2_mc.c b/sys/dev/dpaa2/dpaa2_mc.c
index 66867a18068c..da8f8a077d6b 100644
--- a/sys/dev/dpaa2/dpaa2_mc.c
+++ b/sys/dev/dpaa2/dpaa2_mc.c
@@ -462,8 +462,6 @@ dpaa2_mc_manage_dev(device_t mcdev, device_t dpaa2_dev, uint32_t flags)
return (EINVAL);
di = malloc(sizeof(*di), M_DPAA2_MC, M_WAITOK | M_ZERO);
- if (!di)
- return (ENOMEM);
di->dpaa2_dev = dpaa2_dev;
di->flags = flags;
di->owners = 0;
diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c
index a21351a20b49..6ed656849709 100644
--- a/sys/dev/dpaa2/dpaa2_ni.c
+++ b/sys/dev/dpaa2/dpaa2_ni.c
@@ -588,11 +588,6 @@ dpaa2_ni_attach(device_t dev)
/* Create a taskqueue thread to release new buffers to the pool. */
sc->bp_taskq = taskqueue_create(tq_name, M_WAITOK,
taskqueue_thread_enqueue, &sc->bp_taskq);
- if (sc->bp_taskq == NULL) {
- device_printf(dev, "%s: failed to allocate task queue: %s\n",
- __func__, tq_name);
- goto close_ni;
- }
taskqueue_start_threads(&sc->bp_taskq, 1, PI_NET, "%s", tq_name);
/* sc->cleanup_taskq = taskqueue_create("dpaa2_ch cleanup", M_WAITOK, */
@@ -1339,21 +1334,11 @@ dpaa2_ni_setup_tx_flow(device_t dev, struct dpaa2_ni_fq *fq)
for (uint64_t j = 0; j < DPAA2_NI_BUFS_PER_TX; j++) {
buf = malloc(sizeof(struct dpaa2_buf), M_DPAA2_TXB,
M_WAITOK);
- if (buf == NULL) {
- device_printf(dev, "%s: malloc() failed (buf)\n",
- __func__);
- return (ENOMEM);
- }
/* Keep DMA tag and Tx ring linked to the buffer */
DPAA2_BUF_INIT_TAGOPT(buf, ch->tx_dmat, tx);
buf->sgt = malloc(sizeof(struct dpaa2_buf), M_DPAA2_TXB,
M_WAITOK);
- if (buf->sgt == NULL) {
- device_printf(dev, "%s: malloc() failed (sgt)\n",
- __func__);
- return (ENOMEM);
- }
/* Link SGT to DMA tag and back to its Tx buffer */
DPAA2_BUF_INIT_TAGOPT(buf->sgt, ch->sgt_dmat, buf);
From nobody Tue Sep 3 10:27:42 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdp67H3z5Mkvm;
Tue, 03 Sep 2024 10:27: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 4Wyhdp4R6pz4tm3;
Tue, 3 Sep 2024 10:27:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359262;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=irZ6oHGttFuT91LSo0/0mZnHaHVYEW0I0+C8/loYMyY=;
b=oiDaFUgYj7VZr4pxgtOxNQSW/Xum30ojERwUtGee2fRs+YAvqufMwFIURvXMBJ/Y2P63CD
fj5ITKfOMdsIbYY4ILUUpU3lVRhQApuNHMZc0w7FNt8vprv+xtLEr7AoVsJ8zYRk21tBxB
XFldvId5lY8/2DfoqY6/2BOVmPYBvRH1sChHh21JcjEYS7C8+iOXWVlNfkusJX+FJ3Z63V
SOJdNOXF4Mziftgv/Qe+Y44J/cxSyniRmIT1q/1h4jdDa1LoSsX6fD5clBVcyyrHAdiFtJ
DNbNHUsMNB2t2AbDKpFvZoVxTFXFkTVaFGXWdtu8PHeo0q+LqHJVvcdQQ1uA3A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359262; a=rsa-sha256; cv=none;
b=yeY6MOtReGbp3c+WOxgEdBDtGNipQ50/1xPs2H6mN1HS8MSqEIE2V0zszPeWawIYVpufix
mnOVh/O5HdmxF5yJro3NdfUhRmyvJlBQ7NZMLPUy4k5qmqP1+BbociFiBAJRG1WtMQxK+Y
iPUFmJxMXOzFPv/AgbuDzKE+RDgo44uThjHWS7h8DAC61BBI6eq1hn2/rhoAHE86qT9QgR
2YX00rDbmyqqmv1PcvPet9wW0QVNFsg5GP7sJJr/cWZSVVGn3Q6OAYOimjvf3aPvZUQnfi
hC3UpZBd66zwYTuSQhNcUg0VP4qu5t9ibQYwFbLi5znXF0X9cxp2c3e2poULGA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359262;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=irZ6oHGttFuT91LSo0/0mZnHaHVYEW0I0+C8/loYMyY=;
b=ufzhN37LOAYAKEBfKGlQbDIbF7R1pLiJYRRU0bdnC22JZfW9Euz1E7oeDSsLsky1NyvruK
Ixi2A/fUQgm6E5MbpXnyjOjoqvg40nR94hBXVOYjroj7ZmRLK4k0NXoBZdhDqq6p91eEg+
x9jgd0jgcgtR23zhdRq51BkGdTlAPaZI20FPtTBQkgqvTFnuY2kU7UwfPk4QCvDFC6NVkh
DlCguvxuqFTgDYqK/LJRnV/9xc4RO0uZ96PapozF3CCjSyl/dcfSEAPWNlLYc9dXKAy47/
CkOvUnz1lEmCjDBsWfCzPSqIHdQFDze8oIymDcjTlUsr8C/MCqqMyIG9XSsBxQ==
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 4Wyhdp36KrzcbK;
Tue, 3 Sep 2024 10:27: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 483ARgR4011364;
Tue, 3 Sep 2024 10:27:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARgBi011361;
Tue, 3 Sep 2024 10:27:42 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:42 GMT
Message-Id: <202409031027.483ARgBi011361@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 3fdef8e85502 - main - jme(4): Stop checking for
failures from taskqueue_create_fast(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 3fdef8e855027d5c9bec06e2a53e8f99f7d5694b
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=3fdef8e855027d5c9bec06e2a53e8f99f7d5694b
commit 3fdef8e855027d5c9bec06e2a53e8f99f7d5694b
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:38 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:38 +0000
jme(4): Stop checking for failures from taskqueue_create_fast(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/jme/if_jme.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c
index 96824e2d7f27..4f739ec26347 100644
--- a/sys/dev/jme/if_jme.c
+++ b/sys/dev/jme/if_jme.c
@@ -872,12 +872,6 @@ jme_attach(device_t dev)
/* Create local taskq. */
sc->jme_tq = taskqueue_create_fast("jme_taskq", M_WAITOK,
taskqueue_thread_enqueue, &sc->jme_tq);
- if (sc->jme_tq == NULL) {
- device_printf(dev, "could not create taskqueue.\n");
- ether_ifdetach(ifp);
- error = ENXIO;
- goto fail;
- }
taskqueue_start_threads(&sc->jme_tq, 1, PI_NET, "%s taskq",
device_get_nameunit(sc->jme_dev));
From nobody Tue Sep 3 10:27:43 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhdq5cjVz5Mkb1;
Tue, 03 Sep 2024 10:27:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhdq4D0Rz4tmF;
Tue, 3 Sep 2024 10:27:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359263;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xGGo2Ky5H8rp0vL2BaWbq77E2uOEelAKDMFdgxaOsn8=;
b=sIvys+xySi/WuzaboiXxdRziO08JLvw8a9vMW7ZZ8lDfuMfmbsXyPAt4QBfp14f6MBpmBV
0UBuz/cMZ0xXhnCP0laA6WQT7jL4hrZbzfmd6a4T20AkCA9QS2pVv9IkWxuJuiooQfMT4z
3obRNVmrXF8jsqfpmvtP6OdOTs/T2ZGpqlr4caBcskEYOhubhGgkbOt2OOthG7HP+dxaen
EhhKf4BSyauZElYxEhG2t/5DuJ+mcqGuxymYeJ4O3Xbu87LuUVl+t7CA3YZ6z9/zXMJgJ2
7STSvYM+vYLxIiOgcK6OImPQCgJFNGc6flp41FU+mnpLZluxGzMaUGdDpSK+1g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359263; a=rsa-sha256; cv=none;
b=lq+dm8lvwB8W92pGeEpR9pIlYG2trRoU6Vg7bUqwORdNBBTxrRvtxc5ZN/6IM/a4S6KWnD
Lt4lTshCAKwSfqv7dxh4FRlekcHi7nPEkoE0E6UsqSNW70UcJDhF1tZRH8ULqy0ckyO8PX
yTJUNDh35j6sJhzmlw1aOjG+XypMWkq4T52EzFAfoaYSj17vp1PNVQMqPzVx0flnFUAW/W
cj0SbLnVoJJcp9yeB7OHg3uui6YBEVEc3cWOODxt54VKD6Q+m/P8DMdhTKhfFHtl+yJfZG
5werf9ce6BkZgE4NSXpA89N6qNgOcZoeZtMki4eZYzJTTf2ipTUewNmGSo5n5w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359263;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xGGo2Ky5H8rp0vL2BaWbq77E2uOEelAKDMFdgxaOsn8=;
b=jMuQbY0xLctZ0rtTkA2mhfUUAjiIfHfXbwroVuY7QYWk6vHWaxy9SHjzoP8UFy12ZYpuPl
tCOu2VUDY8+C5bat4mPxNRCAjnI6e1pPg5pih3HQh9d+SXbgCLfD1FbpB2YlBA8xRMxII8
YbtujYSFB3VH1mGVRH1gaF0YImMZ+6vNWa2HsjqQ/obCrtCrCphWjminIRF+buRvbqu5Va
oS1QAhWTdN9PVONEpuDayYOvQFACrGIRNyfrnGIt76u3RhKYoghGNqJrEU+B0v4uTMCnGe
JbrEpcfWHGgd1AV0AyMPCH5uXMOMNN49t3O8II6TZEN3QMlW1Xrqj4w7+DcPBg==
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 4Wyhdq3rGYzcLK;
Tue, 3 Sep 2024 10:27: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 483ARhkM011413;
Tue, 3 Sep 2024 10:27:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARhJL011410;
Tue, 3 Sep 2024 10:27:43 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:43 GMT
Message-Id: <202409031027.483ARhJL011410@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 57cd8f27b727 - main - liquidio(4): Stop checking for
failures from malloc/taskqueue_create/buf_ring_alloc(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 57cd8f27b727e7a87312f6f141cfa13807dc81a0
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=57cd8f27b727e7a87312f6f141cfa13807dc81a0
commit 57cd8f27b727e7a87312f6f141cfa13807dc81a0
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:38 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:38 +0000
liquidio(4): Stop checking for failures from malloc/taskqueue_create/buf_ring_alloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/liquidio/base/lio_request_manager.c | 9 ---------
sys/dev/liquidio/base/lio_response_manager.c | 4 ----
sys/dev/liquidio/lio_main.c | 4 ----
sys/dev/liquidio/lio_sysctl.c | 3 ---
4 files changed, 20 deletions(-)
diff --git a/sys/dev/liquidio/base/lio_request_manager.c b/sys/dev/liquidio/base/lio_request_manager.c
index f4eae0c8bf31..95eac12ecf3b 100644
--- a/sys/dev/liquidio/base/lio_request_manager.c
+++ b/sys/dev/liquidio/base/lio_request_manager.c
@@ -159,11 +159,6 @@ lio_init_instr_queue(struct octeon_device *oct, union octeon_txpciq txpciq,
db_tq = &oct->check_db_tq[iq_no];
db_tq->tq = taskqueue_create("lio_check_db_timeout", M_WAITOK,
taskqueue_thread_enqueue, &db_tq->tq);
- if (db_tq->tq == NULL) {
- lio_dev_err(oct, "check db wq create failed for iq %d\n",
- iq_no);
- return (1);
- }
TIMEOUT_TASK_INIT(db_tq->tq, &db_tq->work, 0, lio_check_db_timeout,
(void *)db_tq);
@@ -179,10 +174,6 @@ lio_init_instr_queue(struct octeon_device *oct, union octeon_txpciq txpciq,
oct->instr_queue[iq_no]->br =
buf_ring_alloc(LIO_BR_SIZE, M_DEVBUF, M_WAITOK,
&oct->instr_queue[iq_no]->enq_lock);
- if (oct->instr_queue[iq_no]->br == NULL) {
- lio_dev_err(oct, "Critical Failure setting up buf ring\n");
- return (1);
- }
return (0);
}
diff --git a/sys/dev/liquidio/base/lio_response_manager.c b/sys/dev/liquidio/base/lio_response_manager.c
index 12a3ad60521e..ac5fc6229885 100644
--- a/sys/dev/liquidio/base/lio_response_manager.c
+++ b/sys/dev/liquidio/base/lio_response_manager.c
@@ -59,10 +59,6 @@ lio_setup_response_list(struct octeon_device *oct)
ctq = &oct->dma_comp_tq;
ctq->tq = taskqueue_create("lio_dma_comp", M_WAITOK,
taskqueue_thread_enqueue, &ctq->tq);
- if (ctq->tq == NULL) {
- lio_dev_err(oct, "failed to create wq thread\n");
- return (-ENOMEM);
- }
TIMEOUT_TASK_INIT(ctq->tq, &ctq->work, 0, lio_poll_req_completion,
(void *)ctq);
diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c
index 7104ff07674f..3c73a6b10eed 100644
--- a/sys/dev/liquidio/lio_main.c
+++ b/sys/dev/liquidio/lio_main.c
@@ -1854,10 +1854,6 @@ lio_setup_rx_oom_poll_fn(if_t ifp)
rx_status_tq->tq = taskqueue_create("lio_rx_oom_status", M_WAITOK,
taskqueue_thread_enqueue,
&rx_status_tq->tq);
- if (rx_status_tq->tq == NULL) {
- lio_dev_err(oct, "unable to create lio rx oom status tq\n");
- return (-1);
- }
TIMEOUT_TASK_INIT(rx_status_tq->tq, &rx_status_tq->work, 0,
lio_poll_check_rx_oom_status, (void *)rx_status_tq);
diff --git a/sys/dev/liquidio/lio_sysctl.c b/sys/dev/liquidio/lio_sysctl.c
index 729f4d432274..61a7e96098c8 100644
--- a/sys/dev/liquidio/lio_sysctl.c
+++ b/sys/dev/liquidio/lio_sysctl.c
@@ -744,9 +744,6 @@ lio_get_regs(SYSCTL_HANDLER_ARGS)
regbuf = malloc(sizeof(char) * LIO_REGDUMP_LEN_XXXX, M_DEVBUF,
M_WAITOK | M_ZERO);
- if (regbuf == NULL)
- return (error);
-
switch (oct->chip_id) {
case LIO_CN23XX_PF_VID:
len += lio_cn23xx_pf_read_csr_reg(regbuf, oct);
From nobody Tue Sep 3 10:27:44 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyhds2nslz5Mkb3;
Tue, 03 Sep 2024 10:27:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyhdr5YJnz4tmR;
Tue, 3 Sep 2024 10:27:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725359264;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=9ZO+hZ5YFWgGWGakC/gsbDHr0FnIyPG8D4WEWElzQFE=;
b=QjILrLS6XsUbryxVRDT7kG+oy1EDq6ZeKTC2yIkk6PZ6zVql0zv2buFjk0dW6W19YO7uqo
w/HUm7x3ZMotjP/wmOXlz9KgXdXpHTbTSoqyOiMsIbB6BhR/HnJVOEcn9Sbl/QpthG3bZI
CUtAPPwFzxHGBdeFWqd3cNDwI5ABQHlQ1NmkMBhD124Zo4z3qu+VNrS8Q3K986eAW+0raE
dhsaXNFWL8YvS6ORW3aHP7Hmuye+lkFuZyXgnAbwcRVkrYd1H6Zx8ZfT0NjnsF64e+kTPQ
IWcsfsjQKUaAA1VA7vLAtgadqALuzsHOHd4ujbAQGn+FhFn4EqsUGKtAU2RmEA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359264; a=rsa-sha256; cv=none;
b=bKZVKbZKFTvfnFjr7EFj4N8pJ97O3+r0LKx5Ge+FWGiqJifmqejoOtG1MspobP1aSf5BEO
7otfLhYVPuVL9nsM8lvQdeJsA5af13EzKJ9mky8qAS569BT8ppOCNghoEaMoivimDWjVTb
BJ8dWh9qRHqGCMLhC6pqis8R3iPkfTAEbrnIDGgaRESgvksXAMQnsvBUSTBtJdhq9cx71o
N0Tx0EmGr+bee6CsRIxJ2nHIlGywLI/Ked+RV5LolZsoljD9+JJLmABCyMV9Z/NgJo4fXT
Ypxk8yJD04BcEStvgFXQrL4jt4OVW0G6oQH9qrVhDbUtA+QQcjWDVaoYdR+f0w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725359264;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=9ZO+hZ5YFWgGWGakC/gsbDHr0FnIyPG8D4WEWElzQFE=;
b=rH8C+u80B90gYaFXvFjq84TpKk+asJNrbkBsRurWOSivG2X9nt4uLndx7OELeTRIzG4clT
FpRuLcPKxB9973yaJnrI2gk8F/3pm7ZQHiGsTCTxkU03DW59eo0Dg4jd0wgHd4nHuxue3/
L8r2k8Q0Gap/XCFBLt/KrCnf78VhokKxlioKdlWvJYgoYC1MBXkEtHHrjOTInLn7lbBlxF
4Fr4z/brzRdwXuPzhwkSe44YQijnGGfXiYlyfm85R/aVm9//mYIG7FKac+kyJUScSyNGeH
Ibc65KCUfBVG2TcJKfQe0IZiXY+zTumBGrfjEMFNOF1JLmTc73Yg8FxxzAn/VQ==
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 4Wyhdr56wQzd18;
Tue, 3 Sep 2024 10:27:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483ARitS011466;
Tue, 3 Sep 2024 10:27:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ARiEt011463;
Tue, 3 Sep 2024 10:27:44 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:27:44 GMT
Message-Id: <202409031027.483ARiEt011463@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 7ea3fd3bb5f4 - main - mxge(4): Stop checking for
failures from taskqueue_create(M_WAITOK)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 7ea3fd3bb5f4039c372fd72aeef004fe12454537
Auto-Submitted: auto-generated
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=7ea3fd3bb5f4039c372fd72aeef004fe12454537
commit 7ea3fd3bb5f4039c372fd72aeef004fe12454537
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:38 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-03 10:25:38 +0000
mxge(4): Stop checking for failures from taskqueue_create(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45853
---
sys/dev/mxge/if_mxge.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
index 47793232d8d5..f36f41d53b40 100644
--- a/sys/dev/mxge/if_mxge.c
+++ b/sys/dev/mxge/if_mxge.c
@@ -4615,10 +4615,6 @@ mxge_attach(device_t dev)
TASK_INIT(&sc->watchdog_task, 1, mxge_watchdog_task, sc);
sc->tq = taskqueue_create("mxge_taskq", M_WAITOK,
taskqueue_thread_enqueue, &sc->tq);
- if (sc->tq == NULL) {
- err = ENOMEM;
- goto abort_with_nothing;
- }
err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */
1, /* alignment */
@@ -4815,7 +4811,6 @@ abort_with_tq:
taskqueue_free(sc->tq);
sc->tq = NULL;
}
-abort_with_nothing:
return err;
}
From nobody Tue Sep 3 10:45:36 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyj2S61J3z5MmFW;
Tue, 03 Sep 2024 10:45:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyj2S5Y4lz4HDW;
Tue, 3 Sep 2024 10:45:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725360336;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=udC0h4KcQ+h6lk7aKZXolx79eRmJ6meNvCjWcYABGYc=;
b=PP84qKHO3Vb1xQ19mQGfGPkZngYsVLZPX/Vxi+Xvg0F4LT6WhvXptA9VkcPCJz1Is0FrkI
EpO4qvnBTGMMeObhj3PmAei0azZL/v9uFJNR9vBdPDlduwTb/CLYxJaobMDE4CeB+Jb4cE
3TdhTCUBYH1zp5+GRkmf8RK1r+5xuhNLfZbsdYfVL9zZztg+S6XIy92URl1NpV542pjL6i
6oYBKGqsDcTgyzBvUuoCpqnC+3wvOy0Q4JQhsBsYHsYdsQUGaBMxeH3sxy8XZv7jRb0SNm
bSKkuLiLjWGTUiH6cM7H7CjU8vIy2nClhtGVk52WILPrQfjS3AQid1hj+/QYsA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725360336; a=rsa-sha256; cv=none;
b=hxLdYDp25QgMFdBhiIZIVnh+20rfmh1eIsSUQNUMi9y2X1nC9ifUtZCS81Qjd3QlFbl3FJ
9kY7yn7jU6TZWJikfn9RTNZqNl+Jwp25a5qh9nKCATD0OTrT4+bGgRmn3gqyqpnlMdvJK+
O/jAo9aB6ptE+cnuHRhO/QW6JCHDCE9iRjH2euCas/4Wi8CZlHhZiwUNzJmuUfRscaN+Zt
IJayHBQn5gfBSvC3lPe6LOSJIz6xFKhMid7G34I+C+iQFyR40+VJl7rz466fqeYzJ2cqN3
aKnRNMcg2Fifpzp+KVOn0gW6aPro/JASFSpi7Z5kLG2v3SQCcUOeyBtoyRKeVQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725360336;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=udC0h4KcQ+h6lk7aKZXolx79eRmJ6meNvCjWcYABGYc=;
b=gReUFOY8/yp9PYMkLQ+6Exkk3NNarMs7Bl7sCB/vLpBRTNtei17VtyblnWunfZLBioTrdB
qvcMgeL/UDGARiEyFF+yXPvRV2wBTA31A2Eg/hFukUGjQ+LanlGc16z9/jrAGccKNyCIw3
7iqzOw6kUb6s0bzH51SHJKz/JRj4o/bNjyNFpTSRnbvc9R/v/qy2eLy59nkkMKLmMlB0jo
aAV65batswkDPyMTHk+shROQU/DrMqxdsLgzdxn5HExgsJ2iMVHs1LNrrQ733GzuaGGTbq
0C45olUNSJaosEIiYiGDIW+k0O3HYs8g8JXYILePw5yQYsd868kTqHaFJsHBtg==
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 4Wyj2S58YvzdVV;
Tue, 3 Sep 2024 10:45: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 483Ajap1044526;
Tue, 3 Sep 2024 10:45:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AjagV044523;
Tue, 3 Sep 2024 10:45:36 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 10:45:36 GMT
Message-Id: <202409031045.483AjagV044523@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Poul-Henning Kamp <phk@FreeBSD.org>
Subject: git: ffaf862df662 - main - Mention that SILI makes tcopy(1)
slow on modern tape drives
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: phk
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ffaf862df662d507e8dd2667bffcba91e3745fe6
Auto-Submitted: auto-generated
The branch main has been updated by phk:
URL: https://cgit.FreeBSD.org/src/commit/?id=ffaf862df662d507e8dd2667bffcba91e3745fe6
commit ffaf862df662d507e8dd2667bffcba91e3745fe6
Author: Poul-Henning Kamp <phk@FreeBSD.org>
AuthorDate: 2024-09-03 10:44:20 +0000
Commit: Poul-Henning Kamp <phk@FreeBSD.org>
CommitDate: 2024-09-03 10:44:20 +0000
Mention that SILI makes tcopy(1) slow on modern tape drives
---
usr.bin/tcopy/tcopy.1 | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index da6a5231a843..f608e0af07e4 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -97,6 +97,16 @@ command appeared in
.Sh BUGS
.Bl -item
.It
+Modern tape drives may return a SCSI "Incorrect Length Indicator (ILI)"
+for reach read with a different block size that what is on the
+tape, and that slows things down a lot.
+This can be disabled with the
+.Xr mt 1
+command:
+.Bd -literal -offset indent
+$ mt param sili -s 1
+.Ed
+.It
Writing an image of a tape to a file does not preserve much more than
the raw data.
Block size(s) and tape EOF marks are lost which would
From nobody Tue Sep 3 13:16:45 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WymNt00gBz5PVd6;
Tue, 03 Sep 2024 13:16: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 4WymNs6XMRz4dnN;
Tue, 3 Sep 2024 13:16:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725369405;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=J7C0VzJSrDeC/ELz8HXwmzjKa/fl7K+X82vflZl7HeY=;
b=lQNl+5SwFY9VniQ5N/2tvYk/3ua31aTZGRQmf4DjJCoLyIfnawrhx/+xHIJkr17tNbreqa
oDPuDH539Z8w1kJy2fEtIf9lDYHaSpN8TrlCecKpFP7xvDc6VcM/Yrd20xoX7RGMvFyIF3
f6SGzCLdua48o/X9yvGuFyX6dScPQTSxtVsOUnIq/LuMgr/hGYd+Bn2wGPPLt9syozOUkz
jjy8WCL09KU8YIC2E471RysFaP91ZETZhDnN8ESAwhZuQ/WF+gwCekjR0iayygxrP1b8KF
BaWpSuUqmeaWu9PhXLuOBCE6G1NwojthiAqqHgmgfm/PzpvxZJbTcaiSLi2LAQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725369405; a=rsa-sha256; cv=none;
b=ORSVx4G3fZNIWh6pVq7MxLWEgHiXJGTpix+iFw2aDE3kQ3p4Fk5ySy2qeJg0sYe+Wt+KzH
ug7dsnIKkK576grXk7nnT9+eVNqpaJ9i9m7NCVQCN1zHVzFVmSQ1YStHhR6Tuq0SB72Ijb
IHkgUD4/1uUJlUxi7YVjpq0SWtgoOi9iHCqhmtTmGMvNGnmEY7/Ot/YUC9ndfqFeRjBEGu
pNOGylRin5ED+ghPt0NMdYBMDTO0WeyYiR39d6OMwJXVsvXF5ZIbJQRIRs9GOTQCcYeWa7
HMEeIqTtwE5DKIOWydQ7S+XLB5zp7PXr8vbYZtbHMR9qqpRsZL3xu8WPQwvaMQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725369405;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=J7C0VzJSrDeC/ELz8HXwmzjKa/fl7K+X82vflZl7HeY=;
b=eb/n2OVd3oxAqv/bWflJgujLmz66lN5/wBOW6zBNL7StZg68dCvgJShFI68p5KPwBB0oGg
HDVxrWHkGkf5SeyJIAPhrQol4smaGOHBRgff+f/ykW1lP2keK+UAnsXg5cyATi2z38nZFP
X6NQ8C+UnECumE1PYRoliIBcH/Wm96dXVUx9HsTIM008/y2Nl0fWNrySxyaSZ6wOFv6xf5
583wtQvi19WeF1hHOkUTYWJ9Da34SxobUrdkMQWQnByxovllAwFiLio04XLgr+RBoN0S4E
3Dllir/wZQdXNR+yS7nLiSp5ZqISeGf9p+d1dveQZrT5QnumIxnf6vzXZB5dhA==
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 4WymNs67VQzjJ1;
Tue, 3 Sep 2024 13:16: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 483DGjEa000610;
Tue, 3 Sep 2024 13:16:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483DGjiq000607;
Tue, 3 Sep 2024 13:16:45 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 13:16:45 GMT
Message-Id: <202409031316.483DGjiq000607@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Olivier Certner <olce@FreeBSD.org>
Subject: git: ad4cf76ec4d4 - main - bitset: __BIT_FFS_AT(): Fix
herald comment, take 2
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: olce
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ad4cf76ec4d4524381350e77b02b9abe24eb4b02
Auto-Submitted: auto-generated
The branch main has been updated by olce:
URL: https://cgit.FreeBSD.org/src/commit/?id=ad4cf76ec4d4524381350e77b02b9abe24eb4b02
commit ad4cf76ec4d4524381350e77b02b9abe24eb4b02
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2024-09-03 10:08:49 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
CommitDate: 2024-09-03 13:16:13 +0000
bitset: __BIT_FFS_AT(): Fix herald comment, take 2
Remove the reference to the nonexistent 'end' parameter. While here,
rephrase a bit.
I did the initial comment fix (commit "bitset: Fix __BIT_FFS_AT()'s
herald comment", f3ab0d86e8070c73) as part of an experiment introducing
macros to operate on ranges of bits in a bitset and subject to
a predicate (a generalization of some code used in some pending
modifications of the ULE scheduler), which was finally ditched as being
too verbose and impractical to use. I however then forgot to remove the
reference to 'end'.
No functional change.
Noted by: emaste
Approved by: emaste (mentor)
MFC after: 3 days
MFC with: f3ab0d86e807
Sponsored by: The FreeBSD Foundation
---
sys/sys/bitset.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h
index 2b26e8bcdbf9..d7e0b4cd7e41 100644
--- a/sys/sys/bitset.h
+++ b/sys/sys/bitset.h
@@ -232,9 +232,8 @@
} while (0)
/*
- * 'start' and 'end' are 0-based bit (runtime) indices. Note that, as for ffs(),
- * the returned index is 1-based, 0 being reserved to indicate that no bits are
- * set.
+ * 'start' is a 0-based bit index. By contrast, and as for ffs(), the returned
+ * index is 1-based, 0 being reserved to indicate that no bits are set.
*/
#define __BIT_FFS_AT(_s, p, start) __extension__ ({ \
__size_t __i; \
From nobody Tue Sep 3 14:28:13 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WynzK3k74z5Pcr6;
Tue, 03 Sep 2024 14:28: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 4WynzK2nY6z4tG8;
Tue, 3 Sep 2024 14:28:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725373693;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=LkIvHbQ/uUit5nNa7OvyqYSBO8Ka0nyJHhkvwyy3asQ=;
b=rD8DOrNogPFKodtUABqV0eowbF/A2q9/IPgOPjKOO9ingHsAgM/y4j+vNbnw3vNepThJGF
MKX523ytguGgTfM7wEzCwhlsfl4PbxJh0f+iSQa7LgtynU2WYYZ31P72GAl+cUNbhVNOHR
sSdU2A1wkFG7IwRt7TtVsxrAOtELGtJ2B7qZWrWa9mdXVUkkgwmuSXka0b0TaCYlWrg7im
4PFU+Wpt7VpfpOqcqQMxZ+oL/YI40ep4siQXb32TNbQ3bWlTTFHzo8bFlg2QIIBXOYvfyh
UuNl+rtgvh7rOynDPGcLwQt53SMZbpowSr9tMvNwyYRbsMRmhgX0+fJzbF8GEw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725373693; a=rsa-sha256; cv=none;
b=hgKtdQ1XWRc6Qu/Jbrdi7U9Go8ECNiZC244t2r17nxcM6bkdqNB5mkdnafmft06NH7UbbN
O7V2po01chHg3ARdStWo18hCwg/JQv3bZoMtsEOTTyXyFEReV6j5mP/qa+oi2c13NAX3PN
TeoC7DOVXT5oT5BhWTR7KNwp7oPvTTd0mfabozTgQtiq+MNAEANytt4a8CrfjPTi+28V17
QjZ82C2GwsdCToUW4FbDCzvhP+OpZFNtReKCcDNBcA4XYeWLDD1TEDU91kNLFuMNSZA408
Xs5yLcKQSGoVgUSB4QLM/ANYuCQqOA8axRLLnWYG/RqOLlDeiMe3REMy3jVsHA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725373693;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=LkIvHbQ/uUit5nNa7OvyqYSBO8Ka0nyJHhkvwyy3asQ=;
b=VcgZwaRCZPxesB8hCQnPLWIXV9BoDmDY+H6AwqZPUIaDnPrBJcguyNVX/SIrryJXNB3DkN
IfnqDZkTW5/kxAAgHmnLbCiboNJ6c6U2CwO5ZtCpX4s0n8DjIFhJmcZaOyD45Glvn1C/Jm
h37GPZnravhrw9wV7ZWimBE3vec8SVLNeuvM2zM98jG7JdaO5g3YTEueWthP56pJGBE9L0
UOtwWPxNzp31P8Qqr1pup9TMQTuiUqtD37kys+xrb7cccgGjC404u2Ncc72v98NytlV5Jd
UFBH4boLSroAmVfMrBVmyYI9FOS46lerRlH8qb8cnJpqgCvEVaoKgteuhnmaCg==
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 4WynzK2Lw5zl6T;
Tue, 3 Sep 2024 14:28: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 483ESDwW020493;
Tue, 3 Sep 2024 14:28:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483ESDAK020490;
Tue, 3 Sep 2024 14:28:13 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 14:28:13 GMT
Message-Id: <202409031428.483ESDAK020490@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 83325e7b738c - main - beep: show error upon failure
to open sound device
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 83325e7b738ce87d88553585b135b0e7d15997a6
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=83325e7b738ce87d88553585b135b0e7d15997a6
commit 83325e7b738ce87d88553585b135b0e7d15997a6
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-09-03 14:21:46 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-03 14:27:43 +0000
beep: show error upon failure to open sound device
If beep cannot open /dev/dsp provide more information to aid the user
in diagnosing a problem.
Reviewed by: christos
Sponsored by: The FreeBSD Foundation
---
usr.bin/beep/beep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/beep/beep.c b/usr.bin/beep/beep.c
index 151236b4825b..2696bacfacf4 100644
--- a/usr.bin/beep/beep.c
+++ b/usr.bin/beep/beep.c
@@ -202,7 +202,7 @@ main(int argc, char **argv)
f = open(oss_dev, O_WRONLY);
if (f < 0)
- errx(1, "Failed to open '%s'", oss_dev);
+ err(1, "Failed to open '%s'", oss_dev);
c = 1; /* mono */
if (ioctl(f, SOUND_PCM_WRITE_CHANNELS, &c) != 0)
From nobody Tue Sep 3 16:00:58 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyqxp2GWkz5TTjj;
Tue, 03 Sep 2024 15:57:02 +0000 (UTC)
(envelope-from ktullavik@gmail.com)
Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230])
(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 4Wyqxp0Thcz582m;
Tue, 3 Sep 2024 15:57:02 +0000 (UTC)
(envelope-from ktullavik@gmail.com)
Authentication-Results: mx1.freebsd.org;
none
Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2f50966c478so58613381fa.1;
Tue, 03 Sep 2024 08:57:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1725379020; x=1725983820; darn=freebsd.org;
h=content-transfer-encoding:in-reply-to:from:references:to
:content-language:subject:user-agent:mime-version:date:message-id
:from:to:cc:subject:date:message-id:reply-to;
bh=7WCmg6UW/ktrXdiLqf4po+Nwl7Ji71RT+IgMyUQqh1E=;
b=CEb70b/Lyle4cUq6xGfPsp7sPAjukYlolRhJ/p53lJDjFsmg6941IMf28rTsQj2enZ
cZIZa5Xo+YdqgNVYx+zaXuRUgHkptzU31O9Ien9sqnVl8kKQk8y4NRQDK1aSiP246WOl
scJk2NtItZwIvP+NWP3icGeOuvjDeSX3rNAxV54L4TucLg6usArnPJNc07qOVy5VZQNY
qMLw4TjBO1RvpNXNo8xFchwY0YakRfkpgc6WO5FLD8f4xPoJcU0tC4eTDjD2z9ehg4M0
FCOGeGqKtky34+HuG8WP4kw1A/wgChpirvaKHVJFG862NYY5ab1RKN1juE/jwkbykrWy
m6QQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1725379020; x=1725983820;
h=content-transfer-encoding:in-reply-to:from:references:to
:content-language:subject:user-agent:mime-version:date:message-id
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=7WCmg6UW/ktrXdiLqf4po+Nwl7Ji71RT+IgMyUQqh1E=;
b=WxBtO3L8e0A7XUTs8DHSWEb3yMLnN+VOTtcg+A8LQ1+aqr2789b67QQ4RfpvvVw7p3
1/hxFpvpbHFQVZdAJCtUmTa0bXz+Lah9FfCi1Hx42/9w68JVrdltve8uVr0B3+ho+0Bp
WPqfH4nXoPaq2+Y5RjifriyoFZFzYsZJreYAp7XQvFv9fyWX61sadMUq5LupmshdUrzH
PgSFS0+Ahg722YGV3YWBBfvdFTx7xQ1Icp+MLXgMlvEIcFAc16CyrDtGuem7FhCNrLcN
BG6U/V2bwsbOVdpyEhYch7f0SsC5ZEgEDBzctStoY5YiiJmSFuEwvC/i1Ug5qHLM86BH
T1rQ==
X-Forwarded-Encrypted: i=1; AJvYcCWc7rrvlQBeXt0XymEMX4UR8yKIwDDIGrkqphvsO4jmYuXORy5HbJwzqF4LpLgF2HLt4RWdxpsZKLSS2qv/iyrxacREK7U=@freebsd.org, AJvYcCXWRl4U4af+2Vv6StDSW7r80qwxxZrN20R/Oe6GjQtSZFZhvFZTL8H+E35kL8TYTCke9SrcNRGwRcWlQXxEbLs=@freebsd.org, AJvYcCXbziLgyryajVyhV1ZrW70WsOXrLof3IBNofAXcrQzZ5ocx6eU1FrcJGub1SFScrDvJYn1Rdz6luw6V5duku77zSFJ8@freebsd.org
X-Gm-Message-State: AOJu0Yzi3ASQJUN6RdWjSWBMLgXM8Fyx88UlfFR2m03pF5Y2259HdkZ9
5ClIzVpBTJLnLI80EdFgR0/sy0hqiTK2aR9BqwvkM5OZoNFYbNGeIeW7AaBC
X-Google-Smtp-Source: AGHT+IFY13FiyLqYhxYAN7inWfuDuG8Vzaw9NQzrAjiXUv7rk2NXWKxBd62LafG2QWERGkH/iqdCsg==
X-Received: by 2002:a2e:bea1:0:b0:2f4:f279:36d3 with SMTP id 38308e7fff4ca-2f61e0258f3mr120432411fa.4.1725379019524;
Tue, 03 Sep 2024 08:56:59 -0700 (PDT)
Received: from [10.0.0.7] ([46.212.160.34])
by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f615171d68sm22339671fa.84.2024.09.03.08.56.58
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Tue, 03 Sep 2024 08:56:58 -0700 (PDT)
Message-ID: <981431aa-9586-4e8e-a178-fe88c5f22d32@gmail.com>
Date: Tue, 3 Sep 2024 18:00:58 +0200
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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: ffaf862df662 - main - Mention that SILI makes tcopy(1) slow
on modern tape drives
Content-Language: en-US
To: Poul-Henning Kamp <phk@FreeBSD.org>, src-committers@FreeBSD.org,
dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
References: <202409031045.483AjagV044523@gitrepo.freebsd.org>
From: KT Ullavik <ktullavik@gmail.com>
In-Reply-To: <202409031045.483AjagV044523@gitrepo.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]
X-Rspamd-Queue-Id: 4Wyqxp0Thcz582m
> ... for reach read ...
Should that be "for each" ?
From nobody Tue Sep 3 16:00:40 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyr2064Xfz5TTS4;
Tue, 03 Sep 2024 16:00: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 4Wyr205csLz58kn;
Tue, 3 Sep 2024 16:00:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725379240;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=CFZmIoCl9tdXvJmEnYByat4+VhFF+C0RA4hJz9d2OwU=;
b=JFI+/LYTlzeDW4L5xTjAo5PbAje38WBG2bkeRRKeFvZ5+6EIKzrn0rzIZ8pwGvTh/c677H
8VtKQJq7m+XfHH3h9iYYIvuvufX+S6VM9stIbjOk6FosB58sCdTFuFXVfumD4R9UVtwjYr
R9cO7Wsyw27huFQ8pPQhXZnPYNzpIzLSgM48PS6kkd62CtYHgAS/BFln1/ZTDCgNO3NJh7
EyJyEfg4nq9peU/Rp2TxM9SGe0MWRLNHcwEP8w8MzMBZxMyqhs9QbdsvAyudiV8kY/IGy1
KBYDTPsYzNnHv3wyYxIKtgQIZeSgy2/Nf8ND8a5RxEZW7xLUfPj7HlUa41zafQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725379240; a=rsa-sha256; cv=none;
b=uVfEav8hrZzosX0BW2m3UsiYKpY0+VoZnnPpLmrIH1ttjUNK4Aco1xbPXY+tD9fG7GlF84
5skitTpr7mJWEC8btIvn6/Ygmc4tEVCgrNM7xTAT/6TByhljomX9ZYzpXbanBv7HpWGOvW
y8loGoIyejGq/rXFt9yULQDofe4WzOebtePfwG1dRDID8NXJ7jlauf0XpohQa0GXQjwHOm
WMNaJJmdFVKUaIzNW4RVcsb4IArotCLDi2NUFq+wILqgGhCk24NygChw012ZKdNE8OKlAi
QywP+ddbRu65Inmte5XxoRybKHHKvGmV9PBrf8i3vlzOBHvpmyVoGDgERsaL2w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725379240;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=CFZmIoCl9tdXvJmEnYByat4+VhFF+C0RA4hJz9d2OwU=;
b=gdKq0s7UiIzjzSFgSWfyCiMGtuymds3g4BbqfOrBQsZToVNWTrDLhsXthObIt7UNgnnGza
tfivb1qe0gDwiaJXw2yJYuj8Th652Ed5JYfDHc0k//NwxEHfig3N0AKRhMs/D4Gjxb9AG2
37gyKudLVJZOpxIbhnuBfaizUwVrudaL31uEAEy7QUSt+500HOPVQUdlwsjEEqhVFvsL/v
ujGUj/VnRzNKKXhSQsQG6O8TRm3Q/DYuptN4SmZCCFWTMt+Ea9rdf4vBfztu04y3hxsriW
5KfDTqHypMpI1lvxzgWg01S8zWz7q9VLfkcWA+aLW1qv4pPwp/79jLqmBn3O5w==
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 4Wyr205DyVznGR;
Tue, 3 Sep 2024 16:00:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483G0eLR083404;
Tue, 3 Sep 2024 16:00:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483G0e5Y083401;
Tue, 3 Sep 2024 16:00:40 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 16:00:40 GMT
Message-Id: <202409031600.483G0e5Y083401@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Poul-Henning Kamp <phk@FreeBSD.org>
Subject: git: 4dabfcb61538 - main - Typo.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: phk
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4dabfcb6153868a03d3afb55a27edf00585790b8
Auto-Submitted: auto-generated
The branch main has been updated by phk:
URL: https://cgit.FreeBSD.org/src/commit/?id=4dabfcb6153868a03d3afb55a27edf00585790b8
commit 4dabfcb6153868a03d3afb55a27edf00585790b8
Author: Poul-Henning Kamp <phk@FreeBSD.org>
AuthorDate: 2024-09-03 16:00:17 +0000
Commit: Poul-Henning Kamp <phk@FreeBSD.org>
CommitDate: 2024-09-03 16:00:17 +0000
Typo.
Spotted by: ktullavik
---
usr.bin/tcopy/tcopy.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index f608e0af07e4..3f12a807e41e 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -98,7 +98,7 @@ command appeared in
.Bl -item
.It
Modern tape drives may return a SCSI "Incorrect Length Indicator (ILI)"
-for reach read with a different block size that what is on the
+for each read with a different block size that what is on the
tape, and that slows things down a lot.
This can be disabled with the
.Xr mt 1
From nobody Tue Sep 3 16:00:48 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyr2B4jQvz5TTYK;
Tue, 03 Sep 2024 16:00:50 +0000 (UTC)
(envelope-from phk@critter.freebsd.dk)
Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222])
(using TLSv1.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 4Wyr2B3dlyz59CZ;
Tue, 3 Sep 2024 16:00:50 +0000 (UTC)
(envelope-from phk@critter.freebsd.dk)
Authentication-Results: mx1.freebsd.org;
none
Received: from critter.freebsd.dk (unknown [192.168.55.3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by phk.freebsd.dk (Postfix) with ESMTPS id 9F0028943A;
Tue, 03 Sep 2024 16:00:48 +0000 (UTC)
Received: (from phk@localhost)
by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 483G0mgN007888;
Tue, 3 Sep 2024 16:00:48 GMT
(envelope-from phk)
Message-Id: <202409031600.483G0mgN007888@critter.freebsd.dk>
To: KT Ullavik <ktullavik@gmail.com>
cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
Subject: Re: git: ffaf862df662 - main - Mention that SILI makes tcopy(1) slow on modern tape drives
In-reply-to: <981431aa-9586-4e8e-a178-fe88c5f22d32@gmail.com>
From: "Poul-Henning Kamp" <phk@phk.freebsd.dk>
References: <202409031045.483AjagV044523@gitrepo.freebsd.org> <981431aa-9586-4e8e-a178-fe88c5f22d32@gmail.com>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-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-ID: <7886.1725379248.1@critter.freebsd.dk>
Date: Tue, 03 Sep 2024 16:00:48 +0000
X-Spamd-Bar: ----
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:1835, ipnet:130.225.0.0/16, country:EU]
X-Rspamd-Queue-Id: 4Wyr2B3dlyz59CZ
--------
KT Ullavik writes:
> > ... for reach read ...
>
> Should that be "for each" ?
Fixed, thanks.
--
Poul-Henning Kamp | UNIX since Zilog Zeus 3.20
phk@FreeBSD.ORG | TCP/IP since RFC 956
FreeBSD committer | BSD since 4.3-tahoe
Never attribute to malice what can adequately be explained by incompetence.
From nobody Tue Sep 3 16:50:21 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wys7Q3S5Gz5TYwN;
Tue, 03 Sep 2024 16:50:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wys7Q321pz44Gg;
Tue, 3 Sep 2024 16:50:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725382226;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=6l+Px/umrBM2EgysHp9c+W54aL1HekxcU8lMl1dtjn8=;
b=J33aIcKWa2IGYESAipnts/X2x5Iw+QZtqeumpYKXFeh/R+MXvvlMHD9qXvAO3cSHWHWk2s
d0EUxTswSCy9nsjajI+pI/OyNwuvalc3no8FSuYjgvAAr+by7ouh8TzCl1gWo1P0yjCbVL
dv10nA/PACk93wI0opGfFFR2W0vJW7gU4B4SvQNOI/nR9GX4hOBKUIj1dN3VUBLPpUg9io
HSEYsYXqAPXzxNgAOyFbSw0ghTHZr6TagNR1L+xCKD+Jgwz7cqYAoyZ1pq6QGzOyJntKHd
LUXEIKpqD55UzYUcEIlPCrGxG6VaXH4M8gnjIr5n+cvsvsll6WQXOWwXTEqOTA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725382226; a=rsa-sha256; cv=none;
b=HuByJkk1V4yPSh6yaN1N6O+eoFT/8xfaxJIBr5+AinzX9der/Ys2DULbQ72hFdOPveaYcB
638W/ujUd4ZT/hZSJQ6bWnjyzb+aktPDWsINbWFsv7pfosf+sDaQh98PjMvpNjIeAcB6vN
TILNKggSzJ982T4Sy6uL8YHMVNSJtc0MwVS+IrprZDFA7muEn8IC0TwXaNXha35uZHMCXd
28qw/6pADiUIa5MazyExzj5ufEMe9kFwQfbaRseDuiDoyN4ZbATQFjhltsiKpEvDEeR52g
vJ3mnfC/xwD7YBVr5x4Ntb2o7hInZNVtaCpdMUbc3nPnmU1SonUhhLgTZeUcnw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725382226;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=6l+Px/umrBM2EgysHp9c+W54aL1HekxcU8lMl1dtjn8=;
b=XLliGQOn6elhLlYZoMS9pt3W/oX05MFzPdSpP27mylZBlhxxWlcd56CzWbP1GU206gvHXg
mliJfMVD0lFr6FKRR2U2YWPxEwsLJ0jRJ12B6hfFKRBdxSN4PNeft1RocZHI8gZwDeeJYe
EyYhqGbZITDHiJYWZEFJZDpW1gC/qQIt38bdUnw131FE1R62XqRnfIpsTVbsvLLkDX2pdR
BtIigYg2mucqa0o8YCzUYBhelv3gQoGHet7YusNwiplszDgzHK7Ga7iLUGadFCSfsfNrb6
YwVwsJREN9YnmMVfjgC4hf4ZheZ1+cjFwMoQoN3fSLqOLhqosJhLoI+bxnwjOw==
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 4Wys7Q2d9rzpY4;
Tue, 3 Sep 2024 16:50: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 483GoQXn068290;
Tue, 3 Sep 2024 16:50:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483GoL8w068280;
Tue, 3 Sep 2024 16:50:21 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 16:50:21 GMT
Message-Id: <202409031650.483GoL8w068280@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: fbd465f26340 - main - openssl: Bring over fix for
CVE-2024-6119 from vendor/openssl-3.0.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: fbd465f263400d3bc6c1a5c30857a76738c64396
Auto-Submitted: auto-generated
The branch main has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=fbd465f263400d3bc6c1a5c30857a76738c64396
commit fbd465f263400d3bc6c1a5c30857a76738c64396
Merge: 4dabfcb61538 e60dbfd00b00
Author: Gordon Tetlow <gordon@FreeBSD.org>
AuthorDate: 2024-09-03 16:47:46 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-09-03 16:49:23 +0000
openssl: Bring over fix for CVE-2024-6119 from vendor/openssl-3.0.
Merge commit 'e60dbfd00b009d424dfc5446d132872c93dd0aed'
crypto/openssl/crypto/x509/v3_utl.c | 78 +++++++++++++++-------
crypto/openssl/test/recipes/25-test_eai_data.t | 12 +++-
.../test/recipes/25-test_eai_data/kdc-cert.pem | 21 ++++++
.../recipes/25-test_eai_data/kdc-root-cert.pem | 16 +++++
.../openssl/test/recipes/25-test_eai_data/kdc.sh | 41 ++++++++++++
5 files changed, 142 insertions(+), 26 deletions(-)
diff --cc crypto/openssl/test/recipes/25-test_eai_data/kdc-cert.pem
index 000000000000,e8a2c6f55d45..e8a2c6f55d45
mode 000000,100644..100644
--- a/crypto/openssl/test/recipes/25-test_eai_data/kdc-cert.pem
+++ b/crypto/openssl/test/recipes/25-test_eai_data/kdc-cert.pem
diff --cc crypto/openssl/test/recipes/25-test_eai_data/kdc-root-cert.pem
index 000000000000,a74c96bf3146..a74c96bf3146
mode 000000,100644..100644
--- a/crypto/openssl/test/recipes/25-test_eai_data/kdc-root-cert.pem
+++ b/crypto/openssl/test/recipes/25-test_eai_data/kdc-root-cert.pem
diff --cc crypto/openssl/test/recipes/25-test_eai_data/kdc.sh
index 000000000000,7a8dbc719fb7..7a8dbc719fb7
mode 000000,100755..100755
--- a/crypto/openssl/test/recipes/25-test_eai_data/kdc.sh
+++ b/crypto/openssl/test/recipes/25-test_eai_data/kdc.sh
From nobody Tue Sep 3 17:26:28 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wysx0617Rz5TdJ8;
Tue, 03 Sep 2024 17:26: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 4Wysx05NL9z48Tw;
Tue, 3 Sep 2024 17:26:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725384388;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=POVZ7kWX0uwzzchC/EHySaS9srtySBDfASG0Vjf1nZw=;
b=dG5t4s7unSXfSW5HSR5k/hY/YFfKqQKs4INPE5Gil8VlAYWKQxxksOPQCubHW69WTIM5LK
5cynN/DeXgeXZPWlWcDWrIkje1uGgYbvD68a9QnSz2qbqAzU/qBWYc8V56iFf1lCyRUxTa
H1UieAQ0/3ll1T9XxnxPFRyBpKbYSaxluZ7Y/Yne6XKtCRwtCEJ7+lPuxUe7srK0t4e9ln
NQVlOZ1Q7Rjti5OseZ32o8C7Fd0Yqc2h2fKRRYzrhX4+/v/nvGkEq/dCzaW2INVb7YYt0s
oI63JlDAgeJExPEUOJNqnZL4H3hyZ418y8BDxhblW3u3+LHw0/iVKJvY/4YE3Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725384388; a=rsa-sha256; cv=none;
b=yfRmAAV6HhOVPl45fRq5SAAMtZlw5fDwcm8oNuVw+hQKjwRjV0FFzE+m0en2iNuY+Jx4bq
VCctshHkqiADwgi+A1syyuYcYwPHZfQoIhpmzzXRV38bJsBL/MHTnjCPPGcOW+WYHsDCAj
okgiSdH0Jlq4Bg5krj1juaiF9svIyTP904Cw+rfTQ8cA2SXCkxhGi518UuNXVQ3ST81QEs
Fu+7adwvrilYGdZCT64w0Tik3IDZdOupH/xCCwEq78KOkvgpZKw8jflzQQmCG+fWWW2+Ti
K04eccdyjarJLiUJ1NtGoavwRO39683PoUkbw0qLxE1w3Hqs7k2AYM5Ch9Qi1A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725384388;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=POVZ7kWX0uwzzchC/EHySaS9srtySBDfASG0Vjf1nZw=;
b=qXvFx11PB4eikO0Ezn80an2uUKjvmhOCfpMWtCJz++LLaonTRzOajD+w+e8LA1F4nBbOHi
awQ6Ji4QXJNBDZo6EZWIREo67CV94XXlZzDe3rkBFmgb8dvkMBw33HGyxwoW20AmM2CaVR
fPeQru8RCkq51HG9y+vxWsgb2xXedj0/mgRCKFdqx4tjGzYUw6jv3ryc7pT8tiDYN3eu1j
5JM5X0vKXo3vGR6OlrBIj5LSUqLzk6YoovIBnA3aEw/6LdcPiJRy3XId2TnLbDFjY4Vqr4
OzURY6Wn/8PauBhCEp42wJLlgFgqHakYt3Rg7iFlEEkVamiqK17ilpcXVxGZlA==
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 4Wysx04zXNzqVN;
Tue, 3 Sep 2024 17:26: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 483HQSL9027177;
Tue, 3 Sep 2024 17:26:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483HQS5l027174;
Tue, 3 Sep 2024 17:26:28 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 17:26:28 GMT
Message-Id: <202409031726.483HQS5l027174@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Joseph Mingrone <jrm@FreeBSD.org>
Subject: git: f8860353d4f4 - main - tcpdump: ppp: Use the buffer
stack for the de-escaping buffer
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrm
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f8860353d4f4c25bacdae5bc1cfb7a95edc9bfe0
Auto-Submitted: auto-generated
The branch main has been updated by jrm:
URL: https://cgit.FreeBSD.org/src/commit/?id=f8860353d4f4c25bacdae5bc1cfb7a95edc9bfe0
commit f8860353d4f4c25bacdae5bc1cfb7a95edc9bfe0
Author: Guy Harris <gharris@sonic.net>
AuthorDate: 2024-09-03 17:11:16 +0000
Commit: Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2024-09-03 17:24:16 +0000
tcpdump: ppp: Use the buffer stack for the de-escaping buffer
This both saves the buffer for freeing later and saves the packet
pointer and snapend to be restored when packet processing is complete,
even if an exception is thrown with longjmp.
This means that the hex/ASCII printing in pretty_print_packet()
processes the packet data as captured or read from the savefile, rather
than as modified by the PPP printer, so that the bounds checking is
correct.
That fixes CVE-2024-2397, which was caused by an exception being thrown
by the hex/ASCII printer (which should only happen if those routines are
called by a packet printer, not if they're called for the -X/-x/-A
flag), which jumps back to the setjmp() that surrounds the packet
printer. Hilarity^Winfinite looping ensues.
Also, restore ndo->ndo_packetp before calling the hex/ASCII printing
routine, in case nd_pop_all_packet_info() didn't restore it.
Reviewed by: emaste
---
contrib/tcpdump/print-ppp.c | 31 +++++++++++++++++--------------
contrib/tcpdump/print.c | 8 ++++++--
2 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index aba243ddb6f2..e5ae0646ebae 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/contrib/tcpdump/print-ppp.c
@@ -42,6 +42,8 @@
#include <net/if_ppp.h>
#endif
+#include <stdlib.h>
+
#include "netdissect.h"
#include "extract.h"
#include "addrtoname.h"
@@ -1363,7 +1365,6 @@ ppp_hdlc(netdissect_options *ndo,
u_char *b, *t, c;
const u_char *s;
u_int i, proto;
- const void *sb, *se;
if (caplen == 0)
return;
@@ -1371,9 +1372,11 @@ ppp_hdlc(netdissect_options *ndo,
if (length == 0)
return;
- b = (u_char *)nd_malloc(ndo, caplen);
- if (b == NULL)
- return;
+ b = (u_char *)malloc(caplen);
+ if (b == NULL) {
+ (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+ "%s: malloc", __func__);
+ }
/*
* Unescape all the data into a temporary, private, buffer.
@@ -1394,13 +1397,15 @@ ppp_hdlc(netdissect_options *ndo,
}
/*
- * Change the end pointer, so bounds checks work.
- * Change the pointer to packet data to help debugging.
+ * Switch to the output buffer for dissection, and save it
+ * on the buffer stack so it can be freed; our caller must
+ * pop it when done.
*/
- sb = ndo->ndo_packetp;
- se = ndo->ndo_snapend;
- ndo->ndo_packetp = b;
- ndo->ndo_snapend = t;
+ if (!nd_push_buffer(ndo, b, b, (u_int)(t - b))) {
+ free(b);
+ (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+ "%s: can't push buffer on buffer stack", __func__);
+ }
length = ND_BYTES_AVAILABLE_AFTER(b);
/* now lets guess about the payload codepoint format */
@@ -1442,13 +1447,11 @@ ppp_hdlc(netdissect_options *ndo,
}
cleanup:
- ndo->ndo_packetp = sb;
- ndo->ndo_snapend = se;
+ nd_pop_packet_info(ndo);
return;
trunc:
- ndo->ndo_packetp = sb;
- ndo->ndo_snapend = se;
+ nd_pop_packet_info(ndo);
nd_print_trunc(ndo);
}
diff --git a/contrib/tcpdump/print.c b/contrib/tcpdump/print.c
index 41a6b524fbf8..96d34b772f08 100644
--- a/contrib/tcpdump/print.c
+++ b/contrib/tcpdump/print.c
@@ -434,10 +434,14 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
nd_pop_all_packet_info(ndo);
/*
- * Restore the original snapend, as a printer might have
- * changed it.
+ * Restore the originals snapend and packetp, as a printer
+ * might have changed them.
+ *
+ * XXX - nd_pop_all_packet_info() should have restored the
+ * original values, but, just in case....
*/
ndo->ndo_snapend = sp + h->caplen;
+ ndo->ndo_packetp = sp;
if (ndo->ndo_Xflag) {
/*
* Print the raw packet data in hex and ASCII.
From nobody Tue Sep 3 19:10:30 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WywF26TLXz5Tp2Y;
Tue, 03 Sep 2024 19:10: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 4WywF21zv9z4VsZ;
Tue, 3 Sep 2024 19:10:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725390630;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=CRB1bu7ptmXiu4MU5+JOiplDaIolCp33YePTlL+4wUg=;
b=UASkE4AW+CZukbCYntPAsDl6TBmwuNQoOjiZMID198c2Ye1nZ83sjKL4GDlrhzJXMKOn+P
oWS65DdNv/LcRi+n+tk2ikx33FM6arU4Z2g/WBR9HGwLkM9hKfQSXYQ/38f3okxlYmZIAJ
HtyKjaHnVt8Ekyxjw6GA+qfSEZx2FhvfpbFFnyoRzUCoc5+cHg4k3Zq4p6Vr6GQi5oyUoW
hb/oLAPrWtycaemj8HQMg6cwOshBYufTH1hzBsLoTfFkvGm4XsObmlKmHEByXrn61eWf/M
EcxIj5x+xonloQCbumjHsvxGQnfjQHkS7uPN99qmK7YtUDn+ZXuAXG/NoXZhpg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725390630; a=rsa-sha256; cv=none;
b=sp13TrIIc+DKAXi6WrSL2giNWAEjPs+X2iiTMc3s49zNlgHGNorhRJz8CmtSrJiF8lc8zY
5ZcZpHqZcMuFQl1Zjz8HhpQxNhCqEDGV7uQuKTMxKBibEm11454sEKESJrH5JOK2z6lp6C
k6e5dT8Dtf6QNL3s2LEjuMTxHHhsCH36VNsgXSf74RanN51AjJSd5nJoCBAemQsqBxMdFS
NqL5zhCbFsqDk7TL6ErA+R3tTqu+h9thGPRBgCyEKgIj5NSLziVQh2Xrc8rkul71gUsny4
nFP8EwjeLZfeuPk5OFfpI2v8fHqu1qNLlgczJnpxTK1n/EN7PT5SSfC10PKWzw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725390630;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=CRB1bu7ptmXiu4MU5+JOiplDaIolCp33YePTlL+4wUg=;
b=Ix+N+mDIr2dGuAU/FRTPizR76om5wn8gVImndiYuzPI1WZ3Y5Ym65oS4aFLwQZjJBZkDO7
8VKy7KM09gYM7HuvxIvD07FsBjDAtbPcrAeW+p0MxShz5TglVE/xaqXf7uW7UuAXIN538w
gMIpdhizHZkEZAotbhGAgpGSx0oOY3laYaU1QYt5CrZAt2rBzlUtrCGJ+LVtDvX1rhNh+g
xndykROvVU8iZVrxQB0V/OcGzIECwmXPMrmFsQk53NBW2qinauEVpWBYBPfZghk04uklXK
5xR+eKtHp4Wrs4Ebc01AVXvae0DosJsRhekxrje2fp9ngyeAcL2TsdAAYhnllw==
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 4WywF21C6rzsn5;
Tue, 3 Sep 2024 19:10: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 483JAUuD007158;
Tue, 3 Sep 2024 19:10:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483JAU5r007155;
Tue, 3 Sep 2024 19:10:30 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 19:10:30 GMT
Message-Id: <202409031910.483JAU5r007155@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 1b9cfd6a625d - main - stand: bump arbitrary build
date to 2024-01-01
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 1b9cfd6a625dc82611846cb9a53c1886f7af3758
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=1b9cfd6a625dc82611846cb9a53c1886f7af3758
commit 1b9cfd6a625dc82611846cb9a53c1886f7af3758
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-08-12 13:11:09 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-03 19:09:28 +0000
stand: bump arbitrary build date to 2024-01-01
For build reproducibility we set PE headers to an arbitrary timestamp.
Nothing in FreeBSD uses this timestamp, but bump it from 2016 to 2024 so
that the timestamp does not seem "too old" in case some third party tool
is used to inspect EFI boot components.
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46527
---
stand/efi/Makefile.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/stand/efi/Makefile.inc b/stand/efi/Makefile.inc
index 3a13ca24f369..18751f0e4ecc 100644
--- a/stand/efi/Makefile.inc
+++ b/stand/efi/Makefile.inc
@@ -23,8 +23,8 @@ EFI_TARGET= efi-app-x86_64
EFI_TARGET= binary
.endif
-# Arbitrarily set the PE/COFF header timestamps to 1 Jan 2016 00:00:00
+# Arbitrarily set the PE/COFF header timestamps to 1 Jan 2024 00:00:00
# for build reproducibility.
-SOURCE_DATE_EPOCH?=1451606400
+SOURCE_DATE_EPOCH?=1704067200
.include "../Makefile.inc"
From nobody Tue Sep 3 20:12:46 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wyxct4FWtz52S5K;
Tue, 03 Sep 2024 20:12: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 4Wyxct3ZRVz4k4P;
Tue, 3 Sep 2024 20:12:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725394366;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sUu37tIC50xJW6Q3dUIztuj+CSLj3pGHTo6uZ0hr7mk=;
b=Ay5bIfoN4noKCB4ltA6jvlvrh1QCI+365FTMK++amwXEKvYlj4uubwmcpSBkA1DqOXmPwO
R7hGop3PxnW9KroHP4yNVkFXRUcGwLj2TeUmKWn0KIOIU6D0Wkxvl9tZbRWi8G+8aRFd7U
GC5615x0VfQS7+Gdm8AZ5m1c+/g9M+3xr2LYtpFb1asHQILTrbcFumkY3OhMddsI5VJ6B7
nCTS307ANHlPCNRqiOA0cRrDZVsC+1hxQ2d2n+2q2+E+NEsQGRmtjml5TqO5efJ2iw2opT
bd/2KXf1XBl/Mcu0aGDGGr0Tpa/7HvnyC69f6lfxsRImEo1Jb/xXl6BEiJu7rQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725394366; a=rsa-sha256; cv=none;
b=grKkFiSk79IkbwcwS+TRPR/ezIHos+YPGewlpAMFrxb6XitMpFnAJptrSQjhZISyPoOACk
7O1xw69RnNmFouC7ks55Qipb8ek+jx/Dz2vxglkBUOGJrRlQRfe9g6RZzRMh9XSVeOiYdg
vklsNmUIFrqMDeq9axqHqs+8Y024YLglMs2f8V1ECCyOO4yDTVO1mcVfGi2FnX6I0BxBi2
6tGtQlu5kdT7Evlh/Ueq3GzYuWyC36CP3yY20qRmbxhoBOoiLgdIRys7FSozW0b4bJOYPL
xLGYVSL7ZXpXYlWyybnXiaruk4nRD7vDerlwdcWkNWIPLd3U096Tktgfa4hEmg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725394366;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sUu37tIC50xJW6Q3dUIztuj+CSLj3pGHTo6uZ0hr7mk=;
b=yzz8GA1n13HljTP0D35k4qEHSacpGHH5suMnDSdx1gOO0f87U9SZv/hii2FE/9eRusQRxd
O2Kv2UxHPP/ToeQsE2S6fYhuxMz+aMV+sSa1P5W8j6rzWG/22uvvQ4tK48c9uHmWVaW79D
maWJzy7H/lbNopLR3XxF0eCy03/BpmPcM8u4MXX6soaj5ty8r2+VQacZ1HyR+vb4zYNboj
HV9sdSp8QTpm0Nu0YXAOHCrM61zZ2MEv9JAgb9t+tDuT9MZMJadFL/mhodX1bOreYzC/VQ
NjYojaRwW6rRz9lBzwsCWPEb6wDG3hE12UREQGhaSiTjgxK5Qar+bLF3fz8yLQ==
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 4Wyxct3B1zzvrQ;
Tue, 3 Sep 2024 20:12: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 483KCkR6015381;
Tue, 3 Sep 2024 20:12:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483KCkjE015378;
Tue, 3 Sep 2024 20:12:46 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 20:12:46 GMT
Message-Id: <202409032012.483KCkjE015378@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: f5541f9f4734 - main - nvmfd/nvmft: Fix a typo "whiled"
-> "while"
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f5541f9f473430a3e608e07f623294322853d25a
Auto-Submitted: auto-generated
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=f5541f9f473430a3e608e07f623294322853d25a
commit f5541f9f473430a3e608e07f623294322853d25a
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-09-03 20:12:04 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-09-03 20:12:04 +0000
nvmfd/nvmft: Fix a typo "whiled" -> "while"
Sponsored by: Chelsio Communications
---
sys/dev/nvmf/controller/nvmft_controller.c | 2 +-
usr.sbin/nvmfd/controller.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/nvmf/controller/nvmft_controller.c b/sys/dev/nvmf/controller/nvmft_controller.c
index dee4d8c92d3d..3c10fea75c9d 100644
--- a/sys/dev/nvmf/controller/nvmft_controller.c
+++ b/sys/dev/nvmf/controller/nvmft_controller.c
@@ -954,7 +954,7 @@ nvmft_handle_admin_command(struct nvmft_controller *ctrlr,
if (NVMEV(NVME_CC_REG_EN, ctrlr->cc) == 0 &&
cmd->opc != NVME_OPC_FABRICS_COMMANDS) {
nvmft_printf(ctrlr,
- "Unsupported admin opcode %#x whiled disabled\n", cmd->opc);
+ "Unsupported admin opcode %#x while disabled\n", cmd->opc);
nvmft_send_generic_error(ctrlr->admin, nc,
NVME_SC_COMMAND_SEQUENCE_ERROR);
nvmf_free_capsule(nc);
diff --git a/usr.sbin/nvmfd/controller.c b/usr.sbin/nvmfd/controller.c
index 09baaea74ab4..e9435bce69da 100644
--- a/usr.sbin/nvmfd/controller.c
+++ b/usr.sbin/nvmfd/controller.c
@@ -192,7 +192,7 @@ controller_handle_admin_commands(struct controller *c, handle_command *cb,
*/
if (NVMEV(NVME_CC_REG_EN, c->cc) == 0 &&
cmd->opc != NVME_OPC_FABRICS_COMMANDS) {
- warnx("Unsupported admin opcode %#x whiled disabled\n",
+ warnx("Unsupported admin opcode %#x while disabled\n",
cmd->opc);
nvmf_send_generic_error(nc,
NVME_SC_COMMAND_SEQUENCE_ERROR);
From nobody Tue Sep 3 20:15:01 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyxgV1VYRz52T31;
Tue, 03 Sep 2024 20:15: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 4WyxgT61mPz4lf2;
Tue, 3 Sep 2024 20:15:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725394501;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0Re3Q4GmG0l7ad1unEXbvfi+5EgXgKqG8fdxggzc0bQ=;
b=tTtTEAOHspB9XI3FXjY4GF8Y9j1kV4CEqV4FxoX/gQBHuv789x8+VHw3PrRbwF15cYniYT
4YORybamUKQJzE6Nq9vqs4lE+UOg+lJPurXn9+W3FvdFe1FszgCIIjTtaY/QQbVVIRU971
hcYRePsOyAiMBS9BAgMdCAC87klkCqaZiIqhT8sSGfNASSAKz0yrO97KiszZ/DvIt68R9i
V34PlNgtwU3dlXpA/40kc3zz937ylOq800j0UH2QsOjHn8Oqv5wB3+8QLFF0gN7ouMGanE
oWgRMuj5HlXsZWA5JczQWYhlQR9bR4ADTooUWaQKcVq/uZ6yee/e63mdRUdfaw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725394501; a=rsa-sha256; cv=none;
b=ujl7zUTffk4gp95Zkgr15Jpo2bSUJNSfAvzZ5Xjgz4b05qOYieWGw7bTr3tXUB9ZbwQflt
Hn/b9NnHhAWNyOECgde6jpX2adDIElkcUUZ9WIGCz9aSzCxyt07wajnIYx8hlvgCqPWlrL
EhA+rIXIrFRPCIibaBn5bMPKiL7pw0lyJeZ+yao0GK9BlCDtBrxDYcdzl03vehG5u8UhZc
LR+xvXMFkz+SaUvFixX/MvpoPJjEpvrhX+ibDjZxPYfWYtXDH+8hgWNqce2iKYMsMcH0X3
lbunkLUmjf6H3VquFaY86DEyFvBWo5HGerrCSdpsL7tpddFmkj0IbHy18cs0Dw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725394501;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0Re3Q4GmG0l7ad1unEXbvfi+5EgXgKqG8fdxggzc0bQ=;
b=fQSUM+rLWorSPvzUsJl2Nu+vH4dWbk0zUhRrwYTceIzwDKjT043J/sECnsuxxlQxyBtbHw
38uW0WG882Z/u7KqOMLifieQi38rNyd/xamEdObyITzddnXjhLAOrUEc/OHJoYvlnfZDj+
SNxsXwFsAQp1MFpyjVYGGjbYXEx1Lmjmk1yUqmBidNfjMWpLAcMU7KUqclVeQS7cP+8xbG
oIeAvLwWSCcx15m7RDCAqPVwefogy02Dfg3ViQUEsJa5vknMMl6T0+G30SYZOLeYAJ/W48
mOtObKQmB9tN3VbTkedceKBZyKyjP33OKQ/axSoXID0V10t1dHAMtkBoK0Nz7Q==
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 4WyxgT5dfXzvrS;
Tue, 3 Sep 2024 20:15: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 483KF1Kh015838;
Tue, 3 Sep 2024 20:15:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483KF1B9015835;
Tue, 3 Sep 2024 20:15:01 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 20:15:01 GMT
Message-Id: <202409032015.483KF1B9015835@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Jessica Clarke <jrtc27@FreeBSD.org>
Subject: git: 18f7683e0d6e - main - loader.efi.8: Remove rogue
duplicated lines
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jrtc27
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 18f7683e0d6ee6858865d8b0c2d7e2c14abf0bc4
Auto-Submitted: auto-generated
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=18f7683e0d6ee6858865d8b0c2d7e2c14abf0bc4
commit 18f7683e0d6ee6858865d8b0c2d7e2c14abf0bc4
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-09-03 20:14:44 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-09-03 20:14:44 +0000
loader.efi.8: Remove rogue duplicated lines
Fixes: 871911a4ab73 ("loader.efi(8): beef up the updating the ESP")
MFC after: 1 week
---
stand/man/loader.efi.8 | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8
index a0c0df9a9c35..3527d8b66a99 100644
--- a/stand/man/loader.efi.8
+++ b/stand/man/loader.efi.8
@@ -30,7 +30,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd August 20, 2024
+.Dd September 3, 2024
.Dt LOADER.EFI 8
.Os
.Sh NAME
@@ -450,9 +450,6 @@ copy the loader to the default location:
# cp /boot/loader.efi /boot/efi/EFI/BOOT/BOOTX64.EFI
.Ed
.Pp
-.Bd -literal -offset indent
-# umount /boot/efi
-.Ed
Finally, if you mounted the ESP, you may wish to unmount it.
.Bd -literal -offset indent
# umount /boot/efi
From nobody Tue Sep 3 21:39:58 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WyzYV3wQzz5MTM1;
Tue, 03 Sep 2024 21:39:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WyzYV3KTKz42lp;
Tue, 3 Sep 2024 21:39:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725399598;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=TgIxMt9QksmB57pkQxkzlE36/QqAql4Ov9CncPLDCgQ=;
b=CpgiH2WXa2vvoaALGmPXiR3KNGWu/ySxrfzOQsZpB7gQ2sjxvtDXIovl1DK356OhVyjILd
l+GlcFMljVXIpeJUhFopyS7tMXU47mDnQ4LLe9iEKO+P5vXvzm/X+F5uFjEKFgMtE75mzs
edKYGVQsymMwD4iINXAQFv+vvIiywrVEQbeVuKRU533/0lzoXs80FeilDyht4/BmTiE3Lo
2jtykLCVcdZais5jxjgvJDZ+UlOeBJsbmUQyiQFTTXCWFT5RS5LMDAGPWrwEEno9SXo3qF
J4FpQ7h69nnPiKRM4owIfHRBPdf/tp44lDGOe15jpIsHEOJIrThg0Al/wmCLEA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725399598; a=rsa-sha256; cv=none;
b=mobt5tVeIxZ/jIJOL120P+A3e4/3r3D9QVOn92kGMROviKIfeQlPDOTpmWyTcj4LtYVmst
09BnkO3Rp/SHXhk+qk1sFHXQJ8XVxytAhyuCcBrbQNN6bEZFHtKbea4qN5JlbkaVIqjs90
8rDcIguBa25WeI5BLq2pEaMHADnEZGPiCx6iP9HTHRLUuQ7OQrIa7A0m+WOweK02xFV/2c
kiAnLivuWqGx74Yv9gEtN7hHm/34G0a0J3mnfkDih09sLO4MFxrO/udh2Z1TgcT2eMh0Gd
rJkubU99+Vj853Zje5/npNW5/CnwNqRVXlDq/u6132rg08ZDy/nlu7C7FUyCSg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725399598;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=TgIxMt9QksmB57pkQxkzlE36/QqAql4Ov9CncPLDCgQ=;
b=MiU3MzwxMed0Gq3epfo20/v3FP76CVMCgB6nkFVFDAVe0tKIgIthuACkEIiaIfgr73mV/O
8ghzCdDml8ClRfTYoVQMPz0rpwNkUr1F6etzAknV0PZ6RQqo2tLsJzJ4vA+izyN6mfkD75
uqpchzR/QdpjbOlqGLlIzDTVHTlIiVzIQ6snCuysEE7OBYZV8MBWbb873W0wQ/WeZqpta5
rR2xIhIAahuCxeiePX2mmh3+4pQlRARQUtmN4+PG8BWutB/VnFttocl+VmMxsYZzBOzJzJ
VSn+RYMrkvJ7ZXTiVDqtQqgqvzkqAPyRRChnod+GbGWpUBj8au846QaupvRJEQ==
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 4WyzYV2lx2zx5B;
Tue, 3 Sep 2024 21:39:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483Ldw93051964;
Tue, 3 Sep 2024 21:39:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483LdwRj051961;
Tue, 3 Sep 2024 21:39:58 GMT
(envelope-from git)
Date: Tue, 3 Sep 2024 21:39:58 GMT
Message-Id: <202409032139.483LdwRj051961@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: git: a84d91d81a6f - main - mmccam: fix mmcsd disk aliases
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bz
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: a84d91d81a6f3eeb4949c4fb3440e0634f2b953a
Auto-Submitted: auto-generated
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=a84d91d81a6f3eeb4949c4fb3440e0634f2b953a
commit a84d91d81a6f3eeb4949c4fb3440e0634f2b953a
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-01-21 19:56:27 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-09-03 21:38:24 +0000
mmccam: fix mmcsd disk aliases
For EXT_CSD_PART_CONFIG_ACC_BOOT<n> and possibly others with suffixes
we fail to create proper disk aliases (symlinks), which shows up as
g_dev_taste: make_dev_alias_p() failed (name=mmcsd0, error=17)
In this case we ended up with the followng two:
/dev/mmcsd0 -> sdda0
/dev/mmcsd1 -> sdda0boot1
Note that (i) it should be mmcsd0boot1 and not mmcsd1 and that
(ii) there is no mmcsd0boot0 (failed above as it tried to create a
second mmcsd0).
Adjust the code (using a highly simplified version--compared to my
original approach--suggested by imp) using an extended format string
with (sdda/mmcsd) prefix as first argument to create proper names.
MFC after: 3 days
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D43538
---
sys/cam/mmc/mmc_da.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c
index 597ba0efb47e..fc29a1925c66 100644
--- a/sys/cam/mmc/mmc_da.c
+++ b/sys/cam/mmc/mmc_da.c
@@ -88,9 +88,11 @@ typedef enum {
SDDA_STATE_PART_SWITCH,
} sdda_state;
-#define SDDA_FMT_BOOT "sdda%dboot"
-#define SDDA_FMT_GP "sdda%dgp"
-#define SDDA_FMT_RPMB "sdda%drpmb"
+/* Purposefully ignore a '%d' argument to snprintf in SDDA_FMT! */
+#define SDDA_FMT "%s"
+#define SDDA_FMT_BOOT "%s%dboot"
+#define SDDA_FMT_GP "%s%dgp"
+#define SDDA_FMT_RPMB "%s%drpmb"
#define SDDA_LABEL_ENH "enh"
#define SDDA_PART_NAMELEN (16 + 1)
@@ -1480,7 +1482,7 @@ finish_hs_tests:
sdda_process_mmc_partitions(periph, start_ccb);
} else if (mmcp->card_features & CARD_FEATURE_MEMORY) {
/* For SD[HC] cards, just add one partition that is the whole card */
- if (sdda_add_part(periph, 0, "sdda",
+ if (sdda_add_part(periph, 0, SDDA_FMT,
periph->unit_number,
mmc_get_media_size(periph),
sdda_get_read_only(periph, start_ccb)) == false)
@@ -1525,7 +1527,7 @@ sdda_add_part(struct cam_periph *periph, u_int type, const char *name,
part->type = type;
part->ro = ro;
part->sc = sc;
- snprintf(part->name, sizeof(part->name), name, periph->unit_number);
+ snprintf(part->name, sizeof(part->name), name, "sdda", periph->unit_number);
/*
* Due to the nature of RPMB partition it doesn't make much sense
@@ -1592,8 +1594,11 @@ sdda_add_part(struct cam_periph *periph, u_int type, const char *name,
part->disk->d_fwsectors = 0;
part->disk->d_fwheads = 0;
- if (sdda_mmcsd_compat)
- disk_add_alias(part->disk, "mmcsd");
+ if (sdda_mmcsd_compat) {
+ char cname[SDDA_PART_NAMELEN]; /* This equals the mmcsd namelen. */
+ snprintf(cname, sizeof(cname), name, "mmcsd", periph->unit_number);
+ disk_add_alias(part->disk, cname);
+ }
/*
* Acquire a reference to the periph before we register with GEOM.
@@ -1682,7 +1687,7 @@ sdda_process_mmc_partitions(struct cam_periph *periph, union ccb *ccb)
* data area in case partitions are supported.
*/
ro = sdda_get_read_only(periph, ccb);
- sdda_add_part(periph, EXT_CSD_PART_CONFIG_ACC_DEFAULT, "sdda",
+ sdda_add_part(periph, EXT_CSD_PART_CONFIG_ACC_DEFAULT, SDDA_FMT,
periph->unit_number, mmc_get_media_size(periph), ro);
sc->part_curr = EXT_CSD_PART_CONFIG_ACC_DEFAULT;
From nobody Wed Sep 4 05:57:16 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzBbK1Kpbz5V9tx;
Wed, 04 Sep 2024 05:57: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 4WzBbK0J6nz43Wl;
Wed, 4 Sep 2024 05:57:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725429437;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Vt0Q3/k+6fxERkkq6n5oFx9+2M14oQf52REWFY5lyCE=;
b=oarZBOiVI+RSIx8MqO5AT9tcTnlP4+yctJJnl7BtUFB7rguXTQpOu1t3J/+2dOHiEe0ipL
Xd2RJWgxWeISv47mnofXGXoBswQPtfcS8CLUSIjO0plye+Ge+F1ZoCOlHWbnXDexQ+ECVu
tfgQ2QrdN5uaX69LeQQQLfCqfBfPF8PcRLhWlMaUsUo72qIzh422TJ2/il9zmvOf9ImVtv
JG0h246RnRpZNAx1Jc1cJhPJr4xGMzG4oUKQEdgbjIvE7aNx3cp/osq+U0OpH+VqfQp6a4
D/88ewIa6F1uSXmL9+3lPeOyHCVyLerUrQE/qalC1WBUPzHqGFOTcXIv+X6VMA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725429437; a=rsa-sha256; cv=none;
b=SJU8BMaVCvSp2Ahvb80hS4KZXAfPZjRownXf3m8bEr7ewGnF3G3JvfkeGa4vKdnTJtLoM5
FZFgE+unWldWUUGGUWYo4Rw4aLSFU/qwzy3Cx05fSDJVkV+tVDKwejBeLKKkub3IJcnF93
kOmFtATqJqNscIf7I4MNqSnhGkYk9qWmNDjEHOGsGFQoTNozkI9IwJ8nH4vIuUD+DlWI70
OLFDH4EnFBJ/EAGVjU0ivEVujrLRa2HmTG14cWQbP0ZTco54Py226CKVqRuO5OWEnVYSou
m5SJ4a50pVVTmvviTwON1URUuk0aCUECsBkcOPt/Ydtld7lpx9yjO2KiHkCEEw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725429437;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Vt0Q3/k+6fxERkkq6n5oFx9+2M14oQf52REWFY5lyCE=;
b=GPF6B2v/8yJBdysb4LyHUYzJRm4nbKKmZSvvvIy8kUPCikcRlaAlc+ZXLIiS3liwoGzG11
VLYG59ikRVn1lrXabLZCW8PiUdTXJ7ncLrFqykcQ/+IK7zqWRyz/inuC5QZAA37Ro7nG1y
Gwc2+RyBh6seMph715pg2+yJGk6jRTqroHllMUhn9+NViMUOe+0ESit5FDEP7kXSSHlRpw
rlgRhc6MipMs1BEvfZqDXlL5wd24UXqqE8PYr+EO9raMr5vx568TMIpNo7AqKnQ1SXt/xf
wLWrzUmv5HT5sLfmW14FgHIlJPLKHFKPEvUibsp6wGGumbSyx+C3T2yDIVvvcw==
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 4WzBbJ6vX8z1C8J;
Wed, 4 Sep 2024 05:57: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 4845vGKV099275;
Wed, 4 Sep 2024 05:57:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4845vGvZ099272;
Wed, 4 Sep 2024 05:57:16 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 05:57:16 GMT
Message-Id: <202409040557.4845vGvZ099272@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Colin Percival <cperciva@FreeBSD.org>
Subject: git: 81d3df02bcf5 - main - vmimage.subr: Pass $INSTALLOPTS
to install*
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cperciva
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 81d3df02bcf5ed6e41a91fd9fbc3b81cfe809ff3
Auto-Submitted: auto-generated
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=81d3df02bcf5ed6e41a91fd9fbc3b81cfe809ff3
commit 81d3df02bcf5ed6e41a91fd9fbc3b81cfe809ff3
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-08-31 23:38:02 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-09-04 05:57:06 +0000
vmimage.subr: Pass $INSTALLOPTS to install*
This makes it possible for a VM build configuration file to pass
options to make installworld/installkernel/distribution, e.g.
WITHOUT_DEBUG_FILES=YES in order to produce smaller images.
Note that these options are only applied at install time, not at
build time (since the same build is installed into many different
VM images), so not all src.conf options are usable here.
Sponsored by: Amazon
Differential Revision: https://reviews.freebsd.org/D46506
---
release/tools/vmimage.subr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 9a60be57acf3..5d98b8990705 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -52,7 +52,7 @@ vm_install_base() {
# Installs the FreeBSD userland/kernel to the virtual machine disk.
cd ${WORLDDIR} && \
- make DESTDIR=${DESTDIR} \
+ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \
installworld installkernel distribution || \
err "\n\nCannot install the base system to ${DESTDIR}."
From nobody Wed Sep 4 05:57:18 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzBbL3qtzz5VBM0;
Wed, 04 Sep 2024 05:57: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 4WzBbL19wMz43pd;
Wed, 4 Sep 2024 05:57:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725429438;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=3gHq8SYD5jkjeo1ByxmbHXg9mh3aLN+s3p2P/ywe9D4=;
b=OVzuOr44f2p/xp/Fmn6cgZyY8SNOQ8OdSbEYCKDCvqThNodou5v896kqGBu+gfrEO0XcuO
o5yJtA4DLIxPNEHE7Q8S9B3xhEYwfleyHTL8jFO2M83pMyvrPEFiTlqNuzHl/Wof9VRAOG
G+i31ceO238hocQd983I6MDdwlHV1WOGMYxkYlu+Les7gWBINSS/xYITo/SSIINWfpRrHM
nCxkkBvEV/njKBLi5445EKgf+AqCEqMk5WfL/Am1vBvxbcfrpTCcHPhEuTtMbeKXIYAaar
zJzpj/crIm2IoZtOo0w+0jGWP+kuc3HtJ914yg0EYofz4Nmro4GgLDDzWFTU0A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725429438; a=rsa-sha256; cv=none;
b=uc7wznWuJxfcft3V74EopKWbMnoMtGUKgJ+X0NJJjzbN6ThhybAumyMmaszwsmP7PonJUQ
N3XuWAdFgLhk1e85JROZkL3ymUWMGTCRIDmJY62Ee36WM0EdcxihicUvZU8SgeVGTAgZ4K
UlAOlbb4oQubSDFMSkmgqxjahjJvAKF6a9UvDRefJxZxfoupZUNZdv/idtCQD5SjqwzRAF
DxRS+dvxl+BoYmjwvdE9WlBM0Qmk6WKVNd4FRn05E/0ZLJTHK/eKzzMPq9zPv3RumYO4TK
5zit8MU1kjiScT5fHQWmijVqsU/rbAnBCPhAsQFIVWWtOjEQxD9zc+1U1u0ClQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725429438;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=3gHq8SYD5jkjeo1ByxmbHXg9mh3aLN+s3p2P/ywe9D4=;
b=XcU6OLaNJVBIzzj41G4rBmejWhJVQlJJ2diw/Y7pnT2NrhKzn6DWf7UCiOfY8uHqTNXkhe
gYCHUAy1rhZVcZt4q6aqVy88OucB5/7EvzzNbKZ8JcIFbApoqVDO3Hot6FukBye/QRk8wj
hrT+z+ZAVCnhE435NZlyiqKjaBj9H+mrfjZ0hmS6vRFJ4XpS6GWvE+Uwh9r0EsUJi89GY1
ilMTd8y/RqIKXBm/xDHpITvCdPW38kUeOqOG31FStZ9fPY7rOnV48djy1kBjpgw2rODSsN
vIstyfag2TRSLqMEATiyCqhjRs/KEwFtcyZhPHKg0bMObR1qK89Zv9tvLRdvbg==
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 4WzBbL0m86z1C6P;
Wed, 4 Sep 2024 05:57: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 4845vIvw099333;
Wed, 4 Sep 2024 05:57:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4845vIvR099330;
Wed, 4 Sep 2024 05:57:18 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 05:57:18 GMT
Message-Id: <202409040557.4845vIvR099330@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Colin Percival <cperciva@FreeBSD.org>
Subject: git: f961ddb28d69 - main - EC2: Move network config into
a separate function
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cperciva
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f961ddb28d6909d4c67e3e0b6b60498bbcbf64cb
Auto-Submitted: auto-generated
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=f961ddb28d6909d4c67e3e0b6b60498bbcbf64cb
commit f961ddb28d6909d4c67e3e0b6b60498bbcbf64cb
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-08-31 23:46:51 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-09-04 05:57:06 +0000
EC2: Move network config into a separate function
Having the "base" FreeBSD network configuration (aka. what is used
when not using cloud-init) in ec2.conf will allow us to reuse it in
other AMIs.
Sponsored by: Amazon
Differential Revision: https://reviews.freebsd.org/D46507
---
release/tools/ec2-base.conf | 26 +++-----------------------
release/tools/ec2.conf | 27 +++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf
index d80035e11ed7..bd2c510cd1a7 100644
--- a/release/tools/ec2-base.conf
+++ b/release/tools/ec2-base.conf
@@ -22,29 +22,6 @@ vm_extra_pre_umount() {
# via EC2 user-data.
echo 'firstboot_pkgs_list="devel/py-awscli"' >> ${DESTDIR}/etc/rc.conf
- # EC2 instances use DHCP to get their network configuration. IPv6
- # requires accept_rtadv.
- echo 'ifconfig_DEFAULT="SYNCDHCP accept_rtadv"' >> ${DESTDIR}/etc/rc.conf
-
- # The EC2 DHCP server can be trusted to know whether an IP address is
- # assigned to us; we don't need to ARP to check if anyone else is using
- # the address before we start using it.
- echo 'dhclient_arpwait="NO"' >> ${DESTDIR}/etc/rc.conf
-
- # Enable IPv6 on all interfaces, and spawn DHCPv6 via rtsold
- echo 'ipv6_activate_all_interfaces="YES"' >> ${DESTDIR}/etc/rc.conf
- echo 'rtsold_enable="YES"' >> ${DESTDIR}/etc/rc.conf
- echo 'rtsold_flags="-M /usr/local/libexec/rtsold-M -a"' >> ${DESTDIR}/etc/rc.conf
-
- # Provide a script which rtsold can use to launch DHCPv6
- mkdir -p ${DESTDIR}/usr/local/libexec
- cat > ${DESTDIR}/usr/local/libexec/rtsold-M <<'EOF'
-#!/bin/sh
-
-/usr/local/sbin/dhclient -6 -nw -N -cf /dev/null $1
-EOF
- chmod 755 ${DESTDIR}/usr/local/libexec/rtsold-M
-
# Any EC2 ephemeral disks seen when the system first boots will
# be "new" disks; there is no "previous boot" when they might have
# been seen and used already.
@@ -53,5 +30,8 @@ EOF
# Configuration common to all EC2 AMIs
ec2_common
+ # Standard FreeBSD network configuration
+ ec2_base_networking
+
return 0
}
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 602216d3c2d4..09cf1ce0017f 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -104,3 +104,30 @@ EOF
return 0
}
+
+ec2_base_networking () {
+ # EC2 instances use DHCP to get their network configuration. IPv6
+ # requires accept_rtadv.
+ echo 'ifconfig_DEFAULT="SYNCDHCP accept_rtadv"' >> ${DESTDIR}/etc/rc.conf
+
+ # The EC2 DHCP server can be trusted to know whether an IP address is
+ # assigned to us; we don't need to ARP to check if anyone else is using
+ # the address before we start using it.
+ echo 'dhclient_arpwait="NO"' >> ${DESTDIR}/etc/rc.conf
+
+ # Enable IPv6 on all interfaces, and spawn DHCPv6 via rtsold
+ echo 'ipv6_activate_all_interfaces="YES"' >> ${DESTDIR}/etc/rc.conf
+ echo 'rtsold_enable="YES"' >> ${DESTDIR}/etc/rc.conf
+ echo 'rtsold_flags="-M /usr/local/libexec/rtsold-M -a"' >> ${DESTDIR}/etc/rc.conf
+
+ # Provide a script which rtsold can use to launch DHCPv6
+ mkdir -p ${DESTDIR}/usr/local/libexec
+ cat > ${DESTDIR}/usr/local/libexec/rtsold-M <<'EOF'
+#!/bin/sh
+
+/usr/local/sbin/dhclient -6 -nw -N -cf /dev/null $1
+EOF
+ chmod 755 ${DESTDIR}/usr/local/libexec/rtsold-M
+
+ return 0
+}
From nobody Wed Sep 4 05:57:19 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzBbM3ls0z5VBM2;
Wed, 04 Sep 2024 05:57:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzBbM201Nz43Rk;
Wed, 4 Sep 2024 05:57:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725429439;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Pj16YpnrDkwhhNrTe/xmLNgTx7JapGidX1dl1KGv71w=;
b=G003fYVQ0H4YTTUUVHUMUxGUNBw1Hr2QO6JpvLc8bi/m9pp2kQRVlJwDTe+P//5HKQLK5j
s34LVvuJqqROn9pvy5ddOw//RGGedQ94M0lGRjhyQgD60BOSHbpwmTPLwFFzoiYvl4R8By
lmgfxRtySX6WKJ/3XWes43RyS1QwAa3ntg+9oJ0USNEiv6VaPTO+W1LHobEoTMlDa+SEVQ
hewNj2/Kb/+GlQ5LkXvKZFs57wrzCeVhbAi8Kn+if+ImkCDwYHZlgiKkky07HqcqtDyoJU
/+PPrO6FS0ygPYECjXv2UnSFGf0tI3SKA06qjUIGFuz4tQAEzWU9Ve8ZL90Zng==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725429439; a=rsa-sha256; cv=none;
b=EteWEjg7BykXk3XI3nIfXlHjuoZk7xqjh4wughS9Pes82rNrrYcUja5vtHxHdVTlF0uPNA
t+59SPyFq7Hu4uCKm8j1YmnfHiYbV1+ctPSugq83M8FjgwiD1eIndHlzeOWtYghstyDMyk
6FKpy0WpZsndkMpkA01l8GHohp6RIzWnHPj2BTFYTqS0uRaZWWI1EIqm/SAr+sgnNs4wT1
dA/JG13G6hSR59IYjo520V1tZvBbuWNfLnawKiHxJtcdY69+DPPG40Xj7X+DWRIHR1uwhq
CUmJUtcr/iyiWamyKOie8a9s9eT0IXpp096x13e5aG9EN8NKV2KxaYK0AULLVg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725429439;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Pj16YpnrDkwhhNrTe/xmLNgTx7JapGidX1dl1KGv71w=;
b=F0OwT30fpFP9a2nrTA6x+WW2pxA9TdXwOur1UFtMhfNn8YgcbEFY//3B6fTwGzq7e1wccF
Cq1iLNVaK7Ow4c/H6Mkhv4lnTLf9vYiSu8aYU4ElQ1m/xMLHSAl5lXyED3Ecxhyj/9XHvR
BvkInFY6Fwxc9Y1Hk585FG7zyhGM3xuTp4fAvhPTfuh2wvfHSp+NT+7pH3riXd4tSyFCV7
KuIFil1wwyaoPj9SgpKyteqzCfMfoXX07IH3X9kEk0gDeCFWBKUxHD2yIXwMt3xCD01ol1
LStNdEZ+6lkl6V4L8rjYUkzF3JVBrMM800lSe7tvPiPjCBwhmH36le5dyj9T5g==
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 4WzBbM1YBcz1BgY;
Wed, 4 Sep 2024 05:57:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4845vJch099379;
Wed, 4 Sep 2024 05:57:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4845vJtf099376;
Wed, 4 Sep 2024 05:57:19 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 05:57:19 GMT
Message-Id: <202409040557.4845vJtf099376@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Colin Percival <cperciva@FreeBSD.org>
Subject: git: 40ff0753abb9 - main - EC2: Make amazon-ssm-agent
optional
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cperciva
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 40ff0753abb9c00b5f1e5df9ea00c9fdded55ac4
Auto-Submitted: auto-generated
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=40ff0753abb9c00b5f1e5df9ea00c9fdded55ac4
commit 40ff0753abb9c00b5f1e5df9ea00c9fdded55ac4
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-08-31 23:50:16 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-09-04 05:57:06 +0000
EC2: Make amazon-ssm-agent optional
Move it from VM_EXTRA_PACKAGES in ec2.conf to VM_EXTRA_PACKAGES in
ec2-{base,cloud-init}.conf
Sponsored by: Amazon
Differential Revision: https://reviews.freebsd.org/D46508
---
release/tools/ec2-base.conf | 4 +++-
release/tools/ec2-cloud-init.conf | 4 ++--
release/tools/ec2.conf | 6 ++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf
index bd2c510cd1a7..3ed20474a4e8 100644
--- a/release/tools/ec2-base.conf
+++ b/release/tools/ec2-base.conf
@@ -4,11 +4,13 @@
# Packages to install into the image we're creating. In addition to packages
# present on all EC2 AMIs, we install:
+# * amazon-ssm-agent (not enabled by default, but some users need to use
+# it on systems not connected to the internet),
# * ec2-scripts, which provides a range of EC2ification startup scripts,
# * firstboot-freebsd-update, to install security updates at first boot,
# * firstboot-pkgs, to install packages at first boot, and
# * isc-dhcp44-client, used for IPv6 network setup.
-export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \
+export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \
firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client"
# Services to enable in rc.conf(5).
diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf
index 7682d635b1d6..048202e252f6 100644
--- a/release/tools/ec2-cloud-init.conf
+++ b/release/tools/ec2-cloud-init.conf
@@ -3,8 +3,8 @@
. ${WORLDDIR}/release/tools/ec2.conf
# Packages to install into the image we're creating. In addition to packages
-# present on all EC2 AMIs, we install cloud-init.
-export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} net/cloud-init"
+# present on all EC2 AMIs, we install amazon-ssm-agent and cloud-init.
+export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent net/cloud-init"
# Services to enable in rc.conf(5).
export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd"
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 09cf1ce0017f..2cca5fa713af 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -1,11 +1,9 @@
#!/bin/sh
-# Packages which should be installed onto all EC2 AMIs:
+# Package which should be installed onto all EC2 AMIs:
# * ebsnvme-id, which is very minimal and provides important EBS-specific
# functionality,
-# * amazon-ssm-agent (not enabled by default, but some users need to use
-# it on systems not connected to the internet).
-export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ebsnvme-id amazon-ssm-agent"
+export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ebsnvme-id"
# Services which should be enabled by default in rc.conf(5).
export VM_RC_LIST="dev_aws_disk ntpd"
From nobody Wed Sep 4 05:57:20 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzBbN5mXFz5VBRf;
Wed, 04 Sep 2024 05:57: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 4WzBbN317xz43mf;
Wed, 4 Sep 2024 05:57:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725429440;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=fBffU+5tT9ofJP2K4qraU3ZcUj6/Xgx1tdOXlSSEYDI=;
b=MEoaKwBrIGqSif3isDkJ3diZC6GJ9jADx1ppOlq+jZtpEQLAqLX4nzWWVnziw/Dsx+CaYq
qzsDu6CNACzeSRw8KpcoaTpmyrcW5AEJZv/ydc/QR2d0oT2EvrHeq0H4nZNvjtKt3DbPp8
mWQ/0mkLRimZTEWNPb0+l6qDhpCEP9ujAW2W5tLrA83Vo/zmTVkvLIQKKlx1KUv2m8zdX7
ZWreEr0Sghiq8Oh6Pp6WtYI933b1nhl2x4ofc1ADbwIFc+FNhavNyP95B87J5JEHT+BHC5
wvlHE6Xcy3251BovMon2mHqX8qTln8/S/EKvtYUV5GsrXBDxPqAp8VNi0CtrGA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725429440; a=rsa-sha256; cv=none;
b=a23+bkFSKS61lsLqEk75Gz9wrsAKgo0jDnFj6E1SvJAEipZ9YyHGUHG3H0JspkTNSalN3N
mtqn/p7bgy1KaCDxKcbb5hnaU4ikwqutG8lLam8epKWVzNJY3oH37nI68AbAxAjrTwpUrT
v2xDlHRWOY8HsWb694c5LMkbO4H9ILNAAVR367m1s09Ne4yr0FgFBMarfNueO9DN2myQ3k
SZJoBvzAfGuPVmTcvw0yUb4qhez6EudpCVf8JkoGIBu4Fr3qyHnuLx0f9K0ps+05D1rRgf
u4Cxtuph9BvLpRYY7/iHbW97ddBx0dhbwWp3fdEr/Q/OLtNGurZrNNtJuE2n0g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725429440;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=fBffU+5tT9ofJP2K4qraU3ZcUj6/Xgx1tdOXlSSEYDI=;
b=HrA8gfHP8LOM2Qr07GKX+0sWA+3GQH8CAxELz4NXZpWexOF4zI+BwiAWAvwzE0vXSCQPr6
IW/uk5utayCnidxGQgqYYVBO+Lrpc3/Mt9tH0BhThHmoYHoczZR3+UNR7MhJnA6+2l7kXM
qpJHP5/1vr7hoOeyXYz9Yse/WxH+CAei5fvT7741zEQw5ylnJh7ehtGQQ99Cc+gN7z3Qgf
ZT8elA0/LDfqTkqeTTeePZ6cn0LBT5iGLqk96ZxLOnsxaTLNTP5EAskkWFyI9L7c5Lpy84
KnCblBEyJYqxQ3PY2QiMjQxerROa3d5ZNen6GSORA8LmP7Ei/qm8EheSjDzChQ==
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 4WzBbN2Y2Kz1BRY;
Wed, 4 Sep 2024 05:57: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 4845vK3P099421;
Wed, 4 Sep 2024 05:57:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4845vKdE099418;
Wed, 4 Sep 2024 05:57:20 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 05:57:20 GMT
Message-Id: <202409040557.4845vKdE099418@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Colin Percival <cperciva@FreeBSD.org>
Subject: git: 647299caa06e - main - EC2: Add new "small" AMIs
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cperciva
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 647299caa06e38622dc05a4358f9407b62a9bdda
Auto-Submitted: auto-generated
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=647299caa06e38622dc05a4358f9407b62a9bdda
commit 647299caa06e38622dc05a4358f9407b62a9bdda
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-08-31 23:55:06 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-09-04 05:57:06 +0000
EC2: Add new "small" AMIs
These are the same as the standard "base" images except:
* They don't have kernel or world debug symbols,
* They don't have FreeBSD tests,
* They don't have 32-bit libraries,
* They don't have LLDB,
* They don't have the Amazon SSM Agent pre-installed,
* They don't default to installing the awscli at first boot.
This reduces the amount of disk space in use when the EC2 instance
finishes booting from ~5 GB to ~1 GB.
Sponsored by: Amazon
Differential Revision: https://reviews.freebsd.org/D46509
---
release/Makefile.vm | 3 ++-
release/tools/ec2-small.conf | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/release/Makefile.vm b/release/Makefile.vm
index d8914d305e2f..b4fe6e23ffcd 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -39,9 +39,10 @@ BASIC-CLOUDINIT_FSLIST?= ufs zfs
BASIC-CLOUDINIT_DESC?= Images for VM with cloudinit disk config support
EC2_FORMAT= raw
EC2_FSLIST?= ufs zfs
-EC2_FLAVOURS?= BASE CLOUD-INIT
+EC2_FLAVOURS?= BASE CLOUD-INIT SMALL
EC2-BASE_DESC= Amazon EC2 image
EC2-CLOUD-INIT_DESC= Amazon EC2 Cloud-Init image
+EC2-SMALL_DESC= Amazon EC2 small image
GCE_FORMAT= raw
GCE_FSLIST?= ufs zfs
GCE_DESC= Google Compute Engine image
diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf
new file mode 100644
index 000000000000..858836717f5a
--- /dev/null
+++ b/release/tools/ec2-small.conf
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+. ${WORLDDIR}/release/tools/ec2.conf
+
+# Build with a 4.9 GB partition; the growfs rc.d script will expand
+# the partition to fill the root disk after the EC2 instance is launched.
+# Note that if this is set to <N>G, we will end up with an <N+1> GB disk
+# image since VMSIZE is the size of the filesystem partition, not the disk
+# which it resides within. (This overrides the default in ec2.conf.)
+export VMSIZE=5000m
+
+# Flags to installworld/kernel: We don't want debug symbols (kernel or
+# userland), 32-bit libraries, tests, or the debugger.
+export INSTALLOPTS="WITHOUT_DEBUG_FILES=YES WITHOUT_KERNEL_SYMBOLS=YES \
+ WITHOUT_LIB32=YES WITHOUT_TESTS=YES WITHOUT_LLDB=YES"
+
+# Packages to install into the image we're creating. In addition to packages
+# present on all EC2 AMIs, we install:
+# * ec2-scripts, which provides a range of EC2ification startup scripts,
+# * firstboot-freebsd-update, to install security updates at first boot,
+# * firstboot-pkgs, to install packages at first boot, and
+# * isc-dhcp44-client, used for IPv6 network setup.
+export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \
+ firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client"
+
+# Services to enable in rc.conf(5).
+export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \
+ ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \
+ growfs sshd"
+
+vm_extra_pre_umount() {
+ # Any EC2 ephemeral disks seen when the system first boots will
+ # be "new" disks; there is no "previous boot" when they might have
+ # been seen and used already.
+ touch ${DESTDIR}/var/db/ec2_ephemeral_diskseen
+
+ # Configuration common to all EC2 AMIs
+ ec2_common
+
+ # Standard FreeBSD network configuration
+ ec2_base_networking
+
+ return 0
+}
From nobody Wed Sep 4 08:50:22 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzGR23hRVz5TRm1;
Wed, 04 Sep 2024 08:50:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzGR232B3z4W32;
Wed, 4 Sep 2024 08:50:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725439822;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=KLOqnt29J4PDA2rvndkr0oJkEinZ6jAaRngUKzBHmCc=;
b=jUWH32u/HG19hTpZByaZ64G8/M1NdEt2GTLhZo70/5TZP5r7aqu02hCEl1/uO9baoZIUmi
2N6N7q7eSDCVLKXx7syhIbQjKlowECz1DIK0W5C98BSNvhuBMO8ys14WndI6PTQ6Bb+Jj7
6I9YsEhS4DwzwuyWEQFEjBZFqq2fmVNkxaMa7rl8NncOi2YQTNXnkJ/V4zTjILMhDPQhJZ
db+fZebMUHvsSeTInQ+kSUPcfjUeicx5iOHt+XVsQ0lnJkQkb5lBQRTTcfva6lVSVCQ32n
f1Ynf07tZThHp2zMCJP6/PwBQjYimMLPfiT9rWHzkqLbKdot6nO7ece/25I3TQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725439822; a=rsa-sha256; cv=none;
b=gKbRnmea8btdlnX5+uIefk2kGT/KJgTQqzwza3gNwIUisG95GFhtscCYh36QHXHTooLtVX
IEmLNRqHq4K2RD35LuNNvQQECIH6p5uDbvpxiIY/yKrScfTUYAVTVDT5C26z4ADEO9BDL+
KUE1mg15gW5OBEmggWkw/93tIaaNO1ry6M8WsS89+DNEss5KHwk0Ui0bgxBut7Fod/hGr+
uILJ3whAoM6ko+G97jSAZjxZv8LXOcTxyhwbzslZ5EFOgj0d6Sz1AS+g9Gj7GuDkh80aJw
9TW4MNwK7/1KzLfmbG7WGipi5xqi19z4by1X8eHLo5j2Ur1LuU+lbCMPPvYXOA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725439822;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=KLOqnt29J4PDA2rvndkr0oJkEinZ6jAaRngUKzBHmCc=;
b=s86t4wPoznRuz1W6UPBYoheO3q/5JH73ezo+Dx43HLU5z5O6caPrOQVWADxmeP1FD0zp04
njSvwrtGffWzWKMF8lT8yMIfQSPz9fhCfI76dFraRzMnApwwBCecZgEjL5+k4GYQthHn3e
Mr/4ES7BIH4U5403RcwsVszObIbgAir7F0b43ZXG7Y1VTVXA8dyvwzfh/qxt8OQJEjOfVf
yCWhy6HlGvhffHHrDfLpZlRf0CzOGxzM4AWSkpqe1bcywLOmF0wrGpmkgYhGOBXKL7f5GV
d9R5EiwDQXY1L7sI5blSeM1GEejYrXYDEtCN+7sE8gNmHNLcnYY0gQSf+/0B+A==
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 4WzGR22dZfzHW4;
Wed, 4 Sep 2024 08:50:22 +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 4848oMb7096708;
Wed, 4 Sep 2024 08:50:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4848oMDu096705;
Wed, 4 Sep 2024 08:50:22 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 08:50:22 GMT
Message-Id: <202409040850.4848oMDu096705@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 957e389ca77c - main - dev/mlx5: remove some duplicated
macros from device.h
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 957e389ca77c8bceec15a685d01888a41ce73681
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=957e389ca77c8bceec15a685d01888a41ce73681
commit 957e389ca77c8bceec15a685d01888a41ce73681
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-08-30 23:38:19 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 08:49:38 +0000
dev/mlx5: remove some duplicated macros from device.h
Sponsored by: NVidia networking
---
sys/dev/mlx5/device.h | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/sys/dev/mlx5/device.h b/sys/dev/mlx5/device.h
index 50995d4f70a7..67c129a0f2b3 100644
--- a/sys/dev/mlx5/device.h
+++ b/sys/dev/mlx5/device.h
@@ -1123,24 +1123,6 @@ enum mlx5_mcam_feature_groups {
#define MLX5_CAP_FLOWTABLE_RDMA_TX_MAX(mdev, cap) \
MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_transmit_rdma.cap)
-#define MLX5_CAP_FLOWTABLE_NIC_TX(mdev, cap) \
- MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_transmit.cap)
-
-#define MLX5_CAP_FLOWTABLE_NIC_TX_MAX(mdev, cap) \
- MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_transmit.cap)
-
-#define MLX5_CAP_FLOWTABLE_RDMA_RX(mdev, cap) \
- MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_receive_rdma.cap)
-
-#define MLX5_CAP_FLOWTABLE_RDMA_RX_MAX(mdev, cap) \
- MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_receive_rdma.cap)
-
-#define MLX5_CAP_FLOWTABLE_RDMA_TX(mdev, cap) \
- MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_transmit_rdma.cap)
-
-#define MLX5_CAP_FLOWTABLE_RDMA_TX_MAX(mdev, cap) \
- MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_transmit_rdma.cap)
-
#define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \
MLX5_GET(flow_table_eswitch_cap, \
mdev->hca_caps_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap)
From nobody Wed Sep 4 08:50:23 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzGR357yHz5TRcs;
Wed, 04 Sep 2024 08:50:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzGR34PHtz4W54;
Wed, 4 Sep 2024 08:50:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725439823;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=h0NnCJprF2oikLNuoYNyYoIq2klsyXZxswitoI6TDHs=;
b=T0DVotO+JHXczrn94Cik/H6+Qz5m9Elp7ZzUgtjN+Os55iKtWsag1MU/vXNpLQ9uLRqbid
xJMP/I5wl7rIS5bZpDYyTbcgl30dUSooS8bZJtwalGZGS8QLYMJ8iFe3aWeH1C5Gl9zx+9
CqZJljF6QyA2aAuTx10cpYmp5rwzKf8vT7SlF+ROB89hvtgkrjJNT7s8mZG0cOos8ZFcgA
gRMb5QrWvk4gV8NzLxDbfLQMW8IHARibQrxairKznEn341xUYwAL7PsRnWYreqIiNbTZOf
dV8HmmdhT0E1fPqCA+JwUsoDhiFVB+tPRTptwrlfNdZUQ54WkxAQ1exKVdSUdg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725439823; a=rsa-sha256; cv=none;
b=sSmRULZqk05Z1o7fgGqSgXPr4VZq7ZoCp1uCqoNdmr/WNpinzZqjXiv5GfzPhQytkoruF4
GYsNoh4MAfPaIsWpJA8nUMZp23KtJWOTozeZL//pDPQ9509DMbVPLICAWST8hyCDqlRICJ
niwguISbqOQs9ZEkx6rDppQ0govDrSiuhv93HbSevfWe6VSua4vhdMoB3khFQeEJhFgqNI
OsG5r36hgEJBbKktDhRp4EWlYjp6LIzyh9oAA7Gl71oAqS4JT83FZZZydDMPUf3Q88KQbf
p/m8XmbUyC575CSmmgqwRfQ8g04r3h3bgi/5pEkeca8e3VBieejFI2MsHNC/bA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725439823;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=h0NnCJprF2oikLNuoYNyYoIq2klsyXZxswitoI6TDHs=;
b=MGJCpjNwbqzZM5JXGnm8IPV2+xmaZYXHqhkUXnm3HiKsZ/nfoywphGSgn8GZ0GSirCkD8v
tX40HS5YfSBlIQWS4uNYxaiXeOdCDPjoAV8bA2u4O9PiberX5AQQBPLcuH/AkZJ3kFBg3e
0MDHaD+28IqY8v812J9S4T1dH0g8T0blkUIJObpbgqIGYtau4EnS5HLcLRqtFjYey+RlN0
+xEAjKqBPz86NvcgTtaeI8fXqZQPsGOdcTRuiBWi8WZ0VsiSGD6mqovzEI4LmSB/2Y6nzw
WKak7yVADa76n4pAcSgVy8KVQu2feaZiNzPY7AsUSz9LXaqBiWwDUhLP4jBrTg==
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 4WzGR33wq2zHSD;
Wed, 4 Sep 2024 08:50:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4848oNfQ096766;
Wed, 4 Sep 2024 08:50:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4848oN9M096763;
Wed, 4 Sep 2024 08:50:23 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 08:50:23 GMT
Message-Id: <202409040850.4848oN9M096763@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: d02e1a3ffac7 - main - ipsec_accel_output(): do not
process packet if interface rejected offload
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: d02e1a3ffac76c17ac4d9fd45dd5edd8bc944c82
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=d02e1a3ffac76c17ac4d9fd45dd5edd8bc944c82
commit d02e1a3ffac76c17ac4d9fd45dd5edd8bc944c82
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-08-28 10:16:38 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 08:49:38 +0000
ipsec_accel_output(): do not process packet if interface rejected offload
Sponsored by: NVidia networking
---
sys/netipsec/ipsec_offload.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c
index bbf98ac7a676..7453fb3818a6 100644
--- a/sys/netipsec/ipsec_offload.c
+++ b/sys/netipsec/ipsec_offload.c
@@ -876,7 +876,8 @@ ipsec_accel_output(struct ifnet *ifp, struct mbuf *m, struct inpcb *inp,
}
i = ipsec_accel_is_accel_sav_ptr(sav, ifp);
- if (i == NULL)
+ if (i == NULL || (i->flags & (IFP_HS_HANDLED | IFP_HS_REJECTED)) !=
+ IFP_HS_HANDLED)
goto out;
if ((m->m_pkthdr.csum_flags & CSUM_TSO) == 0) {
From nobody Wed Sep 4 08:50:24 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzGR503Qnz5TRmw;
Wed, 04 Sep 2024 08:50: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 4WzGR45LkXz4VvT;
Wed, 4 Sep 2024 08:50:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725439824;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Gb7xgrMM1MzsdOAmxTjQoVfA0/IZsbe8eaBkC9Yf4ag=;
b=m1jpK2LjzmY7jW6pA0NOkWBNIyo6jdxrcpk/p7T5ou0UqI6+9iNPQvGUuDyY838Q4s/HT3
WSmkpTXrDPZZlQR2B201/jbCCtrYfdS+ZFBt5dHoGlAuM0FH0ECYd0havYEw8Ipzb9hTM+
c3ttYljp9EfGD1l8WiunaosOn+Ug2A9cskasPpHEQkIORSn5MkOYYUG7/4vDL4CNYkSuT4
amgjUc5Alhhr3oiwvE1VA7im/ExgsSygb1CX22m6m0YLZIxDj5yNkD0Y33nJFk3v1Ix3QO
OErnoaP749OQsHsniMIik3KHxyl/zcLzULKR7wLTCL0IEJNufeiTFGvIF2WQtg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725439824; a=rsa-sha256; cv=none;
b=Vin6CuOoDeylx/lF8weJQO9VGYM45vA0bbWwwBEdLhU09sXXO9fV98TRXLNihcrb0rq5Oc
X22SsLmpw9jFUBspBWjPBS4fGeZNsv2GVbHDAchhVttBms6iPBX9ooGK24fUPdmWEz45KG
wDDb+scYyfLoYgA28q/XZ2v1FOlvdv2QvJCA3ARfxD06Y+gPBsXmZKVUwq7VcC7y758TyK
f6lSRSlwl8Oko3MDr3PyD00LraOWZb4rQYwX2GTgQyaHs/RjRXA14Muf9PqESQjxb3qwo+
1ey6o4g5/Shg6FYYzLGmP+Y88OZlRzQNSKjhZz9tdNzoD/L3+NsXT2pZ9aLwrw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725439824;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Gb7xgrMM1MzsdOAmxTjQoVfA0/IZsbe8eaBkC9Yf4ag=;
b=uKyB9ZqefiZ6R3BkgZ8u4dDAQLHJAC0OwPfEGpSFunhSiEOkS6IlK0F4ZgQ4HEGr+DQnG5
9o9jFFV4Ikf3gJPHEavsd/ly3Ka6O3ZBckUQliD6sr8KPor/Y14zAMGtPIkwwl1gcWtyrJ
ta7dXna0/hrHQx5itpqvFd0p7DA+wU32HGh4B9UM5HQSuJEjhBTRmgjaI6uSU8otaPnylG
d54grkD7Y+5h67g+CWgMvVsWZWtAwQ1l5JocSxer3Rif5G5/Q7hWQ/oohzJDLctRxmNAl9
ZJlDbfO40oLkVL7bAKo4dx00GxOklYPTv8nRIvvHmISjiLJzpi2U2gHAb60JPQ==
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 4WzGR44bz5zHbf;
Wed, 4 Sep 2024 08:50: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 4848oOe1096814;
Wed, 4 Sep 2024 08:50:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4848oO2M096811;
Wed, 4 Sep 2024 08:50:24 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 08:50:24 GMT
Message-Id: <202409040850.4848oO2M096811@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 1af77be32760 - main - ipsec_offlad: remove not needed
IFP_HS_INPUT/OUTPUT flags
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 1af77be32760a86df242a1ffc3292dc3a7e59e27
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=1af77be32760a86df242a1ffc3292dc3a7e59e27
commit 1af77be32760a86df242a1ffc3292dc3a7e59e27
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-09-01 16:20:14 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 08:49:38 +0000
ipsec_offlad: remove not needed IFP_HS_INPUT/OUTPUT flags
Calculate the hdr_ext_size unconditionally, it is kept unused for SAs
not handling the input.
Sponsored by: NVidia networking
---
sys/netipsec/ipsec_offload.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c
index 7453fb3818a6..5e8755d5f243 100644
--- a/sys/netipsec/ipsec_offload.c
+++ b/sys/netipsec/ipsec_offload.c
@@ -97,8 +97,6 @@ struct ifp_handle_sav {
#define IFP_HS_HANDLED 0x00000001
#define IFP_HS_REJECTED 0x00000002
-#define IFP_HS_INPUT 0x00000004
-#define IFP_HS_OUTPUT 0x00000008
#define IFP_HS_MARKER 0x00000010
static CK_LIST_HEAD(, ifp_handle_sav) ipsec_accel_all_sav_handles;
@@ -405,8 +403,7 @@ ipsec_accel_handle_sav(struct secasvar *sav, struct ifnet *ifp,
ihs->drv_spi = drv_spi;
ihs->ifdata = priv;
ihs->flags = flags;
- if ((flags & IFP_HS_OUTPUT) != 0)
- ihs->hdr_ext_size = esp_hdrsiz(sav);
+ ihs->hdr_ext_size = esp_hdrsiz(sav);
mtx_lock(&ipsec_accel_sav_tmp);
CK_LIST_FOREACH(i, &sav->accel_ifps, sav_link) {
if (i->ifp == ifp) {
From nobody Wed Sep 4 08:50:25 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzGR61vDxz5TRjl;
Wed, 04 Sep 2024 08:50:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzGR56PlKz4WDZ;
Wed, 4 Sep 2024 08:50:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725439825;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=RPpz4GI5BDE8t2JTtn1PgWqYKI/SVn0UwGm3YrJ1dso=;
b=Pelk0nzvacVeqem5ntQUCtRCicf+kpB3F+/CDr44YzWbs9nWQ/yuswxLeVtIbmBk4UEdJB
nwlUcJoQ+InnLVXTpwowAvObLMm/9cANh1UtN1EiqJjVaH6LUXkxUuPstUFoz+KZE2nuXq
GKYIZ0tymUsINOPeEZnclqKW4ZrnKPv85DCLNwFBVqTiYxEstwoFvh6cEuTPDjN9RPCEkY
z/qyy2uFHoq9oGAgIIn/qI4lnAXgEPEL11VsMDyG6y0j6bskychi/wF0z4K21hsKwSkvNo
CsM55Ej6SlA3YY8zOjtgXlTawubxUPAb4H5SAUSJ9/NOpWnIc+DbU+b6rKEWnw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725439825; a=rsa-sha256; cv=none;
b=Dr5FyNQ0mtMRRnunAERGEVaHkuhlSVFuTBraOQkvpSaMJzSJgQsSrXbvCChQDtASpW/2wY
HX2cXIxvtCIC2ILDEoVZYK3+1+ZrncPFT4oKpc6MIWn/lIZPnknYsovZKUnzG5bEJZJc4p
0ky+L/H1ofzCGszXqpfBAo7ikIaBhulC0e83+isX9zemeNMRXe0FR5UVFt6rc40PMjbvkB
x7xGlcmkaKi8gG5/BCi5NN7Ioxg/myzkzfnhUG0Q7fyE35xkMODVwUGlBvx5wR3yuZNdj0
mm/OgBDdyJeDvAf2OLx8N5T2cJUsWWPZUOcNGAJowzAFxTTuIAr4sxV5BsRKrw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725439825;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=RPpz4GI5BDE8t2JTtn1PgWqYKI/SVn0UwGm3YrJ1dso=;
b=pgQyWIUacedBCSujtn5fQ+82aqb0g/TkVfqD5/kGpUwf/3LRcQBsBkWP29oDcAl8BvhdCq
HIPd1qeU3i42lzIJUAuwFcYjeDdH5plp4z+1kygl2mQI/v8vRRYosPg1eVYRtADbQeC8Rq
xMTTn8EPiMu1+DjTrPHEXe5RsLz2NO8BHVGiwQxtyF/OUgxW8TluToZkOMWCo0ZUlznq7p
rK1rq4TGNlMcgX5C9+NYDQnaeiuJ/MtwOX9UcN/Tzxz+cxDq3R0eo1s4r6gyDmxxZB2vlT
1f0pUfwL68zl1ylG3++bvlxuSG07XYtDbD5TmnzBADAU8az7ApVyi057g7FG/w==
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 4WzGR55SqszHQG;
Wed, 4 Sep 2024 08:50: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 4848oPDd096862;
Wed, 4 Sep 2024 08:50:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4848oPXu096859;
Wed, 4 Sep 2024 08:50:25 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 08:50:25 GMT
Message-Id: <202409040850.4848oPXu096859@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: f76826b892de - main - ipsec offload: use private
taskqueue thread
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: f76826b892de38ed25e407c9d5e73aec1229f728
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=f76826b892de38ed25e407c9d5e73aec1229f728
commit f76826b892de38ed25e407c9d5e73aec1229f728
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-08-30 17:17:50 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 08:49:38 +0000
ipsec offload: use private taskqueue thread
Using global taskqueue_thread XXX with the vnet tasks scheduled during
VNET destruction. VNET shutdown needs to wait for all vnet-scoped
SAs/SPs to be handled, and doing that from taskqueue_thread task
deadlocks because the same thread proceeds the removals.
Reviewed by: markj
Sponsored by: NVidia networking
Differential revision: https://reviews.freebsd.org/D46494
---
sys/netipsec/ipsec_offload.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c
index 5e8755d5f243..a06e91ada1a1 100644
--- a/sys/netipsec/ipsec_offload.c
+++ b/sys/netipsec/ipsec_offload.c
@@ -69,6 +69,7 @@
static struct mtx ipsec_accel_sav_tmp;
static struct unrhdr *drv_spi_unr;
static struct mtx ipsec_accel_cnt_lock;
+static struct taskqueue *ipsec_accel_tq;
struct ipsec_accel_install_newkey_tq {
struct secasvar *sav;
@@ -166,6 +167,11 @@ ipsec_accel_init(void *arg)
mtx_init(&ipsec_accel_cnt_lock, "ipascn", MTX_DEF, 0);
drv_spi_unr = new_unrhdr(IPSEC_ACCEL_DRV_SPI_MIN,
IPSEC_ACCEL_DRV_SPI_MAX, &ipsec_accel_sav_tmp);
+ ipsec_accel_tq = taskqueue_create("ipsec_offload", M_WAITOK,
+ taskqueue_thread_enqueue, &ipsec_accel_tq);
+ (void)taskqueue_start_threads(&ipsec_accel_tq,
+ 1 /* Must be single-threaded */, PWAIT,
+ "ipsec_offload");
ipsec_accel_sa_newkey_p = ipsec_accel_sa_newkey_impl;
ipsec_accel_forget_sav_p = ipsec_accel_forget_sav_impl;
ipsec_accel_spdadd_p = ipsec_accel_spdadd_impl;
@@ -207,6 +213,8 @@ ipsec_accel_fini(void *arg)
clean_unrhdr(drv_spi_unr); /* avoid panic, should go later */
clear_unrhdr(drv_spi_unr);
delete_unrhdr(drv_spi_unr);
+ taskqueue_drain_all(ipsec_accel_tq);
+ taskqueue_free(ipsec_accel_tq);
mtx_destroy(&ipsec_accel_sav_tmp);
mtx_destroy(&ipsec_accel_cnt_lock);
}
@@ -344,7 +352,7 @@ ipsec_accel_sa_newkey_act(void *context, int pending)
/*
* If ipsec_accel_forget_sav() raced with us and set
* the flag, do its work. Its task cannot execute in
- * parallel since taskqueue_thread is single-threaded.
+ * parallel since ipsec_accel taskqueue is single-threaded.
*/
if ((sav->accel_flags & SADB_KEY_ACCEL_DEINST) != 0) {
tqf = (void *)sav->accel_forget_tq;
@@ -385,7 +393,7 @@ ipsec_accel_sa_newkey_impl(struct secasvar *sav)
TASK_INIT(&tq->install_task, 0, ipsec_accel_sa_newkey_act, tq);
tq->sav = sav;
tq->install_vnet = curthread->td_vnet; /* XXXKIB liveness */
- taskqueue_enqueue(taskqueue_thread, &tq->install_task);
+ taskqueue_enqueue(ipsec_accel_tq, &tq->install_task);
}
static int
@@ -508,7 +516,7 @@ ipsec_accel_forget_sav_impl(struct secasvar *sav)
TASK_INIT(&tq->forget_task, 0, ipsec_accel_forget_sav_act, tq);
tq->forget_vnet = curthread->td_vnet;
tq->sav = sav;
- taskqueue_enqueue(taskqueue_thread, &tq->forget_task);
+ taskqueue_enqueue(ipsec_accel_tq, &tq->forget_task);
}
static void
@@ -696,7 +704,7 @@ ipsec_accel_spdadd_impl(struct secpolicy *sp, struct inpcb *inp)
in_pcbref(inp);
TASK_INIT(&tq->adddel_task, 0, ipsec_accel_spdadd_act, sp);
key_addref(sp);
- taskqueue_enqueue(taskqueue_thread, &tq->adddel_task);
+ taskqueue_enqueue(ipsec_accel_tq, &tq->adddel_task);
}
static void
@@ -751,7 +759,7 @@ ipsec_accel_spddel_impl(struct secpolicy *sp)
tq->adddel_vnet = curthread->td_vnet;
TASK_INIT(&tq->adddel_task, 0, ipsec_accel_spddel_act, sp);
key_addref(sp);
- taskqueue_enqueue(taskqueue_thread, &tq->adddel_task);
+ taskqueue_enqueue(ipsec_accel_tq, &tq->adddel_task);
}
static void
@@ -1124,7 +1132,7 @@ ipsec_accel_sa_lifetime_op_impl(struct secasvar *sav,
static void
ipsec_accel_sync_imp(void)
{
- taskqueue_drain_all(taskqueue_thread);
+ taskqueue_drain_all(ipsec_accel_tq);
}
static struct mbuf *
From nobody Wed Sep 4 09:11:46 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzGvl6sHjz5TTgJ;
Wed, 04 Sep 2024 09:11: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 4WzGvl5jVPz4hC3;
Wed, 4 Sep 2024 09:11:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725441107;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=OAidzEki7BZnHlw4/ysHT08Lh7Smm7sfLy38tD2HPFE=;
b=tLiNcO8jg3eefRAh6nGanw3gZ6hRF5z/U7va0Ib8Nq/jqHwFhxUmDo1Ig4xYx+4vKFQjmr
oATTKEw5nE7MCz9SGuw/99pOSXasIlGpMhxmRhOW60V4RMW9ZrmXQqdSf5IMcOZc+ALdrx
QNYw++lqcQPQRa4UT0vm5GwtrtTn/ANJohUafEtvEa1CTCAGZ/xEoEpGkoCbEpqJu5FDd0
feH8Xk9tHX9qv2B2GHMlTssWBFI+LEWAKNbXVchoFubx5e+Pph2he6C37fzehTBQvOmcwy
Z4NFHK1AxsmzUKk7ACoImmMQrGF2luG6e0nMbiH4zbx4A1a/nGiSX224agNvlA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725441107; a=rsa-sha256; cv=none;
b=CuTgwVz++CfTFGYo41d74LzSnkC2HDvkG9QHM4bZndFoxBz9WUdMRPm4vQYIqcpZUejtig
tHvBQJenz2nsJ61MjECoYJlxn5Zqpv5Wo9VRH5QJYO57Nfbg2DaJtVHXUIHgXoKo5qZWZP
0yNmwgM0cqK0SQ3wnYVGLIuTkdlNuo5qTqHPA/L6eXI5Bm8cVk1VUgAs3Gp/JEKCWZl/uG
r9khkEKQLafmk2e7Nd8GrytZBhFQ7dmTNKULWEGvSo3VkOnXeYZsDzoCKBsstsSPo3vm/M
8WGgs9hVo4zQ/qXSuc7t0BaC8D5FSdp467f1yUKasmIHyI4UUTiPhf4TWCxJ5g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725441107;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=OAidzEki7BZnHlw4/ysHT08Lh7Smm7sfLy38tD2HPFE=;
b=twMbREcexWxnFmJFCE/RFX/6eqh5LJ/0Ixs1a4zzxoAPhs8Yxg+AOV43OzJl4wKt8K3OA9
d/H5MJOTwS+p5rEk7ZORHNIq90Oqd4Xt2f6YYBDwe+xYJCATziDwmUhkqKfz/TinxDpbb8
EAMr62A8sZalrhGBBT5UVYUCmUmbzb9iuhpSYf25sAjWHMmfhGst3vTE3aDqs7Z3wpBfXl
hH71x2hHmKCkSu/YoSsYGBicTha0R7ptSWkm5k6F9HsqeZfgG754qmkpKiNTwTLD1rsMVs
FTKo3xCteFyhLWAK0Hi074tFUJ+nD+y5pDmCxw9SeAPpAR37ud1uwdPuhtOh0A==
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 4WzGvl0HjPzHcp;
Wed, 4 Sep 2024 09:11: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 4849BkKC037196;
Wed, 4 Sep 2024 09:11:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4849Bk8d037174;
Wed, 4 Sep 2024 09:11:46 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 09:11:46 GMT
Message-Id: <202409040911.4849Bk8d037174@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ruslan Bukin <br@FreeBSD.org>
Subject: git: e29afe64efd2 - main - riscv: fix csr_swap()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: br
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e29afe64efd22b5f503d1f2558c38362b56be812
Auto-Submitted: auto-generated
The branch main has been updated by br:
URL: https://cgit.FreeBSD.org/src/commit/?id=e29afe64efd22b5f503d1f2558c38362b56be812
commit e29afe64efd22b5f503d1f2558c38362b56be812
Author: Ruslan Bukin <br@FreeBSD.org>
AuthorDate: 2024-09-04 09:04:11 +0000
Commit: Ruslan Bukin <br@FreeBSD.org>
CommitDate: 2024-09-04 09:08:40 +0000
riscv: fix csr_swap()
Fix csr_swap() macro so that we don't overwrite the argument (which is not
even possible when the argument is an immediate value)
Reviewed by: jrtc27
Differential Revision: https://reviews.freebsd.org/D46526
---
sys/riscv/include/riscvreg.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sys/riscv/include/riscvreg.h b/sys/riscv/include/riscvreg.h
index 6a59b0132b1b..e1ad09acedc8 100644
--- a/sys/riscv/include/riscvreg.h
+++ b/sys/riscv/include/riscvreg.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015-2017 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2024 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -189,13 +189,14 @@
(__builtin_constant_p(val) && ((u_long)(val) < 32))
#define csr_swap(csr, val) \
-({ if (CSR_ZIMM(val)) \
+({ u_long ret; \
+ if (CSR_ZIMM(val)) \
__asm __volatile("csrrwi %0, " #csr ", %1" \
- : "=r" (val) : "i" (val)); \
+ : "=r" (ret) : "i" (val)); \
else \
__asm __volatile("csrrw %0, " #csr ", %1" \
- : "=r" (val) : "r" (val)); \
- val; \
+ : "=r" (ret) : "r" (val)); \
+ ret; \
})
#define csr_write(csr, val) \
From nobody Wed Sep 4 12:22:27 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzM7m1cl8z5TnJD;
Wed, 04 Sep 2024 12:22: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 4WzM7m0tBCz54Yb;
Wed, 4 Sep 2024 12:22:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725452548;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=dSW2dkFEuheKJtGyF58Cw3d32gW4KMjkW38XENeynUw=;
b=Kzh6G8V7iJgFC/pLaJHVf//LWECeXNSdVxzJPnMKkWQnx1sZY5GyFlP2su4fJj2gX++SRG
9XwJJV0t7lCh6Bwh+VOJBGua7TBcdU/JxZxnF9r561HUw6P6AF6189niVV6SfbdpVbTDl1
L0S9o98rQo3PwrYvv9Pa+DMlx0y6LnFQWey4smXAPMH/zQsoVF+oGVvjGvqlSnG64K5KBn
OzPYE50WqGtik9d0PLrcgH0huj7gk0v6Chl443QDInyt9cq/0XjteB8m8cClMP3FjZh4/j
KLOfbJ8EsrbKPt3fBccAj4XoABSyiXXYKktcTRfdEIYtWKUMSeuxms+jSZLwdw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725452548; a=rsa-sha256; cv=none;
b=EM5b8Znox5r+23uDhwXhO1r3V6PaQL4OiUKdbDQLdAB9Y/ia52Sxzxvzzppc5ZW5sbj+rR
2pndAZpSz1A46l0Z6Xs9Ux25cTKUa9zHb0jEIYzFYJHid4JGWIE+RhQkqAMh8FzP7+6gDM
iY61r8f59t8X+kaP2AZh+JZ2WzP9TL3zUn6eRkbDo05mtFXJmP205NnQIAioe43FxqxIdc
ucddKkKYU/FZgESWXNJWeoZyKL5r20t96ftdV5c2ecFSZ/Xte9+PUiqo7a/DVoGKlqaYQe
k2MK6zw7t6tDDWkZgfD2NdosbzGWaXLWBL53gAGGppsAPD10dcSMTPfZQmt3zg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725452548;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=dSW2dkFEuheKJtGyF58Cw3d32gW4KMjkW38XENeynUw=;
b=Yjd+v/5XMOf2tbYKqBkRLPOwvjoZQN63aPNh0YZSf3rNpK+VAwAdORKClhv/vOsEWPPBFV
XaUZD1L8oi5vBzoyhyNIKewS+98PYWfLD4phW9o66Ax9pPtoLSFkl0Lx65dr4N3X8eGizB
BEF18bS/RWZQ6DsFWQOJQKeLuh5K/d7x1qiMtirxO1hKtMAlSOZfPrrQUC+WHFUNpYSF4J
nnlKPbtwoAXPCp3C/WXzJNDCwFQYaMs2TMHB/hT7VMPYMKXOoKaUG0l1ycDBIEz/7Nhfn8
H79qf0IIcXHxvAKzyl4lhcYfaB8ALuc4H2mEYU9v80V195uxlyggJbvDKmTSNA==
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 4WzM7m0TVrzPgy;
Wed, 4 Sep 2024 12:22: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 484CMRtX061629;
Wed, 4 Sep 2024 12:22:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484CMRPi061626;
Wed, 4 Sep 2024 12:22:27 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 12:22:27 GMT
Message-Id: <202409041222.484CMRPi061626@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Subject: git: 36fa90dbde00 - main - libnv: allocate buffer in a
safe way
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: oshogbo
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 36fa90dbde0060aacb5677d0b113ee168e839071
Auto-Submitted: auto-generated
The branch main has been updated by oshogbo:
URL: https://cgit.FreeBSD.org/src/commit/?id=36fa90dbde0060aacb5677d0b113ee168e839071
commit 36fa90dbde0060aacb5677d0b113ee168e839071
Author: Mariusz Zaborski <oshogbo@FreeBSD.org>
AuthorDate: 2024-08-26 18:10:25 +0000
Commit: Mariusz Zaborski <oshogbo@FreeBSD.org>
CommitDate: 2024-09-04 11:42:49 +0000
libnv: allocate buffer in a safe way
Ensure that the calculation of size of array doesn't
overflow.
Security: FreeBSD-24:09.libnv
Security: CVE-2024-45287
Security: CAP-02
Reported by: Synacktiv
Reported by: Taylor R Campbell (NetBSD)
Sponsored by: The Alpha-Omega Project
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46131
---
sys/contrib/libnv/bsd_nvpair.c | 18 +++++++++---------
sys/contrib/libnv/nvlist.c | 8 ++++++--
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c
index 0c76fefeebb6..9560ebc74f83 100644
--- a/sys/contrib/libnv/bsd_nvpair.c
+++ b/sys/contrib/libnv/bsd_nvpair.c
@@ -999,7 +999,7 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp,
return (NULL);
}
- value = nv_malloc(sizeof(*value) * nvp->nvp_nitems);
+ value = nv_calloc(nvp->nvp_nitems, sizeof(*value));
if (value == NULL)
return (NULL);
@@ -1092,7 +1092,7 @@ nvpair_unpack_nvlist_array(bool isbe __unused, nvpair_t *nvp,
return (NULL);
}
- value = nv_malloc(nvp->nvp_nitems * sizeof(*value));
+ value = nv_calloc(nvp->nvp_nitems, sizeof(*value));
if (value == NULL)
return (NULL);
@@ -1330,10 +1330,10 @@ nvpair_create_bool_array(const char *name, const bool *value, size_t nitems)
return (NULL);
}
- size = sizeof(value[0]) * nitems;
- data = nv_malloc(size);
+ data = nv_calloc(nitems, sizeof(value[0]));
if (data == NULL)
return (NULL);
+ size = sizeof(value[0]) * nitems;
memcpy(data, value, size);
nvp = nvpair_allocv(name, NV_TYPE_BOOL_ARRAY, (uint64_t)(uintptr_t)data,
@@ -1360,10 +1360,10 @@ nvpair_create_number_array(const char *name, const uint64_t *value,
return (NULL);
}
- size = sizeof(value[0]) * nitems;
- data = nv_malloc(size);
+ data = nv_calloc(nitems, sizeof(value[0]));
if (data == NULL)
return (NULL);
+ size = sizeof(value[0]) * nitems;
memcpy(data, value, size);
nvp = nvpair_allocv(name, NV_TYPE_NUMBER_ARRAY,
@@ -1393,7 +1393,7 @@ nvpair_create_string_array(const char *name, const char * const *value,
nvp = NULL;
datasize = 0;
- data = nv_malloc(sizeof(value[0]) * nitems);
+ data = nv_calloc(nitems, sizeof(value[0]));
if (data == NULL)
return (NULL);
@@ -1440,7 +1440,7 @@ nvpair_create_nvlist_array(const char *name, const nvlist_t * const *value,
return (NULL);
}
- nvls = nv_malloc(sizeof(value[0]) * nitems);
+ nvls = nv_calloc(nitems, sizeof(value[0]));
if (nvls == NULL)
return (NULL);
@@ -1507,7 +1507,7 @@ nvpair_create_descriptor_array(const char *name, const int *value,
nvp = NULL;
- fds = nv_malloc(sizeof(value[0]) * nitems);
+ fds = nv_calloc(nitems, sizeof(value[0]));
if (fds == NULL)
return (NULL);
for (ii = 0; ii < nitems; ii++) {
diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c
index 57343f953e94..64078b10973e 100644
--- a/sys/contrib/libnv/nvlist.c
+++ b/sys/contrib/libnv/nvlist.c
@@ -758,7 +758,7 @@ nvlist_descriptors(const nvlist_t *nvl, size_t *nitemsp)
int *fds;
nitems = nvlist_ndescriptors(nvl);
- fds = nv_malloc(sizeof(fds[0]) * (nitems + 1));
+ fds = nv_calloc(nitems + 1, sizeof(fds[0]));
if (fds == NULL)
return (NULL);
if (nitems > 0)
@@ -1029,6 +1029,10 @@ static bool
nvlist_check_header(struct nvlist_header *nvlhdrp)
{
+ if (nvlhdrp->nvlh_size > SIZE_MAX - sizeof(nvlhdrp)) {
+ ERRNO_SET(EINVAL);
+ return (false);
+ }
if (nvlhdrp->nvlh_magic != NVLIST_HEADER_MAGIC) {
ERRNO_SET(EINVAL);
return (false);
@@ -1313,7 +1317,7 @@ nvlist_recv(int sock, int flags)
goto out;
if (nfds > 0) {
- fds = nv_malloc(nfds * sizeof(fds[0]));
+ fds = nv_calloc(nfds, sizeof(fds[0]));
if (fds == NULL)
goto out;
if (fd_recv(sock, fds, nfds) == -1)
From nobody Wed Sep 4 12:22:29 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzM7n3VrGz5TnJF;
Wed, 04 Sep 2024 12:22:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzM7n1sS9z54bY;
Wed, 4 Sep 2024 12:22:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725452549;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WKtnuSJf1mI++TTGx/9/BXiNYoEZP+F/nvN/LHq2V4g=;
b=cDGfLVcaKklQIk4huvzEgmU+N+/NClsVQ89hhcULsltX23wUzF4MpetSEj0O36OnTOHa3V
MKCdw2uZgWxI3dWH803EBVKg4Vfb/XlpAwBcQzSu5wEMowns/HfTnuVls0vYPcaDdY2mQb
Mij2gz+Ia5ufRYo7EI+eHotX4Uxm9+fEjeIgDArL7VxnoJTU0KMENrlJKVoUwAHrnNyofx
U9NI5ana1VOAuvy6X1rqltcExCYZDZ6KxDzhrI1TnXvnEoFq7/NETc26SeFbNxobtcK0Zb
cjwf7R2TU/dsEKfhx/gQgt2eu02Oh+1kQnHzOStoZhWjk3UHf/58tQXsxn4/YQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725452549; a=rsa-sha256; cv=none;
b=Zs0ygs4+io8ayvF4ucr2ak7L1Uwm4LGUPXWsFFQ+mDT0AwZaeESMhKPBVlxHB61z3eQLz/
6QQ/06En1B7odDc168eczJ50nce+IuZ8lGTsJGIlA2yEdoa69Mi0g/y/6ZnY/vBWTv5qg4
ROCTl5HNkF2FYx8szMmTDoFu33/8gdYlPtMY7xrwAXzsD65ZLWjfwM6EJpw/rZlYClX38x
inPmpBVF1bT3Xwh3VtYWeDK8iZzuq9LHfDB3xnvu0YJjgYaZdJrjmfuL6I1zmEPC19xUfN
q/NS9hhUsH9DjI+MUw+rHcBa6Htdl+OPPaEcAq9WAl+I3PL3lOSipqKHr0T2YQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725452549;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WKtnuSJf1mI++TTGx/9/BXiNYoEZP+F/nvN/LHq2V4g=;
b=ZPXBnsuzqhaTTOPTxJHyADwRj3g4UaDXCodpdGcYxBFpi8BqWOe3LXarSqovgvcB91Z+X2
BCsrOrve82MwfYa3hM2a/wqtxbn3fvvlPVf4XBdhfHqmysx2Ey6WlQgIB7Hh7N/j1awQun
DHNdEc3bcIQV44RLBVgQ2pI859169FXckpzKIyhPUvpIV4spz+seFO+4L1MiN/1MfWp3JL
Ec5NGJrJjXwpALKuAW2x90yziBxmFmxWb9Uer+A1HrUvZhQSoSO8Wo/LIvF+0tHeIJRqej
p5BbVwC6WOhyzxDpMHwfVpdiLKNx1LZaUsUODsEvoIHotBUQQ8t4eennbwc30g==
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 4WzM7n1SL2zPDM;
Wed, 4 Sep 2024 12:22: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 484CMTBc061677;
Wed, 4 Sep 2024 12:22:29 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484CMTmU061674;
Wed, 4 Sep 2024 12:22:29 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 12:22:29 GMT
Message-Id: <202409041222.484CMTmU061674@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Subject: git: 3aaaca1b51ad - main - libnv: verify that string is
null terminated
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: oshogbo
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 3aaaca1b51ad844ef9e9b3d945217ab3dd189bae
Auto-Submitted: auto-generated
The branch main has been updated by oshogbo:
URL: https://cgit.FreeBSD.org/src/commit/?id=3aaaca1b51ad844ef9e9b3d945217ab3dd189bae
commit 3aaaca1b51ad844ef9e9b3d945217ab3dd189bae
Author: Mariusz Zaborski <oshogbo@FreeBSD.org>
AuthorDate: 2024-08-26 18:20:24 +0000
Commit: Mariusz Zaborski <oshogbo@FreeBSD.org>
CommitDate: 2024-09-04 11:42:55 +0000
libnv: verify that string is null terminated
During unpacking, we ensure that we do not read beyond the
declared size. However, unpack uses a function that copies
null-terminated strings. Prior to this commit, if the last string
was not null-terminated, it could result in copying data into a
buffer smaller than the allocated size.
Security: FreeBSD-24:09.libnv
Security: CVE-2024-45288
Security: CAP-03
Reported by: Synacktiv
Sponsored by: The Alpha-Omega Project
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46138
---
sys/contrib/libnv/bsd_nvpair.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c
index 9560ebc74f83..a977d7941aa3 100644
--- a/sys/contrib/libnv/bsd_nvpair.c
+++ b/sys/contrib/libnv/bsd_nvpair.c
@@ -988,6 +988,10 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp,
for (ii = 0; ii < nvp->nvp_nitems; ii++) {
len = strnlen(tmp, size - 1) + 1;
size -= len;
+ if (tmp[len - 1] != '\0') {
+ ERRNO_SET(EINVAL);
+ return (NULL);
+ }
if (size < 0) {
ERRNO_SET(EINVAL);
return (NULL);
From nobody Wed Sep 4 12:22:30 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzM7p3G6Bz5TnL5;
Wed, 04 Sep 2024 12:22: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 4WzM7p2Vp4z54bb;
Wed, 4 Sep 2024 12:22:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725452550;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XWkK/egcMQKQCVVAxlU9j5K8vMWbL6G/f5hMKYlwejg=;
b=PEkwRshCjT8RpWac9daT6614qFyq6bHYRgl1buJrwpZgVsedgcOSVuyiYQGiSLZBvOx+7s
+xg7qIwmLgEAPTQajZJ0yZcVXYLpE4UWqK+yvLkxdLTTanRKjq8BH2IX7oCCoq5SVRH6ST
F4nMgWKuKVZMLSPkDGglvXvITGaQebMSi5FRo750pGA0sEWs71Zs7pKuh+TJe8/gSE2NqD
HDMaTDPZbz4bcJeV6A8Nwpm/xFHoRfUMbVHPr05jNroYWfgE2fx4B7nQMpib5880orm4eg
g2Bq2tnpK5Y00bPpwYEB2SNGxs39va7UC48jCla8fBei32k/4PFrD+HN5c9knw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725452550; a=rsa-sha256; cv=none;
b=lxYMheLTlWKGWHJet/kMAmiT31sQgWVoeGFql1ux5ujogTxeYrdymt8ZYf0070bfKDDzQx
LZZzDzWYzsSD/3wZVDZVR3nFe4x+q2os1kJ/N3TFT+MWUZDZUsP5xTRROb8qAaSGfYQ9lw
j5J1wW7eyL+vofg1HUhvCP5D+JJo3UkQKfmQAD5PY8ocVgEr/h2NJTmPDWQjnlO99ShtSg
3bZltFZ9YUFpV+ykL6a10NJea/3getuVl8t0Pi3rdvuH51HQVGlKkb5WqGwme2FttL3rN7
hg6D/ZwYpu08G4guRu4IwJN3ciYYN3Fp0UDWml86VjCrZdHNzjADmLRx3imxqw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725452550;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XWkK/egcMQKQCVVAxlU9j5K8vMWbL6G/f5hMKYlwejg=;
b=hlxVoAuzb1UxZpJGXLd/y36gqlsQz6fF93klhLESSaUv0y5mpQqEwvAuy/RBV6+kabKJ1M
LxaHnkV46AEZkoTFu1NhQUkVtmx+GB3pva6nkrSnaiytDgdIew5eJJuZTTy9Ch5c0vL9Em
b6ImzD6Yqj/6fdoScOkIICMWmp2HqH0x2sirrLrlBej7tL9tUv3cDHQp732Pv2sRSF6e93
xWcdVBy+ZdE4AH6xa5ihVwtLEoqOsCqr4nPkw9yy/EF6uHuzdxel3vuOTxrvzJj1Q8RTSg
AnAQ8qVu/ZMo0VWlTrY/XgZ4SyMhI/cpZr1wSwyr+f9dvDrI3FcSIDIGqU669w==
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 4WzM7p26QKzPdw;
Wed, 4 Sep 2024 12:22: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 484CMUgS061744;
Wed, 4 Sep 2024 12:22:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484CMUoR061741;
Wed, 4 Sep 2024 12:22:30 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 12:22:30 GMT
Message-Id: <202409041222.484CMUoR061741@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Subject: git: 2981431e044f - main - libnv: add test to verify null
termination of string in array
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: oshogbo
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 2981431e044fae3bc87e6fa891b8230b484dc84b
Auto-Submitted: auto-generated
The branch main has been updated by oshogbo:
URL: https://cgit.FreeBSD.org/src/commit/?id=2981431e044fae3bc87e6fa891b8230b484dc84b
commit 2981431e044fae3bc87e6fa891b8230b484dc84b
Author: Mariusz Zaborski <oshogbo@FreeBSD.org>
AuthorDate: 2024-08-29 13:44:03 +0000
Commit: Mariusz Zaborski <oshogbo@FreeBSD.org>
CommitDate: 2024-09-04 11:43:07 +0000
libnv: add test to verify null termination of string in array
Differential Revision: https://reviews.freebsd.org/D46138
---
lib/libnv/tests/nv_array_tests.cc | 58 +++++++++++++++++++++++++++++++++++++--
1 file changed, 56 insertions(+), 2 deletions(-)
diff --git a/lib/libnv/tests/nv_array_tests.cc b/lib/libnv/tests/nv_array_tests.cc
index 06d7525c3e1d..9acbaef67eba 100644
--- a/lib/libnv/tests/nv_array_tests.cc
+++ b/lib/libnv/tests/nv_array_tests.cc
@@ -1,6 +1,5 @@
/*-
- * Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
- * All rights reserved.
+ * Copyright (c) 2015-2024 Mariusz Zaborski <oshogbo@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,6 +26,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/nv.h>
+#include <sys/mman.h>
#include <sys/socket.h>
#include <atf-c++.hpp>
@@ -1161,6 +1161,58 @@ ATF_TEST_CASE_BODY(nvlist_nvlist_array__pack)
free(packed);
}
+
+ATF_TEST_CASE_WITHOUT_HEAD(nvlist_string_array_nonull__pack);
+ATF_TEST_CASE_BODY(nvlist_string_array_nonull__pack)
+{
+ nvlist_t *testnvl, *unpacked;
+ const char *somestr[3] = { "a", "b", "XXX" };
+ uint8_t *packed, *twopages, *dataptr, *secondpage;
+ size_t packed_size, page_size;
+ bool found;
+
+ page_size = sysconf(_SC_PAGESIZE);
+ testnvl = nvlist_create(0);
+ ATF_REQUIRE(testnvl != NULL);
+ ATF_REQUIRE_EQ(nvlist_error(testnvl), 0);
+ nvlist_add_string_array(testnvl, "nvl/string", somestr,
+ nitems(somestr));
+ ATF_REQUIRE_EQ(nvlist_error(testnvl), 0);
+
+ packed = (uint8_t *)nvlist_pack(testnvl, &packed_size);
+ ATF_REQUIRE(packed != NULL);
+
+ twopages = (uint8_t *)mmap(NULL, page_size * 2, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ ATF_REQUIRE(twopages != MAP_FAILED);
+ dataptr = &twopages[page_size - packed_size];
+ secondpage = &twopages[page_size];
+
+ memset(twopages, 'A', page_size * 2);
+
+ mprotect(secondpage, page_size, PROT_NONE);
+ memcpy(dataptr, packed, packed_size);
+
+ found = false;
+ for (size_t i = 0; i < packed_size - 3; i++) {
+ if (dataptr[i] == 'X' && dataptr[i + 1] == 'X' &&
+ dataptr[i + 2] == 'X' && dataptr[i + 3] == '\0') {
+ dataptr[i + 3] = 'X';
+ found = true;
+ break;
+ }
+ }
+ ATF_REQUIRE(found == true);
+
+ unpacked = nvlist_unpack(dataptr, packed_size, 0);
+ ATF_REQUIRE(unpacked == NULL);
+
+ nvlist_destroy(testnvl);
+ free(packed);
+ munmap(twopages, page_size * 2);
+}
+
+
ATF_INIT_TEST_CASES(tp)
{
@@ -1190,5 +1242,7 @@ ATF_INIT_TEST_CASES(tp)
ATF_ADD_TEST_CASE(tp, nvlist_descriptor_array__pack)
ATF_ADD_TEST_CASE(tp, nvlist_string_array__pack)
ATF_ADD_TEST_CASE(tp, nvlist_nvlist_array__pack)
+
+ ATF_ADD_TEST_CASE(tp, nvlist_string_array_nonull__pack)
}
From nobody Wed Sep 4 12:22:31 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzM7q4vdFz5TnL9;
Wed, 04 Sep 2024 12:22: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 4WzM7q37V0z54w6;
Wed, 4 Sep 2024 12:22:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725452551;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=kR3CtAlwSpx44tW0vJnUqCP5Gd9DlWrVFBmN5AtOYYE=;
b=XW3ng5zqLhx3GSvDmRYQ+0e2w7fZzK/A0I9PpYkSYq5h/M7nMdSrRl9oDJNvaoI2yC5+O6
J5OCSJOPCU3GfPdeejw47YcihchCVrLCHonMfA6JZG7sy6p855IBZV4icyGciqQSGaQFlW
09nWFktCBaVGevKmsCHIcCYOyetiW0aOo/xta83xhOw6q2zg6d+vUrAoXNqrwPn0Ea7Cr4
FIYk04gqLuKL7DUHepm8V/yScYhi9KfG8WvcWEMr2GPp/N9FktoROc8qFNQsotndVJALQr
XYm2eo9uXy6LTv6+ErMQuMUMWw9SsmJ2dB8Pqfv7bqO1rHQxgfLYc4cdLc3DsA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725452551; a=rsa-sha256; cv=none;
b=QyJ434gWpwj+zc8zSx76DdB3VBhBas/ORmxMHlxr+k9MDbvyVo6arg+FP4vTn95gVuw98/
zDfWwIRDOfhUPL0RHaZJsrutx7RDN6dUo0AccHtCm13vdjt/LCI0wHyTRv+S131xKJyUam
rYRBqaB0Wy5e/w8HZPYwSHsdAvM3OF3vtmo5kf7hKFV8MQqBvre82iDrv4c6bGc0ICM+HP
O/WMTHilN++kHF4PSgPPhMlT7e7csNaI8HAe1x1mBqWagmE6ZsFk5NIMh29QbvfsK74MAj
sBSjJFNNnDmkPvdKk6oJZxOvSDrDfl2uwo1mNJMnmKNU8BrxulCNOYLNBhMsVw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725452551;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=kR3CtAlwSpx44tW0vJnUqCP5Gd9DlWrVFBmN5AtOYYE=;
b=gY/6T6jo4MWZktJ2dii3Zst6WLAK3VyIeLbNk4LemwBAOn9nKy7oJbVrkgrB0fFKMv4HUs
tmgylgIpMBoo7pcsLniTqDawqKn6hTEf2E8VOQemlxHueuELsJt5MVrQdnyhKN6k6HteK5
awunujnVxkJVueIwhOLv8V4b2BVV0NrIZ5f7/RGQVhKQ3oqT973geM/NjPCg7ait7ceFur
tqEmHkLsVZ4C8cQEBvkQg+AoTGWgjBZNePIyuYzNLDsOzUGQcDvlVO7UIqPGzuq3PAbgbQ
hNLjhnxiOdghSgs2nYBSoR1dSbKAluDrm/bwKW/UzBy5Yb9liEiSoxn3vtLDGA==
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 4WzM7q2Q8rzNhQ;
Wed, 4 Sep 2024 12:22: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 484CMVaR061802;
Wed, 4 Sep 2024 12:22:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484CMVxs061799;
Wed, 4 Sep 2024 12:22:31 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 12:22:31 GMT
Message-Id: <202409041222.484CMVxs061799@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Subject: git: 241a7ddd7112 - main - libnv: add tests to verify
potential overflow issues
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: oshogbo
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 241a7ddd7112982ed41ccdd047c1dad59ee0256e
Auto-Submitted: auto-generated
The branch main has been updated by oshogbo:
URL: https://cgit.FreeBSD.org/src/commit/?id=241a7ddd7112982ed41ccdd047c1dad59ee0256e
commit 241a7ddd7112982ed41ccdd047c1dad59ee0256e
Author: Mariusz Zaborski <oshogbo@FreeBSD.org>
AuthorDate: 2024-08-29 13:46:01 +0000
Commit: Mariusz Zaborski <oshogbo@FreeBSD.org>
CommitDate: 2024-09-04 11:43:16 +0000
libnv: add tests to verify potential overflow issues
Differential Revision: https://reviews.freebsd.org/D46131
---
lib/libnv/tests/Makefile | 10 ++
lib/libnv/tests/nvlist_send_recv_test.c | 193 ++++++++++++++++++++++++++++++++
sys/contrib/libnv/nv_impl.h | 8 ++
sys/contrib/libnv/nvlist.c | 7 --
4 files changed, 211 insertions(+), 7 deletions(-)
diff --git a/lib/libnv/tests/Makefile b/lib/libnv/tests/Makefile
index 2e6563a83077..aea416539c4a 100644
--- a/lib/libnv/tests/Makefile
+++ b/lib/libnv/tests/Makefile
@@ -1,6 +1,16 @@
+.include <src.opts.mk>
+
ATF_TESTS_C= \
nvlist_send_recv_test
+.PATH: ${SRCTOP}/lib/libnv
+SRCS.nvlist_send_recv_test= msgio.c nvlist_send_recv_test.c
+CFLAGS.nvlist_send_recv_test+=-I${SRCTOP}/sys/contrib/libnv
+CFLAGS.nvlist_send_recv_test+=-I${SRCTOP}/lib/libnv
+.if ${MK_ASAN} != "yes"
+CFLAGS.nvlist_send_recv_test+=-DNO_ASAN
+.endif
+
ATF_TESTS_CXX= \
cnv_tests \
dnv_tests \
diff --git a/lib/libnv/tests/nvlist_send_recv_test.c b/lib/libnv/tests/nvlist_send_recv_test.c
index f060ee2684d5..79297dfe2043 100644
--- a/lib/libnv/tests/nvlist_send_recv_test.c
+++ b/lib/libnv/tests/nvlist_send_recv_test.c
@@ -43,6 +43,9 @@
#include <atf-c.h>
+#include <nv_impl.h>
+#include <msgio.h>
+
#define ALPHABET "abcdefghijklmnopqrstuvwxyz"
#define fd_is_valid(fd) (fcntl((fd), F_GETFL) != -1 || errno != EBADF)
@@ -542,6 +545,192 @@ ATF_TC_BODY(nvlist_send_recv__send_closed_fd__stream, tc)
nvlist_send_recv__send_closed_fd(SOCK_STREAM);
}
+ATF_TC_WITHOUT_HEAD(nvlist_send_recv__overflow_header_size);
+ATF_TC_BODY(nvlist_send_recv__overflow_header_size, tc)
+{
+ nvlist_t *nvl;
+ void *packed;
+ size_t packed_size;
+ struct nvlist_header *header;
+ int fd, socks[2], status;
+ pid_t pid;
+
+#ifdef NO_ASAN
+ atf_tc_skip("This test requires ASAN");
+#endif
+
+ ATF_REQUIRE_EQ(socketpair(PF_UNIX, SOCK_STREAM, 0, socks), 0);
+
+ pid = fork();
+ ATF_REQUIRE(pid >= 0);
+
+ if (pid == 0) {
+ /* Child. */
+ fd = socks[0];
+ close(socks[1]);
+
+ nvl = nvlist_create(0);
+ ATF_REQUIRE(nvl != NULL);
+ ATF_REQUIRE(nvlist_empty(nvl));
+
+ packed = nvlist_pack(nvl, &packed_size);
+ ATF_REQUIRE(packed != NULL);
+ ATF_REQUIRE(packed_size >= sizeof(struct nvlist_header));
+
+ header = (struct nvlist_header *)packed;
+ header->nvlh_size = SIZE_MAX - sizeof(struct nvlist_header) + 2;
+
+ ATF_REQUIRE_EQ(write(fd, packed, packed_size),
+ (ssize_t)sizeof(struct nvlist_header));
+
+ nvlist_destroy(nvl);
+ free(packed);
+
+ exit(0);
+ } else {
+ /* Parent */
+ fd = socks[1];
+ close(socks[0]);
+
+ errno = 0;
+ nvl = nvlist_recv(fd, 0);
+ ATF_REQUIRE(nvl == NULL);
+
+ /*
+ * Make sure it has failed on EINVAL, and not on
+ * errors returned by malloc or recv.
+ */
+ ATF_REQUIRE(errno == EINVAL);
+
+ ATF_REQUIRE(waitpid(pid, &status, 0) == pid);
+ ATF_REQUIRE(status == 0);
+ close(fd);
+ }
+}
+
+ATF_TC_WITHOUT_HEAD(nvlist_send_recv__invalid_fd_size);
+ATF_TC_BODY(nvlist_send_recv__invalid_fd_size, tc)
+{
+ nvlist_t *nvl;
+ void *packed;
+ size_t packed_size;
+ struct nvlist_header *header;
+ int fd, socks[2], status;
+ pid_t pid;
+
+ ATF_REQUIRE_EQ(socketpair(PF_UNIX, SOCK_STREAM, 0, socks), 0);
+
+ pid = fork();
+ ATF_REQUIRE(pid >= 0);
+
+ if (pid == 0) {
+ /* Child. */
+ fd = socks[0];
+ close(socks[1]);
+
+ nvl = nvlist_create(0);
+ ATF_REQUIRE(nvl != NULL);
+ ATF_REQUIRE(nvlist_empty(nvl));
+
+ nvlist_add_string(nvl, "nvl/string", "test");
+ ATF_REQUIRE_EQ(nvlist_error(nvl), 0);
+
+ packed = nvlist_pack(nvl, &packed_size);
+ ATF_REQUIRE(packed != NULL);
+ ATF_REQUIRE(packed_size >= sizeof(struct nvlist_header));
+
+ header = (struct nvlist_header *)packed;
+ header->nvlh_descriptors = 0x20;
+
+ ATF_REQUIRE_EQ(write(fd, packed, packed_size),
+ (ssize_t)packed_size);
+
+ nvlist_destroy(nvl);
+ free(packed);
+
+ exit(0);
+ } else {
+ /* Parent */
+ fd = socks[1];
+ close(socks[0]);
+
+ nvl = nvlist_recv(fd, 0);
+ ATF_REQUIRE(nvl == NULL);
+
+ ATF_REQUIRE(waitpid(pid, &status, 0) == pid);
+ ATF_REQUIRE(status == 0);
+ }
+
+ close(fd);
+}
+
+ATF_TC_WITHOUT_HEAD(nvlist_send_recv__overflow_fd_size);
+ATF_TC_BODY(nvlist_send_recv__overflow_fd_size, tc)
+{
+ nvlist_t *nvl;
+ void *packed;
+ size_t packed_size;
+ struct nvlist_header *header;
+ int fd, socks[2], fds[1], status;
+ pid_t pid;
+
+ ATF_REQUIRE_EQ(socketpair(PF_UNIX, SOCK_STREAM, 0, socks), 0);
+
+ pid = fork();
+ ATF_REQUIRE(pid >= 0);
+
+ if (pid == 0) {
+ /* Child. */
+ fd = socks[0];
+ close(socks[1]);
+
+ nvl = nvlist_create(0);
+ ATF_REQUIRE(nvl != NULL);
+ ATF_REQUIRE(nvlist_empty(nvl));
+
+ nvlist_add_string(nvl, "nvl/string", "test");
+ ATF_REQUIRE_EQ(nvlist_error(nvl), 0);
+
+ packed = nvlist_pack(nvl, &packed_size);
+ ATF_REQUIRE(packed != NULL);
+ ATF_REQUIRE(packed_size >= sizeof(struct nvlist_header));
+
+ header = (struct nvlist_header *)packed;
+ header->nvlh_descriptors = 0x4000000000000002;
+
+ ATF_REQUIRE_EQ(write(fd, packed, packed_size),
+ (ssize_t)packed_size);
+
+ fds[0] = dup(STDERR_FILENO);
+ ATF_REQUIRE(fds[0] >= 0);
+ ATF_REQUIRE_EQ(fd_send(fd, fds, 1), 0);
+
+ nvlist_destroy(nvl);
+ free(packed);
+
+ close(fds[0]);
+ close(fd);
+
+ exit(0);
+ } else {
+ /* Parent */
+ fd = socks[1];
+ close(socks[0]);
+
+ nvl = nvlist_recv(fd, 0);
+ ATF_REQUIRE(nvl == NULL);
+
+ /* Make sure that fd was not parsed by nvlist */
+ ATF_REQUIRE(fd_recv(fd, fds, 1) == 0);
+
+ ATF_REQUIRE(waitpid(pid, &status, 0) == pid);
+ ATF_REQUIRE(status == 0);
+
+ close(fds[0]);
+ close(fd);
+ }
+}
+
ATF_TP_ADD_TCS(tp)
{
@@ -552,5 +741,9 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, nvlist_send_recv__send_many_fds__dgram);
ATF_TP_ADD_TC(tp, nvlist_send_recv__send_many_fds__stream);
+ ATF_TP_ADD_TC(tp, nvlist_send_recv__overflow_header_size);
+ ATF_TP_ADD_TC(tp, nvlist_send_recv__invalid_fd_size);
+ ATF_TP_ADD_TC(tp, nvlist_send_recv__overflow_fd_size);
+
return (atf_no_error());
}
diff --git a/sys/contrib/libnv/nv_impl.h b/sys/contrib/libnv/nv_impl.h
index e9cd3ffabc3f..4ac57fc7b497 100644
--- a/sys/contrib/libnv/nv_impl.h
+++ b/sys/contrib/libnv/nv_impl.h
@@ -42,6 +42,14 @@ struct nvpair;
typedef struct nvpair nvpair_t;
#endif
+struct nvlist_header {
+ uint8_t nvlh_magic;
+ uint8_t nvlh_version;
+ uint8_t nvlh_flags;
+ uint64_t nvlh_descriptors;
+ uint64_t nvlh_size;
+} __packed;
+
#define NV_TYPE_NVLIST_ARRAY_NEXT 254
#define NV_TYPE_NVLIST_UP 255
diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c
index 64078b10973e..1dc0bb8c1141 100644
--- a/sys/contrib/libnv/nvlist.c
+++ b/sys/contrib/libnv/nvlist.c
@@ -118,13 +118,6 @@ MALLOC_DEFINE(M_NVLIST, "nvlist", "kernel nvlist");
#define NVLIST_HEADER_MAGIC 0x6c
#define NVLIST_HEADER_VERSION 0x00
-struct nvlist_header {
- uint8_t nvlh_magic;
- uint8_t nvlh_version;
- uint8_t nvlh_flags;
- uint64_t nvlh_descriptors;
- uint64_t nvlh_size;
-} __packed;
nvlist_t *
nvlist_create(int flags)
From nobody Wed Sep 4 13:56:39 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzPDR3R9Gz5TwwV;
Wed, 04 Sep 2024 13:56: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 4WzPDR2tLmz45Hs;
Wed, 4 Sep 2024 13:56:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725458199;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xdpoFKdAscKqrqktehkoFYobckHzBz8ROd/b/TQ2aiA=;
b=qplPFgI57zzWb/OzJ+nZNBX3yUd4Q//KojPVHJMBnG1u243ndAPpdQMv/ZymDhM9Ged7RY
GqnfLuTHXYhSlPBbzxoUxc6PIJj2EuZQhxqNpXYAcSIr0uIbaezS/+aI+dTW+T3bzKGVF8
DdyhTQz38yxrZ9ZU9fqX0hxPl42XQtMnP3zq4Rvtq42mOku3S5i3i210zJOG3vsmeeGfdu
y8odj2CplfwTf7y9v6+oxXZkxYDC39PXxoExpsMYp32p+0BwirPfp1pmngCsOjmXwRThBR
XF9W73v+OP/RkWsPS0/9DvNi0A39Gv4xoZ3hHwSUDr3pZa3SxKKk0eJlZzSOyQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725458199; a=rsa-sha256; cv=none;
b=DiZ4tQ2XtfIcQUVXFJu0wqbC8E7eiH4xJ3DGMJpV5xTgmxRueioF/++tkfIftyC+rNRmOl
xWLEwj5qLde9QnwDI7zxOWvyq5/FQo0c+4TKK3zDO4KTKv5bbzxTIy0/zuhkNv9pKt9IRM
SHTeVNDliXj1BmX22H3vAj8SWcL87BASCx8R1V97mPw5U0F6jDdgjLydysKQfQb1rJStfo
in1mfS+3wlW58Ms/K1waTe6Hj+NbMQFNfMJ8YJrneJ6BqogZSkKiolq2HLCqgaTNH8qVoA
oS6hz5cdr3cMGre49E4e3VcAeBQWOxzAvw92PXkJzlb3L+j98Yn7qinGt7bSdg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725458199;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xdpoFKdAscKqrqktehkoFYobckHzBz8ROd/b/TQ2aiA=;
b=AQ0xxyiex0TIjIWdXC66l/FrDjeOapi0KFkbQfQjU62xcmqJvEiWKaF9OU0mQV7uckEL+T
7ukRqfwLIg2MiFGC5fbDoNpv/WGol4TUnpSupdULrNhGBVg41vor7eK1DKvbNfn33gYhnd
jletSfxy0Y5HM17VO6O4yCixmTHAyofdZQSsH5X1gzBmf6NQ9IaCibgPTd0Ke8wZvXPqE0
KpLRyoVtiYAKJRqDKnRYN8Q5Lbt2svdTWfT4WCfIgmooPy/fqUBEz9O/skqm7HIuFW9dqh
rJTPiw2g20l2gkeGJndL9XhDnFFPYq8HROHA7u2ZS+SinuJ6grlBRMkSR0R6OQ==
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 4WzPDR2TF3zRZB;
Wed, 4 Sep 2024 13:56: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 484DudZp014561;
Wed, 4 Sep 2024 13:56:39 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484DudX6014558;
Wed, 4 Sep 2024 13:56:39 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 13:56:39 GMT
Message-Id: <202409041356.484DudX6014558@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: fcef359272fd - main - uart: Use uintptr_t instead of
vm_offset_t for pointer arithmetic
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: fcef359272fdda27eef770a512b15bb40232cbd2
Auto-Submitted: auto-generated
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=fcef359272fdda27eef770a512b15bb40232cbd2
commit fcef359272fdda27eef770a512b15bb40232cbd2
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-09-04 13:56:21 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-09-04 13:56:21 +0000
uart: Use uintptr_t instead of vm_offset_t for pointer arithmetic
Reviewed by: imp
Obtained from: CheriBSD
Sponsored by: AFRL, DARPA
Differential Revision: https://reviews.freebsd.org/D46490
---
sys/dev/uart/uart_cpu_acpi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c
index 53fe459e64a1..7892437e11de 100644
--- a/sys/dev/uart/uart_cpu_acpi.c
+++ b/sys/dev/uart/uart_cpu_acpi.c
@@ -235,10 +235,10 @@ uart_cpu_acpi_dbg2(struct uart_devinfo *di)
error = ENXIO;
- dbg2_dev = (ACPI_DBG2_DEVICE *)((vm_offset_t)dbg2 + dbg2->InfoOffset);
+ dbg2_dev = (ACPI_DBG2_DEVICE *)((uintptr_t)dbg2 + dbg2->InfoOffset);
found = false;
- while ((vm_offset_t)dbg2_dev + dbg2_dev->Length <=
- (vm_offset_t)dbg2 + dbg2->Header.Length) {
+ while ((uintptr_t)dbg2_dev + dbg2_dev->Length <=
+ (uintptr_t)dbg2 + dbg2->Header.Length) {
if (dbg2_dev->PortType != ACPI_DBG2_SERIAL_PORT)
goto next;
@@ -252,7 +252,7 @@ uart_cpu_acpi_dbg2(struct uart_devinfo *di)
class = cd->cd_class;
base_address = (ACPI_GENERIC_ADDRESS *)
- ((vm_offset_t)dbg2_dev + dbg2_dev->BaseAddressOffset);
+ ((uintptr_t)dbg2_dev + dbg2_dev->BaseAddressOffset);
error = uart_cpu_acpi_init_devinfo(di, class, base_address);
if (error == 0) {
@@ -262,7 +262,7 @@ uart_cpu_acpi_dbg2(struct uart_devinfo *di)
next:
dbg2_dev = (ACPI_DBG2_DEVICE *)
- ((vm_offset_t)dbg2_dev + dbg2_dev->Length);
+ ((uintptr_t)dbg2_dev + dbg2_dev->Length);
}
if (!found)
goto out;
From nobody Wed Sep 4 14:28:59 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzPxl6KGTz5V19L;
Wed, 04 Sep 2024 14:28: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 4WzPxl5nqBz495H;
Wed, 4 Sep 2024 14:28:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725460139;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=hXxkw4gRhla/i8tkTgFyIhjzWxwgfk8z6NZ+lpRjwc0=;
b=rH35IqcM9a5Muqdq0nViOTrxDWGSAZzSa+EUIjU7nKmXjBUcbEFVk7kM5pOde2LHxfevXC
Fl+Ab0Pt1cNVZl7FjYUrbFUh7esDnTrBSmmCCewyOwwWrOMrr8nMldLb7AazjPBu8ic8nX
b8767e4WocY9vTaOvnJp0lZ87RBWMogoDg/LPqXQBmv40re2hFH6bcJU+4aNqrzSETyp0y
N+nKmXJA0ifRxHsAEIhEYx1Eie1n6b5Nty5k3P10pYfrLGHNmi/SXFvn0ewG6zBNxRP7t+
IJMxLe60ut/m4AvDDqlkT0SmoxHfk6voQjumqenlyyZ2BJyfzrSarO2FvA3ixA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725460139; a=rsa-sha256; cv=none;
b=BBFR4XkRKUvUb1KniuaHEbEKmSi0CQKOlMg4imue+DxKS8bhY1iqPMrJ+3v++BtP2LjSip
Oc112M3L9An1ztohGIrNi64ZtfZ167FxBssOhmPsezva1Hc10q9SU9dYHa1PwXkIomH/sM
Rb3ld/9/8J1rPKImft6JGeTrpJlO52TFgODKu0DOZNwhXVZDNjldGa2ew4ceIipS+GUmpJ
OiYGAWE8aODrLtj72NvTjZkOqOhwSfbIQmPacQy/DZqY3Ug1IrHM/c7QcGzleCDIjVLVhe
J27V6plZL7XlDXt1PHSJk7kGTD7qY8O4sVKnWc92lN3mhHmHUOUhbfegOVb96Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725460139;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=hXxkw4gRhla/i8tkTgFyIhjzWxwgfk8z6NZ+lpRjwc0=;
b=SMu3Mfc6NEPIM77IN6J6FRdN9PQ14fsPk8LvDehnxxPJrLBHeIwJ9pM076pV2HkS/aZOZ5
F8L5YK91V35oL4DxXfppEXCG/E9zvak5NS7smmvSl5MzCXUT93lOuhJnONs8OmNyNLnLxk
c6yYCZb0qtt69VxGJwYxS/vf8mwilNUwGPSt0ISmP7LKXxYMOKuCNErN9WVruD0qzeKtA3
rHV18iwEBUXLCY4lSeK2689/pJBWz+VDoy9Tr5GufeGapDVxXPyra1O/7Sl1MJ5TMO/f/8
Nf2sWHaMkgPv8iULnjHZqCa6t87nchY7nnSgLevNAt/fpiP4vwl+Vo3KU8Y85A==
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 4WzPxl5KcfzShF;
Wed, 4 Sep 2024 14:28: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 484ESxdY065958;
Wed, 4 Sep 2024 14:28:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484ESx03065955;
Wed, 4 Sep 2024 14:28:59 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:28:59 GMT
Message-Id: <202409041428.484ESx03065955@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: b5d3f8252fe8 - main - ggate tests: Use unique ports
among tests
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: b5d3f8252fe8b74249ed49e87981d190c3ec3d05
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=b5d3f8252fe8b74249ed49e87981d190c3ec3d05
commit b5d3f8252fe8b74249ed49e87981d190c3ec3d05
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-06-15 00:10:42 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-04 14:28:28 +0000
ggate tests: Use unique ports among tests
This helps avoid failures when running tests in parallel.
MFC after: 1 week
---
tests/sys/geom/class/gate/ggate_test.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/sys/geom/class/gate/ggate_test.sh b/tests/sys/geom/class/gate/ggate_test.sh
index 3ca5c3a2531a..4cbc5d80ae89 100644
--- a/tests/sys/geom/class/gate/ggate_test.sh
+++ b/tests/sys/geom/class/gate/ggate_test.sh
@@ -1,7 +1,5 @@
-
PIDFILE=ggated.pid
PLAINFILES=plainfiles
-PORT=33080
CONF=gg.exports
atf_test_case ggatec_trim cleanup
@@ -17,13 +15,14 @@ ggatec_trim_body()
{
load_ggate
+ port=33080
us=$(alloc_ggate_dev)
work=$(alloc_md)
atf_check -e ignore -o ignore dd if=/dev/random of=/dev/$work bs=1m count=1 conv=notrunc
echo $CONF >> $PLAINFILES
echo "localhost RW /dev/$work" > $CONF
- atf_check ggated -p $PORT -F $PIDFILE $CONF
- atf_check ggatec create -p $PORT -u $us localhost /dev/$work
+ atf_check ggated -p $port -F $PIDFILE $CONF
+ atf_check ggatec create -p $port -u $us localhost /dev/$work
ggate_dev=/dev/ggate${us}
wait_for_ggate_device ${ggate_dev}
@@ -55,6 +54,7 @@ ggated_body()
load_ggate
+ port=33081
us=$(alloc_ggate_dev)
work=$(alloc_md)
src=$(alloc_md)
@@ -67,8 +67,8 @@ ggated_body()
echo $CONF >> $PLAINFILES
echo "127.0.0.1 RW /dev/$work" > $CONF
- atf_check ggated -p $PORT -F $PIDFILE $CONF
- atf_check ggatec create -p $PORT -u $us 127.0.0.1 /dev/$work
+ atf_check ggated -p $port -F $PIDFILE $CONF
+ atf_check ggatec create -p $port -u $us 127.0.0.1 /dev/$work
ggate_dev=/dev/ggate${us}
From nobody Wed Sep 4 14:29:00 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzPxn0F7kz5V14g;
Wed, 04 Sep 2024 14:29:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzPxm6qrnz495J;
Wed, 4 Sep 2024 14:29:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725460141;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=vNRuYNHtnHNx58G7XbH6O2eb0pjiNx5W8pXKRWrOJ2s=;
b=KNSKFsqxdo71JKAY+4NpEkz9BuQVJvvpLiJXWPpd5+ArJiY8kxStBwS+e8geAAfvqCVaqi
UKW6WW/K3KMCluFCx1EWaBKrSkZqXnIbsKCrj8b3aq8ySIH1nGZa1/+sx8RMWIIjkPBIWA
XhEPtMwGUxZCcb2MbM6IWJUL693Mpd46plXnIc0id+TMbbUGpZdX4uxjk89esfgd/X+Hsu
mDRSVIvNVGKLmj0xV6Z1DLGABlAGzfM9c4GxzkkQGH2XDqk89fazM3oz8gYuIJlXZLBj7g
sYp+fLKBnGDiErjdUyH7r3WDUKIKoNwSX4AlT4RuVM9Jo1aMuHYvyOKPHEiQHw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725460141; a=rsa-sha256; cv=none;
b=LUAqfZ0nKaszxuFGPWzmWcm0I2ftQrK7TpFqMTvKeRAt9FQm8pZY10FVssmKNK70tb5sGK
z3vyr8S89/DHfe85/irfcaEK98LOc8FjEEUgbrrHbNNM/F37TIbsVLOz2yvLQCGIooDrBY
EWNo34uwQCfsTpcGAC7B1/4XAxo7G/e7+WNK71wLcjIgKW3ZZZlJNn6QzD6wVAYXCL2xdu
NnypjX1KoGGKLaKyD5y3BndE4S5TLf/CiY2zPoecK2NsFnzi1/0RxaG/MIgRxicG+pRVU8
o0gVuLi7ST5eZXgcCGfq8nIUPB8eUSNnOGmMWYOROHisMfF6zVm3T0sRkeDJvg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725460141;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=vNRuYNHtnHNx58G7XbH6O2eb0pjiNx5W8pXKRWrOJ2s=;
b=BeZ/Ff3dsOG5Ioe17sqINcz3dNLC4tU818OBDG5nYKEYrRl1GkAZGwbVRSYY4YgvHmljxq
AozbzMt017ZpE8K6TBT8FC2xh++EQDrTQY7+nkoHmAgg9/9jC5tsSX4zN6pVH2WC2LBd9O
MWsA1xRVnxSGG2Mwosu4+lD9NS9yI1Ul2afVfZT5QAEukwMSFAdSAJJHtu9A6d4jp5sKuz
/MDT+drD8/VnYI7ZekSB+VRtMs60o7a6PvAs5/OjA12PfsnFxD6K6GoX7VuRgGnS2z4QBY
eKrSUnYBJk9oiX75aOtXfOQHmRabLnXEqmxkYPGxJd7hf9rIIEA9NXlxIVlTpw==
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 4WzPxm6HpZzSW6;
Wed, 4 Sep 2024 14:29: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 484ET0DY066017;
Wed, 4 Sep 2024 14:29:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484ET0o8066014;
Wed, 4 Sep 2024 14:29:00 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:29:00 GMT
Message-Id: <202409041429.484ET0o8066014@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 41ece3c036bd - main - capsicum tests: Serialize
functional tests
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 41ece3c036bda3d4da321989ee59d0555c10d603
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=41ece3c036bda3d4da321989ee59d0555c10d603
commit 41ece3c036bda3d4da321989ee59d0555c10d603
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-03 14:39:02 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-04 14:28:28 +0000
capsicum tests: Serialize functional tests
The test suite runs the same tests twice, as different users, and these
can trample over each other when run in parallel, causing spurious test
failures.
MFC after: 1 week
---
tests/sys/capsicum/Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile
index 6d37cfa08056..fd8dcb29d65c 100644
--- a/tests/sys/capsicum/Makefile
+++ b/tests/sys/capsicum/Makefile
@@ -13,6 +13,10 @@ CFLAGS+= -I${SRCTOP}/tests
GTESTS+= capsicum-test
GTESTS_WRAPPER_SH.capsicum-test= functional
+# This test script runs the same test suite twice, once as root and once as an
+# unprivileged user. Serialize them since some tests access global namespaces,
+# e.g., mqueuefs, and can trample on each other.
+TEST_METADATA.functional+= is_exclusive="true"
SRCS.capsicum-test+= \
capsicum-test-main.cc \
From nobody Wed Sep 4 14:29:01 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzPxp4Q0zz5V0wg;
Wed, 04 Sep 2024 14:29: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 4WzPxp0xRJz49MZ;
Wed, 4 Sep 2024 14:29:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725460142;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=in1D01hMpY8noWhgkQRbfSpYChoZAFNXr7C6+bQltSs=;
b=ZaJCF3MQfPWnp9VubkmPaL72hG4wsEi80SQ/JuegPKoW6WPXCPELQm17T3R8kkr1uyoJfG
AzK5lDVOyLkgNgL9vORcgdSriaqEbHTuWDhKP1vTHwzdYUmmR9eqISvAZ3CjxBMeyFIwhp
J4jNV7XkxMoq4rGiZ5D9Z76MY+ksLAhNrWHgNE++dmYeyLYAdg5/WulJwtOzbd/HLy52t7
n8VSfYJwx9wOrmfp9z2oQiXC2TnWq/kN37h+OOCOeZDsNfF0eQbcIJcunR6Kr0fnKxfTWw
uZgmL1rLHPLa//NuoV9FvFwoEvD3dnhNnFHWHhjURECo8c88JADQGwtubqtC+g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725460142; a=rsa-sha256; cv=none;
b=rTnAOwNjlTGtjA7v6gC7V86BIo4xfagEPeiXJxz7wFzx/qJmYdv2fhLQmWIpnOjDG14Ouc
eW2uWoDc8lR50CXItC3inKj9rvt1AixyyZ7X66d+rX5Tbg+hmTgkGvmQ4KHyIGdkLLYVSu
18gdolpx9tF/FVfZnDKceCESjCTdf+IORyLogS+7PkQepmUk7hrYOz2ZX9movHqUUZmz+v
ol9RSVRz76R9zZVcnZCcVA+tmSg65FtNlduXA165dbjzRPckW+3F0MpO4D5CAbtdWZO2WU
TkPXVItkGXuTkBbFNoho9wCtMhlWA7nxR0iMjiFMN88Wn8VKJuy0SBIUC3iYUw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725460142;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=in1D01hMpY8noWhgkQRbfSpYChoZAFNXr7C6+bQltSs=;
b=fa9JfnNBGX1hRU3l1XRlsQ/VMr0A0FF8Ni2QTLrpxyiHpVgRQonSXsORD2R1xcb4/GAAdT
a24lTieRO1oZV6loXZZeimNUlaatSojjfMAMlf7q6oBjIDCJZT6QqnPK73YEGLoha2I+3N
L3dLjeaA6Ho+ndkc9xrvhM5hnxcSTfwzzgGRBCNbjhQWFBp9VVfIUzNVVnxDmP8drTqqpE
reA9lHf6PK+/bAvpVf3aHqXPda1HKYLOZ5df6p4YZ4eA7MbHUrV9ObQiwrAGgigqUExk46
XSHPN2vOyOQ+wdhVYisRvGspyzKZhNAjArqhEyBa3OyEgxCLvBKn4w7ddCwvlA==
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 4WzPxp0G7fzSW7;
Wed, 4 Sep 2024 14:29:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484ET1jo066053;
Wed, 4 Sep 2024 14:29:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484ET1KY066050;
Wed, 4 Sep 2024 14:29:01 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:29:01 GMT
Message-Id: <202409041429.484ET1KY066050@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 408c909dc64f - main - ifnet: Remove if_getamcount()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 408c909dc64f77d2696d6fec77a2e0b00255cf96
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=408c909dc64f77d2696d6fec77a2e0b00255cf96
commit 408c909dc64f77d2696d6fec77a2e0b00255cf96
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-04 13:07:11 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-04 14:28:28 +0000
ifnet: Remove if_getamcount()
All uses of this function were incorrect. if_amcount is a reference
count which tracks the number of times the network stack internally set
IFF_ALLMULTI. (if_pcount is the corresponding counter for IFF_PROMISC.)
Remove if_getamcount() and fix up callers to get the number of assigned
multicast addresses instead, since that's what they actually want.
Sponsored by: Klara, Inc.
Reviewed by: zlei, glebius
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D46523
---
sys/dev/bxe/bxe.c | 2 +-
sys/dev/liquidio/lio_ioctl.c | 2 +-
sys/net/if.c | 6 ------
sys/net/if_var.h | 1 -
4 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 26a87354e5b1..3e7120a42a90 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -12174,7 +12174,7 @@ bxe_set_rx_mode(struct bxe_softc *sc)
if (if_getflags(ifp) & IFF_PROMISC) {
rx_mode = BXE_RX_MODE_PROMISC;
} else if ((if_getflags(ifp) & IFF_ALLMULTI) ||
- ((if_getamcount(ifp) > BXE_MAX_MULTICAST) &&
+ (if_llmaddr_count(ifp) > BXE_MAX_MULTICAST &&
CHIP_IS_E1(sc))) {
rx_mode = BXE_RX_MODE_ALLMULTI;
} else {
diff --git a/sys/dev/liquidio/lio_ioctl.c b/sys/dev/liquidio/lio_ioctl.c
index 10c88b209051..b2fd54f59580 100644
--- a/sys/dev/liquidio/lio_ioctl.c
+++ b/sys/dev/liquidio/lio_ioctl.c
@@ -481,7 +481,7 @@ lio_get_new_flags(if_t ifp)
* Accept all multicast addresses if there are more than we
* can handle
*/
- if (if_getamcount(ifp) > LIO_MAX_MULTICAST_ADDR)
+ if (if_llmaddr_count(ifp) > LIO_MAX_MULTICAST_ADDR)
f |= LIO_IFFLAG_ALLMULTI;
}
if (if_getflags(ifp) & IFF_BROADCAST)
diff --git a/sys/net/if.c b/sys/net/if.c
index c71643a41bc5..4458d710d826 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -4780,12 +4780,6 @@ if_getifaddr(const if_t ifp)
return (ifp->if_addr);
}
-int
-if_getamcount(const if_t ifp)
-{
- return (ifp->if_amcount);
-}
-
int
if_setsendqready(if_t ifp)
{
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index e493f8c7951e..cd074e4a8f4e 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -675,7 +675,6 @@ u_int if_lladdr_count(if_t);
u_int if_llmaddr_count(if_t);
bool if_maddr_empty(if_t);
-int if_getamcount(const if_t ifp);
struct ifaddr * if_getifaddr(const if_t ifp);
typedef u_int if_addr_cb_t(void *, struct ifaddr *, u_int);
u_int if_foreach_addr_type(if_t ifp, int type, if_addr_cb_t cb, void *cb_arg);
From nobody Wed Sep 4 14:29:03 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzPxq4Rnrz5V0yd;
Wed, 04 Sep 2024 14:29:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzPxq1gtfz48tG;
Wed, 4 Sep 2024 14:29:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725460143;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jO2eFrjoAmCrs6oVS/naEdxsIRMIOrg5Tx8xV7uIGfk=;
b=UnjXWG0qRmBaKvDNBbkF2YdI9TKnaGaK76DnWhF/ZaxhtOPePi7OzdVqkR6J7JgX8CJFzX
v1sLpvCLweXeV9FL6x7XR/o0JbAOCZMd52YxraBdPkenkFuGlNryNorf6SgZnosHJ61oJP
ppVNRaMxMkpL9LPkx8jEl/maqp6Lp0mlIfRoH3le9Fp/reNchNSFBzRAWz4N3vNkZcHvd3
Nf9ZpDipIj//0VjFZdQKHWGZME6NkSQHPpDUk9WdGMgxOI6PnDQPxpHG3MZ1OpOi08AALE
RVUCd+LljkC8vwwqKZ5ep9gwepGO68kOMj3Tm8eI6SE8rZqzSRy08AMQu4K61A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725460143; a=rsa-sha256; cv=none;
b=mLjO6q41v5f5p7VjyfghYRNs25S9Ndp2wt/Qu+gSWeEfL5UbjMHrJMkTds+gyHZ1uO0kGY
RaJQR2JQZzqwsixPVUlQGUB0w+RDVKpIV7ndBNgsZ89Nrvmb5f8IjpkTtUIWcKE/KyEtj2
inZLYfmSvdsgnTTTsewmgMITJxegpCFLVFO2WWqOfV9BRCIJCfPTJEtOgPg6s7y0Oj2f9f
RDtc26HGynfFIBzvq05Kn7FMKXewJq6oQ/I68xaPMHUzlv9nCtWLWEteH0hfOO2X+yHMgQ
i+0UqDcYgab+HetrwTIvlDWgxLY+1oj3ZjyD2syqyz3AOlNbVMl8C+ePW6fxKQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725460143;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jO2eFrjoAmCrs6oVS/naEdxsIRMIOrg5Tx8xV7uIGfk=;
b=PLQXDRo/e67Z3bto1lO9EhD7UrbFXNifJcboDEm1wonUEjk9CNpaLTxSY2wAB5KNNneQIE
vUmUgzdNAe3DNonQtfWDkyk1qoqkz+OvzNc72iqGz8R4VYakt/6LTBg65dcUyJR2OXw0EL
kdQzyHvh0EXiFf8dK3YOr0Fk7935KfSJmRRRNMXkaFl11R6WIgRX5KBMeHz7Oc8ib1X/6z
xLZFUQrcpdT22jJjYMxlwjZLouwS/u6B5EYVjr7QwgS4A3lDb+dthWWOtfh3v7KY2nxCgo
5wrYTbqs4j0+1nK5VO4YVoO147DcrapPMPRQy3n0XfilzGrztT+29h+vdmbdiA==
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 4WzPxq0jWLzShG;
Wed, 4 Sep 2024 14:29: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 484ET3qL066112;
Wed, 4 Sep 2024 14:29:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484ET3qf066109;
Wed, 4 Sep 2024 14:29:03 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:29:03 GMT
Message-Id: <202409041429.484ET3qf066109@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 01f43479b592 - main - ipsec: Drain async ipsec_offload
work when destroying a vnet
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 01f43479b5925d5e1f996a5ae2929aa2d2aab83b
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=01f43479b5925d5e1f996a5ae2929aa2d2aab83b
commit 01f43479b5925d5e1f996a5ae2929aa2d2aab83b
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-08-30 00:44:45 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-04 14:28:28 +0000
ipsec: Drain async ipsec_offload work when destroying a vnet
Re-apply commit e196b12f4d4d. This was reverted by commit 28294dc92476
because it could trigger a deadlock, but the underlying problem there
was fixed in commit f76826b892de.
Reported by: KASAN
Reviewed by: kib
Fixes: ef2a572bf6bd ("ipsec_offload: kernel infrastructure")
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D46483
---
sys/netipsec/ipsec_offload.c | 2 +-
sys/netipsec/key.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c
index a06e91ada1a1..19719a8f171b 100644
--- a/sys/netipsec/ipsec_offload.c
+++ b/sys/netipsec/ipsec_offload.c
@@ -392,7 +392,7 @@ ipsec_accel_sa_newkey_impl(struct secasvar *sav)
TASK_INIT(&tq->install_task, 0, ipsec_accel_sa_newkey_act, tq);
tq->sav = sav;
- tq->install_vnet = curthread->td_vnet; /* XXXKIB liveness */
+ tq->install_vnet = curthread->td_vnet;
taskqueue_enqueue(ipsec_accel_tq, &tq->install_task);
}
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 5a3e5727bc2e..ad1d6164f158 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -8713,6 +8713,9 @@ key_vnet_destroy(void *arg __unused)
}
SAHTREE_WUNLOCK();
+ /* Wait for async work referencing this VNET to finish. */
+ ipsec_accel_sync();
+
key_freesah_flushed(&sahdrainq);
hashdestroy(V_sphashtbl, M_IPSEC_SP, V_sphash_mask);
hashdestroy(V_savhashtbl, M_IPSEC_SA, V_savhash_mask);
From nobody Wed Sep 4 14:40:02 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQBV4BpQz5V2B4;
Wed, 04 Sep 2024 14:40:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzQBV2XHVz4F9p;
Wed, 4 Sep 2024 14:40:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725460802;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2FEei6bDjENmGdFsvWXXTZqq+VCWfCJhlEgAqpqKRMQ=;
b=D4lNQTt6/cRd3hmlp9laMGH9wbOOKCBCljPv45aFaOSK0m69CMbRhQvUIfBhVYPhmLd9i7
i3ibi057oNQ915druOvQ98Kf7wjICqukqq7qFqnyM11elt3N0mKBKxf27jsBb3Ab8otXaj
i1iwKLd39s9qaAdTIWCEi9Xz2by8BeDDgBOoslr5Z54JH5X5zWBjd0aa1VWRYnA/q3Jb10
p1legNf2OnpsVBRlR4fOTDIvCMGkYqpE6/5gKex/Mf2nOAo+30hxbs9T11tBWbWwsCo1dW
TqOBOvAb1ZbX2x/X1nCMEDChSsbRXLh26nt6QS8TAEWM9cUvTZwlU5AJEEwYmQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725460802; a=rsa-sha256; cv=none;
b=u+ltG0Vx5P0us5jJuk4skHQuR9wxRAWzuuD9BW1mCztc2dU9MH/X7p9APFVPrJzMKXV0KX
n+nl6BP1MRdgeE2lNM3x+HvNVGidtsTeYrNhZ7IHdKOhotZpdJpYyYk9uKoRCAHhPqLztU
s6Ksl+Z8WLuodpIGKkVz75PXD6K3OUIV4sc8mag2A/1izR9PZv2bAq6ip5CxR45cMDyhNN
uC8HEJObdrb4qgMojqECpFRv5saIoQkA6dMYb+FSoaRLBl2EQXpoZx4RXEgZnFKu4KuXZQ
FugOghSlqNZzQD+f6tvKICI09lum6L3f4pluPpf5SUHFcrs7LY8kG5Ed1GG4lg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725460802;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2FEei6bDjENmGdFsvWXXTZqq+VCWfCJhlEgAqpqKRMQ=;
b=UmlhHyGj5mGMTVNent64p+kk6KJwonoMlpVUCeVI2rfUz+/Ay4HAnTZHCcujLl0Fr2isOo
6DBLXhdfnOssZNBu1DClQdwUwqakVq978VpDrlREub3YUrBxXj3eZ4D9pH2NJaXZvMb1+j
U/90lOZujD1rFJDdOKeTfJP8dRVpVrUSiPCpvb6YEeSFV7x2cOJ62xJSf8NJGV3ynPqogm
AFmrrof4JIp9DGlgdO1jlH38Spz79enI0SafWZKuelRXZYawfWvtRFq73T75RJ2Ry3hTaU
lI1EQ4SYRLAQS2pLRZSm5awsjLDWQsAlEiQS/Fu3rCnYeuaVbJXMlcM11BE8jw==
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 4WzQBV2852zSj7;
Wed, 4 Sep 2024 14:40:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484Ee2mp086212;
Wed, 4 Sep 2024 14:40:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Ee2qW086208;
Wed, 4 Sep 2024 14:40:02 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:40:02 GMT
Message-Id: <202409041440.484Ee2qW086208@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: a06fc21e770a - main - bhyve: fix Out-Of-Bounds
read/write heap in tpm_ppi_mem_handler
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a06fc21e770a482c8915411ebc98c870e42dd29b
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=a06fc21e770a482c8915411ebc98c870e42dd29b
commit a06fc21e770a482c8915411ebc98c870e42dd29b
Author: Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2024-09-04 14:38:11 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:11 +0000
bhyve: fix Out-Of-Bounds read/write heap in tpm_ppi_mem_handler
The function tpm_ppi_mem_handler is vulnerable to buffer over-read and
over-write, the MMIO handler serves the heap allocated structure
tpm_ppi_qemu.
The issue is that the structure size is smaller than 0x1000 and the
handler does not validate the offset and size (sizeof is 0x15A while the
handler allows up to 0x1000 bytes)
Reported by: Synacktiv
Reviewed by: corvink
Security: FreeBSD-SA-24:10.bhyve
Security: CVE-2024-41928
Security: HYP-01
Sponsored by: The Alpha-Omega Project
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45980
---
usr.sbin/bhyve/tpm_ppi_qemu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/bhyve/tpm_ppi_qemu.c b/usr.sbin/bhyve/tpm_ppi_qemu.c
index 239d39184589..01b8493e7273 100644
--- a/usr.sbin/bhyve/tpm_ppi_qemu.c
+++ b/usr.sbin/bhyve/tpm_ppi_qemu.c
@@ -25,7 +25,7 @@
#include "tpm_ppi.h"
#define TPM_PPI_ADDRESS 0xFED45000
-#define TPM_PPI_SIZE 0x1000
+#define TPM_PPI_SIZE 0x400
#define TPM_PPI_FWCFG_FILE "etc/tpm/config"
@@ -100,7 +100,7 @@ tpm_ppi_init(void **sc)
struct tpm_ppi_fwcfg *fwcfg = NULL;
int error;
- ppi = calloc(1, sizeof(*ppi));
+ ppi = calloc(1, TPM_PPI_SIZE);
if (ppi == NULL) {
warnx("%s: failed to allocate acpi region for ppi", __func__);
error = ENOMEM;
From nobody Wed Sep 4 14:40:03 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQBW3y8Gz5V1y6;
Wed, 04 Sep 2024 14:40: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 4WzQBW3Qt5z4F36;
Wed, 4 Sep 2024 14:40:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725460803;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sHAzqgd2O5wvzTaSbM4XoEa/72bqcRRlCjB7juWowlc=;
b=fVS4S1y3VpvMsfYH5pwQ7Or+WCROSmT774PwlCRV0zyOssspA5QJwI2R8blDMxwT9+TGrH
UJoV532OMEY0kdCWQ83rGZQVcpCTN5vEYlvo3TMYVtxKs3Cf6jjM+Y/kcPUSIvfZZRxUzT
D6+9n/y6z3aD2SpB3iQD1l66HWgBTVQBAyvwslYzJslA2e7RfPxvgoC/DHwZtAqu/EXSTe
gK1JX0sNm3mx/hflDFX7MPSarc+dBLe4+3MSjxhB8XrMVWT1REv7HySqHXG+dcRWdaDNsA
vzbcO1f5GjTXXI7Bl7fGikn2C2wXk5vqwyTlE0Eoi+Sc9Wa7BxOyyBFBvlrzXA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725460803; a=rsa-sha256; cv=none;
b=GohmyQ8t+I1AKXOnnkdwOTgpxILBR19S4V4QYsra3nwp5K0fjq3xobbJs74No5VhO5B+Us
GKFtYR5tZWqCzUeWMZkvMhPEsOU6hU5SM2n0DuAL8+YZa4b9oHUbAMmyMg7Cq0DDEpg8Wy
UvKtUgOL83qVpm6PmyJ97dFdXCqm2otHckYEoaUTfEls+49GxPyddYcs2SYcKcywoVfodz
eD6DPXJjtroD06BgPCpn9oGV80ighMNOeoh8NAo3rpQLwmZjwXjk89f0bmXHcBeQx02tHe
2HBtrvY/BjvzKP2QGLthZ9h3FlxlbjZ7E6sKrWCXE30vkX1Mk8Z2DdCALDclVg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725460803;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sHAzqgd2O5wvzTaSbM4XoEa/72bqcRRlCjB7juWowlc=;
b=g+2pKl5TirppaWQiVKZyXtGB5s99fZaabtFxHA+XLnvblqDsMCaDAvom4eAp37y+hdyu51
c/nZ4BwJV3esKS5PnUZwdY1PAMLBPopVI9MBNfgngPbccWIBcELHDYArRpqsaCeswpeM/p
sn+ZIKX4/wS02Q6vunrnsTCiFcv+5slr4oUkvsRaEGwLteu3wACuEkJ7YAw5iBF8fa4MGB
VDdiJesPGMTzjC+1T5AcUDAFAaUkTWSbt4yyn4t1YPSl9KZ8+j0UgTnIFbKScVnAf3RPVv
xlyfWrhNMK/MBQAcJAkQgJr7ADNl/+3G+KcWY8mWT6YmLSDWH27P4RboeT7LgQ==
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 4WzQBW2lGJzSqm;
Wed, 4 Sep 2024 14:40: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 484Ee3A0086506;
Wed, 4 Sep 2024 14:40:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Ee3Wq086501;
Wed, 4 Sep 2024 14:40:03 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:40:03 GMT
Message-Id: <202409041440.484Ee3Wq086501@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 5c9308a41308 - main - bhyve: fix off by one error in
pci_xhci
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5c9308a4130858598c76f3ae6e3e3dfb41ccfe68
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=5c9308a4130858598c76f3ae6e3e3dfb41ccfe68
commit 5c9308a4130858598c76f3ae6e3e3dfb41ccfe68
Author: Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2024-09-04 14:38:11 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:11 +0000
bhyve: fix off by one error in pci_xhci
The function pci_xhci_find_stream validates that the streamid is valid
but the bound check accepts up to ep_MaxPStreams included.
The bug results in an out-of-bounds write on the heap with controlled
data.
Reported by: Synacktiv
Reviewed by: jhb
Security: FreeBSD-SA-24:12.bhyve
Security: CVE-2024-32668
Security: HYP-04
Sponsored by: The Alpha-Omega Project
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45994
---
usr.sbin/bhyve/pci_xhci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
index 8654dd9e7a14..b72c839c807b 100644
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -660,7 +660,7 @@ pci_xhci_init_ep(struct pci_xhci_dev_emu *dev, int epid)
devep = &dev->eps[epid];
pstreams = XHCI_EPCTX_0_MAXP_STREAMS_GET(ep_ctx->dwEpCtx0);
if (pstreams > 0) {
- DPRINTF(("init_ep %d with pstreams %d", epid, pstreams));
+ DPRINTF(("init_ep %d with pstreams %u", epid, pstreams));
assert(devep->ep_sctx_trbs == NULL);
devep->ep_sctx = XHCI_GADDR(dev->xsc, ep_ctx->qwEpCtx2 &
@@ -1202,7 +1202,7 @@ pci_xhci_find_stream(struct pci_xhci_softc *sc, struct xhci_endp_ctx *ep,
}
/* only support primary stream */
- if (streamid > devep->ep_MaxPStreams)
+ if (streamid >= devep->ep_MaxPStreams)
return (XHCI_TRB_ERROR_STREAM_TYPE);
sctx = (struct xhci_stream_ctx *)XHCI_GADDR(sc, ep->qwEpCtx2 & ~0xFUL) +
From nobody Wed Sep 4 14:46:16 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQKh59gZz5V2bV;
Wed, 04 Sep 2024 14:46:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzQKh4LXNz4GVT;
Wed, 4 Sep 2024 14:46:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725461176;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=mH0fUxRWVlUjtZS7wbNKpxxZ8yB2oL+GdsBk2bcdWrI=;
b=iEiZ29Ccm5oVDQHnEtXUmDfUDdwWvU/P462EbY67upsOsVWsWsuHMy7EM92oGuzkll08YZ
Wgy4YElGNtF8cESx118bIr6aX1fUpbGnAAJhgx6OK5iLP5Rkmm9h67U1aZ/suS6/vUsL76
qty88LklKWOalAYr2QXaDCl7t7//rQ8t17tBDwElc6BCXf1jGVyCgvze0kVLKTdmgGHFB3
EWvuzLsqoHiHZSYWV8oB3QPqD4PVnbKqiqC8WOx8fZr1LKvCbVrn6hMSEfP0w4L6USVQ0P
MM62VRjtASSJX/sZVzj4xfg3nFOz1gDYrG93p865gFZdcBmf8EZz6g4kftmgFQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725461176; a=rsa-sha256; cv=none;
b=kfIApIfJKoMvqDPsBRCmcKU3fRdwvEIYPSONIkYr8xZMYAt85UeCt/L7olsXNajbp1fr3T
bpKqO/bac9e/e5zC5GoLMc30QsKAfoOAC5bMf18WxGMDtHfXLSCfhkBcB5jEaJV1mxfX3+
umgKpSz4p4nntDLlsSlmIUhcyAKkJB5e95WGXkO/kLnePNuwvy1tHvS4v9x59T8x5YG7rd
OoQwHioUrpddpXQJL6uTO03ypwCKx02kwz9URO11onLloA66DirOucIdyAvVT16aA+O75S
wpKNw7laH6rFRntdmH19XGasVYr6Hnfm412x2oV3XPP/zHhXnu5Df2fOoxbGXA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725461176;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=mH0fUxRWVlUjtZS7wbNKpxxZ8yB2oL+GdsBk2bcdWrI=;
b=E7AO/Adw9bhy4uXAJczPOJSoTFLeiTACFtDd7DNPxRKAlov5esRqQRVWNr5nU2L9X/R6Yi
uoaPA517smvJvploq+ZfCaHfUdC+lgeXd7fUGQHvj/C38FPMDCBnYt15BFM7Ml88szR8Yv
Rh3fkPcjq6bsfteenF6UL12zvFMEYrCMykYMnJ9LYkNgowG/tENWrPJ/2s5N9nuud6YDCO
tmfTizWpBilAqw/UssI0EquWAhfNBnIouSoJIVkuiIZnBEj9YLHy9FLHQ+waTQVtIuwPSj
+G/DXCcF+MORjXaYHwva1oe+NaYVIa83ncxbAKA7YJ0N1uI5mio4pFvXjzxQeA==
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 4WzQKh3b5CzSln;
Wed, 4 Sep 2024 14:46: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 484EkGBi000724;
Wed, 4 Sep 2024 14:46:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484EkGCM000721;
Wed, 4 Sep 2024 14:46:16 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:46:16 GMT
Message-Id: <202409041446.484EkGCM000721@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 670b582db6cb - main - ctl: fix Use-After-Free in
ctl_write_buffer
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 670b582db6cb827a8760df942ed8af0020a0b4d0
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=670b582db6cb827a8760df942ed8af0020a0b4d0
commit 670b582db6cb827a8760df942ed8af0020a0b4d0
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-09-04 14:38:11 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:11 +0000
ctl: fix Use-After-Free in ctl_write_buffer
The virtio_scsi device allows a guest VM to directly send SCSI commands
to the kernel driver exposed on /dev/cam/ctl. This setup makes the
vulnerability directly accessible from VMs through the pci_virtio_scsi
bhyve device.
The function ctl_write_buffer sets the CTL_FLAG_ALLOCATED flag, causing
the kern_data_ptr to be freed when the command finishes processing.
However, the buffer is still stored in lun->write_buffer, leading to a
Use-After-Free vulnerability.
Since the buffer needs to persist indefinitely, so it can be accessed by
READ BUFFER, do not set CTL_FLAG_ALLOCATED.
Reported by: Synacktiv
Reviewed by: Pierre Pronchery <pierre@freebsdfoundation.org>
Reviewed by: jhb
Security: FreeBSD-SA-24:11.ctl
Security: CVE-2024-45063
Security: HYP-03
Sponsored by: Axcient
Sponsored by: The Alpha-Omega Project
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46424
---
sys/cam/ctl/ctl.c | 19 +++++++++++--------
sys/cam/ctl/ctl_private.h | 8 ++++++++
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 82420396aca1..2124903f4ac1 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -5625,21 +5625,24 @@ ctl_write_buffer(struct ctl_scsiio *ctsio)
return (CTL_RETVAL_COMPLETE);
}
+ if (lun->write_buffer == NULL) {
+ lun->write_buffer = malloc(CTL_WRITE_BUFFER_SIZE,
+ M_CTL, M_WAITOK);
+ }
+
/*
- * If we've got a kernel request that hasn't been malloced yet,
- * malloc it and tell the caller the data buffer is here.
+ * If this kernel request hasn't started yet, initialize the data
+ * buffer to the correct region of the LUN's write buffer. Note that
+ * this doesn't set CTL_FLAG_ALLOCATED since this points into a
+ * persistent buffer belonging to the LUN rather than a buffer
+ * dedicated to this request.
*/
- if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
- if (lun->write_buffer == NULL) {
- lun->write_buffer = malloc(CTL_WRITE_BUFFER_SIZE,
- M_CTL, M_WAITOK);
- }
+ if (ctsio->kern_data_ptr == NULL) {
ctsio->kern_data_ptr = lun->write_buffer + buffer_offset;
ctsio->kern_data_len = len;
ctsio->kern_total_len = len;
ctsio->kern_rel_offset = 0;
ctsio->kern_sg_entries = 0;
- ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
ctsio->be_move_done = ctl_config_move_done;
ctl_datamove((union ctl_io *)ctsio);
diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h
index cd7e499c60a6..821aa0aa681b 100644
--- a/sys/cam/ctl/ctl_private.h
+++ b/sys/cam/ctl/ctl_private.h
@@ -355,6 +355,14 @@ struct ctl_lun {
uint8_t pr_res_type;
int prevent_count;
uint32_t *prevent;
+
+ /*
+ * The READ_BUFFER and WRITE_BUFFER commands permit access to a logical
+ * data buffer associated with a LUN. Accesses to the data buffer do
+ * not affect data stored on the storage medium. To support this,
+ * allocate a buffer on first use that persists until the LUN is
+ * destroyed.
+ */
uint8_t *write_buffer;
struct ctl_devid *lun_devid;
TAILQ_HEAD(tpc_lists, tpc_list) tpc_lists;
From nobody Wed Sep 4 14:46:17 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQKj5YQFz5V2qc;
Wed, 04 Sep 2024 14:46:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzQKj56nKz4GMW;
Wed, 4 Sep 2024 14:46:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725461177;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xMD97kITUYdyZ1ge0Zkq13FoZrh+QxhS+aqsyCQmxqE=;
b=otXLGOmQyvReg6w4rcRrHhDJ5+vK49GyE5gBCaW3AE6vrLcdbiHzDXfdHymn3O5jmfIzvI
Yg4+WMe+fHtODW+Laiu9dYYESwUym5NRW4Jr2uZEt4z3nmu79hF4qc3UBPd61TCZf2BU5E
/HB6f9p3lbjSoZOVaPPYs1Q7As1esFqc2BvHbcCpAnotC2XzmcDvpaCno5ujCQVxLrg2KN
+kI6KS9Klc0tvur35X9YLRimudqsuh4kddoP7U6tKYamJJh6GNRWoKx7lkg9TKjS+ggrY4
jQ9DCQallHmYOMo1CmJzELAL8Vgk90xJ68RpUWKq9OVTPcHC4SO2Cz6AkPKWiA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725461177; a=rsa-sha256; cv=none;
b=Xzt5jul4ZiTsVavRq8RJ8b5M8n6am8YafFmJH5vgXUD7MxVZm8KNQ29biGytfLaJP+lCPR
b89Jp5JHVrJsGhnOfC8wy0k/3yHvrqb8ETKKoFQ4/1YA+cOGRu3Wj8+NSpFacKBD6G3anN
WL9okW27rHrkElj+uIHNy3R1aS3XyES/Wiem59scRg6U2R9DgnsiGQOxSrSp86j60fdXRk
ectbwS5n3xU8cUir1Frm2dPpwo7OCBP+1h37mjIWSq3fW7f01IwRL+5JZdy7S2G+V+wjbj
fAdiVHuGtG6c8O1IinMA2d1XsBDSQXGTRDd+FGaTcIxAtY/O+yHjbfIkOTiNLQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725461177;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xMD97kITUYdyZ1ge0Zkq13FoZrh+QxhS+aqsyCQmxqE=;
b=WrPNcSdkvl/LyhXICVqkx18sRcIqFTRytvPdWFbmLqGJj/J1gOiK7Gw4B5RSsbS0TjLKuf
9kwFk5BppvnVb2S2PDvKW5fppdmQLryRP0y5lyj+bEVQtT/o1kOXQo8YDmF+nqvEh7WK2r
9lIHIHlGP4t7lWeBWicSUguU/hiRPwN78zqKXCN2SflskIaz2UyvWDEbUcZHRuynII4o50
nC/aAZTLuxtdz/qor8J1BCX5rFccnfyysg5eJ+dLrg8n2aHe3NuwDfiKQlb6aPDOvo2zen
zXHDNfTX5eoYXVXoRe4pO8F3A6gGkqmQctKfX6lw1UTzrhhlV0ablrcVgk5fRw==
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 4WzQKj4gF5zSp9;
Wed, 4 Sep 2024 14:46: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 484EkHl1000778;
Wed, 4 Sep 2024 14:46:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484EkH57000775;
Wed, 4 Sep 2024 14:46:17 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:46:17 GMT
Message-Id: <202409041446.484EkH57000775@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: ea44766b78d6 - main - ctl: fix memory disclosure in
read/write buffer commands
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: ea44766b78d639d3a89afd5302ec6feffaade813
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=ea44766b78d639d3a89afd5302ec6feffaade813
commit ea44766b78d639d3a89afd5302ec6feffaade813
Author: Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2024-09-04 14:38:11 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:11 +0000
ctl: fix memory disclosure in read/write buffer commands
The functions ctl_write_buffer() and ctl_read_buffer() are vulnerable to
a kernel memory disclosure caused by an uninitialized kernel allocation.
If one of these functions is called for the first time for a given LUN, a
kernel allocation is performed without the M_ZERO flag. Then a call to
ctl_read_buffer() returns the content of this allocation, which may
contain kernel data.
Reported by: Synacktiv
Reviewed by: asomers
Reviewed by: jhb
Security: FreeBSD-SA-24:11.ctl
Security: CVE-2024-8178
Security: HYP-05
Sponsored by: The Alpha-Omega Project
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45952
---
sys/cam/ctl/ctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 2124903f4ac1..e58299951540 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -5586,7 +5586,7 @@ ctl_read_buffer(struct ctl_scsiio *ctsio)
} else {
if (lun->write_buffer == NULL) {
lun->write_buffer = malloc(CTL_WRITE_BUFFER_SIZE,
- M_CTL, M_WAITOK);
+ M_CTL, M_WAITOK | M_ZERO);
}
ctsio->kern_data_ptr = lun->write_buffer + buffer_offset;
}
@@ -5627,7 +5627,7 @@ ctl_write_buffer(struct ctl_scsiio *ctsio)
if (lun->write_buffer == NULL) {
lun->write_buffer = malloc(CTL_WRITE_BUFFER_SIZE,
- M_CTL, M_WAITOK);
+ M_CTL, M_WAITOK | M_ZERO);
}
/*
From nobody Wed Sep 4 14:46:18 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQKl14Nyz5V2fj;
Wed, 04 Sep 2024 14:46:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzQKk6dFtz4GPp;
Wed, 4 Sep 2024 14:46:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725461178;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=eyKwLtVKOIcP7rPOtN2vZKN8MB05WYszULgBRRTLojY=;
b=c/X90jpSj7zPN86r9Wgg+4e/V8C/CH5vvDsIueKrF7lAWMWf2QWO2SwNxRPt9nxx2CF9vg
VQSIS3CmJXQNuacZcLv1qcFSmqfQx4MIyzAalqNvk/A6NrQ6LOUWJmim4VjLc220nCDSa5
UsxSHNM9bPqYcT7eFxXvSSn/0ud4vwJPIFp15yB/Bn4711uiIWOPOTMneKTcvuSeGw2oOg
3CFMJKhG2OGVfPkMppt5CRjStoAY1oB2BTwPxeOiUW/ehjlhNHYd1mdQZCl2RVdrqh4Gac
3y7L670grJQaLHqP0+bMP/3slhDotPZ4uk+ovzYN0MwxyXHVsSFJuo8l/RAS/Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725461178; a=rsa-sha256; cv=none;
b=L1IpEo13qZML7/bcNRbtktrp5m8GE6ce33bz7f2ZOD6ndML8kCNXsQRSZRXNNklf+Y9Q6k
/gnquwP4yl/h1/9zdQQ0yx7qKG7BqTr7SbGAU955IlP0CwTd+tfRVNrsgXhgy0ylJBXXpF
pM7mD3YII/8NRE8UrYcJ4nZXJyfxDVD8pbghUAy1/itDRxLa71gCNFO98CCmME9Tk0Yvwy
a4FdbWZ+110qCjYkf8x7Mp2Kp0gVvCUxqC016CPZhrQ7ldv4F8H5McfWyldSTrFLor1CaB
IoaIpSHl7RYi9cg/fbmYY9RhiLITzpIuxCxzHFJfC7yaVnDfeFYWdoGqg07RmQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725461178;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=eyKwLtVKOIcP7rPOtN2vZKN8MB05WYszULgBRRTLojY=;
b=vvR8/ArbrUGwaSaNevqCPMIUL5cO7waIUqXlMwTM3Tb9FaP5ql6EKVHJ18/NNYBFC0Ty+9
l9C9+BVG9q4hVPyTRrtKxzGmQOOgr0Iyz1NeQE/f43D0FxJRAo7LnfIaj+Cg3+7WtfAaq4
xR/dtmgiJFb2xJJkHy6fyIptrB/VkIhDpyhSgTmKkObkwEN4N7I9RHUqWJsFiamoUjVZdr
wBNEnFCVZF+dGYd9rXOUOHlqsTnMKio5sUyQ1OAxz6FC0L6TCH0r+mbXizM1ysdqK742xY
R4di1D2z6GFxQc0Gc3bYGzGSiQOMIcEosbK48ebLwRm8YKQPKGkU8ov3hGYfNw==
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 4WzQKk5MgkzSk0;
Wed, 4 Sep 2024 14:46: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 484EkIt6000823;
Wed, 4 Sep 2024 14:46:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484EkIgb000820;
Wed, 4 Sep 2024 14:46:18 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:46:18 GMT
Message-Id: <202409041446.484EkIgb000820@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: af438acbfde3 - main - ctl: fix Out-Of-Bounds access
in ctl_report_supported_opcodes
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: af438acbfde3d25dbdc82b2b3d72380f0191e9d9
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=af438acbfde3d25dbdc82b2b3d72380f0191e9d9
commit af438acbfde3d25dbdc82b2b3d72380f0191e9d9
Author: Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2024-09-04 14:38:12 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:12 +0000
ctl: fix Out-Of-Bounds access in ctl_report_supported_opcodes
This vulnerability is directly accessible to a guest VM through the
pci_virtio_scsi bhyve device.
In the function ctl_report_supported_opcodes() accessible from the VM,
the option RSO_OPTIONS_OC_ASA does not check the requested
service_action value before accessing &ctl_cmd_table[].
Reported by: Synacktiv
Reviewed by: asomers
Security: FreeBSD-SA-24:11.ctl
Security: CVE-2024-42416
Security: HYP-06
Sponsored by: The Alpha-Omega Project
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46027
---
sys/cam/ctl/ctl.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index e58299951540..53858edc2a1d 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -7470,20 +7470,19 @@ ctl_report_supported_opcodes(struct ctl_scsiio *ctsio)
case RSO_OPTIONS_OC_SA:
if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) == 0 ||
service_action >= 32) {
- ctl_set_invalid_field(/*ctsio*/ ctsio,
- /*sks_valid*/ 1,
- /*command*/ 1,
- /*field*/ 2,
- /*bit_valid*/ 1,
- /*bit*/ 2);
- ctl_done((union ctl_io *)ctsio);
- return (CTL_RETVAL_COMPLETE);
+ goto invalid;
}
- /* FALLTHROUGH */
+ total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32;
+ break;
case RSO_OPTIONS_OC_ASA:
+ if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) != 0 &&
+ service_action >= 32) {
+ goto invalid;
+ }
total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32;
break;
default:
+invalid:
ctl_set_invalid_field(/*ctsio*/ ctsio,
/*sks_valid*/ 1,
/*command*/ 1,
From nobody Wed Sep 4 14:46:19 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQKm27mlz5V2qd;
Wed, 04 Sep 2024 14:46:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzQKl74wdz4GbG;
Wed, 4 Sep 2024 14:46:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725461180;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2t0yLMn7H+uMP+FHA+23fOQfQTdp+TKdLg+tNq8B0qM=;
b=K8cePUVexG1WXqbgla5F5Dk0LHyT0vgThNjkgJiDVzyR0eqZqZAeIWCynX+Zznss89sShh
nd8SmWVVE5hyaXW//S4/2QwMqYFoF0HRLwYEwRpAQKiPNriW4ay7oRPn3Z6TooWuJE8s40
No2VpvWQA8c5wGESh7DZHZ0SqQXCnT0a0mKPqbAROMakvhhH52XvTKgNyvgCumemH1XdGt
7gdD9BtJwdzBAh39mBTcg+ZWcGzPPo6JrPS5QqR9bZftKjpKFGNV0CSh+OzrvSAoG2+5XK
ljvh8IebelHz2YV6FwjwVIvmkrSAVS3RQ9MzL7n5ZEVcjQraz3XygdTagHaZ7A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725461180; a=rsa-sha256; cv=none;
b=X/fblyaqM5J22VJfdoBc4rBZF+wbmty06jv6S3fL/RXovCFwlZcDbrkvig9oE4SRJATFd0
fLfNTNr1GbZQkOpbzqUJrQMI1R+EHUtImHpG+mF41mp6ivP7dwEe51FU8ncwr/3xaE1vka
kDm06AfcL1jZfFHLG9ICpFnLagnpm59ekRbT7Kz48HboZTZ0hvwVRQ7Ot+SyLoSF92MuV2
q3dBnL91nnBSdHYxJPc80k/kGuaSo+h8WEfktIMNeUP989gTX69dUTa9XOlygT7FK7UW0S
NTNJCVHVs2QmfAjSkRwbG0zGemY5n61e6SiejhSwvGaWfFikmg1BJcm5ewE//A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725461180;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2t0yLMn7H+uMP+FHA+23fOQfQTdp+TKdLg+tNq8B0qM=;
b=fjIhgeHx0BabsYm3JjCe+GeCvOoxX9eRSsM5fdG18QaSqCG7tJYma+YBt3HAvi45k3M94r
qyog8++Q4xR/cuPF+rlpvsb8gXJoOHkGr/R5DOrk3OFSDpn/3tlE1dRNRkObYGjTbpmQlS
pFMj7nxsDmMwUyKyBqnTVPEtKfOZf+WD+V4UFsGT2ybBw1YHS+ri5VAheVO+LbR27XCQZE
pqIG+s83weG1UL3GbI7XE0qZptflM6ovBcmM8o9urt8aIlMAooU0n43EzO/DTKyqHVHIFQ
Y9UGozwap5/oCOgUL0qB6M34AA/LTRy9MkaHiazk3OnB8kiJzrtz7O8RkSX1Gw==
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 4WzQKl6jB7zSk1;
Wed, 4 Sep 2024 14:46:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484EkJ4Z000874;
Wed, 4 Sep 2024 14:46:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484EkJIo000871;
Wed, 4 Sep 2024 14:46:19 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:46:19 GMT
Message-Id: <202409041446.484EkJIo000871@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 60d717baf214 - main - ctl: add some ATF tests for
READ BUFFER
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 60d717baf2144cf344ec9b47d715ce837b5d46d4
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=60d717baf2144cf344ec9b47d715ce837b5d46d4
commit 60d717baf2144cf344ec9b47d715ce837b5d46d4
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-09-04 14:38:12 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:12 +0000
ctl: add some ATF tests for READ BUFFER
Reviewed by: Pierre Pronchery <pierre@freebsdfoundation.org>
Reviewed by: jhb
MFC after: 2 weeks
Sponsored by: Axcient
---
etc/mtree/BSD.tests.dist | 4 +
tests/sys/Makefile | 1 +
tests/sys/cam/Makefile | 7 ++
tests/sys/cam/ctl/Makefile | 10 ++
tests/sys/cam/ctl/read_buffer.sh | 226 +++++++++++++++++++++++++++++++++++++++
5 files changed, 248 insertions(+)
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index ba03881bcc27..ac53de071c11 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -791,6 +791,10 @@
..
compat32
..
+ cam
+ ctl
+ ..
+ ..
devrandom
..
dtrace
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index e64268e5a397..535e627d22cb 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -6,6 +6,7 @@ TESTS_SUBDIRS+= acl
TESTS_SUBDIRS+= aio
TESTS_SUBDIRS+= ${_audit}
TESTS_SUBDIRS+= auditpipe
+TESTS_SUBDIRS+= cam
TESTS_SUBDIRS+= capsicum
TESTS_SUBDIRS+= ${_cddl}
# XXX: Currently broken in CI
diff --git a/tests/sys/cam/Makefile b/tests/sys/cam/Makefile
new file mode 100644
index 000000000000..4cc36604280a
--- /dev/null
+++ b/tests/sys/cam/Makefile
@@ -0,0 +1,7 @@
+.include <src.opts.mk>
+
+TESTSDIR= ${TESTSBASE}/sys/cam
+
+TESTS_SUBDIRS+= ctl
+
+.include <bsd.test.mk>
diff --git a/tests/sys/cam/ctl/Makefile b/tests/sys/cam/ctl/Makefile
new file mode 100644
index 000000000000..0e6f39a1a56f
--- /dev/null
+++ b/tests/sys/cam/ctl/Makefile
@@ -0,0 +1,10 @@
+PACKAGE= tests
+
+TESTSDIR= ${TESTSBASE}/sys/cam/ctl
+
+ATF_TESTS_SH+= read_buffer
+
+# Must be exclusive because it disables/enables camsim
+TEST_METADATA.read_buffer+= is_exclusive="true"
+
+.include <bsd.test.mk>
diff --git a/tests/sys/cam/ctl/read_buffer.sh b/tests/sys/cam/ctl/read_buffer.sh
new file mode 100644
index 000000000000..4a84eb6b9725
--- /dev/null
+++ b/tests/sys/cam/ctl/read_buffer.sh
@@ -0,0 +1,226 @@
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2024 Axcient
+# 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 DOCUMENTATION IS PROVIDED BY THE AUTHOR ``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 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.
+
+# Not tested
+# * modes other than "Data" and "Desc". We don't support those.
+# * Buffer ID other than 0. We don't support those.
+# * The Mode Specific field. We don't support it.
+
+load_modules() {
+ if ! kldstat -q -m ctl; then
+ kldload ctl || atf_skip "could not load ctl kernel mod"
+ fi
+ if ! ctladm port -o on -p 0; then
+ atf_skip "could not enable the camsim frontend"
+ fi
+}
+
+find_da_device() {
+ SERIAL=$1
+
+ # Rescan camsim
+ # XXX camsim doesn't update when creating a new device. Worse, a
+ # rescan won't look for new devices. So we must disable/re-enable it.
+ # Worse still, enabling it isn't synchronous, so we need a retry loop
+ # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281000
+ retries=5
+ ctladm port -o off -p 0 >/dev/null
+ ctladm port -o on -p 0 >/dev/null
+ while true; do
+
+ # Find the corresponding da device
+ da=`geom disk list | awk -v serial=$SERIAL ' /Geom name:/ { devname=$NF } /ident:/ && $NF ~ serial { print devname; exit } '`
+ if [ -z "$da" ]; then
+ retries=$(( $retries - 1 ))
+ if [ $retries -eq 0 ]; then
+ cat lun-create.txt
+ geom disk list
+ atf_fail "Could not find da device"
+ fi
+ sleep 0.1
+ continue
+ fi
+ break
+ done
+}
+
+# Create a CTL LUN
+create_ramdisk() {
+ atf_check -o save:lun-create.txt ctladm create -b ramdisk -s 1048576
+ atf_check egrep -q "LUN created successfully" lun-create.txt
+ SERIAL=`awk '/Serial Number:/ {print $NF}' lun-create.txt`
+ if [ -z "$SERIAL" ]; then
+ atf_fail "Could not find serial number"
+ fi
+ find_da_device $SERIAL
+}
+
+cleanup() {
+ if [ -e "lun-create.txt" ]; then
+ lun_id=`awk '/LUN ID:/ {print $NF}' lun-create.txt`
+ ctladm remove -b ramdisk -l $lun_id > /dev/null
+ fi
+}
+
+atf_test_case basic cleanup
+basic_head()
+{
+ atf_set "descr" "READ BUFFER can retrieve data previously written by WRITE BUFFER"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_read_buffer sg_write_buffer
+}
+basic_body()
+{
+ create_ramdisk
+
+ # Write to its buffer
+ cp /etc/passwd input
+ len=`wc -c input | cut -wf 2`
+ atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$da
+
+ # Read it back
+ atf_check -o save:output sg_read_buffer --mode data -l $len --raw /dev/$da
+
+ # And verify
+ if ! diff -q input output; then
+ atf_fail "Miscompare!"
+ fi
+}
+basic_cleanup()
+{
+ cleanup
+}
+
+# Read from the Descriptor mode. Along with Data, these are the only two modes
+# we support.
+atf_test_case desc cleanup
+desc_head()
+{
+ atf_set "descr" "READ BUFFER can retrieve the buffer size via the DESCRIPTOR mode"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_read_buffer
+}
+desc_body()
+{
+ create_ramdisk
+
+ atf_check -o inline:" 00 00 04 00 00\n" sg_read_buffer --hex --mode desc /dev/$da
+}
+desc_cleanup()
+{
+ cleanup
+}
+
+atf_test_case length cleanup
+length_head()
+{
+ atf_set "descr" "READ BUFFER can limit its length with the LENGTH field"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_read_buffer sg_write_buffer
+}
+length_body()
+{
+ create_ramdisk
+
+ # Write to its buffer
+ atf_check -o ignore -e ignore dd if=/dev/random of=input bs=4096 count=1
+ atf_check -o ignore -e ignore dd if=input bs=2048 count=1 of=expected
+ atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$da
+
+ # Read it back
+ atf_check -o save:output sg_read_buffer --mode data -l 2048 --raw /dev/$da
+
+ # And verify
+ if ! diff -q expected output; then
+ atf_fail "Miscompare!"
+ fi
+}
+length_cleanup()
+{
+ cleanup
+}
+
+atf_test_case offset cleanup
+offset_head()
+{
+ atf_set "descr" "READ BUFFER accepts the BUFFER OFFSET field"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_read_buffer sg_write_buffer
+}
+offset_body()
+{
+ create_ramdisk
+
+ # Write to its buffer
+ atf_check -o ignore -e ignore dd if=/dev/random of=input bs=4096 count=1
+ atf_check -o ignore -e ignore dd if=input iseek=2 bs=512 count=1 of=expected
+ atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$da
+
+ # Read it back
+ atf_check -o save:output sg_read_buffer --mode data -l 512 -o 1024 --raw /dev/$da
+
+ # And verify
+ if ! diff -q expected output; then
+ atf_fail "Miscompare!"
+ fi
+}
+offset_cleanup()
+{
+ cleanup
+}
+
+atf_test_case uninitialized cleanup
+uninitialized_head()
+{
+ atf_set "descr" "READ BUFFER buffers are zero-initialized"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_read_buffer
+}
+uninitialized_body()
+{
+ create_ramdisk
+
+ # Read an uninitialized buffer
+ atf_check -o save:output sg_read_buffer --mode data -l 262144 --raw /dev/$da
+
+ # And verify
+ atf_check -o ignore -e ignore dd if=/dev/zero bs=262144 count=1 of=expected
+ if ! diff -q expected output; then
+ atf_fail "Miscompare!"
+ fi
+}
+uninitialized_cleanup()
+{
+ cleanup
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case basic
+ atf_add_test_case desc
+ atf_add_test_case length
+ atf_add_test_case offset
+ atf_add_test_case uninitialized
+}
From nobody Wed Sep 4 14:48:17 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQN161XNz5V2wC;
Wed, 04 Sep 2024 14:48: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 4WzQN15YMjz4Hpf;
Wed, 4 Sep 2024 14:48:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725461297;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sDRIeBUmlPJ1EcC1rHUFs1K512DsEzLAE01adXusEfM=;
b=n78Fc7ajWcWGhJ/sXW9ABtLjk0U3STQc3u1r+/FQGEdMwhKlCGjFT/u1H/qkzxcsjKd3lD
V1tPcFUpW53INLhtx9/bNRQFExNOwK0vIccsm2YF9WfRaGV4rxNIZUDppk/lzYeeiqwp+8
ywkHRAyM2MXLAyJS+Ak6n16YkkOp1qqYiPk31FjJ9w/D5g3lmCDsjSquUNxfnpKiSz0BqW
6RNnGeBvzPOfqxOVZ3afXvShIvpRwnXRUl5sJl91oMY4MiUh1eX63P1iFq4APKLkNDDeXM
Fls/5Ok4ssgpNvqwZxJxMOHLTXGuLfFIlLNIgs5QDbJOUYOQ8zSJuk4d2LVHEw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725461297; a=rsa-sha256; cv=none;
b=rTecKuuEhKMpOxmFA5usqFDvkUR0pbX6voThS3upr0tWUjoco0MO2kv0TiEcFfaSvP5KER
WzyduwrAc89S+4DsJrnC6s3aTbUFnHDv2QIxLvOyhdtX9B6ROKoKokDX7j3aZG9iYI5aBY
3xwPfAf7atjR3OT8Q5jpwQtQjSpWERutlJBhIFvCCojtIm8pP9LpNWPb+R8SwDN2XSVy0K
UWvLQySCD8EgHbECZXPmXgVhsE0YdSb9Iqk7hc0H2eiKXIIP1r9YVSb55KkDBvwdHG/g//
5lw5gfPua2kyuN3kqo+2Vh4EwauXlXM318yHTOA7ABeMJRdZH4s51Rp5wONtRw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725461297;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sDRIeBUmlPJ1EcC1rHUFs1K512DsEzLAE01adXusEfM=;
b=XpSrE14mgjomeoZgsVxGueoJ3TPwOwd3HmfHwDsHDE4qyClI0PoHuyp2nUnzYAbxz5DDyX
AqWvT0abghvtJCBJ3AAT9CjKTBHZuNRT1kQUbdBetscth+2X/YUELDEUPTCcK8fhbFU4gR
av5bO5aXUbmI34LReUNOtuimk6x2qnfUxNGtjrxT/KR3QRgJyBgQHOcS7CGFmj2ic3hsdL
qGzMBFt701iomMCP2iz1JH9Z41BFux7GNBDuUyCaMmd9drNiCP4L3PhQjnm1WBtMB2N7ht
wY7Y7IOn4zigAJ2TDM088PWo33g+n8WQaryLpXZ+Oo8mPH8trDakhkvLAiHy1w==
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 4WzQN14lC3zSrf;
Wed, 4 Sep 2024 14:48: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 484EmHmv001295;
Wed, 4 Sep 2024 14:48:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484EmHU0001292;
Wed, 4 Sep 2024 14:48:17 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:48:17 GMT
Message-Id: <202409041448.484EmHU0001292@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: dd83da532c36 - main - umtx: shm: Collapse USHMF_REG_LINKED
and USHMF_OBJ_LINKED flags
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: dd83da532c36830a0c0aac624903849262ec6f68
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=dd83da532c36830a0c0aac624903849262ec6f68
commit dd83da532c36830a0c0aac624903849262ec6f68
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2024-09-04 14:38:12 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:12 +0000
umtx: shm: Collapse USHMF_REG_LINKED and USHMF_OBJ_LINKED flags
...into the only USHMF_LINKED, as they are always set or unset together.
This is both to stop giving the impression that they can be set/unset
independently, which they can't with the current code, and to make it
clearer that an upcoming reference counting fix is correct.
Reviewed by: kib
Approved by: emaste (mentor)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46126
---
sys/kern/kern_umtx.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index e6d5e2de5e88..8d70438ea195 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -4293,8 +4293,7 @@ __umtx_op_sem2_wake(struct thread *td, struct _umtx_op_args *uap,
#define USHM_OBJ_UMTX(o) \
((struct umtx_shm_obj_list *)(&(o)->umtx_data))
-#define USHMF_REG_LINKED 0x0001
-#define USHMF_OBJ_LINKED 0x0002
+#define USHMF_LINKED 0x0001
struct umtx_shm_reg {
TAILQ_ENTRY(umtx_shm_reg) ushm_reg_link;
LIST_ENTRY(umtx_shm_reg) ushm_obj_link;
@@ -4354,7 +4353,7 @@ umtx_shm_find_reg_locked(const struct umtx_key *key)
KASSERT(reg->ushm_key.type == TYPE_SHM, ("TYPE_USHM"));
KASSERT(reg->ushm_refcnt > 0,
("reg %p refcnt 0 onlist", reg));
- KASSERT((reg->ushm_flags & USHMF_REG_LINKED) != 0,
+ KASSERT((reg->ushm_flags & USHMF_LINKED) != 0,
("reg %p not linked", reg));
reg->ushm_refcnt++;
return (reg);
@@ -4394,14 +4393,11 @@ umtx_shm_unref_reg_locked(struct umtx_shm_reg *reg, bool force)
reg->ushm_refcnt--;
res = reg->ushm_refcnt == 0;
if (res || force) {
- if ((reg->ushm_flags & USHMF_REG_LINKED) != 0) {
+ if ((reg->ushm_flags & USHMF_LINKED) != 0) {
TAILQ_REMOVE(&umtx_shm_registry[reg->ushm_key.hash],
reg, ushm_reg_link);
- reg->ushm_flags &= ~USHMF_REG_LINKED;
- }
- if ((reg->ushm_flags & USHMF_OBJ_LINKED) != 0) {
LIST_REMOVE(reg, ushm_obj_link);
- reg->ushm_flags &= ~USHMF_OBJ_LINKED;
+ reg->ushm_flags &= ~USHMF_LINKED;
}
}
return (res);
@@ -4494,7 +4490,7 @@ umtx_shm_create_reg(struct thread *td, const struct umtx_key *key,
TAILQ_INSERT_TAIL(&umtx_shm_registry[key->hash], reg, ushm_reg_link);
LIST_INSERT_HEAD(USHM_OBJ_UMTX(key->info.shared.object), reg,
ushm_obj_link);
- reg->ushm_flags = USHMF_REG_LINKED | USHMF_OBJ_LINKED;
+ reg->ushm_flags = USHMF_LINKED;
mtx_unlock(&umtx_shm_lock);
*res = reg;
return (0);
From nobody Wed Sep 4 14:49:12 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQP46gWGz5V2tm;
Wed, 04 Sep 2024 14:49:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzQP46230z4J4X;
Wed, 4 Sep 2024 14:49:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725461352;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=NPyaO5tbYrXe1nDTwk/DYGp0YTF0cls4gmpoeYbHd88=;
b=tIZhpKKFyX5+hR/NUZXgLlZi4HB1W13svjuvVHgXxKP0QaGOgGXjfpLCwzftV09NtPd6vF
lYvc60elIGqDHUz3iECWI6+gpq1TvCIxZaW6wX4thjxaSI7/y0PeUOVN+O5P99Yb41NcWW
OJvnSbiALNsxfu2nyTAVnD7fPio0fpAGU+9veJ4W/RLk3QYFGDuYP/VQF9S5q00NSaczBy
/q54iz7SZM4cKY23l4O5l4l6TNob+akse4rNaujdk7ZOGxzG+xk1kXcaxMRlkXUSqZgQ/U
0vDp/y/Q5oMUvnaSNYfkSextgE72SCWu5zrAu23oqXIDuIwLI50YEiZzGFXTMA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725461352; a=rsa-sha256; cv=none;
b=b3bNz8NMrChxPFMPtCayTkoJYtbBgZVrbbYQ3L5bMX3t3t6UiRogGpOSRwvgQN7oITiNQG
2Oqlz96awZL8HIKysFgVveBUE8ktN24iggwMLR9ZguXgNaKLPWUhC8hxhd23GXeJBcE1dH
+QiUhYtJMl3+JwfWIaNHnG6wYkBXM/A9xNDgve8DAXAegPjycZT2+paDgA47y00U5o5pwu
v39qgxovpi3gHQi8hqHFRCQdZTvyCID/Jfz8VVicK4KwHLy/3iIAEfsZ1Ts4i5CxzUb/MA
Fpf41NlHt9KDb41o23cu9BFbu9WNZUPvfHYTojVdvUw0xN8yhlH+nWgLbA/nAA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725461352;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=NPyaO5tbYrXe1nDTwk/DYGp0YTF0cls4gmpoeYbHd88=;
b=qo6cIxNknJWaY/Moe24LULO0xwg2Ta/mBsz5AZRTU9vzztVYlost890kn7Ga4VNrqMR2BP
tOTEYt9nS9G6FIxpySy96KC7oIyOQeqcs+DPIpIk+fDFz22ERAxEOjG47XL5RJLLJjN1Jy
Fkipd0PyiB1l6FwypXE5EhlFQYYoZ7HimKl2n+WRCxSQ8YaRqCZ6yXKvtNZZAFXpNjCvKY
Cf48CRne3FKTquPUVIGbssCQTa3rK3Bdg6FG/LzrvjnD7EDG4A+N/uYQnJhPf6Rn1GQ/uR
shbFqECUjESrzIr6hZK85z1bN1J5/2jGOGv7iWG93ybAuYKWJxZeRAMohcGUwQ==
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 4WzQP45L1rzSrh;
Wed, 4 Sep 2024 14:49: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 484EnC5W001600;
Wed, 4 Sep 2024 14:49:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484EnCAE001597;
Wed, 4 Sep 2024 14:49:12 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:49:12 GMT
Message-Id: <202409041449.484EnCAE001597@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 62f40433ab47 - main - umtx: shm: Fix use-after-free
due to multiple drops of the registry reference
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 62f40433ab47ad4a9694a22a0313d57661502ca1
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=62f40433ab47ad4a9694a22a0313d57661502ca1
commit 62f40433ab47ad4a9694a22a0313d57661502ca1
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2024-09-04 14:38:12 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:12 +0000
umtx: shm: Fix use-after-free due to multiple drops of the registry reference
umtx_shm_unref_reg_locked() would unconditionally drop the "registry"
reference, tied to USHMF_LINKED.
This is not a problem for caller umtx_shm_object_terminated(), which
operates under the 'umtx_shm_lock' lock end-to-end, but it is for
indirect caller umtx_shm(), which drops the lock between
umtx_shm_find_reg() and the call to umtx_shm_unref_reg(true) that
deregisters the umtx shared region (from 'umtx_shm_registry';
umtx_shm_find_reg() only finds registered shared mutexes).
Thus, two concurrent user-space callers of _umtx_op() with UMTX_OP_SHM
and flags UMTX_SHM_DESTROY, both progressing past umtx_shm_find_reg()
but before umtx_shm_unref_reg(true), would then decrease twice the
reference count for the single reference standing for the shared mutex's
registration.
Reported by: Synacktiv
Reviewed by: kib
Approved by: emaste (mentor)
Security: FreeBSD-SA-24:14.umtx
Security: CVE-2024-43102
Security: CAP-01
Sponsored by: The Alpha-Omega Project
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46126
---
sys/kern/kern_umtx.c | 51 +++++++++++++++++++++++++++++++++------------------
1 file changed, 33 insertions(+), 18 deletions(-)
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 8d70438ea195..37c44f969a27 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -4384,39 +4384,49 @@ umtx_shm_free_reg(struct umtx_shm_reg *reg)
}
static bool
-umtx_shm_unref_reg_locked(struct umtx_shm_reg *reg, bool force)
+umtx_shm_unref_reg_locked(struct umtx_shm_reg *reg, bool linked_ref)
{
- bool res;
-
mtx_assert(&umtx_shm_lock, MA_OWNED);
KASSERT(reg->ushm_refcnt > 0, ("ushm_reg %p refcnt 0", reg));
- reg->ushm_refcnt--;
- res = reg->ushm_refcnt == 0;
- if (res || force) {
- if ((reg->ushm_flags & USHMF_LINKED) != 0) {
- TAILQ_REMOVE(&umtx_shm_registry[reg->ushm_key.hash],
- reg, ushm_reg_link);
- LIST_REMOVE(reg, ushm_obj_link);
- reg->ushm_flags &= ~USHMF_LINKED;
- }
+
+ if (linked_ref) {
+ if ((reg->ushm_flags & USHMF_LINKED) == 0)
+ /*
+ * The reference tied to USHMF_LINKED has already been
+ * released concurrently.
+ */
+ return (false);
+
+ TAILQ_REMOVE(&umtx_shm_registry[reg->ushm_key.hash], reg,
+ ushm_reg_link);
+ LIST_REMOVE(reg, ushm_obj_link);
+ reg->ushm_flags &= ~USHMF_LINKED;
}
- return (res);
+
+ reg->ushm_refcnt--;
+ return (reg->ushm_refcnt == 0);
}
static void
-umtx_shm_unref_reg(struct umtx_shm_reg *reg, bool force)
+umtx_shm_unref_reg(struct umtx_shm_reg *reg, bool linked_ref)
{
vm_object_t object;
bool dofree;
- if (force) {
+ if (linked_ref) {
+ /*
+ * Note: This may be executed multiple times on the same
+ * shared-memory VM object in presence of concurrent callers
+ * because 'umtx_shm_lock' is not held all along in umtx_shm()
+ * and here.
+ */
object = reg->ushm_obj->shm_object;
VM_OBJECT_WLOCK(object);
vm_object_set_flag(object, OBJ_UMTXDEAD);
VM_OBJECT_WUNLOCK(object);
}
mtx_lock(&umtx_shm_lock);
- dofree = umtx_shm_unref_reg_locked(reg, force);
+ dofree = umtx_shm_unref_reg_locked(reg, linked_ref);
mtx_unlock(&umtx_shm_lock);
if (dofree)
umtx_shm_free_reg(reg);
@@ -4469,7 +4479,6 @@ umtx_shm_create_reg(struct thread *td, const struct umtx_key *key,
if (!chgumtxcnt(cred->cr_ruidinfo, 1, lim_cur(td, RLIMIT_UMTXP)))
return (ENOMEM);
reg = uma_zalloc(umtx_shm_reg_zone, M_WAITOK | M_ZERO);
- reg->ushm_refcnt = 1;
bcopy(key, ®->ushm_key, sizeof(*key));
reg->ushm_obj = shm_alloc(td->td_ucred, O_RDWR, false);
reg->ushm_cred = crhold(cred);
@@ -4486,11 +4495,17 @@ umtx_shm_create_reg(struct thread *td, const struct umtx_key *key,
*res = reg1;
return (0);
}
- reg->ushm_refcnt++;
TAILQ_INSERT_TAIL(&umtx_shm_registry[key->hash], reg, ushm_reg_link);
LIST_INSERT_HEAD(USHM_OBJ_UMTX(key->info.shared.object), reg,
ushm_obj_link);
reg->ushm_flags = USHMF_LINKED;
+ /*
+ * This is one reference for the registry and the list of shared
+ * mutexes referenced by the VM object containing the lock pointer, and
+ * another for the caller, which it will free after use. So, one of
+ * these is tied to the presence of USHMF_LINKED.
+ */
+ reg->ushm_refcnt = 2;
mtx_unlock(&umtx_shm_lock);
*res = reg;
return (0);
From nobody Wed Sep 4 14:53:57 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQVY6B46z5V3Mk;
Wed, 04 Sep 2024 14:53:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzQVY5G2Mz4JnX;
Wed, 4 Sep 2024 14:53:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725461637;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=7bBknuDy3scdf4ek7t1hdbuVM5erK5B5nVbhAAN5NO4=;
b=ahVffDAYxdLJpN10paYlEqNYZm0c21idgVuTNv8sMwBi5x8yqCJRD04r0a4b2Xcpmg3rIF
hxErXZBHU1nrJDx6vSnDyPf0SGMXnjxD/otePRImN6XQscvdbvIN97XLi53siWJay8WSzY
eT2eHv4f21gKIABvW/KFArHpei/PnNeCs2prQnjDkWWz1hsyPRQypQYNVROZVfk3hFyduQ
62QTULc3wzLEsgB5YyPeAL5EvmHXBBpcYXRTBOP6xf5XmIGvPX48Llk96N7tKU7UD2CFZL
onUBkhr6Snzy2YnfDfPAVFtu08YqJvcKJkMWgfTXXJWTD3sik4ZHyVCP5u/YNA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725461637; a=rsa-sha256; cv=none;
b=p+2GsrmAs087Vt19+Ihm/Xa4lbPV3kXpL9nyNB3cpnAq/O5er38hWspknNegVoTyNHuDW0
Cy3tfo8tCyszWjGvoNf7GvzQRbmJf3ACrn/0C0gaSlW14ozM8ECFPtzWEsYc6z8LnYFxIa
UmCNScks4/dmC8fqGhgpSlAXhu3Mv8be9rlh0CFaFxM2nM+yhSV8/00uhTHX6H2LXolwTh
Q81EBDGe3dmu7RRGxm6Z24pySmGRBXOSTP9TDXa7Bx5mKG9kb8CpAK76FkIu25+58q7Wbd
en0ZuBORkRkIaX2VnHWtJeSy13RJzjS6s4T086wGS9nFMkVkNikDF4jHBP65Wg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725461637;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=7bBknuDy3scdf4ek7t1hdbuVM5erK5B5nVbhAAN5NO4=;
b=nTO/m431G5wogq1zjbebI48Ho20DRUQs5v585UJZOx9e0IPhYCOmnOoMYXnEBBBpojV8wl
AnCihyH1kIsaExjMo+mDAJxTK757V0TqhzQeiyFPxpE+mXA8AEeZ1I6d8BVdCLxmPO+arD
xi3xR8jfAEpRcepspCrEgXfGUzqrjxNbsWCK/7udcxau9GNxqYkkEVLGtF8ctrWnBmKGJz
qzhJ/cZJS5cKP9S8+JcffF8GmMElS8XZsdcw8qOP5VnMsXWYaLHrSY24grUzCDp3AXV+Dy
8dKhiwTCO5aNx2vB9Gk4FAsR025yNIDMz2nO1c8j7TGZ+yGwXUcFB7XnHKgDjQ==
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 4WzQVY4nk2zTBd;
Wed, 4 Sep 2024 14:53: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 484ErvDq017379;
Wed, 4 Sep 2024 14:53:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484ErvrB017376;
Wed, 4 Sep 2024 14:53:57 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:53:57 GMT
Message-Id: <202409041453.484ErvrB017376@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: c3e6dfe55c0e - main - umtx: shm: Prevent reference
counting overflow
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: c3e6dfe55c0e81d0717b0458bc95128384c3ebe8
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=c3e6dfe55c0e81d0717b0458bc95128384c3ebe8
commit c3e6dfe55c0e81d0717b0458bc95128384c3ebe8
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2024-09-04 14:38:12 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:12 +0000
umtx: shm: Prevent reference counting overflow
This hardens against provoked use-after-free occurences should there be
reference counting leaks in the future (which is currently not the
case).
At the deepest level, umtx_shm_find_reg_unlocked() now returns EOVERFLOW
when it cannot grant an additional reference to the registry object, and
so will umtx_shm_find_reg(). umtx_shm_create_reg() will fail if calling
umtx_shm_find_reg() returns EOVERFLOW (meaning a SHM object for the
passed key already exists, but we can't acquire another reference on
it), avoiding the creation of a duplicate registry entry for a given key
(this wouldn't pose problem for the rest of the code in its current
form, but is expressly avoided for intelligibility and hardening
purposes).
Since umtx_shm_find_reg*(), and consequently the whole _umtx_op() system
call, can only return EOVERFLOW on such a bug manifesting, we don't
document that return value.
Reviewed by: kib, emaste
Approved by: emaste (mentor)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46126
---
sys/kern/kern_umtx.c | 76 +++++++++++++++++++++++++++++++++++++---------------
1 file changed, 54 insertions(+), 22 deletions(-)
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 37c44f969a27..a6c160ab6283 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -4334,8 +4334,17 @@ umtx_shm_reg_delfree_tq(void *context __unused, int pending __unused)
static struct task umtx_shm_reg_delfree_task =
TASK_INITIALIZER(0, umtx_shm_reg_delfree_tq, NULL);
-static struct umtx_shm_reg *
-umtx_shm_find_reg_locked(const struct umtx_key *key)
+/*
+ * Returns 0 if a SHM with the passed key is found in the registry, in which
+ * case it is returned through 'oreg'. Otherwise, returns an error among ESRCH
+ * (no corresponding SHM; ESRCH was chosen for compatibility, ENOENT would have
+ * been preferable) or EOVERFLOW (there is a corresponding SHM, but reference
+ * count would overflow, so can't return it), in which case '*oreg' is left
+ * unchanged.
+ */
+static int
+umtx_shm_find_reg_locked(const struct umtx_key *key,
+ struct umtx_shm_reg **const oreg)
{
struct umtx_shm_reg *reg;
struct umtx_shm_reg_head *reg_head;
@@ -4355,22 +4364,34 @@ umtx_shm_find_reg_locked(const struct umtx_key *key)
("reg %p refcnt 0 onlist", reg));
KASSERT((reg->ushm_flags & USHMF_LINKED) != 0,
("reg %p not linked", reg));
+ /*
+ * Don't let overflow happen, just deny a new reference
+ * (this is additional protection against some reference
+ * count leak, which is known not to be the case at the
+ * time of this writing).
+ */
+ if (__predict_false(reg->ushm_refcnt == UINT_MAX))
+ return (EOVERFLOW);
reg->ushm_refcnt++;
- return (reg);
+ *oreg = reg;
+ return (0);
}
}
- return (NULL);
+ return (ESRCH);
}
-static struct umtx_shm_reg *
-umtx_shm_find_reg(const struct umtx_key *key)
+/*
+ * Calls umtx_shm_find_reg_unlocked() under the 'umtx_shm_lock'.
+ */
+static int
+umtx_shm_find_reg(const struct umtx_key *key, struct umtx_shm_reg **const oreg)
{
- struct umtx_shm_reg *reg;
+ int error;
mtx_lock(&umtx_shm_lock);
- reg = umtx_shm_find_reg_locked(key);
+ error = umtx_shm_find_reg_locked(key, oreg);
mtx_unlock(&umtx_shm_lock);
- return (reg);
+ return (error);
}
static void
@@ -4470,11 +4491,18 @@ umtx_shm_create_reg(struct thread *td, const struct umtx_key *key,
struct ucred *cred;
int error;
- reg = umtx_shm_find_reg(key);
- if (reg != NULL) {
- *res = reg;
- return (0);
+ error = umtx_shm_find_reg(key, res);
+ if (error != ESRCH) {
+ /*
+ * Either no error occured, and '*res' was filled, or EOVERFLOW
+ * was returned, indicating a reference count limit, and we
+ * won't create a duplicate registration. In both cases, we are
+ * done.
+ */
+ return (error);
}
+ /* No entry, we will create one. */
+
cred = td->td_ucred;
if (!chgumtxcnt(cred->cr_ruidinfo, 1, lim_cur(td, RLIMIT_UMTXP)))
return (ENOMEM);
@@ -4488,12 +4516,20 @@ umtx_shm_create_reg(struct thread *td, const struct umtx_key *key,
return (error);
}
mtx_lock(&umtx_shm_lock);
- reg1 = umtx_shm_find_reg_locked(key);
- if (reg1 != NULL) {
+ /* Re-lookup as 'umtx_shm_lock' has been temporarily released. */
+ error = umtx_shm_find_reg_locked(key, ®1);
+ switch (error) {
+ case 0:
mtx_unlock(&umtx_shm_lock);
umtx_shm_free_reg(reg);
*res = reg1;
return (0);
+ case ESRCH:
+ break;
+ default:
+ mtx_unlock(&umtx_shm_lock);
+ umtx_shm_free_reg(reg);
+ return (error);
}
TAILQ_INSERT_TAIL(&umtx_shm_registry[key->hash], reg, ushm_reg_link);
LIST_INSERT_HEAD(USHM_OBJ_UMTX(key->info.shared.object), reg,
@@ -4564,13 +4600,9 @@ umtx_shm(struct thread *td, void *addr, u_int flags)
if (error != 0)
return (error);
KASSERT(key.shared == 1, ("non-shared key"));
- if ((flags & UMTX_SHM_CREAT) != 0) {
- error = umtx_shm_create_reg(td, &key, ®);
- } else {
- reg = umtx_shm_find_reg(&key);
- if (reg == NULL)
- error = ESRCH;
- }
+ error = (flags & UMTX_SHM_CREAT) != 0 ?
+ umtx_shm_create_reg(td, &key, ®) :
+ umtx_shm_find_reg(&key, ®);
umtx_key_release(&key);
if (error != 0)
return (error);
From nobody Wed Sep 4 14:53:58 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzQVb1DdHz5V3Mm;
Wed, 04 Sep 2024 14:53:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzQVZ6D35z4JXM;
Wed, 4 Sep 2024 14:53:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725461638;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jHr+ye4STj+0PBoObvOWkloKIAcz3E7p/VdN5nVWofE=;
b=upf8NOvrdeZ+jWBHK6dHsVR81uDC36E6AZhiVfYKNH0w//oyANj2NJVcA1kxr6rBWbV+XL
VGVpc5xnfh3SPWDOIpreMUVu1TnhyhRI2vRN6vuToClwLXsEehAIAhweBu25DsgmrzjgnC
qHsjOkRQ7qxJDemHg02++sJTSOrvCAPuOZPCPTIxxipKV8EG1WgvuzN/YroJYxg5AjzTvp
0cPvD04++A1j+t31Ys970QPHZlijVBdvzHhMg2VWozE2WUKG8Xx1gDlr4CUklVqP9zClNk
AG0DSh45108yODyKvrwKtjSsctVMGeiU9LLj+fECpirg4FPogkWOi3xMu1Q7tQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725461638; a=rsa-sha256; cv=none;
b=x0AIkQBh+4mRZ3sWG4PjBnsSex1Fhn8pLrOts8yBhAbcobQMRhbwBGl0Ns9FHX6u5ZaIqb
aoDLhmdnIs6MRzVwYiWUk+339NYOn7uvd/i4FHdZ/ACF4JDCKPSJzFdKi3UfMEOFFYTG2c
A5trfA9QgaLDmuLYn+LNEUGqowKWtcYMxZe7X5DowRc64MvA+9mJHQBzw4h29uCdmJ1MZQ
HE10MwgCFi1Dbnz83eJdW7XUkDH8F3VqRiMXLCFvT5Ft/YyRPt9mamnNlhK09xoufU6n14
JWuaRNsTNxgj/u5XYlMw/H98CfpFTLw/qbqWF6F3jtYeQXX9GZQKMTSpndPdzg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725461638;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jHr+ye4STj+0PBoObvOWkloKIAcz3E7p/VdN5nVWofE=;
b=eXN5fsStTJ2riJ0yDcMzOubyvoLYbrwLRS3ppEvFLrBp7OLhH+vj5ibYTbNWDbcMiECfX1
wJGBpqDwevxE+3FiBzEZPBzSjGcI2cI0BLJ1lh4ougktXBXlEoyYM51xORBh+U21J3NBsb
9K+GNOYatB0Ph1nDqaye7WlbiVCm+fmvp0vleg4nMMnTkacER2l4PZiWuFs/MctpmNf9IQ
XFOJ89KNdMUpipgUDKoHMPDsEX4Us6+Q59qDw7W6lqpb3/61fKnGz5mcZxcNoggCgxx2Z9
sZd4ZLQSItV6TNVC+UwMCuf5RgV4abxiTHJ6Zz9H4CBaNbkL52vvniBbgUbtWA==
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 4WzQVZ5qT7zTGh;
Wed, 4 Sep 2024 14:53:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484Erw84017433;
Wed, 4 Sep 2024 14:53:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484ErwTx017430;
Wed, 4 Sep 2024 14:53:58 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 14:53:58 GMT
Message-Id: <202409041453.484ErwTx017430@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: c75a18905e30 - main - umtx: shm: 'ushm_refcnt > 0'
=> 'ushm_refcnt != 0'
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: c75a18905e308f69b01f19c3d7d613883a008e79
Auto-Submitted: auto-generated
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=c75a18905e308f69b01f19c3d7d613883a008e79
commit c75a18905e308f69b01f19c3d7d613883a008e79
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2024-09-04 14:38:12 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-09-04 14:38:12 +0000
umtx: shm: 'ushm_refcnt > 0' => 'ushm_refcnt != 0'
'ushm_refcnt' is unsigned. Don't leave the impression it isn't.
No functional change (intended).
Reviewed by: kib
Approved by: emaste (mentor)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46126
---
sys/kern/kern_umtx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index a6c160ab6283..705571930d7b 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -4360,7 +4360,7 @@ umtx_shm_find_reg_locked(const struct umtx_key *key,
reg->ushm_key.info.shared.offset ==
key->info.shared.offset) {
KASSERT(reg->ushm_key.type == TYPE_SHM, ("TYPE_USHM"));
- KASSERT(reg->ushm_refcnt > 0,
+ KASSERT(reg->ushm_refcnt != 0,
("reg %p refcnt 0 onlist", reg));
KASSERT((reg->ushm_flags & USHMF_LINKED) != 0,
("reg %p not linked", reg));
@@ -4408,7 +4408,7 @@ static bool
umtx_shm_unref_reg_locked(struct umtx_shm_reg *reg, bool linked_ref)
{
mtx_assert(&umtx_shm_lock, MA_OWNED);
- KASSERT(reg->ushm_refcnt > 0, ("ushm_reg %p refcnt 0", reg));
+ KASSERT(reg->ushm_refcnt != 0, ("ushm_reg %p refcnt 0", reg));
if (linked_ref) {
if ((reg->ushm_flags & USHMF_LINKED) == 0)
From nobody Wed Sep 4 17:32:46 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzV1p4rVYz5VJ98;
Wed, 04 Sep 2024 17:32: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 4WzV1p4KSrz4rK4;
Wed, 4 Sep 2024 17:32:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725471166;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xh1A6B9fhI9rvOGbTZV/BNkUlhvLrdy3mYztaO5efZk=;
b=LGe+W+KbncQNPn31lfy7ItI4H2FQ5SQAFnQp0T9nNYVHgsT+PBor/G0SFXKYbDnjg+t0Lw
Jn7R+pdA2FkrnZFianzeDmakV9kMk+EsUwLwVZR7xf/enkjWhLE2oBOyuJV52V3bFVq2C6
+wn+/APsoeuV/VsCn9huLHKy1OZUi6f1BJaaHC7Unl6bBCjx2t21TSxo1doFIKJni/9VnM
wkpAH5Jsy/LJbiwA3/tah6tJDmRrdr6CpyEj+CKQmuO5mc3eAQBFTwMiBTYTwKcfmcyQiW
qw40qwvFuoFABg9ckSDc7BHGu/JKwEeC2O3bqPptiQd0sbaAts3Y6v1rgBSioA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725471166; a=rsa-sha256; cv=none;
b=bnFWpS+yZvvFk8vwJtU2gguYlmGtd4ktMe0UxIXLGAQnGEtuysnRUi16b9yx2kKNoE76WE
eMrpdw0kaGGTOsvUxEWAoW9k4CG9b8mptWSErr2GCIH+hRgEE+YiyzUKPgboEXvD+cdeeX
gKaorgLwjSAlaghHnXh5UQEllLSn0vqyF/VXA7KnUvAdy3pD2rFGsnI3KDhwUC9I7x1dQC
CSteCwerKmSHU1L9zAEZH5drMudFu6L0U23uaKEKeDBEhOTb0OLlNXMuHwKoQvvoatKtgw
rJg4dvAt3vDEobWuYlz8c8WFDROMX3mT5Ig6tLJC1XNIREorWZ1gV7SQ+fl1Xw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725471166;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xh1A6B9fhI9rvOGbTZV/BNkUlhvLrdy3mYztaO5efZk=;
b=rb8Y6fLjHOM4TgeOWnvLVxY0IsneQ69miPfYk2lKNIAkE8Jyh1l5ZNrHTtVqF94Y559EmB
UbO9dpDyP+ftPb21Vr5UKJgvslm98/a8P7InScWVEkN9XjQubBftclg0JC9W/360KoQ1sL
lPH6rirzL9/wPdOhStzqUy3kfQa9t8Uz+eC91rktBRL57SCbMDkJlcUq3gU0krc0EUrQvY
ATteKDLzI/KEFUeY0onukUIsQMXxhvy+TBudxJz+VF+IdH+WMHGDoyO+Z4YIah4dThLEK/
2cKuqzJqCb1uWvt608x5P/C5BDXJZ2INUUFx211fuV6MgSzkxuW4UVgl6s20UQ==
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 4WzV1p3wfgzYyn;
Wed, 4 Sep 2024 17:32: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 484HWkGL091489;
Wed, 4 Sep 2024 17:32:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484HWkpu091486;
Wed, 4 Sep 2024 17:32:46 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 17:32:46 GMT
Message-Id: <202409041732.484HWkpu091486@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?= <des@FreeBSD.org>
Subject: git: a8ddd1926a34 - main - date: Fix a few nits.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a8ddd1926a34fc20970d9ceaad71b31fc414b1c5
Auto-Submitted: auto-generated
The branch main has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=a8ddd1926a34fc20970d9ceaad71b31fc414b1c5
commit a8ddd1926a34fc20970d9ceaad71b31fc414b1c5
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-09-04 17:32:23 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2024-09-04 17:32:23 +0000
date: Fix a few nits.
* Don't use `asprintf()` when `strdup()` can do the job just as well.
* Fix a couple of typos in a comment.
Fixes: eeb04a736cb9
MFC after: 3 days
Sponsored by: Klara, Inc.
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D46533
---
bin/date/date.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/date/date.c b/bin/date/date.c
index 3ce9ee3235fb..01797084c0d6 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -382,8 +382,8 @@ strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format,
bool seen_percent;
seen_percent = false;
- if (asprintf(&newformat, "%s", format) < 0)
- err(1, "asprintf");
+ if ((newformat = strdup(format)) == NULL)
+ err(1, "strdup");
tok = newformat;
for (tok = newformat; *tok != '\0'; tok++) {
switch (*tok) {
@@ -405,9 +405,9 @@ strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format,
suffix = tok + 1;
/*
* Construct a new format string from the
- * prefix (i.e., the part of the old fromat
+ * prefix (i.e., the part of the old format
* from its beginning to the currently handled
- * "%N" conversion specification, the
+ * "%N" conversion specification), the
* nanoseconds, and the suffix (i.e., the part
* of the old format from the next token to the
* end).
From nobody Wed Sep 4 19:53:55 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzY8h0qSFz5VGSX;
Wed, 04 Sep 2024 19:53:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzY8h0CRYz47rq;
Wed, 4 Sep 2024 19:53:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725479636;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=RALGbj6gZTd64GwIuwsjvOhQuu4N3uw+VFGGvWGiCDY=;
b=KjHq0oOH5IzK3eBwnzTWRvyFEjsubwsKKI+pUKZgAcsvIysqaqhpytnhEaTmEjAH9QUbtJ
hZBrk7z85ue/8WwqPWiJBvj6bVZthmuxrn0dVWluZ5vc8spsICOGpR0aaaANILXVgsZLnt
2M6fAfniREGPxHeAvPR6tGKY7FWRXVIp+zwqgQYTUV/typdoTLfYpX1LRXXXQvcQ+LnFgc
LqXhQEZtohAtMcTKUxKKXW4lqrFPz+j5j7ClJOaMUZrEfc0mW4AH6YsFhAUCnCVj8n/5Dz
oqpUQcOXoNFUEMSKcI2qUT4ZJaIK5tuvuufmqkX/dJiSJmGL2qrnDXV5sjMwkQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725479636; a=rsa-sha256; cv=none;
b=n545i7JWZhOfXJhaTKQljpQW2s2SR2K0WsZCf8quyiQIo/bgSY6O2x37SXJwGuhKTJiFOa
o4EO/DSKSgM1ZJS7ybeaZGWfVKACa9KJa0RIvPJ8UYrA0ZcGhjaBgU0NBbkfcFdAH84ABF
jp/vpS9Y7WjMGk25ml9j/cHf2cBOHsR05yAhCeQmMIPBbM7yVI3TCBRnQb+qbnYWfNL3Lr
bqbaDwgCUYmipOx5mUPUPtSwXQvrUD0S5MJu8teuZajnhAOKJyf8PB9s/Lkz6lut+NKXLh
eclBIBP5yfzAOPN0d8Ve9rOIKVpyrqzozjvkKZUKpd4GuKfeI83LzbItqYoPOw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725479636;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=RALGbj6gZTd64GwIuwsjvOhQuu4N3uw+VFGGvWGiCDY=;
b=uYk+dx/hjmdYuTWx1LGKJSyLnBrFZEZ7EMfujsmXnA8CjFqTQuI/GM+9uOwZf1QbOqQ96A
eMdBtWvp6WDADihFptA2Z4XknHZH1zaYXmbb0qs+GOwDhu08+K1eAVjYaW8lffkBvo6gbB
AC3CNZ2Exi3tuctRv7J1nGztgGmr1x4yZZ1X5bCY4FRcX630pdjMw6Ez4d84LiewdZF83R
wnu4lXR41eLA7MR0sCzBbvKi0JSlFtJN5JOKdZyL9OWPYVEVEivEGh6hHdYvoU3NyeRi5M
z5UDSE4krlQrMc/UglX4kjgoXXdfAFsDN2NMLCGePOGfeJlMbbxzo6NjNtUHvg==
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 4WzY8g6wQ3zd8Y;
Wed, 4 Sep 2024 19:53: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 484Jrtej028811;
Wed, 4 Sep 2024 19:53:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Jrt5E028808;
Wed, 4 Sep 2024 19:53:55 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 19:53:55 GMT
Message-Id: <202409041953.484Jrt5E028808@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 77eb877714d6 - main - grep: Fix various bugs in
recursive tree handling
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 77eb877714d69ee0279d70eb3331920fba90db95
Auto-Submitted: auto-generated
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=77eb877714d69ee0279d70eb3331920fba90db95
commit 77eb877714d69ee0279d70eb3331920fba90db95
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-09-04 19:53:17 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-09-04 19:53:17 +0000
grep: Fix various bugs in recursive tree handling
The -OpS options were effectively ignored due to a collection of
bugs in the use of fts(3):
- fts_open(3) requires one of FTS_PHYSICAL or FTS_LOGICAL to be
specified, but in the -O case, only FTS_COMFOLLOW was given. Fix
this to use FTS_COMFOLLOW | FTS_PHYSICAL.
- The switch on the entry type returned by fts_read() did not check
for symbolic links, so symbolic links fell into the default case and
were always passed to procfile() even when -p was given. Fix this
by adding cases in the switch statement to explicitly ignore FTS_SL.
- FTS_NOSTAT was passed to fts_open(), so fts_open() couldn't detect
symbolic links when FTS_PHYSICAL was passed, instead both regular
files and symbolic links were returned as FTS_NSOK entries. Fix
by only using FTS_NOSTAT with FTS_LOGICAL.
While here, fix a few other nits:
- Treat FTS_NS as an error like FTS_DNR and FTS_ERR.
- Just ignore FTS_DP. The logic to skip descending into skipped
directories is only relevant when a directory is first visited, not
after the directory has been visited.
- Use warnc instead of warnx + strerror.
PR: 280676
Reviewed by: kevans
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D46255
---
usr.bin/grep/util.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 936abc41b3ef..4e1c44b442f2 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -136,16 +136,16 @@ grep_tree(char **argv)
/* This switch effectively initializes 'fts_flags' */
switch(linkbehave) {
case LINK_EXPLICIT:
- fts_flags = FTS_COMFOLLOW;
+ fts_flags = FTS_COMFOLLOW | FTS_PHYSICAL;
break;
case LINK_SKIP:
fts_flags = FTS_PHYSICAL;
break;
default:
- fts_flags = FTS_LOGICAL;
+ fts_flags = FTS_LOGICAL | FTS_NOSTAT;
}
- fts_flags |= FTS_NOSTAT | FTS_NOCHDIR;
+ fts_flags |= FTS_NOCHDIR;
fts = fts_open((argv[0] == NULL) ?
__DECONST(char * const *, wd) : argv, fts_flags, NULL);
@@ -154,15 +154,13 @@ grep_tree(char **argv)
while (errno = 0, (p = fts_read(fts)) != NULL) {
switch (p->fts_info) {
case FTS_DNR:
- /* FALLTHROUGH */
case FTS_ERR:
+ case FTS_NS:
file_err = true;
if(!sflag)
- warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
+ warnc(p->fts_errno, "%s", p->fts_path);
break;
case FTS_D:
- /* FALLTHROUGH */
- case FTS_DP:
if (dexclude || dinclude)
if (!dir_matching(p->fts_name) ||
!dir_matching(p->fts_path))
@@ -173,6 +171,17 @@ grep_tree(char **argv)
warnx("warning: %s: recursive directory loop",
p->fts_path);
break;
+ case FTS_DP:
+ break;
+ case FTS_SL:
+ /*
+ * Skip symlinks for LINK_EXPLICIT and
+ * LINK_SKIP. Note that due to FTS_COMFOLLOW,
+ * symlinks on the command line are followed
+ * for LINK_EXPLICIT and not reported as
+ * symlinks.
+ */
+ break;
default:
/* Check for file exclusion/inclusion */
ok = true;
From nobody Wed Sep 4 19:53:57 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzY8j1jhNz5VGn1;
Wed, 04 Sep 2024 19:53:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzY8j19g7z47wj;
Wed, 4 Sep 2024 19:53:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725479637;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=zor90OcuWJX0NMDqyagalpYc8a/eJ3kfaD3XOvDRaJA=;
b=XJO+PTHHq5HcLrdfm2i1w2UUbU2fYW5vx6nJ9J51hm6pVuQoupb2xyu74zz6N4TF19LK6W
JgQgga8ZTnsFeuLqVbPAdynciFNJViW1JBn3plMhJ86xSutOqmZ112f86i6eoTAvbwfjmd
7lSws08phwrU2B//WwsLjSjDwO3d/W7gXHxzHzSC9733zuNGIL3tR38kSxxFQgUTuEpGbQ
G7GOQ/CHEsYNTg41bo2Tyq6M29A/hSAlffeXOyZU6+oLzxNczBuucqwNi4XbVZ0orq9Jzh
SqKHeJFZA4hK+UbMNwhPYGpj5PBH2klDyUmDERo8IJQfLNrJt1+bWNXCqSZxnw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725479637; a=rsa-sha256; cv=none;
b=X/IKFBCoKg1TrsFZNLg/UdaogTuIwyAHbIHDD6SNsgfJmYsaVQd5wPYM1M9zQVU3c5qsF1
V+c4UOICWcW86DMHDeucV/A0PA7ZuCzZIJ1DusCxC4uqbklODXpabIdPx+O3NGa/yeVowl
Fd2EYpExEiQu7bsVtIkiWBn6jaIQcMRw4EsWL3G/5RVQ83ugxHTqC1THPxz6BOz/zWT8lo
WpGiV0uU6H+vn7sml08/OMSvVOZ9XtRg8FzS9cELyZlOiJ8egkVN+KSxn5knFN46Idh3ZN
dFhoM6ZGD1KGhEEmAspnrc9wRrWEeHeWoi85a8zld5rrKOuzWCGBCSZ/xjubsA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725479637;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=zor90OcuWJX0NMDqyagalpYc8a/eJ3kfaD3XOvDRaJA=;
b=TXVODpwrS4RR0F/WzWpyzMSmHpRDHE7iTwojzOE2QdwDxQE7NWmpoABwiQZyWuAjIJJLpV
grTNypMLGiyRqhJeNVDfcLpHGkETlfSdIFY08Wyzgrkt/3Hke5LmqvrCQ1GwATB0p+u4dy
z/HyjEJWNW6Ch/NPPkLqK3So8pufOVD8HmHDpIBAapPbeP+CNFs5j/9wGtZECVFdlusYLH
2qiGCrlQkw8wPuQ3mQ16f6DcqCdu2q5soAxz5pY8Xsk7TyPCOWyCk7wsHpGPy2GPyTuhZ3
QJH8k7kVmSliG5Fs2dcVH0T9QGYzw9vRGzqEH+1o1ot22lA6JyRZsYWFBIDqog==
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 4WzY8j0n78zf2n;
Wed, 4 Sep 2024 19:53: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 484JrvHd028861;
Wed, 4 Sep 2024 19:53:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484JrvPY028856;
Wed, 4 Sep 2024 19:53:57 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 19:53:57 GMT
Message-Id: <202409041953.484JrvPY028856@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: fc12c191c087 - main - grep: Default to -p instead of
-S.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: fc12c191c087b63e1204fee210ba76082ea40b96
Auto-Submitted: auto-generated
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=fc12c191c087b63e1204fee210ba76082ea40b96
commit fc12c191c087b63e1204fee210ba76082ea40b96
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-09-04 19:53:22 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-09-04 19:53:22 +0000
grep: Default to -p instead of -S.
This matches the documented behavior in the manpage as well as the
default behavior on macOS.
PR: 280676
Reported by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Reviewed by: kevans
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D46256
---
usr.bin/grep/grep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 9f960f74dbb6..feaf17d7c1e1 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -112,7 +112,7 @@ int binbehave = BINFILE_BIN; /* -aIU: handling of binary files */
int filebehave = FILE_STDIO;
int devbehave = DEV_READ; /* -D: handling of devices */
int dirbehave = DIR_READ; /* -dRr: handling of directories */
-int linkbehave = LINK_READ; /* -OpS: handling of symlinks */
+int linkbehave = LINK_SKIP; /* -OpS: handling of symlinks */
bool dexclude, dinclude; /* --exclude-dir and --include-dir */
bool fexclude, finclude; /* --exclude and --include */
From nobody Wed Sep 4 21:50:37 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblL0z9sz5VRyv;
Wed, 04 Sep 2024 21:50: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 4WzblL0Qbpz4gs1;
Wed, 4 Sep 2024 21:50:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486638;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=t0Nj/MP5tohjVt3tT3AhCk71rud/RrHsEQX09n7dvmg=;
b=eyg1BznvBeJjNprhaQo0Ou7ea4CfRsDTlgAkFzV2r7E1eQiFO88VJaB+LTzkNfU0ad98Wg
UWRi4OobkSGHekVFlci7ojUmpY7AKz7SNzSYHnEt3IMDvEUBWYbU+Rz6fnLyjNFKd53FVb
Z+W485MOaoMsCN1IAcygR6rhaAepnFFuhO10J17I2dSGlmB+EGNMH8bB72nA1YMVZ62ddk
gb6K1oL0/6/FRAwwWcd/MNK/sYThYEayoVrQu2Z1MXGanBaeOhPR5RRyP42sKsElgtBjeb
uITaOK3RlHizeUc5N5FO1SVAP+GR3sul+WceXqzMj3L0MC37GcMVtUUgHY6f/A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486638; a=rsa-sha256; cv=none;
b=UVC25F9SJE060mZtMvnZvVMCHejhzDDO8bh8VATcWPevq9cAZvExv0UM0hc2Gno+f4Myf4
e80WkpI1vKtMCP3JtQe4+taESoL4RANCT6IpRDF9JmundiHvO/LVhWqlr6oG6KpVArheGP
lLFfhIBikDCuCbuf2/uAI33KLO4C1SsgbRbYn9RDXZv7Stycmm+3jOs+7uA5H172JDH95y
czj3jv3AAYUQbNi/k1shqGsKOK3xOCL+EdLZgm6+YEnCjfUWili0110R0OdHxlqLaUedWs
/t/yqJu8y2DdSs8mPFOU9vWpIRs2okwc2MDtWxfC1Z3canduHqzI0lKNhTDEMQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486638;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=t0Nj/MP5tohjVt3tT3AhCk71rud/RrHsEQX09n7dvmg=;
b=ugnFj4dNcMW7ZJwar7xSpmx7rL3K8Eq0hpk0EMoHT5UfxTr1GK0mwUlmdNUCtiU61Uno5I
5KFDIif+g2AdGF9vHAWDOUYoWYgvOTiU2iUJDv/reHYhP951JDTTH5a4nYiUeSgJBB3/f/
5vKxJdyLFoVAKw4HHo57cNgAuB6tApAOadAQRGnE3BCloRvw06I2Wq50reppatPsW5c5Hd
E8nU0M1H2KyGudWVq3TyjhR4WU+OIh8aP8fo59Ne5mPGAz4VMuA71v9ebLad8ZPaynlRuo
NE2aGeAb7gJYkzh1r7Z4riqgcPcCeQZTBmkyqfQb5ImEukB9uuD/UZLNg7uGfg==
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 4WzblL01zPzhN7;
Wed, 4 Sep 2024 21:50: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 484LobPr031387;
Wed, 4 Sep 2024 21:50:37 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LobGE031384;
Wed, 4 Sep 2024 21:50:37 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:37 GMT
Message-Id: <202409042150.484LobGE031384@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: c47229ae6676 - main - Intel DMAR: improve X2X macros
to fix failures in certain syntax contexts
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: c47229ae66764fec85477e89d4f3861ac29abf48
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=c47229ae66764fec85477e89d4f3861ac29abf48
commit c47229ae66764fec85477e89d4f3861ac29abf48
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-06 00:52:39 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:18 +0000
Intel DMAR: improve X2X macros to fix failures in certain syntax contexts
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_dmar.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index b7f0300e16f0..9eb87bcfdc35 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -87,15 +87,15 @@ struct dmar_ctx {
#define DMAR_DOMAIN_UNLOCK(dom) mtx_unlock(&(dom)->iodom.lock)
#define DMAR_DOMAIN_ASSERT_LOCKED(dom) mtx_assert(&(dom)->iodom.lock, MA_OWNED)
-#define DMAR2IOMMU(dmar) &((dmar)->iommu)
+#define DMAR2IOMMU(dmar) (&((dmar)->iommu))
#define IOMMU2DMAR(dmar) \
__containerof((dmar), struct dmar_unit, iommu)
-#define DOM2IODOM(domain) &((domain)->iodom)
+#define DOM2IODOM(domain) (&((domain)->iodom))
#define IODOM2DOM(domain) \
__containerof((domain), struct dmar_domain, iodom)
-#define CTX2IOCTX(ctx) &((ctx)->context)
+#define CTX2IOCTX(ctx) (&((ctx)->context))
#define IOCTX2CTX(ctx) \
__containerof((ctx), struct dmar_ctx, context)
From nobody Wed Sep 4 21:50:39 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblM2ZqNz5VRmG;
Wed, 04 Sep 2024 21:50: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 4WzblM1Ngzz4gts;
Wed, 4 Sep 2024 21:50:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486639;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=7Vpfvu93QbeNVrzQepgLS6K2rwgAfDZ+qfIHwAg1w9c=;
b=BJnDHsfnw0ZjaZFtN+LIaLb2IfUQAlDDMUDxv3rcejKY9z+Ii8gZfx9BUHaIBaVg8FJfRE
TnoQgnsThP7yU9D5hipF9P0ag+Pk0qnBVz1Hzv6Q6KwHihM1jNUpJXVpTJZFSVU1Pk3Usu
NKE9rTFSiHrESUvmpVUZP6zyQHRZ/IsHXx/keNG7KCBdowITPTKLzpofdZJrEJAZjFPz8Y
oAKPsz6f6RrNMyBj8ytj7JLGmoVYGkTPl5NA2Yea1H0MpIMwslNRXvIEEAoc+SpEesiIKG
2gpXnyJKvMBC3F6EJsu97WUpBlSK9Oenf2Uiu2e/aK1HYkaz6GnRV8eg0Qxkdw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486639; a=rsa-sha256; cv=none;
b=OrgHHVGAHDsm7yiXMIOhhMckWjWsV2FsQPzg9SBhSMUovnzwZEHryVTrq9iaBJuqkmikUX
Hvc6QAsCBOXKRql+MW9nEb7mzih4SW+sF70fEGMj0ImwgV6TeyC1jVzJh008j8zk/VqHvA
IcQiB3AYyEfuiXVQp7BT+CoPBOn4zzZcXxgC+A2FK0Y9dy+rxz3ZRC20mEh91nb1cSKFW4
Ih9H1IPk43OnF9HXV04EfrnIU99p3ayWxbG2giXkzDTIFLdTEvSYQzCVVs/1DcjBnQ/AtO
GtPHtICfwB60Gx0ULtH945RxPu3VCdJ1GvuJGXb9p+tA8RmnSo/oDu5dj6u/6Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486639;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=7Vpfvu93QbeNVrzQepgLS6K2rwgAfDZ+qfIHwAg1w9c=;
b=mkLrJTMTFMczcrw32lrkmRGM/fRtFCgVDBemon5PywEMJLNs1jQmrd5IriGh7riKV1ueYz
zOVWe8OYrZC/IDE2TCcxcMzfHduiwUkmm4YtpRzaSwaQ11VGXiphJyApnHU+T5xMil6Zh7
nTuStk01H1+W4uUxwFFFNw25w3PgznMbVrjz2bUeZKblcrzPgrqum+tJMY0epEaJGsK/C8
3M9sg/t1ryow+GD3/E8ywsVrb811w0t3VDsNppOLrwPJPfDj8cwCGJkXuQ683vhUk3ezTw
bGVaZEqy/1v64rC/MM/c2Ew4fbGVpBY7IZVXmOzzDReSo/cwqzaRuQj6YAhXxQ==
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 4WzblM1182zhN8;
Wed, 4 Sep 2024 21:50: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 484LodEg031438;
Wed, 4 Sep 2024 21:50:39 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LodTe031435;
Wed, 4 Sep 2024 21:50:39 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:39 GMT
Message-Id: <202409042150.484LodTe031435@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 0fcbf4944cb9 - main - DMAR: use DMAR2IOMMU() for
DMAR_LOCK() and related macros
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 0fcbf4944cb9865c6db0154c2f479fdd05b115c1
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=0fcbf4944cb9865c6db0154c2f479fdd05b115c1
commit 0fcbf4944cb9865c6db0154c2f479fdd05b115c1
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-06 00:39:52 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:18 +0000
DMAR: use DMAR2IOMMU() for DMAR_LOCK() and related macros
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_dmar.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index 9eb87bcfdc35..4ae005238074 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -205,9 +205,9 @@ struct dmar_unit {
struct taskqueue *qi_taskqueue;
};
-#define DMAR_LOCK(dmar) mtx_lock(&(dmar)->iommu.lock)
-#define DMAR_UNLOCK(dmar) mtx_unlock(&(dmar)->iommu.lock)
-#define DMAR_ASSERT_LOCKED(dmar) mtx_assert(&(dmar)->iommu.lock, MA_OWNED)
+#define DMAR_LOCK(dmar) mtx_lock(&DMAR2IOMMU(dmar)->lock)
+#define DMAR_UNLOCK(dmar) mtx_unlock(&DMAR2IOMMU(dmar)->lock)
+#define DMAR_ASSERT_LOCKED(dmar) mtx_assert(&DMAR2IOMMU(dmar)->lock, MA_OWNED)
#define DMAR_FAULT_LOCK(dmar) mtx_lock_spin(&(dmar)->fault_lock)
#define DMAR_FAULT_UNLOCK(dmar) mtx_unlock_spin(&(dmar)->fault_lock)
From nobody Wed Sep 4 21:50:40 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblN5Bqxz5VRrX;
Wed, 04 Sep 2024 21:50: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 4WzblN2Zvtz4gkB;
Wed, 4 Sep 2024 21:50:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486640;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0EtVYRU7tV250Qp//VmJf+P0mkGk02yeQibNlcC9FqY=;
b=X4iIG7a5EmVrOLzh1ubZYeicALYKUtFMq9BCQBQDbXCbdxfLKWbo6vJt0xY8NDILJc5hld
1n1/Fy5+RipcqbPGrRXmkbdddYOeoHCeEOq0yh4zuOoRdto7EuiVTpDjuRugC35kkg1CWp
CyQROk7yXIlZW55yGksXxmMIJKEpTQrAe4VyL4qDsgsIsoMqrM5xUR7GCvkcHdfXy3jtsw
m3kyU2vrC7z3vLqnCEWd/cEdjtfy3ELdoBjXo76/9SNdQi8J6KqI3PbGT61hLgsJC2mpjM
KSsZKTnXF1BgXXk2gAjs1SCugyQ7S5zHGCp43H4nHoI9wFtqmT4C2pPQFrN3CQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486640; a=rsa-sha256; cv=none;
b=BZL2vkILh05SlVY4daSjHu+JQ5hZUI8ViNcjHtztolHBU0dK861mQdfYFqjCJLud2JyHT0
iYzlzpEKm5BhANxd9hedG6QlmOUBSNBpTIPAglki4IDPbqsQVlmtOwTB3B4DNP+htNDdgC
Vo1tajj4TA+yjXcLrbTCubP+fT0GL7SDRDsEYxQhpYvqIUMbSF1qEcM8Tgu+OZKH4ZsXVl
VDRdSLHqTKPx2TW0z/ca7kKAMGDZZpuLT/Z2ww5jRE84tBmXXyXpAVjcsWcl0AVLifDItj
ao79wQQOKgzKxfJx2VJhSbExaxYjiWTF8ij+ZVxTHgTu/zO06B8c2VQxEDUG6g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486640;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0EtVYRU7tV250Qp//VmJf+P0mkGk02yeQibNlcC9FqY=;
b=H9RoTI8+ApuZmKAay1/CGIFlChbkb5hBrpHh417XHbjd2yNtxeCweBKJRDhRMBSi1BWTS1
hoIyoaxg9y4ixsY8qiBQ/gNlKYWPHdl2ZD+cjeCpYQACDRn5f0/2bfBv9AyFnL0KoeKRdB
Ioe0YYRoS0LYkDloIes0vaPN96Q5Fj2Uj0zpl73i8kqNX3WP9+5JwSwnXCjLWT3rwLi+lA
qACwQyaEprnjVoQ3XQWUYjcbyJm6rh/fCQjAO8lulPWB2OiR1LgRlRVHv0S2XNjsxT303w
rmB/r+iIlIHsPeqPYcDzhgEYj/ifO2t26JcbWaNy+2gudgQG93vLIwcuYf9syw==
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 4WzblN24qmzhFQ;
Wed, 4 Sep 2024 21:50:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484Loehl031496;
Wed, 4 Sep 2024 21:50:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LoeAq031493;
Wed, 4 Sep 2024 21:50:40 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:40 GMT
Message-Id: <202409042150.484LoeAq031493@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 65b133e5d292 - main - x86: allow to have more than
one kind of IOMMU
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 65b133e5d292686fe20f11dd39b53812226a8684
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=65b133e5d292686fe20f11dd39b53812226a8684
commit 65b133e5d292686fe20f11dd39b53812226a8684
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-05-29 14:38:14 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:18 +0000
x86: allow to have more than one kind of IOMMU
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_ctx.c | 22 +++++------
sys/x86/iommu/intel_dmar.h | 18 ++++++++-
sys/x86/iommu/intel_drv.c | 30 ++++++++++++--
sys/x86/iommu/intel_intrmap.c | 10 ++---
sys/x86/iommu/iommu_utils.c | 91 ++++++++++++++++++++++++++++++++++++++++++-
sys/x86/iommu/x86_iommu.h | 25 +++++++++++-
6 files changed, 173 insertions(+), 23 deletions(-)
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index baee0109e5a9..a3ff35dc527e 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -75,6 +75,9 @@ static void dmar_unref_domain_locked(struct dmar_unit *dmar,
struct dmar_domain *domain);
static void dmar_domain_destroy(struct dmar_domain *domain);
+static void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx);
+static void dmar_free_ctx(struct dmar_ctx *ctx);
+
static void
dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus)
{
@@ -745,7 +748,7 @@ dmar_unref_domain_locked(struct dmar_unit *dmar, struct dmar_domain *domain)
dmar_domain_destroy(domain);
}
-void
+static void
dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx)
{
struct sf_buf *sf;
@@ -819,7 +822,7 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx)
TD_PINNED_ASSERT;
}
-void
+static void
dmar_free_ctx(struct dmar_ctx *ctx)
{
struct dmar_unit *dmar;
@@ -867,7 +870,7 @@ dmar_domain_free_entry(struct iommu_map_entry *entry, bool free)
* the entry's dmamap_link field.
*/
void
-iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free,
+dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free,
bool cansleep)
{
struct dmar_domain *domain;
@@ -909,7 +912,7 @@ dmar_domain_unload_emit_wait(struct dmar_domain *domain,
}
void
-iommu_domain_unload(struct iommu_domain *iodom,
+dmar_domain_unload(struct iommu_domain *iodom,
struct iommu_map_entries_tailq *entries, bool cansleep)
{
struct dmar_domain *domain;
@@ -947,37 +950,34 @@ iommu_domain_unload(struct iommu_domain *iodom,
}
struct iommu_ctx *
-iommu_get_ctx(struct iommu_unit *iommu, device_t dev, uint16_t rid,
+dmar_get_ctx(struct iommu_unit *iommu, device_t dev, uint16_t rid,
bool id_mapped, bool rmrr_init)
{
struct dmar_unit *dmar;
struct dmar_ctx *ret;
dmar = IOMMU2DMAR(iommu);
-
ret = dmar_get_ctx_for_dev(dmar, dev, rid, id_mapped, rmrr_init);
-
return (CTX2IOCTX(ret));
}
void
-iommu_free_ctx_locked(struct iommu_unit *iommu, struct iommu_ctx *context)
+dmar_free_ctx_locked_method(struct iommu_unit *iommu,
+ struct iommu_ctx *context)
{
struct dmar_unit *dmar;
struct dmar_ctx *ctx;
dmar = IOMMU2DMAR(iommu);
ctx = IOCTX2CTX(context);
-
dmar_free_ctx_locked(dmar, ctx);
}
void
-iommu_free_ctx(struct iommu_ctx *context)
+dmar_free_ctx_method(struct iommu_ctx *context)
{
struct dmar_ctx *ctx;
ctx = IOCTX2CTX(context);
-
dmar_free_ctx(ctx);
}
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index 4ae005238074..0ede955e12b9 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -293,10 +293,17 @@ struct dmar_ctx *dmar_get_ctx_for_devpath(struct dmar_unit *dmar, uint16_t rid,
int dev_domain, int dev_busno, const void *dev_path, int dev_path_len,
bool id_mapped, bool rmrr_init);
int dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx);
-void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx);
-void dmar_free_ctx(struct dmar_ctx *ctx);
+void dmar_free_ctx_locked_method(struct iommu_unit *dmar,
+ struct iommu_ctx *ctx);
+void dmar_free_ctx_method(struct iommu_ctx *ctx);
struct dmar_ctx *dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid);
+struct iommu_ctx *dmar_get_ctx(struct iommu_unit *iommu, device_t dev,
+ uint16_t rid, bool id_mapped, bool rmrr_init);
void dmar_domain_free_entry(struct iommu_map_entry *entry, bool free);
+void dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free,
+ bool cansleep);
+void dmar_domain_unload(struct iommu_domain *iodom,
+ struct iommu_map_entries_tailq *entries, bool cansleep);
void dmar_dev_parse_rmrr(struct dmar_domain *domain, int dev_domain,
int dev_busno, const void *dev_path, int dev_path_len,
@@ -308,6 +315,13 @@ void dmar_quirks_pre_use(struct iommu_unit *dmar);
int dmar_init_irt(struct dmar_unit *unit);
void dmar_fini_irt(struct dmar_unit *unit);
+int dmar_alloc_msi_intr(device_t src, u_int *cookies, u_int count);
+int dmar_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
+ uint64_t *addr, uint32_t *data);
+int dmar_unmap_msi_intr(device_t src, u_int cookie);
+int dmar_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
+ bool activehi, int irq, u_int *cookie, uint32_t *hi, uint32_t *lo);
+int dmar_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie);
extern int haw;
extern int dmar_batch_coalesce;
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
index 636534173715..79350358cced 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -64,6 +64,8 @@
#include <dev/pci/pcivar.h>
#include <machine/bus.h>
#include <machine/pci_cfgreg.h>
+#include <machine/md_var.h>
+#include <machine/cputypes.h>
#include <x86/include/busdma_impl.h>
#include <dev/iommu/busdma_iommu.h>
#include <x86/iommu/intel_reg.h>
@@ -1357,12 +1359,34 @@ DB_SHOW_ALL_COMMAND(dmars, db_show_all_dmars)
}
#endif
-struct iommu_unit *
-iommu_find(device_t dev, bool verbose)
+static struct iommu_unit *
+dmar_find_method(device_t dev, bool verbose)
{
struct dmar_unit *dmar;
dmar = dmar_find(dev, verbose);
-
return (&dmar->iommu);
}
+
+static struct x86_iommu dmar_x86_iommu = {
+ .domain_unload_entry = dmar_domain_unload_entry,
+ .domain_unload = dmar_domain_unload,
+ .get_ctx = dmar_get_ctx,
+ .free_ctx_locked = dmar_free_ctx_locked_method,
+ .free_ctx = dmar_free_ctx_method,
+ .find = dmar_find_method,
+ .alloc_msi_intr = dmar_alloc_msi_intr,
+ .map_msi_intr = dmar_map_msi_intr,
+ .unmap_msi_intr = dmar_unmap_msi_intr,
+ .map_ioapic_intr = dmar_map_ioapic_intr,
+ .unmap_ioapic_intr = dmar_unmap_ioapic_intr,
+};
+
+static void
+x86_iommu_set_intel(void *arg __unused)
+{
+ if (cpu_vendor_id == CPU_VENDOR_INTEL)
+ set_x86_iommu(&dmar_x86_iommu);
+}
+
+SYSINIT(x86_iommu, SI_SUB_TUNABLES, SI_ORDER_ANY, x86_iommu_set_intel, NULL);
diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c
index 22fd51bc8be9..a6979a9d2501 100644
--- a/sys/x86/iommu/intel_intrmap.c
+++ b/sys/x86/iommu/intel_intrmap.c
@@ -65,7 +65,7 @@ static void dmar_ir_program_irte(struct dmar_unit *unit, u_int idx,
static int dmar_ir_free_irte(struct dmar_unit *unit, u_int cookie);
int
-iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
+dmar_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
{
struct dmar_unit *unit;
vmem_addr_t vmem_res;
@@ -93,7 +93,7 @@ iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
}
int
-iommu_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
+dmar_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
uint64_t *addr, uint32_t *data)
{
struct dmar_unit *unit;
@@ -139,7 +139,7 @@ iommu_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
}
int
-iommu_unmap_msi_intr(device_t src, u_int cookie)
+dmar_unmap_msi_intr(device_t src, u_int cookie)
{
struct dmar_unit *unit;
@@ -150,7 +150,7 @@ iommu_unmap_msi_intr(device_t src, u_int cookie)
}
int
-iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
+dmar_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
bool activehi, int irq, u_int *cookie, uint32_t *hi, uint32_t *lo)
{
struct dmar_unit *unit;
@@ -213,7 +213,7 @@ iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
}
int
-iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
+dmar_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
{
struct dmar_unit *unit;
u_int idx;
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index ffea1cc1a190..ea2c0358e072 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -1,7 +1,7 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
- * Copyright (c) 2013, 2014 The FreeBSD Foundation
+ * Copyright (c) 2013, 2014, 2024 The FreeBSD Foundation
*
* This software was developed by Konstantin Belousov <kib@FreeBSD.org>
* under sponsorship from the FreeBSD Foundation.
@@ -50,6 +50,7 @@
#include <dev/iommu/busdma_iommu.h>
#include <dev/iommu/iommu.h>
#include <x86/iommu/x86_iommu.h>
+#include <x86/iommu/iommu_intrmap.h>
vm_page_t
iommu_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags)
@@ -162,3 +163,91 @@ SYSCTL_NODE(_hw_iommu, OID_AUTO, dmar, CTLFLAG_RD | CTLFLAG_MPSAFE,
SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD,
&iommu_tbl_pagecnt, 0,
"Count of pages used for DMAR pagetables");
+
+static struct x86_iommu *x86_iommu;
+
+void
+set_x86_iommu(struct x86_iommu *x)
+{
+ MPASS(x86_iommu == NULL);
+ x86_iommu = x;
+}
+
+struct x86_iommu *
+get_x86_iommu(void)
+{
+ return (x86_iommu);
+}
+
+void
+iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free,
+ bool cansleep)
+{
+ x86_iommu->domain_unload_entry(entry, free, cansleep);
+}
+
+void
+iommu_domain_unload(struct iommu_domain *iodom,
+ struct iommu_map_entries_tailq *entries, bool cansleep)
+{
+ x86_iommu->domain_unload(iodom, entries, cansleep);
+}
+
+struct iommu_ctx *
+iommu_get_ctx(struct iommu_unit *iommu, device_t dev, uint16_t rid,
+ bool id_mapped, bool rmrr_init)
+{
+ return (x86_iommu->get_ctx(iommu, dev, rid, id_mapped, rmrr_init));
+}
+
+void
+iommu_free_ctx_locked(struct iommu_unit *iommu, struct iommu_ctx *context)
+{
+ x86_iommu->free_ctx_locked(iommu, context);
+}
+
+void
+iommu_free_ctx(struct iommu_ctx *context)
+{
+ x86_iommu->free_ctx(context);
+}
+
+struct iommu_unit *
+iommu_find(device_t dev, bool verbose)
+{
+ return (x86_iommu->find(dev, verbose));
+}
+
+int
+iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
+{
+ return (x86_iommu->alloc_msi_intr(src, cookies, count));
+}
+
+int
+iommu_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
+ uint64_t *addr, uint32_t *data)
+{
+ return (x86_iommu->map_msi_intr(src, cpu, vector, cookie,
+ addr, data));
+}
+
+int
+iommu_unmap_msi_intr(device_t src, u_int cookie)
+{
+ return (x86_iommu->unmap_msi_intr(src, cookie));
+}
+
+int
+iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
+ bool activehi, int irq, u_int *cookie, uint32_t *hi, uint32_t *lo)
+{
+ return (x86_iommu->map_ioapic_intr(ioapic_id, cpu, vector, edge,
+ activehi, irq, cookie, hi, lo));
+}
+
+int
+iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
+{
+ return (x86_iommu->unmap_ioapic_intr(ioapic_id, cookie));
+}
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index 3789586f1eaf..8c908964acd0 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -1,7 +1,7 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
- * Copyright (c) 2013-2015 The FreeBSD Foundation
+ * Copyright (c) 2013-2015, 2024 The FreeBSD Foundation
*
* This software was developed by Konstantin Belousov <kib@FreeBSD.org>
* under sponsorship from the FreeBSD Foundation.
@@ -59,4 +59,27 @@ extern int iommu_tbl_pagecnt;
SYSCTL_DECL(_hw_iommu);
SYSCTL_DECL(_hw_iommu_dmar);
+struct x86_iommu {
+ void (*domain_unload_entry)(struct iommu_map_entry *entry, bool free,
+ bool cansleep);
+ void (*domain_unload)(struct iommu_domain *iodom,
+ struct iommu_map_entries_tailq *entries, bool cansleep);
+ struct iommu_ctx *(*get_ctx)(struct iommu_unit *iommu,
+ device_t dev, uint16_t rid, bool id_mapped, bool rmrr_init);
+ void (*free_ctx_locked)(struct iommu_unit *iommu,
+ struct iommu_ctx *context);
+ void (*free_ctx)(struct iommu_ctx *context);
+ struct iommu_unit *(*find)(device_t dev, bool verbose);
+ int (*alloc_msi_intr)(device_t src, u_int *cookies, u_int count);
+ int (*map_msi_intr)(device_t src, u_int cpu, u_int vector,
+ u_int cookie, uint64_t *addr, uint32_t *data);
+ int (*unmap_msi_intr)(device_t src, u_int cookie);
+ int (*map_ioapic_intr)(u_int ioapic_id, u_int cpu, u_int vector,
+ bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
+ uint32_t *lo);
+ int (*unmap_ioapic_intr)(u_int ioapic_id, u_int *cookie);
+};
+void set_x86_iommu(struct x86_iommu *);
+struct x86_iommu *get_x86_iommu(void);
+
#endif
From nobody Wed Sep 4 21:50:41 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblP5lXFz5VRyy;
Wed, 04 Sep 2024 21:50:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzblP34gcz4gxP;
Wed, 4 Sep 2024 21:50:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486641;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=T0BLWscLdWpZB1MG8p1Y8v9u4O7AL0IaDOKBRZ5v2j8=;
b=Hh9f/Zo7pA+EPcaeGgM9M12LyurdestDCKNINEZKFxb0KEB3xGmtxYwY+CLbsRrNOnYMKi
VYk0vvPPlyIWn45wJW0+Qxii2TjnLvsQv8xN6IWy/kNzTdq2NsyYrtpFVgq7xdYN7yZ6la
0qGiwBSW4OBmmU46sDx7YjfZgjf0acDboU2pokycGk0I87PPvcRnFt3KXaez17chyqiY64
BS+R5VnwlSLwJNjpJWZYo5jHlHjLeAxV8t9+VuAIEEdr91to/4qDq+obUT6RMFuDXdKM66
zfYOGvtF4mV41/50W97IaFJJeVAXhovQ4tVB+HWdVhwaidF5zd5YsHJOGgfpXQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486641; a=rsa-sha256; cv=none;
b=r4JbZRU3qgnyXS6LVZeNaWXi3P5rhbzy6ThHSyG9bzu9L1q13F9M+ydisdJOdKHIFBOtn2
gI3xHkS5A+VjBmLFc6ZCN6fCEgO+loUYwuimyOwgtVTRZ1DFMeDQgKwv2148DJK+2F5VIj
0MRGD7OhphTLEdPUNd+0nlDYZeCfW2vHJUmpbOZ5ORKkhNAfRs7zfA/dJZjirzdI3hkGSj
wYtux+8I4FNdTEV113OnjRsw4Vyi1+Z2f3oUWEbRuoG4V8BIEN0nJzJ+TYz5VfKnf0rDAM
yY+s2f3Lnxd4HKZhZKFxJ+sbbQMTAPyl9soUFb8LpkvptFW6xN04GNI1aFleaw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486641;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=T0BLWscLdWpZB1MG8p1Y8v9u4O7AL0IaDOKBRZ5v2j8=;
b=exShKROvMl6cbTztxxNGLDooQNki20aFq5XwRP8feE8dqhrsCoxBsoADb3UoC9dL1P1UAO
Z5bBnu4CNAVpZUwI2l8yvkW9D1o2pJ746da6mLUGZ/1T75pQDEGryA5pB2Tatnv60PHWwU
xzd9PN78i+kH1geVpkwfDxw9HxXs9EDwVUQOgPJ38s3+JxPk4R8/yHMK4M6dhU2v9aKcjR
w+qkMHwl2PQnO02mDhe0VrbNXkkItvYvAKEhab21J/kpzQTMHLEFcrLfYaQk5IAuq2Rxcb
i3G4vBf1ynfnKi/VOpQitNtmv/dD/5nRyqcdtNYbmkLxMQeKcL+ZbnC9BkqPLg==
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 4WzblP2WpdzhYN;
Wed, 4 Sep 2024 21:50: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 484LofhZ031562;
Wed, 4 Sep 2024 21:50:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LofIi031559;
Wed, 4 Sep 2024 21:50:41 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:41 GMT
Message-Id: <202409042150.484LofIi031559@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: ad794e6d7d02 - main - x86 iommu: move DMAR-independent
parts of the qi code into common
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: ad794e6d7d02a11b01e721859e096efeb258a4d4
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=ad794e6d7d02a11b01e721859e096efeb258a4d4
commit ad794e6d7d02a11b01e721859e096efeb258a4d4
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-06 01:16:36 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:18 +0000
x86 iommu: move DMAR-independent parts of the qi code into common
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_ctx.c | 7 +-
sys/x86/iommu/intel_dmar.h | 42 +-----
sys/x86/iommu/intel_drv.c | 26 ++--
sys/x86/iommu/intel_qi.c | 330 ++++++++++++--------------------------------
sys/x86/iommu/iommu_utils.c | 234 ++++++++++++++++++++++++++++++-
sys/x86/iommu/x86_iommu.h | 72 ++++++++++
6 files changed, 413 insertions(+), 298 deletions(-)
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index a3ff35dc527e..03ef196c4cb0 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -887,10 +887,11 @@ dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free,
if (unit->qi_enabled) {
if (free) {
DMAR_LOCK(unit);
- dmar_qi_invalidate_locked(domain, entry, true);
+ iommu_qi_invalidate_locked(&domain->iodom, entry,
+ true);
DMAR_UNLOCK(unit);
} else {
- dmar_qi_invalidate_sync(domain, entry->start,
+ iommu_qi_invalidate_sync(&domain->iodom, entry->start,
entry->end - entry->start, cansleep);
dmar_domain_free_entry(entry, false);
}
@@ -943,7 +944,7 @@ dmar_domain_unload(struct iommu_domain *iodom,
DMAR_LOCK(unit);
while ((entry = TAILQ_FIRST(entries)) != NULL) {
TAILQ_REMOVE(entries, entry, dmamap_link);
- dmar_qi_invalidate_locked(domain, entry,
+ iommu_qi_invalidate_locked(&domain->iodom, entry,
dmar_domain_unload_emit_wait(domain, entry));
}
DMAR_UNLOCK(unit);
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index 0ede955e12b9..8a815d5cfca6 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -123,6 +123,7 @@ struct dmar_msi_data {
struct dmar_unit {
struct iommu_unit iommu;
+ struct x86_unit_common x86c;
uint16_t segment;
uint64_t base;
@@ -155,17 +156,6 @@ struct dmar_unit {
/* QI */
int qi_enabled;
- char *inv_queue;
- vm_size_t inv_queue_size;
- uint32_t inv_queue_avail;
- uint32_t inv_queue_tail;
- volatile uint32_t inv_waitd_seq_hw; /* hw writes there on wait
- descr completion */
- uint64_t inv_waitd_seq_hw_phys;
- uint32_t inv_waitd_seq; /* next sequence number to use for wait descr */
- u_int inv_waitd_gen; /* seq number generation AKA seq overflows */
- u_int inv_seq_waiters; /* count of waiters for seq */
- u_int inv_queue_full; /* informational counter */
/* IR */
int ir_enabled;
@@ -173,36 +163,6 @@ struct dmar_unit {
dmar_irte_t *irt;
u_int irte_cnt;
vmem_t *irtids;
-
- /*
- * Delayed freeing of map entries queue processing:
- *
- * tlb_flush_head and tlb_flush_tail are used to implement a FIFO
- * queue that supports concurrent dequeues and enqueues. However,
- * there can only be a single dequeuer (accessing tlb_flush_head) and
- * a single enqueuer (accessing tlb_flush_tail) at a time. Since the
- * unit's qi_task is the only dequeuer, it can access tlb_flush_head
- * without any locking. In contrast, there may be multiple enqueuers,
- * so the enqueuers acquire the iommu unit lock to serialize their
- * accesses to tlb_flush_tail.
- *
- * In this FIFO queue implementation, the key to enabling concurrent
- * dequeues and enqueues is that the dequeuer never needs to access
- * tlb_flush_tail and the enqueuer never needs to access
- * tlb_flush_head. In particular, tlb_flush_head and tlb_flush_tail
- * are never NULL, so neither a dequeuer nor an enqueuer ever needs to
- * update both. Instead, tlb_flush_head always points to a "zombie"
- * struct, which previously held the last dequeued item. Thus, the
- * zombie's next field actually points to the struct holding the first
- * item in the queue. When an item is dequeued, the current zombie is
- * finally freed, and the struct that held the just dequeued item
- * becomes the new zombie. When the queue is empty, tlb_flush_tail
- * also points to the zombie.
- */
- struct iommu_map_entry *tlb_flush_head;
- struct iommu_map_entry *tlb_flush_tail;
- struct task qi_task;
- struct taskqueue *qi_taskqueue;
};
#define DMAR_LOCK(dmar) mtx_lock(&DMAR2IOMMU(dmar)->lock)
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
index 79350358cced..9fa1b3f98dc6 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -1303,19 +1303,19 @@ dmar_print_one(int idx, bool show_domains, bool show_mappings)
"size 0x%jx\n"
" head 0x%x tail 0x%x avail 0x%x status 0x%x ctrl 0x%x\n"
" hw compl 0x%x@%p/phys@%jx next seq 0x%x gen 0x%x\n",
- (uintmax_t)unit->inv_queue,
+ (uintmax_t)unit->x86c.inv_queue,
(uintmax_t)dmar_read8(unit, DMAR_IQA_REG),
- (uintmax_t)unit->inv_queue_size,
+ (uintmax_t)unit->x86c.inv_queue_size,
dmar_read4(unit, DMAR_IQH_REG),
dmar_read4(unit, DMAR_IQT_REG),
- unit->inv_queue_avail,
+ unit->x86c.inv_queue_avail,
dmar_read4(unit, DMAR_ICS_REG),
dmar_read4(unit, DMAR_IECTL_REG),
- unit->inv_waitd_seq_hw,
- &unit->inv_waitd_seq_hw,
- (uintmax_t)unit->inv_waitd_seq_hw_phys,
- unit->inv_waitd_seq,
- unit->inv_waitd_gen);
+ unit->x86c.inv_waitd_seq_hw,
+ &unit->x86c.inv_waitd_seq_hw,
+ (uintmax_t)unit->x86c.inv_waitd_seq_hw_phys,
+ unit->x86c.inv_waitd_seq,
+ unit->x86c.inv_waitd_gen);
} else {
db_printf("qi is disabled\n");
}
@@ -1368,7 +1368,17 @@ dmar_find_method(device_t dev, bool verbose)
return (&dmar->iommu);
}
+static struct x86_unit_common *
+dmar_get_x86_common(struct iommu_unit *unit)
+{
+ struct dmar_unit *dmar;
+
+ dmar = IOMMU2DMAR(unit);
+ return (&dmar->x86c);
+}
+
static struct x86_iommu dmar_x86_iommu = {
+ .get_x86_common = dmar_get_x86_common,
.domain_unload_entry = dmar_domain_unload_entry,
.domain_unload = dmar_domain_unload,
.get_ctx = dmar_get_ctx,
diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c
index 590cbac9bcbd..a94fbb54e7f7 100644
--- a/sys/x86/iommu/intel_qi.c
+++ b/sys/x86/iommu/intel_qi.c
@@ -58,17 +58,6 @@
#include <x86/iommu/x86_iommu.h>
#include <x86/iommu/intel_dmar.h>
-static bool
-dmar_qi_seq_processed(const struct dmar_unit *unit,
- const struct iommu_qi_genseq *pseq)
-{
- u_int gen;
-
- gen = unit->inv_waitd_gen;
- return (pseq->gen < gen ||
- (pseq->gen == gen && pseq->seq <= unit->inv_waitd_seq_hw));
-}
-
static int
dmar_enable_qi(struct dmar_unit *unit)
{
@@ -96,32 +85,36 @@ dmar_disable_qi(struct dmar_unit *unit)
}
static void
-dmar_qi_advance_tail(struct dmar_unit *unit)
+dmar_qi_advance_tail(struct iommu_unit *iommu)
{
+ struct dmar_unit *unit;
+ unit = IOMMU2DMAR(iommu);
DMAR_ASSERT_LOCKED(unit);
- dmar_write4(unit, DMAR_IQT_REG, unit->inv_queue_tail);
+ dmar_write4(unit, DMAR_IQT_REG, unit->x86c.inv_queue_tail);
}
static void
-dmar_qi_ensure(struct dmar_unit *unit, int descr_count)
+dmar_qi_ensure(struct iommu_unit *iommu, int descr_count)
{
+ struct dmar_unit *unit;
uint32_t head;
int bytes;
+ unit = IOMMU2DMAR(iommu);
DMAR_ASSERT_LOCKED(unit);
bytes = descr_count << DMAR_IQ_DESCR_SZ_SHIFT;
for (;;) {
- if (bytes <= unit->inv_queue_avail)
+ if (bytes <= unit->x86c.inv_queue_avail)
break;
/* refill */
head = dmar_read4(unit, DMAR_IQH_REG);
head &= DMAR_IQH_MASK;
- unit->inv_queue_avail = head - unit->inv_queue_tail -
+ unit->x86c.inv_queue_avail = head - unit->x86c.inv_queue_tail -
DMAR_IQ_DESCR_SZ;
- if (head <= unit->inv_queue_tail)
- unit->inv_queue_avail += unit->inv_queue_size;
- if (bytes <= unit->inv_queue_avail)
+ if (head <= unit->x86c.inv_queue_tail)
+ unit->x86c.inv_queue_avail += unit->x86c.inv_queue_size;
+ if (bytes <= unit->x86c.inv_queue_avail)
break;
/*
@@ -134,11 +127,11 @@ dmar_qi_ensure(struct dmar_unit *unit, int descr_count)
* See dmar_qi_invalidate_locked() for a discussion
* about data race prevention.
*/
- dmar_qi_advance_tail(unit);
- unit->inv_queue_full++;
+ dmar_qi_advance_tail(DMAR2IOMMU(unit));
+ unit->x86c.inv_queue_full++;
cpu_spinwait();
}
- unit->inv_queue_avail -= bytes;
+ unit->x86c.inv_queue_avail -= bytes;
}
static void
@@ -146,162 +139,60 @@ dmar_qi_emit(struct dmar_unit *unit, uint64_t data1, uint64_t data2)
{
DMAR_ASSERT_LOCKED(unit);
- *(volatile uint64_t *)(unit->inv_queue + unit->inv_queue_tail) = data1;
- unit->inv_queue_tail += DMAR_IQ_DESCR_SZ / 2;
- KASSERT(unit->inv_queue_tail <= unit->inv_queue_size,
- ("tail overflow 0x%x 0x%jx", unit->inv_queue_tail,
- (uintmax_t)unit->inv_queue_size));
- unit->inv_queue_tail &= unit->inv_queue_size - 1;
- *(volatile uint64_t *)(unit->inv_queue + unit->inv_queue_tail) = data2;
- unit->inv_queue_tail += DMAR_IQ_DESCR_SZ / 2;
- KASSERT(unit->inv_queue_tail <= unit->inv_queue_size,
- ("tail overflow 0x%x 0x%jx", unit->inv_queue_tail,
- (uintmax_t)unit->inv_queue_size));
- unit->inv_queue_tail &= unit->inv_queue_size - 1;
+ *(volatile uint64_t *)(unit->x86c.inv_queue +
+ unit->x86c.inv_queue_tail) = data1;
+ unit->x86c.inv_queue_tail += DMAR_IQ_DESCR_SZ / 2;
+ KASSERT(unit->x86c.inv_queue_tail <= unit->x86c.inv_queue_size,
+ ("tail overflow 0x%x 0x%jx", unit->x86c.inv_queue_tail,
+ (uintmax_t)unit->x86c.inv_queue_size));
+ unit->x86c.inv_queue_tail &= unit->x86c.inv_queue_size - 1;
+ *(volatile uint64_t *)(unit->x86c.inv_queue +
+ unit->x86c.inv_queue_tail) = data2;
+ unit->x86c.inv_queue_tail += DMAR_IQ_DESCR_SZ / 2;
+ KASSERT(unit->x86c.inv_queue_tail <= unit->x86c.inv_queue_size,
+ ("tail overflow 0x%x 0x%jx", unit->x86c.inv_queue_tail,
+ (uintmax_t)unit->x86c.inv_queue_size));
+ unit->x86c.inv_queue_tail &= unit->x86c.inv_queue_size - 1;
}
static void
-dmar_qi_emit_wait_descr(struct dmar_unit *unit, uint32_t seq, bool intr,
+dmar_qi_emit_wait_descr(struct iommu_unit *iommu, uint32_t seq, bool intr,
bool memw, bool fence)
{
+ struct dmar_unit *unit;
+ unit = IOMMU2DMAR(iommu);
DMAR_ASSERT_LOCKED(unit);
dmar_qi_emit(unit, DMAR_IQ_DESCR_WAIT_ID |
(intr ? DMAR_IQ_DESCR_WAIT_IF : 0) |
(memw ? DMAR_IQ_DESCR_WAIT_SW : 0) |
(fence ? DMAR_IQ_DESCR_WAIT_FN : 0) |
(memw ? DMAR_IQ_DESCR_WAIT_SD(seq) : 0),
- memw ? unit->inv_waitd_seq_hw_phys : 0);
-}
-
-static void
-dmar_qi_emit_wait_seq(struct dmar_unit *unit, struct iommu_qi_genseq *pseq,
- bool emit_wait)
-{
- struct iommu_qi_genseq gsec;
- uint32_t seq;
-
- KASSERT(pseq != NULL, ("wait descriptor with no place for seq"));
- DMAR_ASSERT_LOCKED(unit);
- if (unit->inv_waitd_seq == 0xffffffff) {
- gsec.gen = unit->inv_waitd_gen;
- gsec.seq = unit->inv_waitd_seq;
- dmar_qi_ensure(unit, 1);
- dmar_qi_emit_wait_descr(unit, gsec.seq, false, true, false);
- dmar_qi_advance_tail(unit);
- while (!dmar_qi_seq_processed(unit, &gsec))
- cpu_spinwait();
- unit->inv_waitd_gen++;
- unit->inv_waitd_seq = 1;
- }
- seq = unit->inv_waitd_seq++;
- pseq->gen = unit->inv_waitd_gen;
- pseq->seq = seq;
- if (emit_wait) {
- dmar_qi_ensure(unit, 1);
- dmar_qi_emit_wait_descr(unit, seq, true, true, false);
- }
+ memw ? unit->x86c.inv_waitd_seq_hw_phys : 0);
}
-/*
- * To avoid missed wakeups, callers must increment the unit's waiters count
- * before advancing the tail past the wait descriptor.
- */
static void
-dmar_qi_wait_for_seq(struct dmar_unit *unit, const struct iommu_qi_genseq *gseq,
- bool nowait)
-{
-
- DMAR_ASSERT_LOCKED(unit);
- KASSERT(unit->inv_seq_waiters > 0, ("%s: no waiters", __func__));
- while (!dmar_qi_seq_processed(unit, gseq)) {
- if (cold || nowait) {
- cpu_spinwait();
- } else {
- msleep(&unit->inv_seq_waiters, &unit->iommu.lock, 0,
- "dmarse", hz);
- }
- }
- unit->inv_seq_waiters--;
-}
-
-static void
-dmar_qi_invalidate_emit(struct dmar_domain *domain, iommu_gaddr_t base,
+dmar_qi_invalidate_emit(struct iommu_domain *idomain, iommu_gaddr_t base,
iommu_gaddr_t size, struct iommu_qi_genseq *pseq, bool emit_wait)
{
struct dmar_unit *unit;
+ struct dmar_domain *domain;
iommu_gaddr_t isize;
int am;
+ domain = __containerof(idomain, struct dmar_domain, iodom);
unit = domain->dmar;
DMAR_ASSERT_LOCKED(unit);
for (; size > 0; base += isize, size -= isize) {
am = calc_am(unit, base, size, &isize);
- dmar_qi_ensure(unit, 1);
+ dmar_qi_ensure(DMAR2IOMMU(unit), 1);
dmar_qi_emit(unit, DMAR_IQ_DESCR_IOTLB_INV |
DMAR_IQ_DESCR_IOTLB_PAGE | DMAR_IQ_DESCR_IOTLB_DW |
DMAR_IQ_DESCR_IOTLB_DR |
DMAR_IQ_DESCR_IOTLB_DID(domain->domain),
base | am);
}
- dmar_qi_emit_wait_seq(unit, pseq, emit_wait);
-}
-
-/*
- * The caller must not be using the entry's dmamap_link field.
- */
-void
-dmar_qi_invalidate_locked(struct dmar_domain *domain,
- struct iommu_map_entry *entry, bool emit_wait)
-{
- struct dmar_unit *unit;
-
- unit = domain->dmar;
- DMAR_ASSERT_LOCKED(unit);
- dmar_qi_invalidate_emit(domain, entry->start, entry->end -
- entry->start, &entry->gseq, emit_wait);
-
- /*
- * To avoid a data race in dmar_qi_task(), the entry's gseq must be
- * initialized before the entry is added to the TLB flush list, and the
- * entry must be added to that list before the tail is advanced. More
- * precisely, the tail must not be advanced past the wait descriptor
- * that will generate the interrupt that schedules dmar_qi_task() for
- * execution before the entry is added to the list. While an earlier
- * call to dmar_qi_ensure() might have advanced the tail, it will not
- * advance it past the wait descriptor.
- *
- * See the definition of struct dmar_unit for more information on
- * synchronization.
- */
- entry->tlb_flush_next = NULL;
- atomic_store_rel_ptr((uintptr_t *)&unit->tlb_flush_tail->tlb_flush_next,
- (uintptr_t)entry);
- unit->tlb_flush_tail = entry;
-
- dmar_qi_advance_tail(unit);
-}
-
-void
-dmar_qi_invalidate_sync(struct dmar_domain *domain, iommu_gaddr_t base,
- iommu_gaddr_t size, bool cansleep)
-{
- struct dmar_unit *unit;
- struct iommu_qi_genseq gseq;
-
- unit = domain->dmar;
- DMAR_LOCK(unit);
- dmar_qi_invalidate_emit(domain, base, size, &gseq, true);
-
- /*
- * To avoid a missed wakeup in dmar_qi_task(), the unit's waiters count
- * must be incremented before the tail is advanced.
- */
- unit->inv_seq_waiters++;
-
- dmar_qi_advance_tail(unit);
- dmar_qi_wait_for_seq(unit, &gseq, !cansleep);
- DMAR_UNLOCK(unit);
+ iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), pseq, emit_wait);
}
void
@@ -310,13 +201,13 @@ dmar_qi_invalidate_ctx_glob_locked(struct dmar_unit *unit)
struct iommu_qi_genseq gseq;
DMAR_ASSERT_LOCKED(unit);
- dmar_qi_ensure(unit, 2);
+ dmar_qi_ensure(DMAR2IOMMU(unit), 2);
dmar_qi_emit(unit, DMAR_IQ_DESCR_CTX_INV | DMAR_IQ_DESCR_CTX_GLOB, 0);
- dmar_qi_emit_wait_seq(unit, &gseq, true);
+ iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), &gseq, true);
/* See dmar_qi_invalidate_sync(). */
- unit->inv_seq_waiters++;
- dmar_qi_advance_tail(unit);
- dmar_qi_wait_for_seq(unit, &gseq, false);
+ unit->x86c.inv_seq_waiters++;
+ dmar_qi_advance_tail(DMAR2IOMMU(unit));
+ iommu_qi_wait_for_seq(DMAR2IOMMU(unit), &gseq, false);
}
void
@@ -325,14 +216,14 @@ dmar_qi_invalidate_iotlb_glob_locked(struct dmar_unit *unit)
struct iommu_qi_genseq gseq;
DMAR_ASSERT_LOCKED(unit);
- dmar_qi_ensure(unit, 2);
+ dmar_qi_ensure(DMAR2IOMMU(unit), 2);
dmar_qi_emit(unit, DMAR_IQ_DESCR_IOTLB_INV | DMAR_IQ_DESCR_IOTLB_GLOB |
DMAR_IQ_DESCR_IOTLB_DW | DMAR_IQ_DESCR_IOTLB_DR, 0);
- dmar_qi_emit_wait_seq(unit, &gseq, true);
+ iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), &gseq, true);
/* See dmar_qi_invalidate_sync(). */
- unit->inv_seq_waiters++;
- dmar_qi_advance_tail(unit);
- dmar_qi_wait_for_seq(unit, &gseq, false);
+ unit->x86c.inv_seq_waiters++;
+ dmar_qi_advance_tail(DMAR2IOMMU(unit));
+ iommu_qi_wait_for_seq(DMAR2IOMMU(unit), &gseq, false);
}
void
@@ -341,13 +232,13 @@ dmar_qi_invalidate_iec_glob(struct dmar_unit *unit)
struct iommu_qi_genseq gseq;
DMAR_ASSERT_LOCKED(unit);
- dmar_qi_ensure(unit, 2);
+ dmar_qi_ensure(DMAR2IOMMU(unit), 2);
dmar_qi_emit(unit, DMAR_IQ_DESCR_IEC_INV, 0);
- dmar_qi_emit_wait_seq(unit, &gseq, true);
+ iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), &gseq, true);
/* See dmar_qi_invalidate_sync(). */
- unit->inv_seq_waiters++;
- dmar_qi_advance_tail(unit);
- dmar_qi_wait_for_seq(unit, &gseq, false);
+ unit->x86c.inv_seq_waiters++;
+ dmar_qi_advance_tail(DMAR2IOMMU(unit));
+ iommu_qi_wait_for_seq(DMAR2IOMMU(unit), &gseq, false);
}
void
@@ -363,21 +254,21 @@ dmar_qi_invalidate_iec(struct dmar_unit *unit, u_int start, u_int cnt)
for (; cnt > 0; cnt -= c, start += c) {
l = ffs(start | cnt) - 1;
c = 1 << l;
- dmar_qi_ensure(unit, 1);
+ dmar_qi_ensure(DMAR2IOMMU(unit), 1);
dmar_qi_emit(unit, DMAR_IQ_DESCR_IEC_INV |
DMAR_IQ_DESCR_IEC_IDX | DMAR_IQ_DESCR_IEC_IIDX(start) |
DMAR_IQ_DESCR_IEC_IM(l), 0);
}
- dmar_qi_ensure(unit, 1);
- dmar_qi_emit_wait_seq(unit, &gseq, true);
+ dmar_qi_ensure(DMAR2IOMMU(unit), 1);
+ iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), &gseq, true);
/*
- * Since dmar_qi_wait_for_seq() will not sleep, this increment's
+ * Since iommu_qi_wait_for_seq() will not sleep, this increment's
* placement relative to advancing the tail doesn't matter.
*/
- unit->inv_seq_waiters++;
+ unit->x86c.inv_seq_waiters++;
- dmar_qi_advance_tail(unit);
+ dmar_qi_advance_tail(DMAR2IOMMU(unit));
/*
* The caller of the function, in particular,
@@ -394,7 +285,7 @@ dmar_qi_invalidate_iec(struct dmar_unit *unit, u_int start, u_int cnt)
* queue is processed, which includes requests possibly issued
* before our request.
*/
- dmar_qi_wait_for_seq(unit, &gseq, true);
+ iommu_qi_wait_for_seq(DMAR2IOMMU(unit), &gseq, true);
}
int
@@ -405,38 +296,18 @@ dmar_qi_intr(void *arg)
unit = arg;
KASSERT(unit->qi_enabled, ("dmar%d: QI is not enabled",
unit->iommu.unit));
- taskqueue_enqueue(unit->qi_taskqueue, &unit->qi_task);
+ taskqueue_enqueue(unit->x86c.qi_taskqueue, &unit->x86c.qi_task);
return (FILTER_HANDLED);
}
-static void
-dmar_qi_drain_tlb_flush(struct dmar_unit *unit)
-{
- struct iommu_map_entry *entry, *head;
-
- for (head = unit->tlb_flush_head;; head = entry) {
- entry = (struct iommu_map_entry *)
- atomic_load_acq_ptr((uintptr_t *)&head->tlb_flush_next);
- if (entry == NULL ||
- !dmar_qi_seq_processed(unit, &entry->gseq))
- break;
- unit->tlb_flush_head = entry;
- iommu_gas_free_entry(head);
- if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0)
- iommu_gas_free_region(entry);
- else
- iommu_gas_free_space(entry);
- }
-}
-
static void
dmar_qi_task(void *arg, int pending __unused)
{
struct dmar_unit *unit;
uint32_t ics;
- unit = arg;
- dmar_qi_drain_tlb_flush(unit);
+ unit = IOMMU2DMAR(arg);
+ iommu_qi_drain_tlb_flush(DMAR2IOMMU(unit));
/*
* Request an interrupt on the completion of the next invalidation
@@ -453,16 +324,16 @@ dmar_qi_task(void *arg, int pending __unused)
* Otherwise, such entries will linger until a later entry
* that requests an interrupt is processed.
*/
- dmar_qi_drain_tlb_flush(unit);
+ iommu_qi_drain_tlb_flush(DMAR2IOMMU(unit));
}
- if (unit->inv_seq_waiters > 0) {
+ if (unit->x86c.inv_seq_waiters > 0) {
/*
* Acquire the DMAR lock so that wakeup() is called only after
* the waiter is sleeping.
*/
DMAR_LOCK(unit);
- wakeup(&unit->inv_seq_waiters);
+ wakeup(&unit->x86c.inv_seq_waiters);
DMAR_UNLOCK(unit);
}
}
@@ -472,7 +343,7 @@ dmar_init_qi(struct dmar_unit *unit)
{
uint64_t iqa;
uint32_t ics;
- int qi_sz;
+ u_int qi_sz;
if (!DMAR_HAS_QI(unit) || (unit->hw_cap & DMAR_CAP_CM) != 0)
return (0);
@@ -481,34 +352,19 @@ dmar_init_qi(struct dmar_unit *unit)
if (!unit->qi_enabled)
return (0);
- unit->tlb_flush_head = unit->tlb_flush_tail =
- iommu_gas_alloc_entry(NULL, 0);
- TASK_INIT(&unit->qi_task, 0, dmar_qi_task, unit);
- unit->qi_taskqueue = taskqueue_create_fast("dmarqf", M_WAITOK,
- taskqueue_thread_enqueue, &unit->qi_taskqueue);
- taskqueue_start_threads(&unit->qi_taskqueue, 1, PI_AV,
- "dmar%d qi taskq", unit->iommu.unit);
-
- unit->inv_waitd_gen = 0;
- unit->inv_waitd_seq = 1;
-
- qi_sz = DMAR_IQA_QS_DEF;
- TUNABLE_INT_FETCH("hw.dmar.qi_size", &qi_sz);
- if (qi_sz > DMAR_IQA_QS_MAX)
- qi_sz = DMAR_IQA_QS_MAX;
- unit->inv_queue_size = (1ULL << qi_sz) * PAGE_SIZE;
- /* Reserve one descriptor to prevent wraparound. */
- unit->inv_queue_avail = unit->inv_queue_size - DMAR_IQ_DESCR_SZ;
-
- /* The invalidation queue reads by DMARs are always coherent. */
- unit->inv_queue = kmem_alloc_contig(unit->inv_queue_size, M_WAITOK |
- M_ZERO, 0, iommu_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT);
- unit->inv_waitd_seq_hw_phys = pmap_kextract(
- (vm_offset_t)&unit->inv_waitd_seq_hw);
+ unit->x86c.qi_buf_maxsz = DMAR_IQA_QS_MAX;
+ unit->x86c.qi_cmd_sz = DMAR_IQ_DESCR_SZ;
+ iommu_qi_common_init(DMAR2IOMMU(unit), dmar_qi_task);
+ get_x86_iommu()->qi_ensure = dmar_qi_ensure;
+ get_x86_iommu()->qi_emit_wait_descr = dmar_qi_emit_wait_descr;
+ get_x86_iommu()->qi_advance_tail = dmar_qi_advance_tail;
+ get_x86_iommu()->qi_invalidate_emit = dmar_qi_invalidate_emit;
+
+ qi_sz = ilog2(unit->x86c.inv_queue_size / PAGE_SIZE);
DMAR_LOCK(unit);
dmar_write8(unit, DMAR_IQT_REG, 0);
- iqa = pmap_kextract((uintptr_t)unit->inv_queue);
+ iqa = pmap_kextract((uintptr_t)unit->x86c.inv_queue);
iqa |= qi_sz;
dmar_write8(unit, DMAR_IQA_REG, iqa);
dmar_enable_qi(unit);
@@ -523,35 +379,19 @@ dmar_init_qi(struct dmar_unit *unit)
return (0);
}
+static void
+dmar_fini_qi_helper(struct iommu_unit *iommu)
+{
+ dmar_disable_qi_intr(IOMMU2DMAR(iommu));
+ dmar_disable_qi(IOMMU2DMAR(iommu));
+}
+
void
dmar_fini_qi(struct dmar_unit *unit)
{
- struct iommu_qi_genseq gseq;
-
if (!unit->qi_enabled)
return;
- taskqueue_drain(unit->qi_taskqueue, &unit->qi_task);
- taskqueue_free(unit->qi_taskqueue);
- unit->qi_taskqueue = NULL;
-
- DMAR_LOCK(unit);
- /* quisce */
- dmar_qi_ensure(unit, 1);
- dmar_qi_emit_wait_seq(unit, &gseq, true);
- /* See dmar_qi_invalidate_sync_locked(). */
- unit->inv_seq_waiters++;
- dmar_qi_advance_tail(unit);
- dmar_qi_wait_for_seq(unit, &gseq, false);
- /* only after the quisce, disable queue */
- dmar_disable_qi_intr(unit);
- dmar_disable_qi(unit);
- KASSERT(unit->inv_seq_waiters == 0,
- ("dmar%d: waiters on disabled queue", unit->iommu.unit));
- DMAR_UNLOCK(unit);
-
- kmem_free(unit->inv_queue, unit->inv_queue_size);
- unit->inv_queue = NULL;
- unit->inv_queue_size = 0;
+ iommu_qi_common_fini(DMAR2IOMMU(unit), dmar_fini_qi_helper);
unit->qi_enabled = 0;
}
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index ea2c0358e072..571e5a2e65cd 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -29,7 +29,9 @@
*/
#include <sys/systm.h>
+#include <sys/kernel.h>
#include <sys/lock.h>
+#include <sys/malloc.h>
#include <sys/memdesc.h>
#include <sys/mutex.h>
#include <sys/sf_buf.h>
@@ -40,8 +42,11 @@
#include <sys/taskqueue.h>
#include <sys/tree.h>
#include <vm/vm.h>
-#include <vm/vm_page.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_map.h>
#include <vm/vm_object.h>
+#include <vm/vm_page.h>
#include <dev/pci/pcireg.h>
#include <machine/atomic.h>
#include <machine/bus.h>
@@ -251,3 +256,230 @@ iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
{
return (x86_iommu->unmap_ioapic_intr(ioapic_id, cookie));
}
+
+#define IOMMU2X86C(iommu) (x86_iommu->get_x86_common(iommu))
+
+static bool
+iommu_qi_seq_processed(struct iommu_unit *unit,
+ const struct iommu_qi_genseq *pseq)
+{
+ struct x86_unit_common *x86c;
+ u_int gen;
+
+ x86c = IOMMU2X86C(unit);
+ gen = x86c->inv_waitd_gen;
+ return (pseq->gen < gen ||
+ (pseq->gen == gen && pseq->seq <= x86c->inv_waitd_seq_hw));
+}
+
+void
+iommu_qi_emit_wait_seq(struct iommu_unit *unit, struct iommu_qi_genseq *pseq,
+ bool emit_wait)
+{
+ struct x86_unit_common *x86c;
+ struct iommu_qi_genseq gsec;
+ uint32_t seq;
+
+ KASSERT(pseq != NULL, ("wait descriptor with no place for seq"));
+ IOMMU_ASSERT_LOCKED(unit);
+ x86c = IOMMU2X86C(unit);
+
+ if (x86c->inv_waitd_seq == 0xffffffff) {
+ gsec.gen = x86c->inv_waitd_gen;
+ gsec.seq = x86c->inv_waitd_seq;
+ x86_iommu->qi_ensure(unit, 1);
+ x86_iommu->qi_emit_wait_descr(unit, gsec.seq, false,
+ true, false);
+ x86_iommu->qi_advance_tail(unit);
+ while (!iommu_qi_seq_processed(unit, &gsec))
+ cpu_spinwait();
+ x86c->inv_waitd_gen++;
+ x86c->inv_waitd_seq = 1;
+ }
+ seq = x86c->inv_waitd_seq++;
+ pseq->gen = x86c->inv_waitd_gen;
+ pseq->seq = seq;
+ if (emit_wait) {
+ x86_iommu->qi_ensure(unit, 1);
+ x86_iommu->qi_emit_wait_descr(unit, seq, true, true, false);
+ }
+}
+
+/*
+ * To avoid missed wakeups, callers must increment the unit's waiters count
+ * before advancing the tail past the wait descriptor.
+ */
+void
+iommu_qi_wait_for_seq(struct iommu_unit *unit, const struct iommu_qi_genseq *
+ gseq, bool nowait)
+{
+ struct x86_unit_common *x86c;
+
+ IOMMU_ASSERT_LOCKED(unit);
+ x86c = IOMMU2X86C(unit);
+
+ KASSERT(x86c->inv_seq_waiters > 0, ("%s: no waiters", __func__));
+ while (!iommu_qi_seq_processed(unit, gseq)) {
+ if (cold || nowait) {
+ cpu_spinwait();
+ } else {
+ msleep(&x86c->inv_seq_waiters, &unit->lock, 0,
+ "dmarse", hz);
+ }
+ }
+ x86c->inv_seq_waiters--;
+}
+
+/*
+ * The caller must not be using the entry's dmamap_link field.
+ */
+void
+iommu_qi_invalidate_locked(struct iommu_domain *domain,
+ struct iommu_map_entry *entry, bool emit_wait)
+{
+ struct iommu_unit *unit;
+ struct x86_unit_common *x86c;
+
+ unit = domain->iommu;
+ x86c = IOMMU2X86C(unit);
+ IOMMU_ASSERT_LOCKED(unit);
+
+ x86_iommu->qi_invalidate_emit(domain, entry->start, entry->end -
+ entry->start, &entry->gseq, emit_wait);
+
+ /*
+ * To avoid a data race in dmar_qi_task(), the entry's gseq must be
+ * initialized before the entry is added to the TLB flush list, and the
+ * entry must be added to that list before the tail is advanced. More
+ * precisely, the tail must not be advanced past the wait descriptor
+ * that will generate the interrupt that schedules dmar_qi_task() for
+ * execution before the entry is added to the list. While an earlier
+ * call to dmar_qi_ensure() might have advanced the tail, it will not
+ * advance it past the wait descriptor.
+ *
+ * See the definition of struct dmar_unit for more information on
+ * synchronization.
+ */
+ entry->tlb_flush_next = NULL;
+ atomic_store_rel_ptr((uintptr_t *)&x86c->tlb_flush_tail->
+ tlb_flush_next, (uintptr_t)entry);
+ x86c->tlb_flush_tail = entry;
+
+ x86_iommu->qi_advance_tail(unit);
+}
+
+void
+iommu_qi_invalidate_sync(struct iommu_domain *domain, iommu_gaddr_t base,
+ iommu_gaddr_t size, bool cansleep)
+{
+ struct iommu_unit *unit;
+ struct iommu_qi_genseq gseq;
+
+ unit = domain->iommu;
+ IOMMU_LOCK(unit);
+ x86_iommu->qi_invalidate_emit(domain, base, size, &gseq, true);
+
+ /*
+ * To avoid a missed wakeup in iommu_qi_task(), the unit's
+ * waiters count must be incremented before the tail is
+ * advanced.
+ */
+ IOMMU2X86C(unit)->inv_seq_waiters++;
+
+ x86_iommu->qi_advance_tail(unit);
+ iommu_qi_wait_for_seq(unit, &gseq, !cansleep);
+ IOMMU_UNLOCK(unit);
+}
+
+void
+iommu_qi_drain_tlb_flush(struct iommu_unit *unit)
+{
+ struct x86_unit_common *x86c;
+ struct iommu_map_entry *entry, *head;
+
+ x86c = IOMMU2X86C(unit);
+ for (head = x86c->tlb_flush_head;; head = entry) {
+ entry = (struct iommu_map_entry *)
+ atomic_load_acq_ptr((uintptr_t *)&head->tlb_flush_next);
+ if (entry == NULL ||
+ !iommu_qi_seq_processed(unit, &entry->gseq))
+ break;
+ x86c->tlb_flush_head = entry;
+ iommu_gas_free_entry(head);
+ if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0)
+ iommu_gas_free_region(entry);
+ else
+ iommu_gas_free_space(entry);
+ }
+}
+
+void
+iommu_qi_common_init(struct iommu_unit *unit, task_fn_t qi_task)
+{
+ struct x86_unit_common *x86c;
+ u_int qi_sz;
+
+ x86c = IOMMU2X86C(unit);
+
+ x86c->tlb_flush_head = x86c->tlb_flush_tail =
+ iommu_gas_alloc_entry(NULL, 0);
+ TASK_INIT(&x86c->qi_task, 0, qi_task, unit);
+ x86c->qi_taskqueue = taskqueue_create_fast("iommuqf", M_WAITOK,
+ taskqueue_thread_enqueue, &x86c->qi_taskqueue);
+ taskqueue_start_threads(&x86c->qi_taskqueue, 1, PI_AV,
+ "iommu%d qi taskq", unit->unit);
+
+ x86c->inv_waitd_gen = 0;
+ x86c->inv_waitd_seq = 1;
+
+ qi_sz = 3;
+ TUNABLE_INT_FETCH("hw.iommu.qi_size", &qi_sz);
+ if (qi_sz > x86c->qi_buf_maxsz)
+ qi_sz = x86c->qi_buf_maxsz;
+ x86c->inv_queue_size = (1ULL << qi_sz) * PAGE_SIZE;
+ /* Reserve one descriptor to prevent wraparound. */
+ x86c->inv_queue_avail = x86c->inv_queue_size -
+ x86c->qi_cmd_sz;
+
+ /*
+ * The invalidation queue reads by DMARs/AMDIOMMUs are always
+ * coherent.
+ */
+ x86c->inv_queue = kmem_alloc_contig(x86c->inv_queue_size,
+ M_WAITOK | M_ZERO, 0, iommu_high, PAGE_SIZE, 0,
+ VM_MEMATTR_DEFAULT);
+ x86c->inv_waitd_seq_hw_phys = pmap_kextract(
+ (vm_offset_t)&x86c->inv_waitd_seq_hw);
+}
+
+void
+iommu_qi_common_fini(struct iommu_unit *unit, void (*disable_qi)(
+ struct iommu_unit *))
+{
+ struct x86_unit_common *x86c;
+ struct iommu_qi_genseq gseq;
+
+ x86c = IOMMU2X86C(unit);
+
+ taskqueue_drain(x86c->qi_taskqueue, &x86c->qi_task);
+ taskqueue_free(x86c->qi_taskqueue);
+ x86c->qi_taskqueue = NULL;
+
+ IOMMU_LOCK(unit);
+ /* quisce */
+ x86_iommu->qi_ensure(unit, 1);
+ iommu_qi_emit_wait_seq(unit, &gseq, true);
+ /* See iommu_qi_invalidate_locked(). */
+ x86c->inv_seq_waiters++;
+ x86_iommu->qi_advance_tail(unit);
+ iommu_qi_wait_for_seq(unit, &gseq, false);
+ /* only after the quisce, disable queue */
+ disable_qi(unit);
+ KASSERT(x86c->inv_seq_waiters == 0,
+ ("iommu%d: waiters on disabled queue", unit->unit));
+ IOMMU_UNLOCK(unit);
+
+ kmem_free(x86c->inv_queue, x86c->inv_queue_size);
+ x86c->inv_queue = NULL;
+ x86c->inv_queue_size = 0;
+}
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index 8c908964acd0..eb1bbafbeb77 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -59,7 +59,18 @@ extern int iommu_tbl_pagecnt;
SYSCTL_DECL(_hw_iommu);
SYSCTL_DECL(_hw_iommu_dmar);
+struct x86_unit_common;
+
struct x86_iommu {
+ struct x86_unit_common *(*get_x86_common)(struct
+ iommu_unit *iommu);
+ void (*qi_ensure)(struct iommu_unit *unit, int descr_count);
+ void (*qi_emit_wait_descr)(struct iommu_unit *unit, uint32_t seq,
+ bool, bool, bool);
+ void (*qi_advance_tail)(struct iommu_unit *unit);
+ void (*qi_invalidate_emit)(struct iommu_domain *idomain,
+ iommu_gaddr_t base, iommu_gaddr_t size, struct iommu_qi_genseq *
+ pseq, bool emit_wait);
void (*domain_unload_entry)(struct iommu_map_entry *entry, bool free,
bool cansleep);
void (*domain_unload)(struct iommu_domain *iodom,
@@ -82,4 +93,65 @@ struct x86_iommu {
void set_x86_iommu(struct x86_iommu *);
struct x86_iommu *get_x86_iommu(void);
+struct x86_unit_common {
+ uint32_t qi_buf_maxsz;
+ uint32_t qi_cmd_sz;
+
+ char *inv_queue;
+ vm_size_t inv_queue_size;
+ uint32_t inv_queue_avail;
+ uint32_t inv_queue_tail;
+ volatile uint32_t inv_waitd_seq_hw; /* hw writes there on wait
+ descr completion */
*** 52 LINES SKIPPED ***
From nobody Wed Sep 4 21:50:42 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblQ6bMhz5VS2d;
Wed, 04 Sep 2024 21:50: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 4WzblQ3wfTz4gkg;
Wed, 4 Sep 2024 21:50:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486642;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=iAz0O1Fcn+Nxso0hOeCrilHLxlKXPAyEzD1arNyyb6o=;
b=iVKeqt1WoTzrrvGUq3ojZr3wQ7qYxh4FGcI8D8jVbN2YB4BxD3Bnx+9+Pg+aWHV0+uWSJQ
eGimNy7Z5Be9kEmB6CxoivV315VTpFlpxymeGYE7n3bui+sV+Bf6yFmvwkQeawR0f8ueZi
ZSnmG43BVOQ99iBHrBl+iae+GEOGB6y/S8VbdJGM3vRm9hUs5L8gaxp2H6T4xGKGFoY2zG
KVl75WyFef+uCH/du6Laz8W67zQ+2N9sqz50Cidb37eP/Z8MQVrprJTM0AEwZF1WEDZZVv
dBOBQEJnp4GXvNj+V23rzdZuGIh9TP8aZU/aaKHou0/wbpFL7NUmRPRQTG2d0g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486642; a=rsa-sha256; cv=none;
b=g8NXvz8vKPL77leVx63EHOUVttCxHFyjqBnUp1J5LGE+e22sa38nUPx2/EVvgwvNYYCS8s
lNtoX0m3WOawRyFL/JvHj7frh5jf/Lr3JoPkfkNj8KEnY5bkM0dI115pubrP53sa4w4uoL
pY+CSenXV9pCFvFpNnCZyZ4o+vE7lN1/V3/CzRCvNfhZnQ5Qpro+sTgR2XKjVUWqZ/uFLI
tUP4oCWCac7x/ttZX/p5VRRiKHntOjyKcAWAx9Z4k0/PR511jxI/+WtUD1j+QdcvluwRne
N4/aKeYMAI+/FdTwZn3b+tChpbx3owMFvOXh/WfTI9ZD0XwgnxZ3UQ4KEAGLpQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486642;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=iAz0O1Fcn+Nxso0hOeCrilHLxlKXPAyEzD1arNyyb6o=;
b=iIERrrL3kDMs6/jgESxl7bHHdfiDzZ43CcCqOWaEIOnsnYK5tfX7WJdpAxUUyJLmXe5OC0
5dORpMsz8LpjsZsrwvMw3RRuP2ykuUll1EEgcfp2qOwXHjoedwLq98p20qrD9q+danbkgR
qL8Pa7Mh82E8ECyOmPUv52/xjxzFh85P898guf5OVXF5ahtHIJfOWRQOyHrzIx5oDt8CN8
jK9eb4/mL6daDEoyoiSkH4+bKRvJjPFgVjE9pAgmxJlzSv5zNc6heKltYfCjkpaNxpddt7
9zjpoEJaQgVidsS7eXstlbz2Vyedj6Rn22tjk1zCN+53FCVg+sX6gpfVg3ANmA==
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 4WzblQ3XsDzhL1;
Wed, 4 Sep 2024 21:50: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 484LogAC031605;
Wed, 4 Sep 2024 21:50:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Log8b031602;
Wed, 4 Sep 2024 21:50:42 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:42 GMT
Message-Id: <202409042150.484Log8b031602@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: f776a2b84972 - main - dmar_qi_XXX_invalidate_glob():
reduce code duplication
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: f776a2b849726e7b86735b2930be64f5a2edf731
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=f776a2b849726e7b86735b2930be64f5a2edf731
commit f776a2b849726e7b86735b2930be64f5a2edf731
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-09 17:24:31 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:18 +0000
dmar_qi_XXX_invalidate_glob(): reduce code duplication
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_qi.c | 38 ++++++++++++++------------------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c
index a94fbb54e7f7..b474d695552f 100644
--- a/sys/x86/iommu/intel_qi.c
+++ b/sys/x86/iommu/intel_qi.c
@@ -195,14 +195,14 @@ dmar_qi_invalidate_emit(struct iommu_domain *idomain, iommu_gaddr_t base,
iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), pseq, emit_wait);
}
-void
-dmar_qi_invalidate_ctx_glob_locked(struct dmar_unit *unit)
+static void
+dmar_qi_invalidate_glob_impl(struct dmar_unit *unit, uint64_t data1)
{
struct iommu_qi_genseq gseq;
DMAR_ASSERT_LOCKED(unit);
dmar_qi_ensure(DMAR2IOMMU(unit), 2);
- dmar_qi_emit(unit, DMAR_IQ_DESCR_CTX_INV | DMAR_IQ_DESCR_CTX_GLOB, 0);
+ dmar_qi_emit(unit, data1, 0);
iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), &gseq, true);
/* See dmar_qi_invalidate_sync(). */
unit->x86c.inv_seq_waiters++;
@@ -211,34 +211,24 @@ dmar_qi_invalidate_ctx_glob_locked(struct dmar_unit *unit)
}
void
-dmar_qi_invalidate_iotlb_glob_locked(struct dmar_unit *unit)
+dmar_qi_invalidate_ctx_glob_locked(struct dmar_unit *unit)
{
- struct iommu_qi_genseq gseq;
+ dmar_qi_invalidate_glob_impl(unit, DMAR_IQ_DESCR_CTX_INV |
+ DMAR_IQ_DESCR_CTX_GLOB);
+}
- DMAR_ASSERT_LOCKED(unit);
- dmar_qi_ensure(DMAR2IOMMU(unit), 2);
- dmar_qi_emit(unit, DMAR_IQ_DESCR_IOTLB_INV | DMAR_IQ_DESCR_IOTLB_GLOB |
- DMAR_IQ_DESCR_IOTLB_DW | DMAR_IQ_DESCR_IOTLB_DR, 0);
- iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), &gseq, true);
- /* See dmar_qi_invalidate_sync(). */
- unit->x86c.inv_seq_waiters++;
- dmar_qi_advance_tail(DMAR2IOMMU(unit));
- iommu_qi_wait_for_seq(DMAR2IOMMU(unit), &gseq, false);
+void
+dmar_qi_invalidate_iotlb_glob_locked(struct dmar_unit *unit)
+{
+ dmar_qi_invalidate_glob_impl(unit, DMAR_IQ_DESCR_IOTLB_INV |
+ DMAR_IQ_DESCR_IOTLB_GLOB | DMAR_IQ_DESCR_IOTLB_DW |
+ DMAR_IQ_DESCR_IOTLB_DR);
}
void
dmar_qi_invalidate_iec_glob(struct dmar_unit *unit)
{
- struct iommu_qi_genseq gseq;
-
- DMAR_ASSERT_LOCKED(unit);
- dmar_qi_ensure(DMAR2IOMMU(unit), 2);
- dmar_qi_emit(unit, DMAR_IQ_DESCR_IEC_INV, 0);
- iommu_qi_emit_wait_seq(DMAR2IOMMU(unit), &gseq, true);
- /* See dmar_qi_invalidate_sync(). */
- unit->x86c.inv_seq_waiters++;
- dmar_qi_advance_tail(DMAR2IOMMU(unit));
- iommu_qi_wait_for_seq(DMAR2IOMMU(unit), &gseq, false);
+ dmar_qi_invalidate_glob_impl(unit, DMAR_IQ_DESCR_IEC_INV);
}
void
From nobody Wed Sep 4 21:50:43 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblS0y3fz5VRtg;
Wed, 04 Sep 2024 21:50: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 4WzblR4w5Jz4hBh;
Wed, 4 Sep 2024 21:50:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486643;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XD+qUjkXG6sF/mmqGpvtk4iA9FQ3+W/YXWO7gRB4Dng=;
b=RkfyMjXU1Dwd/a9KiprOyMzPB23YegmDGFJyCatrpdVEWoq0YpbwxHnI/pCDKP2ew2xLEi
bq2HEX48rAsSCmKOpWu2Z7Eg1RoZe1bxUgNxaeXBU6QNXYKFvWM0wOhJKqLo01mH3Q5sj/
qOq28lbCwMl0zW19HN4EHA3q439tPaTbOU6qsFDY17WnOZiAce4/PnGX2INiNrCLdj1x8L
IxshnerDW+Yp+vNrel3+QlZdvpwNtHXJ59sKeEr/jnJLTcPgSbaqMDSpldHoontzHVno+k
2EMQAKnv2vN+mJMwq0rMgt2hjhfkqupe62q/J5bZlsaRpBPp2LtCQ88oTwVeqA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486643; a=rsa-sha256; cv=none;
b=aDxXmyvNl+QoZgl4pLA6C6ncRwJrKs6ULpB+NwRruR2z5BOWs0M7KcX1bdRFQhJGtgyeKD
zr+cb0ngMFDStLY8yfaKdhuZbolv4b77Uz5mSNfoiE3mmZmecLryBdIZEVeQleda7jUDAB
cK0E7pnvyeiT2p4L+Gs1eoIQ3N5W+SLO20PngS7IhcTH5Zhbl8YCZ8tdWgmhx66GFT6QbI
tuKT0NR36/wZ2yXOLlkH2G2cPGj99Z0fzHDvSg/+5VbmlPEoDmZgqJBs8Vl+MhzcPB+zNr
nhToV+dLwU+6PyEYd+j7iQOsRZqC+u1xRMOOUo1lQB/lVEf5eDcWJPl1QgpbSQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486643;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=XD+qUjkXG6sF/mmqGpvtk4iA9FQ3+W/YXWO7gRB4Dng=;
b=rxhsmvHbaL7gPTd1BHN4B65QA0qmxjSSyXf+y4rrg/wDaZjJrmEZMq7Z5UcmZAxrPLEcsi
H7cVktiaGJ29ZmHT5SxvsibA6XV9HbB2H9X4mwoGuViLurfup0IUvP479gG8SJpBARx6F3
KN+0U+1sod64ID5Y6UR9/EkJtawOx45syshpj33n5xX/XRrbma5ZgDrWShNM92icztpyAZ
8NoLBtkNOwsnKOMWsbWdvUYxGDg6Rl/33x8Ih9IkPSJd6RZ+/QGA103HFG49ciqgC9OqLj
ovkhyzG3WQt6ZsaDMEBayeX031HHiR3M26Bz2b9/TUkbdywo3dBB2RyFIJGvGA==
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 4WzblR4WW2zhL2;
Wed, 4 Sep 2024 21:50: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 484LohvJ031647;
Wed, 4 Sep 2024 21:50:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Lohms031644;
Wed, 4 Sep 2024 21:50:43 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:43 GMT
Message-Id: <202409042150.484Lohms031644@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: b563be66998d - main - dmar_qi_emit(): use atomic_store_64()
when available
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: b563be66998ddd9dbc83364c8b515398d984c140
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=b563be66998ddd9dbc83364c8b515398d984c140
commit b563be66998ddd9dbc83364c8b515398d984c140
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-06 03:21:31 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:18 +0000
dmar_qi_emit(): use atomic_store_64() when available
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_qi.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c
index b474d695552f..8b5cfe3c0205 100644
--- a/sys/x86/iommu/intel_qi.c
+++ b/sys/x86/iommu/intel_qi.c
@@ -139,15 +139,25 @@ dmar_qi_emit(struct dmar_unit *unit, uint64_t data1, uint64_t data2)
{
DMAR_ASSERT_LOCKED(unit);
+#ifdef __LP64__
+ atomic_store_64((uint64_t *)(unit->x86c.inv_queue +
+ unit->x86c.inv_queue_tail), data1);
+#else
*(volatile uint64_t *)(unit->x86c.inv_queue +
unit->x86c.inv_queue_tail) = data1;
+#endif
unit->x86c.inv_queue_tail += DMAR_IQ_DESCR_SZ / 2;
KASSERT(unit->x86c.inv_queue_tail <= unit->x86c.inv_queue_size,
("tail overflow 0x%x 0x%jx", unit->x86c.inv_queue_tail,
(uintmax_t)unit->x86c.inv_queue_size));
unit->x86c.inv_queue_tail &= unit->x86c.inv_queue_size - 1;
+#ifdef __LP64__
+ atomic_store_64((uint64_t *)(unit->x86c.inv_queue +
+ unit->x86c.inv_queue_tail), data2);
+#else
*(volatile uint64_t *)(unit->x86c.inv_queue +
unit->x86c.inv_queue_tail) = data2;
+#endif
unit->x86c.inv_queue_tail += DMAR_IQ_DESCR_SZ / 2;
KASSERT(unit->x86c.inv_queue_tail <= unit->x86c.inv_queue_size,
("tail overflow 0x%x 0x%jx", unit->x86c.inv_queue_tail,
From nobody Wed Sep 4 21:50:44 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblT2zMMz5VS4r;
Wed, 04 Sep 2024 21:50: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 4WzblS6Gndz4gyJ;
Wed, 4 Sep 2024 21:50:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486644;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=z82VXpWdrQf7LWqHIYs1kgCeRixhBg7CeAm9piSpc9M=;
b=Xhxs0TR4TyFIY3VaPtlSMvUUeKOL8j6JzIqlwfwtNpEtD/C7laAqiY74IAAykx3NsdyW+B
9BT7dTQyyqISkHkMTut7TZbE1C0onHl6t+hBB3dvnK6Q3uY+3hKbVe3hp2+cQqw5nuZtZa
nNZ0n44Pf0qiSW8Wm0fpNYrTGIet/sO4AhFyzli0YIz4gjARgVbuJHvapWLasokPz0ErZA
4MvArry7gmKb604lexvS/js+kgLzj3woZyEBNiyW34Ktb3X5SYpSJHfOxl668eCbRELLud
Sj4PrWPpWU8Ipg1+dOFLJre+n33zetqKnVRKMkeVK9G1hL41pZBGYRagt2bCpA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486644; a=rsa-sha256; cv=none;
b=G71vrO2m9oUAZjuYGpSb6pzt3ekNleRJ96iJYiEtvKdNCKpuRKqshQJSi4RFkj631SU3BN
+pHYXxJyqsSoV44afiB7IMGMlk6nrolM7DasO6fSez8CDwA+FzajFZdhx9bScgn+QSm/lZ
Wjcm/fT9Pty21vHVTz1Dw+rOTcuZWADFc/BZDNzKW9GXciHtqHvxI4SIuEVgdNiOhYCUZU
nmkRUG5DKh77B9GbbeGTRL0HMmGv5tz9KuBhgFS8otIPiNQ2DyUn95Ovqs/tocG8qprEs8
Ji1x32zzn6GyxKH+KwXUI9jNmdZ/L4Mj8tu/9TA/uYlWbVZaWw2tTv9WlaLHTg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486644;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=z82VXpWdrQf7LWqHIYs1kgCeRixhBg7CeAm9piSpc9M=;
b=NBBrf3tJiSDDkRSnv4H/81ZlvIzz1pYA3mVirQfsKMZ/0mwnFFN50TNTu2C4f6jswIeGcz
X550WOr6SiHP9FnmBvdHvjTOWi2H/f67kvVrOJnSRvYD8AaeEz5j1r22vqLaHe6Z29XVCh
1baGM507Jo9SANaTeB2NyCZr2FTJEfzyLh5kBDzSOpGwCc0g3P8WEfaoOVOCwbSG+DkAjJ
sl/1DLUowmv7wFHyhXXcEHOW8EC91CwcSjT13m+C/06YEYSZsDIuUbPV7Rs95EQ5UNovuZ
RoZFLY6WtortY2AI8BRtCa9GvxXNphJxWC4Pyku7U4yQjYi98voe8OTAiU4khg==
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 4WzblS5WMvzhL4;
Wed, 4 Sep 2024 21:50:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484LoiIM031689;
Wed, 4 Sep 2024 21:50:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LoixC031686;
Wed, 4 Sep 2024 21:50:44 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:44 GMT
Message-Id: <202409042150.484LoixC031686@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 23145534154c - main - DMAR: rename domain_{alloc,free}_pgtbl
to domain_domain_$1_pgtbl
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 23145534154c279e3e8cbcd17d155f7ee67d8aa9
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=23145534154c279e3e8cbcd17d155f7ee67d8aa9
commit 23145534154c279e3e8cbcd17d155f7ee67d8aa9
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-30 03:52:52 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:18 +0000
DMAR: rename domain_{alloc,free}_pgtbl to domain_domain_$1_pgtbl
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_ctx.c | 4 ++--
sys/x86/iommu/intel_dmar.h | 4 ++--
sys/x86/iommu/intel_idpgtbl.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index 03ef196c4cb0..e39d2a136d8a 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -423,7 +423,7 @@ dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped)
}
domain->iodom.flags |= IOMMU_DOMAIN_IDMAP;
} else {
- error = domain_alloc_pgtbl(domain);
+ error = dmar_domain_alloc_pgtbl(domain);
if (error != 0)
goto fail;
/* Disable local apic region access */
@@ -509,7 +509,7 @@ dmar_domain_destroy(struct dmar_domain *domain)
if ((domain->iodom.flags & IOMMU_DOMAIN_PGTBL_INITED) != 0) {
if (domain->pgtbl_obj != NULL)
DMAR_DOMAIN_PGLOCK(domain);
- domain_free_pgtbl(domain);
+ dmar_domain_free_pgtbl(domain);
}
iommu_domain_fini(iodom);
dmar = DOM2DMAR(domain);
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index 8a815d5cfca6..7b4a7900fa25 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -240,8 +240,8 @@ vm_object_t domain_get_idmap_pgtbl(struct dmar_domain *domain,
void put_idmap_pgtbl(vm_object_t obj);
void domain_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base,
iommu_gaddr_t size);
-int domain_alloc_pgtbl(struct dmar_domain *domain);
-void domain_free_pgtbl(struct dmar_domain *domain);
+int dmar_domain_alloc_pgtbl(struct dmar_domain *domain);
+void dmar_domain_free_pgtbl(struct dmar_domain *domain);
extern const struct iommu_domain_map_ops dmar_domain_map_ops;
int dmar_dev_depth(device_t child);
diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c
index de38a6fece94..eb6a51216dfd 100644
--- a/sys/x86/iommu/intel_idpgtbl.c
+++ b/sys/x86/iommu/intel_idpgtbl.c
@@ -696,7 +696,7 @@ domain_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base,
}
int
-domain_alloc_pgtbl(struct dmar_domain *domain)
+dmar_domain_alloc_pgtbl(struct dmar_domain *domain)
{
vm_page_t m;
@@ -718,7 +718,7 @@ domain_alloc_pgtbl(struct dmar_domain *domain)
}
void
-domain_free_pgtbl(struct dmar_domain *domain)
+dmar_domain_free_pgtbl(struct dmar_domain *domain)
{
vm_object_t obj;
vm_page_t m;
From nobody Wed Sep 4 21:50:46 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblW1xXCz5VS2n;
Wed, 04 Sep 2024 21:50: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 4WzblW0LQQz4hMC;
Wed, 4 Sep 2024 21:50:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486647;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Ey1l8oc3p6ue872YSjN+wZzxMxUTSnKVFgfbHcUR2pQ=;
b=lQLusofXEoW/2qXHw/+sdRITPHK+28HAPwUW3muEHZeJ680D+HnSDokZ7U8xTYy0Vn3CDZ
edyuZZiQv7bQdejCoC5w33Uz6yae7IcOI3Zo+1SPyLMCOAGM0ezE2MmSH0QOJFvo+6WddV
Sq8QlUWylOPrasj3OelVCIkLSIeqNIJg6wLuv4Wo+XUNue8+TJ6+Y68Q29871KQmmSZUjF
7pluc6zVZ9a/6F2xdVLFc+87N5kJWkMk9U+KLfbEdE2UUg95tRWS5djEkATRkbRfsFS/Tm
0OhDBVCnLvrZUheXSYDN7Y/6z42HqSF1VQSjYjDpEcSp9r1mJBZ+U+k1oP63Ag==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486647; a=rsa-sha256; cv=none;
b=rxvmUfuFPB5/WnzA77gzyz9jIWalCBH3pHP8HwqLp0MNKJIHWH26ZQaB1TNrSWpzFzmJns
cUDgpXlH1SNfrH0J1Wotwjk3az58YFA35Q/PNSDvX4D3M8yQdqxPvkhw37ewej1YLWTH+d
yep5XVy7nLKFolqsx+O8DZ/O5QMYFHYFEYqAnh/9K1QojYwds9AcGFeFbp6u6oULqw/c8l
pPu0iXqd9Do+DY7uu37hGZox6ZAfIYrYyZC43mEQTDTvTqjTasLFi7VHze60hRygdORYhz
vSyiDpLryFh8DSg9CT/UXWPbe3okFTtLLXfxI52v/donZ2OXf6b39TzD1rU3jw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486647;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Ey1l8oc3p6ue872YSjN+wZzxMxUTSnKVFgfbHcUR2pQ=;
b=NSYMeDG98+UsWxPiusrL4tNoQdAtK23qMwWq9BpHx6OK/QL7G8IX5LxN4gcH4E5Suf0OqW
iy5t3Iy+stIEuBs/CDaJD9zd02CK0J8KaFd1ojrQwuNXL49GnIUjLqASF8rY7ylCj/uu53
eH/IYEmLPFIiGAUAndQek6fgEo0WsvJdcJXR/eyfGMWoa5pHcd3q524NcqRK07MkNa6WAY
eoKltb+on0Pg335KW2Lmu5PtT+bhA/8W0RdwCc7QiZhyu6mEQCl59Sa+oBp461k1yyBLis
vbjGvSBMPf+WH9ba/oiRFr6nSxlVbsPpWyFnKgcIg0sGCsGHeWNybCOzZCwS7Q==
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 4WzblV73M1zhmd;
Wed, 4 Sep 2024 21:50: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 484LokW6031814;
Wed, 4 Sep 2024 21:50:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LokCu031811;
Wed, 4 Sep 2024 21:50:46 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:46 GMT
Message-Id: <202409042150.484LokCu031811@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 5967352a923e - main - x86 iommu: move DMAR-independent
parts of the interrupt setup code into common
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5967352a923efe6676bdf794d6b73f7354719a43
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=5967352a923efe6676bdf794d6b73f7354719a43
commit 5967352a923efe6676bdf794d6b73f7354719a43
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-09 19:36:10 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
x86 iommu: move DMAR-independent parts of the interrupt setup code into common
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_dmar.h | 24 ++-----
sys/x86/iommu/intel_drv.c | 151 ++++++++++++--------------------------------
sys/x86/iommu/intel_fault.c | 16 +++--
sys/x86/iommu/intel_qi.c | 14 ++--
sys/x86/iommu/iommu_utils.c | 105 ++++++++++++++++++++++++++++++
sys/x86/iommu/x86_iommu.h | 23 +++++++
6 files changed, 193 insertions(+), 140 deletions(-)
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index 7b4a7900fa25..0242e0cb954f 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -103,20 +103,6 @@ struct dmar_ctx {
#define CTX2DMAR(ctx) (CTX2DOM(ctx)->dmar)
#define DOM2DMAR(domain) ((domain)->dmar)
-struct dmar_msi_data {
- int irq;
- int irq_rid;
- struct resource *irq_res;
- void *intr_handle;
- int (*handler)(void *);
- int msi_data_reg;
- int msi_addr_reg;
- int msi_uaddr_reg;
- void (*enable_intr)(struct dmar_unit *);
- void (*disable_intr)(struct dmar_unit *);
- const char *name;
-};
-
#define DMAR_INTR_FAULT 0
#define DMAR_INTR_QI 1
#define DMAR_INTR_TOTAL 2
@@ -131,8 +117,6 @@ struct dmar_unit {
int reg_rid;
struct resource *regs;
- struct dmar_msi_data intrs[DMAR_INTR_TOTAL];
-
/* Hardware registers cache */
uint32_t hw_ver;
uint64_t hw_cap;
@@ -216,14 +200,14 @@ uint64_t dmar_get_timeout(void);
void dmar_update_timeout(uint64_t newval);
int dmar_fault_intr(void *arg);
-void dmar_enable_fault_intr(struct dmar_unit *unit);
-void dmar_disable_fault_intr(struct dmar_unit *unit);
+void dmar_enable_fault_intr(struct iommu_unit *unit);
+void dmar_disable_fault_intr(struct iommu_unit *unit);
int dmar_init_fault_log(struct dmar_unit *unit);
void dmar_fini_fault_log(struct dmar_unit *unit);
int dmar_qi_intr(void *arg);
-void dmar_enable_qi_intr(struct dmar_unit *unit);
-void dmar_disable_qi_intr(struct dmar_unit *unit);
+void dmar_enable_qi_intr(struct iommu_unit *unit);
+void dmar_disable_qi_intr(struct iommu_unit *unit);
int dmar_init_qi(struct dmar_unit *unit);
void dmar_fini_qi(struct dmar_unit *unit);
void dmar_qi_invalidate_locked(struct dmar_domain *domain,
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
index 66d99748888f..2439ef9e4ef5 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -230,22 +230,6 @@ dmar_probe(device_t dev)
return (BUS_PROBE_NOWILDCARD);
}
-static void
-dmar_release_intr(device_t dev, struct dmar_unit *unit, int idx)
-{
- struct dmar_msi_data *dmd;
-
- dmd = &unit->intrs[idx];
- if (dmd->irq == -1)
- return;
- bus_teardown_intr(dev, dmd->irq_res, dmd->intr_handle);
- bus_release_resource(dev, SYS_RES_IRQ, dmd->irq_rid, dmd->irq_res);
- bus_delete_resource(dev, SYS_RES_IRQ, dmd->irq_rid);
- PCIB_RELEASE_MSIX(device_get_parent(device_get_parent(dev)),
- dev, dmd->irq);
- dmd->irq = -1;
-}
-
static void
dmar_release_resources(device_t dev, struct dmar_unit *unit)
{
@@ -256,7 +240,7 @@ dmar_release_resources(device_t dev, struct dmar_unit *unit)
dmar_fini_qi(unit);
dmar_fini_fault_log(unit);
for (i = 0; i < DMAR_INTR_TOTAL; i++)
- dmar_release_intr(dev, unit, i);
+ iommu_release_intr(DMAR2IOMMU(unit), i);
if (unit->regs != NULL) {
bus_deactivate_resource(dev, SYS_RES_MEMORY, unit->reg_rid,
unit->regs);
@@ -274,84 +258,19 @@ dmar_release_resources(device_t dev, struct dmar_unit *unit)
}
}
-static int
-dmar_alloc_irq(device_t dev, struct dmar_unit *unit, int idx)
-{
- device_t pcib;
- struct dmar_msi_data *dmd;
- uint64_t msi_addr;
- uint32_t msi_data;
- int error;
-
- dmd = &unit->intrs[idx];
- pcib = device_get_parent(device_get_parent(dev)); /* Really not pcib */
- error = PCIB_ALLOC_MSIX(pcib, dev, &dmd->irq);
- if (error != 0) {
- device_printf(dev, "cannot allocate %s interrupt, %d\n",
- dmd->name, error);
- goto err1;
- }
- error = bus_set_resource(dev, SYS_RES_IRQ, dmd->irq_rid,
- dmd->irq, 1);
- if (error != 0) {
- device_printf(dev, "cannot set %s interrupt resource, %d\n",
- dmd->name, error);
- goto err2;
- }
- dmd->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
- &dmd->irq_rid, RF_ACTIVE);
- if (dmd->irq_res == NULL) {
- device_printf(dev,
- "cannot allocate resource for %s interrupt\n", dmd->name);
- error = ENXIO;
- goto err3;
- }
- error = bus_setup_intr(dev, dmd->irq_res, INTR_TYPE_MISC,
- dmd->handler, NULL, unit, &dmd->intr_handle);
- if (error != 0) {
- device_printf(dev, "cannot setup %s interrupt, %d\n",
- dmd->name, error);
- goto err4;
- }
- bus_describe_intr(dev, dmd->irq_res, dmd->intr_handle, "%s", dmd->name);
- error = PCIB_MAP_MSI(pcib, dev, dmd->irq, &msi_addr, &msi_data);
- if (error != 0) {
- device_printf(dev, "cannot map %s interrupt, %d\n",
- dmd->name, error);
- goto err5;
- }
- dmar_write4(unit, dmd->msi_data_reg, msi_data);
- dmar_write4(unit, dmd->msi_addr_reg, msi_addr);
- /* Only for xAPIC mode */
- dmar_write4(unit, dmd->msi_uaddr_reg, msi_addr >> 32);
- return (0);
-
-err5:
- bus_teardown_intr(dev, dmd->irq_res, dmd->intr_handle);
-err4:
- bus_release_resource(dev, SYS_RES_IRQ, dmd->irq_rid, dmd->irq_res);
-err3:
- bus_delete_resource(dev, SYS_RES_IRQ, dmd->irq_rid);
-err2:
- PCIB_RELEASE_MSIX(pcib, dev, dmd->irq);
- dmd->irq = -1;
-err1:
- return (error);
-}
-
#ifdef DEV_APIC
static int
dmar_remap_intr(device_t dev, device_t child, u_int irq)
{
struct dmar_unit *unit;
- struct dmar_msi_data *dmd;
+ struct iommu_msi_data *dmd;
uint64_t msi_addr;
uint32_t msi_data;
int i, error;
unit = device_get_softc(dev);
for (i = 0; i < DMAR_INTR_TOTAL; i++) {
- dmd = &unit->intrs[i];
+ dmd = &unit->x86c.intrs[i];
if (irq == dmd->irq) {
error = PCIB_MAP_MSI(device_get_parent(
device_get_parent(dev)),
@@ -359,11 +278,14 @@ dmar_remap_intr(device_t dev, device_t child, u_int irq)
if (error != 0)
return (error);
DMAR_LOCK(unit);
- (dmd->disable_intr)(unit);
- dmar_write4(unit, dmd->msi_data_reg, msi_data);
- dmar_write4(unit, dmd->msi_addr_reg, msi_addr);
- dmar_write4(unit, dmd->msi_uaddr_reg, msi_addr >> 32);
- (dmd->enable_intr)(unit);
+ dmd->msi_data = msi_data;
+ dmd->msi_addr = msi_addr;
+ (dmd->disable_intr)(DMAR2IOMMU(unit));
+ dmar_write4(unit, dmd->msi_data_reg, dmd->msi_data);
+ dmar_write4(unit, dmd->msi_addr_reg, dmd->msi_addr);
+ dmar_write4(unit, dmd->msi_uaddr_reg,
+ dmd->msi_addr >> 32);
+ (dmd->enable_intr)(DMAR2IOMMU(unit));
DMAR_UNLOCK(unit);
return (0);
}
@@ -407,6 +329,7 @@ dmar_attach(device_t dev)
{
struct dmar_unit *unit;
ACPI_DMAR_HARDWARE_UNIT *dmaru;
+ struct iommu_msi_data *dmd;
uint64_t timeout;
int disable_pmr;
int i, error;
@@ -439,37 +362,47 @@ dmar_attach(device_t dev)
dmar_update_timeout(timeout);
for (i = 0; i < DMAR_INTR_TOTAL; i++)
- unit->intrs[i].irq = -1;
-
- unit->intrs[DMAR_INTR_FAULT].name = "fault";
- unit->intrs[DMAR_INTR_FAULT].irq_rid = DMAR_FAULT_IRQ_RID;
- unit->intrs[DMAR_INTR_FAULT].handler = dmar_fault_intr;
- unit->intrs[DMAR_INTR_FAULT].msi_data_reg = DMAR_FEDATA_REG;
- unit->intrs[DMAR_INTR_FAULT].msi_addr_reg = DMAR_FEADDR_REG;
- unit->intrs[DMAR_INTR_FAULT].msi_uaddr_reg = DMAR_FEUADDR_REG;
- unit->intrs[DMAR_INTR_FAULT].enable_intr = dmar_enable_fault_intr;
- unit->intrs[DMAR_INTR_FAULT].disable_intr = dmar_disable_fault_intr;
- error = dmar_alloc_irq(dev, unit, DMAR_INTR_FAULT);
+ unit->x86c.intrs[i].irq = -1;
+
+ dmd = &unit->x86c.intrs[DMAR_INTR_FAULT];
+ dmd->name = "fault";
+ dmd->irq_rid = DMAR_FAULT_IRQ_RID;
+ dmd->handler = dmar_fault_intr;
+ dmd->msi_data_reg = DMAR_FEDATA_REG;
+ dmd->msi_addr_reg = DMAR_FEADDR_REG;
+ dmd->msi_uaddr_reg = DMAR_FEUADDR_REG;
+ dmd->enable_intr = dmar_enable_fault_intr;
+ dmd->disable_intr = dmar_disable_fault_intr;
+ error = iommu_alloc_irq(DMAR2IOMMU(unit), DMAR_INTR_FAULT);
if (error != 0) {
dmar_release_resources(dev, unit);
dmar_devs[unit->iommu.unit] = NULL;
return (error);
}
+ dmar_write4(unit, dmd->msi_data_reg, dmd->msi_data);
+ dmar_write4(unit, dmd->msi_addr_reg, dmd->msi_addr);
+ dmar_write4(unit, dmd->msi_uaddr_reg, dmd->msi_addr >> 32);
+
if (DMAR_HAS_QI(unit)) {
- unit->intrs[DMAR_INTR_QI].name = "qi";
- unit->intrs[DMAR_INTR_QI].irq_rid = DMAR_QI_IRQ_RID;
- unit->intrs[DMAR_INTR_QI].handler = dmar_qi_intr;
- unit->intrs[DMAR_INTR_QI].msi_data_reg = DMAR_IEDATA_REG;
- unit->intrs[DMAR_INTR_QI].msi_addr_reg = DMAR_IEADDR_REG;
- unit->intrs[DMAR_INTR_QI].msi_uaddr_reg = DMAR_IEUADDR_REG;
- unit->intrs[DMAR_INTR_QI].enable_intr = dmar_enable_qi_intr;
- unit->intrs[DMAR_INTR_QI].disable_intr = dmar_disable_qi_intr;
- error = dmar_alloc_irq(dev, unit, DMAR_INTR_QI);
+ dmd = &unit->x86c.intrs[DMAR_INTR_QI];
+ dmd->name = "qi";
+ dmd->irq_rid = DMAR_QI_IRQ_RID;
+ dmd->handler = dmar_qi_intr;
+ dmd->msi_data_reg = DMAR_IEDATA_REG;
+ dmd->msi_addr_reg = DMAR_IEADDR_REG;
+ dmd->msi_uaddr_reg = DMAR_IEUADDR_REG;
+ dmd->enable_intr = dmar_enable_qi_intr;
+ dmd->disable_intr = dmar_disable_qi_intr;
+ error = iommu_alloc_irq(DMAR2IOMMU(unit), DMAR_INTR_QI);
if (error != 0) {
dmar_release_resources(dev, unit);
dmar_devs[unit->iommu.unit] = NULL;
return (error);
}
+
+ dmar_write4(unit, dmd->msi_data_reg, dmd->msi_data);
+ dmar_write4(unit, dmd->msi_addr_reg, dmd->msi_addr);
+ dmar_write4(unit, dmd->msi_uaddr_reg, dmd->msi_addr >> 32);
}
mtx_init(&unit->iommu.lock, "dmarhw", NULL, MTX_DEF);
diff --git a/sys/x86/iommu/intel_fault.c b/sys/x86/iommu/intel_fault.c
index 59b482720cf1..1064165ea5d7 100644
--- a/sys/x86/iommu/intel_fault.c
+++ b/sys/x86/iommu/intel_fault.c
@@ -127,7 +127,7 @@ dmar_fault_intr(void *arg)
int fri, frir, faultp;
bool enqueue;
- unit = arg;
+ unit = IOMMU2DMAR((struct iommu_unit *)arg);
enqueue = false;
fsts = dmar_read4(unit, DMAR_FSTS_REG);
dmar_fault_intr_clear(unit, fsts);
@@ -276,9 +276,9 @@ dmar_init_fault_log(struct dmar_unit *unit)
"dmar%d fault taskq", unit->iommu.unit);
DMAR_LOCK(unit);
- dmar_disable_fault_intr(unit);
+ dmar_disable_fault_intr(&unit->iommu);
dmar_clear_faults(unit);
- dmar_enable_fault_intr(unit);
+ dmar_enable_fault_intr(&unit->iommu);
DMAR_UNLOCK(unit);
return (0);
@@ -292,7 +292,7 @@ dmar_fini_fault_log(struct dmar_unit *unit)
return;
DMAR_LOCK(unit);
- dmar_disable_fault_intr(unit);
+ dmar_disable_fault_intr(&unit->iommu);
DMAR_UNLOCK(unit);
taskqueue_drain(unit->fault_taskqueue, &unit->fault_task);
@@ -306,10 +306,12 @@ dmar_fini_fault_log(struct dmar_unit *unit)
}
void
-dmar_enable_fault_intr(struct dmar_unit *unit)
+dmar_enable_fault_intr(struct iommu_unit *iommu)
{
+ struct dmar_unit *unit;
uint32_t fectl;
+ unit = IOMMU2DMAR(iommu);
DMAR_ASSERT_LOCKED(unit);
fectl = dmar_read4(unit, DMAR_FECTL_REG);
fectl &= ~DMAR_FECTL_IM;
@@ -317,10 +319,12 @@ dmar_enable_fault_intr(struct dmar_unit *unit)
}
void
-dmar_disable_fault_intr(struct dmar_unit *unit)
+dmar_disable_fault_intr(struct iommu_unit *iommu)
{
+ struct dmar_unit *unit;
uint32_t fectl;
+ unit = IOMMU2DMAR(iommu);
DMAR_ASSERT_LOCKED(unit);
fectl = dmar_read4(unit, DMAR_FECTL_REG);
dmar_write4(unit, DMAR_FECTL_REG, fectl | DMAR_FECTL_IM);
diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c
index 8b5cfe3c0205..c11946ad9447 100644
--- a/sys/x86/iommu/intel_qi.c
+++ b/sys/x86/iommu/intel_qi.c
@@ -293,7 +293,7 @@ dmar_qi_intr(void *arg)
{
struct dmar_unit *unit;
- unit = arg;
+ unit = IOMMU2DMAR((struct iommu_unit *)arg);
KASSERT(unit->qi_enabled, ("dmar%d: QI is not enabled",
unit->iommu.unit));
taskqueue_enqueue(unit->x86c.qi_taskqueue, &unit->x86c.qi_task);
@@ -373,7 +373,7 @@ dmar_init_qi(struct dmar_unit *unit)
ics = DMAR_ICS_IWC;
dmar_write4(unit, DMAR_ICS_REG, ics);
}
- dmar_enable_qi_intr(unit);
+ dmar_enable_qi_intr(DMAR2IOMMU(unit));
DMAR_UNLOCK(unit);
return (0);
@@ -382,7 +382,7 @@ dmar_init_qi(struct dmar_unit *unit)
static void
dmar_fini_qi_helper(struct iommu_unit *iommu)
{
- dmar_disable_qi_intr(IOMMU2DMAR(iommu));
+ dmar_disable_qi_intr(iommu);
dmar_disable_qi(IOMMU2DMAR(iommu));
}
@@ -396,10 +396,12 @@ dmar_fini_qi(struct dmar_unit *unit)
}
void
-dmar_enable_qi_intr(struct dmar_unit *unit)
+dmar_enable_qi_intr(struct iommu_unit *iommu)
{
+ struct dmar_unit *unit;
uint32_t iectl;
+ unit = IOMMU2DMAR(iommu);
DMAR_ASSERT_LOCKED(unit);
KASSERT(DMAR_HAS_QI(unit), ("dmar%d: QI is not supported",
unit->iommu.unit));
@@ -409,10 +411,12 @@ dmar_enable_qi_intr(struct dmar_unit *unit)
}
void
-dmar_disable_qi_intr(struct dmar_unit *unit)
+dmar_disable_qi_intr(struct iommu_unit *iommu)
{
+ struct dmar_unit *unit;
uint32_t iectl;
+ unit = IOMMU2DMAR(iommu);
DMAR_ASSERT_LOCKED(unit);
KASSERT(DMAR_HAS_QI(unit), ("dmar%d: QI is not supported",
unit->iommu.unit));
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 571e5a2e65cd..04d42799310e 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -28,7 +28,15 @@
* SUCH DAMAGE.
*/
+#include "opt_acpi.h"
+#if defined(__amd64__)
+#define DEV_APIC
+#else
+#include "opt_apic.h"
+#endif
+
#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
@@ -38,6 +46,7 @@
#include <sys/sysctl.h>
#include <sys/proc.h>
#include <sys/sched.h>
+#include <sys/rman.h>
#include <sys/rwlock.h>
#include <sys/taskqueue.h>
#include <sys/tree.h>
@@ -48,6 +57,7 @@
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <machine/atomic.h>
#include <machine/bus.h>
#include <machine/cpu.h>
@@ -56,6 +66,12 @@
#include <dev/iommu/iommu.h>
#include <x86/iommu/x86_iommu.h>
#include <x86/iommu/iommu_intrmap.h>
+#ifdef DEV_APIC
+#include "pcib_if.h"
+#include <machine/intr_machdep.h>
+#include <x86/apicreg.h>
+#include <x86/apicvar.h>
+#endif
vm_page_t
iommu_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags)
@@ -483,3 +499,92 @@ iommu_qi_common_fini(struct iommu_unit *unit, void (*disable_qi)(
x86c->inv_queue = NULL;
x86c->inv_queue_size = 0;
}
+
+int
+iommu_alloc_irq(struct iommu_unit *unit, int idx)
+{
+ device_t dev, pcib;
+ struct iommu_msi_data *dmd;
+ uint64_t msi_addr;
+ uint32_t msi_data;
+ int error;
+
+ MPASS(idx >= 0 || idx < IOMMU_MAX_MSI);
+
+ dev = unit->dev;
+ dmd = &IOMMU2X86C(unit)->intrs[idx];
+ pcib = device_get_parent(device_get_parent(dev)); /* Really not pcib */
+ error = PCIB_ALLOC_MSIX(pcib, dev, &dmd->irq);
+ if (error != 0) {
+ device_printf(dev, "cannot allocate %s interrupt, %d\n",
+ dmd->name, error);
+ goto err1;
+ }
+ error = bus_set_resource(dev, SYS_RES_IRQ, dmd->irq_rid,
+ dmd->irq, 1);
+ if (error != 0) {
+ device_printf(dev, "cannot set %s interrupt resource, %d\n",
+ dmd->name, error);
+ goto err2;
+ }
+ dmd->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &dmd->irq_rid, RF_ACTIVE);
+ if (dmd->irq_res == NULL) {
+ device_printf(dev,
+ "cannot allocate resource for %s interrupt\n", dmd->name);
+ error = ENXIO;
+ goto err3;
+ }
+ error = bus_setup_intr(dev, dmd->irq_res, INTR_TYPE_MISC,
+ dmd->handler, NULL, unit, &dmd->intr_handle);
+ if (error != 0) {
+ device_printf(dev, "cannot setup %s interrupt, %d\n",
+ dmd->name, error);
+ goto err4;
+ }
+ bus_describe_intr(dev, dmd->irq_res, dmd->intr_handle, "%s", dmd->name);
+ error = PCIB_MAP_MSI(pcib, dev, dmd->irq, &msi_addr, &msi_data);
+ if (error != 0) {
+ device_printf(dev, "cannot map %s interrupt, %d\n",
+ dmd->name, error);
+ goto err5;
+ }
+
+ dmd->msi_data = msi_data;
+ dmd->msi_addr = msi_addr;
+
+ return (0);
+
+err5:
+ bus_teardown_intr(dev, dmd->irq_res, dmd->intr_handle);
+err4:
+ bus_release_resource(dev, SYS_RES_IRQ, dmd->irq_rid, dmd->irq_res);
+err3:
+ bus_delete_resource(dev, SYS_RES_IRQ, dmd->irq_rid);
+err2:
+ PCIB_RELEASE_MSIX(pcib, dev, dmd->irq);
+ dmd->irq = -1;
+err1:
+ return (error);
+}
+
+void
+iommu_release_intr(struct iommu_unit *unit, int idx)
+{
+ device_t dev;
+ struct iommu_msi_data *dmd;
+
+ MPASS(idx >= 0 || idx < IOMMU_MAX_MSI);
+
+ dmd = &IOMMU2X86C(unit)->intrs[idx];
+ if (dmd->handler == NULL || dmd->irq == -1)
+ return;
+ dev = unit->dev;
+
+ bus_teardown_intr(dev, dmd->irq_res, dmd->intr_handle);
+ bus_release_resource(dev, SYS_RES_IRQ, dmd->irq_rid, dmd->irq_res);
+ bus_delete_resource(dev, SYS_RES_IRQ, dmd->irq_rid);
+ PCIB_RELEASE_MSIX(device_get_parent(device_get_parent(dev)),
+ dev, dmd->irq);
+ dmd->irq = -1;
+}
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index 966a13c19b6e..d6e3ea56bd2c 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -93,6 +93,24 @@ struct x86_iommu {
void set_x86_iommu(struct x86_iommu *);
struct x86_iommu *get_x86_iommu(void);
+struct iommu_msi_data {
+ int irq;
+ int irq_rid;
+ struct resource *irq_res;
+ void *intr_handle;
+ int (*handler)(void *);
+ int msi_data_reg;
+ int msi_addr_reg;
+ int msi_uaddr_reg;
+ uint64_t msi_addr;
+ uint32_t msi_data;
+ void (*enable_intr)(struct iommu_unit *);
+ void (*disable_intr)(struct iommu_unit *);
+ const char *name;
+};
+
+#define IOMMU_MAX_MSI 3
+
struct x86_unit_common {
uint32_t qi_buf_maxsz;
uint32_t qi_cmd_sz;
@@ -145,6 +163,8 @@ struct x86_unit_common {
struct iommu_map_entry *tlb_flush_tail;
struct task qi_task;
struct taskqueue *qi_taskqueue;
+
+ struct iommu_msi_data intrs[IOMMU_MAX_MSI];
};
void iommu_qi_emit_wait_seq(struct iommu_unit *unit, struct iommu_qi_genseq *
@@ -160,4 +180,7 @@ void iommu_qi_common_init(struct iommu_unit *unit, task_fn_t taskfunc);
void iommu_qi_common_fini(struct iommu_unit *unit, void (*disable_qi)(
struct iommu_unit *));
+int iommu_alloc_irq(struct iommu_unit *unit, int idx);
+void iommu_release_intr(struct iommu_unit *unit, int idx);
+
#endif
From nobody Wed Sep 4 21:50:45 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblV20R1z5VRth;
Wed, 04 Sep 2024 21:50: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 4WzblT6yghz4gwF;
Wed, 4 Sep 2024 21:50:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486646;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MzT9JLiWgwVVlERcOtrJ40uZAUX2Nm5vz86Eu35pbuQ=;
b=QXTY10KuZaUZAsp3eQ5mQnf0LLPmT32Rvf61zPiLhZlaRZh2iV+Yl2ptNwJxoo1ezOl9KL
ft2rVqdnybKGUr7eFLInoaCKNJGD/vZe/tiCCcy8jN4DOhie6f3nFbyiTcylOu/AAdJlJL
MqDoIdb/v5D2Nl5bHX+F8X7nhytugvDFElJCGnuQ2MXrDZdIHYu/EUcVWDaDRA6b+vbt1Z
VSqkN8vuvexu6tlgmz6ujYa4W1IVKev2WNsxHeoB1wEeuRuLeO7RECysBwkkazyKU/jUFK
wQEFndXmpvkLt9hJxhC0FnoOZI6NeMgkk60dzLtl1uZWov+VJ/N2EKQ6J4lsiQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486646; a=rsa-sha256; cv=none;
b=IoEj1r/WNxbdhMtF+hs5qkGV06pQSfI7ehtjtvP6JpMaUNd1M3NeT3i7r+sKODULUhbAsG
UE8odMS0iqPUjdwPnVbl++Qd8YrK0P5zk6FxTqTJmcnmLq7E6jPvxlsOagI/jvy0dnUrXZ
twNneHaqNrPSciDw7B871lVGkKPZslFmo0KHNKFze6qJP5huZx5ScatU8np2+wgQIYO8W4
4mJcLtDqKTOECv0z0IRdA++jC10C2AkCoHpYtLQifSCfZogm2yHFEXsTf1F9tOgDr7ml5D
dCXbcSULAA2pBVNUndNs9/c3S4yEZXZT0tyqY2o10ZuCcKHmybtYy9yE4i+Yxg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486646;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MzT9JLiWgwVVlERcOtrJ40uZAUX2Nm5vz86Eu35pbuQ=;
b=uaL2GP3NjbyE2gONYDYPzR7tbHNPoTK/WEivBVWTWQtQ5GGFzguS7gIY8RU4wKeGZLdC0b
2B3t9hIDQiwgmtZ95nPZVvBE7BarsF2o8FHAOaI+MB5Wh35WT1YVjHiaAvnrOH7wR8Gf6T
C36OFei5OH8BFgWvVxfl9ExzJ8K9r6SPgLhhqeBwsjHixHa53It/Ta9zL+sLx7Qezb1v2V
dqeRblQOuyskWn8uJA0jh16jhcSwfkN+lDbN3LdjVmguvLPXSP7A9CLH4vGwaQVPvoxOMW
L4GYHmQ+z7WJfWu+nRVVDWOxQUe7Tw9/pJaQLr0TiuaGNa7Pk2HBKUQd+jjucQ==
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 4WzblT6Yz5zh2r;
Wed, 4 Sep 2024 21:50: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 484Loj5a031749;
Wed, 4 Sep 2024 21:50:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LojXZ031746;
Wed, 4 Sep 2024 21:50:45 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:45 GMT
Message-Id: <202409042150.484LojXZ031746@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: fc8da73b93be - main - x86 iommu x86_unit_common:
expand hw completion write-out area to 8 bytes
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: fc8da73b93be3f5cc50f7607dbcfc1edb911de65
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=fc8da73b93be3f5cc50f7607dbcfc1edb911de65
commit fc8da73b93be3f5cc50f7607dbcfc1edb911de65
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-09 14:08:28 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:18 +0000
x86 iommu x86_unit_common: expand hw completion write-out area to 8 bytes
in preparation to share it with AMD IOMMU. AMD writes out 8 bytes. We
use 32-bit completion sequence numbers, and CPUs are little-endian. So
the expansion is acceptable on Intel.
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_drv.c | 4 ++--
sys/x86/iommu/x86_iommu.h | 10 ++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
index 9fa1b3f98dc6..66d99748888f 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -1302,7 +1302,7 @@ dmar_print_one(int idx, bool show_domains, bool show_mappings)
db_printf("qi is enabled: queue @0x%jx (IQA 0x%jx) "
"size 0x%jx\n"
" head 0x%x tail 0x%x avail 0x%x status 0x%x ctrl 0x%x\n"
- " hw compl 0x%x@%p/phys@%jx next seq 0x%x gen 0x%x\n",
+ " hw compl 0x%jx@%p/phys@%jx next seq 0x%x gen 0x%x\n",
(uintmax_t)unit->x86c.inv_queue,
(uintmax_t)dmar_read8(unit, DMAR_IQA_REG),
(uintmax_t)unit->x86c.inv_queue_size,
@@ -1311,7 +1311,7 @@ dmar_print_one(int idx, bool show_domains, bool show_mappings)
unit->x86c.inv_queue_avail,
dmar_read4(unit, DMAR_ICS_REG),
dmar_read4(unit, DMAR_IECTL_REG),
- unit->x86c.inv_waitd_seq_hw,
+ (uintmax_t)unit->x86c.inv_waitd_seq_hw,
&unit->x86c.inv_waitd_seq_hw,
(uintmax_t)unit->x86c.inv_waitd_seq_hw_phys,
unit->x86c.inv_waitd_seq,
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index eb1bbafbeb77..966a13c19b6e 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -101,8 +101,14 @@ struct x86_unit_common {
vm_size_t inv_queue_size;
uint32_t inv_queue_avail;
uint32_t inv_queue_tail;
- volatile uint32_t inv_waitd_seq_hw; /* hw writes there on wait
- descr completion */
+
+ /*
+ * Hw writes there on completion of wait descriptor
+ * processing. Intel writes 4 bytes, while AMD does the
+ * 8-bytes write. Due to little-endian, and use of 4-byte
+ * sequence numbers, the difference does not matter for us.
+ */
+ volatile uint64_t inv_waitd_seq_hw;
uint64_t inv_waitd_seq_hw_phys;
uint32_t inv_waitd_seq; /* next sequence number to use for wait descr */
From nobody Wed Sep 4 21:50:48 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblX2qlvz5VS4w;
Wed, 04 Sep 2024 21:50: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 4WzblX17rbz4hQy;
Wed, 4 Sep 2024 21:50:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486648;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Chra9jl4EA/8VYddGt6Ag1COTiIt6Jbc6xgmocofp1E=;
b=AB2Gvx0NtCS3xmMNCyP/uQNKsjp/8292CzLIc+YWuXgfSG7tVEw11fBvID7/ReckhUPXZ/
3IbrnIWYgHFLH6jmsvS2rKdYH64JljoeWI9Ow1RhQP9S+38JUe5BCtMEqrfq3sJi0Akq5z
eXwyA5cO1VHoqiMsBoIiv16zDR1ZRKgSU+yKF6m4oKFf0bpyTYhxKlKE/hMGtHJJb4gjao
q4w8hRv5ICXdsP05m9fM4lbCxE+aPWzV4aHNyTvc5vvJjYfaVC4ZUIOHlOJeXtMG5SanZr
WjHMP0PpsC0lWqbybgvWzUvlLmBqBexYWCin/nmhC3HFjQeRG8e8KX1bwLpDAw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486648; a=rsa-sha256; cv=none;
b=IQfrX3WnI08vdkutsCYC52PTXvPEfsURNxPg21eG6MshJAfBKwWTUGjl+KxBLoKut2wciq
JEHikFSnCtrCt53eKBhh36V4Qe1Ah8UPYWoV9q5C9FKUYcG2mrXBrHgT2Q/woRbjv7rxZ9
T6tOBkfUfZHebiPQVT91ihRvltFfTBihJuB587paBZz/52xBe2qNUT8rXpmfS5dn65mBxW
/sjRWyzvDz/+UsqOPuEV3y2koipaDpC73+Eru9OQHQUS3VZmmIQVJTQmnubcVJoeZxHg03
JM6SEbA6KDJ0ntu9hZx8aMPRfaPy4/nTOo9xiN5MYrOXqDCovn7XU2FS19w1Mw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486648;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Chra9jl4EA/8VYddGt6Ag1COTiIt6Jbc6xgmocofp1E=;
b=eKJyrOm7OjSv9vBAT9W/8pzONzUJfaE72qn/AAG5K/+1lq0l+taUdvklHZdGC9m91QZYvj
wqUN+oimbmZoEAcnQK9L7Q6yBRj88MybH2ZsS/+kNX8m9OS0B2AHrQ9yWUNTvQoGqV8Pim
EbJR8pOatlxsMXvP9hc7N6tfoTsAUYsmApZRGkRebwiGjAoNok0mcD/pKkdQl6tBb1vOeP
uYMcv/TXx7g+icQaZUhNsMFK1hzK1kpMwY1S19bJDY7L4h+ivEw/Fbbel8aLGok/iDw4RN
tdRaUT/hpNmzzxQ8bd64lWsPEEbcE9rwV8sTxNvmrEbvv3Pq57qX9mORbn+RjA==
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 4WzblX0mCSzhmf;
Wed, 4 Sep 2024 21:50: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 484LompP032725;
Wed, 4 Sep 2024 21:50:48 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LomsT032722;
Wed, 4 Sep 2024 21:50:48 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:48 GMT
Message-Id: <202409042150.484LomsT032722@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: ff54674b0950 - main - x86 iommu: move device_tag_init()
to utils
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: ff54674b09501f4302e675bb2d3e34a752a63405
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=ff54674b09501f4302e675bb2d3e34a752a63405
commit ff54674b09501f4302e675bb2d3e34a752a63405
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-06-30 01:16:51 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
x86 iommu: move device_tag_init() to utils
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_ctx.c | 21 +--------------------
sys/x86/iommu/iommu_utils.c | 17 +++++++++++++++++
sys/x86/iommu/x86_iommu.h | 2 ++
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index e39d2a136d8a..12dd0f0a5259 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -124,25 +124,6 @@ dmar_map_ctx_entry(struct dmar_ctx *ctx, struct sf_buf **sfp)
return (ctxp);
}
-static void
-device_tag_init(struct dmar_ctx *ctx, device_t dev)
-{
- struct dmar_domain *domain;
- bus_addr_t maxaddr;
-
- domain = CTX2DOM(ctx);
- maxaddr = MIN(domain->iodom.end, BUS_SPACE_MAXADDR);
- ctx->context.tag->common.impl = &bus_dma_iommu_impl;
- ctx->context.tag->common.boundary = 0;
- ctx->context.tag->common.lowaddr = maxaddr;
- ctx->context.tag->common.highaddr = maxaddr;
- ctx->context.tag->common.maxsize = maxaddr;
- ctx->context.tag->common.nsegments = BUS_SPACE_UNRESTRICTED;
- ctx->context.tag->common.maxsegsz = maxaddr;
- ctx->context.tag->ctx = CTX2IOCTX(ctx);
- ctx->context.tag->owner = dev;
-}
-
static void
ctx_id_entry_init_one(dmar_ctx_entry_t *ctxp, struct dmar_domain *domain,
vm_page_t ctx_root)
@@ -586,7 +567,7 @@ dmar_get_ctx_for_dev1(struct dmar_unit *dmar, device_t dev, uint16_t rid,
ctx = ctx1;
dmar_ctx_link(ctx);
ctx->context.tag->owner = dev;
- device_tag_init(ctx, dev);
+ iommu_device_tag_init(CTX2IOCTX(ctx), dev);
/*
* This is the first activated context for the
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 04d42799310e..20ca7890ce65 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -588,3 +588,20 @@ iommu_release_intr(struct iommu_unit *unit, int idx)
dev, dmd->irq);
dmd->irq = -1;
}
+
+void
+iommu_device_tag_init(struct iommu_ctx *ctx, device_t dev)
+{
+ bus_addr_t maxaddr;
+
+ maxaddr = MIN(ctx->domain->end, BUS_SPACE_MAXADDR);
+ ctx->tag->common.impl = &bus_dma_iommu_impl;
+ ctx->tag->common.boundary = 0;
+ ctx->tag->common.lowaddr = maxaddr;
+ ctx->tag->common.highaddr = maxaddr;
+ ctx->tag->common.maxsize = maxaddr;
+ ctx->tag->common.nsegments = BUS_SPACE_UNRESTRICTED;
+ ctx->tag->common.maxsegsz = maxaddr;
+ ctx->tag->ctx = ctx;
+ ctx->tag->owner = dev;
+}
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index d6e3ea56bd2c..5f56a2db74b5 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -183,4 +183,6 @@ void iommu_qi_common_fini(struct iommu_unit *unit, void (*disable_qi)(
int iommu_alloc_irq(struct iommu_unit *unit, int idx);
void iommu_release_intr(struct iommu_unit *unit, int idx);
+void iommu_device_tag_init(struct iommu_ctx *ctx, device_t dev);
+
#endif
From nobody Wed Sep 4 21:50:49 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblY3fs3z5VRmT;
Wed, 04 Sep 2024 21:50: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 4WzblY26Dtz4hFS;
Wed, 4 Sep 2024 21:50:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486649;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MmRimT17N0Nb0TznJREFkc5z3XOgBd+zyykcZuCfBew=;
b=YQeGWRbKgV7acXxIRTeuLg9aeX95t1XTvmfmH76iGeHhSOAQi53MSK4lMWDmLFjyPdW5qj
3S0V8ZJ+TZEXTTfLzKhmTlwYHN1/2VbPt+KpEdNsI9v8oWuZLfQOvKOVQoMKJQFw60yQdx
tdXGWnExQH1Ht9plF2PgqLcxC5gAN6sBPlLcije3GO4tVnzEhb1tW0Bp0cNxuo5frQTm+k
S/iyVdkd64Dv/ak+87PKgyTnRghEPwLaoltvVqZK149ZtKGo/S6hUOFPhgH1y/qwGwcJx3
BCu38Ol18KemkvyEgLCY8r/r97igSWjaKIXkgCc1nc2MUm3m/K4sziOfhe0SHQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486649; a=rsa-sha256; cv=none;
b=as/AI1wJQiyCINfch216LM+0m+Co57ENJpUuhQU/lbfdiiz90iRoMM7DVtAXadW8Cq45Ys
Dw97y1gMAgr/yB2NagzQXK8ZddeuQ44e8P/pm34NF/9h5KWa+EYaPlAGFZAQZKEbLijDty
o4Ga4311naOWTxjrjeltjWWsLkzws8FCV3teBIzwEaJ9r9V03ix24bsaCy3SU3CxAqIIom
dawEwkkwr53OcxwDN2luCgOebWSjWumcay3TG/TC6yMmymNaVyF9y9A71IqFcvG4b8TmAR
iPInaDlm5EgDxPzxQi1iyYgp7gaA0EuFZL0YCAg5i3c29oSxj3tI1GyzGuTSVQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486649;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MmRimT17N0Nb0TznJREFkc5z3XOgBd+zyykcZuCfBew=;
b=HTXBvT0luHMpNw1n4u1RSgOfiXyF097SMwcoCz8KPSBasxB34UA72MMXftWXt1AUuYIk8K
PTVN6BD6OxIuW37zFqzsNHiwaxQvcoQfG1WR6BYoW5He9xrQtmqZRJSkfXzE+6wAhtR/zD
RVFD71CRJ6UaSRQXG5EMjsSj3Xf2dxspHIhgk6K4DcyM2ggVfv/w4Zln+B53+bnCM7cSvM
rhzZll2HOlUtLc2JUzcj0pQIYEKSJhMtTXVRolMMMuoh+snF7wuPDDWhWYxLyfLgWgmG0o
i+I6lryVqaYIhwtbBbGaT77xOgR2OJ5CxFb8TGM55nH0mNTRM71ko+YXZmEtpA==
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 4WzblY1k1fzhL7;
Wed, 4 Sep 2024 21:50: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 484LonDD032844;
Wed, 4 Sep 2024 21:50:49 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Lonvj032841;
Wed, 4 Sep 2024 21:50:49 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:49 GMT
Message-Id: <202409042150.484Lonvj032841@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: b3042e3a7c6f - main - x86 dmar: generalize
dmar_domain_free_entry() into iommu_domain_free_entry()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: b3042e3a7c6ffee3867d52b192c6a9f4f49faf4b
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=b3042e3a7c6ffee3867d52b192c6a9f4f49faf4b
commit b3042e3a7c6ffee3867d52b192c6a9f4f49faf4b
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-07-07 03:22:00 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
x86 dmar: generalize dmar_domain_free_entry() into iommu_domain_free_entry()
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_ctx.c | 19 +++----------------
sys/x86/iommu/intel_dmar.h | 1 -
sys/x86/iommu/iommu_utils.c | 14 ++++++++++++++
sys/x86/iommu/x86_iommu.h | 2 ++
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index 12dd0f0a5259..9167bfd13589 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -833,19 +833,6 @@ dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid)
return (NULL);
}
-void
-dmar_domain_free_entry(struct iommu_map_entry *entry, bool free)
-{
- if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0)
- iommu_gas_free_region(entry);
- else
- iommu_gas_free_space(entry);
- if (free)
- iommu_gas_free_entry(entry);
- else
- entry->flags = 0;
-}
-
/*
* If the given value for "free" is true, then the caller must not be using
* the entry's dmamap_link field.
@@ -874,12 +861,12 @@ dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free,
} else {
iommu_qi_invalidate_sync(&domain->iodom, entry->start,
entry->end - entry->start, cansleep);
- dmar_domain_free_entry(entry, false);
+ iommu_domain_free_entry(entry, false);
}
} else {
domain_flush_iotlb_sync(domain, entry->start, entry->end -
entry->start);
- dmar_domain_free_entry(entry, free);
+ iommu_domain_free_entry(entry, free);
}
}
@@ -915,7 +902,7 @@ dmar_domain_unload(struct iommu_domain *iodom,
domain_flush_iotlb_sync(domain, entry->start,
entry->end - entry->start);
TAILQ_REMOVE(entries, entry, dmamap_link);
- dmar_domain_free_entry(entry, true);
+ iommu_domain_free_entry(entry, true);
}
}
if (TAILQ_EMPTY(entries))
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index 0242e0cb954f..edb152f42fe7 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -243,7 +243,6 @@ void dmar_free_ctx_method(struct iommu_ctx *ctx);
struct dmar_ctx *dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid);
struct iommu_ctx *dmar_get_ctx(struct iommu_unit *iommu, device_t dev,
uint16_t rid, bool id_mapped, bool rmrr_init);
-void dmar_domain_free_entry(struct iommu_map_entry *entry, bool free);
void dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free,
bool cansleep);
void dmar_domain_unload(struct iommu_domain *iodom,
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 20ca7890ce65..9c6cae5ff51f 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -605,3 +605,17 @@ iommu_device_tag_init(struct iommu_ctx *ctx, device_t dev)
ctx->tag->ctx = ctx;
ctx->tag->owner = dev;
}
+
+void
+iommu_domain_free_entry(struct iommu_map_entry *entry, bool free)
+{
+ if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0)
+ iommu_gas_free_region(entry);
+ else
+ iommu_gas_free_space(entry);
+ if (free)
+ iommu_gas_free_entry(entry);
+ else
+ entry->flags = 0;
+}
+
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index 5f56a2db74b5..9e3a82283729 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -167,6 +167,8 @@ struct x86_unit_common {
struct iommu_msi_data intrs[IOMMU_MAX_MSI];
};
+void iommu_domain_free_entry(struct iommu_map_entry *entry, bool free);
+
void iommu_qi_emit_wait_seq(struct iommu_unit *unit, struct iommu_qi_genseq *
pseq, bool emit_wait);
void iommu_qi_wait_for_seq(struct iommu_unit *unit, const struct
From nobody Wed Sep 4 21:50:50 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzblZ4s69z5VS0F;
Wed, 04 Sep 2024 21:50:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzblZ3YKBz4hZT;
Wed, 4 Sep 2024 21:50:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486650;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=UgGW4tOUdY/QMoE+wEIy8/2pbu3pAaSni/GrFL8n0fk=;
b=u3X2KjpeNlFwa5jVeOZzqqG1uSxRs6JIZLTZs26jQVOY3Hg0WR0mMg7/wFPV1kw+llr7y1
7B3GoEoY6F7WucROR6eP4BY8FRvCbmxLWLqpLk//XyzeHYUC9R384m/cyAX4aG43P2mCFd
hFnyrtwl1duaQCUcyUe9rzB3BFX0C9nT65lNaPsLLAeSwFE+dxz8FW4z7VxWn08WCGwH5b
eALaopSsbgotLuNgDE8p66MPvcLI+fLWAmq0v+14X2yEmIRT+ssud2flCt2hgZ43z7Z/c4
lDgEfAQRbiIjfA67FRQGZ5RLN7NHibqNlwUobx25iwnLvSWbbfFvKbFXYApdmA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486650; a=rsa-sha256; cv=none;
b=A31epf40hTtb+eOEbTW+kWAZEZY6G/xRpAh7PBSeO6tC0LAwkOBr15qLBKKgza57uVxSA2
SKEf2I0N2lrrfWf5wSWMtEvbSVC21Gmpmv5DRXpcaK9yhDDY2cO9fYZjHbZmxE7wymIziO
CqPSRnE9SKWH2cccpe5llTDr3M2voVIsoAGi/Idw0ZtCQ4VI7nsaf2QsslFzHZvM1JyDm7
fTxV6V9oURsGY5TE2zMRV8zVDpaQ75tti1OhXvctSJZatPi7Cq6b2xUNtskxuiCi4/Tqpk
44ropUKo2Eu7lItkksfYUHciWBYPiVO95R56rkShxt4/qlYjKVgKfHJ3sZWGUQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486650;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=UgGW4tOUdY/QMoE+wEIy8/2pbu3pAaSni/GrFL8n0fk=;
b=MzLCoAIt6FePoXgEv30meQQLnjPCb3mk0jzxNNC61/+LD5BZdqsUxCY6hjp/tuiPt0qsOc
CX9Csnm2XuP3dTWaLCTtvlGNVqiwyVUoA0E/eRtX9pyNTyFEy4YM8SJPasC26+T00fFwzi
hZV8AQX+pGsUlWUokmk/jSIPFKo5Mfcnsgrg65gUjn+JxtbLjodnZWllD/MpBUgucbwoOB
7F1HXf4t4H4nE71/qTtXMeUUgYz8c6WyFyLytoeFg2bEiN06k14Z4txtWLnmefENzb8RFU
O/rKNtxCvnVWCnwScD2Qm+lWebwleI+sR1EkrHMmDKkpmokN33znA4uu64VNpQ==
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 4WzblZ36kDzhmh;
Wed, 4 Sep 2024 21:50: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 484LooNH032902;
Wed, 4 Sep 2024 21:50:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Loo9b032899;
Wed, 4 Sep 2024 21:50:50 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:50 GMT
Message-Id: <202409042150.484Loo9b032899@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 29e227047065 - main - x86 iommu: move page level
related functions to common utils
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 29e227047065c6b1d08fdb72a21f33560637332b
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=29e227047065c6b1d08fdb72a21f33560637332b
commit 29e227047065c6b1d08fdb72a21f33560637332b
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-07-19 23:47:48 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
x86 iommu: move page level related functions to common utils
Also improve pglvl_page_size() to handle level 6.
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_dmar.h | 2 --
sys/x86/iommu/intel_idpgtbl.c | 38 ++---------------------
sys/x86/iommu/intel_utils.c | 37 ----------------------
sys/x86/iommu/iommu_utils.c | 71 +++++++++++++++++++++++++++++++++++++++++++
sys/x86/iommu/x86_iommu.h | 5 +++
5 files changed, 78 insertions(+), 75 deletions(-)
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index edb152f42fe7..c1e6c8f06f64 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -175,9 +175,7 @@ bool dmar_pglvl_supported(struct dmar_unit *unit, int pglvl);
int domain_set_agaw(struct dmar_domain *domain, int mgaw);
int dmar_maxaddr2mgaw(struct dmar_unit *unit, iommu_gaddr_t maxaddr,
bool allow_less);
-vm_pindex_t pglvl_max_pages(int pglvl);
int domain_is_sp_lvl(struct dmar_domain *domain, int lvl);
-iommu_gaddr_t pglvl_page_size(int total_pglvl, int lvl);
iommu_gaddr_t domain_page_size(struct dmar_domain *domain, int lvl);
int calc_am(struct dmar_unit *unit, iommu_gaddr_t base, iommu_gaddr_t size,
iommu_gaddr_t *isizep);
diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c
index eb6a51216dfd..53851622340b 100644
--- a/sys/x86/iommu/intel_idpgtbl.c
+++ b/sys/x86/iommu/intel_idpgtbl.c
@@ -316,40 +316,6 @@ put_idmap_pgtbl(vm_object_t obj)
* address. Support superpages.
*/
-/*
- * Index of the pte for the guest address base in the page table at
- * the level lvl.
- */
-static int
-domain_pgtbl_pte_off(struct dmar_domain *domain, iommu_gaddr_t base, int lvl)
-{
-
- base >>= IOMMU_PAGE_SHIFT + (domain->pglvl - lvl - 1) *
- IOMMU_NPTEPGSHIFT;
- return (base & IOMMU_PTEMASK);
-}
-
-/*
- * Returns the page index of the page table page in the page table
- * object, which maps the given address base at the page table level
- * lvl.
- */
-static vm_pindex_t
-domain_pgtbl_get_pindex(struct dmar_domain *domain, iommu_gaddr_t base, int lvl)
-{
- vm_pindex_t idx, pidx;
- int i;
-
- KASSERT(lvl >= 0 && lvl < domain->pglvl,
- ("wrong lvl %p %d", domain, lvl));
-
- for (pidx = idx = 0, i = 0; i < lvl; i++, pidx = idx) {
- idx = domain_pgtbl_pte_off(domain, base, i) +
- pidx * IOMMU_NPTEPG + 1;
- }
- return (idx);
-}
-
static iommu_pte_t *
domain_pgtbl_map_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl,
int flags, vm_pindex_t *idxp, struct sf_buf **sf)
@@ -362,7 +328,7 @@ domain_pgtbl_map_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl,
DMAR_DOMAIN_ASSERT_PGLOCKED(domain);
KASSERT((flags & IOMMU_PGF_OBJL) != 0, ("lost PGF_OBJL"));
- idx = domain_pgtbl_get_pindex(domain, base, lvl);
+ idx = pglvl_pgtbl_get_pindex(domain->pglvl, base, lvl);
if (*sf != NULL && idx == *idxp) {
pte = (iommu_pte_t *)sf_buf_kva(*sf);
} else {
@@ -414,7 +380,7 @@ retry:
goto retry;
}
}
- pte += domain_pgtbl_pte_off(domain, base, lvl);
+ pte += pglvl_pgtbl_pte_off(domain->pglvl, base, lvl);
return (pte);
}
diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c
index a96f65fddfc5..141452b3393d 100644
--- a/sys/x86/iommu/intel_utils.c
+++ b/sys/x86/iommu/intel_utils.c
@@ -172,23 +172,6 @@ dmar_maxaddr2mgaw(struct dmar_unit *unit, iommu_gaddr_t maxaddr, bool allow_less
return (-1);
}
-/*
- * Calculate the total amount of page table pages needed to map the
- * whole bus address space on the context with the selected agaw.
- */
-vm_pindex_t
-pglvl_max_pages(int pglvl)
-{
- vm_pindex_t res;
- int i;
-
- for (res = 0, i = pglvl; i > 0; i--) {
- res *= IOMMU_NPTEPG;
- res++;
- }
- return (res);
-}
-
/*
* Return true if the page table level lvl supports the superpage for
* the context ctx.
@@ -209,26 +192,6 @@ domain_is_sp_lvl(struct dmar_domain *domain, int lvl)
return (alvl < nitems(sagaw_sp) && (sagaw_sp[alvl] & cap_sps) != 0);
}
-iommu_gaddr_t
-pglvl_page_size(int total_pglvl, int lvl)
-{
- int rlvl;
- static const iommu_gaddr_t pg_sz[] = {
- (iommu_gaddr_t)IOMMU_PAGE_SIZE,
- (iommu_gaddr_t)IOMMU_PAGE_SIZE << IOMMU_NPTEPGSHIFT,
- (iommu_gaddr_t)IOMMU_PAGE_SIZE << (2 * IOMMU_NPTEPGSHIFT),
- (iommu_gaddr_t)IOMMU_PAGE_SIZE << (3 * IOMMU_NPTEPGSHIFT),
- (iommu_gaddr_t)IOMMU_PAGE_SIZE << (4 * IOMMU_NPTEPGSHIFT),
- (iommu_gaddr_t)IOMMU_PAGE_SIZE << (5 * IOMMU_NPTEPGSHIFT),
- };
-
- KASSERT(lvl >= 0 && lvl < total_pglvl,
- ("total %d lvl %d", total_pglvl, lvl));
- rlvl = total_pglvl - lvl - 1;
- KASSERT(rlvl < nitems(pg_sz), ("sizeof pg_sz lvl %d", lvl));
- return (pg_sz[rlvl]);
-}
-
iommu_gaddr_t
domain_page_size(struct dmar_domain *domain, int lvl)
{
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 9c6cae5ff51f..645c7e15740a 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -619,3 +619,74 @@ iommu_domain_free_entry(struct iommu_map_entry *entry, bool free)
entry->flags = 0;
}
+/*
+ * Index of the pte for the guest address base in the page table at
+ * the level lvl.
+ */
+int
+pglvl_pgtbl_pte_off(int pglvl, iommu_gaddr_t base, int lvl)
+{
+
+ base >>= IOMMU_PAGE_SHIFT + (pglvl - lvl - 1) *
+ IOMMU_NPTEPGSHIFT;
+ return (base & IOMMU_PTEMASK);
+}
+
+/*
+ * Returns the page index of the page table page in the page table
+ * object, which maps the given address base at the page table level
+ * lvl.
+ */
+vm_pindex_t
+pglvl_pgtbl_get_pindex(int pglvl, iommu_gaddr_t base, int lvl)
+{
+ vm_pindex_t idx, pidx;
+ int i;
+
+ KASSERT(lvl >= 0 && lvl < pglvl,
+ ("wrong lvl %d %d", pglvl, lvl));
+
+ for (pidx = idx = 0, i = 0; i < lvl; i++, pidx = idx) {
+ idx = pglvl_pgtbl_pte_off(pglvl, base, i) +
+ pidx * IOMMU_NPTEPG + 1;
+ }
+ return (idx);
+}
+
+/*
+ * Calculate the total amount of page table pages needed to map the
+ * whole bus address space on the context with the selected agaw.
+ */
+vm_pindex_t
+pglvl_max_pages(int pglvl)
+{
+ vm_pindex_t res;
+ int i;
+
+ for (res = 0, i = pglvl; i > 0; i--) {
+ res *= IOMMU_NPTEPG;
+ res++;
+ }
+ return (res);
+}
+
+iommu_gaddr_t
+pglvl_page_size(int total_pglvl, int lvl)
+{
+ int rlvl;
+ static const iommu_gaddr_t pg_sz[] = {
+ (iommu_gaddr_t)IOMMU_PAGE_SIZE,
+ (iommu_gaddr_t)IOMMU_PAGE_SIZE << IOMMU_NPTEPGSHIFT,
+ (iommu_gaddr_t)IOMMU_PAGE_SIZE << (2 * IOMMU_NPTEPGSHIFT),
+ (iommu_gaddr_t)IOMMU_PAGE_SIZE << (3 * IOMMU_NPTEPGSHIFT),
+ (iommu_gaddr_t)IOMMU_PAGE_SIZE << (4 * IOMMU_NPTEPGSHIFT),
+ (iommu_gaddr_t)IOMMU_PAGE_SIZE << (5 * IOMMU_NPTEPGSHIFT),
+ (iommu_gaddr_t)IOMMU_PAGE_SIZE << (6 * IOMMU_NPTEPGSHIFT),
+ };
+
+ KASSERT(lvl >= 0 && lvl < total_pglvl,
+ ("total %d lvl %d", total_pglvl, lvl));
+ rlvl = total_pglvl - lvl - 1;
+ KASSERT(rlvl < nitems(pg_sz), ("sizeof pg_sz lvl %d", lvl));
+ return (pg_sz[rlvl]);
+}
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index 9e3a82283729..b2caed550e35 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -187,4 +187,9 @@ void iommu_release_intr(struct iommu_unit *unit, int idx);
void iommu_device_tag_init(struct iommu_ctx *ctx, device_t dev);
+int pglvl_pgtbl_pte_off(int pglvl, iommu_gaddr_t base, int lvl);
+vm_pindex_t pglvl_pgtbl_get_pindex(int pglvl, iommu_gaddr_t base, int lvl);
+vm_pindex_t pglvl_max_pages(int pglvl);
+iommu_gaddr_t pglvl_page_size(int total_pglvl, int lvl);
+
#endif
From nobody Wed Sep 4 21:50:51 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzblc2zmTz5VS2x;
Wed, 04 Sep 2024 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 4Wzblb4C3Rz4hG0;
Wed, 4 Sep 2024 21:50:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486651;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gaV5e+KyT02wuuILXDr8XO8B0AogGbQjE0L4a9aB+h0=;
b=d+X0gL6rcbnWMQ7kt2fdXkNiRU1lJ1HrXm3lblfSwnndOPSFqHR9E5hHpap8zKtU28q3tF
TFLKtVi13zojvGq2qoUBBV3SpumSuhL15NrAnczx35G0FSTbCZL1NeMm2NxmOkaoug9sfL
xkBgLPCZzIRXtAnVxqNCemwh1qcb9+BlKLdJ1plaazrgPN76tog6u+xXv41ryQeJv6baIp
gUfabxZy3PllIvKL9AvF+4AV5ykjlsqpO4U3gzJ8SRMtlroKMO3O0oKKmJC7Pg9EEWMJ9F
mjqN75TAOL/h4VAx8j4ZWXeDlC+1aa81zzmPrM4dL0C70qGFIAwcasaM2Aagtg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486651; a=rsa-sha256; cv=none;
b=j+BdkXYWgpaJvZTvxDRunJrV54cqkOJBNN0bjA0GvHvg1GG/UPW2NIiOUwDD/fJlEfdhIL
/SuJLlQyUAb6wWxQtjP3d81v/2DnXp8iKdJcE1pwL6og0b2r0/bngvzkwueg+DhVTbEMi0
dytRIi/K9OAnmG/ZyuPZRT6r183LRYH1zKElfrMi/rg15Ou9zBqllUvJto/vhBzkOuIDyf
7Lcez+0Nkol7yuVwFlHj51Du6mfoVzP80fqP3I0z40GvtzdrD7r9Ztdb0bha5IGEg2FagE
pifzz32E5uR+09QVbNdrE5vj8Cc7xSMeOgMl/VsYunOMpo8vMPdDruohV0L7CQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486651;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gaV5e+KyT02wuuILXDr8XO8B0AogGbQjE0L4a9aB+h0=;
b=msZ0Y6HWPiTAONyQ7w4kWvlxxxrYQtFwrGDrDxzfTSzPFSWgYcNioz6R/xZ+58b3xEfbrJ
0RLXnaTjpNKxzRSqPYPypai3JUHdOR3bTc+IfsoMRhmAfiv6SQuqC1xgPOYANDCDgbBd35
1QsPhwRyCzxmmB6tNwMBxA+DkeAPfoToOObrFPWuBReFyCb5RQh3vUi+qHWts8ny0jNit8
oAaLBqA3qUyKc8s8unqPkXwOmScEQu3FM9uJCujss9HFXBRX9dcVDp5goW3ymiAI+75u7b
44hdNWpFf9zZSQOC4DnfnVZ56eSvT4bjCBCXeYzTtayjH4fCet8CuYjDZOyKnQ==
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 4Wzblb3pv4zhFT;
Wed, 4 Sep 2024 21:50: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 484LopiD032951;
Wed, 4 Sep 2024 21:50:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484Lop2q032948;
Wed, 4 Sep 2024 21:50:51 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:51 GMT
Message-Id: <202409042150.484Lop2q032948@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 0386b2451592 - main - DMAR: move
hw.iommu.dmar.{tbl_pagecnt,batch_coalesce} sysctls up one level
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 0386b2451592ec04e4cff826b698f978a45ab3e4
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=0386b2451592ec04e4cff826b698f978a45ab3e4
commit 0386b2451592ec04e4cff826b698f978a45ab3e4
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-08-23 21:10:14 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
DMAR: move hw.iommu.dmar.{tbl_pagecnt,batch_coalesce} sysctls up one level
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_ctx.c | 2 +-
sys/x86/iommu/intel_dmar.h | 3 ++-
sys/x86/iommu/intel_utils.c | 4 ----
sys/x86/iommu/iommu_utils.c | 9 +++++++--
sys/x86/iommu/x86_iommu.h | 2 +-
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index 9167bfd13589..5047acd283e9 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -877,7 +877,7 @@ dmar_domain_unload_emit_wait(struct dmar_domain *domain,
if (TAILQ_NEXT(entry, dmamap_link) == NULL)
return (true);
- return (domain->batch_no++ % dmar_batch_coalesce == 0);
+ return (domain->batch_no++ % iommu_qi_batch_coalesce == 0);
}
void
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index c1e6c8f06f64..188e40dec36c 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -166,6 +166,8 @@ struct dmar_unit {
#define DMAR_BARRIER_RMRR 0
#define DMAR_BARRIER_USEQ 1
+SYSCTL_DECL(_hw_iommu_dmar);
+
struct dmar_unit *dmar_find(device_t dev, bool verbose);
struct dmar_unit *dmar_find_hpet(device_t dev, uint16_t *rid);
struct dmar_unit *dmar_find_ioapic(u_int apic_id, uint16_t *rid);
@@ -265,7 +267,6 @@ int dmar_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
int dmar_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie);
extern int haw;
-extern int dmar_batch_coalesce;
extern int dmar_rmrr_enable;
static inline uint32_t
diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c
index 141452b3393d..287b5fe9376a 100644
--- a/sys/x86/iommu/intel_utils.c
+++ b/sys/x86/iommu/intel_utils.c
@@ -507,7 +507,6 @@ dmar_barrier_exit(struct dmar_unit *dmar, u_int barrier_id)
DMAR_UNLOCK(dmar);
}
-int dmar_batch_coalesce = 100;
struct timespec dmar_hw_timeout = {
.tv_sec = 0,
.tv_nsec = 1000000
@@ -546,9 +545,6 @@ dmar_timeout_sysctl(SYSCTL_HANDLER_ARGS)
return (error);
}
-SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN,
- &dmar_batch_coalesce, 0,
- "Number of qi batches between interrupt");
SYSCTL_PROC(_hw_iommu_dmar, OID_AUTO, timeout,
CTLTYPE_U64 | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0,
dmar_timeout_sysctl, "QU",
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 645c7e15740a..5d22c6584ab7 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -181,9 +181,14 @@ int iommu_tbl_pagecnt;
SYSCTL_NODE(_hw_iommu, OID_AUTO, dmar, CTLFLAG_RD | CTLFLAG_MPSAFE,
NULL, "");
-SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD,
+SYSCTL_INT(_hw_iommu, OID_AUTO, tbl_pagecnt, CTLFLAG_RD,
&iommu_tbl_pagecnt, 0,
- "Count of pages used for DMAR pagetables");
+ "Count of pages used for IOMMU pagetables");
+
+int iommu_qi_batch_coalesce = 100;
+SYSCTL_INT(_hw_iommu, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN,
+ &iommu_qi_batch_coalesce, 0,
+ "Number of qi batches between interrupt");
static struct x86_iommu *x86_iommu;
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index b2caed550e35..210ce82c8f6d 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -55,9 +55,9 @@ void iommu_unmap_pgtbl(struct sf_buf *sf);
extern iommu_haddr_t iommu_high;
extern int iommu_tbl_pagecnt;
+extern int iommu_qi_batch_coalesce;
SYSCTL_DECL(_hw_iommu);
-SYSCTL_DECL(_hw_iommu_dmar);
struct x86_unit_common;
From nobody Wed Sep 4 21:50:52 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzblc61R1z5VS58;
Wed, 04 Sep 2024 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 4Wzblc5CzJz4hdF;
Wed, 4 Sep 2024 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=1725486652;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=eHpk0ZLz17KJTY0iJnNBsmjCQUgmJ3I0qkBK2naxi6Y=;
b=arj/k1QYKs0vZ2tIr/rmPNxgiEVNBgg8WS43toPuSpNPUPxQbUTNiD3FNVvmNONO7KzqOF
LRj5esQNhFeLzh25xXxV3a/dFXGdB7rMWc8nCFxEcjzQNfm3sZnNbv9kNOL/MPbGm7SLSs
RU6pJmEcLxnuLX8lxNf9PKt1bVR6P6eybzOa+Q4wiAal021uqBrre5ckrVI7F6+tw3f192
cfMJ/MF0OHsStXznVEKUzuhffm9V55D4AqPt8mUJbWVUQvHXqVh1oGTQuHos3exbfRedrK
ki4rKNOKiwsW4Vji0S9oVJQUUdLAdZhuH5N2sYx2jrShsZ6Gj1bY6OqN/cPmZg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486652; a=rsa-sha256; cv=none;
b=vKw9M0DQpbUIoRxD6xXnXvb8hy9keZndZtFLgtL+gd0GAco3oSTUQkDPDV+B+GBvlmICO6
45BUU/cT/+OyipyLFSzdFnbURGC+ebjqukS9VxOmWvkH/ZJQeXJykAt+fziaIsbPirXEdu
0nfC/RWpebFmc7HLR3ZaU7/cjxhcwO4QrY2KWooetsgcFiWJ4gFycuUozGAVLmLSEWlsXm
x9TA2stp4aHea3CDbj6zAfVzpm3hbzyaIlmrOdwSvIlTTHOfyDs8JR240f86WeNOS6wJaN
51dtRWEg1fmcy7S/qbPbMr8fVbjFHjyQ1UlOsoVZEfrWWbnKoE9Y6tILjmvJoA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486652;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=eHpk0ZLz17KJTY0iJnNBsmjCQUgmJ3I0qkBK2naxi6Y=;
b=jxIMO/2jTXNB5evguhOO0Yk6m5dy1wMzpeIOcpNiZDmNOYAnV/gOVRWmEIZMc458cuKPBG
EA/GQgCOkurhLw3ds8FObV8ipGlt8zDlz2xw3WpKeECQ9v29kDBDCVh6bTahTStW4hu7LP
GGnxatSkK7d351vyxOcXyhUzXk+PuSx+RfS8UE0uJA9u8ughmfWvHYLbwCZyYFLbOJOGf6
Km42KuOIdrf1sedImMW9rXGN3BMoAuCWprQs8anDvuaGohr05pPpZ1sTMuRmRP60dH3jsN
Z2ZrYvKJpcX/RrL7MGRd8SFaLO5z+oPz1onf0H8byiOn1hAKc/SFsuLPS7SGpA==
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 4Wzblc4rGJzh5n;
Wed, 4 Sep 2024 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 484Loqhd033002;
Wed, 4 Sep 2024 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 484LoqsG032999;
Wed, 4 Sep 2024 21:50:52 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:52 GMT
Message-Id: <202409042150.484LoqsG032999@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 22bf8cf32f35 - main - DMAR: provide hw.iommu.ir alias
for the hw.dmar.ir tunable
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 22bf8cf32f355705eb40cfbd7892492ac8140c50
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=22bf8cf32f355705eb40cfbd7892492ac8140c50
commit 22bf8cf32f355705eb40cfbd7892492ac8140c50
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-08-23 21:12:15 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
DMAR: provide hw.iommu.ir alias for the hw.dmar.ir tunable
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_intrmap.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c
index a6979a9d2501..ec3cd35e4f4e 100644
--- a/sys/x86/iommu/intel_intrmap.c
+++ b/sys/x86/iommu/intel_intrmap.c
@@ -323,6 +323,7 @@ dmar_init_irt(struct dmar_unit *unit)
return (0);
unit->ir_enabled = 1;
TUNABLE_INT_FETCH("hw.dmar.ir", &unit->ir_enabled);
+ TUNABLE_INT_FETCH("hw.iommu.ir", &unit->ir_enabled);
if (!unit->ir_enabled)
return (0);
if (!unit->qi_enabled) {
From nobody Wed Sep 4 21:50:53 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzblf0rSQz5VS0R;
Wed, 04 Sep 2024 21:50:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzbld60f3z4hdb;
Wed, 4 Sep 2024 21: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=1725486653;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=wgjRc5w1urqs/hyAo6vC0UXLYdh7sxZ3tMC6ou+rzPo=;
b=nX9kGZs1xyx7oiDTT1N3n1lOFCZWgnZHvobyk9FAuYbkryiE7XPmTZRkg6MOTksoAi6y17
PCYq/UqTQ6e+FruC3b3u79pKJflu8BAOMEys3C+cF28sau1pdGpud8gE5UkhdwiLi3YGbJ
aTdlpqrWVaxNgsRH/Y/VZRlfcz4+FOn6JNl+tyKXdXgeu1bwhwLnvhbqkdvJhAuloztas6
X70zy6lfzqJYuz02pLDduWMdc4flmlAtoDtOcqMo/zSXYFfj9+JpYTAmm+vfBg1c/jYSy5
LVoBpw8aF62sRkpTwymE+dxqUPnQBUhcN1l9fHL9VzN4rLCN7KmVlFo4GLcmww==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486653; a=rsa-sha256; cv=none;
b=r/FRSxcJF137JHsCtaYNHr4B987M+5sqsqZBd+X7ZYDKF59jUKohabVh1dnAE2/fSmFS3H
WrxmXeieQwFwZ8fhFiA8J6KxAGkQqA5e/6Ic7CMBkSsio/V3yf6ioRfyE5T2YYoVI+NXz4
Vz9kQZipGLEcaW1BBBBV3MaqSm1kihbVLrwgorzQxokR6MAe7l0CqBHVk5oMkMU5uiKDe3
DrHCfU0XXC0RD/iTRu4DJSWGa/Cuz40ZZVNf2KNyD/6dkgPGnEK28iN6QRvyOxga+xTSwZ
oarKp2gOJfIUVdPK9ekJ3r9ImlW1F4esSK9SzBvU5hKhXVm0Yd0SjqMx1RJwhQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486653;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=wgjRc5w1urqs/hyAo6vC0UXLYdh7sxZ3tMC6ou+rzPo=;
b=S3sxMUINg5F0AdxUnksESraOfqDRffWAYL5wS2BIszN8wbPaHRPdEkJicV9lJLxYL8Z/Ef
q5xwoPX9WcFqjSFieXKE9SDjjUxTxC+9ZHIRo9A/whoZBJbMYtEyeNzyKj7D4GZ0CaBm8A
ZNgkEKav+8yK69rOfGD3Zy+0s/arwmRwfE+axa9o3LjlGoiGxf/7J5bFJtWC9sKUVQe/kR
YmDYy0qU6JRGqjz+nSmuWG9KFLL/uz6akr4q4LUXuXHSUZzi3X0cUgkfoX1L5ZKcjyBUQU
aXorP39JtWQTY6EchzmbyC3lbZmwSMsOyyLkAvZSmSjt6wWJ0oetXPKTANvbKw==
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 4Wzbld5byyzhFV;
Wed, 4 Sep 2024 21: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 484Lor6P033056;
Wed, 4 Sep 2024 21: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 484LorVp033053;
Wed, 4 Sep 2024 21:50:53 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:53 GMT
Message-Id: <202409042150.484LorVp033053@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: ba33e74c7d48 - main - busdma_iommu: indirect dmar-specific
method calls in iommu_get_dev_ctx()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: ba33e74c7d48479784896807eb8a1c2e1012d163
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=ba33e74c7d48479784896807eb8a1c2e1012d163
commit ba33e74c7d48479784896807eb8a1c2e1012d163
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-07-27 16:28:01 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
busdma_iommu: indirect dmar-specific method calls in iommu_get_dev_ctx()
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/arm64/iommu/iommu.c | 5 +++++
sys/dev/iommu/busdma_iommu.c | 6 +-----
sys/dev/iommu/iommu.h | 1 +
sys/x86/iommu/intel_drv.c | 8 ++++++++
sys/x86/iommu/iommu_utils.c | 6 ++++++
sys/x86/iommu/x86_iommu.h | 1 +
6 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/sys/arm64/iommu/iommu.c b/sys/arm64/iommu/iommu.c
index b765763e3a60..af0edfee70d8 100644
--- a/sys/arm64/iommu/iommu.c
+++ b/sys/arm64/iommu/iommu.c
@@ -501,6 +501,11 @@ iommu_find(device_t dev, bool verbose)
return (NULL);
}
+void
+iommu_unit_pre_instantiate_ctx(struct iommu_unit *unit)
+{
+}
+
void
iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free,
bool cansleep __unused)
diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c
index 3d554249ba3f..bddb466547d1 100644
--- a/sys/dev/iommu/busdma_iommu.c
+++ b/sys/dev/iommu/busdma_iommu.c
@@ -278,11 +278,7 @@ iommu_get_dev_ctx(device_t dev)
if (!unit->dma_enabled)
return (NULL);
-#if defined(__amd64__) || defined(__i386__)
- dmar_quirks_pre_use(unit);
- dmar_instantiate_rmrr_ctxs(unit);
-#endif
-
+ iommu_unit_pre_instantiate_ctx(unit);
return (iommu_instantiate_ctx(unit, dev, false));
}
diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h
index 157f4c62423f..9845b09e8732 100644
--- a/sys/dev/iommu/iommu.h
+++ b/sys/dev/iommu/iommu.h
@@ -158,6 +158,7 @@ void iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free,
void iommu_domain_unload(struct iommu_domain *domain,
struct iommu_map_entries_tailq *entries, bool cansleep);
+void iommu_unit_pre_instantiate_ctx(struct iommu_unit *iommu);
struct iommu_ctx *iommu_instantiate_ctx(struct iommu_unit *iommu,
device_t dev, bool rmrr);
device_t iommu_get_requester(device_t dev, uint16_t *rid);
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
index 2439ef9e4ef5..05fb49538add 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -1310,8 +1310,16 @@ dmar_get_x86_common(struct iommu_unit *unit)
return (&dmar->x86c);
}
+static void
+dmar_unit_pre_instantiate_ctx(struct iommu_unit *unit)
+{
+ dmar_quirks_pre_use(unit);
+ dmar_instantiate_rmrr_ctxs(unit);
+}
+
static struct x86_iommu dmar_x86_iommu = {
.get_x86_common = dmar_get_x86_common,
+ .unit_pre_instantiate_ctx = dmar_unit_pre_instantiate_ctx,
.domain_unload_entry = dmar_domain_unload_entry,
.domain_unload = dmar_domain_unload,
.get_ctx = dmar_get_ctx,
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 5d22c6584ab7..2c647fd21c67 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -278,6 +278,12 @@ iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
return (x86_iommu->unmap_ioapic_intr(ioapic_id, cookie));
}
+void
+iommu_unit_pre_instantiate_ctx(struct iommu_unit *unit)
+{
+ x86_iommu->unit_pre_instantiate_ctx(unit);
+}
+
#define IOMMU2X86C(iommu) (x86_iommu->get_x86_common(iommu))
static bool
diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
index 210ce82c8f6d..a1ed5c71c513 100644
--- a/sys/x86/iommu/x86_iommu.h
+++ b/sys/x86/iommu/x86_iommu.h
@@ -64,6 +64,7 @@ struct x86_unit_common;
struct x86_iommu {
struct x86_unit_common *(*get_x86_common)(struct
iommu_unit *iommu);
+ void (*unit_pre_instantiate_ctx)(struct iommu_unit *iommu);
void (*qi_ensure)(struct iommu_unit *unit, int descr_count);
void (*qi_emit_wait_descr)(struct iommu_unit *unit, uint32_t seq,
bool, bool, bool);
From nobody Wed Sep 4 21:50:54 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzblg1Y2Kz5VRrw;
Wed, 04 Sep 2024 21: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 4Wzblf70p2z4hYB;
Wed, 4 Sep 2024 21: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=1725486655;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jzYVvrZL3q01UIj6LbHw5f1eEDLqo0MkyGk2kliMS9w=;
b=FSjSFHuSHCwEBv5+IhElscy4NK183yhldcUaHZ8UwAo+QX/ydkYs5+h3EXGzn2JBecfgdn
wWXL1XPOdG7yMk74PnfI09dylIRxaEWuFSkxoWd0xX/3aacgrDa5RJEfk8YeNqDq/fz/VM
Mnh9uysMey3iAvsiiQogqLqM3M4/iYIwcJ09j5Rynf6wdw/GInaDON15odqI/2iwXRlEhE
IRsNe8m4kkJO/gp4rGQTtErZAJQ6dzfh1cDY5sxAi3m9bSy6A5/xQC11eEiFLxIHMrM86v
1+CQF9in8MfCUIiMjHCZTrsdlHBmwbVMHuNnO5kYsyXgcHH61ywGMgrv6v9V+w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486655; a=rsa-sha256; cv=none;
b=jChl/gSKNHZ5avhYKOf7YBhLvQcdd6ILaACK568gk1kw94boVXrIm6D/bFm6y2Ghffg5GS
bof21HwN2aVBZ3D8t++SqFhqSpkl/AuVSugl3QGY32M6oLt9ErH+JP+uN1feq3bDNtmDgR
GOEfG8nvSSGXtzaM4fkd+SAl5P1NLVJi9pLm60pJRDzvgModQUxlFvT7PGi5oqVBoyEHQI
PWZD+9I1vMzqNCqWKJ0hU30S6rpHRUfrYSTfiML1tbR2GKLL5BAjfT9jze8GkDhzrvCnhw
y7nGYTCEQ/ob4pPI/gkDfP1vjnPwFTaASUgJ+UzX0w4O9sqwgGrZ5wQFDFf9sQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486655;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jzYVvrZL3q01UIj6LbHw5f1eEDLqo0MkyGk2kliMS9w=;
b=SBre3MkXUMJiU2i0OjGwXsIRTVTaTXFQ7vjFuVptDdchi/8ZlTROzlD4AeuzcGylorP1Wg
SeHA1N6ZjiXqBSypBLYYZcia7e1TQ5EFIkeJkVhoKpGjiYBsie+CkHPb79aFICgTT6uLF/
Ktxgp/v2Pow/7H67rMoKrOZucn9mc6INYHHMVuABWQFcVRK+/Wt5wMNH3O9alYfKJLh1Ml
zx8jutED3jiPoCmy2Qlf6AzTzHi4evWy+BO4Rz0wfxSWpnVBZpPCIjLxVswyJEwUXtw2va
9Ibl8gKX4sRhdNuESvw9gKL2Yj1KR1Pjq1nXaA4RN3a6/u6K6h5WY/fBS5/+ww==
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 4Wzblf6cd7zhL9;
Wed, 4 Sep 2024 21: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 484Lossg033107;
Wed, 4 Sep 2024 21: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 484LosDN033104;
Wed, 4 Sep 2024 21:50:54 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:54 GMT
Message-Id: <202409042150.484LosDN033104@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 09fc33d1d75f - main - dmar: avoid excessive indirection
in KASSERT() in domain_map_buf()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 09fc33d1d75f93ed04fc6b18e7fe2911b7e770e0
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=09fc33d1d75f93ed04fc6b18e7fe2911b7e770e0
commit 09fc33d1d75f93ed04fc6b18e7fe2911b7e770e0
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-07-20 00:15:22 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
dmar: avoid excessive indirection in KASSERT() in domain_map_buf()
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/intel_idpgtbl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c
index 53851622340b..fbc0e9e97b64 100644
--- a/sys/x86/iommu/intel_idpgtbl.c
+++ b/sys/x86/iommu/intel_idpgtbl.c
@@ -478,7 +478,7 @@ domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base,
domain = IODOM2DOM(iodom);
unit = domain->dmar;
- KASSERT((domain->iodom.flags & IOMMU_DOMAIN_IDMAP) == 0,
+ KASSERT((iodom->flags & IOMMU_DOMAIN_IDMAP) == 0,
("modifying idmap pagetable domain %p", domain));
KASSERT((base & IOMMU_PAGE_MASK) == 0,
("non-aligned base %p %jx %jx", domain, (uintmax_t)base,
From nobody Wed Sep 4 21:50:55 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzblh41yhz5VS5L;
Wed, 04 Sep 2024 21:50:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzblh1KxNz4hH4;
Wed, 4 Sep 2024 21:50:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486656;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jU4UkNvf6WD1I9tKBSQ2HatqkU4nc2C3pFwI8QyDli8=;
b=Cw3s9zuQEih7tJ87mUe0iG2gtYizQeYVTmO/IDMpQ/UiqgGj5DU/ckEg1lws5F6qX7UR0v
9lXvmSih03gULQw+/v5Qr3sFt4d7v+HIMmqLaoWSFkApuzs3M8KkN53I3OjiHnU/qnwlZ8
16cFdW7gPIGPe+xNPWMu62WSuNwlIBmRTdP2MPesxbV/bJSinwBE1D9cnaPPaDvA2TauXn
zx4Q0EdRfeaBNHQ2sVQhwB9hLTC5zhVDk+MWhGkYmrByFUtpO3HeR0SrSFLZ6LKDG7hJgL
pgspCuyTKlp9rlJNLETMpCQw+yPjWJMx1rdIYc+WaeQmxFol4djtST8nU5UYJg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486656; a=rsa-sha256; cv=none;
b=Cb2ViJwhIbahT8/4Yfir8/ha6RQ0Hrr6l1zfpRkkgHIstt8lq/sFfr/wBHurlcMMYcPHbO
Yy//6AczdWr3FjZT60FLDWSNMLdmlw4n1yLhHESlR1S5fsd8jp11R+q/UcSlZ92/FYt1MP
qhfmMIreo6+mP4QvJ8/ww0RhY7QTGlk7ljpV1BlhZI1TI0Tib/7lfe0k5LpAup7S8L0vMw
MEbzC0K8lYqFtRWs5XKt9j+TzXhG8SsUdS3/eRMB1MpY7u37rnjoCElFhCl/yTV7e36soE
feJyyukdLFjkGWUA1mEQiq21doaj+eViyhhTH6wLjpOciA5ZyUA0SZ8Jr2MD4w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486656;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jU4UkNvf6WD1I9tKBSQ2HatqkU4nc2C3pFwI8QyDli8=;
b=hMfKLGu1wrDuwZgUGNE5eEwwSwSrrhdqGl7Bg2B3hSRvLFuR02Ww07i94MIyeju1zCGvAW
OQgmowhxXoVnrS1evxtS90ahCFFF/ZkTDRfrcStZrnIEZYgFKH4yDlVBt3mv9bHG5wdCET
yyqc0zXpYNQgkh4LV76ue7a/S+XEfXKB0qVLDYhphgl3pqsQaMNOkDXuM5XWAYdnF92xEw
1Maub1L1t15nfFwZtGDrvkmHJvt0sKHAIHjtCtTy2zvWUL2VmUeCrpN7w/7h7i2bvdGqh1
5M7sz/5P657H+ODVYwg7i5ImuOlLSaZoUWLl+sV/jZrN0c1HeBFWwlQKxz44ng==
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 4Wzblh0lTTzhbt;
Wed, 4 Sep 2024 21:50: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 484Lot4m033160;
Wed, 4 Sep 2024 21:50:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LotVO033157;
Wed, 4 Sep 2024 21:50:55 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:55 GMT
Message-Id: <202409042150.484LotVO033157@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 5681ddfd9f80 - main - msi_alloc(): do not leak msi_lock
in error case
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5681ddfd9f80c3aa25f900a1bcaa69b36a4e9e27
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=5681ddfd9f80c3aa25f900a1bcaa69b36a4e9e27
commit 5681ddfd9f80c3aa25f900a1bcaa69b36a4e9e27
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-08-27 02:28:10 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:19 +0000
msi_alloc(): do not leak msi_lock in error case
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/x86/msi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c
index 888635cba3f4..177bd7868ec4 100644
--- a/sys/x86/x86/msi.c
+++ b/sys/x86/x86/msi.c
@@ -480,6 +480,7 @@ again:
if (error != 0) {
for (i = 0; i < count; i++)
apic_free_vector(cpu, vector + i, irqs[i]);
+ mtx_unlock(&msi_lock);
free(mirqs, M_MSI);
return (error);
}
From nobody Wed Sep 4 21:50:57 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzblj3gwVz5VS33;
Wed, 04 Sep 2024 21:50:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzblj23lxz4hZ1;
Wed, 4 Sep 2024 21:50:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725486657;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xjU95wAT60uxAurfGdrh9JfntffLlxofRr2qJlAvaI4=;
b=tC5YEBZ4uSRrWJCUUzX9rQqoUXKg7055RkDVNYENtd5hC7BC/z1VPnHShDyDjI78clm9Jv
L9m8iuMpODkkibFB/9VntVyPAi/t4p0Atyt1l9GITNhLiAl0odFjKm6/aIWjYGQgH7t5XW
OjqAwg57VeUBu/xkszYGA6AkNEQvTnTBUw2rWebLGq1W/4KkUF/Qbmqz6FgVkSRCdw49bU
VfcSqsqsQTo0GOqEZzHgv7tCuCvyHgfZLG6Iixfj9QaXObYtyGAwyd1xjW+YBnESuqYEwT
D2odMDyeSzhUol8qlpm8d/24k1uLQAKWsfrCmDeRGW5BDLjDLqdFwOXbFKx31A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486657; a=rsa-sha256; cv=none;
b=MCmBiwmFfbBlrpMAY89XKMlKAdzZ/OsXpAh6nJlSQfl0YF2B5PRYg2ODffUuTJVvyEuY6T
nhd8ErFcuRoa75kDAjEZDoXjxuP5kLif/JCvLgTtRX/SW3Ai/3Qb6t7lMX6enQ4l8DtF8I
M/6qtanTFaZngXOJ98VAS1znilosebXTDOhxM9bnozgN8skOc7ZKax8EoUExPE8LfOa6GC
93ID16egTF5gv2BPa5t113PdMjlZQH4TZwd2Tn5jBgU6ftlkpbWB+sQ74YsRirDuT+jBjR
tS4GxZZngwO6RmYVQaLkXIbytTkPbsKYDPIf1hcv0Ae0KClPCNmzQGbF9Uob1Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725486657;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xjU95wAT60uxAurfGdrh9JfntffLlxofRr2qJlAvaI4=;
b=nJOzdDp+H5lKyJFcVFD3y+dd/cNYMxRA6G92Xucueumar4ObnYOEOMjvK8hLeu4vLY50CS
EUxo9PNMQhY6X6XAv/J25zHhxDbTbADx3UzE0ylzM4X3Wki5imBOkIUlOkim6Vma7Vf/q7
qSXwSSHsiEyKrBtRSwDuWuEfprY8GzqD+ND2yoQhGHNqBIe/YaRLIXmVLMFhKdHObnkcz4
oLIVmtQLinzPwTnN0MRP4h8yLm5HW/65HWuG7tL0w27Xruf/C/W/Zm0SyejEJZbN8CQaHW
0DFN2ZsE7O9EnTtIE8trFqF4lEJ3fMx/g4tlWnyZ29b/1NuIz8hZuiqzIOAu2w==
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 4Wzblj1VSgzhND;
Wed, 4 Sep 2024 21:50: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 484LovtD033210;
Wed, 4 Sep 2024 21:50:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LovNe033207;
Wed, 4 Sep 2024 21:50:57 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:50:57 GMT
Message-Id: <202409042150.484LovNe033207@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: e8fc8eb8b8f5 - main - msi_release(): consistently
unlock msi_lock around iommu_unmap_msi_intr()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: e8fc8eb8b8f55072379f65f5f058b81870031b7d
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=e8fc8eb8b8f55072379f65f5f058b81870031b7d
commit e8fc8eb8b8f55072379f65f5f058b81870031b7d
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-08-27 02:28:49 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:50:20 +0000
msi_release(): consistently unlock msi_lock around iommu_unmap_msi_intr()
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/x86/msi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c
index 177bd7868ec4..c8e7db9469ed 100644
--- a/sys/x86/x86/msi.c
+++ b/sys/x86/x86/msi.c
@@ -555,7 +555,9 @@ msi_release(int *irqs, int count)
KASSERT(msi->msi_first == first, ("message not in group"));
KASSERT(msi->msi_dev == first->msi_dev, ("owner mismatch"));
#ifdef IOMMU
+ mtx_unlock(&msi_lock);
iommu_unmap_msi_intr(first->msi_dev, msi->msi_remap_cookie);
+ mtx_lock(&msi_lock);
#endif
msi->msi_first = NULL;
msi->msi_dev = NULL;
From nobody Wed Sep 4 21:59:19 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzbxM4CKVz5VSln;
Wed, 04 Sep 2024 21:59:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzbxM3VNJz4pkY;
Wed, 4 Sep 2024 21:59:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725487159;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=QO8iWm7DFK5IvXdnZ/qJhhI2fC27XWL+N454fN2lGt8=;
b=QPOySiOlplODyVnsX6sQClpdkh1JAGXjVb6o3SUCuoNFLm9HLhGb/Hi6FL26JgGRxnDYgx
agJARcFgL7ymT8irUB9sod2JyWHKSrSVGCw9VyWKL1oM/mxZRRtAYlpG9INWyTvscCAI5D
psmJDle5TBZ/N25j1WQgUBttrdLoCYc6xZLWVXevF44uw4wA2ZUIoEB5F3t8V87jPHa1PH
6FLZZKHYID0ZsBmajP5mgv/U/dgdpcULhHBSSf+oJdMYVB6K+IOdy9H9FCRYrMpH7OsDmT
Cuix6Q8kbTpcNkbPsyD9e6aRGdSzqoVuejNwtdJMw7JYDcgMtOjUWGaZapQ92g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725487159; a=rsa-sha256; cv=none;
b=PlY1ctVQJo3grkfNQyXRH+y9sxWBM6rxSfZOehtTR9WJk29RNHdYwt2EExPKy90mXlARDx
jOg5R7Mto5jwl0lq4vyPVyKf22NPiyXmCLoom7cmQa+DWcQZ7Qig3Kc1s4X0PZfnZbVsmI
+KobvppfT9MOUCs9abE6gLdSG9uSZ2D9TUCZIm+7JxD+xs6v73rCoK37souYFm8D4rtA3J
ywnP+sXpRH/k+j43kklCco90cSusd5TZT4p1/FmcCjg2vX4L7uii4Is8q2Flqn2xpoqzhr
P2IHaC4DKWTz4UucCrtz4qM2/c+ADWxKC97x/sEAKjOuMgDatLa9g5lluyuj7w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725487159;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=QO8iWm7DFK5IvXdnZ/qJhhI2fC27XWL+N454fN2lGt8=;
b=n8WLhdy/fFOYA/3y1efrvuCusEHgM/+VCKEupW+p9OfmvPp+YqlAUPcl8LeuCju+awy05C
R77g7HxoKIuAQbP0u+xVdAxMHZBZDZj93yDUZEV9zPdInAWIjLaRNHC/yhZqOUq8jsUhKR
itdLoaUDg0rXU01MF6w/SOvtMQdVxsCmm9PvHnB5hWR/8nTftlUhoSRp7g2vNrna/zzyU8
llXBJ5QpZQRSvIVSfn7AYb2b5LfdCVsWxyqpmwHYIhKo3GwbhXrfHO7P6SR6W1S3P149Cs
kDKf1SArEQhx6+TF9qHlCuW5YARn+eySCdEJb1uG0xb71D5upYQBoX90m4S7iA==
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 4WzbxM2z86zhYy;
Wed, 4 Sep 2024 21:59:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484LxJ5X039972;
Wed, 4 Sep 2024 21:59:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LxJrf039969;
Wed, 4 Sep 2024 21:59:19 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 21:59:19 GMT
Message-Id: <202409042159.484LxJrf039969@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: e28ee29d2d13 - main - vfs_default.c: trim whitespace
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: e28ee29d2d13dc24cd3d5e19fa1fe6bef0085d41
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=e28ee29d2d13dc24cd3d5e19fa1fe6bef0085d41
commit e28ee29d2d13dc24cd3d5e19fa1fe6bef0085d41
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-09-03 03:42:54 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-04 21:58:51 +0000
vfs_default.c: trim whitespace
Sponsored by: The FreeBSD Foundation
MFC after: 3 days
---
sys/kern/vfs_default.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 1393f2fce9f3..d612642a6bc9 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -113,10 +113,10 @@ struct vop_vector default_vnodeops = {
.vop_fsync = VOP_NULL,
.vop_stat = vop_stdstat,
.vop_fdatasync = vop_stdfdatasync,
- .vop_getlowvnode = vop_stdgetlowvnode,
+ .vop_getlowvnode = vop_stdgetlowvnode,
.vop_getpages = vop_stdgetpages,
.vop_getpages_async = vop_stdgetpages_async,
- .vop_getwritemount = vop_stdgetwritemount,
+ .vop_getwritemount = vop_stdgetwritemount,
.vop_inactive = VOP_NULL,
.vop_need_inactive = vop_stdneed_inactive,
.vop_ioctl = vop_stdioctl,
@@ -1087,7 +1087,7 @@ vop_stdadvise(struct vop_advise_args *ap)
/*
* Round to block boundaries (and later possibly further to
- * page boundaries). Applications cannot reasonably be aware
+ * page boundaries). Applications cannot reasonably be aware
* of the boundaries, and the rounding must be to expand at
* both extremities to cover enough. It still doesn't cover
* read-ahead. For partial blocks, this gives unnecessary
From nobody Wed Sep 4 23:48:25 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzfMF6y4vz5Vvhv;
Wed, 04 Sep 2024 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 4WzfMF1zrGz4T4L;
Wed, 4 Sep 2024 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=1725493705;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=CtxQQgOfGUOckMkgBRa7flsvI1/hJYByMw7OY4McECo=;
b=EQ8XsU9SDK8aLk1l8SZp1DeqRV5r2+6nFUKhivitapXGxK0ppNLXiquMDawJZnZf9m6+y5
/PGlXjVFym0LJetGHTeQ7b5a+2zpa4UwLfcAHQ5gDYoitIkNFoNvmWpsCQz9VmEFKIJBE6
Rt5VeI2bdnwWgyzEuUyzz0QRY4lz+pQxjbbj3RRAWKOrd+ITOc643T+I03TI3Ra1rRW482
XnMdt1pl+mHhVN3fG9cl6UvOV9etHJuAc4t+As6slGAnPY3TsZNhaIEUMWpNVcvdbwEA6q
X1c4DNNgHkhWTzD6Bwz75wXOMMpl6niz6fJMtXgZV1SriCFPemT/JOs3gSoIQA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725493705; a=rsa-sha256; cv=none;
b=PlsQtp76TcoVeoODqk/1gbHQHCB1na6+t7OSU+D1X8yzH3eEiTHIHB2E7TnQ+99BTqL30v
KHcDg+wFh4Z2K2+W8Dm9cGNO3E1iXO90tH26aFLhZACLrxr2tSY+uHAeUPOcJ62UWtCeJy
q4FMSFir1K5VtZwCMo6pfR+VVgVSMvgm/8J+1ij0pcI/yuxyjBOO4Y9u+SgqkQyu6O2tLI
Gwf9CWFZjgD4RdLclZkgd7PQTXvuJMlxP7ZkBNjP229jlfMJCvw2NtrciJFmp0Aglg6UEy
fIBVvWDYvK9a3qqqAl/XPcvGWOZvYLPNcTqzo1ny16tAikWYISC55cQBUVjkHQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725493705;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=CtxQQgOfGUOckMkgBRa7flsvI1/hJYByMw7OY4McECo=;
b=XeJaKAHQF8MAbHbB2UduPm5a5gjX0wH/F0+PG8aKp50Fv+Xac4kv8M7LnDAExzCouBzPZf
HPT12yxPIaYOwVcQRoJb2vXDsvyVxJjSHYYCllHmmRt0h+lzhIWgR6k5h24PU0tZyln8MH
GbFKtCkxrD0pSjcjwvvBHmhsJLQJqA89Q2Dw5iTUrnrlpEvYFlTa22zy0Tu3QEGyXLnp2V
ETzlwLVn28pw9GFvgkQeq//fUvpogLUnKupkpzxod/EnoXYwa+tsz8N9aUTYKX3RLFZtmW
a4OP/sm0//UpIKh+c5tH19s4/MsvYrIxyEu0V/oW7cnn3EdxAX9lGS1Mp2+Lhg==
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 4WzfMF1JwXzlff;
Wed, 4 Sep 2024 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 484NmPgC025913;
Wed, 4 Sep 2024 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 484NmPA7025910;
Wed, 4 Sep 2024 23:48:25 GMT
(envelope-from git)
Date: Wed, 4 Sep 2024 23:48:25 GMT
Message-Id: <202409042348.484NmPA7025910@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 66fc442421f8 - main - vmm: Remove an incorrect
credential check in vmmdev_open()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 66fc442421f868b01bee4e299d7e3a4c4df37d21
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=66fc442421f868b01bee4e299d7e3a4c4df37d21
commit 66fc442421f868b01bee4e299d7e3a4c4df37d21
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-04 20:05:33 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-04 22:54:25 +0000
vmm: Remove an incorrect credential check in vmmdev_open()
Checking pointer equality here is too strict and can lead to incorrect
errors, as credentials are frequently copied to avoid reference counting
overhead.
The check is new with commit 4008758105a6 and was added with the goal of
allowing non-root users to create VMs in mind. Just remove it for now.
Reported by: Alonso Cárdenas Márquez <acardenas@bsd-peru.org>
Reviewed by: jhb
Fixes: 4008758105a6 ("vmm: Validate credentials when opening a vmmdev")
Differential Revision: https://reviews.freebsd.org/D46535
---
sys/dev/vmm/vmm_dev.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c
index ea2aaace832c..353b58dd8a2c 100644
--- a/sys/dev/vmm/vmm_dev.c
+++ b/sys/dev/vmm/vmm_dev.c
@@ -331,12 +331,6 @@ vmmdev_open(struct cdev *dev, int flags, int fmt, struct thread *td)
sc = vmmdev_lookup2(dev);
KASSERT(sc != NULL, ("%s: device not found", __func__));
- /*
- * A user can only access VMs that they themselves have created.
- */
- if (td->td_ucred != sc->ucred)
- return (EPERM);
-
/*
* A jail without vmm access shouldn't be able to access vmm device
* files at all, but check here just to be thorough.
From nobody Wed Sep 4 23:52:04 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzfRW3V3Cz5VwfM;
Wed, 04 Sep 2024 23:52:07 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzfRW0ChDz4bS7;
Wed, 4 Sep 2024 23:52:07 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250])
by cmsmtp with ESMTPS
id lqO4sRl1n9TOUlznCscCV0; Wed, 04 Sep 2024 23:52:06 +0000
Received: from spqr.komquats.com ([70.66.152.170])
by cmsmtp with ESMTPSA
id lznAsOGII2M9qlznBs1Tqz; Wed, 04 Sep 2024 23:52:06 +0000
X-Auth-User: cschuber
X-Authority-Analysis: v=2.4 cv=ce5xrWDM c=1 sm=1 tr=0 ts=66d8f2a6
a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17
a=0_lmrure0TmMD5iX:21 a=kj9zAlcOel0A:10 a=EaEq8P2WXUwA:10 a=6I5d2MoRAAAA:8
a=NEAV23lmAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=L5vLIMzQ0kdiWkzAmtAA:9
a=CjuIK1q_8ugA:10 a=RVmHIydaz68A:10 a=Ia-lj3WSrqcvXOmTRaiG:22
a=LK5xJRSDVpKd5WXXoEvA:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTP id 483D4CC;
Wed, 04 Sep 2024 16:52:04 -0700 (PDT)
Received: by slippy.cwsent.com (Postfix, from userid 1000)
id 1FCD9C5; Wed, 04 Sep 2024 16:52:04 -0700 (PDT)
X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev
Reply-to: Cy Schubert <Cy.Schubert@cschubert.com>
From: Cy Schubert <Cy.Schubert@cschubert.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Konstantin Belousov <kib@FreeBSD.org>
cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
Subject: Re: git: 65b133e5d292 - main - x86: allow to have more than one
kind of IOMMU
In-reply-to: <202409042150.484LoeAq031493@gitrepo.freebsd.org>
References: <202409042150.484LoeAq031493@gitrepo.freebsd.org>
Comments: In-reply-to Konstantin Belousov <kib@FreeBSD.org>
message dated "Wed, 04 Sep 2024 21:50:40 +0000."
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 04 Sep 2024 16:52:04 -0700
Message-Id: <20240904235204.1FCD9C5@slippy.cwsent.com>
X-CMAE-Envelope: MS4xfLid89UMQwnY/zRAXa3Od2w2/bZd0pDcYdTLJp4aroWC/gWmRDIIpU92nffrNu4ajKYLvbUkmMoAapVYhp3Sp5DUwyo5+EGVHIEOtFckVuFxNdfLFRVe
ktjExF4OktgA18R1bkBewf3j/rB4rmN7mavapOUX3j0vWn/sxBeSfmIN1hD/aqV3EHOwna2N+VF+kI9vgBKvtxL9nyH3sJnhCRm1OTAKZkhsmnvnBnVFvb+E
LoY4ZVeFwHM74gZ8dLu/O44uMRER9WoNsNiMNmE11lKdDhxPi6zL0Dwtgz0SU8NS9NTrLkne5OpYgMb1ANLgtwJj3Y4DgLxGoFtPTasD/OY=
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]
X-Rspamd-Queue-Id: 4WzfRW0ChDz4bS7
In message <202409042150.484LoeAq031493@gitrepo.freebsd.org>, Konstantin
Belous
ov writes:
> The branch main has been updated by kib:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=65b133e5d292686fe20f11dd39b53812
> 226a8684
>
> commit 65b133e5d292686fe20f11dd39b53812226a8684
> Author: Konstantin Belousov <kib@FreeBSD.org>
> AuthorDate: 2024-05-29 14:38:14 +0000
> Commit: Konstantin Belousov <kib@FreeBSD.org>
> CommitDate: 2024-09-04 21:50:18 +0000
>
> x86: allow to have more than one kind of IOMMU
>
> Sponsored by: Advanced Micro Devices (AMD)
> Sponsored by: The FreeBSD Foundation
> MFC after: 1 week
> ---
> sys/x86/iommu/intel_ctx.c | 22 +++++------
> sys/x86/iommu/intel_dmar.h | 18 ++++++++-
> sys/x86/iommu/intel_drv.c | 30 ++++++++++++--
> sys/x86/iommu/intel_intrmap.c | 10 ++---
> sys/x86/iommu/iommu_utils.c | 91 +++++++++++++++++++++++++++++++++++++++++
> +-
> sys/x86/iommu/x86_iommu.h | 25 +++++++++++-
> 6 files changed, 173 insertions(+), 23 deletions(-)
>
> diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
> index baee0109e5a9..a3ff35dc527e 100644
> --- a/sys/x86/iommu/intel_ctx.c
> +++ b/sys/x86/iommu/intel_ctx.c
> @@ -75,6 +75,9 @@ static void dmar_unref_domain_locked(struct dmar_unit *dmar
> ,
> struct dmar_domain *domain);
> static void dmar_domain_destroy(struct dmar_domain *domain);
>
> +static void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ct
> x);
> +static void dmar_free_ctx(struct dmar_ctx *ctx);
> +
> static void
> dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus)
> {
> @@ -745,7 +748,7 @@ dmar_unref_domain_locked(struct dmar_unit *dmar, struct d
> mar_domain *domain)
> dmar_domain_destroy(domain);
> }
>
> -void
> +static void
> dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx)
> {
> struct sf_buf *sf;
> @@ -819,7 +822,7 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_
> ctx *ctx)
> TD_PINNED_ASSERT;
> }
>
> -void
> +static void
> dmar_free_ctx(struct dmar_ctx *ctx)
> {
> struct dmar_unit *dmar;
> @@ -867,7 +870,7 @@ dmar_domain_free_entry(struct iommu_map_entry *entry, boo
> l free)
> * the entry's dmamap_link field.
> */
> void
> -iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free,
> +dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free,
> bool cansleep)
> {
> struct dmar_domain *domain;
> @@ -909,7 +912,7 @@ dmar_domain_unload_emit_wait(struct dmar_domain *domain,
> }
>
> void
> -iommu_domain_unload(struct iommu_domain *iodom,
> +dmar_domain_unload(struct iommu_domain *iodom,
> struct iommu_map_entries_tailq *entries, bool cansleep)
> {
> struct dmar_domain *domain;
> @@ -947,37 +950,34 @@ iommu_domain_unload(struct iommu_domain *iodom,
> }
>
> struct iommu_ctx *
> -iommu_get_ctx(struct iommu_unit *iommu, device_t dev, uint16_t rid,
> +dmar_get_ctx(struct iommu_unit *iommu, device_t dev, uint16_t rid,
> bool id_mapped, bool rmrr_init)
> {
> struct dmar_unit *dmar;
> struct dmar_ctx *ret;
>
> dmar = IOMMU2DMAR(iommu);
> -
> ret = dmar_get_ctx_for_dev(dmar, dev, rid, id_mapped, rmrr_init);
> -
> return (CTX2IOCTX(ret));
> }
>
> void
> -iommu_free_ctx_locked(struct iommu_unit *iommu, struct iommu_ctx *context)
> +dmar_free_ctx_locked_method(struct iommu_unit *iommu,
> + struct iommu_ctx *context)
> {
> struct dmar_unit *dmar;
> struct dmar_ctx *ctx;
>
> dmar = IOMMU2DMAR(iommu);
> ctx = IOCTX2CTX(context);
> -
> dmar_free_ctx_locked(dmar, ctx);
> }
>
> void
> -iommu_free_ctx(struct iommu_ctx *context)
> +dmar_free_ctx_method(struct iommu_ctx *context)
> {
> struct dmar_ctx *ctx;
>
> ctx = IOCTX2CTX(context);
> -
> dmar_free_ctx(ctx);
> }
> diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
> index 4ae005238074..0ede955e12b9 100644
> --- a/sys/x86/iommu/intel_dmar.h
> +++ b/sys/x86/iommu/intel_dmar.h
> @@ -293,10 +293,17 @@ struct dmar_ctx *dmar_get_ctx_for_devpath(struct dmar_u
> nit *dmar, uint16_t rid,
> int dev_domain, int dev_busno, const void *dev_path, int dev_path_len,
> bool id_mapped, bool rmrr_init);
> int dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx
> );
> -void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx);
> -void dmar_free_ctx(struct dmar_ctx *ctx);
> +void dmar_free_ctx_locked_method(struct iommu_unit *dmar,
> + struct iommu_ctx *ctx);
> +void dmar_free_ctx_method(struct iommu_ctx *ctx);
> struct dmar_ctx *dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid);
> +struct iommu_ctx *dmar_get_ctx(struct iommu_unit *iommu, device_t dev,
> + uint16_t rid, bool id_mapped, bool rmrr_init);
> void dmar_domain_free_entry(struct iommu_map_entry *entry, bool free);
> +void dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free,
> + bool cansleep);
> +void dmar_domain_unload(struct iommu_domain *iodom,
> + struct iommu_map_entries_tailq *entries, bool cansleep);
>
> void dmar_dev_parse_rmrr(struct dmar_domain *domain, int dev_domain,
> int dev_busno, const void *dev_path, int dev_path_len,
> @@ -308,6 +315,13 @@ void dmar_quirks_pre_use(struct iommu_unit *dmar);
>
> int dmar_init_irt(struct dmar_unit *unit);
> void dmar_fini_irt(struct dmar_unit *unit);
> +int dmar_alloc_msi_intr(device_t src, u_int *cookies, u_int count);
> +int dmar_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
> + uint64_t *addr, uint32_t *data);
> +int dmar_unmap_msi_intr(device_t src, u_int cookie);
> +int dmar_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge
> ,
> + bool activehi, int irq, u_int *cookie, uint32_t *hi, uint32_t *lo);
> +int dmar_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie);
>
> extern int haw;
> extern int dmar_batch_coalesce;
> diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
> index 636534173715..79350358cced 100644
> --- a/sys/x86/iommu/intel_drv.c
> +++ b/sys/x86/iommu/intel_drv.c
> @@ -64,6 +64,8 @@
> #include <dev/pci/pcivar.h>
> #include <machine/bus.h>
> #include <machine/pci_cfgreg.h>
> +#include <machine/md_var.h>
> +#include <machine/cputypes.h>
> #include <x86/include/busdma_impl.h>
> #include <dev/iommu/busdma_iommu.h>
> #include <x86/iommu/intel_reg.h>
> @@ -1357,12 +1359,34 @@ DB_SHOW_ALL_COMMAND(dmars, db_show_all_dmars)
> }
> #endif
>
> -struct iommu_unit *
> -iommu_find(device_t dev, bool verbose)
> +static struct iommu_unit *
> +dmar_find_method(device_t dev, bool verbose)
> {
> struct dmar_unit *dmar;
>
> dmar = dmar_find(dev, verbose);
> -
> return (&dmar->iommu);
> }
> +
> +static struct x86_iommu dmar_x86_iommu = {
> + .domain_unload_entry = dmar_domain_unload_entry,
> + .domain_unload = dmar_domain_unload,
> + .get_ctx = dmar_get_ctx,
> + .free_ctx_locked = dmar_free_ctx_locked_method,
> + .free_ctx = dmar_free_ctx_method,
> + .find = dmar_find_method,
> + .alloc_msi_intr = dmar_alloc_msi_intr,
> + .map_msi_intr = dmar_map_msi_intr,
> + .unmap_msi_intr = dmar_unmap_msi_intr,
> + .map_ioapic_intr = dmar_map_ioapic_intr,
> + .unmap_ioapic_intr = dmar_unmap_ioapic_intr,
> +};
> +
> +static void
> +x86_iommu_set_intel(void *arg __unused)
> +{
> + if (cpu_vendor_id == CPU_VENDOR_INTEL)
> + set_x86_iommu(&dmar_x86_iommu);
> +}
> +
> +SYSINIT(x86_iommu, SI_SUB_TUNABLES, SI_ORDER_ANY, x86_iommu_set_intel, NULL)
> ;
> diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c
> index 22fd51bc8be9..a6979a9d2501 100644
> --- a/sys/x86/iommu/intel_intrmap.c
> +++ b/sys/x86/iommu/intel_intrmap.c
> @@ -65,7 +65,7 @@ static void dmar_ir_program_irte(struct dmar_unit *unit, u_
> int idx,
> static int dmar_ir_free_irte(struct dmar_unit *unit, u_int cookie);
>
> int
> -iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
> +dmar_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
> {
> struct dmar_unit *unit;
> vmem_addr_t vmem_res;
> @@ -93,7 +93,7 @@ iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int co
> unt)
> }
>
> int
> -iommu_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
> +dmar_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
> uint64_t *addr, uint32_t *data)
> {
> struct dmar_unit *unit;
> @@ -139,7 +139,7 @@ iommu_map_msi_intr(device_t src, u_int cpu, u_int vector,
> u_int cookie,
> }
>
> int
> -iommu_unmap_msi_intr(device_t src, u_int cookie)
> +dmar_unmap_msi_intr(device_t src, u_int cookie)
> {
> struct dmar_unit *unit;
>
> @@ -150,7 +150,7 @@ iommu_unmap_msi_intr(device_t src, u_int cookie)
> }
>
> int
> -iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
> +dmar_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
> bool activehi, int irq, u_int *cookie, uint32_t *hi, uint32_t *lo)
> {
> struct dmar_unit *unit;
> @@ -213,7 +213,7 @@ iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int v
> ector, bool edge,
> }
>
> int
> -iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
> +dmar_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
> {
> struct dmar_unit *unit;
> u_int idx;
> diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
> index ffea1cc1a190..ea2c0358e072 100644
> --- a/sys/x86/iommu/iommu_utils.c
> +++ b/sys/x86/iommu/iommu_utils.c
> @@ -1,7 +1,7 @@
> /*-
> * SPDX-License-Identifier: BSD-2-Clause
> *
> - * Copyright (c) 2013, 2014 The FreeBSD Foundation
> + * Copyright (c) 2013, 2014, 2024 The FreeBSD Foundation
> *
> * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
> * under sponsorship from the FreeBSD Foundation.
> @@ -50,6 +50,7 @@
> #include <dev/iommu/busdma_iommu.h>
> #include <dev/iommu/iommu.h>
> #include <x86/iommu/x86_iommu.h>
> +#include <x86/iommu/iommu_intrmap.h>
>
> vm_page_t
> iommu_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags)
> @@ -162,3 +163,91 @@ SYSCTL_NODE(_hw_iommu, OID_AUTO, dmar, CTLFLAG_RD | CTLF
> LAG_MPSAFE,
> SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD,
> &iommu_tbl_pagecnt, 0,
> "Count of pages used for DMAR pagetables");
> +
> +static struct x86_iommu *x86_iommu;
> +
> +void
> +set_x86_iommu(struct x86_iommu *x)
> +{
> + MPASS(x86_iommu == NULL);
> + x86_iommu = x;
> +}
> +
> +struct x86_iommu *
> +get_x86_iommu(void)
> +{
> + return (x86_iommu);
> +}
> +
> +void
> +iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free,
> + bool cansleep)
> +{
> + x86_iommu->domain_unload_entry(entry, free, cansleep);
> +}
> +
> +void
> +iommu_domain_unload(struct iommu_domain *iodom,
> + struct iommu_map_entries_tailq *entries, bool cansleep)
> +{
> + x86_iommu->domain_unload(iodom, entries, cansleep);
> +}
> +
> +struct iommu_ctx *
> +iommu_get_ctx(struct iommu_unit *iommu, device_t dev, uint16_t rid,
> + bool id_mapped, bool rmrr_init)
> +{
> + return (x86_iommu->get_ctx(iommu, dev, rid, id_mapped, rmrr_init));
> +}
> +
> +void
> +iommu_free_ctx_locked(struct iommu_unit *iommu, struct iommu_ctx *context)
> +{
> + x86_iommu->free_ctx_locked(iommu, context);
> +}
> +
> +void
> +iommu_free_ctx(struct iommu_ctx *context)
> +{
> + x86_iommu->free_ctx(context);
> +}
> +
> +struct iommu_unit *
> +iommu_find(device_t dev, bool verbose)
> +{
> + return (x86_iommu->find(dev, verbose));
> +}
> +
> +int
> +iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
> +{
> + return (x86_iommu->alloc_msi_intr(src, cookies, count));
> +}
> +
> +int
> +iommu_map_msi_intr(device_t src, u_int cpu, u_int vector, u_int cookie,
> + uint64_t *addr, uint32_t *data)
> +{
> + return (x86_iommu->map_msi_intr(src, cpu, vector, cookie,
> + addr, data));
> +}
> +
> +int
> +iommu_unmap_msi_intr(device_t src, u_int cookie)
> +{
> + return (x86_iommu->unmap_msi_intr(src, cookie));
> +}
> +
> +int
> +iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge,
> + bool activehi, int irq, u_int *cookie, uint32_t *hi, uint32_t *lo)
> +{
> + return (x86_iommu->map_ioapic_intr(ioapic_id, cpu, vector, edge,
> + activehi, irq, cookie, hi, lo));
> +}
> +
> +int
> +iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
> +{
> + return (x86_iommu->unmap_ioapic_intr(ioapic_id, cookie));
> +}
> diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h
> index 3789586f1eaf..8c908964acd0 100644
> --- a/sys/x86/iommu/x86_iommu.h
> +++ b/sys/x86/iommu/x86_iommu.h
> @@ -1,7 +1,7 @@
> /*-
> * SPDX-License-Identifier: BSD-2-Clause
> *
> - * Copyright (c) 2013-2015 The FreeBSD Foundation
> + * Copyright (c) 2013-2015, 2024 The FreeBSD Foundation
> *
> * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
> * under sponsorship from the FreeBSD Foundation.
> @@ -59,4 +59,27 @@ extern int iommu_tbl_pagecnt;
> SYSCTL_DECL(_hw_iommu);
> SYSCTL_DECL(_hw_iommu_dmar);
>
> +struct x86_iommu {
> + void (*domain_unload_entry)(struct iommu_map_entry *entry, bool free,
> + bool cansleep);
> + void (*domain_unload)(struct iommu_domain *iodom,
> + struct iommu_map_entries_tailq *entries, bool cansleep);
> + struct iommu_ctx *(*get_ctx)(struct iommu_unit *iommu,
> + device_t dev, uint16_t rid, bool id_mapped, bool rmrr_init);
> + void (*free_ctx_locked)(struct iommu_unit *iommu,
> + struct iommu_ctx *context);
> + void (*free_ctx)(struct iommu_ctx *context);
> + struct iommu_unit *(*find)(device_t dev, bool verbose);
> + int (*alloc_msi_intr)(device_t src, u_int *cookies, u_int count);
> + int (*map_msi_intr)(device_t src, u_int cpu, u_int vector,
> + u_int cookie, uint64_t *addr, uint32_t *data);
> + int (*unmap_msi_intr)(device_t src, u_int cookie);
> + int (*map_ioapic_intr)(u_int ioapic_id, u_int cpu, u_int vector,
> + bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
> + uint32_t *lo);
> + int (*unmap_ioapic_intr)(u_int ioapic_id, u_int *cookie);
> +};
> +void set_x86_iommu(struct x86_iommu *);
> +struct x86_iommu *get_x86_iommu(void);
> +
> #endif
>
I suspect this commit but could be one of the others that caused this panic
during intialization. From a serial console log:
Hit [Enter] to boot immediately, or any other key for command prompt.
Booting [/boot/kernel/kernel] in 10 seconds... ^MBooting
[/boot/kernel/kernel] in 9 seconds... ^MBooting [/boot/kernel/kernel]...
^M
\^HGDB: no debug ports present
KDB: debugger backends: ddb
KDB: current backend: ddb
---<<BOOT>>---
Copyright (c) 1992-2024 The FreeBSD Project.
Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
The Regents of the University of California. All rights reserved.
FreeBSD is a registered trademark of The FreeBSD Foundation.
FreeBSD 15.0-CURRENT #60 komquats-n272059-e28ee29d2d13: Wed Sep 4 15:07:36
PDT 2024
root@cwsys:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git
llvmorg-18.1.6-0-g1118c2e05e67)
VT(vga): text 80x25
CPU: AMD Processor model unknown (3000.06-MHz K8-class CPU)
Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,M
CA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
Features2=0x802009<SSE3,MON,CX16,POPCNT>
AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3D
Now!>
AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,
IBS,SKINIT,WDT>
SVM: NP,NRIP,NAsids=64
TSC: P-state invariant
real memory = 8589934592 (8192 MB)
avail memory = 8145883136 (7768 MB)
Event timer "LAPIC" quality 100
ACPI APIC Table: <ATI ASUSACPI>
FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
FreeBSD/SMP: 1 package(s) x 4 core(s)
random: unblocking device.
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock:
32/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock:
16/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8
(20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8
(20230628/tbfadt-748)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using
default 32 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using
default 16 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using
default 32 (20230628/tbfadt-850)
ioapic0: MADT APIC ID 4 != hw id 0
kernel trap 12 with interrupts disabled
Fatal trap 12: page fault while in kernel mode
cpuid = 0; apic id = 00
fault virtual address = 0x78
fault code = supervisor read data, page not present
instruction pointer = 0x20:0xffffffff80a2c48b
stack pointer = 0x28:0xffffffff81f05e90
frame pointer = 0x28:0xffffffff81f05e90
code segment = base 0x0, limit 0xfffff, type 0x1b
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags = resume, IOPL = 0
current process = 0 (swapper)
rdi: 0000000000000004 rsi: 0000000000000000 rdx: 0000000000000000
rcx: 0000000000000001 r8: 0000000000000001 r9: 00000000ffffffff
rax: 0000000000000000 rbx: fffff800fec00000 rbp: ffffffff81f05e90
r10: 0000000000000000 r11: 00000000fff5cfdf r12: 0000000000000010
r13: fffff800033aa8ec r14: fffff800033aa8e4 r15: 0000000000000000
trap number = 12
panic: page fault
cpuid = 0
time = 1
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
0xffffffff81f05b80
vpanic() at vpanic+0x13f/frame 0xffffffff81f05cb0
panic() at panic+0x43/frame 0xffffffff81f05d10
trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f05d70
trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f05dc0
calltrap() at calltrap+0x8/frame 0xffffffff81f05dc0
--- trap 0xc, rip = 0xffffffff80a2c48b, rsp = 0xffffffff81f05e90, rbp =
0xffffffff81f05e90 ---
iommu_map_ioapic_intr() at iommu_map_ioapic_intr+0xb/frame
0xffffffff81f05e90
ioapic_create() at ioapic_create+0x460/frame 0xffffffff81f05f20
madt_parse_apics() at madt_parse_apics+0x51/frame 0xffffffff81f05f40
acpi_walk_subtables() at acpi_walk_subtables+0x31/frame 0xffffffff81f05f70
madt_setup_io() at madt_setup_io+0x62/frame 0xffffffff81f05f90
apic_setup_io() at apic_setup_io+0x24/frame 0xffffffff81f05fa0
mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f05ff0
Uptime: 1s
Automatic reboot in 15 seconds - press a key on the console to abort
--> Press a key on the console to reboot,
--> or switch off the system now.
Rebooting...
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org
NTP: <cy@nwtime.org> Web: https://nwtime.org
e^(i*pi)+1=0
From nobody Thu Sep 5 00:37:49 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzgSS0zkjz5W7CZ;
Thu, 05 Sep 2024 00:38:00 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzgSR5sRfz4LnQ;
Thu, 5 Sep 2024 00:37:59 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from tom.home (kib@localhost [127.0.0.1] (may be forged))
by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 4850bnSj032440;
Thu, 5 Sep 2024 03:37:52 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 4850bnSj032440
Received: (from kostik@localhost)
by tom.home (8.18.1/8.18.1/Submit) id 4850bnTr032439;
Thu, 5 Sep 2024 03:37:49 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f
Date: Thu, 5 Sep 2024 03:37:49 +0300
From: Konstantin Belousov <kostikbel@gmail.com>
To: Cy Schubert <Cy.Schubert@cschubert.com>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Subject: Re: git: 65b133e5d292 - main - x86: allow to have more than one kind
of IOMMU
Message-ID: <Ztj9XU2ETM9gKP7r@kib.kiev.ua>
References: <202409042150.484LoeAq031493@gitrepo.freebsd.org>
<20240904235204.1FCD9C5@slippy.cwsent.com>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-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: <20240904235204.1FCD9C5@slippy.cwsent.com>
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,
NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1
X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]
X-Rspamd-Queue-Id: 4WzgSR5sRfz4LnQ
On Wed, Sep 04, 2024 at 04:52:04PM -0700, Cy Schubert wrote:
> I suspect this commit but could be one of the others that caused this panic
> during intialization. From a serial console log:
>
> Hit [Enter] to boot immediately, or any other key for command prompt.
> Booting [/boot/kernel/kernel] in 10 seconds... ^MBooting
> [/boot/kernel/kernel] in 9 seconds... ^MBooting [/boot/kernel/kernel]...
> ^M
> \^HGDB: no debug ports present
> KDB: debugger backends: ddb
> KDB: current backend: ddb
> ---<<BOOT>>---
> Copyright (c) 1992-2024 The FreeBSD Project.
> Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
> The Regents of the University of California. All rights reserved.
> FreeBSD is a registered trademark of The FreeBSD Foundation.
> FreeBSD 15.0-CURRENT #60 komquats-n272059-e28ee29d2d13: Wed Sep 4 15:07:36
> PDT 2024
> root@cwsys:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
> FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git
> llvmorg-18.1.6-0-g1118c2e05e67)
> VT(vga): text 80x25
> CPU: AMD Processor model unknown (3000.06-MHz K8-class CPU)
> Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
> Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,M
> CA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
> Features2=0x802009<SSE3,MON,CX16,POPCNT>
> AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3D
> Now!>
> AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,
> IBS,SKINIT,WDT>
> SVM: NP,NRIP,NAsids=64
> TSC: P-state invariant
> real memory = 8589934592 (8192 MB)
> avail memory = 8145883136 (7768 MB)
> Event timer "LAPIC" quality 100
> ACPI APIC Table: <ATI ASUSACPI>
> FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
> FreeBSD/SMP: 1 package(s) x 4 core(s)
> random: unblocking device.
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock:
> 32/8 (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock:
> 16/8 (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8
> (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8
> (20230628/tbfadt-748)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using
> default 32 (20230628/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using
> default 16 (20230628/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using
> default 32 (20230628/tbfadt-850)
> ioapic0: MADT APIC ID 4 != hw id 0
> kernel trap 12 with interrupts disabled
>
>
> Fatal trap 12: page fault while in kernel mode
> cpuid = 0; apic id = 00
> fault virtual address = 0x78
> fault code = supervisor read data, page not present
> instruction pointer = 0x20:0xffffffff80a2c48b
> stack pointer = 0x28:0xffffffff81f05e90
> frame pointer = 0x28:0xffffffff81f05e90
> code segment = base 0x0, limit 0xfffff, type 0x1b
> = DPL 0, pres 1, long 1, def32 0, gran 1
> processor eflags = resume, IOPL = 0
> current process = 0 (swapper)
> rdi: 0000000000000004 rsi: 0000000000000000 rdx: 0000000000000000
> rcx: 0000000000000001 r8: 0000000000000001 r9: 00000000ffffffff
> rax: 0000000000000000 rbx: fffff800fec00000 rbp: ffffffff81f05e90
> r10: 0000000000000000 r11: 00000000fff5cfdf r12: 0000000000000010
> r13: fffff800033aa8ec r14: fffff800033aa8e4 r15: 0000000000000000
> trap number = 12
> panic: page fault
> cpuid = 0
> time = 1
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> 0xffffffff81f05b80
> vpanic() at vpanic+0x13f/frame 0xffffffff81f05cb0
> panic() at panic+0x43/frame 0xffffffff81f05d10
> trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f05d70
> trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f05dc0
> calltrap() at calltrap+0x8/frame 0xffffffff81f05dc0
> --- trap 0xc, rip = 0xffffffff80a2c48b, rsp = 0xffffffff81f05e90, rbp =
> 0xffffffff81f05e90 ---
> iommu_map_ioapic_intr() at iommu_map_ioapic_intr+0xb/frame
> 0xffffffff81f05e90
> ioapic_create() at ioapic_create+0x460/frame 0xffffffff81f05f20
> madt_parse_apics() at madt_parse_apics+0x51/frame 0xffffffff81f05f40
> acpi_walk_subtables() at acpi_walk_subtables+0x31/frame 0xffffffff81f05f70
> madt_setup_io() at madt_setup_io+0x62/frame 0xffffffff81f05f90
> apic_setup_io() at apic_setup_io+0x24/frame 0xffffffff81f05fa0
> mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f05ff0
> Uptime: 1s
> Automatic reboot in 15 seconds - press a key on the console to abort
> --> Press a key on the console to reboot,
> --> or switch off the system now.
> Rebooting...
Try this
commit 27647f0593a0e7c1cdacb8531dd944aa568dbdb5
Author: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu Sep 5 03:33:34 2024 +0300
x86: always provide dummy x86_iommu virtual methods
to make configurations where vendor-specific IOMMU not yet implemented
but IOMMU is enabled in config, work when calling into MSI/IOAPIC
interrupt remapping.
Reported by: cy
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 2c647fd21c67..ebfcb94c7e97 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -190,12 +190,53 @@ SYSCTL_INT(_hw_iommu, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN,
&iommu_qi_batch_coalesce, 0,
"Number of qi batches between interrupt");
-static struct x86_iommu *x86_iommu;
+static int
+x86_no_iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_map_msi_intr(device_t src, u_int cpu, u_int vector,
+ u_int cookie, uint64_t *addr, uint32_t *data)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_unmap_msi_intr(device_t src, u_int cookie)
+{
+ return (0);
+}
+
+static int
+x86_no_iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector,
+ bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
+ uint32_t *lo)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
+{
+ return (0);
+}
+
+static struct x86_iommu x86_no_iommu = {
+ .alloc_msi_intr = x86_no_iommu_alloc_msi_intr,
+ .map_msi_intr = x86_no_iommu_map_msi_intr,
+ .unmap_msi_intr = x86_no_iommu_unmap_msi_intr,
+ .map_ioapic_intr = x86_no_iommu_map_ioapic_intr,
+ .unmap_ioapic_intr = x86_no_iommu_unmap_ioapic_intr,
+};
+
+static struct x86_iommu *x86_iommu = &x86_no_iommu;
void
set_x86_iommu(struct x86_iommu *x)
{
- MPASS(x86_iommu == NULL);
+ MPASS(x86_iommu == &x86_no_iommu);
x86_iommu = x;
}
From nobody Thu Sep 5 00:38:38 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzgTC2GwZz5W7wV;
Thu, 05 Sep 2024 00:38: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 4WzgTB3pmKz4MHH;
Thu, 5 Sep 2024 00:38:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725496718;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WBmPLErXm0TcCt1emjg5+Gd0HOWtjb+JxYC04mevT9c=;
b=OI6CrkN4ZVfj5hc4TqucrPSF2gpqMhS8hFkJ7EzWfBunSsC6AX2LN9wxEdobW/JqjFQls5
V1EN7+ASZAdVJO5R841YMovM/AZ8sduLwXqUOoFcNLGF+Iuqkc/zKxuiSUd4exXSDa0uG3
KQ274r+NLrM3FD6F4ksBzwJJ5nogBlLxddQrCGMQlnqMAvHc2ncYRXawn36NCu9V05FD21
it4Sfn82I64IpxkN3bro2K92P200olJNHccOffAiuTtYkGDcxIMc7nZ6GFDtbbruNJI7cn
ww9kcdwUV788BA7UqzeNRanrFWIgERp0rFUDr3UwRX4Cyn+RS27ayIhKH7IZ/w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725496718; a=rsa-sha256; cv=none;
b=qyj8EjOTJTB+K8RTtNvBJZ8KblAB499L1AX74f7xaTr1DG+Nvazqat34jB8t1hJvWM494w
J7nBIzoYJVAVJUVpmIyH2LFtRN0d+aWa+lANOjVVN6waPBAGr7X1rtome7Ws5O9MUkHLdV
SZ55sKt1q93YQMPvhQqKEWuIwJOpMJ5HmQrOo3zT5d5i8TQuNvOwvn5CoQYdLd9LQuun/L
Q8Ycs/YSEXVyn7VVuMJPAdojKUFH9HCGBCX8840PAR0Vrv2zmXO07PI7gyxXOVwUMrn4d+
BWwUl3u6vLyfnMXYnKbkJNQ+botRddlRSNSkMcxC5eLTIkhumFwrK7O3mHTlmw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725496718;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=WBmPLErXm0TcCt1emjg5+Gd0HOWtjb+JxYC04mevT9c=;
b=FfUCD4Cevl1Us9LMbMlUAwyOWHJKZn+AmCXh0O9bzQuVpfoMfiSdOWCyHwrxIQQm7NKymS
L0DXdRI11aXIBR2Olsomr+HwH7CochflLqMTtyRLAHJZB6a4jz+HJA6lR+Fx9enODQv1Kp
kTF5VTu59c9w2HgFQ68VZGYrSKZE1Ojocx5bDscSlJzqhSN6iS6v8g3GPrcCUjFgSQgNE3
IVpmQtUw9CmpCcNkDBV9+HE4GvQlNanbro88PtFTIE00xSjWZVO5UcsmICtpRPpLIhtkQb
DHikWIJiIwPmUn/c/xAyL3vbDXqI3NDi9b5OS74b9Fgk3dF/Hck1/L9fxNcV7Q==
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 4WzgTB1w0TzmQd;
Thu, 5 Sep 2024 00:38: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 4850cc68010424;
Thu, 5 Sep 2024 00:38:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4850cc49010422;
Thu, 5 Sep 2024 00:38:38 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 00:38:38 GMT
Message-Id: <202409050038.4850cc49010422@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: dc450b388bba - main - vmm: Remove more of vmmdev_open()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: dc450b388bba182d0b3ce2f1a04c20acda7ff922
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=dc450b388bba182d0b3ce2f1a04c20acda7ff922
commit dc450b388bba182d0b3ce2f1a04c20acda7ff922
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-05 00:36:27 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-05 00:36:27 +0000
vmm: Remove more of vmmdev_open()
The softc pointer is now unused, just remove it.
Reported by: se
Fixes: 66fc442421f8 ("vmm: Remove an incorrect credential check in vmmdev_open()")
---
sys/dev/vmm/vmm_dev.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c
index 353b58dd8a2c..a43d642b3925 100644
--- a/sys/dev/vmm/vmm_dev.c
+++ b/sys/dev/vmm/vmm_dev.c
@@ -325,12 +325,8 @@ vm_set_register_set(struct vcpu *vcpu, unsigned int count, int *regnum,
static int
vmmdev_open(struct cdev *dev, int flags, int fmt, struct thread *td)
{
- struct vmmdev_softc *sc;
int error;
- sc = vmmdev_lookup2(dev);
- KASSERT(sc != NULL, ("%s: device not found", __func__));
-
/*
* A jail without vmm access shouldn't be able to access vmm device
* files at all, but check here just to be thorough.
From nobody Thu Sep 5 00:40:42 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzgWb1WNBz5W7yC;
Thu, 05 Sep 2024 00:40: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 4WzgWb10PCz4Mcs;
Thu, 5 Sep 2024 00:40:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725496843;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jVTKeMHujsrXi5xauHjhiCQNq+LCXRcjs+9qryJ0yqs=;
b=RifMRM5Iwhr+Kffo4SQmJEpaYQaMxc2HKy2gwFhfMqf4exo+NXJaF4WCnq6wsKdzEHiLtV
kbX3pO0lzoINCmTYn4UI300cIio2gS/WqimlRQR64jORFWFIYP0Q+T7kWcSfcqLZCUPOFi
Xasc/ac2F9SM8LX1R4dqTByvf6SKMuTeaGouPhYR/HnHW9vm1mrI3mP+BMhcoAZYIKOe5n
H+3UCdpkRV0QijMj1wFdQRb/rFSIdwSO3yv9rFxO+ijkpISKzJaXxJQNeJ6CT0IBwpjaez
8ZiYym72SweePVk4WCc3+EBXT3SM7rjiSglh4Fbr1J3mUtojklHk9wVdXG2OGw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725496843; a=rsa-sha256; cv=none;
b=eD2ik1QQJk+ZbWBpROTmV8EF8+GE9iMYW95oQCEGkK5m5l1KXAyjGTHoW7nH4WKdyiuP2x
TkEiAwL9+iZPz0kk3VaFgEB+UxJjW5cWN5GEslLfGj2bcXRTlwzokS24ByTfmLNOmSrAyK
fOtOeOKW1bP9q7uPRvsL4kzVbHegJvEF3e8hC+uYm/K1i30hXD/WS0pLTPQP7HFVURTcSM
lj0PaGjSxoOm+l7sPGyPmGxQQvyQVE44fYh+X+iviBjFzIq2SJyxeOs+ld4wTZrCugYThr
fmshcjMvB4F0z3sZwU01sIf7DadwnevttOaFF6Y+PG8KMgeLS8T/nnxY7T/mFg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725496843;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jVTKeMHujsrXi5xauHjhiCQNq+LCXRcjs+9qryJ0yqs=;
b=WmBfpUWYChi6hzxfph2X9pY3cVR89ZOw4e/0ZjY8lhrs1NX29M6N4+vINh6Sd40agXXbqR
w0BszPN+VflhloT++e0SzeqBR2JOCzJoRSDwnWmvKFVUCdOF5auPCWYEJeSi/w0coAg6Yy
mUeBjDdTO+uipKfawmUv4M1M260/dKpGi+qBUOenyfnib12jUlYeVKYZONZTPPqbmMk8uW
cSYSS+dmMv0BH3WZp0zdXyh3HqAMJ/9JV5R4APOG/iQQG5lh8Ec9vdaDBHCtS60bmVWi0H
3mEMdUWwk+1i6XgOt647yTA/JfaUuReM8ZQnuPhlhk/Yh1IQOsjyjBOt9upBHg==
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 4WzgWb0V1nzmbj;
Thu, 5 Sep 2024 00:40: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 4850egZa019402;
Thu, 5 Sep 2024 00:40:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4850egxl019399;
Thu, 5 Sep 2024 00:40:42 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 00:40:42 GMT
Message-Id: <202409050040.4850egxl019399@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 79eba754bec3 - main - vop_stdadvise(): restore correct
handling of length == 0
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 79eba754bec39d88a6494318a2176d19743cf993
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=79eba754bec39d88a6494318a2176d19743cf993
commit 79eba754bec39d88a6494318a2176d19743cf993
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-09-03 04:20:40 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-05 00:40:14 +0000
vop_stdadvise(): restore correct handling of length == 0
Switch to unsigned arithmetic to handle overflow not relying on -fwrap,
and specially treat the case of length == 0 from posix_fadvise() which
passes OFF_MAX as the end to VOP. There, roundup() overflows and -fwrap
causes bend and endn become negative. Using uintmax_t gives the place
for roundup() to not wrap.
Also remove locals with single use, and move calculations out from under
bo lock.
Reported by: tmunro
Reviewed by: markj, tmunro
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Differential revision: https://reviews.freebsd.org/D46518
---
sys/kern/vfs_default.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index d612642a6bc9..f5722851d729 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -1063,8 +1063,8 @@ vop_stdadvise(struct vop_advise_args *ap)
{
struct vnode *vp;
struct bufobj *bo;
+ uintmax_t bstart, bend;
daddr_t startn, endn;
- off_t bstart, bend, start, end;
int bsize, error;
vp = ap->a_vp;
@@ -1096,7 +1096,8 @@ vop_stdadvise(struct vop_advise_args *ap)
*/
bsize = vp->v_bufobj.bo_bsize;
bstart = rounddown(ap->a_start, bsize);
- bend = roundup(ap->a_end, bsize);
+ bend = ap->a_end;
+ bend = roundup(bend, bsize);
/*
* Deactivate pages in the specified range from the backing VM
@@ -1105,18 +1106,17 @@ vop_stdadvise(struct vop_advise_args *ap)
* below.
*/
if (vp->v_object != NULL) {
- start = trunc_page(bstart);
- end = round_page(bend);
VM_OBJECT_RLOCK(vp->v_object);
- vm_object_page_noreuse(vp->v_object, OFF_TO_IDX(start),
- OFF_TO_IDX(end));
+ vm_object_page_noreuse(vp->v_object,
+ OFF_TO_IDX(trunc_page(bstart)),
+ OFF_TO_IDX(round_page(bend)));
VM_OBJECT_RUNLOCK(vp->v_object);
}
bo = &vp->v_bufobj;
- BO_RLOCK(bo);
startn = bstart / bsize;
endn = bend / bsize;
+ BO_RLOCK(bo);
error = bnoreuselist(&bo->bo_clean, bo, startn, endn);
if (error == 0)
error = bnoreuselist(&bo->bo_dirty, bo, startn, endn);
From nobody Thu Sep 5 01:06:00 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzh4r4jSFz5WDry;
Thu, 05 Sep 2024 01:06:04 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzh4r2jhYz4QV4;
Thu, 5 Sep 2024 01:06:04 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227])
by cmsmtp with ESMTPS
id lr9rsRnry9TOUm0wlscMEa; Thu, 05 Sep 2024 01:06:03 +0000
Received: from spqr.komquats.com ([70.66.152.170])
by cmsmtp with ESMTPSA
id m0wjsjtRbKHV8m0wksnd6p; Thu, 05 Sep 2024 01:06:03 +0000
X-Auth-User: cschuber
X-Authority-Analysis: v=2.4 cv=XeEqz555 c=1 sm=1 tr=0 ts=66d903fb
a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17
a=0_lmrure0TmMD5iX:21 a=kj9zAlcOel0A:10 a=EaEq8P2WXUwA:10 a=NEAV23lmAAAA:8
a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=3UDjUPUtPk4n7ud1VCEA:9
a=3wAIKV35zABP6r1R:21 a=CjuIK1q_8ugA:10 a=RVmHIydaz68A:10
a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTP id ECD831BF;
Wed, 04 Sep 2024 18:06:00 -0700 (PDT)
Received: by slippy.cwsent.com (Postfix, from userid 1000)
id B9D292A; Wed, 04 Sep 2024 18:06:00 -0700 (PDT)
X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev
Reply-to: Cy Schubert <Cy.Schubert@cschubert.com>
From: Cy Schubert <Cy.Schubert@cschubert.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Konstantin Belousov <kostikbel@gmail.com>
cc: Cy Schubert <Cy.Schubert@cschubert.com>, src-committers@freebsd.org,
dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject: Re: git: 65b133e5d292 - main - x86: allow to have more than one kind of IOMMU
In-reply-to: <Ztj9XU2ETM9gKP7r@kib.kiev.ua>
References: <202409042150.484LoeAq031493@gitrepo.freebsd.org> <20240904235204.1FCD9C5@slippy.cwsent.com> <Ztj9XU2ETM9gKP7r@kib.kiev.ua>
Comments: In-reply-to Konstantin Belousov <kostikbel@gmail.com>
message dated "Thu, 05 Sep 2024 03:37:49 +0300."
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 04 Sep 2024 18:06:00 -0700
Message-Id: <20240905010600.B9D292A@slippy.cwsent.com>
X-CMAE-Envelope: MS4xfEedAPJ4rlBR0HCGKt7KW4oa+UB7mTgGDx9bV88pfODuURbZyq3oeo9eja4m+tSLRWCo9m6rw6dFX5oMJHbX+O2Frw6ymV4CSHIea/bPFQz1/KBBDMCc
nKNP9fJtkt7UD4qxmDmvj45604kMlti4xERbUUPEJ6bC0C6+sij6tVC2CpawgzbKWy50BxkOCAIhZ8jEKUtbESPK4LVUUz8463tlCLkJvLSGwkt0pRBNnz0e
2IjGAsr4enftN0B8Q7v0fPuBgaQkrQs2Eq/J41RO2hbhIU6oZIi/81jMlBTHg4Ume3DyeIEODWNgsLDjvGS+qBrEFY4a+15p1wTI5LHgCjg=
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]
X-Rspamd-Queue-Id: 4Wzh4r2jhYz4QV4
In message <Ztj9XU2ETM9gKP7r@kib.kiev.ua>, Konstantin Belousov writes:
> On Wed, Sep 04, 2024 at 04:52:04PM -0700, Cy Schubert wrote:
> > I suspect this commit but could be one of the others that caused this panic
>
> > during intialization. From a serial console log:
> >
> > Hit [Enter] to boot immediately, or any other key for command prompt.
> > Booting [/boot/kernel/kernel] in 10 seconds... ^MBooting
> > [/boot/kernel/kernel] in 9 seconds... ^MBooting [/boot/kernel/kernel]...
>
> > ^M
> > \^HGDB: no debug ports present
> > KDB: debugger backends: ddb
> > KDB: current backend: ddb
> > ---<<BOOT>>---
> > Copyright (c) 1992-2024 The FreeBSD Project.
> > Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
> > The Regents of the University of California. All rights reserved.
> > FreeBSD is a registered trademark of The FreeBSD Foundation.
> > FreeBSD 15.0-CURRENT #60 komquats-n272059-e28ee29d2d13: Wed Sep 4 15:07:36
>
> > PDT 2024
> > root@cwsys:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
> > FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git
> > llvmorg-18.1.6-0-g1118c2e05e67)
> > VT(vga): text 80x25
> > CPU: AMD Processor model unknown (3000.06-MHz K8-class CPU)
> > Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
> > Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,
> M
> > CA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
> > Features2=0x802009<SSE3,MON,CX16,POPCNT>
> > AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3
> D
> > Now!>
> > AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW
> ,
> > IBS,SKINIT,WDT>
> > SVM: NP,NRIP,NAsids=64
> > TSC: P-state invariant
> > real memory = 8589934592 (8192 MB)
> > avail memory = 8145883136 (7768 MB)
> > Event timer "LAPIC" quality 100
> > ACPI APIC Table: <ATI ASUSACPI>
> > FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
> > FreeBSD/SMP: 1 package(s) x 4 core(s)
> > random: unblocking device.
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock:
> > 32/8 (20230628/tbfadt-748)
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock:
> > 16/8 (20230628/tbfadt-748)
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8
> > (20230628/tbfadt-748)
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8
> > (20230628/tbfadt-748)
> > Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using
> > default 32 (20230628/tbfadt-850)
> > Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using
>
> > default 16 (20230628/tbfadt-850)
> > Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using
> > default 32 (20230628/tbfadt-850)
> > ioapic0: MADT APIC ID 4 != hw id 0
> > kernel trap 12 with interrupts disabled
> >
> >
> > Fatal trap 12: page fault while in kernel mode
> > cpuid = 0; apic id = 00
> > fault virtual address = 0x78
> > fault code = supervisor read data, page not present
> > instruction pointer = 0x20:0xffffffff80a2c48b
> > stack pointer = 0x28:0xffffffff81f05e90
> > frame pointer = 0x28:0xffffffff81f05e90
> > code segment = base 0x0, limit 0xfffff, type 0x1b
> > = DPL 0, pres 1, long 1, def32 0, gran 1
> > processor eflags = resume, IOPL = 0
> > current process = 0 (swapper)
> > rdi: 0000000000000004 rsi: 0000000000000000 rdx: 0000000000000000
> > rcx: 0000000000000001 r8: 0000000000000001 r9: 00000000ffffffff
> > rax: 0000000000000000 rbx: fffff800fec00000 rbp: ffffffff81f05e90
> > r10: 0000000000000000 r11: 00000000fff5cfdf r12: 0000000000000010
> > r13: fffff800033aa8ec r14: fffff800033aa8e4 r15: 0000000000000000
> > trap number = 12
> > panic: page fault
> > cpuid = 0
> > time = 1
> > KDB: stack backtrace:
> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> > 0xffffffff81f05b80
> > vpanic() at vpanic+0x13f/frame 0xffffffff81f05cb0
> > panic() at panic+0x43/frame 0xffffffff81f05d10
> > trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f05d70
> > trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f05dc0
> > calltrap() at calltrap+0x8/frame 0xffffffff81f05dc0
> > --- trap 0xc, rip = 0xffffffff80a2c48b, rsp = 0xffffffff81f05e90, rbp =
> > 0xffffffff81f05e90 ---
> > iommu_map_ioapic_intr() at iommu_map_ioapic_intr+0xb/frame
> > 0xffffffff81f05e90
> > ioapic_create() at ioapic_create+0x460/frame 0xffffffff81f05f20
> > madt_parse_apics() at madt_parse_apics+0x51/frame 0xffffffff81f05f40
> > acpi_walk_subtables() at acpi_walk_subtables+0x31/frame 0xffffffff81f05f70
> > madt_setup_io() at madt_setup_io+0x62/frame 0xffffffff81f05f90
> > apic_setup_io() at apic_setup_io+0x24/frame 0xffffffff81f05fa0
> > mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f05ff0
> > Uptime: 1s
> > Automatic reboot in 15 seconds - press a key on the console to abort
> > --> Press a key on the console to reboot,
> > --> or switch off the system now.
> > Rebooting...
>
> Try this
>
> commit 27647f0593a0e7c1cdacb8531dd944aa568dbdb5
> Author: Konstantin Belousov <kib@FreeBSD.org>
> Date: Thu Sep 5 03:33:34 2024 +0300
>
> x86: always provide dummy x86_iommu virtual methods
>
> to make configurations where vendor-specific IOMMU not yet implemented
> but IOMMU is enabled in config, work when calling into MSI/IOAPIC
> interrupt remapping.
>
> Reported by: cy
> Sponsored by: Advanced Micro Devices (AMD)
> Sponsored by: The FreeBSD Foundation
> MFC after: 1 week
>
> diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
> index 2c647fd21c67..ebfcb94c7e97 100644
> --- a/sys/x86/iommu/iommu_utils.c
> +++ b/sys/x86/iommu/iommu_utils.c
> @@ -190,12 +190,53 @@ SYSCTL_INT(_hw_iommu, OID_AUTO, batch_coalesce, CTLFLAG
> _RWTUN,
> &iommu_qi_batch_coalesce, 0,
> "Number of qi batches between interrupt");
>
> -static struct x86_iommu *x86_iommu;
> +static int
> +x86_no_iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
> +{
> + return (EOPNOTSUPP);
> +}
> +
> +static int
> +x86_no_iommu_map_msi_intr(device_t src, u_int cpu, u_int vector,
> + u_int cookie, uint64_t *addr, uint32_t *data)
> +{
> + return (EOPNOTSUPP);
> +}
> +
> +static int
> +x86_no_iommu_unmap_msi_intr(device_t src, u_int cookie)
> +{
> + return (0);
> +}
> +
> +static int
> +x86_no_iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector,
> + bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
> + uint32_t *lo)
> +{
> + return (EOPNOTSUPP);
> +}
> +
> +static int
> +x86_no_iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
> +{
> + return (0);
> +}
> +
> +static struct x86_iommu x86_no_iommu = {
> + .alloc_msi_intr = x86_no_iommu_alloc_msi_intr,
> + .map_msi_intr = x86_no_iommu_map_msi_intr,
> + .unmap_msi_intr = x86_no_iommu_unmap_msi_intr,
> + .map_ioapic_intr = x86_no_iommu_map_ioapic_intr,
> + .unmap_ioapic_intr = x86_no_iommu_unmap_ioapic_intr,
> +};
> +
> +static struct x86_iommu *x86_iommu = &x86_no_iommu;
>
> void
> set_x86_iommu(struct x86_iommu *x)
> {
> - MPASS(x86_iommu == NULL);
> + MPASS(x86_iommu == &x86_no_iommu);
> x86_iommu = x;
> }
>
It still panics, differently though.
---<<BOOT>>---
Copyright (c) 1992-2024 The FreeBSD Project.
Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
The Regents of the University of California. All rights reserved.
FreeBSD is a registered trademark of The FreeBSD Foundation.
FreeBSD 15.0-CURRENT #61 komquats-n272062-79eba754bec3: Wed Sep 4 17:46:55 PDT 2024
root@slippy:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git llvmorg-18.1.6-0-g1118c2e05e67)
VT(vga): text 80x25
CPU: AMD Processor model unknown (3000.00-MHz K8-class CPU)
Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
Features2=0x802009<SSE3,MON,CX16,POPCNT>
AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3DNow!>
AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,IBS,SKINIT,WDT>
SVM: NP,NRIP,NAsids=64
TSC: P-state invariant
real memory = 8589934592 (8192 MB)
avail memory = 8145883136 (7768 MB)
Event timer "LAPIC" quality 100
ACPI APIC Table: <ATI ASUSACPI>
FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
FreeBSD/SMP: 1 package(s) x 4 core(s)
random: unblocking device.
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock: 32/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock: 16/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using default 32 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using default 16 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using default 32 (20230628/tbfadt-850)
ioapic0: MADT APIC ID 4 != hw id 0
ioapic0 <Version 2.1> irqs 0-23
Launching APs: 1 3 2
random: entropy device external interface
vtvga0: <VT VGA driver>
aesni0: No AES or SHA support.
acpi0: <ATI ASUSACPI>
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_PR_.CPU0 (20230628/dspkginit-605)
acpi0: Power Button (fixed)
cpu0: <ACPI CPU> on acpi0
attimer0: <AT timer> port 0x40-0x43 on acpi0
Timecounter "i8254" frequency 1193182 Hz quality 0
Event timer "i8254" frequency 1193182 Hz quality 100
hpet0: <High Precision Event Timer> iomem 0xfed00000-0xfed003ff irq 0,8 on acpi0
device_attach: hpet0 attach returned 12
atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
atrtc0: registered as a time-of-day clock, resolution 1.000000s
Event timer "RTC" frequency 32768 Hz quality 0
Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
acpi_timer0: <32-bit timer at 3.579545MHz> port 0x4008-0x400b on acpi0
acpi_button0: <Power Button> on acpi0
pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
pci0: <ACPI PCI bus> on pcib0
pcib1: <ACPI PCI-PCI bridge> at device 1.0 on pci0
pci1: <ACPI PCI bus> on pcib1
vgapci0: <VGA-compatible display> port 0xcc00-0xccff mem 0xf0000000-0xf7ffffff,0xfdbf0000-0xfdbfffff,0xfda00000-0xfdafffff irq 18 at device 5.0 on pci1
vgapci0: Boot video device
pcib2: <ACPI PCI-PCI bridge> at device 7.0 on pci0
pci2: <ACPI PCI bus> on pcib2
re0: <RealTek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet> port 0xdc00-0xdcff mem 0xfdfff000-0xfdffffff irq 19 at device 0.0 on pci2
re0: Using 1 MSI message
re0: Chip rev. 0x38000000
re0: MAC rev. 0x00000000
Fatal trap 12: page fault while in kernel mode
cpuid = 2; apic id = 02
fault virtual address = 0x0
fault code = supervisor read instruction, page not present
instruction pointer = 0x20:0x0
stack pointer = 0x28:0xffffffff81f058c8
frame pointer = 0x28:0xffffffff81f058e0
code segment = base 0x0, limit 0xfffff, type 0x1b
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags = interrupt enabled, resume, IOPL = 0
current process = 0 (swapper)
rdi: fffff800057d4d00 rsi: 0000000000000000 rdx: 000000000000004a
rcx: fffff80005704000 r8: 00000015bf17440a r9: ffffffff810f5ce0
rax: 0000000000000000 rbx: fffff800057d4d00 rbp: ffffffff81f058e0
r10: ffffffff81f05860 r11: fffffffffffffff5 r12: 0000000038000000
r13: ffffffffffffffff r14: fffff800057d4e00 r15: 0000000000000100
trap number = 12
panic: page fault
cpuid = 2
time = 1
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xffffffff81f055b0
vpanic() at vpanic+0x13f/frame 0xffffffff81f056e0
panic() at panic+0x43/frame 0xffffffff81f05740
trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f057a0
trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f057f0
calltrap() at calltrap+0x8/frame 0xffffffff81f057f0
--- trap 0xc, rip = 0, rsp = 0xffffffff81f058c8, rbp = 0xffffffff81f058e0 ---
??() at 0/frame 0xffffffff81f058e0
acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f05900
re_attach() at re_attach+0x100b/frame 0xffffffff81f05990
device_attach() at device_attach+0x3ac/frame 0xffffffff81f059e0
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05a10
pci_attach() at pci_attach+0xc7/frame 0xffffffff81f05a40
acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f05a80
device_attach() at device_attach+0x3ac/frame 0xffffffff81f05ad0
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05b00
acpi_pcib_pci_attach() at acpi_pcib_pci_attach+0x95/frame 0xffffffff81f05b30
device_attach() at device_attach+0x3ac/frame 0xffffffff81f05b80
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05bb0
pci_attach() at pci_attach+0xc7/frame 0xffffffff81f05be0
acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f05c20
device_attach() at device_attach+0x3ac/frame 0xffffffff81f05c70
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05ca0
acpi_pcib_acpi_attach() at acpi_pcib_acpi_attach+0x424/frame 0xffffffff81f05d00
device_attach() at device_attach+0x3ac/frame 0xffffffff81f05d50
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05d80
acpi_probe_children() at acpi_probe_children+0x6f/frame 0xffffffff81f05de0
acpi_attach() at acpi_attach+0x9dc/frame 0xffffffff81f05e70
device_attach() at device_attach+0x3ac/frame 0xffffffff81f05ec0
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05ef0
device_attach() at device_attach+0x3ac/frame 0xffffffff81f05f40
bus_generic_new_pass() at bus_generic_new_pass+0x127/frame 0xffffffff81f05f70
root_bus_configure() at root_bus_configure+0x26/frame 0xffffffff81f05f90
configure() at configure+0x9/frame 0xffffffff81f05fa0
mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f05ff0
Uptime: 1s
Automatic reboot in 15 seconds - press a key on the console to abort
Rebooting...
cpu_reset: Restarting BSP
cpu_reset_proxy: Stopped CPU 2
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org
NTP: <cy@nwtime.org> Web: https://nwtime.org
e^(i*pi)+1=0
From nobody Thu Sep 5 01:30:19 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzhct6Hkbz5WK2F;
Thu, 05 Sep 2024 01:30:22 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzhct25Ddz4Vls;
Thu, 5 Sep 2024 01:30:22 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227])
by cmsmtp with ESMTPS
id lr9rscHMOMArNm1KHs9cpD; Thu, 05 Sep 2024 01:30:21 +0000
Received: from spqr.komquats.com ([70.66.152.170])
by cmsmtp with ESMTPSA
id m1KGsjyyPKHV8m1KGsnexc; Thu, 05 Sep 2024 01:30:21 +0000
X-Auth-User: cschuber
X-Authority-Analysis: v=2.4 cv=XeEqz555 c=1 sm=1 tr=0 ts=66d909ad
a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17
a=0_lmrure0TmMD5iX:21 a=kj9zAlcOel0A:10 a=EaEq8P2WXUwA:10 a=VxmjJ2MpAAAA:8
a=NEAV23lmAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8
a=IS9ZRXeZG70pK1hyvhsA:9 a=i7m8eXiX1cS3P9We:21 a=CjuIK1q_8ugA:10
a=RVmHIydaz68A:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22
a=LK5xJRSDVpKd5WXXoEvA:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTP id 8502E23E;
Wed, 04 Sep 2024 18:30:19 -0700 (PDT)
Received: by slippy.cwsent.com (Postfix, from userid 1000)
id 6B7C7287; Wed, 04 Sep 2024 18:30:19 -0700 (PDT)
X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev
Reply-to: Cy Schubert <Cy.Schubert@cschubert.com>
From: Cy Schubert <Cy.Schubert@cschubert.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Cy Schubert <Cy.Schubert@cschubert.com>
cc: Konstantin Belousov <kostikbel@gmail.com>,
src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Subject: Re: git: 65b133e5d292 - main - x86: allow to have more than one
kind of IOMMU
In-reply-to: <20240905010600.B9D292A@slippy.cwsent.com>
References: <202409042150.484LoeAq031493@gitrepo.freebsd.org>
<20240904235204.1FCD9C5@slippy.cwsent.com> <Ztj9XU2ETM9gKP7r@kib.kiev.ua>
<20240905010600.B9D292A@slippy.cwsent.com>
Comments: In-reply-to Cy Schubert <Cy.Schubert@cschubert.com>
message dated "Wed, 04 Sep 2024 18:06:00 -0700."
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 04 Sep 2024 18:30:19 -0700
Message-Id: <20240905013019.6B7C7287@slippy.cwsent.com>
X-CMAE-Envelope: MS4xfEiQsyeMT+2dN/BgFd8qCRohfPR68akRL9PxsyZt5ipxi20DVQk3zVatAMbKtBBf2mGj/fQA1VMWGn9z0n+Pu9NcZb1JurCO9cvl5jcdMcire/2oWAno
3ca9ggfPiQJ04nTkrmJQ5PdywEfi9oMrngT9oRDRsCSG2GSunNOTZW/0gL8hPePA3ovyWEdSaSm+pFbqTa1kXD/arWUe8Pa4n9/lNgUVjmItuObMuwmmxBTE
yOU61F+kshhPI8CFN19kKBoMwuoklmlwPhgDX6vpMbx7JTJPKRWhHZYsB78HarpsrWCwzYGl8A+FFcqJXz+14tLRZR5uN9SKsw4uGcSni/c=
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]
X-Rspamd-Queue-Id: 4Wzhct25Ddz4Vls
In message <20240905010600.B9D292A@slippy.cwsent.com>, Cy Schubert writes:
> In message <Ztj9XU2ETM9gKP7r@kib.kiev.ua>, Konstantin Belousov writes:
> > On Wed, Sep 04, 2024 at 04:52:04PM -0700, Cy Schubert wrote:
> > > I suspect this commit but could be one of the others that caused this pan
> ic
> >
> > > during intialization. From a serial console log:
> > >
> > > Hit [Enter] to boot immediately, or any other key for command prompt.
> > > Booting [/boot/kernel/kernel] in 10 seconds... ^MBooting
> > > [/boot/kernel/kernel] in 9 seconds... ^MBooting [/boot/kernel/kernel]...
>
> >
> > > ^M
> > > \^HGDB: no debug ports present
> > > KDB: debugger backends: ddb
> > > KDB: current backend: ddb
> > > ---<<BOOT>>---
> > > Copyright (c) 1992-2024 The FreeBSD Project.
> > > Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
> > > The Regents of the University of California. All rights reserved.
> > > FreeBSD is a registered trademark of The FreeBSD Foundation.
> > > FreeBSD 15.0-CURRENT #60 komquats-n272059-e28ee29d2d13: Wed Sep 4 15:07:
> 36
> >
> > > PDT 2024
> > > root@cwsys:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
> > > FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git
> > > llvmorg-18.1.6-0-g1118c2e05e67)
> > > VT(vga): text 80x25
> > > CPU: AMD Processor model unknown (3000.06-MHz K8-class CPU)
> > > Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
> > > Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PG
> E,
> > M
> > > CA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
> > > Features2=0x802009<SSE3,MON,CX16,POPCNT>
> > > AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+
> ,3
> > D
> > > Now!>
> > > AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OS
> VW
> > ,
> > > IBS,SKINIT,WDT>
> > > SVM: NP,NRIP,NAsids=64
> > > TSC: P-state invariant
> > > real memory = 8589934592 (8192 MB)
> > > avail memory = 8145883136 (7768 MB)
> > > Event timer "LAPIC" quality 100
> > > ACPI APIC Table: <ATI ASUSACPI>
> > > FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
> > > FreeBSD/SMP: 1 package(s) x 4 core(s)
> > > random: unblocking device.
> > > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock:
> > > 32/8 (20230628/tbfadt-748)
> > > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock:
>
> > > 16/8 (20230628/tbfadt-748)
> > > Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/
> 8
> > > (20230628/tbfadt-748)
> > > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8
> > > (20230628/tbfadt-748)
> > > Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using
>
> > > default 32 (20230628/tbfadt-850)
> > > Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, usi
> ng
> >
> > > default 16 (20230628/tbfadt-850)
> > > Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using
> > > default 32 (20230628/tbfadt-850)
> > > ioapic0: MADT APIC ID 4 != hw id 0
> > > kernel trap 12 with interrupts disabled
> > >
> > >
> > > Fatal trap 12: page fault while in kernel mode
> > > cpuid = 0; apic id = 00
> > > fault virtual address = 0x78
> > > fault code = supervisor read data, page not present
> > > instruction pointer = 0x20:0xffffffff80a2c48b
> > > stack pointer = 0x28:0xffffffff81f05e90
> > > frame pointer = 0x28:0xffffffff81f05e90
> > > code segment = base 0x0, limit 0xfffff, type 0x1b
> > > = DPL 0, pres 1, long 1, def32 0, gran 1
> > > processor eflags = resume, IOPL = 0
> > > current process = 0 (swapper)
> > > rdi: 0000000000000004 rsi: 0000000000000000 rdx: 0000000000000000
> > > rcx: 0000000000000001 r8: 0000000000000001 r9: 00000000ffffffff
> > > rax: 0000000000000000 rbx: fffff800fec00000 rbp: ffffffff81f05e90
> > > r10: 0000000000000000 r11: 00000000fff5cfdf r12: 0000000000000010
> > > r13: fffff800033aa8ec r14: fffff800033aa8e4 r15: 0000000000000000
> > > trap number = 12
> > > panic: page fault
> > > cpuid = 0
> > > time = 1
> > > KDB: stack backtrace:
> > > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> > > 0xffffffff81f05b80
> > > vpanic() at vpanic+0x13f/frame 0xffffffff81f05cb0
> > > panic() at panic+0x43/frame 0xffffffff81f05d10
> > > trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f05d70
> > > trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f05dc0
> > > calltrap() at calltrap+0x8/frame 0xffffffff81f05dc0
> > > --- trap 0xc, rip = 0xffffffff80a2c48b, rsp = 0xffffffff81f05e90, rbp =
> > > 0xffffffff81f05e90 ---
> > > iommu_map_ioapic_intr() at iommu_map_ioapic_intr+0xb/frame
> > > 0xffffffff81f05e90
> > > ioapic_create() at ioapic_create+0x460/frame 0xffffffff81f05f20
> > > madt_parse_apics() at madt_parse_apics+0x51/frame 0xffffffff81f05f40
> > > acpi_walk_subtables() at acpi_walk_subtables+0x31/frame 0xffffffff81f05f7
> 0
> > > madt_setup_io() at madt_setup_io+0x62/frame 0xffffffff81f05f90
> > > apic_setup_io() at apic_setup_io+0x24/frame 0xffffffff81f05fa0
> > > mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f05ff0
> > > Uptime: 1s
> > > Automatic reboot in 15 seconds - press a key on the console to abort
> > > --> Press a key on the console to reboot,
> > > --> or switch off the system now.
> > > Rebooting...
> >
> > Try this
> >
> > commit 27647f0593a0e7c1cdacb8531dd944aa568dbdb5
> > Author: Konstantin Belousov <kib@FreeBSD.org>
> > Date: Thu Sep 5 03:33:34 2024 +0300
> >
> > x86: always provide dummy x86_iommu virtual methods
> >
> > to make configurations where vendor-specific IOMMU not yet implemented
> > but IOMMU is enabled in config, work when calling into MSI/IOAPIC
> > interrupt remapping.
> >
> > Reported by: cy
> > Sponsored by: Advanced Micro Devices (AMD)
> > Sponsored by: The FreeBSD Foundation
> > MFC after: 1 week
> >
> > diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
> > index 2c647fd21c67..ebfcb94c7e97 100644
> > --- a/sys/x86/iommu/iommu_utils.c
> > +++ b/sys/x86/iommu/iommu_utils.c
> > @@ -190,12 +190,53 @@ SYSCTL_INT(_hw_iommu, OID_AUTO, batch_coalesce, CTLFL
> AG
> > _RWTUN,
> > &iommu_qi_batch_coalesce, 0,
> > "Number of qi batches between interrupt");
> >
> > -static struct x86_iommu *x86_iommu;
> > +static int
> > +x86_no_iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
> > +{
> > + return (EOPNOTSUPP);
> > +}
> > +
> > +static int
> > +x86_no_iommu_map_msi_intr(device_t src, u_int cpu, u_int vector,
> > + u_int cookie, uint64_t *addr, uint32_t *data)
> > +{
> > + return (EOPNOTSUPP);
> > +}
> > +
> > +static int
> > +x86_no_iommu_unmap_msi_intr(device_t src, u_int cookie)
> > +{
> > + return (0);
> > +}
> > +
> > +static int
> > +x86_no_iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector,
> > + bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
> > + uint32_t *lo)
> > +{
> > + return (EOPNOTSUPP);
> > +}
> > +
> > +static int
> > +x86_no_iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
> > +{
> > + return (0);
> > +}
> > +
> > +static struct x86_iommu x86_no_iommu = {
> > + .alloc_msi_intr = x86_no_iommu_alloc_msi_intr,
> > + .map_msi_intr = x86_no_iommu_map_msi_intr,
> > + .unmap_msi_intr = x86_no_iommu_unmap_msi_intr,
> > + .map_ioapic_intr = x86_no_iommu_map_ioapic_intr,
> > + .unmap_ioapic_intr = x86_no_iommu_unmap_ioapic_intr,
> > +};
> > +
> > +static struct x86_iommu *x86_iommu = &x86_no_iommu;
> >
> > void
> > set_x86_iommu(struct x86_iommu *x)
> > {
> > - MPASS(x86_iommu == NULL);
> > + MPASS(x86_iommu == &x86_no_iommu);
> > x86_iommu = x;
> > }
> >
>
> It still panics, differently though.
>
> ---<<BOOT>>---
> Copyright (c) 1992-2024 The FreeBSD Project.
> Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
> The Regents of the University of California. All rights reserved.
> FreeBSD is a registered trademark of The FreeBSD Foundation.
> FreeBSD 15.0-CURRENT #61 komquats-n272062-79eba754bec3: Wed Sep 4 17:46:55 P
> DT 2024
> root@slippy:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
> FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git llvmor
> g-18.1.6-0-g1118c2e05e67)
> VT(vga): text 80x25
> CPU: AMD Processor model unknown (3000.00-MHz K8-class CPU)
> Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
> Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MC
> A,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
> Features2=0x802009<SSE3,MON,CX16,POPCNT>
> AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3DN
> ow!>
> AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,I
> BS,SKINIT,WDT>
> SVM: NP,NRIP,NAsids=64
> TSC: P-state invariant
> real memory = 8589934592 (8192 MB)
> avail memory = 8145883136 (7768 MB)
> Event timer "LAPIC" quality 100
> ACPI APIC Table: <ATI ASUSACPI>
> FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
> FreeBSD/SMP: 1 package(s) x 4 core(s)
> random: unblocking device.
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock: 32/8
> (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock: 16/
> 8 (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8 (2
> 0230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8 (2023
> 0628/tbfadt-748)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using def
> ault 32 (20230628/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using d
> efault 16 (20230628/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using defau
> lt 32 (20230628/tbfadt-850)
> ioapic0: MADT APIC ID 4 != hw id 0
> ioapic0 <Version 2.1> irqs 0-23
> Launching APs: 1 3 2
> random: entropy device external interface
> vtvga0: <VT VGA driver>
> aesni0: No AES or SHA support.
> acpi0: <ATI ASUSACPI>
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> \_PR_.CPU0 (20230628/dspkginit-605)
> acpi0: Power Button (fixed)
> cpu0: <ACPI CPU> on acpi0
> attimer0: <AT timer> port 0x40-0x43 on acpi0
> Timecounter "i8254" frequency 1193182 Hz quality 0
> Event timer "i8254" frequency 1193182 Hz quality 100
> hpet0: <High Precision Event Timer> iomem 0xfed00000-0xfed003ff irq 0,8 on ac
> pi0
> device_attach: hpet0 attach returned 12
> atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
> atrtc0: registered as a time-of-day clock, resolution 1.000000s
> Event timer "RTC" frequency 32768 Hz quality 0
> Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
> acpi_timer0: <32-bit timer at 3.579545MHz> port 0x4008-0x400b on acpi0
> acpi_button0: <Power Button> on acpi0
> pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
> pci0: <ACPI PCI bus> on pcib0
> pcib1: <ACPI PCI-PCI bridge> at device 1.0 on pci0
> pci1: <ACPI PCI bus> on pcib1
> vgapci0: <VGA-compatible display> port 0xcc00-0xccff mem 0xf0000000-0xf7fffff
> f,0xfdbf0000-0xfdbfffff,0xfda00000-0xfdafffff irq 18 at device 5.0 on pci1
> vgapci0: Boot video device
> pcib2: <ACPI PCI-PCI bridge> at device 7.0 on pci0
> pci2: <ACPI PCI bus> on pcib2
> re0: <RealTek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet> port 0xdc00-
> 0xdcff mem 0xfdfff000-0xfdffffff irq 19 at device 0.0 on pci2
> re0: Using 1 MSI message
> re0: Chip rev. 0x38000000
> re0: MAC rev. 0x00000000
>
>
> Fatal trap 12: page fault while in kernel mode
> cpuid = 2; apic id = 02
> fault virtual address = 0x0
> fault code = supervisor read instruction, page not present
> instruction pointer = 0x20:0x0
> stack pointer = 0x28:0xffffffff81f058c8
> frame pointer = 0x28:0xffffffff81f058e0
> code segment = base 0x0, limit 0xfffff, type 0x1b
> = DPL 0, pres 1, long 1, def32 0, gran 1
> processor eflags = interrupt enabled, resume, IOPL = 0
> current process = 0 (swapper)
> rdi: fffff800057d4d00 rsi: 0000000000000000 rdx: 000000000000004a
> rcx: fffff80005704000 r8: 00000015bf17440a r9: ffffffff810f5ce0
> rax: 0000000000000000 rbx: fffff800057d4d00 rbp: ffffffff81f058e0
> r10: ffffffff81f05860 r11: fffffffffffffff5 r12: 0000000038000000
> r13: ffffffffffffffff r14: fffff800057d4e00 r15: 0000000000000100
> trap number = 12
> panic: page fault
> cpuid = 2
> time = 1
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xffffffff81f055b
> 0
> vpanic() at vpanic+0x13f/frame 0xffffffff81f056e0
> panic() at panic+0x43/frame 0xffffffff81f05740
> trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f057a0
> trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f057f0
> calltrap() at calltrap+0x8/frame 0xffffffff81f057f0
> --- trap 0xc, rip = 0, rsp = 0xffffffff81f058c8, rbp = 0xffffffff81f058e0 ---
> ??() at 0/frame 0xffffffff81f058e0
> acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f05900
> re_attach() at re_attach+0x100b/frame 0xffffffff81f05990
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f059e0
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05a10
> pci_attach() at pci_attach+0xc7/frame 0xffffffff81f05a40
> acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f05a80
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f05ad0
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05b00
> acpi_pcib_pci_attach() at acpi_pcib_pci_attach+0x95/frame 0xffffffff81f05b30
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f05b80
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05bb0
> pci_attach() at pci_attach+0xc7/frame 0xffffffff81f05be0
> acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f05c20
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f05c70
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05ca0
> acpi_pcib_acpi_attach() at acpi_pcib_acpi_attach+0x424/frame 0xffffffff81f05d
> 00
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f05d50
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05d80
> acpi_probe_children() at acpi_probe_children+0x6f/frame 0xffffffff81f05de0
> acpi_attach() at acpi_attach+0x9dc/frame 0xffffffff81f05e70
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f05ec0
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f05ef0
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f05f40
> bus_generic_new_pass() at bus_generic_new_pass+0x127/frame 0xffffffff81f05f70
> root_bus_configure() at root_bus_configure+0x26/frame 0xffffffff81f05f90
> configure() at configure+0x9/frame 0xffffffff81f05fa0
> mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f05ff0
> Uptime: 1s
> Automatic reboot in 15 seconds - press a key on the console to abort
> Rebooting...
> cpu_reset: Restarting BSP
> cpu_reset_proxy: Stopped CPU 2
>
>
>
> --
> Cheers,
> Cy Schubert <Cy.Schubert@cschubert.com>
> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org
> NTP: <cy@nwtime.org> Web: https://nwtime.org
>
> e^(i*pi)+1=0
The other machine with the problem suffers a different but similar panic.
---<<BOOT>>---
Copyright (c) 1992-2024 The FreeBSD Project.
Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
The Regents of the University of California. All rights reserved.
FreeBSD is a registered trademark of The FreeBSD Foundation.
FreeBSD 15.0-CURRENT #61 komquats-n272062-79eba754bec3: Wed Sep 4 17:46:55
PDT 2024
root@slippy:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git
llvmorg-18.1.6-0-g1118c2e05e67)
VT(vga): text 80x25
CPU: AMD Phenom(tm) II X4 945 Processor (3014.08-MHz K8-class CPU)
Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,M
CA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
Features2=0x802009<SSE3,MON,CX16,POPCNT>
AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3D
Now!>
AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,
IBS,SKINIT,WDT>
SVM: NP,NRIP,NAsids=64
TSC: P-state invariant
real memory = 8589934592 (8192 MB)
avail memory = 8264790016 (7881 MB)
Event timer "LAPIC" quality 100
ACPI APIC Table: <Nvidia ASUSACPI>
FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
FreeBSD/SMP: 1 package(s) x 4 core(s)
random: unblocking device.
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock:
32/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock:
16/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8
(20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8
(20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe1Block: 128/8
(20230628/tbfadt-748)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using
default 32 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using
default 16 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using
default 32 (20230628/tbfadt-850)
ioapic0: MADT APIC ID 4 != hw id 0
ioapic0 <Version 1.1> irqs 0-23
Launching APs: 2 1 3
random: entropy device external interface
kbd1 at kbdmux0
vtvga0: <VT VGA driver>
aesni0: No AES or SHA support.
acpi0: <Nvidia ASUSACPI>
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element
- \_PR_.CPU0 (20230628/dspkginit-605)
acpi0: Power Button (fixed)
cpu0: <ACPI CPU> on acpi0
attimer0: <AT timer> port 0x40-0x43 on acpi0
Timecounter "i8254" frequency 1193182 Hz quality 0
Event timer "i8254" frequency 1193182 Hz quality 100
hpet0: <High Precision Event Timer> iomem 0xfefff000-0xfefff3ff irq 0,8 on
acpi0
Timecounter "HPET" frequency 25000000 Hz quality 950
atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
atrtc0: registered as a time-of-day clock, resolution 1.000000s
Event timer "RTC" frequency 32768 Hz quality 0
Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1008-0x100b on acpi0
acpi_button0: <Power Button> on acpi0
pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
pci0: <ACPI PCI bus> on pcib0
pci0: <memory, RAM> at device 0.0 (no driver attached)
isab0: <PCI-ISA bridge> at device 1.0 on pci0
isa0: <ISA bus> on isab0
ohci0: <nVidia nForce MCP55 USB Controller> mem 0xfe02f000-0xfe02ffff irq
21 at device 2.0 on pci0
Fatal trap 12: page fault while in kernel mode
cpuid = 2; apic id = 02
fault virtual address = 0x0
fault code = supervisor read instruction, page not present
instruction pointer = 0x20:0x0
stack pointer = 0x28:0xffffffff81f2caa8
frame pointer = 0x28:0xffffffff81f2cac0
code segment = base 0x0, limit 0xfffff, type 0x1b
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags = interrupt enabled, resume, IOPL = 0
current process = 0 (swapper)
rdi: fffff80003437500 rsi: 0000000000000000 rdx: ffffffff80e54eb8
rcx: ffffffff80e54eb8 r8: 000000124472ef7c r9: ffffffff810f5ce0
rax: 0000000000000000 rbx: fffff80003437500 rbp: ffffffff81f2cac0
r10: ffffffff81f2c9f0 r11: fffffffffffffff5 r12: fffffe00113fc320
r13: fffff8000341b0a0 r14: fffff80003437800 r15: fffff80003437800
trap number = 12
panic: page fault
cpuid = 2
time = 1
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
0xffffffff81f2c790
vpanic() at vpanic+0x13f/frame 0xffffffff81f2c8c0
panic() at panic+0x43/frame 0xffffffff81f2c920
trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f2c980
trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f2c9d0
calltrap() at calltrap+0x8/frame 0xffffffff81f2c9d0
--- trap 0xc, rip = 0, rsp = 0xffffffff81f2caa8, rbp = 0xffffffff81f2cac0
---
??() at 0/frame 0xffffffff81f2cac0
acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f2cae0
ohci_pci_attach() at ohci_pci_attach+0x4f/frame 0xffffffff81f2cb30
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cb80
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cbb0
pci_attach() at pci_attach+0xc7/frame 0xffffffff81f2cbe0
acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f2cc20
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cc70
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cca0
acpi_pcib_acpi_attach() at acpi_pcib_acpi_attach+0x424/frame
0xffffffff81f2cd00
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cd50
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cd80
acpi_probe_children() at acpi_probe_children+0x6f/frame 0xffffffff81f2cde0
acpi_attach() at acpi_attach+0x9dc/frame 0xffffffff81f2ce70
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cec0
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cef0
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cf40
bus_generic_new_pass() at bus_generic_new_pass+0x127/frame
0xffffffff81f2cf70
root_bus_configure() at root_bus_configure+0x26/frame 0xffffffff81f2cf90
configure() at configure+0x9/frame 0xffffffff81f2cfa0
mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f2cff0
Uptime: 1s
Automatic reboot in 15 seconds - press a key on the console to abort
acpi0: reset failed - timeout
Rebooting...
cpu_reset: Restarting BSP
cpu_reset_proxy: Stopped CPU 2
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org
NTP: <cy@nwtime.org> Web: https://nwtime.org
e^(i*pi)+1=0
From nobody Thu Sep 5 01:32:02 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzhg26CwKz5WKn5;
Thu, 05 Sep 2024 01:32:14 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzhg24Nwxz4Wrs;
Thu, 5 Sep 2024 01:32:14 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from tom.home (kib@localhost [127.0.0.1] (may be forged))
by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 4851W2vT034174;
Thu, 5 Sep 2024 04:32:06 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 4851W2vT034174
Received: (from kostik@localhost)
by tom.home (8.18.1/8.18.1/Submit) id 4851W2s4034173;
Thu, 5 Sep 2024 04:32:02 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f
Date: Thu, 5 Sep 2024 04:32:02 +0300
From: Konstantin Belousov <kostikbel@gmail.com>
To: Cy Schubert <Cy.Schubert@cschubert.com>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Subject: Re: git: 65b133e5d292 - main - x86: allow to have more than one kind
of IOMMU
Message-ID: <ZtkKErhgQskvSrXT@kib.kiev.ua>
References: <202409042150.484LoeAq031493@gitrepo.freebsd.org>
<20240904235204.1FCD9C5@slippy.cwsent.com>
<Ztj9XU2ETM9gKP7r@kib.kiev.ua>
<20240905010600.B9D292A@slippy.cwsent.com>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-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: <20240905010600.B9D292A@slippy.cwsent.com>
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,
NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1
X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]
X-Rspamd-Queue-Id: 4Wzhg24Nwxz4Wrs
On Wed, Sep 04, 2024 at 06:06:00PM -0700, Cy Schubert wrote:
> ??() at 0/frame 0xffffffff81f058e0
> acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f05900
One more method is needed. Updated patch is below.
commit 99e3d96fc1a2b1d5cac5a635608ec3044ec4fa13
Author: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu Sep 5 03:33:34 2024 +0300
x86: always provide dummy x86_iommu virtual methods
to make configurations where vendor-specific IOMMU not yet implemented
but IOMMU is enabled in config, work when calling into MSI/IOAPIC
interrupt remapping.
Reported by: cy
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 2c647fd21c67..2011c632f770 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -190,12 +190,60 @@ SYSCTL_INT(_hw_iommu, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN,
&iommu_qi_batch_coalesce, 0,
"Number of qi batches between interrupt");
-static struct x86_iommu *x86_iommu;
+static struct iommu_unit *
+x86_no_iommu_find(device_t dev, bool verbose)
+{
+ return (NULL);
+}
+
+static int
+x86_no_iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_map_msi_intr(device_t src, u_int cpu, u_int vector,
+ u_int cookie, uint64_t *addr, uint32_t *data)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_unmap_msi_intr(device_t src, u_int cookie)
+{
+ return (0);
+}
+
+static int
+x86_no_iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector,
+ bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
+ uint32_t *lo)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
+{
+ return (0);
+}
+
+static struct x86_iommu x86_no_iommu = {
+ .find = x86_no_iommu_find,
+ .alloc_msi_intr = x86_no_iommu_alloc_msi_intr,
+ .map_msi_intr = x86_no_iommu_map_msi_intr,
+ .unmap_msi_intr = x86_no_iommu_unmap_msi_intr,
+ .map_ioapic_intr = x86_no_iommu_map_ioapic_intr,
+ .unmap_ioapic_intr = x86_no_iommu_unmap_ioapic_intr,
+};
+
+static struct x86_iommu *x86_iommu = &x86_no_iommu;
void
set_x86_iommu(struct x86_iommu *x)
{
- MPASS(x86_iommu == NULL);
+ MPASS(x86_iommu == &x86_no_iommu);
x86_iommu = x;
}
From nobody Thu Sep 5 02:06:02 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzjQ53Lntz5WRDt;
Thu, 05 Sep 2024 02:06:05 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzjQ51Hmsz4c2v;
Thu, 5 Sep 2024 02:06:05 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183])
by cmsmtp with ESMTPS
id lrFvscHkKMArNm1sqs9geU; Thu, 05 Sep 2024 02:06:04 +0000
Received: from spqr.komquats.com ([70.66.152.170])
by cmsmtp with ESMTPSA
id m1sosrvO3E0IVm1spsnJUW; Thu, 05 Sep 2024 02:06:04 +0000
X-Auth-User: cschuber
X-Authority-Analysis: v=2.4 cv=cI9DsUeN c=1 sm=1 tr=0 ts=66d9120c
a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17
a=0_lmrure0TmMD5iX:21 a=kj9zAlcOel0A:10 a=EaEq8P2WXUwA:10 a=NEAV23lmAAAA:8
a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=AHSZ7YSsU9PHovtevYAA:9
a=DeRpVz0td-2OLLQ0:21 a=CjuIK1q_8ugA:10 a=RVmHIydaz68A:10
a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTP id 5048F353;
Wed, 04 Sep 2024 19:06:02 -0700 (PDT)
Received: by slippy.cwsent.com (Postfix, from userid 1000)
id 4AF2711D; Wed, 04 Sep 2024 19:06:02 -0700 (PDT)
X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev
Reply-to: Cy Schubert <Cy.Schubert@cschubert.com>
From: Cy Schubert <Cy.Schubert@cschubert.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Konstantin Belousov <kostikbel@gmail.com>
cc: Cy Schubert <Cy.Schubert@cschubert.com>, src-committers@freebsd.org,
dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject: Re: git: 65b133e5d292 - main - x86: allow to have more than one kind of IOMMU
In-reply-to: <ZtkKErhgQskvSrXT@kib.kiev.ua>
References: <202409042150.484LoeAq031493@gitrepo.freebsd.org> <20240904235204.1FCD9C5@slippy.cwsent.com> <Ztj9XU2ETM9gKP7r@kib.kiev.ua> <20240905010600.B9D292A@slippy.cwsent.com> <ZtkKErhgQskvSrXT@kib.kiev.ua>
Comments: In-reply-to Konstantin Belousov <kostikbel@gmail.com>
message dated "Thu, 05 Sep 2024 04:32:02 +0300."
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 04 Sep 2024 19:06:02 -0700
Message-Id: <20240905020602.4AF2711D@slippy.cwsent.com>
X-CMAE-Envelope: MS4xfMKEB/SQyJw2UMXbEVyCrjwM6/ZuKjEqZKV6e+Uz9uWAPZ1eCX9hbq6IA8XqDzG1o7s2LOstPbl6gXTgUJqkvZKu7w7nNnXNK8DzHH9hCq1TtB6fcPWs
zd51+RHgITqRIW238+aYU8pxcOUWxUn5mqrvfa8+9/l0c1CQPj/2Ru52P/te+IP26r52WOPqLpOWdvrUk4nWyAQ1pZSmcwXs1t96LX3UPwxPiUsPgECFZfQQ
kfZaBhoFEzouAyjFmw1i+TaI8GFhsArkn1FwGkkJOmaNIf90CaaoBf0fx8m+BKTFOILe49J87j0rXd0XF2jbFnovXdyliTpPJR7Con1Wdms=
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]
X-Rspamd-Queue-Id: 4WzjQ51Hmsz4c2v
Both machines still panic.
First machine panics on ohci(4) attach while the second at re(4) attach in
acpi_pci_get_dma_tag().
First machine:
Copyright (c) 1992-2024 The FreeBSD Project.
Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
The Regents of the University of California. All rights reserved.
FreeBSD is a registered trademark of The FreeBSD Foundation.
FreeBSD 15.0-CURRENT #61 komquats-n272062-79eba754bec3: Wed Sep 4 17:46:55 PDT 2024
root@slippy:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git llvmorg-18.1.6-0-g1118c2e05e67)
VT(vga): text 80x25
CPU: AMD Phenom(tm) II X4 945 Processor (3013.95-MHz K8-class CPU)
Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
Features2=0x802009<SSE3,MON,CX16,POPCNT>
AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3DNow!>
AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,IBS,SKINIT,WDT>
SVM: NP,NRIP,NAsids=64
TSC: P-state invariant
real memory = 8589934592 (8192 MB)
avail memory = 8264794112 (7881 MB)
Event timer "LAPIC" quality 100
ACPI APIC Table: <Nvidia ASUSACPI>
FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
FreeBSD/SMP: 1 package(s) x 4 core(s)
random: unblocking device.
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock: 32/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock: 16/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe1Block: 128/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using default 32 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using default 16 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using default 32 (20230628/tbfadt-850)
ioapic0: MADT APIC ID 4 != hw id 0
ioapic0 <Version 1.1> irqs 0-23
Launching APs: 1 2 3
random: entropy device external interface
kbd1 at kbdmux0
vtvga0: <VT VGA driver>
aesni0: No AES or SHA support.
acpi0: <Nvidia ASUSACPI>
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_PR_.CPU0 (20230628/dspkginit-605)
acpi0: Power Button (fixed)
cpu0: <ACPI CPU> on acpi0
attimer0: <AT timer> port 0x40-0x43 on acpi0
Timecounter "i8254" frequency 1193182 Hz quality 0
Event timer "i8254" frequency 1193182 Hz quality 100
hpet0: <High Precision Event Timer> iomem 0xfefff000-0xfefff3ff irq 0,8 on acpi0
Timecounter "HPET" frequency 25000000 Hz quality 950
atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
atrtc0: registered as a time-of-day clock, resolution 1.000000s
Event timer "RTC" frequency 32768 Hz quality 0
Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1008-0x100b on acpi0
acpi_button0: <Power Button> on acpi0
pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
pci0: <ACPI PCI bus> on pcib0
pci0: <memory, RAM> at device 0.0 (no driver attached)
isab0: <PCI-ISA bridge> at device 1.0 on pci0
isa0: <ISA bus> on isab0
ohci0: <nVidia nForce MCP55 USB Controller> mem 0xfe02f000-0xfe02ffff irq 21 at device 2.0 on pci0
Fatal trap 12: page fault while in kernel mode
cpuid = 2; apic id = 02
fault virtual address = 0x0
fault code = supervisor read instruction, page not present
instruction pointer = 0x20:0x0
stack pointer = 0x28:0xffffffff81f2caa8
frame pointer = 0x28:0xffffffff81f2cac0
code segment = base 0x0, limit 0xfffff, type 0x1b
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags = interrupt enabled, resume, IOPL = 0
current process = 0 (swapper)
rdi: fffff80005808500 rsi: 0000000000000000 rdx: ffffffff80e54eb8
rcx: ffffffff80e54eb8 r8: 0000001473a90040 r9: ffffffff810f5ce0
rax: 0000000000000000 rbx: fffff80005808500 rbp: ffffffff81f2cac0
r10: ffffffff81f2c9f0 r11: fffffffffffffff5 r12: fffffe00113fc320
r13: fffff800057ec0a0 r14: fffff80005808800 r15: fffff80005808800
trap number = 12
panic: page fault
cpuid = 2
time = 1
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xffffffff81f2c790
vpanic() at vpanic+0x13f/frame 0xffffffff81f2c8c0
panic() at panic+0x43/frame 0xffffffff81f2c920
trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f2c980
trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f2c9d0
calltrap() at calltrap+0x8/frame 0xffffffff81f2c9d0
--- trap 0xc, rip = 0, rsp = 0xffffffff81f2caa8, rbp = 0xffffffff81f2cac0 ---
??() at 0/frame 0xffffffff81f2cac0
acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f2cae0
ohci_pci_attach() at ohci_pci_attach+0x4f/frame 0xffffffff81f2cb30
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cb80
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cbb0
pci_attach() at pci_attach+0xc7/frame 0xffffffff81f2cbe0
acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f2cc20
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cc70
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cca0
acpi_pcib_acpi_attach() at acpi_pcib_acpi_attach+0x424/frame 0xffffffff81f2cd00
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cd50
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cd80
acpi_probe_children() at acpi_probe_children+0x6f/frame 0xffffffff81f2cde0
acpi_attach() at acpi_attach+0x9dc/frame 0xffffffff81f2ce70
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cec0
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cef0
device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cf40
bus_generic_new_pass() at bus_generic_new_pass+0x127/frame 0xffffffff81f2cf70
root_bus_configure() at root_bus_configure+0x26/frame 0xffffffff81f2cf90
configure() at configure+0x9/frame 0xffffffff81f2cfa0
mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f2cff0
Uptime: 1s
Automatic reboot in 15 seconds - press a key on the console to abort
--> Press a key on the console to reboot,
--> or switch off the system now.
acpi0: reset failed - timeout
Rebooting...
cpu_reset: Restarting BSP
cpu_reset_proxy: Stopped CPU 2
Second machine:
Copyright (c) 1992-2024 The FreeBSD Project.
Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
The Regents of the University of California. All rights reserved.
FreeBSD is a registered trademark of The FreeBSD Foundation.
FreeBSD 15.0-CURRENT #61 komquats-n272062-79eba754bec3: Wed Sep 4 17:46:55 PDT 2024
root@slippy:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git llvmorg-18.1.6-0-g1118c2e05e67)
VT(vga): text 80x25
CPU: AMD Processor model unknown (3000.02-MHz K8-class CPU)
Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
Features2=0x802009<SSE3,MON,CX16,POPCNT>
AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3DNow!>
AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,IBS,SKINIT,WDT>
SVM: NP,NRIP,NAsids=64
TSC: P-state invariant
real memory = 8589934592 (8192 MB)
avail memory = 8145883136 (7768 MB)
Event timer "LAPIC" quality 100
ACPI APIC Table: <ATI ASUSACPI>
FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
FreeBSD/SMP: 1 package(s) x 4 core(s)
random: unblocking device.
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock: 32/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock: 16/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8 (20230628/tbfadt-748)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using default 32 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using default 16 (20230628/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using default 32 (20230628/tbfadt-850)
ioapic0: MADT APIC ID 4 != hw id 0
ioapic0 <Version 2.1> irqs 0-23
Launching APs: 1 3 2
random: entropy device external interface
vtvga0: <VT VGA driver>
aesni0: No AES or SHA support.
acpi0: <ATI ASUSACPI>
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKA (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKB (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKC (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - LNKD (20230628/dspkginit-605)
ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_PR_.CPU0 (20230628/dspkginit-605)
acpi0: Power Button (fixed)
cpu0: <ACPI CPU> on acpi0
attimer0: <AT timer> port 0x40-0x43 on acpi0
Timecounter "i8254" frequency 1193182 Hz quality 0
Event timer "i8254" frequency 1193182 Hz quality 100
hpet0: <High Precision Event Timer> iomem 0xfed00000-0xfed003ff irq 0,8 on acpi0
device_attach: hpet0 attach returned 12
atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
atrtc0: registered as a time-of-day clock, resolution 1.000000s
Event timer "RTC" frequency 32768 Hz quality 0
Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
acpi_timer0: <32-bit timer at 3.579545MHz> port 0x4008-0x400b on acpi0
acpi_button0: <Power Button> on acpi0
pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
pci0: <ACPI PCI bus> on pcib0
pcib1: <ACPI PCI-PCI bridge> at device 1.0 on pci0
pci1: <ACPI PCI bus> on pcib1
vgapci0: <VGA-compatible display> port 0xcc00-0xccff mem 0xf0000000-0xf7ffffff,0xfdbf0000-0xfdbfffff,0xfda00000-0xfdafffff irq 18 at device 5.0 on pci1
vgapci0: Boot video device
pcib2: <ACPI PCI-PCI bridge> at device 7.0 on pci0
pci2: <ACPI PCI bus> on pcib2
re0: <RealTek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet> port 0xdc00-0xdcff mem 0xfdfff000-0xfdffffff irq 19 at device 0.0 on pci2
re0: Using 1 MSI message
re0: Chip rev. 0x38000000
re0: MAC rev. 0x00000000
Fatal trap 12: page fault while in kernel mode
cpuid = 2; apic id = 02
fault virtual address = 0x0
fault code = supervisor read instruction, page not present
instruction pointer = 0x20:0x0
stack pointer = 0x28:0xffffffff81f088c8
frame pointer = 0x28:0xffffffff81f088e0
code segment = base 0x0, limit 0xfffff, type 0x1b
= DPL 0, pres 1, long 1, def32 0, gran 1
processor eflags = interrupt enabled, resume, IOPL = 0
current process = 0 (swapper)
rdi: fffff800057d4d00 rsi: 0000000000000000 rdx: 000000000000004a
rcx: fffff80005704000 r8: 0000001670cdcfc6 r9: ffffffff810f5ce0
rax: 0000000000000000 rbx: fffff800057d4d00 rbp: ffffffff81f088e0
r10: ffffffff81f08860 r11: fffffffffffffff5 r12: 0000000038000000
r13: ffffffffffffffff r14: fffff800057d4e00 r15: 0000000000000100
trap number = 12
panic: page fault
cpuid = 2
time = 1
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xffffffff81f085b0
vpanic() at vpanic+0x13f/frame 0xffffffff81f086e0
panic() at panic+0x43/frame 0xffffffff81f08740
trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f087a0
trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f087f0
calltrap() at calltrap+0x8/frame 0xffffffff81f087f0
--- trap 0xc, rip = 0, rsp = 0xffffffff81f088c8, rbp = 0xffffffff81f088e0 ---
??() at 0/frame 0xffffffff81f088e0
acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f08900
re_attach() at re_attach+0x100b/frame 0xffffffff81f08990
device_attach() at device_attach+0x3ac/frame 0xffffffff81f089e0
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08a10
pci_attach() at pci_attach+0xc7/frame 0xffffffff81f08a40
acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f08a80
device_attach() at device_attach+0x3ac/frame 0xffffffff81f08ad0
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08b00
acpi_pcib_pci_attach() at acpi_pcib_pci_attach+0x95/frame 0xffffffff81f08b30
device_attach() at device_attach+0x3ac/frame 0xffffffff81f08b80
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08bb0
pci_attach() at pci_attach+0xc7/frame 0xffffffff81f08be0
acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f08c20
device_attach() at device_attach+0x3ac/frame 0xffffffff81f08c70
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08ca0
acpi_pcib_acpi_attach() at acpi_pcib_acpi_attach+0x424/frame 0xffffffff81f08d00
device_attach() at device_attach+0x3ac/frame 0xffffffff81f08d50
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08d80
acpi_probe_children() at acpi_probe_children+0x6f/frame 0xffffffff81f08de0
acpi_attach() at acpi_attach+0x9dc/frame 0xffffffff81f08e70
device_attach() at device_attach+0x3ac/frame 0xffffffff81f08ec0
bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08ef0
device_attach() at device_attach+0x3ac/frame 0xffffffff81f08f40
bus_generic_new_pass() at bus_generic_new_pass+0x127/frame 0xffffffff81f08f70
root_bus_configure() at root_bus_configure+0x26/frame 0xffffffff81f08f90
configure() at configure+0x9/frame 0xffffffff81f08fa0
mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f08ff0
Uptime: 1s
Automatic reboot in 15 seconds - press a key on the console to abort
--> Press a key on the console to reboot,
--> or switch off the system now.
Rebooting...
cpu_reset: Restarting BSP
cpu_reset_proxy: Stopped CPU 2
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org
NTP: <cy@nwtime.org> Web: https://nwtime.org
e^(i*pi)+1=0
In message <ZtkKErhgQskvSrXT@kib.kiev.ua>, Konstantin Belousov writes:
> On Wed, Sep 04, 2024 at 06:06:00PM -0700, Cy Schubert wrote:
> > ??() at 0/frame 0xffffffff81f058e0
> > acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f0590
> 0
>
> One more method is needed. Updated patch is below.
>
> commit 99e3d96fc1a2b1d5cac5a635608ec3044ec4fa13
> Author: Konstantin Belousov <kib@FreeBSD.org>
> Date: Thu Sep 5 03:33:34 2024 +0300
>
> x86: always provide dummy x86_iommu virtual methods
>
> to make configurations where vendor-specific IOMMU not yet implemented
> but IOMMU is enabled in config, work when calling into MSI/IOAPIC
> interrupt remapping.
>
> Reported by: cy
> Sponsored by: Advanced Micro Devices (AMD)
> Sponsored by: The FreeBSD Foundation
> MFC after: 1 week
>
> diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
> index 2c647fd21c67..2011c632f770 100644
> --- a/sys/x86/iommu/iommu_utils.c
> +++ b/sys/x86/iommu/iommu_utils.c
> @@ -190,12 +190,60 @@ SYSCTL_INT(_hw_iommu, OID_AUTO, batch_coalesce, CTLFLAG
> _RWTUN,
> &iommu_qi_batch_coalesce, 0,
> "Number of qi batches between interrupt");
>
> -static struct x86_iommu *x86_iommu;
> +static struct iommu_unit *
> +x86_no_iommu_find(device_t dev, bool verbose)
> +{
> + return (NULL);
> +}
> +
> +static int
> +x86_no_iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
> +{
> + return (EOPNOTSUPP);
> +}
> +
> +static int
> +x86_no_iommu_map_msi_intr(device_t src, u_int cpu, u_int vector,
> + u_int cookie, uint64_t *addr, uint32_t *data)
> +{
> + return (EOPNOTSUPP);
> +}
> +
> +static int
> +x86_no_iommu_unmap_msi_intr(device_t src, u_int cookie)
> +{
> + return (0);
> +}
> +
> +static int
> +x86_no_iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector,
> + bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
> + uint32_t *lo)
> +{
> + return (EOPNOTSUPP);
> +}
> +
> +static int
> +x86_no_iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
> +{
> + return (0);
> +}
> +
> +static struct x86_iommu x86_no_iommu = {
> + .find = x86_no_iommu_find,
> + .alloc_msi_intr = x86_no_iommu_alloc_msi_intr,
> + .map_msi_intr = x86_no_iommu_map_msi_intr,
> + .unmap_msi_intr = x86_no_iommu_unmap_msi_intr,
> + .map_ioapic_intr = x86_no_iommu_map_ioapic_intr,
> + .unmap_ioapic_intr = x86_no_iommu_unmap_ioapic_intr,
> +};
> +
> +static struct x86_iommu *x86_iommu = &x86_no_iommu;
>
> void
> set_x86_iommu(struct x86_iommu *x)
> {
> - MPASS(x86_iommu == NULL);
> + MPASS(x86_iommu == &x86_no_iommu);
> x86_iommu = x;
> }
>
From nobody Thu Sep 5 02:38:16 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzk7H2TgSz5WXW7;
Thu, 05 Sep 2024 02:38:19 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzk7G6Mz5z4hg8;
Thu, 5 Sep 2024 02:38:18 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142])
by cmsmtp with ESMTPS
id lxDhsSDWZ9TOUm2O2scVtE; Thu, 05 Sep 2024 02:38:18 +0000
Received: from spqr.komquats.com ([70.66.152.170])
by cmsmtp with ESMTPSA
id m2O0sjRBOGvSVm2O1sHHEt; Thu, 05 Sep 2024 02:38:18 +0000
X-Auth-User: cschuber
X-Authority-Analysis: v=2.4 cv=FpSm/Hrq c=1 sm=1 tr=0 ts=66d9199a
a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17
a=0_lmrure0TmMD5iX:21 a=kj9zAlcOel0A:10 a=EaEq8P2WXUwA:10 a=YxBL1-UpAAAA:8
a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=VxmjJ2MpAAAA:8 a=NEAV23lmAAAA:8
a=eWv-Ina5K8jpqD3U3YMA:9 a=yqttXw7gEnsO1n-h:21 a=CjuIK1q_8ugA:10
a=RVmHIydaz68A:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22
a=7gXAzLPJhVmCkEl4_tsf:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTP id 28B55423;
Wed, 04 Sep 2024 19:38:16 -0700 (PDT)
Received: by slippy.cwsent.com (Postfix, from userid 1000)
id 22B72121; Wed, 04 Sep 2024 19:38:16 -0700 (PDT)
X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev
Reply-to: Cy Schubert <Cy.Schubert@cschubert.com>
From: Cy Schubert <Cy.Schubert@cschubert.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Cy Schubert <Cy.Schubert@cschubert.com>
cc: Konstantin Belousov <kostikbel@gmail.com>,
src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Subject: Re: git: 65b133e5d292 - main - x86: allow to have more than one
kind of IOMMU
In-reply-to: <20240905020602.4AF2711D@slippy.cwsent.com>
References: <202409042150.484LoeAq031493@gitrepo.freebsd.org>
<20240904235204.1FCD9C5@slippy.cwsent.com> <Ztj9XU2ETM9gKP7r@kib.kiev.ua>
<20240905010600.B9D292A@slippy.cwsent.com> <ZtkKErhgQskvSrXT@kib.kiev.ua>
<20240905020602.4AF2711D@slippy.cwsent.com>
Comments: In-reply-to Cy Schubert <Cy.Schubert@cschubert.com>
message dated "Wed, 04 Sep 2024 19:06:02 -0700."
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 04 Sep 2024 19:38:16 -0700
Message-Id: <20240905023816.22B72121@slippy.cwsent.com>
X-CMAE-Envelope: MS4xfNYoC/XrClBEpq2EX4wvr/Y7n0RMHBi+Gd1c0U8p+5XCCq9Q6H9Eq50VUM0+Zb15d0ScNhcwv931PBl6zPkP7s41QRWibgxzpPfxsTqWltrx+QYkzpoa
vAWFcp+BA9I/IaWkijAO3sjfeeCu1ixtmkaTouYGpBtKppZOV+IEgBtl4qzCnyNLGJcwcKDdLUtIBn15ovFUEvXPzK4zzCkhD1pWiTaamyY5Vc8J7yhOlMLs
ZDahLmiHZ119QEKZKxtnXizbM6ATwRCKEkDAz/nq+uA2qyJ3qNgd8G86FQD5IgKz39H41x/lbbtXLzq4XrDOHTOhYYMTIO12q8OA07JPVFY=
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]
X-Rspamd-Queue-Id: 4Wzk7G6Mz5z4hg8
Looks like we have success.
I removed /usr/obj/sys and rebuilt the kernel from scratch.
How did I arrive at this?
Both backtraces included:
??() at 0/frame 0xffffffff81f088e0
acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f08900
"??()" had to be line 447 in acpi_pci.c:
tag = iommu_get_dma_tag(bus, child);
Some more background: Originally the buildworld/buildkernel was performed
on my main build server (cwsys). The initial build and subsequent builds
were performed on that machine. During my latter tests I was building the
kernel on my laptop (slippy). Both builds exhibited the same problem,
ruling out some local-only "thing" on that machine only.
The problem affected my AMD machines however my laptop, Intel i7, had no
such problems.
I will deploy this on all my machines downstairs. The risk being that I may
send out an email retracting all this if it fails to boot a second time.
But I'm willing to take that risk (looking stupid) to avoid you spending
more time at this.
I will test this on my i5 laptop tomorrow morning.
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org
NTP: <cy@nwtime.org> Web: https://nwtime.org
e^(i*pi)+1=0
In message <20240905020602.4AF2711D@slippy.cwsent.com>, Cy Schubert writes:
> Both machines still panic.
>
> First machine panics on ohci(4) attach while the second at re(4) attach in
> acpi_pci_get_dma_tag().
>
> First machine:
>
> Copyright (c) 1992-2024 The FreeBSD Project.
> Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
> The Regents of the University of California. All rights reserved.
> FreeBSD is a registered trademark of The FreeBSD Foundation.
> FreeBSD 15.0-CURRENT #61 komquats-n272062-79eba754bec3: Wed Sep 4 17:46:55 P
> DT 2024
> root@slippy:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
> FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git llvmor
> g-18.1.6-0-g1118c2e05e67)
> VT(vga): text 80x25
> CPU: AMD Phenom(tm) II X4 945 Processor (3013.95-MHz K8-class CPU)
> Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
> Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MC
> A,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
> Features2=0x802009<SSE3,MON,CX16,POPCNT>
> AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3DN
> ow!>
> AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,I
> BS,SKINIT,WDT>
> SVM: NP,NRIP,NAsids=64
> TSC: P-state invariant
> real memory = 8589934592 (8192 MB)
> avail memory = 8264794112 (7881 MB)
> Event timer "LAPIC" quality 100
> ACPI APIC Table: <Nvidia ASUSACPI>
> FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
> FreeBSD/SMP: 1 package(s) x 4 core(s)
> random: unblocking device.
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock: 32/8
> (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock: 16/
> 8 (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8 (2
> 0230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8 (2023
> 0628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe1Block: 128/8 (202
> 30628/tbfadt-748)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using def
> ault 32 (20230628/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using d
> efault 16 (20230628/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using defau
> lt 32 (20230628/tbfadt-850)
> ioapic0: MADT APIC ID 4 != hw id 0
> ioapic0 <Version 1.1> irqs 0-23
> Launching APs: 1 2 3
> random: entropy device external interface
> kbd1 at kbdmux0
> vtvga0: <VT VGA driver>
> aesni0: No AES or SHA support.
> acpi0: <Nvidia ASUSACPI>
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> \_PR_.CPU0 (20230628/dspkginit-605)
> acpi0: Power Button (fixed)
> cpu0: <ACPI CPU> on acpi0
> attimer0: <AT timer> port 0x40-0x43 on acpi0
> Timecounter "i8254" frequency 1193182 Hz quality 0
> Event timer "i8254" frequency 1193182 Hz quality 100
> hpet0: <High Precision Event Timer> iomem 0xfefff000-0xfefff3ff irq 0,8 on ac
> pi0
> Timecounter "HPET" frequency 25000000 Hz quality 950
> atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
> atrtc0: registered as a time-of-day clock, resolution 1.000000s
> Event timer "RTC" frequency 32768 Hz quality 0
> Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
> acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1008-0x100b on acpi0
> acpi_button0: <Power Button> on acpi0
> pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
> pci0: <ACPI PCI bus> on pcib0
> pci0: <memory, RAM> at device 0.0 (no driver attached)
> isab0: <PCI-ISA bridge> at device 1.0 on pci0
> isa0: <ISA bus> on isab0
> ohci0: <nVidia nForce MCP55 USB Controller> mem 0xfe02f000-0xfe02ffff irq 21
> at device 2.0 on pci0
>
>
> Fatal trap 12: page fault while in kernel mode
> cpuid = 2; apic id = 02
> fault virtual address = 0x0
> fault code = supervisor read instruction, page not present
> instruction pointer = 0x20:0x0
> stack pointer = 0x28:0xffffffff81f2caa8
> frame pointer = 0x28:0xffffffff81f2cac0
> code segment = base 0x0, limit 0xfffff, type 0x1b
> = DPL 0, pres 1, long 1, def32 0, gran 1
> processor eflags = interrupt enabled, resume, IOPL = 0
> current process = 0 (swapper)
> rdi: fffff80005808500 rsi: 0000000000000000 rdx: ffffffff80e54eb8
> rcx: ffffffff80e54eb8 r8: 0000001473a90040 r9: ffffffff810f5ce0
> rax: 0000000000000000 rbx: fffff80005808500 rbp: ffffffff81f2cac0
> r10: ffffffff81f2c9f0 r11: fffffffffffffff5 r12: fffffe00113fc320
> r13: fffff800057ec0a0 r14: fffff80005808800 r15: fffff80005808800
> trap number = 12
> panic: page fault
> cpuid = 2
> time = 1
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xffffffff81f2c79
> 0
> vpanic() at vpanic+0x13f/frame 0xffffffff81f2c8c0
> panic() at panic+0x43/frame 0xffffffff81f2c920
> trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f2c980
> trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f2c9d0
> calltrap() at calltrap+0x8/frame 0xffffffff81f2c9d0
> --- trap 0xc, rip = 0, rsp = 0xffffffff81f2caa8, rbp = 0xffffffff81f2cac0 ---
> ??() at 0/frame 0xffffffff81f2cac0
> acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f2cae0
> ohci_pci_attach() at ohci_pci_attach+0x4f/frame 0xffffffff81f2cb30
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cb80
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cbb0
> pci_attach() at pci_attach+0xc7/frame 0xffffffff81f2cbe0
> acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f2cc20
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cc70
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cca0
> acpi_pcib_acpi_attach() at acpi_pcib_acpi_attach+0x424/frame 0xffffffff81f2cd
> 00
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cd50
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cd80
> acpi_probe_children() at acpi_probe_children+0x6f/frame 0xffffffff81f2cde0
> acpi_attach() at acpi_attach+0x9dc/frame 0xffffffff81f2ce70
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cec0
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f2cef0
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f2cf40
> bus_generic_new_pass() at bus_generic_new_pass+0x127/frame 0xffffffff81f2cf70
> root_bus_configure() at root_bus_configure+0x26/frame 0xffffffff81f2cf90
> configure() at configure+0x9/frame 0xffffffff81f2cfa0
> mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f2cff0
> Uptime: 1s
> Automatic reboot in 15 seconds - press a key on the console to abort
> --> Press a key on the console to reboot,
> --> or switch off the system now.
> acpi0: reset failed - timeout
> Rebooting...
> cpu_reset: Restarting BSP
> cpu_reset_proxy: Stopped CPU 2
>
>
> Second machine:
>
> Copyright (c) 1992-2024 The FreeBSD Project.
> Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
> The Regents of the University of California. All rights reserved.
> FreeBSD is a registered trademark of The FreeBSD Foundation.
> FreeBSD 15.0-CURRENT #61 komquats-n272062-79eba754bec3: Wed Sep 4 17:46:55 P
> DT 2024
> root@slippy:/export/obj/opt/src/git-src/amd64.amd64/sys/BREAK amd64
> FreeBSD clang version 18.1.6 (https://github.com/llvm/llvm-project.git llvmor
> g-18.1.6-0-g1118c2e05e67)
> VT(vga): text 80x25
> CPU: AMD Processor model unknown (3000.02-MHz K8-class CPU)
> Origin="AuthenticAMD" Id=0x100f43 Family=0x10 Model=0x4 Stepping=3
> Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MC
> A,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
> Features2=0x802009<SSE3,MON,CX16,POPCNT>
> AMD Features=0xee500800<SYSCALL,NX,MMX+,FFXSR,Page1GB,RDTSCP,LM,3DNow!+,3DN
> ow!>
> AMD Features2=0x37ff<LAHF,CMP,SVM,ExtAPIC,CR8,ABM,SSE4A,MAS,Prefetch,OSVW,I
> BS,SKINIT,WDT>
> SVM: NP,NRIP,NAsids=64
> TSC: P-state invariant
> real memory = 8589934592 (8192 MB)
> avail memory = 8145883136 (7768 MB)
> Event timer "LAPIC" quality 100
> ACPI APIC Table: <ATI ASUSACPI>
> FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
> FreeBSD/SMP: 1 package(s) x 4 core(s)
> random: unblocking device.
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock: 32/8
> (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock: 16/
> 8 (20230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8 (2
> 0230628/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8 (2023
> 0628/tbfadt-748)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using def
> ault 32 (20230628/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using d
> efault 16 (20230628/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using defau
> lt 32 (20230628/tbfadt-850)
> ioapic0: MADT APIC ID 4 != hw id 0
> ioapic0 <Version 2.1> irqs 0-23
> Launching APs: 1 3 2
> random: entropy device external interface
> vtvga0: <VT VGA driver>
> aesni0: No AES or SHA support.
> acpi0: <ATI ASUSACPI>
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKA (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKB (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKC (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> LNKD (20230628/dspkginit-605)
> ACPI Error: AE_NOT_FOUND, While resolving a named reference package element -
> \_PR_.CPU0 (20230628/dspkginit-605)
> acpi0: Power Button (fixed)
> cpu0: <ACPI CPU> on acpi0
> attimer0: <AT timer> port 0x40-0x43 on acpi0
> Timecounter "i8254" frequency 1193182 Hz quality 0
> Event timer "i8254" frequency 1193182 Hz quality 100
> hpet0: <High Precision Event Timer> iomem 0xfed00000-0xfed003ff irq 0,8 on ac
> pi0
> device_attach: hpet0 attach returned 12
> atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
> atrtc0: registered as a time-of-day clock, resolution 1.000000s
> Event timer "RTC" frequency 32768 Hz quality 0
> Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
> acpi_timer0: <32-bit timer at 3.579545MHz> port 0x4008-0x400b on acpi0
> acpi_button0: <Power Button> on acpi0
> pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
> pci0: <ACPI PCI bus> on pcib0
> pcib1: <ACPI PCI-PCI bridge> at device 1.0 on pci0
> pci1: <ACPI PCI bus> on pcib1
> vgapci0: <VGA-compatible display> port 0xcc00-0xccff mem 0xf0000000-0xf7fffff
> f,0xfdbf0000-0xfdbfffff,0xfda00000-0xfdafffff irq 18 at device 5.0 on pci1
> vgapci0: Boot video device
> pcib2: <ACPI PCI-PCI bridge> at device 7.0 on pci0
> pci2: <ACPI PCI bus> on pcib2
> re0: <RealTek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet> port 0xdc00-
> 0xdcff mem 0xfdfff000-0xfdffffff irq 19 at device 0.0 on pci2
> re0: Using 1 MSI message
> re0: Chip rev. 0x38000000
> re0: MAC rev. 0x00000000
>
>
> Fatal trap 12: page fault while in kernel mode
> cpuid = 2; apic id = 02
> fault virtual address = 0x0
> fault code = supervisor read instruction, page not present
> instruction pointer = 0x20:0x0
> stack pointer = 0x28:0xffffffff81f088c8
> frame pointer = 0x28:0xffffffff81f088e0
> code segment = base 0x0, limit 0xfffff, type 0x1b
> = DPL 0, pres 1, long 1, def32 0, gran 1
> processor eflags = interrupt enabled, resume, IOPL = 0
> current process = 0 (swapper)
> rdi: fffff800057d4d00 rsi: 0000000000000000 rdx: 000000000000004a
> rcx: fffff80005704000 r8: 0000001670cdcfc6 r9: ffffffff810f5ce0
> rax: 0000000000000000 rbx: fffff800057d4d00 rbp: ffffffff81f088e0
> r10: ffffffff81f08860 r11: fffffffffffffff5 r12: 0000000038000000
> r13: ffffffffffffffff r14: fffff800057d4e00 r15: 0000000000000100
> trap number = 12
> panic: page fault
> cpuid = 2
> time = 1
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xffffffff81f085b
> 0
> vpanic() at vpanic+0x13f/frame 0xffffffff81f086e0
> panic() at panic+0x43/frame 0xffffffff81f08740
> trap_fatal() at trap_fatal+0x40b/frame 0xffffffff81f087a0
> trap_pfault() at trap_pfault+0x46/frame 0xffffffff81f087f0
> calltrap() at calltrap+0x8/frame 0xffffffff81f087f0
> --- trap 0xc, rip = 0, rsp = 0xffffffff81f088c8, rbp = 0xffffffff81f088e0 ---
> ??() at 0/frame 0xffffffff81f088e0
> acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f08900
> re_attach() at re_attach+0x100b/frame 0xffffffff81f08990
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f089e0
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08a10
> pci_attach() at pci_attach+0xc7/frame 0xffffffff81f08a40
> acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f08a80
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f08ad0
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08b00
> acpi_pcib_pci_attach() at acpi_pcib_pci_attach+0x95/frame 0xffffffff81f08b30
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f08b80
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08bb0
> pci_attach() at pci_attach+0xc7/frame 0xffffffff81f08be0
> acpi_pci_attach() at acpi_pci_attach+0x15/frame 0xffffffff81f08c20
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f08c70
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08ca0
> acpi_pcib_acpi_attach() at acpi_pcib_acpi_attach+0x424/frame 0xffffffff81f08d
> 00
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f08d50
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08d80
> acpi_probe_children() at acpi_probe_children+0x6f/frame 0xffffffff81f08de0
> acpi_attach() at acpi_attach+0x9dc/frame 0xffffffff81f08e70
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f08ec0
> bus_generic_attach() at bus_generic_attach+0x4b/frame 0xffffffff81f08ef0
> device_attach() at device_attach+0x3ac/frame 0xffffffff81f08f40
> bus_generic_new_pass() at bus_generic_new_pass+0x127/frame 0xffffffff81f08f70
> root_bus_configure() at root_bus_configure+0x26/frame 0xffffffff81f08f90
> configure() at configure+0x9/frame 0xffffffff81f08fa0
> mi_startup() at mi_startup+0x1c8/frame 0xffffffff81f08ff0
> Uptime: 1s
> Automatic reboot in 15 seconds - press a key on the console to abort
> --> Press a key on the console to reboot,
> --> or switch off the system now.
> Rebooting...
> cpu_reset: Restarting BSP
> cpu_reset_proxy: Stopped CPU 2
>
>
> --
> Cheers,
> Cy Schubert <Cy.Schubert@cschubert.com>
> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org
> NTP: <cy@nwtime.org> Web: https://nwtime.org
>
> e^(i*pi)+1=0
>
>
> In message <ZtkKErhgQskvSrXT@kib.kiev.ua>, Konstantin Belousov writes:
> > On Wed, Sep 04, 2024 at 06:06:00PM -0700, Cy Schubert wrote:
> > > ??() at 0/frame 0xffffffff81f058e0
> > > acpi_pci_get_dma_tag() at acpi_pci_get_dma_tag+0x34/frame 0xffffffff81f05
> 90
> > 0
> >
> > One more method is needed. Updated patch is below.
> >
> > commit 99e3d96fc1a2b1d5cac5a635608ec3044ec4fa13
> > Author: Konstantin Belousov <kib@FreeBSD.org>
> > Date: Thu Sep 5 03:33:34 2024 +0300
> >
> > x86: always provide dummy x86_iommu virtual methods
> >
> > to make configurations where vendor-specific IOMMU not yet implemented
> > but IOMMU is enabled in config, work when calling into MSI/IOAPIC
> > interrupt remapping.
> >
> > Reported by: cy
> > Sponsored by: Advanced Micro Devices (AMD)
> > Sponsored by: The FreeBSD Foundation
> > MFC after: 1 week
> >
> > diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
> > index 2c647fd21c67..2011c632f770 100644
> > --- a/sys/x86/iommu/iommu_utils.c
> > +++ b/sys/x86/iommu/iommu_utils.c
> > @@ -190,12 +190,60 @@ SYSCTL_INT(_hw_iommu, OID_AUTO, batch_coalesce, CTLFL
> AG
> > _RWTUN,
> > &iommu_qi_batch_coalesce, 0,
> > "Number of qi batches between interrupt");
> >
> > -static struct x86_iommu *x86_iommu;
> > +static struct iommu_unit *
> > +x86_no_iommu_find(device_t dev, bool verbose)
> > +{
> > + return (NULL);
> > +}
> > +
> > +static int
> > +x86_no_iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
> > +{
> > + return (EOPNOTSUPP);
> > +}
> > +
> > +static int
> > +x86_no_iommu_map_msi_intr(device_t src, u_int cpu, u_int vector,
> > + u_int cookie, uint64_t *addr, uint32_t *data)
> > +{
> > + return (EOPNOTSUPP);
> > +}
> > +
> > +static int
> > +x86_no_iommu_unmap_msi_intr(device_t src, u_int cookie)
> > +{
> > + return (0);
> > +}
> > +
> > +static int
> > +x86_no_iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector,
> > + bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
> > + uint32_t *lo)
> > +{
> > + return (EOPNOTSUPP);
> > +}
> > +
> > +static int
> > +x86_no_iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
> > +{
> > + return (0);
> > +}
> > +
> > +static struct x86_iommu x86_no_iommu = {
> > + .find = x86_no_iommu_find,
> > + .alloc_msi_intr = x86_no_iommu_alloc_msi_intr,
> > + .map_msi_intr = x86_no_iommu_map_msi_intr,
> > + .unmap_msi_intr = x86_no_iommu_unmap_msi_intr,
> > + .map_ioapic_intr = x86_no_iommu_map_ioapic_intr,
> > + .unmap_ioapic_intr = x86_no_iommu_unmap_ioapic_intr,
> > +};
> > +
> > +static struct x86_iommu *x86_iommu = &x86_no_iommu;
> >
> > void
> > set_x86_iommu(struct x86_iommu *x)
> > {
> > - MPASS(x86_iommu == NULL);
> > + MPASS(x86_iommu == &x86_no_iommu);
> > x86_iommu = x;
> > }
> >
From nobody Thu Sep 5 02:43:33 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzkFL0xr0z5WYLx;
Thu, 05 Sep 2024 02:43:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WzkFL0QxNz4jsw;
Thu, 5 Sep 2024 02:43:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725504214;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=dX7CkyZIvy25bHCuhEoi1Qswjyng+AYMWEQHhzkgiGg=;
b=pvtsvaZjRp640A/Kmkvjrv2ys0wvfwZuEtXpSNGboD05U0Asw4iO/HeMZJzq6caqvm3Y3N
awt+c+DnJMAap2ZcBxlltSnkv+hWicuBZmxcpoM/ZHCHlkDJR447+A5D7yOzt7x8Id/S9Z
aqg4J4gBwyY4rj3WMMpFrUf1YYoWqH1c7fVODjUGN6W1Dx/p114LNbVMs7pe/ZQIRNnlhh
JpP9L1IocrGEIGIwI8bpBKi9s1KWq7pl1P7KpIeWMOFs9uSmM9LFFIhSdIclz8eXMhKL3j
UPtuj4E1B1bj/Ccx/RLEDw0o2CSun59Etv966d2j5fM54OLlzDP7uK3RdmyD7g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725504214; a=rsa-sha256; cv=none;
b=qD6AaarwKpTTkPMVa8hgR18OwXbtoBGoReV0jB0iTuhL0so9/NyzbRJv3R0q1Yxi4VgmQt
iC9TWog/7EGGd/mhIWcrGXDbTDHO6eb0VGExmsAzN9+AKFBgK7AdNifYXbxStMB3x/5bQd
LwGP/riiRSfaGAjjFVG1kU3+bcqH/Q1DdnAcIBw5QT0WfzXB63MlkCtWrMwQAEuqSIHkRx
DyGeUWXn8KL0xP0F8Uqv9ezPasEglLltgfZmBa5mO6T9oLHJ/WzyAk6ZRUdICKVkFbLOAI
ts7R2vVBBWMy9zK7JRf2X7QtQvS3ygIKDwQkHVEraaEAp0HB+HqcIUQagXywSQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725504214;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=dX7CkyZIvy25bHCuhEoi1Qswjyng+AYMWEQHhzkgiGg=;
b=SkkO9ZA/JCLa/dBGWURkTdq2Nv9KtGUW49bpGG8vwqIza45KMwF9e0Ni7X72ZJzl3yoCzC
oS/6qraG2fdldx5NOjWDo+2UYSAkDvYBGOrR2prlgGIVsTXqKfK3PT8BrDWACROKsX7w48
ludcXV6RR3ZcqeS95WmjI6FfBFiCiE9PI8xv9/b3kET5KEatVTo7SEC9vugFeDFZaUynaA
8NnrlzUb5m6P6UMYEJA0e0Q3e1tagRZIhw+Ghm/aBMBwqInifFjlkUzZJ4OBWv/nN9Xshm
BrhHn5inej4MPgrIE1VKlC+jvD0aLfatFq65QXg11rvhVYF2AtsL5TpdZmsf0Q==
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 4WzkFL02LWzqyR;
Thu, 5 Sep 2024 02:43: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 4852hXiA029242;
Thu, 5 Sep 2024 02:43:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4852hXOP029239;
Thu, 5 Sep 2024 02:43:33 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 02:43:33 GMT
Message-Id: <202409050243.4852hXOP029239@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 99e3d96fc1a2 - main - x86: always provide dummy
x86_iommu virtual methods
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 99e3d96fc1a2b1d5cac5a635608ec3044ec4fa13
Auto-Submitted: auto-generated
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=99e3d96fc1a2b1d5cac5a635608ec3044ec4fa13
commit 99e3d96fc1a2b1d5cac5a635608ec3044ec4fa13
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-09-05 00:33:34 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-09-05 01:30:29 +0000
x86: always provide dummy x86_iommu virtual methods
to make configurations where vendor-specific IOMMU not yet implemented
but IOMMU is enabled in config, work when calling into MSI/IOAPIC
interrupt remapping.
Reported by: cy
Sponsored by: Advanced Micro Devices (AMD)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/x86/iommu/iommu_utils.c | 52 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 50 insertions(+), 2 deletions(-)
diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c
index 2c647fd21c67..2011c632f770 100644
--- a/sys/x86/iommu/iommu_utils.c
+++ b/sys/x86/iommu/iommu_utils.c
@@ -190,12 +190,60 @@ SYSCTL_INT(_hw_iommu, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN,
&iommu_qi_batch_coalesce, 0,
"Number of qi batches between interrupt");
-static struct x86_iommu *x86_iommu;
+static struct iommu_unit *
+x86_no_iommu_find(device_t dev, bool verbose)
+{
+ return (NULL);
+}
+
+static int
+x86_no_iommu_alloc_msi_intr(device_t src, u_int *cookies, u_int count)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_map_msi_intr(device_t src, u_int cpu, u_int vector,
+ u_int cookie, uint64_t *addr, uint32_t *data)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_unmap_msi_intr(device_t src, u_int cookie)
+{
+ return (0);
+}
+
+static int
+x86_no_iommu_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector,
+ bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi,
+ uint32_t *lo)
+{
+ return (EOPNOTSUPP);
+}
+
+static int
+x86_no_iommu_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie)
+{
+ return (0);
+}
+
+static struct x86_iommu x86_no_iommu = {
+ .find = x86_no_iommu_find,
+ .alloc_msi_intr = x86_no_iommu_alloc_msi_intr,
+ .map_msi_intr = x86_no_iommu_map_msi_intr,
+ .unmap_msi_intr = x86_no_iommu_unmap_msi_intr,
+ .map_ioapic_intr = x86_no_iommu_map_ioapic_intr,
+ .unmap_ioapic_intr = x86_no_iommu_unmap_ioapic_intr,
+};
+
+static struct x86_iommu *x86_iommu = &x86_no_iommu;
void
set_x86_iommu(struct x86_iommu *x)
{
- MPASS(x86_iommu == NULL);
+ MPASS(x86_iommu == &x86_no_iommu);
x86_iommu = x;
}
From nobody Thu Sep 5 05:16:43 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wznf4295Cz5V5gc;
Thu, 05 Sep 2024 05:16: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 4Wznf418hhz55cm;
Thu, 5 Sep 2024 05:16:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725513404;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ffcKx3Dhzc0EHBPDd2GV8rGjVz3Ob+mt5NoUBNoGDRY=;
b=m4/2glEvCT9DliI5zx86lapBLvxkQNptWQyFqqnvpIxHS3ahPClEtf8DVgEIwbqsXw0d9S
S7g+cqtOexQqKJXa2xYxmFIifwIPc8eoXR1FQtLxXhJxITuKQMrS9LfBWUG5sbNQ31HmKK
fyhXBsqeH4xSufKRWEm5E2+3D1UAUx3hFatTuyI6U9Zmy9H/HgE0nuhcvtT/he39Xc5k9R
jeGyDDbiZ9NxlexXJevH5ECiuwg+qyOjmtm3FQMkavd5K6aegDS/EItaS+R+ZUpWoGrLV+
oIReU8au1TI+ftbuXC+usz5zr6EKnBY1fj4/HSFIf+muFEmqOEcfP76VLAOIdg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725513404; a=rsa-sha256; cv=none;
b=dBPgp4UtUZPQwKWsuU5xDOuh9OTNgBQ5WRVkiBfxBz5/cMoZBuxcyBDOAGaSfcmkB6gRar
KrQHuKP0SwVNdXt/IJ4mag4zIjj2BFcyuOi7YeA6xghixA+Qoc/2Ws/E4RIDEyVkvSgWsg
oMdnnfU2gvwdl5pE9mJto/F7I1bxAVa5JEYuaWKdsqZ6/C61Tv8RgLBdEMEowXKq1JOvEO
r43n+lRFrsHQii+gtBHfVmd/OAsgPufY11T01y1PUeIjuN/e3gTJGJPrIvdP7N6vaTUomc
RpWMsC/BUEOe4LdPm4aK0jTbKXZjskaCBqSNLXVm8x3MhoQwsKgimDWEwJ1waQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725513404;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ffcKx3Dhzc0EHBPDd2GV8rGjVz3Ob+mt5NoUBNoGDRY=;
b=OtFphtbR83S636DaS2sBlrrwa6MfxtEDLuxgNZ/nCG7glmDoUDEGYHQi6I6DS7uD+uRxu8
IQYxXPaIbo9qvMFbKphsFWT8YK3XLhmM/FeQrxB1ski2k7ioFmL8ZfiJiXDDzjx/CJd849
FZMX4O50UTgKt9EZAlPxaHxNITLfsNQmMkDOM2uvKLOBnayHUs5UsLEXalXKqlcErxxvLN
82+28HiRijpAHB+wOE2/SckI5EwWsiEhrQDKt9ACbin9Z6+4xZ8qv96O1VJKvxuB4dCOcv
7+l3J3QVbKLzSnM0cPTFgrHu8QCKzfPSFdBPoV54gybAzQnYhwMOcWQZc98+qg==
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 4Wznf40W3tzvW3;
Thu, 5 Sep 2024 05:16:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4855Ghkj085176;
Thu, 5 Sep 2024 05:16:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4855GhXb085173;
Thu, 5 Sep 2024 05:16:43 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 05:16:43 GMT
Message-Id: <202409050516.4855GhXb085173@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 7aeec281b8b2 - main - cxgbe(4): Always report link-down
on an abrupt stop.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 7aeec281b8b2620d7d88c9abdfadd7e20a485b9c
Auto-Submitted: auto-generated
The branch main has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=7aeec281b8b2620d7d88c9abdfadd7e20a485b9c
commit 7aeec281b8b2620d7d88c9abdfadd7e20a485b9c
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2024-09-05 02:28:09 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2024-09-05 04:54:30 +0000
cxgbe(4): Always report link-down on an abrupt stop.
This fixes a regression in 5241b210a4e1 where the driver stopped
reporting link down after a fatal error unless t4_reset_on_fatal_err was
also set.
Fixes: 5241b210a4e1 cxgbe(4): Basic infrastructure for ULDs to participate in adapter reset.
MFC after: 1 week
Sponsored by: Chelsio Communications
---
sys/dev/cxgbe/t4_main.c | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 0606f383b879..540edbb568c0 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -1920,6 +1920,9 @@ t4_detach_common(device_t dev)
static inline int
stop_adapter(struct adapter *sc)
{
+ struct port_info *pi;
+ int i;
+
if (atomic_testandset_int(&sc->error_flags, ilog2(ADAP_STOPPED))) {
CH_ALERT(sc, "%s from %p, flags 0x%08x,0x%08x, EALREADY\n",
__func__, curthread, sc->flags, sc->error_flags);
@@ -1927,7 +1930,24 @@ stop_adapter(struct adapter *sc)
}
CH_ALERT(sc, "%s from %p, flags 0x%08x,0x%08x\n", __func__, curthread,
sc->flags, sc->error_flags);
- return (t4_shutdown_adapter(sc));
+ t4_shutdown_adapter(sc);
+ for_each_port(sc, i) {
+ pi = sc->port[i];
+ PORT_LOCK(pi);
+ if (pi->up_vis > 0 && pi->link_cfg.link_ok) {
+ /*
+ * t4_shutdown_adapter has already shut down all the
+ * PHYs but it also disables interrupts and DMA so there
+ * won't be a link interrupt. Update the state manually
+ * if the link was up previously and inform the kernel.
+ */
+ pi->link_cfg.link_ok = false;
+ t4_os_link_changed(pi);
+ }
+ PORT_UNLOCK(pi);
+ }
+
+ return (0);
}
static inline int
@@ -2020,20 +2040,6 @@ stop_lld(struct adapter *sc)
for_each_port(sc, i) {
pi = sc->port[i];
pi->vxlan_tcam_entry = false;
-
- PORT_LOCK(pi);
- if (pi->up_vis > 0) {
- /*
- * t4_shutdown_adapter has already shut down all the
- * PHYs but it also disables interrupts and DMA so there
- * won't be a link interrupt. So we update the state
- * manually and inform the kernel.
- */
- pi->link_cfg.link_ok = false;
- t4_os_link_changed(pi);
- }
- PORT_UNLOCK(pi);
-
for_each_vi(pi, j, vi) {
vi->xact_addr_filt = -1;
mtx_lock(&vi->tick_mtx);
From nobody Thu Sep 5 07:20:13 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzrNZ0dWlz5VTfZ;
Thu, 05 Sep 2024 07:20: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 4WzrNZ06cWz4T6F;
Thu, 5 Sep 2024 07:20:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725520814;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=EsrOXW1018mGniqb/b+6T6oDxgklDPPbm5StCFwClRg=;
b=wnzSV4eYZWfgwubXcxvugwrOnTYZtPK/Wor2V3NNJgZrlwBM7pXcVlAyZ/oZv9Vzxn4dWc
Z43muTdGrjJe/T1NBz9B1hb0pEg4IXk6KsobKBgz92i2UfoSGn8U5Dw03fzIG5OvoG93Ri
Rg93kTMXY2X4bSAMJ50a/ozwu5PMiJwXdnsoDYU1BmH7tE4oPgzyJhIAku0HerJTS95VOA
pCdjn2tofGvhCHANdZVm9Yya3yQJmWGLeceD4W372sICmcgzcwSRYsED52ZCcArlr5ko7f
knnQ/kUUhJeCrV1qwaCNDWOxmj1uXs0XfGnysuAQdiT5xU7xCj+G22HSSGeAQQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725520814; a=rsa-sha256; cv=none;
b=lr33buMPxf2Gqah53iLxbEqxm1M5zq6X0L9yOHP1JeQ14gbzVoYnPEl5g0AmgimzbORHMk
w/nmjFZk34mvWFwc32b1LbD85yT8hLoKEVJOYRO3KBzWhNgHWovlt4V1nuIA3ymIiiWQqU
VaXlkfpsNQWm7VenLAp1LK8/p4qYWD2FEKeSc3yJdTaBYxPgAMW1+yMdg85s1Cokcf8/zl
ZsJae79UJ0bZSEzceZaEHW0dVynTiWdwI2E0aq+yHA3PGLyifx2lweCRCz09Wy7a9kAanw
QuGNaRkvDl+9rXurTobmY0OXzeqfKXRTHYJVOx1Adb9xNP9I6ZmJSow16QO2lA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725520814;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=EsrOXW1018mGniqb/b+6T6oDxgklDPPbm5StCFwClRg=;
b=yhIAaL6c91e/eMjVZPc3JQ6JFin1Wg4GCLSfnot5SOLLwduXBrQEk+fgunShwQxGnOVvn8
IAHDrIN1DIZjpfPqdrFZN4vm9VYpeR2K1itreslAyQQzdpG357U3Hr50Kdxwy5e6am75Xv
7dBh4E4F3ctMRoLkL71jsHm/foC0LmBpjOzWQqMpA1O7hqPAOZXJRXEUUs1UGrTjR8Jav7
hOQzqio7+Jw1k6y+65kbwyLfWRJNZxaRAadlCB7/VuXQkoDh/rIGBYfYCDhhaZVQYUT8Cd
XhGJyqjg0nXE/aEWEcAtBJuR4k8eNJEeSOCmEvzITzktrQ1TqZCNle+u0/xGiw==
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 4WzrNY6X3BzyY7;
Thu, 5 Sep 2024 07:20: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 4857KD7j010487;
Thu, 5 Sep 2024 07:20:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4857KDFU010483;
Thu, 5 Sep 2024 07:20:13 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 07:20:13 GMT
Message-Id: <202409050720.4857KDFU010483@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: ef438f7706be - main - tcp: improve consistency of
syncache_respond() failure handling
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: ef438f7706be48f1cf7fd4c8a60329e1619cfe30
Auto-Submitted: auto-generated
The branch main has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=ef438f7706be48f1cf7fd4c8a60329e1619cfe30
commit ef438f7706be48f1cf7fd4c8a60329e1619cfe30
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-09-05 01:33:13 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-09-05 01:33:13 +0000
tcp: improve consistency of syncache_respond() failure handling
When the initial sending of the SYN ACK segment using
syncache_respond() fails, it is handled as a permanent error.
To improve consistency, apply this policy in all cases, where
syncache_respond() is called. These include
* timer based retransmissions of the SYN ACK
* retransmitting a SYN ACK in response to a SYN retransmission
* sending of challenge ACKs in response to received RST segments
In these cases, fall back to SYN cookies, if enabled.
While there, also improve consistency of the TCP stats counters.
Reviewed by: cc, glebius (earlier version)
MFC after: 1 week
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D46428
---
sys/netinet/tcp_syncache.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 33a6a66b7138..d0a7690256f4 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -527,10 +527,16 @@ syncache_timer(void *xsch)
}
NET_EPOCH_ENTER(et);
- syncache_respond(sc, NULL, TH_SYN|TH_ACK);
+ if (syncache_respond(sc, NULL, TH_SYN|TH_ACK) == 0) {
+ syncache_timeout(sc, sch, 0);
+ TCPSTAT_INC(tcps_sndacks);
+ TCPSTAT_INC(tcps_sndtotal);
+ TCPSTAT_INC(tcps_sc_retransmitted);
+ } else {
+ syncache_drop(sc, sch);
+ TCPSTAT_INC(tcps_sc_dropped);
+ }
NET_EPOCH_EXIT(et);
- TCPSTAT_INC(tcps_sc_retransmitted);
- syncache_timeout(sc, sch, 0);
}
if (!TAILQ_EMPTY(&(sch)->sch_bucket))
callout_reset(&(sch)->sch_timer, (sch)->sch_nextc - tick,
@@ -688,7 +694,13 @@ syncache_chkrst(struct in_conninfo *inc, struct tcphdr *th, struct mbuf *m,
"sending challenge ACK\n",
s, __func__,
th->th_seq, sc->sc_irs + 1, sc->sc_wnd);
- syncache_respond(sc, m, TH_ACK);
+ if (syncache_respond(sc, m, TH_ACK) == 0) {
+ TCPSTAT_INC(tcps_sndacks);
+ TCPSTAT_INC(tcps_sndtotal);
+ } else {
+ syncache_drop(sc, sch);
+ TCPSTAT_INC(tcps_sc_dropped);
+ }
}
} else {
if ((s = tcp_log_addrs(inc, th, NULL, NULL)))
@@ -1549,6 +1561,9 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
syncache_timeout(sc, sch, 1);
TCPSTAT_INC(tcps_sndacks);
TCPSTAT_INC(tcps_sndtotal);
+ } else {
+ syncache_drop(sc, sch);
+ TCPSTAT_INC(tcps_sc_dropped);
}
SCH_UNLOCK(sch);
goto donenoprobe;
From nobody Thu Sep 5 09:00:26 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WztcC00pnz5W14f;
Thu, 05 Sep 2024 09:00:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WztcB6H7dz4mCT;
Thu, 5 Sep 2024 09:00:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725526826;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=NdaKvAnh4nhXyHQ0whdz5mlbc5WxY0iIjifkPVgcC9U=;
b=Fq0kIyq6HxmLfIZ05Rcz5I1FKiaDDlY404HZkBWUAebRi/XkgVZeHJyycFRk+Gc1QSo3F6
5rU9dKAhI6YSqKuedjisurShuIwt3cKa0i/QGQAMf6/ZGBfDCLeGCVQ28N4dizkEQ4D1yH
hCgL76pPs1sTjqgrC5MwWaP6MjAcR4C+1HGAW7wOpZezHI0cydEsrB1WWaYb0rvU7TNtvE
hv+my1NMIyU4YL2z+A55KEkUqb9O6pm0UQVaybhorhAkEyk1tIHXbSpUrNseRCK2/jkcFk
w7twulRzjnuHzeZceV1Nm0lMgln3mMIQsVOyb6i431Xy0sqhLyeNfSjBSIR1Og==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725526826; a=rsa-sha256; cv=none;
b=pjtIn+xb+uRGPZSYnzjkyq/6A0izARbgHSAY0VQWtK3QEK04yDAXhyPcwfqaly4AKUdAi1
UPgdz30f89EVFbpVhhkGd1eje6EQ4slZDx+7zhrIQaa2sDPTNOs6A3aO3NS4cFF19B1OLa
GKJrFTKhP4YHFwhGh1y9GOWsrbu6BaPS8uCeRILaaxUJCaqBCjT+La9Q5tA5jOETD1F7Fl
SEAuB6PLHBn+IkX2zUw01evbNfKaW9OdMY5ouNHw3i2G3+EXmHNbylGfzEwcTPjnR7Vr6t
y6J+To9YPkvQwenV6HXr4PXVFWMQeUKfUCLi4I79xV9v6Q3OxKCvzdegJYw1sA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725526826;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=NdaKvAnh4nhXyHQ0whdz5mlbc5WxY0iIjifkPVgcC9U=;
b=mx/QUfQmsTopr5HvyVvX9Poo6juZ7Q+jub9+y6fFZqrua5+8TOEUjX0aecvtBjQoaQNVJQ
H4/A7uxgyyeFLsWneQBXtlwRKrzXKv/wnYo1lgLMFGQyxXt1JTxXQypqf31XLjpYfl3VdE
bed9IU+X/VuUcF3m7a2f/6E2eXUqw5pIOBfhHhIaQcAOmGoaRaclmuMSec0nBfL3bgO0JV
9ngnVhs2gPU8rHwOEt1l2O7IUSxxMKA9j3cg3rUrEwBNiHUWuVxkC+cL2LvqrP4m0YRRpc
RmMbCFVqQdA3ABth3MVS9dd7DW74y3+XTLtI1H5CTkVhZ7VdTyQQdB7bmNj6og==
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 4WztcB5nn8z12JZ;
Thu, 5 Sep 2024 09:00: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 48590Q69083371;
Thu, 5 Sep 2024 09:00:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48590QEk083368;
Thu, 5 Sep 2024 09:00:26 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 09:00:26 GMT
Message-Id: <202409050900.48590QEk083368@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: a9ac25d65f64 - main - pf.4: document missing sysctls
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a9ac25d65f640a0a06a96e20c60bb34111db8ef6
Auto-Submitted: auto-generated
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=a9ac25d65f640a0a06a96e20c60bb34111db8ef6
commit a9ac25d65f640a0a06a96e20c60bb34111db8ef6
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-09-02 13:34:50 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-09-05 07:38:11 +0000
pf.4: document missing sysctls
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D46510
---
share/man/man4/pf.4 | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 645f31e6e395..9bfc75cb490d 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 20, 2023
+.Dd September 2, 2024
.Dt PF 4
.Os
.Sh NAME
@@ -80,17 +80,26 @@ The following
tunables are available.
.Bl -tag -width indent
.It Va net.pf.states_hashsize
-Size of hash tables that store states.
+Size of hash table that stores states.
Should be power of 2.
Default value is 131072.
.It Va net.pf.source_nodes_hashsize
-Size of hash table that store source nodes.
+Size of hash table that stores source nodes.
Should be power of 2.
Default value is 32768.
+.It Va net.pf.rule_tag_hashsize
+Size of the hash table that stores tags.
.It Va net.pf.default_to_drop
This value overrides
.Cd "options PF_DEFAULT_TO_DROP"
from kernel configuration file.
+.It Va net.pf.filter_local
+This tells
+.Nm
+to also filter on the loopback output hook.
+This is typically used to allow redirect rules to adjust the source address.
+.It net.pf.request_maxcount
+The maximum number of items in a single ioctl call.
.El
.Pp
Read only
From nobody Thu Sep 5 09:00:27 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WztcD0x1Jz5W16k;
Thu, 05 Sep 2024 09:00: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 4WztcD0QgNz4mT0;
Thu, 5 Sep 2024 09:00:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725526828;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=vpweC052vZ3IzGv78oaNaW3AfrQqhpt/j9Rvax+rnaI=;
b=NKYGcSpTOSoktDm9kkIsS9hTuPatKuuP9dfH7Q2VI7IXqCBJujD4fM2tfIaBknoVQJgtg6
APT3Xe+WfbzGUeQ2rmkej7j2lZp66hj2mqeC4RIJK2Rb8UXb1KPQsNGQCriPN0D8BDyHUW
EKW1k8YPkobaIA/9IYeRt/Zosmm5teXRdORWRhvz1g75YD74OGvTxJzkUrHqkMPToBXuyS
B0g644ZYtW25wXnmUUrTslgnsC8qg+UlaLpdbCXWAzmpFA1vD7hhVRzL9ASAmBY2WgbtGh
Acd0e2GftduzS6jfE4szbe+0t66Gxz3FhT3GDWGAuR4GFvG/nIK0K+4Fv75zmQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725526828; a=rsa-sha256; cv=none;
b=a6p68+O9BvSTewVMVTjPI2Z2odSBEQXa9yIBHSZ393guBvisBQNsdmUel27RrBtZuIsLoh
CDgds2ne1Akt/hU2MNol9Yqa4P6HepM2KwxYHxrfYY/XFaOJYyPxGQtIueq3ho6RgBuci8
TkxnGe+1dJA6MT0h4qAfhslS0JLCKO4QWGIweaFao9bhOEhLS4daQS9mrAx0u+OV95vM7n
YVjDbDBo3cGMXiOW42RMrS8cQ3rqlAbLGGaXHDO4QjT4XGjuYKz5R2XyzWX7kvr7qQcTBe
7jctBQ4O/3Oa7nAEHcdolVyeWcHrPxgZYaOAtb76cQCPv6LqoqAynZ2qbdJZ1w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725526828;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=vpweC052vZ3IzGv78oaNaW3AfrQqhpt/j9Rvax+rnaI=;
b=Py7NIfKqe/Gdg93+t+S6J7SYDTqZDRRZo2Zq+/Nb/7aHpuQWGwDgGbrTBUnEw+k0+2c3eZ
zj0ymnHf9LSDyMM4GFK32erD5o881AD71z2URq1huvC3IchiNsmLxqgTaXl68DFFdYh4Yq
TY09mgkiXf9iLAo3tvArntL0ory9+3KM0OTT3fE3qX0al9NzszPTjwkMxP+P3ctpNNhYHV
FwxQDfEWKtPdhe9I+qXwrVF3EyvOBFxU6UCWUv0aHMjuq2Of7RSre42GYapdVr7bw/fxmz
iZ5ZtosX4ki10PlUZS0elIcXLtb49SOXJd9eXQy02JYckejeBuSe8DYUnxLtSA==
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 4WztcC6RV9z12Wq;
Thu, 5 Sep 2024 09:00: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 48590RQJ083423;
Thu, 5 Sep 2024 09:00:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48590RHp083420;
Thu, 5 Sep 2024 09:00:27 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 09:00:27 GMT
Message-Id: <202409050900.48590RHp083420@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 5644e2c6d47c - main - if_ovpn: ensure it's safe to
modify the mbuf
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5644e2c6d47c6113a61ab7fc0776b7227677656a
Auto-Submitted: auto-generated
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=5644e2c6d47c6113a61ab7fc0776b7227677656a
commit 5644e2c6d47c6113a61ab7fc0776b7227677656a
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-09-04 12:54:23 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-09-05 08:59:31 +0000
if_ovpn: ensure it's safe to modify the mbuf
PR: 280036
Reviewed by: ae
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D46529
---
sys/net/if_ovpn.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c
index f6f640a65f61..ee097cfa24b3 100644
--- a/sys/net/if_ovpn.c
+++ b/sys/net/if_ovpn.c
@@ -2115,6 +2115,12 @@ ovpn_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
sc = ifp->if_softc;
+ m = m_unshare(m, M_NOWAIT);
+ if (m == NULL) {
+ OVPN_COUNTER_ADD(sc, lost_data_pkts_out, 1);
+ return (ENOBUFS);
+ }
+
OVPN_RLOCK(sc);
SDT_PROBE1(if_ovpn, tx, transmit, start, m);
@@ -2233,6 +2239,12 @@ ovpn_udp_input(struct mbuf *m, int off, struct inpcb *inp,
M_ASSERTPKTHDR(m);
+ m = m_unshare(m, M_NOWAIT);
+ if (m == NULL) {
+ OVPN_COUNTER_ADD(sc, nomem_data_pkts_in, 1);
+ return (true);
+ }
+
OVPN_COUNTER_ADD(sc, transport_bytes_received, m->m_pkthdr.len - off);
ohdrlen = sizeof(*ohdr) - sizeof(ohdr->auth_tag);
From nobody Thu Sep 5 12:27:52 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzzCX4QP0z5Vwgd;
Thu, 05 Sep 2024 12:27: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 4WzzCX3tpwz4GZ0;
Thu, 5 Sep 2024 12:27:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725539272;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=rn31P7Onb0EusefCQcM9UG33qkdK8UCrvePUQTrc8Aw=;
b=OC9gx72lcUEhODOV8mttOf9t3iqCYXHBd0Wnx08KnMK4Yux39m3hAHFmtJdSAIf46m0/fM
HSqbqUbdNmyhH4Igm7W4ShE38ClId6sNfe7qpn2q9GSSzJSBGaSnfBDgq86sbROhbI06qg
yudciCvIGbNFV8v/kgbvKZpV7sxOEK8B10tzMkA0fLNlbjEDxv0svlJ0BVww2d3X0Xbw+s
b7P52mUx02F4zarylcZXFCqsFVc84GBUbhgluJIZAFrhkSvs3FnWSPXx4eizzXO7h7oKtP
L0dDs78ebI32sBMMvDyg5Z8qrJfr983/OSVsgcRSvnN8i17XDenBfZxRZej8gg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725539272; a=rsa-sha256; cv=none;
b=pSya5kzKM9FNx87uftLi5FR6mv9Rou9SNQxgA/exPJGHdEfuZF0slQ41KADoXuUWnCLOX+
td3axM++joOgq2v1quqcJPDQZbRYjb7bW1aTxJj2CxM1rhyhLZQaOx2+197v+C1rgYraMa
ezB9ggBl0SPLbbqlokGpza56QB7MCW8QEntwZ5E8yjk+WiW7AVx2+eVBp64+hDvUttFYYQ
w9Cg61w3JmNM6Sb2nnDt0kZ6BZIAur/1tpfevDUD6VTIS7aflgpbgqQiX54UUaKkbTVxyn
/41RlZrZnjrpbVTDuZcEBt+PfHHzOb9Y2sFDrAbwiMUW496iGYJk5DkVQCTZRw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725539272;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=rn31P7Onb0EusefCQcM9UG33qkdK8UCrvePUQTrc8Aw=;
b=tqZAOmCmcF+YqWTSU7FKkbyy7iCsSryZ4NsFq07GptDLQP+1Wvw+cR9myI+f/Kgbh2d19Z
IgdEVvN1/XzGkplNDtdNgemLRy5uFeqHhxx5kQxQxVw4jl8Q5R/CjiYYqaHmjVRWC0LC8i
9d8+TKUGazG90RLmVYI0e+khuw+Kex2dH4kawfaDcT2Mz1ciec8+tBzIBw4VYGLnAIdG4w
BHVlp2zyTvyhnAPA7ZC1WLLFQx8XIv3QpZ0+3X8Pn1wOT1ujibgo0usLVH8nJd2tuS/2V4
AUA+EputmRW8LPiKwhlKARWq6DkcgoPxhQWg8wh1idCKSut+76XJDzEQsCtNsQ==
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 4WzzCX32Zpz17S5;
Thu, 5 Sep 2024 12:27: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 485CRqBK029335;
Thu, 5 Sep 2024 12:27:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485CRq8R029332;
Thu, 5 Sep 2024 12:27:52 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 12:27:52 GMT
Message-Id: <202409051227.485CRq8R029332@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Andrew Turner <andrew@FreeBSD.org>
Subject: git: 7be11454edd4 - main - arm64: Add the tcr_el2 ds field
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: andrew
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 7be11454edd4eca6cbd299cb5b486294f912ffbd
Auto-Submitted: auto-generated
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=7be11454edd4eca6cbd299cb5b486294f912ffbd
commit 7be11454edd4eca6cbd299cb5b486294f912ffbd
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-09-05 12:11:42 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-09-05 12:12:16 +0000
arm64: Add the tcr_el2 ds field
This will be used to support FEAT_LPA2 to allow more than 48 bits of
physical address space.
Reviewed by: alc, kib, markj
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D46392
---
sys/arm64/include/armreg.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h
index a04afd57585c..b4adc3d2c254 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -2444,6 +2444,8 @@
#define TCR_EL1_CRm 0
#define TCR_EL1_op2 2
/* Bits 63:59 are reserved */
+#define TCR_DS_SHIFT 59
+#define TCR_DS (UL(1) << TCR_DS_SHIFT)
#define TCR_TCMA1_SHIFT 58
#define TCR_TCMA1 (UL(1) << TCR_TCMA1_SHIFT)
#define TCR_TCMA0_SHIFT 57
From nobody Thu Sep 5 12:27:53 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzzCY6GGjz5Vwky;
Thu, 05 Sep 2024 12:27: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 4WzzCY4RR3z4GlM;
Thu, 5 Sep 2024 12:27:53 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725539273;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=wwdbf14aEeqbNaxfdMC+szoFPI0Vj8w1pxNMC6kb4Fo=;
b=AmjHv+X+68T5Jn1V3GUWW+js2oXJZfjmUyeoJmdLCStF4wueZfnXdFa2zvRP6QEaUuNEfn
tz5hnX/Bkh+xAr+iN1oS8x3RgHX93Cbh56EiDDon5avNjPPGEl0fYse3ftt0KxL8uagzV7
B83lAxY8Irx3DRMuyLenEf0EZDtzVKP718jfU2dTllwVQ5un+/dAo1Ra6YDHMGsxnQcYM2
bNK7+mJ2PkOzBO/3gnUVrUm66PcUmre3K/Tx/wKuvCAAgca8L7+auLShXJjdLx7Cda73jp
KdNMziCIQgWkgxfWpNPJyVkRnDCcf2+8QUTL8iU0CONEJEzMWRXyKkdHyoQ/oQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725539273; a=rsa-sha256; cv=none;
b=c0cYwEEOgG4Fx1/FafSnHgUUOeP/YlInSMqqMTgclX9JHsi6w38NhjuKHOXvWbWQp0gwEu
Yse5x0sfHwF2dLO5VelZqAwG7Tnx+aEX5hWA6hWtkwxK0Oo9Op86AVVszVVXTUs+a5Kl5J
xVleOiDl1y9X3PeHlTZeu4mhvT2QVAUeI9yEFVGjaUGbdhiW0/Oad5UyQ0nj945MU1KQxJ
1H4rPX8XA76qh/32PeKmTdZiFNhvb+189lXpoRLKVQ8o//qHsGihZQVAIkDZXbD9a/Hv+N
+LM0SANG73w2nQcrJ/xCGZ95SSdVzR7xIXZ06kLZ1haazbkbFM+6bp5rLFsXUg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725539273;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=wwdbf14aEeqbNaxfdMC+szoFPI0Vj8w1pxNMC6kb4Fo=;
b=LIDU6FWCJ5JHzbJlF+kZmo+tTeVhS5hMwryn0q3UD68K9XiOUy8nfzeUnpKA7c0M7R20WD
LSPN4StZbzhpbGeRBfC5kxTKN43EKu5nNGAFkxOwL50tVHYJJuRSCe6frsoC4EIUZhYwms
If4Z9neFqNox78A8OpB5FRjUq4ds2HVyIMVNCyCWK7P9BXL3+dnvh3O2+8ZrSV6/K00I3V
IM/VmsqXJUE/XoB59H6j+6+aCr9SttvyMaBc/+UVPqzoJ1iw5x2gbzJuLKN5oTo5hPIja0
DY38drTyQigKc7gUYrBZDBlnpDg60jkyWAId3rBSo1lTUvZpbzKh03iTxJEuTg==
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 4WzzCY3wHcz178X;
Thu, 5 Sep 2024 12:27: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 485CRra8029377;
Thu, 5 Sep 2024 12:27:53 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485CRrUU029374;
Thu, 5 Sep 2024 12:27:53 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 12:27:53 GMT
Message-Id: <202409051227.485CRrUU029374@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Andrew Turner <andrew@FreeBSD.org>
Subject: git: 3a3aa2cc0756 - main - arm64: Remove TCR_CACHE_ATTRS
and TCR_SMP_ATTRS
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: andrew
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 3a3aa2cc07563e288950affbda6b743487e9d49d
Auto-Submitted: auto-generated
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=3a3aa2cc07563e288950affbda6b743487e9d49d
commit 3a3aa2cc07563e288950affbda6b743487e9d49d
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-09-05 12:11:48 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-09-05 12:12:16 +0000
arm64: Remove TCR_CACHE_ATTRS and TCR_SMP_ATTRS
These are only used in one place so expand them there.
While here always set TCR_SH0_IS and TCR_SH1_IS. There is no advantage
to not set them in a UP kernel.
Reviewed by: alc, kib, markj
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D46393
---
sys/arm64/arm64/locore.S | 5 +++--
sys/arm64/include/armreg.h | 8 --------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index ae1a005fd68f..daf8a936eda2 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -945,8 +945,9 @@ tcr:
#error Unsupported page size
#endif
- .quad (TCR_TxSZ(64 - VIRT_BITS) | TCR_TG | \
- TCR_CACHE_ATTRS | TCR_SMP_ATTRS)
+ .quad (TCR_TxSZ(64 - VIRT_BITS) | TCR_TG | \
+ TCR_SH1_IS | TCR_ORGN1_WBWA | TCR_IRGN1_WBWA | \
+ TCR_SH0_IS | TCR_ORGN0_WBWA | TCR_IRGN0_WBWA)
sctlr_set:
/* Bits to set */
.quad (SCTLR_LSMAOE | SCTLR_nTLSMD | SCTLR_UCI | SCTLR_SPAN | \
diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h
index b4adc3d2c254..54600d63891e 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -2543,14 +2543,6 @@
#define TCR_T0SZ(x) ((x) << TCR_T0SZ_SHIFT)
#define TCR_TxSZ(x) (TCR_T1SZ(x) | TCR_T0SZ(x))
-#define TCR_CACHE_ATTRS ((TCR_IRGN0_WBWA | TCR_IRGN1_WBWA) |\
- (TCR_ORGN0_WBWA | TCR_ORGN1_WBWA))
-#ifdef SMP
-#define TCR_SMP_ATTRS (TCR_SH0_IS | TCR_SH1_IS)
-#else
-#define TCR_SMP_ATTRS 0
-#endif
-
/* TCR_EL12 */
#define TCR_EL12_REG MRS_REG_ALT_NAME(TCR_EL12)
#define TCR_EL12_op0 3
From nobody Thu Sep 5 12:27:54 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzzCc0lKMz5VwWX;
Thu, 05 Sep 2024 12:27: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 4WzzCZ4z7wz4Ghq;
Thu, 5 Sep 2024 12:27:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725539274;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=YJOzXPgF0wzgJDEq6CYGdUwehMFHjhbMomFp4inJj54=;
b=OwkDySrHf4giyjR9BMb5G8o7dJZUKkbSRFPgcvJEymP/3QHDlQ9+NK37dh/yKjdFjfCa/v
q3paKZ6/CKXDh9UPd/rgwsCQC0ARBS3iDMxbMm7habH5rfu2uNtxdBaP8pUCBTR0VelbML
gY1DPmdcDfDSEHKvN4U8DIvRXzhsPWjr4OsLlJJHzg095jk85j9UlE4Hb+EEpM19MJZcAi
rFsCrvHf7JFDKWiW1D+w8tXXWQX47Es+TxMXIQYLbOdEHD65jdT8FfZTNUDX5GEc1DSooT
Cnnpt3iiWtQoVjIIseUqSpfoKGLTLKUb8NqlvIhDmHcjn362WAQIy1gF8lWR/g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725539274; a=rsa-sha256; cv=none;
b=TZPvuIyRCbCQ8xkjjCQZ2jF7jlvjB6kfePJk6KXfd6HIgDakioXVFUKWl0tK0m57jhH43G
ZvAjoJBaH7KzVCBR4L32GSZr1ITzt2hULg7cXGDxhTNwHCGPGC/HyMSVikfLyubQJBdpwi
muaOq8uudJr9bwW+imrlkE+YHpMhfPg7krUSTp9Cx6q5+9Dmkz9LfFbGyI9S008US26Rq4
PgyIivO3mmQJkab9Et3kUa8+ArFH3C2j1F85KqtTKWEfTzMPuue18z3sqn0cOPkge39yna
apW6TIeDQsh8k/HpC953hX8T6KzsCDd8xH11OvEWuscUi+z3G3EgTo4EIrDX/Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725539274;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=YJOzXPgF0wzgJDEq6CYGdUwehMFHjhbMomFp4inJj54=;
b=fl7oyN+vE81d88wKoYzQP/aOPhI9gd150TdkptyHXRctWHJLKpmdb8nI1x1shYywLe12tk
erL27PTyL5KYIexJHqeSVPwwnhVUFrHJI9WZoeWvDqLeowzO2XYqGFcviZguFnYGf9cW9L
j4L42QxWSLYYQ3apzL6Wu8lxLybttUMVqzM0ouzU6VeYM/kWkhPynrO0jpd/PXVF5Eo6dX
tWO9pS3mKJwmSrSVrMxBk1ICvfc2dUY9+P+40Z0Y5rONmBkn7RVrcxaB7Dcq8yd+d69500
dpu4Z1Qx0vn051gcYzA68XoMnn+5TPyo/N0VZkikoLUgL83zGlpVTl56aZMtww==
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 4WzzCZ4RHzz17fW;
Thu, 5 Sep 2024 12:27: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 485CRsVh029419;
Thu, 5 Sep 2024 12:27:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485CRsbF029416;
Thu, 5 Sep 2024 12:27:54 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 12:27:54 GMT
Message-Id: <202409051227.485CRsbF029416@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Andrew Turner <andrew@FreeBSD.org>
Subject: git: e2990a9ee479 - main - arm64: Remove ATTR_DEFAULT from
pte.h
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: andrew
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e2990a9ee479b7d31bceb75310c0f290cdfb8504
Auto-Submitted: auto-generated
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=e2990a9ee479b7d31bceb75310c0f290cdfb8504
commit e2990a9ee479b7d31bceb75310c0f290cdfb8504
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-09-05 12:11:55 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-09-05 12:12:17 +0000
arm64: Remove ATTR_DEFAULT from pte.h
ATTR_SH(ATTR_SH_IS) will soon be dynamic as the field is moved out of
the page tables in FEAT_LPA2. When this happens ATTR_DEFAULT will just
be ATTR_AF.
Rather than keeping ATTR_DEFAULT with one attribute remove it.
Reviewed by: alc, kib, markj
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D46466
---
sys/arm64/arm64/efirt_machdep.c | 2 +-
sys/arm64/arm64/locore.S | 4 +--
sys/arm64/arm64/minidump_machdep.c | 6 ++---
sys/arm64/arm64/pmap.c | 53 ++++++++++++++++++++------------------
sys/arm64/include/pte.h | 2 --
sys/arm64/iommu/iommu_pmap.c | 2 +-
sys/arm64/vmm/vmm_mmu.c | 2 +-
7 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c
index 0c46d2e6dcc6..7c1d12b0b9b4 100644
--- a/sys/arm64/arm64/efirt_machdep.c
+++ b/sys/arm64/arm64/efirt_machdep.c
@@ -214,7 +214,7 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz)
p->md_phys, mode, p->md_pages);
}
- l3_attr = ATTR_DEFAULT | ATTR_S1_IDX(mode) |
+ l3_attr = ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_IDX(mode) |
ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_nG | L3_PAGE;
if (mode == VM_MEMATTR_DEVICE || p->md_attr & EFI_MD_ATTR_XP)
l3_attr |= ATTR_S1_XN;
diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index daf8a936eda2..e37ea5aa3b48 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -747,7 +747,7 @@ LENTRY(build_l2_block_pagetable)
/* Build the L2 block entry */
orr x12, x7, #L2_BLOCK
- orr x12, x12, #(ATTR_DEFAULT)
+ orr x12, x12, #(ATTR_AF | ATTR_SH(ATTR_SH_IS))
orr x12, x12, #(ATTR_S1_UXN)
#ifdef __ARM_FEATURE_BTI_DEFAULT
orr x12, x12, #(ATTR_S1_GP)
@@ -823,7 +823,7 @@ LENTRY(build_l3_page_pagetable)
/* Build the L3 page entry */
orr x12, x7, #L3_PAGE
- orr x12, x12, #(ATTR_DEFAULT)
+ orr x12, x12, #(ATTR_AF | ATTR_SH(ATTR_SH_IS))
orr x12, x12, #(ATTR_S1_UXN)
#ifdef __ARM_FEATURE_BTI_DEFAULT
orr x12, x12, #(ATTR_S1_GP)
diff --git a/sys/arm64/arm64/minidump_machdep.c b/sys/arm64/arm64/minidump_machdep.c
index 8ee626953aef..ac0a2c2dc96e 100644
--- a/sys/arm64/arm64/minidump_machdep.c
+++ b/sys/arm64/arm64/minidump_machdep.c
@@ -310,8 +310,8 @@ cpu_minidumpsys(struct dumperinfo *di, const struct minidumpstate *state)
for (i = 0; i < Ln_ENTRIES; i++) {
for (j = 0; j < Ln_ENTRIES; j++) {
tmpbuffer[j] = (pa + i * L2_SIZE +
- j * PAGE_SIZE) | ATTR_DEFAULT |
- L3_PAGE;
+ j * PAGE_SIZE) | ATTR_AF |
+ ATTR_SH(ATTR_SH_IS) | L3_PAGE;
}
error = blk_write(di, (char *)&tmpbuffer, 0,
PAGE_SIZE);
@@ -330,7 +330,7 @@ cpu_minidumpsys(struct dumperinfo *di, const struct minidumpstate *state)
/* Generate fake l3 entries based upon the l1 entry */
for (i = 0; i < Ln_ENTRIES; i++) {
tmpbuffer[i] = (pa + i * PAGE_SIZE) |
- ATTR_DEFAULT | L3_PAGE;
+ ATTR_AF | ATTR_SH(ATTR_SH_IS) | L3_PAGE;
}
error = blk_write(di, (char *)&tmpbuffer, 0, PAGE_SIZE);
if (error)
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index 224ecbdc4577..5f09f4cbcf1b 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -185,8 +185,8 @@
#else
#define ATTR_KERN_GP 0
#endif
-#define PMAP_SAN_PTE_BITS (ATTR_DEFAULT | ATTR_S1_XN | ATTR_KERN_GP | \
- ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | ATTR_S1_AP(ATTR_S1_AP_RW))
+#define PMAP_SAN_PTE_BITS (ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_XN | \
+ ATTR_KERN_GP | ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | ATTR_S1_AP(ATTR_S1_AP_RW))
struct pmap_large_md_page {
struct rwlock pv_lock;
@@ -1150,7 +1150,7 @@ pmap_bootstrap_l2_block(struct pmap_bootstrap_state *state, int i)
MPASS((state->pa & L2_OFFSET) == 0);
MPASS(state->l2[l2_slot] == 0);
pmap_store(&state->l2[l2_slot], PHYS_TO_PTE(state->pa) |
- ATTR_DEFAULT | ATTR_S1_XN | ATTR_KERN_GP |
+ ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_XN | ATTR_KERN_GP |
ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | contig | L2_BLOCK);
}
MPASS(state->va == (state->pa - dmap_phys_base + DMAP_MIN_ADDRESS));
@@ -1200,7 +1200,7 @@ pmap_bootstrap_l3_page(struct pmap_bootstrap_state *state, int i)
MPASS((state->pa & L3_OFFSET) == 0);
MPASS(state->l3[l3_slot] == 0);
pmap_store(&state->l3[l3_slot], PHYS_TO_PTE(state->pa) |
- ATTR_DEFAULT | ATTR_S1_XN | ATTR_KERN_GP |
+ ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_XN | ATTR_KERN_GP |
ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | contig | L3_PAGE);
}
MPASS(state->va == (state->pa - dmap_phys_base + DMAP_MIN_ADDRESS));
@@ -1242,7 +1242,8 @@ pmap_bootstrap_dmap(void)
MPASS((bs_state.pa & L1_OFFSET) == 0);
pmap_store(
&bs_state.l1[pmap_l1_index(bs_state.va)],
- PHYS_TO_PTE(bs_state.pa) | ATTR_DEFAULT |
+ PHYS_TO_PTE(bs_state.pa) | ATTR_AF |
+ ATTR_SH(ATTR_SH_IS) |
ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) |
ATTR_S1_XN | ATTR_KERN_GP | L1_BLOCK);
}
@@ -2111,8 +2112,8 @@ pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode)
KASSERT((size & PAGE_MASK) == 0,
("pmap_kenter: Mapping is not page-sized"));
- attr = ATTR_DEFAULT | ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_XN |
- ATTR_KERN_GP | ATTR_S1_IDX(mode);
+ attr = ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_AP(ATTR_S1_AP_RW) |
+ ATTR_S1_XN | ATTR_KERN_GP | ATTR_S1_IDX(mode);
old_l3e = 0;
va = sva;
while (size != 0) {
@@ -2326,7 +2327,8 @@ pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count)
("pmap_qenter: Invalid level %d", lvl));
m = ma[i];
- attr = ATTR_DEFAULT | ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_XN |
+ attr = ATTR_AF | ATTR_SH(ATTR_SH_IS) |
+ ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_XN |
ATTR_KERN_GP | ATTR_S1_IDX(m->md.pv_memattr) | L3_PAGE;
pte = pmap_l2_to_l3(pde, va);
old_l3e |= pmap_load_store(pte, VM_PAGE_TO_PTE(m) | attr);
@@ -5122,7 +5124,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
if ((m->oflags & VPO_UNMANAGED) == 0)
VM_PAGE_OBJECT_BUSY_ASSERT(m);
pa = VM_PAGE_TO_PHYS(m);
- new_l3 = (pt_entry_t)(PHYS_TO_PTE(pa) | ATTR_DEFAULT | L3_PAGE);
+ new_l3 = (pt_entry_t)(PHYS_TO_PTE(pa) | ATTR_AF | ATTR_SH(ATTR_SH_IS) |
+ L3_PAGE);
new_l3 |= pmap_pte_memattr(pmap, m->md.pv_memattr);
new_l3 |= pmap_pte_prot(pmap, prot);
if ((flags & PMAP_ENTER_WIRED) != 0)
@@ -5465,13 +5468,13 @@ pmap_enter_l2_rx(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
KASSERT(ADDR_IS_CANONICAL(va),
("%s: Address not in canonical form: %lx", __func__, va));
- new_l2 = (pd_entry_t)(VM_PAGE_TO_PTE(m) | ATTR_DEFAULT |
+ new_l2 = (pd_entry_t)(VM_PAGE_TO_PTE(m) | ATTR_SH(ATTR_SH_IS) |
ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) |
L2_BLOCK);
- if ((m->oflags & VPO_UNMANAGED) == 0) {
+ if ((m->oflags & VPO_UNMANAGED) == 0)
new_l2 |= ATTR_SW_MANAGED;
- new_l2 &= ~ATTR_AF;
- }
+ else
+ new_l2 |= ATTR_AF;
if ((prot & VM_PROT_EXECUTE) == 0 ||
m->md.pv_memattr == VM_MEMATTR_DEVICE)
new_l2 |= ATTR_S1_XN;
@@ -5694,13 +5697,13 @@ pmap_enter_l3c_rx(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *ml3p,
KASSERT(ADDR_IS_CANONICAL(va),
("%s: Address not in canonical form: %lx", __func__, va));
- l3e = VM_PAGE_TO_PTE(m) | ATTR_DEFAULT |
+ l3e = VM_PAGE_TO_PTE(m) | ATTR_SH(ATTR_SH_IS) |
ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) |
ATTR_CONTIGUOUS | L3_PAGE;
- if ((m->oflags & VPO_UNMANAGED) == 0) {
+ if ((m->oflags & VPO_UNMANAGED) == 0)
l3e |= ATTR_SW_MANAGED;
- l3e &= ~ATTR_AF;
- }
+ else
+ l3e |= ATTR_AF;
if ((prot & VM_PROT_EXECUTE) == 0 ||
m->md.pv_memattr == VM_MEMATTR_DEVICE)
l3e |= ATTR_S1_XN;
@@ -6091,8 +6094,8 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
pmap_resident_count_inc(pmap, 1);
pa = VM_PAGE_TO_PHYS(m);
- l3_val = PHYS_TO_PTE(pa) | ATTR_DEFAULT | ATTR_S1_IDX(m->md.pv_memattr) |
- ATTR_S1_AP(ATTR_S1_AP_RO) | L3_PAGE;
+ l3_val = PHYS_TO_PTE(pa) | ATTR_SH(ATTR_SH_IS) |
+ ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) | L3_PAGE;
l3_val |= pmap_pte_bti(pmap, va);
if ((prot & VM_PROT_EXECUTE) == 0 ||
m->md.pv_memattr == VM_MEMATTR_DEVICE)
@@ -6107,10 +6110,10 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
/*
* Now validate mapping with RO protection
*/
- if ((m->oflags & VPO_UNMANAGED) == 0) {
+ if ((m->oflags & VPO_UNMANAGED) == 0)
l3_val |= ATTR_SW_MANAGED;
- l3_val &= ~ATTR_AF;
- }
+ else
+ l3_val |= ATTR_AF;
/* Sync icache before the mapping is stored to PTE */
if ((prot & VM_PROT_EXECUTE) && pmap != kernel_pmap &&
@@ -7741,9 +7744,9 @@ pmap_mapbios(vm_paddr_t pa, vm_size_t size)
/* Insert L2_BLOCK */
l2 = pmap_l1_to_l2(pde, va);
old_l2e |= pmap_load_store(l2,
- PHYS_TO_PTE(pa) | ATTR_DEFAULT | ATTR_S1_XN |
- ATTR_KERN_GP | ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) |
- L2_BLOCK);
+ PHYS_TO_PTE(pa) | ATTR_AF | ATTR_SH(ATTR_SH_IS) |
+ ATTR_S1_XN | ATTR_KERN_GP |
+ ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | L2_BLOCK);
va += L2_SIZE;
pa += L2_SIZE;
diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h
index 1f36655a45e2..02eba21448ba 100644
--- a/sys/arm64/include/pte.h
+++ b/sys/arm64/include/pte.h
@@ -111,8 +111,6 @@ typedef uint64_t pt_entry_t; /* page table entry */
#define ATTR_S2_MEMATTR_WT 0xa
#define ATTR_S2_MEMATTR_WB 0xf
-#define ATTR_DEFAULT (ATTR_AF | ATTR_SH(ATTR_SH_IS))
-
#define ATTR_DESCR_MASK 3
#define ATTR_DESCR_VALID 1
#define ATTR_DESCR_TYPE_MASK 2
diff --git a/sys/arm64/iommu/iommu_pmap.c b/sys/arm64/iommu/iommu_pmap.c
index 8a0ea641e231..dc5c09239c04 100644
--- a/sys/arm64/iommu/iommu_pmap.c
+++ b/sys/arm64/iommu/iommu_pmap.c
@@ -708,7 +708,7 @@ smmu_pmap_enter(struct smmu_pmap *pmap, vm_offset_t va, vm_paddr_t pa,
KASSERT(va < VM_MAXUSER_ADDRESS, ("wrong address space"));
va = trunc_page(va);
- new_l3 = (pt_entry_t)(pa | ATTR_DEFAULT |
+ new_l3 = (pt_entry_t)(pa | ATTR_AF | ATTR_SH(ATTR_SH_IS) |
ATTR_S1_IDX(VM_MEMATTR_DEVICE) | IOMMU_L3_PAGE);
if ((prot & VM_PROT_WRITE) == 0)
new_l3 |= ATTR_S1_AP(ATTR_S1_AP_RO);
diff --git a/sys/arm64/vmm/vmm_mmu.c b/sys/arm64/vmm/vmm_mmu.c
index 1f2d248a743b..42537254e27b 100644
--- a/sys/arm64/vmm/vmm_mmu.c
+++ b/sys/arm64/vmm/vmm_mmu.c
@@ -294,7 +294,7 @@ vmmpmap_enter(vm_offset_t va, vm_size_t size, vm_paddr_t pa, vm_prot_t prot)
KASSERT((size & PAGE_MASK) == 0,
("%s: Mapping is not page-sized", __func__));
- l3e = ATTR_DEFAULT | L3_PAGE;
+ l3e = ATTR_AF | ATTR_SH(ATTR_SH_IS) | L3_PAGE;
/* This bit is res1 at EL2 */
l3e |= ATTR_S1_AP(ATTR_S1_AP_USER);
/* Only normal memory is used at EL2 */
From nobody Thu Sep 5 12:27:55 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WzzCd39XRz5Vwj2;
Thu, 05 Sep 2024 12:27: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 4WzzCb6nlGz4GZF;
Thu, 5 Sep 2024 12:27:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725539276;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=q9m2ToMS1x66uBGHnJYSmQSMWqTIp2RxB8F7gbrwt78=;
b=f/dluPwuJ+Wj7G3TUaK3zIKFm9Zbv0TcFZQeSyzdOWxmj+SvPc5gYhiv2UNM9SbGGPSP7j
ypnuWAwDFyLS6FooYlHaaoFbu3ExFzlPRgUNqTp2bbPh742efH95jWYZOseBYL8545JyCZ
S9L1lQIVWgM1WXmsy/8pW5aQnLiQLr9k6LuZ/My+2rccugHbRcyTFh/0E9BdHWJUowLjjg
jbsRvrvYVT/sSC0GBOCuQDOMK2mZe4N/bR5/6QFnl8ciJwqy/GBRPZuqjeItdHXkaN/M6t
OEtHeHELBtAM5ThCu4zNIBFoiTXDGwXfqoWHOMZDjl+pHAS9xKP0e6T6RofvlA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725539276; a=rsa-sha256; cv=none;
b=KvsJ4gz/dX2QCf5bgII9uRLppjo4O/y4Zk6YklvLGxCbD6ZKG1sRJt4tJ2COx44nREdFx0
+zbYS+txVpHjElwHGK70q3tQ9Ou9Tc/L9zHZ6oZZXx9K9ffUoWjyVu/5QFmValXBaqGBMz
cJc5cMrsVu1hE2bXQ9Gl6Fg0xLa1Q7Sh0Y5OZbvYZeheIP6pgxt/O9u3exUeK7uFZMhyVh
yk5dPVTBMK7VdiI4higDOK/fVI9WQJV8ad9URNK1NOjNreT0RNT78JzKmGsN8uYQQULSPa
LDb8Q38XmBxgkwnjHaw8npFVSzKM09JFjvPZapse9uJYyaLyAYq7SNUwdB2mDQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725539276;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=q9m2ToMS1x66uBGHnJYSmQSMWqTIp2RxB8F7gbrwt78=;
b=ulFCuGaxUdmEvw53SThBnS+YpRQusni9Wd3eUoX3gEgkYm/7rvyXSvUCeoNi7wG/k3smsK
tmeP6VjXFQnqDZr6Dh9ZoOd00hM1oce0MTz9etA1lUqTkPGRYpfUJIBnWcpVtOirJuotgE
CY/Dw7c8u8k7yNW1cFWTiKJDg/PsgGrseWsST63vSaQN9lNjS6Ale/N/PWc8CpyjSDYOv2
S6/ZBXAWUom2phtY+6xhYZ2/rygLn3CxGIikk/691cR0/VLBTpARw/BvDHQBk+Mzq33tac
TO8fKVCo+YC49uszYJnJKRlOw9b7Jz/GHuLIWB5jfGKt/u052ZKuFlzJ65iVzg==
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 4WzzCb5dRzz17fX;
Thu, 5 Sep 2024 12:27: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 485CRtUc029462;
Thu, 5 Sep 2024 12:27:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485CRtXH029459;
Thu, 5 Sep 2024 12:27:55 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 12:27:55 GMT
Message-Id: <202409051227.485CRtXH029459@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Andrew Turner <andrew@FreeBSD.org>
Subject: git: d52c31904218 - main - arm64: Make shareability
attributes dynamic
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: andrew
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: d52c31904218c79424435b69b9ec4098885d800f
Auto-Submitted: auto-generated
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=d52c31904218c79424435b69b9ec4098885d800f
commit d52c31904218c79424435b69b9ec4098885d800f
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-09-05 12:12:04 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-09-05 12:12:17 +0000
arm64: Make shareability attributes dynamic
When LPA2 is enabled the shareability attribute in the page table are
replaces with output address bits. To support a larger physical address
space make this attribute dynamic so we only set it when appropriate.
Reviewed by: alc, kib
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D46394
---
sys/arm64/arm64/efirt_machdep.c | 2 +-
sys/arm64/arm64/locore.S | 44 ++++++++++++++++++++++++++++++++++++--
sys/arm64/arm64/minidump_machdep.c | 4 ++--
sys/arm64/arm64/pmap.c | 24 +++++++++++----------
sys/arm64/include/hypervisor.h | 2 ++
sys/arm64/include/pmap.h | 2 ++
sys/arm64/vmm/vmm_arm64.c | 8 +++++++
7 files changed, 70 insertions(+), 16 deletions(-)
diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c
index 7c1d12b0b9b4..47e0a209d8b1 100644
--- a/sys/arm64/arm64/efirt_machdep.c
+++ b/sys/arm64/arm64/efirt_machdep.c
@@ -214,7 +214,7 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz)
p->md_phys, mode, p->md_pages);
}
- l3_attr = ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_IDX(mode) |
+ l3_attr = ATTR_AF | pmap_sh_attr | ATTR_S1_IDX(mode) |
ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_nG | L3_PAGE;
if (mode == VM_MEMATTR_DEVICE || p->md_attr & EFI_MD_ATTR_XP)
l3_attr |= ATTR_S1_XN;
diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index e37ea5aa3b48..7c60a2c5bf0a 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -86,6 +86,7 @@ ENTRY(_start)
* x27 = TTBR0 table
* x26 = Kernel L1 table
* x24 = TTBR1 table
+ * x22 = PTE shareability attributes
*/
/* Enable the mmu */
@@ -135,6 +136,10 @@ virtdone:
str x27, [x0, #BP_KERN_TTBR0]
str x23, [x0, #BP_BOOT_EL]
+ /* Set this before it's used in kasan_init_early */
+ adrp x1, pmap_sh_attr
+ str x22, [x1, :lo12:pmap_sh_attr]
+
#ifdef KASAN
/* Save bootparams */
mov x19, x0
@@ -476,6 +481,30 @@ LENTRY(create_pagetables)
cmp x6, x27
b.lo 1b
+ /*
+ * Find the shareability attribute we should use. If FEAT_LPA2 is
+ * enabled then the shareability field is moved from the page table
+ * to tcr_el1 and the bits in the page table are reused by the
+ * address field.
+ */
+#if PAGE_SIZE == PAGE_SIZE_4K
+#define LPA2_MASK ID_AA64MMFR0_TGran4_MASK
+#define LPA2_VAL ID_AA64MMFR0_TGran4_LPA2
+#elif PAGE_SIZE == PAGE_SIZE_16K
+#define LPA2_MASK ID_AA64MMFR0_TGran16_MASK
+#define LPA2_VAL ID_AA64MMFR0_TGran16_LPA2
+#else
+#error Unsupported page size
+#endif
+ mrs x6, id_aa64mmfr0_el1
+ mov x7, LPA2_VAL
+ and x6, x6, LPA2_MASK
+ cmp x6, x7
+ ldr x22, =(ATTR_SH(ATTR_SH_IS))
+ csel x22, xzr, x22, eq
+#undef LPA2_MASK
+#undef LPA2_VAL
+
/*
* Build the TTBR1 maps.
*/
@@ -747,11 +776,13 @@ LENTRY(build_l2_block_pagetable)
/* Build the L2 block entry */
orr x12, x7, #L2_BLOCK
- orr x12, x12, #(ATTR_AF | ATTR_SH(ATTR_SH_IS))
+ orr x12, x12, #(ATTR_AF)
orr x12, x12, #(ATTR_S1_UXN)
#ifdef __ARM_FEATURE_BTI_DEFAULT
orr x12, x12, #(ATTR_S1_GP)
#endif
+ /* Set the shareability attribute */
+ orr x12, x12, x22
/* Only use the output address bits */
lsr x9, x9, #L2_SHIFT
@@ -823,11 +854,13 @@ LENTRY(build_l3_page_pagetable)
/* Build the L3 page entry */
orr x12, x7, #L3_PAGE
- orr x12, x12, #(ATTR_AF | ATTR_SH(ATTR_SH_IS))
+ orr x12, x12, #(ATTR_AF)
orr x12, x12, #(ATTR_S1_UXN)
#ifdef __ARM_FEATURE_BTI_DEFAULT
orr x12, x12, #(ATTR_S1_GP)
#endif
+ /* Set the shareability attribute */
+ orr x12, x12, x22
/* Only use the output address bits */
lsr x9, x9, #L3_SHIFT
@@ -886,6 +919,13 @@ LENTRY(start_mmu)
* to 1 only if the ASIDBits field equals 0b0010.
*/
ldr x2, tcr
+
+ /* If x22 contains a non-zero value then LPA2 is not implemented */
+ cbnz x22, .Lno_lpa2
+ ldr x3, =(TCR_DS)
+ orr x2, x2, x3
+.Lno_lpa2:
+
mrs x3, id_aa64mmfr0_el1
/* Copy the bottom 3 bits from id_aa64mmfr0_el1 into TCR.IPS */
diff --git a/sys/arm64/arm64/minidump_machdep.c b/sys/arm64/arm64/minidump_machdep.c
index ac0a2c2dc96e..749c96545506 100644
--- a/sys/arm64/arm64/minidump_machdep.c
+++ b/sys/arm64/arm64/minidump_machdep.c
@@ -311,7 +311,7 @@ cpu_minidumpsys(struct dumperinfo *di, const struct minidumpstate *state)
for (j = 0; j < Ln_ENTRIES; j++) {
tmpbuffer[j] = (pa + i * L2_SIZE +
j * PAGE_SIZE) | ATTR_AF |
- ATTR_SH(ATTR_SH_IS) | L3_PAGE;
+ pmap_sh_attr | L3_PAGE;
}
error = blk_write(di, (char *)&tmpbuffer, 0,
PAGE_SIZE);
@@ -330,7 +330,7 @@ cpu_minidumpsys(struct dumperinfo *di, const struct minidumpstate *state)
/* Generate fake l3 entries based upon the l1 entry */
for (i = 0; i < Ln_ENTRIES; i++) {
tmpbuffer[i] = (pa + i * PAGE_SIZE) |
- ATTR_AF | ATTR_SH(ATTR_SH_IS) | L3_PAGE;
+ ATTR_AF | pmap_sh_attr | L3_PAGE;
}
error = blk_write(di, (char *)&tmpbuffer, 0, PAGE_SIZE);
if (error)
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index 5f09f4cbcf1b..dc02e732568f 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -185,7 +185,7 @@
#else
#define ATTR_KERN_GP 0
#endif
-#define PMAP_SAN_PTE_BITS (ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_XN | \
+#define PMAP_SAN_PTE_BITS (ATTR_AF | ATTR_S1_XN | pmap_sh_attr | \
ATTR_KERN_GP | ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | ATTR_S1_AP(ATTR_S1_AP_RW))
struct pmap_large_md_page {
@@ -355,6 +355,8 @@ static u_int physmap_idx;
static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
"VM/pmap parameters");
+pt_entry_t pmap_sh_attr __read_mostly = ATTR_SH(ATTR_SH_IS);
+
#if PAGE_SIZE == PAGE_SIZE_4K
#define L1_BLOCKS_SUPPORTED 1
#else
@@ -1150,7 +1152,7 @@ pmap_bootstrap_l2_block(struct pmap_bootstrap_state *state, int i)
MPASS((state->pa & L2_OFFSET) == 0);
MPASS(state->l2[l2_slot] == 0);
pmap_store(&state->l2[l2_slot], PHYS_TO_PTE(state->pa) |
- ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_XN | ATTR_KERN_GP |
+ ATTR_AF | pmap_sh_attr | ATTR_S1_XN | ATTR_KERN_GP |
ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | contig | L2_BLOCK);
}
MPASS(state->va == (state->pa - dmap_phys_base + DMAP_MIN_ADDRESS));
@@ -1200,7 +1202,7 @@ pmap_bootstrap_l3_page(struct pmap_bootstrap_state *state, int i)
MPASS((state->pa & L3_OFFSET) == 0);
MPASS(state->l3[l3_slot] == 0);
pmap_store(&state->l3[l3_slot], PHYS_TO_PTE(state->pa) |
- ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_XN | ATTR_KERN_GP |
+ ATTR_AF | pmap_sh_attr | ATTR_S1_XN | ATTR_KERN_GP |
ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | contig | L3_PAGE);
}
MPASS(state->va == (state->pa - dmap_phys_base + DMAP_MIN_ADDRESS));
@@ -1243,7 +1245,7 @@ pmap_bootstrap_dmap(void)
pmap_store(
&bs_state.l1[pmap_l1_index(bs_state.va)],
PHYS_TO_PTE(bs_state.pa) | ATTR_AF |
- ATTR_SH(ATTR_SH_IS) |
+ pmap_sh_attr |
ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) |
ATTR_S1_XN | ATTR_KERN_GP | L1_BLOCK);
}
@@ -2112,7 +2114,7 @@ pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode)
KASSERT((size & PAGE_MASK) == 0,
("pmap_kenter: Mapping is not page-sized"));
- attr = ATTR_AF | ATTR_SH(ATTR_SH_IS) | ATTR_S1_AP(ATTR_S1_AP_RW) |
+ attr = ATTR_AF | pmap_sh_attr | ATTR_S1_AP(ATTR_S1_AP_RW) |
ATTR_S1_XN | ATTR_KERN_GP | ATTR_S1_IDX(mode);
old_l3e = 0;
va = sva;
@@ -2327,7 +2329,7 @@ pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count)
("pmap_qenter: Invalid level %d", lvl));
m = ma[i];
- attr = ATTR_AF | ATTR_SH(ATTR_SH_IS) |
+ attr = ATTR_AF | pmap_sh_attr |
ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_XN |
ATTR_KERN_GP | ATTR_S1_IDX(m->md.pv_memattr) | L3_PAGE;
pte = pmap_l2_to_l3(pde, va);
@@ -5124,7 +5126,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
if ((m->oflags & VPO_UNMANAGED) == 0)
VM_PAGE_OBJECT_BUSY_ASSERT(m);
pa = VM_PAGE_TO_PHYS(m);
- new_l3 = (pt_entry_t)(PHYS_TO_PTE(pa) | ATTR_AF | ATTR_SH(ATTR_SH_IS) |
+ new_l3 = (pt_entry_t)(PHYS_TO_PTE(pa) | ATTR_AF | pmap_sh_attr |
L3_PAGE);
new_l3 |= pmap_pte_memattr(pmap, m->md.pv_memattr);
new_l3 |= pmap_pte_prot(pmap, prot);
@@ -5468,7 +5470,7 @@ pmap_enter_l2_rx(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
KASSERT(ADDR_IS_CANONICAL(va),
("%s: Address not in canonical form: %lx", __func__, va));
- new_l2 = (pd_entry_t)(VM_PAGE_TO_PTE(m) | ATTR_SH(ATTR_SH_IS) |
+ new_l2 = (pd_entry_t)(VM_PAGE_TO_PTE(m) | pmap_sh_attr |
ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) |
L2_BLOCK);
if ((m->oflags & VPO_UNMANAGED) == 0)
@@ -5697,7 +5699,7 @@ pmap_enter_l3c_rx(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *ml3p,
KASSERT(ADDR_IS_CANONICAL(va),
("%s: Address not in canonical form: %lx", __func__, va));
- l3e = VM_PAGE_TO_PTE(m) | ATTR_SH(ATTR_SH_IS) |
+ l3e = VM_PAGE_TO_PTE(m) | pmap_sh_attr |
ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) |
ATTR_CONTIGUOUS | L3_PAGE;
if ((m->oflags & VPO_UNMANAGED) == 0)
@@ -6094,7 +6096,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
pmap_resident_count_inc(pmap, 1);
pa = VM_PAGE_TO_PHYS(m);
- l3_val = PHYS_TO_PTE(pa) | ATTR_SH(ATTR_SH_IS) |
+ l3_val = PHYS_TO_PTE(pa) | pmap_sh_attr |
ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) | L3_PAGE;
l3_val |= pmap_pte_bti(pmap, va);
if ((prot & VM_PROT_EXECUTE) == 0 ||
@@ -7744,7 +7746,7 @@ pmap_mapbios(vm_paddr_t pa, vm_size_t size)
/* Insert L2_BLOCK */
l2 = pmap_l1_to_l2(pde, va);
old_l2e |= pmap_load_store(l2,
- PHYS_TO_PTE(pa) | ATTR_AF | ATTR_SH(ATTR_SH_IS) |
+ PHYS_TO_PTE(pa) | ATTR_AF | pmap_sh_attr |
ATTR_S1_XN | ATTR_KERN_GP |
ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | L2_BLOCK);
diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h
index 4c501e2722a9..1a27a8dd919b 100644
--- a/sys/arm64/include/hypervisor.h
+++ b/sys/arm64/include/hypervisor.h
@@ -241,6 +241,8 @@
#define VTCR_EL2_PS_42BIT (0x3UL << VTCR_EL2_PS_SHIFT)
#define VTCR_EL2_PS_44BIT (0x4UL << VTCR_EL2_PS_SHIFT)
#define VTCR_EL2_PS_48BIT (0x5UL << VTCR_EL2_PS_SHIFT)
+#define VTCR_EL2_DS_SHIFT 32
+#define VTCR_EL2_DS (0x1UL << VTCR_EL2_DS_SHIFT)
/* VTTBR_EL2 - Virtualization Translation Table Base Register */
#define VTTBR_VMID_MASK 0xffff000000000000
diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h
index d604f705e596..c9552ebc326a 100644
--- a/sys/arm64/include/pmap.h
+++ b/sys/arm64/include/pmap.h
@@ -127,6 +127,8 @@ extern struct pmap kernel_pmap_store;
extern vm_offset_t virtual_avail;
extern vm_offset_t virtual_end;
+extern pt_entry_t pmap_sh_attr;
+
/*
* Macros to test if a mapping is mappable with an L1 Section mapping
* or an L2 Large Page mapping.
diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c
index 164ff65cfe2c..80d985241c69 100644
--- a/sys/arm64/vmm/vmm_arm64.c
+++ b/sys/arm64/vmm/vmm_arm64.c
@@ -396,6 +396,14 @@ vmmops_modinit(int ipinum)
#ifdef SMP
el2_regs.vtcr_el2 |= VTCR_EL2_SH0_IS;
#endif
+ /*
+ * If FEAT_LPA2 is enabled in the host then we need to enable it here
+ * so the page tables created by pmap.c are correct. The meaning of
+ * the shareability field changes to become address bits when this
+ * is set.
+ */
+ if ((READ_SPECIALREG(tcr_el1) & TCR_DS) != 0)
+ el2_regs.vtcr_el2 |= VTCR_EL2_DS;
smp_rendezvous(NULL, arm_setup_vectors, NULL, &el2_regs);
From nobody Thu Sep 5 12:48:04 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzzfr5GGfz5Vyhr;
Thu, 05 Sep 2024 12:48:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzzfr4lfCz4K86;
Thu, 5 Sep 2024 12:48:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725540484;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gqGzRd5O0D7w8PHoaPcMzfzfqSL0ubY5fb7o4eIRrsg=;
b=SXrWmnhJRoRbCOi8jc0+cCOrSwrb/KaaSI2ZjvQGXLgJQDXbGoyjzqNL2dmomXTN6gI8P3
6KcTFaUPf2/J4/35vT2idUpUz43aMdTEzZlqcW1VHydn0HORdzSz1UXjz0phBhLqNWguZs
D0IMpFGjIMCR4S//ALRfBo7V9xN2Il4pp0wUsaMHEMnQcEyJsA9Y1RRadm5aD3iZPfReDm
e91deJNKLpQwx3T03MI+SzIRCj1+IcAZ3/tfZvB2si5/niPqE5qdyM7Nhq6FZn61tREg14
v7iao+x6CmOG9zCaBUTTHXVYstIo5j7Iw++ckSYd35rpHyFBfmBaXLFHwyQltA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725540484; a=rsa-sha256; cv=none;
b=FlP8UFVMZEjOuikCS+JYxX4tCaKUfnem7A8B/BxzhQ554BTTbmR1fZrukMW1l9XHSfDmcN
VN/o9fXKlUWcEPlepmohsTdYaG8qoNwMgufRFxYqtB6Bo70WkGHwl8HTTaqpibx4/TZ86X
1nUiH6mwAEI0GSJ9oBSV7IBRFSPOwgnUInsAGJwg/oAq98JVn/+3yG/4xJuuD91a/Z347E
+bOskW/NEjUpUmzdXxNV+Bh7o5dLvByrISIl20aw7wC4SxjZhQYV+1UZzNrJSIxsS8kldn
XtwZKmu/gqbopbfIfzkLcziRQ7CPNH5vNhN52GQFahMPJcX20H4xnzRqEiS8UQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725540484;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gqGzRd5O0D7w8PHoaPcMzfzfqSL0ubY5fb7o4eIRrsg=;
b=Ca82Z1/ASeSN5fkwzlSL0WF8bUG3TTmptKKEXpMEVjSqYXjfjxQLceWAxflqpW8BjTTf6H
ZJdCGdn3APo9Z0gYxBQM7Xs5OpQ4DuPz/0B8qUfpaJE3YCVBwj1/yVW4k0Aa13ir01ijzL
0Zk+WvB47zu0glolZ3Br1mK+giQgUN3dqasK/Web261+gnNpFY1SJLG5lyhVDqN7vCxIN1
VZ6hSE0I2lI/Y3xPgv1UZhtD8qYdvOn+wjigPlHojjQGTiyj3kZk2HmvNCyE/hqgEs27uK
bHn4kI0qBU42u+/clNa55fI0SNaIkSy3WVP/D1nqXqVg0NaX1ERhrZNPUxeGvg==
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 4Wzzfr4Lw2z17RZ;
Thu, 5 Sep 2024 12:48:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 485Cm4M1063075;
Thu, 5 Sep 2024 12:48:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485Cm4kx063072;
Thu, 5 Sep 2024 12:48:04 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 12:48:04 GMT
Message-Id: <202409051248.485Cm4kx063072@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: git: f5c7feee7129 - main - LinuxKPI: add general
module_driver(), use it for module_pci_driver()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bz
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f5c7feee7129dc88a2e5dc3ce0a075cb5e4f534a
Auto-Submitted: auto-generated
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=f5c7feee7129dc88a2e5dc3ce0a075cb5e4f534a
commit f5c7feee7129dc88a2e5dc3ce0a075cb5e4f534a
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-08-28 14:21:33 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-09-05 12:46:21 +0000
LinuxKPI: add general module_driver(), use it for module_pci_driver()
Factor out module_pci_driver() from 366d68f283793 into a general
module_driver() so other bus attachments can also use the same kind
of macro without duplicating all the lines.
Redefine module_pci_driver() using the new general macro.
No functional changes intended.
Sponsored by: The FreeBSD Foundation
MFC after: 3 days
Reviewed by: manu
Differential Revision: https://reviews.freebsd.org/D46467
---
.../linuxkpi/common/include/linux/device/driver.h | 33 ++++++++++++++++++++++
sys/compat/linuxkpi/common/include/linux/pci.h | 21 ++------------
2 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/device/driver.h b/sys/compat/linuxkpi/common/include/linux/device/driver.h
new file mode 100644
index 000000000000..03b510c9c8b7
--- /dev/null
+++ b/sys/compat/linuxkpi/common/include/linux/device/driver.h
@@ -0,0 +1,33 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2021 Bjoern A. Zeeb
+ * Copyright (c) 2024 The FreeBSD Foundation
+ *
+ * Portions of this software were developed by Björn Zeeb
+ * under sponsorship from the FreeBSD Foundation.
+ */
+
+#ifndef LINUXKPI_LINUX_DEVICE_DRIVER_H
+#define LINUXKPI_LINUX_DEVICE_DRIVER_H
+
+#include <sys/cdefs.h>
+#include <linux/module.h>
+
+#define module_driver(_drv, _regf, _unregf) \
+static inline int \
+__CONCAT(__CONCAT(_, _drv), _init)(void) \
+{ \
+ return (_regf(&(_drv))); \
+} \
+ \
+static inline void \
+__CONCAT(__CONCAT(_, _drv), _exit)(void) \
+{ \
+ _unregf(&(_drv)); \
+} \
+ \
+module_init(__CONCAT(__CONCAT(_, _drv), _init)); \
+module_exit(__CONCAT(__CONCAT(_, _drv), _exit))
+
+#endif /* LINUXKPI_LINUX_DEVICE_DRIVER_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
index 9457599d31d3..36b970154ad2 100644
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -36,6 +36,7 @@
#define CONFIG_PCI_MSI
#include <linux/types.h>
+#include <linux/device/driver.h>
#include <sys/param.h>
#include <sys/bus.h>
@@ -274,24 +275,8 @@ extern spinlock_t pci_lock;
#define __devexit_p(x) x
-#define module_pci_driver(_driver) \
- \
-static inline int \
-_pci_init(void) \
-{ \
- \
- return (linux_pci_register_driver(&_driver)); \
-} \
- \
-static inline void \
-_pci_exit(void) \
-{ \
- \
- linux_pci_unregister_driver(&_driver); \
-} \
- \
-module_init(_pci_init); \
-module_exit(_pci_exit)
+#define module_pci_driver(_drv) \
+ module_driver(_drv, linux_pci_register_driver, linux_pci_unregister_driver)
struct msi_msg {
uint32_t data;
From nobody Thu Sep 5 13:52:39 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X015S59Csz5W5W6;
Thu, 05 Sep 2024 13:52:44 +0000 (UTC)
(envelope-from markjdb@gmail.com)
Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d])
(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 4X015S3DMSz4RxP;
Thu, 5 Sep 2024 13:52:44 +0000 (UTC)
(envelope-from markjdb@gmail.com)
Authentication-Results: mx1.freebsd.org;
none
Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-4568fe680a3so4560391cf.0;
Thu, 05 Sep 2024 06:52:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1725544363; x=1726149163; darn=freebsd.org;
h=in-reply-to:content-transfer-encoding:content-disposition
:mime-version:references:message-id:subject:cc:to:from:date:sender
:from:to:cc:subject:date:message-id:reply-to;
bh=5bGZGb3RXiGbV05JoZAS8d6zNmB36tSHn18H6zLiLQI=;
b=MVlTm3lq73WvnysmXNVQBKYJx6XTWV+7DmVhntoNLBgflWwMWgXwXliUIwwWRLdW7X
tSTn0d6LC4zt/8OQJVCHqOvBkOEABA+sVxt1m9A9Sdpn3HdSxV+EPV3RoWsgisfw9i/k
iwpuePzwyXQltB/7v63Adke65QScI078F65J4umV3aFVhYQfFpU5MUkk1L1wANHhRRYe
W4837/b1wwdbmGafulE77pNY790D/UeEVbTDS7zJhKx6RFx29sYCwY837XWwwrMBL6bd
ppXSOLNXd2XTJG9okpa92HAAdGcSYNlKkaHOh2EKr1GKSrUsjO1Z+f0ldvi57xD9yECz
gs7w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1725544363; x=1726149163;
h=in-reply-to:content-transfer-encoding:content-disposition
:mime-version:references:message-id:subject:cc:to:from:date:sender
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=5bGZGb3RXiGbV05JoZAS8d6zNmB36tSHn18H6zLiLQI=;
b=Y16jbff3X1lGojSzBZ94hIBww35sBHmKDv0kl86A73qANS24K3nh1Pdy1RKAk+DHmZ
kIR7gdhuGOAFVwYXjYPzEBSE+P2l7zMMMglXsbldYSWU95AgL+kjKHkxyRRvPk1RhVkm
SxH1joyb7P/CG+Vf/h+cMeAERnPD1+u+ITzVU7g97xUlTHOLK/AzTCtXHkQsi2kQna7P
Qfp/GXysgB7Tm7Q/4s+mqcB+dOlB5UOogvw5x4nETtZsxyVRdjCulSLr0xyGVCHujloK
HwHT2qY2T1vlkRWeFpvexmCqKlNYEAGgwc9NhdLkyr2bF2+GbMIGdhsGe1x5Hs00etT3
Gw5w==
X-Forwarded-Encrypted: i=1; AJvYcCWUM5tL5juRSbSOXLtI/q3rdwiVcqYSZ14yzSIWsKGqQUrZBqURO13SnoNrTqIQopRIN/OAEzFqkeYf61R/Ucluux/i@freebsd.org, AJvYcCXXnv/ioQOVejbRS8zcMZzS8OipMcavQpafyjnHsM6FPKT1kT7YQXK6s+xVIBNo089JFcLx9sIYw0yxEjzC6B73+0AdU7A=@freebsd.org
X-Gm-Message-State: AOJu0YyIxECNSClefVbteHc5nyyNzBNxiIo+wFwrGDEdJ7jEY4LnjLqU
jpHww1JCVa10o03ftP+M4SgvN6mcXjdRDHHkxQPUS21UchsJ2uXJMHJecw==
X-Google-Smtp-Source: AGHT+IHotTQe97zQ/ZPfltjQI7ImY1seepUSm1ABLTByQnCzaGtpFl/Duony74ss6KAEj8QuKmkBkg==
X-Received: by 2002:a05:622a:6103:b0:457:cb51:2cd4 with SMTP id d75a77b69052e-457e2f51ff2mr102026961cf.45.1725544362502;
Thu, 05 Sep 2024 06:52:42 -0700 (PDT)
Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237])
by smtp.gmail.com with ESMTPSA id d75a77b69052e-45801b31e67sm7262511cf.21.2024.09.05.06.52.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 05 Sep 2024 06:52:41 -0700 (PDT)
Date: Thu, 5 Sep 2024 09:52:39 -0400
From: Mark Johnston <markj@freebsd.org>
To: John Baldwin <jhb@freebsd.org>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Subject: Re: git: fc12c191c087 - main - grep: Default to -p instead of -S.
Message-ID: <Ztm3p2OJmtVA4_66@nuc>
References: <202409041953.484JrvPY028856@gitrepo.freebsd.org>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <202409041953.484JrvPY028856@gitrepo.freebsd.org>
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]
X-Rspamd-Queue-Id: 4X015S3DMSz4RxP
On Wed, Sep 04, 2024 at 07:53:57PM +0000, John Baldwin wrote:
> The branch main has been updated by jhb:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=fc12c191c087b63e1204fee210ba76082ea40b96
>
> commit fc12c191c087b63e1204fee210ba76082ea40b96
> Author: John Baldwin <jhb@FreeBSD.org>
> AuthorDate: 2024-09-04 19:53:22 +0000
> Commit: John Baldwin <jhb@FreeBSD.org>
> CommitDate: 2024-09-04 19:53:22 +0000
>
> grep: Default to -p instead of -S.
>
> This matches the documented behavior in the manpage as well as the
> default behavior on macOS.
Should this get a RELNOTES entry?
>
> PR: 280676
> Reported by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
> Reviewed by: kevans
> MFC after: 1 week
> Differential Revision: https://reviews.freebsd.org/D46256
> ---
> usr.bin/grep/grep.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
> index 9f960f74dbb6..feaf17d7c1e1 100644
> --- a/usr.bin/grep/grep.c
> +++ b/usr.bin/grep/grep.c
> @@ -112,7 +112,7 @@ int binbehave = BINFILE_BIN; /* -aIU: handling of binary files */
> int filebehave = FILE_STDIO;
> int devbehave = DEV_READ; /* -D: handling of devices */
> int dirbehave = DIR_READ; /* -dRr: handling of directories */
> -int linkbehave = LINK_READ; /* -OpS: handling of symlinks */
> +int linkbehave = LINK_SKIP; /* -OpS: handling of symlinks */
>
> bool dexclude, dinclude; /* --exclude-dir and --include-dir */
> bool fexclude, finclude; /* --exclude and --include */
From nobody Thu Sep 5 13:55:16 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X018P21gWz5W5k1;
Thu, 05 Sep 2024 13:55: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 4X018P0Gx3z4SV8;
Thu, 5 Sep 2024 13:55:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725544517;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Ls/DmXVd3+Z4YxWmEUaKZrWE4jUNNZV7G94lEEBTKeA=;
b=QhBUAF+aEYWxXAzv+v+WLd0s5V1CVRPnONoCNZ7xorrX89RDJYokOZ45C0rids/M++MloV
mS7jupeHCT8UOnf5qXn0mlNMWkO+QZB2IQ1kGvrtVFJelH6/SzpXfRPVzOrrs8LPQAE/fE
9Val5Xn0pdS5Q9OLbPOBY1+Y8ue1EsE3/yrWlp1COfffQeR/EIKurXppLDtkIPxHritLgn
0+VmJoPAexesELlgUScQuWSI0084ZDwupVWqJ+D6eF+6ROmDuv6u1dHMnFh9YGKOo/q7xL
haEHeyMZeUM8KwWaDTBBKpl6qk8x6fREtN8aZ4MhQumCh8a8Pw/REBDAxy7DkQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725544517; a=rsa-sha256; cv=none;
b=PxauKwk0ERmlhbRmWXHP3LmRz/4sS5Va/eTK8q8CStPpl1nupOUUfOiEZ7N4wPJxU5yrEN
e8K4QCpA6xNpvFL1OOXrwimFolPO/sSAXrr6cGTLVBHN6r7Xf5Dzhxhvmjvk8zOHxjIG0I
odydibC1TasIirRKkQc7dg5Ln6wqYCAOG5JqPxs6Cupb94Szt0hD4/RUCmsmV2OuBpwonY
fsj8CcSAdKugu9v1fLzaLrC3dZw2x4BoW7gLSuTrldc1+KbvN3lpo45OuqG2JALeSizpj3
rrdKIWeKQaKtMOH07hGkzc3dynGaU/3ms/x3+/OudflwD48ICGlXMwSIYbaYTw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725544517;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Ls/DmXVd3+Z4YxWmEUaKZrWE4jUNNZV7G94lEEBTKeA=;
b=oG4aTXxFHfAGfXcCI0lvvCb9fFxlIwjcmnmF1wOymL09GxMi1toUbW5pNn7SebPxJjSsFT
+aZtuL7jJEVSb0zsZgraI9TLVMuD0xFIw486BFrydmXXhT/WZJApZo32hPpHUr41ttSawa
9z3uG7aTp6/hYbSRf6cBfT3mzl5WhXD+Ec9mu3UXLucNav2dW6kIcY8XaC+MwidQNiNLEh
N9xYl8Iw26Igj/C25qF3AohXcBm1FyldLdaSMdIkN+MNHuY85/TOA7Nw9ElYe1Jcuirp5C
LoLQtnaF4rR/iARb3aVu2vAnfprSY/H5PgSUtnVbD9DZXyQne01UsMh0UoVyzg==
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 4X018N70Btz19cl;
Thu, 5 Sep 2024 13:55: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 485DtGfD081558;
Thu, 5 Sep 2024 13:55:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485DtGuQ081555;
Thu, 5 Sep 2024 13:55:16 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 13:55:16 GMT
Message-Id: <202409051355.485DtGuQ081555@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Tom Jones <thj@FreeBSD.org>
Subject: git: d8fffc3704a0 - main - imx_gpio: Add gpio compat string
for imx8 SOCs
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: thj
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: d8fffc3704a0d7f4ea5b866f689e58480ddebaa1
Auto-Submitted: auto-generated
The branch main has been updated by thj:
URL: https://cgit.FreeBSD.org/src/commit/?id=d8fffc3704a0d7f4ea5b866f689e58480ddebaa1
commit d8fffc3704a0d7f4ea5b866f689e58480ddebaa1
Author: Tom Jones <thj@FreeBSD.org>
AuthorDate: 2024-09-04 15:32:56 +0000
Commit: Tom Jones <thj@FreeBSD.org>
CommitDate: 2024-09-05 13:51:37 +0000
imx_gpio: Add gpio compat string for imx8 SOCs
Several imx8* device trees have a compatible gpio controller which
identifies as working with the soc and imx35-gpio.
Add a compat string for the commonly included 'imx35-gpio', rather than
adding each to the table.
From a grep of our dts mirror this includes the following arm64 SOCs:
- imx8dxl
- imx8mm
- imx8mn
- imx8mp
- imx8mq
- imx8qm
- imx8qxp
Reviewed by: manu
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46532
---
sys/arm/freescale/imx/imx_gpio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/arm/freescale/imx/imx_gpio.c b/sys/arm/freescale/imx/imx_gpio.c
index c5e92992a36b..7610d28af90e 100644
--- a/sys/arm/freescale/imx/imx_gpio.c
+++ b/sys/arm/freescale/imx/imx_gpio.c
@@ -134,6 +134,7 @@ static struct ofw_compat_data compat_data[] = {
{"fsl,imx6q-gpio", 1},
{"fsl,imx53-gpio", 1},
{"fsl,imx51-gpio", 1},
+ {"fsl,imx35-gpio", 1},
{NULL, 0}
};
From nobody Thu Sep 5 15:12:13 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X02s92vrhz5WD3q;
Thu, 05 Sep 2024 15:12: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 4X02s92Rydz4g3R;
Thu, 5 Sep 2024 15:12:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725549133;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=w/B7D1QXAJXsRZTxsoNGl+t8dZbrmFgtXXIocxvFGas=;
b=DmNafO5/oYC09WkdZQsCZHgosJb2UkItPUcaXBP0y+2ClJFkhimEnr19ocA4OJttUBWX+k
/fxY8DH6UzqTXsT2Im6uykDdHcl5Fs2zxSRSqtURNzRwhmOddb87T2PZhMRVwYYG/zU9wJ
nKXWBLMp0KOOeuSVuokvDH6gstH+fX0jTPz9ZtV+FbR6TyZLCcY3wY4zATlAIuS/GkF0Sh
seUzc3ViSdGiKeTSUGhezU+qoRPiNm2XJfyAvVKeTXlXN13PGBDf2F9HG6ZChvDrbjOK8l
I7MOr8C+hJ/dflKyCfpcA8sJHurEEYYaRm9dQu+NSwv8NHWEcCPeySo/WtEduA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725549133; a=rsa-sha256; cv=none;
b=oPz9sFnzYK9TveVttcQv8c2BZZkxygEk9HOJelEN2+oi3Wggxbcd+t2LnfosF7rLCepyHF
98dtt/7SFVeGymWOafqmT4FyzTAwZH56OyWZrXvghLyr6D/SSoSEdHyXirT+jdq3iE+fQc
6ltPC2pieIf+BSCMK9P5W/QIhoJBy9kjtbTFrw/LKtei+GesBxpD5D6nBTD94WBXlJyeRa
vsI5EZarBXzKRrhIDyNjHXkQY0SP8Qz6wSXt1djE3FTKxZf6U78pqebXMnG8b09pAoqFz2
ASZZVGntGfx/0QFp5bmh3L3VOnKyt7Vo3WTyRbVSGeBC0OGa8CEPmXWtVY0OlA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725549133;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=w/B7D1QXAJXsRZTxsoNGl+t8dZbrmFgtXXIocxvFGas=;
b=XTMvySf7YjiMxLJrdCtg5/A6iKgSes6eoeIk4J+MadQVXnCvj0IZcrsYUpJcSWVydf2PtJ
V0P5K/xhOiBgVEd7DXxsqvoZAUQe/ww5eysfBnShjNRDW0AT0q/aW4oyhYqB5HP1VLjFIE
m4xliJT9Xr+8aH7PlmFxBLBLIZnq60jLR/1AsRI6z9wGt4k2vQ9jSXI30ZAL0J7ZXPSuh6
vT+h3mdVIEO9nsleHcdz+QKPgsfHPEWYywJK0QBcu14bI1XBUVIlFY4pKIjBMILA3cWtK8
i6LGZzjCleQziqVihR3qw9POEbXWLD9M/EZryFxhR0oteFl5xlSlzoLqo4kXpQ==
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 4X02s923HMz1C7p;
Thu, 5 Sep 2024 15:12: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 485FCDWN015588;
Thu, 5 Sep 2024 15:12:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485FCDEA015578;
Thu, 5 Sep 2024 15:12:13 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 15:12:13 GMT
Message-Id: <202409051512.485FCDEA015578@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alan Somers <asomers@FreeBSD.org>
Subject: git: fe1755fa6bb4 - main - ctl: add tests for START STOP
UNIT
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: asomers
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: fe1755fa6bb4039c1e00f5226c473a024685005b
Auto-Submitted: auto-generated
The branch main has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=fe1755fa6bb4039c1e00f5226c473a024685005b
commit fe1755fa6bb4039c1e00f5226c473a024685005b
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-08-23 20:51:32 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2024-09-05 15:09:41 +0000
ctl: add tests for START STOP UNIT
MFC after: 2 weeks
Sponsored by: Axcient
Reviewed by: emaste, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1409
---
tests/sys/cam/ctl/Makefile | 5 +-
tests/sys/cam/ctl/ctl.subr | 94 ++++++++++++++++++++++
tests/sys/cam/ctl/read_buffer.sh | 72 +++--------------
tests/sys/cam/ctl/start_stop_unit.sh | 150 +++++++++++++++++++++++++++++++++++
4 files changed, 257 insertions(+), 64 deletions(-)
diff --git a/tests/sys/cam/ctl/Makefile b/tests/sys/cam/ctl/Makefile
index 0e6f39a1a56f..1b857bb0c291 100644
--- a/tests/sys/cam/ctl/Makefile
+++ b/tests/sys/cam/ctl/Makefile
@@ -2,9 +2,12 @@ PACKAGE= tests
TESTSDIR= ${TESTSBASE}/sys/cam/ctl
+${PACKAGE}FILES+= ctl.subr
+
ATF_TESTS_SH+= read_buffer
+ATF_TESTS_SH+= start_stop_unit
# Must be exclusive because it disables/enables camsim
-TEST_METADATA.read_buffer+= is_exclusive="true"
+TEST_METADATA+= is_exclusive="true"
.include <bsd.test.mk>
diff --git a/tests/sys/cam/ctl/ctl.subr b/tests/sys/cam/ctl/ctl.subr
new file mode 100644
index 000000000000..18991e0fa144
--- /dev/null
+++ b/tests/sys/cam/ctl/ctl.subr
@@ -0,0 +1,94 @@
+# vim: filetype=sh
+
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2024 Axcient
+# 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 DOCUMENTATION IS PROVIDED BY THE AUTHOR ``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 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.
+
+load_modules() {
+ if ! kldstat -q -m ctl; then
+ kldload ctl || atf_skip "could not load ctl kernel mod"
+ fi
+ if ! ctladm port -o on -p 0; then
+ atf_skip "could not enable the camsim frontend"
+ fi
+}
+
+find_device() {
+ LUN=$1
+
+ # Rescan camsim
+ # XXX camsim doesn't update when creating a new device. Worse, a
+ # rescan won't look for new devices. So we must disable/re-enable it.
+ # Worse still, enabling it isn't synchronous, so we need a retry loop
+ # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281000
+ retries=5
+ ctladm port -o off -p 0 >/dev/null
+ ctladm port -o on -p 0 >/dev/null
+ HEXLUN=`printf %x $LUN`
+ while true; do
+ dev=`camcontrol devlist | awk -v lun=$HEXLUN '/FREEBSD CTL/ && $9==lun {split($10, fields, /[,]/); print fields[1];}' | sed 's:[()]::'`
+ if [ -z "$dev" -o ! -c /dev/$dev ]; then
+ retries=$(( $retries - 1 ))
+ if [ $retries -eq 0 ]; then
+ cat lun-create.txt
+ camcontrol devlist
+ atf_fail "Could not find GEOM device"
+ fi
+ sleep 0.1
+ continue
+ fi
+ break
+ done
+ # Ensure that it's actually ready. camcontrol may report the disk's
+ # ident before it's actually ready to receive commands. Maybe that's
+ # because all of the GEOM providers must probe it?
+ while true; do
+ dd if=/dev/$dev bs=4096 count=1 of=/dev/null >/dev/null 2>/dev/null && break
+ retries=$(( $retries - 1 ))
+ if [ $retries -eq 0 ]; then
+ atf_fail "Device never became ready"
+ fi
+ sleep 0.1
+ done
+}
+
+# Create a CTL LUN
+create_ramdisk() {
+ EXTRA_ARGS=$*
+
+ atf_check -o save:lun-create.txt ctladm create -b ramdisk -s 1048576 $EXTRA_ARGS
+ atf_check egrep -q "LUN created successfully" lun-create.txt
+ LUN=`awk '/LUN ID:/ {print $NF}' lun-create.txt`
+ if [ -z "$LUN" ]; then
+ atf_fail "Could not find LUN id"
+ fi
+ find_device $LUN
+}
+
+cleanup() {
+ if [ -e "lun-create.txt" ]; then
+ lun_id=`awk '/LUN ID:/ {print $NF}' lun-create.txt`
+ ctladm remove -b ramdisk -l $lun_id > /dev/null
+ fi
+}
diff --git a/tests/sys/cam/ctl/read_buffer.sh b/tests/sys/cam/ctl/read_buffer.sh
index 4a84eb6b9725..e54b0dadc134 100644
--- a/tests/sys/cam/ctl/read_buffer.sh
+++ b/tests/sys/cam/ctl/read_buffer.sh
@@ -28,61 +28,7 @@
# * Buffer ID other than 0. We don't support those.
# * The Mode Specific field. We don't support it.
-load_modules() {
- if ! kldstat -q -m ctl; then
- kldload ctl || atf_skip "could not load ctl kernel mod"
- fi
- if ! ctladm port -o on -p 0; then
- atf_skip "could not enable the camsim frontend"
- fi
-}
-
-find_da_device() {
- SERIAL=$1
-
- # Rescan camsim
- # XXX camsim doesn't update when creating a new device. Worse, a
- # rescan won't look for new devices. So we must disable/re-enable it.
- # Worse still, enabling it isn't synchronous, so we need a retry loop
- # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281000
- retries=5
- ctladm port -o off -p 0 >/dev/null
- ctladm port -o on -p 0 >/dev/null
- while true; do
-
- # Find the corresponding da device
- da=`geom disk list | awk -v serial=$SERIAL ' /Geom name:/ { devname=$NF } /ident:/ && $NF ~ serial { print devname; exit } '`
- if [ -z "$da" ]; then
- retries=$(( $retries - 1 ))
- if [ $retries -eq 0 ]; then
- cat lun-create.txt
- geom disk list
- atf_fail "Could not find da device"
- fi
- sleep 0.1
- continue
- fi
- break
- done
-}
-
-# Create a CTL LUN
-create_ramdisk() {
- atf_check -o save:lun-create.txt ctladm create -b ramdisk -s 1048576
- atf_check egrep -q "LUN created successfully" lun-create.txt
- SERIAL=`awk '/Serial Number:/ {print $NF}' lun-create.txt`
- if [ -z "$SERIAL" ]; then
- atf_fail "Could not find serial number"
- fi
- find_da_device $SERIAL
-}
-
-cleanup() {
- if [ -e "lun-create.txt" ]; then
- lun_id=`awk '/LUN ID:/ {print $NF}' lun-create.txt`
- ctladm remove -b ramdisk -l $lun_id > /dev/null
- fi
-}
+. $(atf_get_srcdir)/ctl.subr
atf_test_case basic cleanup
basic_head()
@@ -98,10 +44,10 @@ basic_body()
# Write to its buffer
cp /etc/passwd input
len=`wc -c input | cut -wf 2`
- atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$da
+ atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$dev
# Read it back
- atf_check -o save:output sg_read_buffer --mode data -l $len --raw /dev/$da
+ atf_check -o save:output sg_read_buffer --mode data -l $len --raw /dev/$dev
# And verify
if ! diff -q input output; then
@@ -126,7 +72,7 @@ desc_body()
{
create_ramdisk
- atf_check -o inline:" 00 00 04 00 00\n" sg_read_buffer --hex --mode desc /dev/$da
+ atf_check -o inline:" 00 00 04 00 00\n" sg_read_buffer --hex --mode desc /dev/$dev
}
desc_cleanup()
{
@@ -147,10 +93,10 @@ length_body()
# Write to its buffer
atf_check -o ignore -e ignore dd if=/dev/random of=input bs=4096 count=1
atf_check -o ignore -e ignore dd if=input bs=2048 count=1 of=expected
- atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$da
+ atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$dev
# Read it back
- atf_check -o save:output sg_read_buffer --mode data -l 2048 --raw /dev/$da
+ atf_check -o save:output sg_read_buffer --mode data -l 2048 --raw /dev/$dev
# And verify
if ! diff -q expected output; then
@@ -176,10 +122,10 @@ offset_body()
# Write to its buffer
atf_check -o ignore -e ignore dd if=/dev/random of=input bs=4096 count=1
atf_check -o ignore -e ignore dd if=input iseek=2 bs=512 count=1 of=expected
- atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$da
+ atf_check -o ignore sg_write_buffer --mode data --in=input /dev/$dev
# Read it back
- atf_check -o save:output sg_read_buffer --mode data -l 512 -o 1024 --raw /dev/$da
+ atf_check -o save:output sg_read_buffer --mode data -l 512 -o 1024 --raw /dev/$dev
# And verify
if ! diff -q expected output; then
@@ -203,7 +149,7 @@ uninitialized_body()
create_ramdisk
# Read an uninitialized buffer
- atf_check -o save:output sg_read_buffer --mode data -l 262144 --raw /dev/$da
+ atf_check -o save:output sg_read_buffer --mode data -l 262144 --raw /dev/$dev
# And verify
atf_check -o ignore -e ignore dd if=/dev/zero bs=262144 count=1 of=expected
diff --git a/tests/sys/cam/ctl/start_stop_unit.sh b/tests/sys/cam/ctl/start_stop_unit.sh
new file mode 100644
index 000000000000..163011c8f574
--- /dev/null
+++ b/tests/sys/cam/ctl/start_stop_unit.sh
@@ -0,0 +1,150 @@
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2024 Axcient
+# 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 DOCUMENTATION IS PROVIDED BY THE AUTHOR ``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 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.
+
+. $(atf_get_srcdir)/ctl.subr
+
+# TODO:
+# * format layer
+# * IMM bit
+# * LOEJ
+# * noflush
+# * power conditions
+
+# Not Tested
+# * Power Condition Modifier (not implemented in CTL)
+
+atf_test_case eject cleanup
+eject_head()
+{
+ atf_set "descr" "START STOP UNIT can eject a CDROM device"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_start sg_readcap
+}
+eject_body()
+{
+ # -t 5 for CD/DVD device type
+ create_ramdisk -t 5
+
+ # Verify that the device is online
+ # Too bad I don't know of any other way to check that it's stopped but
+ # by using sg_readcap.
+ atf_check -o ignore -e not-match:"Device not ready" sg_readcap /dev/$dev
+
+ # eject the device
+ atf_check sg_start --eject /dev/$dev
+
+ # Ejected, it should now return ENXIO
+ atf_check -s exit:1 -o ignore -e match:"Device not configured" dd if=/dev/$dev bs=4096 count=1 of=/dev/null
+}
+eject_cleanup()
+{
+ cleanup
+}
+
+atf_test_case load cleanup
+load_head()
+{
+ atf_set "descr" "START STOP UNIT can load a CDROM device"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_start sg_readcap
+}
+load_body()
+{
+ # -t 5 for CD/DVD device type
+ create_ramdisk -t 5
+
+ # eject the device
+ atf_check sg_start --eject /dev/$dev
+
+ # Verify that it's offline it should now return ENXIO
+ atf_check -s exit:1 -o ignore -e match:"Device not configured" dd if=/dev/$dev bs=4096 count=1 of=/dev/null
+
+ # Load it again
+ atf_check sg_start --load /dev/$dev
+
+ atf_check -o ignore -e ignore dd if=/dev/$dev bs=4096 count=1 of=/dev/null
+ atf_check -o ignore -e not-match:"Device not ready" sg_readcap /dev/$dev
+}
+load_cleanup()
+{
+ cleanup
+}
+
+atf_test_case start cleanup
+start_head()
+{
+ atf_set "descr" "START STOP UNIT can start a device"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_start sg_readcap
+}
+start_body()
+{
+ create_ramdisk
+
+ # stop the device
+ atf_check sg_start --stop /dev/$dev
+
+ # And start it again
+ atf_check sg_start /dev/$dev
+
+ # Now sg_readcap should succeed. Too bad I don't know of any other way
+ # to check that it's stopped.
+ atf_check -o ignore -e not-match:"Device not ready" sg_readcap /dev/$dev
+}
+start_cleanup()
+{
+ cleanup
+}
+
+atf_test_case stop cleanup
+stop_head()
+{
+ atf_set "descr" "START STOP UNIT can stop a device"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_start sg_readcap
+}
+stop_body()
+{
+ create_ramdisk
+
+ # Stop the device
+ atf_check sg_start --stop /dev/$dev
+
+ # Now sg_readcap should fail. Too bad I don't know of any other way to
+ # check that it's stopped.
+ atf_check -s exit:2 -e match:"Device not ready" sg_readcap /dev/$dev
+}
+stop_cleanup()
+{
+ cleanup
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case eject
+ atf_add_test_case load
+ atf_add_test_case start
+ atf_add_test_case stop
+}
From nobody Thu Sep 5 15:12:14 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X02sB47GBz5WCvq;
Thu, 05 Sep 2024 15:12: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 4X02sB36GLz4gGF;
Thu, 5 Sep 2024 15:12:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725549134;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=rawcZ0RxdRkJwhCptafO1Sro+9yzImmQpxnt9HULBY0=;
b=mKwjQVEFD+MAPp4g8AQRUO9fgjhNhFR2DUVNptQbxSk8Qjsx1ciVps48lreAvvMKuZQRPU
ndt5S/V6QsHTfl01KtWwVjeHmYI7vg2B+3UgsrZF6T5WRf4HQkZHeFCoIxuMLn1rjyA5I0
A/kL/ECXMFKGQx+wjigHGiPxWJ/lrU62x1MBrFaQSJVMD+SWqat2zj1/lRGB+xLb1syCok
rm9kuHn/eYWud3+vJ1ItiTnbhpqk1MoyxTM6EvGZSGUd5pOAFoeMvHHLVf8lIyVwgzzHXV
ItzK9ez9rzELfnjwLr+xYsSptA1S52Im9qgiwnYugLBPaJLPUCAwzW+xEziLzA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725549134; a=rsa-sha256; cv=none;
b=AC19CNnXpNcB8YRryS1278IEJJ7X0oJGC2OWPELKegdytzhDJz1/uJ5hux0ld8vAQXF2UC
mvQWAcPL2cMyZz28OR3KOnfLbKKPGBAWgnhC8pH7E2YTSs+unP9SNEHgkO6e6s5u8pLDVZ
HDz3Eka7N5gLhrjNz2t3M5O4eEnL4jDXyTtKijJKkNAavz+O0zeJiDBSZvwwyJr0QhWc8l
le3xYwR8itZ+lVzaObaE2qbHVt2BrpFDd3Q2u4PyHPapDadAOKMzAev8DTfsVmo5mPxarh
R28KncfTea5lrN0KeBes+s5ALHxDS8AG0AoA/91+LWNkcFVk9AHrDdB7sB/Z5g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725549134;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=rawcZ0RxdRkJwhCptafO1Sro+9yzImmQpxnt9HULBY0=;
b=FHAdusw6adtNrkw0T7XZau4FXnL4B8ODAsBNu5HOOVfPYnsazQ+xva1fk/yY0j2zQ+1bSx
ZWigzC0jwf/N9xgWMulJnprUUz38VJbI1gYFSDzKgaQHf6/TmD8FHoiDe75NzNKIRUKqun
r6ImEN0SR0E5wea/5Pu+5KJnLFvUkAJJK1LQzHbDDTK4UZgCzucFUhNzweZ2gTXa56iRIM
xW2y4lK9LEUedn13taszL0k76uXNf6guqjzE+LMGtxn8z3kAi4hzDWFEAO/N0zrWMZZLRy
DuO4oHmtau/0yH7I6RGKl3bfTAMIbvcg19/7FLNR6yBpeynjPfg0nUwZN7XgIw==
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 4X02sB2kFLz1CqM;
Thu, 5 Sep 2024 15:12: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 485FCEDR016928;
Thu, 5 Sep 2024 15:12:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485FCEIG016925;
Thu, 5 Sep 2024 15:12:14 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 15:12:14 GMT
Message-Id: <202409051512.485FCEIG016925@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alan Somers <asomers@FreeBSD.org>
Subject: git: e234a72bb8c0 - main - ctl: add tests for PREVENT ALLOW
MEDIUM REMOVAL
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: asomers
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e234a72bb8c0e8e25ea8a879582e85bb2e09f096
Auto-Submitted: auto-generated
The branch main has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=e234a72bb8c0e8e25ea8a879582e85bb2e09f096
commit e234a72bb8c0e8e25ea8a879582e85bb2e09f096
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-08-26 20:01:44 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2024-09-05 15:10:09 +0000
ctl: add tests for PREVENT ALLOW MEDIUM REMOVAL
MFC after: 2 weeks
Sponsored by: Axcient
Reviewed by: emaste, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1409
---
tests/sys/cam/ctl/Makefile | 1 +
tests/sys/cam/ctl/prevent.sh | 161 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 162 insertions(+)
diff --git a/tests/sys/cam/ctl/Makefile b/tests/sys/cam/ctl/Makefile
index 1b857bb0c291..1333397af464 100644
--- a/tests/sys/cam/ctl/Makefile
+++ b/tests/sys/cam/ctl/Makefile
@@ -4,6 +4,7 @@ TESTSDIR= ${TESTSBASE}/sys/cam/ctl
${PACKAGE}FILES+= ctl.subr
+ATF_TESTS_SH+= prevent
ATF_TESTS_SH+= read_buffer
ATF_TESTS_SH+= start_stop_unit
diff --git a/tests/sys/cam/ctl/prevent.sh b/tests/sys/cam/ctl/prevent.sh
new file mode 100644
index 000000000000..a5a187dad8ff
--- /dev/null
+++ b/tests/sys/cam/ctl/prevent.sh
@@ -0,0 +1,161 @@
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2024 Axcient
+# 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 DOCUMENTATION IS PROVIDED BY THE AUTHOR ``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 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.
+
+. $(atf_get_srcdir)/ctl.subr
+
+# TODO
+# * multiple initiators may block removal
+
+# Not Tested
+# * persistent removal (not implemented in CTL)
+
+atf_test_case allow cleanup
+allow_head()
+{
+ atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL will prevent a CD from being ejected"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_prevent sg_start
+}
+allow_body()
+{
+ # -t 5 for CD/DVD device type
+ create_ramdisk -t 5
+
+ atf_check sg_prevent --prevent 1 /dev/$dev
+
+ # Now sg_start --eject should fail
+ atf_check -s exit:5 -e match:"Illegal request" sg_start --eject /dev/$dev
+
+ atf_check sg_prevent --allow /dev/$dev
+
+ # Now sg_start --eject should work again
+ atf_check -s exit:0 sg_start --eject /dev/$dev
+}
+allow_cleanup()
+{
+ cleanup
+}
+
+atf_test_case allow_idempotent cleanup
+allow_idempotent_head()
+{
+ atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL is idempotent when run from the same initiator"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_prevent sg_start
+}
+allow_idempotent_body()
+{
+ # -t 5 for CD/DVD device type
+ create_ramdisk -t 5
+
+ atf_check sg_prevent --allow /dev/$dev
+ atf_check sg_prevent --allow /dev/$dev
+ atf_check sg_prevent --prevent 1 /dev/$dev
+
+ # Even though we ran --allow twice, a single --prevent command should
+ # suffice to prevent ejecting. Multiple ALLOW/PREVENT commands from
+ # the same initiator don't have any additional effect.
+ atf_check -s exit:5 -e match:"Illegal request" sg_start --eject /dev/$dev
+}
+allow_idempotent_cleanup()
+{
+ cleanup
+}
+
+atf_test_case nonremovable cleanup
+nonremovable_head()
+{
+ atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL may not be used on non-removable media"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_prevent
+}
+nonremovable_body()
+{
+ # Create a HDD, not a CD, device
+ create_ramdisk -t 0
+
+ atf_check -s exit:9 -e match:"Invalid opcode" sg_prevent /dev/$dev
+}
+nonremovable_cleanup()
+{
+ cleanup
+}
+
+atf_test_case prevent cleanup
+prevent_head()
+{
+ atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL will prevent a CD from being ejected"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_prevent sg_start
+}
+prevent_body()
+{
+ # -t 5 for CD/DVD device type
+ create_ramdisk -t 5
+
+ atf_check sg_prevent --prevent 1 /dev/$dev
+
+ # Now sg_start --eject should fail
+ atf_check -s exit:5 -e match:"Illegal request" sg_start --eject /dev/$dev
+}
+prevent_cleanup()
+{
+ cleanup
+}
+
+atf_test_case prevent_idempotent cleanup
+prevent_idempotent_head()
+{
+ atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL is idempotent when run from the same initiator"
+ atf_set "require.user" "root"
+ atf_set "require.progs" sg_prevent sg_start
+}
+prevent_idempotent_body()
+{
+ # -t 5 for CD/DVD device type
+ create_ramdisk -t 5
+
+ atf_check sg_prevent --prevent 1 /dev/$dev
+ atf_check sg_prevent --prevent 1 /dev/$dev
+ atf_check sg_prevent --allow /dev/$dev
+
+ # Even though we ran prevent idempotent and allow only once, eject
+ # should be allowed. Multiple PREVENT commands from the same initiator
+ # don't have any additional effect.
+ atf_check sg_start --eject /dev/$dev
+}
+prevent_idempotent_cleanup()
+{
+ cleanup
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case allow
+ atf_add_test_case allow_idempotent
+ atf_add_test_case nonremovable
+ atf_add_test_case prevent
+ atf_add_test_case prevent_idempotent
+}
From nobody Thu Sep 5 15:12:15 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X02sD1McKz5WD3s;
Thu, 05 Sep 2024 15:12: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 4X02sC4kTWz4g3Y;
Thu, 5 Sep 2024 15:12:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725549135;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=g19peTucLeZgXPLIytfRqlyUG0X2DSOnXBvbLGSALG4=;
b=XK3izgEVfwSTCLhlqZcl3O9wO5ADqM7lW7aNwVQ4nYjRHWS4ZbDPiPjrKvrPKPdeKeBgiE
RFFB7p8DMuuw4SFp4q+wVAYmz9ZtOjcdFwIVAWHUGuz/Zuv5+EaWxQVu37qLViS9qBUStM
6vx5JjkW9g2LtKdoLo69tmiQ64GvcLqvmGKh3+c6i+66tHy1iEZZfDqXrLIqaPjnz+p3ZV
IRpXWqpxODMmNvdnCdOSgAE4w7UUgxnUfewP4fFpqWKuWilPyGBTJ9uvAkbScmImDAYqfl
evH0Qazr97oI3UIh9H66p2cD0yCKJfkKosH9mUEv34VnxbuRWSGBwDv1McQgmg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725549135; a=rsa-sha256; cv=none;
b=M8w2b49suafs606oYRoOLrNxfMqKZvoDZyfQJgcpA2FWjFkQxV9aJ1pYHtBADd6j2KCtQe
5Ku6pY2yXOsuEabOPhgk4Ed7uxGnTu6j5UjqEwf9sObGgw42FxF4J9mNaYq6Vl20xw3AFC
6QN+UTJaal7vwmRPEW0nRDTTAzK2JyOwZSgZPFDaWhxzLdbHwT+3d5PolbXJkxb90hWHHI
XgGwTFacs1QFCjPLXmpyNdpPNx4oaTZL3vzflpO31YZzNJc2OYycHItUdrN8pS8PnaHNxF
PnScETy3ZN5ZX/MFnAwVfo71FqWqNyL/X+lmtPBGdzaZaVtLdmDP+Bg1I8zBVQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725549135;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=g19peTucLeZgXPLIytfRqlyUG0X2DSOnXBvbLGSALG4=;
b=Vn0xp5nb+93yncLvT83H07EPi44/rpqEK0Vk7LYR1J1kGAWr6lJA0rtUl4eAajeSdzBNFy
8716cTo5POCUAXzPOzOSkBVDW4Cue78mzHelgbk9iH67wQLqbcB2aldYx+g3H0fGL+acTT
VdnHXNFtLrjGeepjDoDK0Mrw91YwhZRQbYVpUrSOr+ehZ8yd9jSP6xstDhzw3iLCf/wfNL
pG6IWXPerkrLFYjmHyCp8ajtsLpriXknbnDCh7BBBODhfDfrN6XNfhDO/aDfX2SoP9lkZe
O/lBKKpQ1x9NSkTwrvAYNZxKU9uvcyaG78HgazWFGi/Hoiu5ktBag/TeNxuXQQ==
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 4X02sC3qCQz1C7q;
Thu, 5 Sep 2024 15:12: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 485FCFHK016985;
Thu, 5 Sep 2024 15:12:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485FCF7k016982;
Thu, 5 Sep 2024 15:12:15 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 15:12:15 GMT
Message-Id: <202409051512.485FCF7k016982@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alan Somers <asomers@FreeBSD.org>
Subject: git: 0f2b2276abc3 - main - ctl: fix uninitialized data
used by PREVENT ALLOW MEDIUM REMOVAL
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: asomers
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 0f2b2276abc305905e7d88619a7abca26b0dd7eb
Auto-Submitted: auto-generated
The branch main has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=0f2b2276abc305905e7d88619a7abca26b0dd7eb
commit 0f2b2276abc305905e7d88619a7abca26b0dd7eb
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-08-26 20:44:24 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2024-09-05 15:10:14 +0000
ctl: fix uninitialized data used by PREVENT ALLOW MEDIUM REMOVAL
Zero-initialize the bitmap of preventers. Otherwise, the START STOP
UNIT command may not have the intended effect.
MFC after: 2 weeks
Sponsored by: Axcient
Reviewed by: emaste, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1409
---
sys/cam/ctl/ctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 53858edc2a1d..1505e0886f57 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -4630,7 +4630,7 @@ fail:
ctl_tpc_lun_init(lun);
if (lun->flags & CTL_LUN_REMOVABLE) {
lun->prevent = malloc((CTL_MAX_INITIATORS + 31) / 32 * 4,
- M_CTL, M_WAITOK);
+ M_CTL, M_WAITOK | M_ZERO);
}
/*
From nobody Thu Sep 5 15:35:14 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X03Mk537gz5WFdx;
Thu, 05 Sep 2024 15:35: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 4X03Mk4B9rz4jPg;
Thu, 5 Sep 2024 15:35:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725550514;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=+oALFUeF5rTmHsUpvnwMnkihbPJj8us5yHk/uTsYBxI=;
b=JjDRXoTImsEm+NDe/3UZBvGXTLHcK2dEIqWbYULEayNqhthbAfh8IVu3ny/orDt5Z9DEg1
aCoFp7JR0p1IOBtM71u5nlQlADjTmfhDMmHDqR4gG8q1QIjh57JKoYGJeR0RZlQw9ZydpZ
FLXXznZrI/oBXVdYLuADlf0Vz8DM9ToWdlKxT/Lh4hncIYvOm3yRFj9YbfxPpekQMSMt6Q
DVubiTWbe30fSxazuj+RVpPQN5UyoWnl9x2psBTWYDDYlug+Tlt+orYJCXxoMGnLrYqzZa
48+P6H/x5XrLwcsAA1CVf/WxNJ49ntl9q5iSEoei1bezD0KvjrFuU+0CbVu0fw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725550514; a=rsa-sha256; cv=none;
b=nRTKvjIXHk/1X9i2J5MnQd8W7TtE+YhCjAFAO0M5v3j8b1852P2lHPVH2qq7r/hHmeTOK1
1DaucGIE/Zy31KAsnc6ZIOg5/otNxOdPXQBXr5UyeEaQ4EYhGpYr4U4VqVymdacm/TrqY8
p4m1eC1bEA8UYs0QhXaWVK760G9zhzaLLiKEDpXZuxzN1tRzKrv7/6fAEc2uPdWqSpgoNu
G9+mtEAGNP09zn4+rs2edzNQtfM+MBzjCZSeDH4aThPJc8RrSfRm1LUjELvTFKFrZhD/+M
D7aq8wXc2PQNrtmPip5PxAQ9CJMhPlNDyCtYS8ZqE7Diz75vLo2hZDcexZMnaw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725550514;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=+oALFUeF5rTmHsUpvnwMnkihbPJj8us5yHk/uTsYBxI=;
b=CZf3d3OkAzxot21fg4K1WYCsf8STRJ5XU0d2npSbvw1Ld5Cx8jJLNbU19C4ys5JSZsuBbH
/Nep3XzWaCH/ff/FxAfqFDbf9iBcI0a6vvrA0lA/PTeV2x7PA0Yus1GJF+dOXWPcUgueiZ
VouXO+Zh0N9Ho/02idQL5MkdyholvVUSJNF+5HgvbegGnm7CsSGFdjk3iYsq5EKydrGPp1
4irDOpRdrbJrRvdwMjmEBUuUMIvLgwfUPFrFVgIXI+5xYiXp4Wczwqao7U9roRO94xla1d
XZzn7B9b11yF/TtXF/xosT2iorVH/GyQ7JG0/XN20/NEfIdTozH2+gqr0xII+w==
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 4X03Mk3gNyzDb9;
Thu, 5 Sep 2024 15:35: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 485FZEhO052529;
Thu, 5 Sep 2024 15:35:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485FZE3I052526;
Thu, 5 Sep 2024 15:35:14 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 15:35:14 GMT
Message-Id: <202409051535.485FZE3I052526@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 5203dcce2527 - main - neta: improve TCP LRO
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5203dcce2527fd235648e2b855a13f62247eb2de
Auto-Submitted: auto-generated
The branch main has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=5203dcce2527fd235648e2b855a13f62247eb2de
commit 5203dcce2527fd235648e2b855a13f62247eb2de
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-09-05 15:31:31 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-09-05 15:31:31 +0000
neta: improve TCP LRO
Use the appropriate function to flush correctly all entries. The old
code does not remove the element from the hash table, only from the
active queue.
Reviewed by: Peter Lei, rscheff
MFC after: 1 week
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D46433
---
sys/dev/neta/if_mvneta.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/sys/dev/neta/if_mvneta.c b/sys/dev/neta/if_mvneta.c
index e663306509a0..bc57b10b6d8e 100644
--- a/sys/dev/neta/if_mvneta.c
+++ b/sys/dev/neta/if_mvneta.c
@@ -3000,8 +3000,6 @@ mvneta_rx_queue(struct mvneta_softc *sc, int q, int npkt)
struct mvneta_rx_desc *r;
struct mvneta_buf *rxbuf;
struct mbuf *m;
- struct lro_ctrl *lro;
- struct lro_entry *queued;
void *pktbuf;
int i, pktlen, processed, ndma;
@@ -3115,11 +3113,7 @@ rx_lro:
/*
* Flush any outstanding LRO work
*/
- lro = &rx->lro;
- while (__predict_false((queued = LIST_FIRST(&lro->lro_active)) != NULL)) {
- LIST_REMOVE(LIST_FIRST((&lro->lro_active)), next);
- tcp_lro_flush(lro, queued);
- }
+ tcp_lro_flush_all(&rx->lro);
}
STATIC void
From nobody Thu Sep 5 15:39:14 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X03SM2PlYz5WFrd;
Thu, 05 Sep 2024 15:39: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 4X03SM1WSsz4k81;
Thu, 5 Sep 2024 15:39:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725550755;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=84d6Nze3Uc0ZTF1ri9IpLdTeQ95PyiLmnd2SVsHGVgY=;
b=PO4fhEZXK1wk1Azc5jzpW7Aw5kVtXL31o7q+GpldLFtsgKiObahVoTZS1WG1axOmFJpcad
SPP6aAAS7Zb3H6Hl5MAXCqC0MYTj6jXelMaY+4MeRwRbMTMLhD7qaa07pX3aMJsix8ZA3q
rIm9msjtM5VGGirW/fc8px+XsCJWvE6hRJ2Wvwrm93o/ugaTi0MjslpIcx45+14V6FmNi0
29s87K8WKQDWTBr1JuBKo2C5SjhHZKqGbFTtYnuaxq73otlOII+Zzkr4S76iwBYzrAvdvp
syTbgNRtJJDnrQc09je1/oVgtHp/jG/HIdhvnXkz7gSu9O+D5UocapDk9tsppw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725550755; a=rsa-sha256; cv=none;
b=AUGRN70NcZi2Hamfl8c0n2vpFgmL6IMPuXA34kt0WpGFtX/ZuS0u+UB7VRflt4KLwT1xdh
0WSS+YmjvOC1dPr6z6+jcxPbo9eTZDPE+1nIW24Ai31zn6DpQC/Y2Tub0VrIx2CdGrzvqw
2ZrvpUHzz+VZCV8pnrRdkQbQ0qAa+o2wCux0Uj5o/S3XVQyBLDmHqiIv2MFS8MuQdOUNTt
phpnt7C/o5FN5Zwq22tviOfQ/THsaJ3WOlMX1PVfiIn4D/yk5rnFWhHL2AV6Dp2vLoyV+m
eoGjzW3qUkrbfkbTY5uYhaQW+IZbLtTDaVY7VwAVXjNlyujzy9T7PQZjB9G0fw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725550755;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=84d6Nze3Uc0ZTF1ri9IpLdTeQ95PyiLmnd2SVsHGVgY=;
b=V/4GG9oC/xJ1chkc7har3VpnjSUE69eJwCyaHHGY8wx6oJXVJ+Xcf+ZAEGKwdjR2r7WMld
7tk9ufkxbqpGKH/ZqoT/kGZPdkelyTkkeeEzK7HAqGuapOHyjTFLL2MlPFzaZ5MQHlQ1LU
UK30KjcActlTHfElY+TLfXWQZQU2/1tIA1PHNvRo+RZy7lVWeje1+qtgY3ZidbkJF8NPZ5
mMD9hI5QRRVl2kYjnA7uwhkvC+yZhdvzoTPKARj6CoivTuLSrh5chT7qV7aZ0hpV3zoNEb
nmiXqCbvGdcPGsrVYOqOzOMNg6vadSt5m92mjJrIBelU6X+6if13NYbwgeuhtA==
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 4X03SM0nKBzF1B;
Thu, 5 Sep 2024 15:39: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 485FdFBV053309;
Thu, 5 Sep 2024 15:39:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485FdEMI053306;
Thu, 5 Sep 2024 15:39:14 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 15:39:14 GMT
Message-Id: <202409051539.485FdEMI053306@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: 0b45d36510d8 - main - al_eth: improve TCP LRO
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 0b45d36510d8c629fcc49805bc64e5893f4ba63c
Auto-Submitted: auto-generated
The branch main has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=0b45d36510d8c629fcc49805bc64e5893f4ba63c
commit 0b45d36510d8c629fcc49805bc64e5893f4ba63c
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-09-05 15:35:40 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-09-05 15:35:40 +0000
al_eth: improve TCP LRO
Use the appropriate function to flush correctly all entries. The old
code does not remove the element from the hash table, only from the
active queue.
Reviewed by: Peter Lei, rscheff
MFC after: 1 week
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D46434
---
sys/dev/al_eth/al_eth.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sys/dev/al_eth/al_eth.c b/sys/dev/al_eth/al_eth.c
index e12c8dfcc281..f4fec7c6aa94 100644
--- a/sys/dev/al_eth/al_eth.c
+++ b/sys/dev/al_eth/al_eth.c
@@ -1580,7 +1580,6 @@ al_eth_rx_recv_work(void *arg, int pending)
{
struct al_eth_ring *rx_ring = arg;
struct mbuf *mbuf;
- struct lro_entry *queued;
unsigned int qid = rx_ring->ring_id;
struct al_eth_pkt *hal_pkt = &rx_ring->hal_pkt;
uint16_t next_to_clean = rx_ring->next_to_clean;
@@ -1671,10 +1670,7 @@ al_eth_rx_recv_work(void *arg, int pending)
"%s: not filling rx queue %d\n", __func__, qid);
}
- while (((queued = LIST_FIRST(&rx_ring->lro.lro_active)) != NULL)) {
- LIST_REMOVE(queued, next);
- tcp_lro_flush(&rx_ring->lro, queued);
- }
+ tcp_lro_flush_all(&rx_ring->lro);
if (napi != 0) {
rx_ring->enqueue_is_running = 0;
From nobody Thu Sep 5 15:48:01 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X03fV0z0Gz5WGlr;
Thu, 05 Sep 2024 15:48: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 4X03fV0Snhz4l8t;
Thu, 5 Sep 2024 15:48:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725551282;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jxaRg/QawSlK6U+ZZTQmFhbhOZKhdTMSXODXJO24ffM=;
b=pL7RCe/1FWbj4wHm74+fUTxdecgooIdzskUMTvdsLbsApyJzqtSyJVfKdbeNFJ0Fl0z675
5Vk94Qf8HBykr1XAzqoaWYs3Livln6zck4hZsbGG0Vi7K8kns/VA9nEiT8Qp3BO5w3kx2L
jOKDl4zj1TOEdBAbG63OXZu5WDc1e16+iWmknbUFEWwEUvHtVHSE1dkJLM6tsmiH6DFi1Y
xpifhdUSywsDYr0tQdpH+TduVik78R/SP+5bZA5OBrGOHAnEWka8kO4lltwE7ACDNvh9zc
Lv08JaJB5uW0JVJvwWuCCN/pg9OnwEZw3YDgbB6SRE/uCQKK61d/r5/fYl0CVA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725551282; a=rsa-sha256; cv=none;
b=C6rL+Ih/Xbv9RZvyQSIMX+qPVXZ1OwqNZIgvrXELePKwaIIE8fJI9fyRzJhhy2hNdxRsPJ
N9m2FFpbOrZTRv+5eh0uqTnmMIxR20hbiLDIpc8rLm+MKgR/DCTaO+hS1RV/CFKRe//qOf
R3l7hCTvOIJOmoKgcHzhccl6NTEF5VwK5CO3yl7EBcOgxTmnHRF0wNRTXWdhjxQwnf+6uy
CgWNjd0+aLRkdrLHYbwAcJm0yDM/y3X9YhaTUYDaoarSD7ELGbwaEz7TxmeH///O87Vk62
c5hE7zWR3NCGa2SBsNM3VvJnkDpiQvsCvisIIhTQ84UAWUI8IZOYQmqcAwHnKg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725551282;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=jxaRg/QawSlK6U+ZZTQmFhbhOZKhdTMSXODXJO24ffM=;
b=wADPvMFJ9hTtyIdkiFm63pL6maK47VrOgCvzqHGu1ZgBbwJalp6HArXny5d53f6AwK2v/v
+ieneC2EAA8zWllbTtjhVNivzbpn9f6/E7o/SdOcijhackK4+1QNvB8H7wRwk5li2VIg3f
YkFmefw7Gd9yB+xV4E3RNOGuRuRxS9ej47f+oslDcZPantKOweDl1GClL/1KOosb/GAZi5
FV5OCczE9+0dVf+Qpqjl1hI77PKh4eUjcZDeQgUUseMGzfdOfozcElmkEsXC1yh5FYGYLK
yNZmfLpeRPe5v9y7NKhOfTRVfMBOAP544kgr37FdWLdUK6AUFzguZkW0t2AYLQ==
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 4X03fV00SwzFDQ;
Thu, 5 Sep 2024 15:48:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 485Fm10n069758;
Thu, 5 Sep 2024 15:48:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485Fm1CP069755;
Thu, 5 Sep 2024 15:48:01 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 15:48:01 GMT
Message-Id: <202409051548.485Fm1CP069755@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: e06cf0fc5dd6 - main - tcp: make tcp_lro_flush() static
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: e06cf0fc5dd626c34acdef308b696b4995371a4b
Auto-Submitted: auto-generated
The branch main has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=e06cf0fc5dd626c34acdef308b696b4995371a4b
commit e06cf0fc5dd626c34acdef308b696b4995371a4b
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-09-05 15:44:33 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-09-05 15:44:33 +0000
tcp: make tcp_lro_flush() static
tcp_lro_flush() is not used anymore outside of tcp_lro.c. Therefore
make it static.
Reviewed by: rscheff, glebius, Peter Lei
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D46435
---
sys/netinet/tcp_lro.c | 3 ++-
sys/netinet/tcp_lro.h | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c
index 906e01257a04..10afed17bf3b 100644
--- a/sys/netinet/tcp_lro.c
+++ b/sys/netinet/tcp_lro.c
@@ -83,6 +83,7 @@ static MALLOC_DEFINE(M_LRO, "LRO", "LRO control structures");
static void tcp_lro_rx_done(struct lro_ctrl *lc);
static int tcp_lro_rx_common(struct lro_ctrl *lc, struct mbuf *m,
uint32_t csum, bool use_hash);
+static void tcp_lro_flush(struct lro_ctrl *lc, struct lro_entry *le);
SYSCTL_NODE(_net_inet_tcp, OID_AUTO, lro, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TCP LRO");
@@ -1104,7 +1105,7 @@ again:
}
}
-void
+static void
tcp_lro_flush(struct lro_ctrl *lc, struct lro_entry *le)
{
diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h
index b4b5e3f811e4..a94eca665eb5 100644
--- a/sys/netinet/tcp_lro.h
+++ b/sys/netinet/tcp_lro.h
@@ -216,7 +216,6 @@ int tcp_lro_init(struct lro_ctrl *);
int tcp_lro_init_args(struct lro_ctrl *, struct ifnet *, unsigned, unsigned);
void tcp_lro_free(struct lro_ctrl *);
void tcp_lro_flush_inactive(struct lro_ctrl *, const struct timeval *);
-void tcp_lro_flush(struct lro_ctrl *, struct lro_entry *);
void tcp_lro_flush_all(struct lro_ctrl *);
extern int (*tcp_lro_flush_tcphpts)(struct lro_ctrl *, struct lro_entry *);
int tcp_lro_rx(struct lro_ctrl *, struct mbuf *, uint32_t);
From nobody Thu Sep 5 15:54:20 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X03nm4m4sz5WHLl;
Thu, 05 Sep 2024 15:54: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 4X03nm42Dqz4lfc;
Thu, 5 Sep 2024 15:54:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725551660;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=DtectqnxSLV6xlyiDOS3NL7IoJgYI1Sh0oKA2Yo9RW4=;
b=SW8nlZX7zdMfqxLhvBESCSXnnQKOW6BEKK1GHmpv4hs7ULHLY1X7NGqnREiiS9hdFc1t/0
ZgXy4oQHoHnGYTv7wmf3MR9RFzwZN9L2//hLfBVxPM9TPA3iw5965FdxOL21v2vZbwlpdz
79Lc4BmSiJMAK88qlfIinU2XsiCb8wrBWMDpWeIu4RxkKbOVwgsWZHuqjRRowsiHThXrnZ
uYiBVVHqoDE27LGJftgNGzL7ktzC0ZKIZrIt+5znYxfLkMGg4jOFzdqcjUoHM9NQ8f4zRm
cPTHruDxZJwf5/AOUnkq7V+A1j1MROpNsYdg7S1Bsyuhl8eb7LDjlX76pnpTew==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725551660; a=rsa-sha256; cv=none;
b=Sjyg9Y3Xm3JbDO5UYXfV+So4nr2gR0KIQlOagkNbCJHa0Ia+4p9oJmiv8NPlqNhlsUaYc4
PIhTp2R76+jr0n3kPkuf+HrvUs8nnXf5BVN7za79VPnK+bxICujLJUqLpKoaW3cqHwKj0u
ah8LEBOAOMNgSnbfg6MHPVpkl3a/nVNaw9Aih3YIiqmRqH088fv9GkuW/6tbR4KmdK0T6c
19sfA6KIjOJk+Tr0c6qadPKKcPg2sk9aNK9tNcpEzqcgZcqu4fcbIs6in3FGdy+aOxKa1H
fwe7xZ9LonLY7r94eiqs6TqEpHNgg9FcHyv5ce50GgiYqlo0n02Vy2MBoBVhNg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725551660;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=DtectqnxSLV6xlyiDOS3NL7IoJgYI1Sh0oKA2Yo9RW4=;
b=fclU3WHrNGKIGjw7UtupNi2TdvFfUA9xUYrfjqVVz9jsHfarUcD0IOjXV7UAHZdg4nMqJu
eE0UBcDy5i5nu2nJI0HK95fEkHXwADGtwOWmmAUYK9LYZNrOkI9HmkAxWc58Gq5SmZKW64
hYH/lp/hHMOV90lq61WVPMbUT3qHehECO6FJ32u3C69J0MQXILkJTg3bmCj0GhlDeDVOXr
UdsnGdMsRM7UCOudZXVrUHVgr+WsMNc/i2CmXRv5M47UcvRhy0jhTRRqV7G9UoRe7SbXXy
CHOcMzEIi6ZOhHWRX0iMIxCxxrS+cXAcqKnnf1rXh098OTHSatKnRlWDPnkPZw==
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 4X03nm3dfvzFYn;
Thu, 5 Sep 2024 15:54: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 485FsKlf085698;
Thu, 5 Sep 2024 15:54:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485FsKvx085695;
Thu, 5 Sep 2024 15:54:20 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 15:54:20 GMT
Message-Id: <202409051554.485FsKvx085695@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 1726db7af6b3 - main - flua: Add wrappers for sys/utsname.h
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 1726db7af6b3738eb04d962b351d7f4017e1fc77
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=1726db7af6b3738eb04d962b351d7f4017e1fc77
commit 1726db7af6b3738eb04d962b351d7f4017e1fc77
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-05 15:16:29 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-05 15:53:52 +0000
flua: Add wrappers for sys/utsname.h
This allows one to invoke uname from lua scripts.
Reviewed by: bapt, kevans, emaste
MFC after: 1 month
Differential Revision: https://reviews.freebsd.org/D42017
---
libexec/flua/linit_flua.c | 1 +
libexec/flua/modules/lposix.c | 47 ++++++++++++++++++++++++++++++++++++++++++-
libexec/flua/modules/lposix.h | 1 +
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c
index 4d4d69920e94..1b7d83016cfe 100644
--- a/libexec/flua/linit_flua.c
+++ b/libexec/flua/linit_flua.c
@@ -59,6 +59,7 @@ static const luaL_Reg loadedlibs[] = {
/* FreeBSD Extensions */
{"lfs", luaopen_lfs},
{"posix.sys.stat", luaopen_posix_sys_stat},
+ {"posix.sys.utsname", luaopen_posix_sys_utsname},
{"posix.unistd", luaopen_posix_unistd},
{"ucl", luaopen_ucl},
{"fbsd", luaopen_fbsd},
diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c
index 5b6e80a0309f..fa3fd5f8e589 100644
--- a/libexec/flua/modules/lposix.c
+++ b/libexec/flua/modules/lposix.c
@@ -24,8 +24,8 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/stat.h>
+#include <sys/utsname.h>
#include <errno.h>
#include <grp.h>
@@ -130,12 +130,50 @@ lua_getpid(lua_State *L)
return 1;
}
+static int
+lua_uname(lua_State *L)
+{
+ struct utsname name;
+ int error, n;
+
+ n = lua_gettop(L);
+ luaL_argcheck(L, n == 0, 1, "too many arguments");
+
+ error = uname(&name);
+ if (error != 0) {
+ error = errno;
+ lua_pushnil(L);
+ lua_pushstring(L, strerror(error));
+ lua_pushinteger(L, error);
+ return (3);
+ }
+
+ lua_newtable(L);
+#define setkv(f) do { \
+ lua_pushstring(L, name.f); \
+ lua_setfield(L, -2, #f); \
+} while (0)
+ setkv(sysname);
+ setkv(nodename);
+ setkv(release);
+ setkv(version);
+ setkv(machine);
+#undef setkv
+
+ return (1);
+}
+
#define REG_SIMPLE(n) { #n, lua_ ## n }
static const struct luaL_Reg sys_statlib[] = {
REG_SIMPLE(chmod),
{ NULL, NULL },
};
+static const struct luaL_Reg sys_utsnamelib[] = {
+ REG_SIMPLE(uname),
+ { NULL, NULL },
+};
+
static const struct luaL_Reg unistdlib[] = {
REG_SIMPLE(getpid),
REG_SIMPLE(chown),
@@ -150,6 +188,13 @@ luaopen_posix_sys_stat(lua_State *L)
return 1;
}
+int
+luaopen_posix_sys_utsname(lua_State *L)
+{
+ luaL_newlib(L, sys_utsnamelib);
+ return 1;
+}
+
int
luaopen_posix_unistd(lua_State *L)
{
diff --git a/libexec/flua/modules/lposix.h b/libexec/flua/modules/lposix.h
index 6085bf045d79..e37caaae9d04 100644
--- a/libexec/flua/modules/lposix.h
+++ b/libexec/flua/modules/lposix.h
@@ -8,4 +8,5 @@
#include <lua.h>
int luaopen_posix_sys_stat(lua_State *L);
+int luaopen_posix_sys_utsname(lua_State *L);
int luaopen_posix_unistd(lua_State *L);
From nobody Thu Sep 5 16:20:01 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X04MP2xTWz5WKgn;
Thu, 05 Sep 2024 16:20:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X04MP2LLcz4qsL;
Thu, 5 Sep 2024 16:20:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725553201;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0i/wyElIkSRJi6fan8caZHx/EXJhgRpbS7WgxOsAyFU=;
b=fCzcnB3VVrwxXOATjlIuPWF6tCgvVnbp2FOvAjQA2TssYLg9fZt+uI3j+P+aG2wEnrgCJO
K6DtckiJnsPwWpOP98+bdnNb8pjVbUxz12cnJ6hZOSwDmLWq/nEsdHdb1/oxVL9YHEFM3B
dB4IcWZIRqJp7R00v8cPKjsLOaN4rRUUFxjZRNxoMYSUL5xcQ8ib6B/27fWGUODKY9RyVN
IBonjyDRalVJXACd+rAVvETc+cfa7t//cXrvAZHZWrtwBUal3NCiVwio5xIqWlsPePxy4W
fJDkYg+hy7qgllsUkP/dSG8cSz18CPxIS3G+nhJwUzHi2GPYA+V/KUZ6hn1b1A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725553201; a=rsa-sha256; cv=none;
b=drrAgMhF1l1eQhOPJTxP2hGRt3zKeYLpb31h6qzRKM5XVBg9RM35ZcJlzXhetinC6kJVzo
ZFvS/kjrEfMG3lXRXqZBoPRhCwJvt7ZH6/a9evwgp/ueE1UvkdyWdeQbxLpi2bowQOGJJA
4j2a33IIFDz6cFQKoI0fZvOybsPw3NTGLu0RHKS52kllp+gE0AElbCRJZBytiXKGSL42wq
WSaJ0Zq6gfR4YuGvSJSJcsNmnbLdlrRE/pjK4FBvtsIDBVnzv0QIIOxje2oCYQQg6oAfYw
11PB2b/CzyZ5NGmYUQCrb0lKmIRF9QPh7pku9U8vCrNVGYC7UwWfDfYFSgYRgA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725553201;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0i/wyElIkSRJi6fan8caZHx/EXJhgRpbS7WgxOsAyFU=;
b=Hhg+JOf59G8FjahSunj5e05PkLXjBi/JEjzoGTWxYotsbmefw6XZqm2/MFLauPByavLCb7
RCsr8MlAPZBOVTqjqvmRyEoozAhIkqSr/+F3t3cEIQVVtYdqBBq16oCjrleZaEsPMqdH8Y
W06Gb1FIxZ62mx0Z5WiRJxSMf/8XkSCDG/sKd3Rh7tI0Ew9D8r+/X8ECvsmvpw7J92xv7X
U5WEsSIu+BF2/+Tqm+eEVQCo4KYLVLOE2dUQqHtYWJJUYXXBbBUIp+mfc5ReeidUMIBCnk
q+XE8O8ayVG5fcPg8+N8KRle1IYXBppPe6vElsyv4SpZRDj961PTjC0/h602Wg==
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 4X04MP1QCWzFvS;
Thu, 5 Sep 2024 16:20: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 485GK1Yi023809;
Thu, 5 Sep 2024 16:20:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485GK1rL023806;
Thu, 5 Sep 2024 16:20:01 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 16:20:01 GMT
Message-Id: <202409051620.485GK1rL023806@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Doug Moore <dougm@FreeBSD.org>
Subject: git: 6aede562b438 - main - vm_phys: hide alloc_freelist_pages
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 6aede562b438ad9be7197f04307d8bc58d43e6ee
Auto-Submitted: auto-generated
The branch main has been updated by dougm:
URL: https://cgit.FreeBSD.org/src/commit/?id=6aede562b438ad9be7197f04307d8bc58d43e6ee
commit 6aede562b438ad9be7197f04307d8bc58d43e6ee
Author: Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2024-09-05 16:17:53 +0000
Commit: Doug Moore <dougm@FreeBSD.org>
CommitDate: 2024-09-05 16:17:53 +0000
vm_phys: hide alloc_freelist_pages
Make vm_phys_alloc_freelist_pages static. There are no longer any
callers outside of vm_phys.c.
Reviewed by: alc, markj
Differential Revision: https://reviews.freebsd.org/D46539
---
sys/vm/vm_phys.c | 42 +++++++++++++++++++++---------------------
sys/vm/vm_phys.h | 2 --
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
index 59ab7d13c55d..cf1ed5818b2f 100644
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -903,26 +903,6 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[])
return (i);
}
-/*
- * Allocate a contiguous, power of two-sized set of physical pages
- * from the free lists.
- *
- * The free page queues must be locked.
- */
-vm_page_t
-vm_phys_alloc_pages(int domain, int pool, int order)
-{
- vm_page_t m;
- int freelist;
-
- for (freelist = 0; freelist < VM_NFREELIST; freelist++) {
- m = vm_phys_alloc_freelist_pages(domain, freelist, pool, order);
- if (m != NULL)
- return (m);
- }
- return (NULL);
-}
-
/*
* Allocate a contiguous, power of two-sized set of physical pages from the
* specified free list. The free list must be specified using one of the
@@ -930,7 +910,7 @@ vm_phys_alloc_pages(int domain, int pool, int order)
*
* The free page queues must be locked.
*/
-vm_page_t
+static vm_page_t
vm_phys_alloc_freelist_pages(int domain, int freelist, int pool, int order)
{
struct vm_freelist *alt, *fl;
@@ -987,6 +967,26 @@ vm_phys_alloc_freelist_pages(int domain, int freelist, int pool, int order)
return (NULL);
}
+/*
+ * Allocate a contiguous, power of two-sized set of physical pages
+ * from the free lists.
+ *
+ * The free page queues must be locked.
+ */
+vm_page_t
+vm_phys_alloc_pages(int domain, int pool, int order)
+{
+ vm_page_t m;
+ int freelist;
+
+ for (freelist = 0; freelist < VM_NFREELIST; freelist++) {
+ m = vm_phys_alloc_freelist_pages(domain, freelist, pool, order);
+ if (m != NULL)
+ return (m);
+ }
+ return (NULL);
+}
+
/*
* Find the vm_page corresponding to the given physical address, which must lie
* within the given physical memory segment.
diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h
index bd086fd5571f..43d94a9420f2 100644
--- a/sys/vm/vm_phys.h
+++ b/sys/vm/vm_phys.h
@@ -61,8 +61,6 @@ extern int *mem_locality;
void vm_phys_add_seg(vm_paddr_t start, vm_paddr_t end);
vm_page_t vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low,
vm_paddr_t high, u_long alignment, vm_paddr_t boundary);
-vm_page_t vm_phys_alloc_freelist_pages(int domain, int freelist, int pool,
- int order);
int vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]);
vm_page_t vm_phys_alloc_pages(int domain, int pool, int order);
int vm_phys_domain_match(int prefer, vm_paddr_t low, vm_paddr_t high);
From nobody Thu Sep 5 17:25:44 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X05qD4fBgz5WRxj;
Thu, 05 Sep 2024 17:25: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 4X05qD46W1z47qx;
Thu, 5 Sep 2024 17:25:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725557144;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=6YfTeFl+n+VPinEe5jJj6qd+hpGS9fPiGlxS8+tvd/8=;
b=hrPtB3eC8JA2xx/HT161S44jkzPxP5B6OJR1AsS9XX1s3PLVfSqSodLugPdwBKQJMeSaeh
/UOs3NYzbS8IeMAQCOMu3syEmUgaBSGF0VKwEo1i1lHcjHwSLlMwkIBdKj1St/k1P5fPge
WzfWRk5Ta6rgaiUIWzjyL8PpDybjO4z+o+w7REyyK7vC8aNfHXm+gHKVxecS/Rl+8SkpyX
pXKKj46PMgyIHj+sHZ5wLkoKiWWFzZ7tup8G0MH44R5enGzTnnROZfSV4KVY95ddLJak7k
eoq6Vd4qbZHaYuR4KFl/ga8+wF7QlIQTWVEQD2574lOpN9jVB7koSvMmWWw8Kw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725557144; a=rsa-sha256; cv=none;
b=E2ZPuUXU3Abc7uDLhfAdk/eYVZhk0O5nAyDLzurQD6r0v8kLzM6U3+uHHDUBP2fhm/eyst
uYP1U/P+QyDnB/ir4evctKhsXhKfa7Gi/6dcvCgahBQm++ZLfhXPOw/ph4kcGZmC00+Hvu
+1gjBtdUgZox6aSsbpMJ/21pesoq6aFS/u3ihV0b5bpK1JoWUi3Uo+cK/7yOxMVmnw2n9d
jEB2FThVKZmG9Thz6OEzKL908HsTlO/Mwx8hgU/vlxgu4xO/79E8Q0QFobX5gZXYJ3Ssmr
Yjj6WvR7UEwySmkAWmI44iPATg9sqj/DwW/ysaQo1f0Q0d+QLL6Ig39wOkWpVg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725557144;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=6YfTeFl+n+VPinEe5jJj6qd+hpGS9fPiGlxS8+tvd/8=;
b=ZtSdSDm9Xe9Dx7rTQb582ykD9Sxv0ChAAdYrajib0XgNtWA0rQDRbat03NpfajDVxDyMbR
8USsNFt2NjUCgzhI4BFgGCEjlcDsMfIcbMNys85vH1xrjSjSR49ks6x29zVMeMz0VALGhm
Vfjc3D2+uXDcXP7sjqAVL3ihIvSP3/8GXjnufMzZKAVvK8bGQrnWyZNomhKbmjdoifa+ws
z2FF/ZuzLeby3wHBe4nzYglUM1jd6vj0Mte9aG/enZnUkYF25kz7C92A545pH+cu2rbov7
wHzVwwUN5PuUbFnMqhlM/m+L6lHp0yredcw619MRR9duHD13PoOoPxEJkThTJw==
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 4X05qD3bC3zH4p;
Thu, 5 Sep 2024 17:25:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 485HPiAZ040328;
Thu, 5 Sep 2024 17:25:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485HPi2c040325;
Thu, 5 Sep 2024 17:25:44 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 17:25:44 GMT
Message-Id: <202409051725.485HPi2c040325@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Justin Hibbits <jhibbits@FreeBSD.org>
Subject: git: 7b86593f0f6c - main - sdhci: Match quirk_set/quirk_clear
sysctls to type
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhibbits
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 7b86593f0f6cbfba2883058c6c9d2389f1c581aa
Auto-Submitted: auto-generated
The branch main has been updated by jhibbits:
URL: https://cgit.FreeBSD.org/src/commit/?id=7b86593f0f6cbfba2883058c6c9d2389f1c581aa
commit 7b86593f0f6cbfba2883058c6c9d2389f1c581aa
Author: Justin Hibbits <jhibbits@FreeBSD.org>
AuthorDate: 2024-09-05 17:20:14 +0000
Commit: Justin Hibbits <jhibbits@FreeBSD.org>
CommitDate: 2024-09-05 17:25:16 +0000
sdhci: Match quirk_set/quirk_clear sysctls to type
These quirk fields are u_int, so match the sysctl type to the actual
types, and use SYSCTL_UINT. This provides room for setting bit 31 quirk
as needed.
Sponsored by: Juniper Networks, Inc.
MFC after: 1 week
---
sys/dev/sdhci/sdhci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
index 2403f60d613c..c747f54cb32c 100644
--- a/sys/dev/sdhci/sdhci.c
+++ b/sys/dev/sdhci/sdhci.c
@@ -72,10 +72,10 @@ static int sdhci_debug = 0;
SYSCTL_INT(_hw_sdhci, OID_AUTO, debug, CTLFLAG_RWTUN, &sdhci_debug, 0,
"Debug level");
u_int sdhci_quirk_clear = 0;
-SYSCTL_INT(_hw_sdhci, OID_AUTO, quirk_clear, CTLFLAG_RWTUN, &sdhci_quirk_clear,
+SYSCTL_UINT(_hw_sdhci, OID_AUTO, quirk_clear, CTLFLAG_RWTUN, &sdhci_quirk_clear,
0, "Mask of quirks to clear");
u_int sdhci_quirk_set = 0;
-SYSCTL_INT(_hw_sdhci, OID_AUTO, quirk_set, CTLFLAG_RWTUN, &sdhci_quirk_set, 0,
+SYSCTL_UINT(_hw_sdhci, OID_AUTO, quirk_set, CTLFLAG_RWTUN, &sdhci_quirk_set, 0,
"Mask of quirks to set");
#define RD1(slot, off) SDHCI_READ_1((slot)->bus, (slot), (off))
From nobody Thu Sep 5 17:28:14 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X05t65zRDz5WS7Y;
Thu, 05 Sep 2024 17:28: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 4X05t659bQz482H;
Thu, 5 Sep 2024 17:28:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725557294;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=T4MVSlebqEkwDe4TLpolHWuw91LbroBrBXouKmDTbVU=;
b=sMsx09Nx5DoqUFsqm2ZmwfcyzGxAVFLY0w6lnYDbxrC9LgCdw8LVGNCsSmOTii8+26sHpF
/bK5aThczM36D3v4XIAZHby2bUM2r0JZDtVfVjhqKPhSWNqsBHCWiqyEJiICsujah+TwbR
275Qon/+FEH/EWCnD9OLQyvVR9+YRqdIQI7UriyFUeqwh9SVOv3H2aaVv7YV5wvR7lAX4j
xg7BJYaKcBH2SAQVE12+SDlYuHN4oZX55UZs5FqyMVWwg7705PiEx+3rlbiPIAjYm9TMay
yBxohQRuyQo917WlsqN2cAWZl0Yq+CiOzAGIyTpZOerr9dQJ05x0GYWQI9H3og==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725557294; a=rsa-sha256; cv=none;
b=xYcQutQ1CS82bCuXBDvvkEdcOpR0iZ2EmsBImlHJNr4GGSPfGiv4QN0kV8IC590WTzeFQ8
I4hpRRjFCOeN59tyRI7pGzHlstPQyxeweHwBXb1OSgVLNGmDN56V8y6InApSD83NT0ZQkZ
AyS7yvMLrhseJLICMWOGVkxfpgeIH6iuk+ZWTcabGbFmYjPmUjOxfan74XGEUW9PjjZ7yC
e9Wm/kDaiwpuJQlVfksbeMpAGFyI+QqcUA5347d1+T9lSY4MVzPmR4CB6ougW2w+8j+UdM
nmEO+qLihdJbEIquto7EDC/BPBnB5AACKTLtTJdVpVcESdxYAi/vZgb/OM4Qjw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725557294;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=T4MVSlebqEkwDe4TLpolHWuw91LbroBrBXouKmDTbVU=;
b=NmjReWFAK/TP8QKqJGD0uNC44e0c6l+NQe92BzzSzmU8zAuTkIN4yrKWZQTekRMWuSZggi
iWp2br8DeiavzXtyqo89e1/Vi5PSInoRiVnVYuFFQjfVlshFaSwf/k5KXEGl54IrQ5saCM
mJaqnfuYg+Xl17X9wc4yUjD5MPGj8DtFISzE2cZu5IsAcraBTfDrnZxeSmFPL0ydjV88Oe
tGYp/viu/dk0rejVA5BUBaJOZr5D1jxukXlhTtcUQYwrmhKaJuYBumNU3kEDhbmgrZaphg
IHdxz8lmnury14QG6PbJWXULRcWeMOUakOs9vTtINRcOURD5hKaq4ZzE4r581Q==
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 4X05t64nKrzHdR;
Thu, 5 Sep 2024 17:28: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 485HSE5O040819;
Thu, 5 Sep 2024 17:28:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485HSE1R040816;
Thu, 5 Sep 2024 17:28:14 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 17:28:14 GMT
Message-Id: <202409051728.485HSE1R040816@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Gleb Smirnoff <glebius@FreeBSD.org>
Subject: git: d59a76183470 - main - spa_prop_get: require caller
to supply output nvlist
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: d59a76183470685bdf0b88013d2baad1f04f030f
Auto-Submitted: auto-generated
The branch main has been updated by glebius:
URL: https://cgit.FreeBSD.org/src/commit/?id=d59a76183470685bdf0b88013d2baad1f04f030f
commit d59a76183470685bdf0b88013d2baad1f04f030f
Author: Rob Norris <rob.norris@klarasystems.com>
AuthorDate: 2024-09-04 02:09:43 +0000
Commit: Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2024-09-05 17:27:35 +0000
spa_prop_get: require caller to supply output nvlist
All callers to spa_prop_get() and spa_prop_get_nvlist() supplied their
own preallocated nvlist (except ztest), so we can remove the option to
have them allocate one if none is supplied.
This sidesteps a bug in spa_prop_get(), where the error var wasn't
initialised, which could lead to the provided nvlist being freed at the
end.
Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
(cherry picked from commit 366d6fecf6bb3c59668b0f3b89f2a610595f3d2f)
---
sys/contrib/openzfs/cmd/ztest.c | 5 +-
sys/contrib/openzfs/include/sys/spa.h | 4 +-
sys/contrib/openzfs/module/zfs/spa.c | 100 +++++++++++++----------------
sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 10 +--
4 files changed, 53 insertions(+), 66 deletions(-)
diff --git a/sys/contrib/openzfs/cmd/ztest.c b/sys/contrib/openzfs/cmd/ztest.c
index 6a9264ddcc4c..eb68c27b1dc1 100644
--- a/sys/contrib/openzfs/cmd/ztest.c
+++ b/sys/contrib/openzfs/cmd/ztest.c
@@ -6211,13 +6211,14 @@ void
ztest_spa_prop_get_set(ztest_ds_t *zd, uint64_t id)
{
(void) zd, (void) id;
- nvlist_t *props = NULL;
(void) pthread_rwlock_rdlock(&ztest_name_lock);
(void) ztest_spa_prop_set_uint64(ZPOOL_PROP_AUTOTRIM, ztest_random(2));
- VERIFY0(spa_prop_get(ztest_spa, &props));
+ nvlist_t *props = fnvlist_alloc();
+
+ VERIFY0(spa_prop_get(ztest_spa, props));
if (ztest_opts.zo_verbose >= 6)
dump_nvlist(props, 4);
diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h
index 3998f5a6de73..0fa3149e6c6f 100644
--- a/sys/contrib/openzfs/include/sys/spa.h
+++ b/sys/contrib/openzfs/include/sys/spa.h
@@ -1196,9 +1196,9 @@ extern void spa_boot_init(void);
/* properties */
extern int spa_prop_set(spa_t *spa, nvlist_t *nvp);
-extern int spa_prop_get(spa_t *spa, nvlist_t **nvp);
+extern int spa_prop_get(spa_t *spa, nvlist_t *nvp);
extern int spa_prop_get_nvlist(spa_t *spa, char **props,
- unsigned int n_props, nvlist_t **outnvl);
+ unsigned int n_props, nvlist_t *outnvl);
extern void spa_prop_clear_bootfs(spa_t *spa, uint64_t obj, dmu_tx_t *tx);
extern void spa_configfile_set(spa_t *, nvlist_t *, boolean_t);
diff --git a/sys/contrib/openzfs/module/zfs/spa.c b/sys/contrib/openzfs/module/zfs/spa.c
index cafc7196c354..7a3dd29769ca 100644
--- a/sys/contrib/openzfs/module/zfs/spa.c
+++ b/sys/contrib/openzfs/module/zfs/spa.c
@@ -366,21 +366,15 @@ spa_prop_add(spa_t *spa, const char *propname, nvlist_t *outnvl)
int
spa_prop_get_nvlist(spa_t *spa, char **props, unsigned int n_props,
- nvlist_t **outnvl)
+ nvlist_t *outnvl)
{
int err = 0;
if (props == NULL)
return (0);
- if (*outnvl == NULL) {
- err = nvlist_alloc(outnvl, NV_UNIQUE_NAME, KM_SLEEP);
- if (err)
- return (err);
- }
-
for (unsigned int i = 0; i < n_props && err == 0; i++) {
- err = spa_prop_add(spa, props[i], *outnvl);
+ err = spa_prop_add(spa, props[i], outnvl);
}
return (err);
@@ -406,7 +400,7 @@ spa_prop_add_user(nvlist_t *nvl, const char *propname, char *strval,
* Get property values from the spa configuration.
*/
static void
-spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
+spa_prop_get_config(spa_t *spa, nvlist_t *nv)
{
vdev_t *rvd = spa->spa_root_vdev;
dsl_pool_t *pool = spa->spa_dsl_pool;
@@ -428,48 +422,48 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
size += metaslab_class_get_space(spa_dedup_class(spa));
size += metaslab_class_get_space(spa_embedded_log_class(spa));
- spa_prop_add_list(*nvp, ZPOOL_PROP_NAME, spa_name(spa), 0, src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_SIZE, NULL, size, src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_ALLOCATED, NULL, alloc, src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_FREE, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_NAME, spa_name(spa), 0, src);
+ spa_prop_add_list(nv, ZPOOL_PROP_SIZE, NULL, size, src);
+ spa_prop_add_list(nv, ZPOOL_PROP_ALLOCATED, NULL, alloc, src);
+ spa_prop_add_list(nv, ZPOOL_PROP_FREE, NULL,
size - alloc, src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_CHECKPOINT, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_CHECKPOINT, NULL,
spa->spa_checkpoint_info.sci_dspace, src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_FRAGMENTATION, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_FRAGMENTATION, NULL,
metaslab_class_fragmentation(mc), src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_EXPANDSZ, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_EXPANDSZ, NULL,
metaslab_class_expandable_space(mc), src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_READONLY, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_READONLY, NULL,
(spa_mode(spa) == SPA_MODE_READ), src);
cap = (size == 0) ? 0 : (alloc * 100 / size);
- spa_prop_add_list(*nvp, ZPOOL_PROP_CAPACITY, NULL, cap, src);
+ spa_prop_add_list(nv, ZPOOL_PROP_CAPACITY, NULL, cap, src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_DEDUPRATIO, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_DEDUPRATIO, NULL,
ddt_get_pool_dedup_ratio(spa), src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_BCLONEUSED, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_BCLONEUSED, NULL,
brt_get_used(spa), src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_BCLONESAVED, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_BCLONESAVED, NULL,
brt_get_saved(spa), src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_BCLONERATIO, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_BCLONERATIO, NULL,
brt_get_ratio(spa), src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_DEDUP_TABLE_SIZE, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_DEDUP_TABLE_SIZE, NULL,
ddt_get_ddt_dsize(spa), src);
- spa_prop_add_list(*nvp, ZPOOL_PROP_HEALTH, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_HEALTH, NULL,
rvd->vdev_state, src);
version = spa_version(spa);
if (version == zpool_prop_default_numeric(ZPOOL_PROP_VERSION)) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_VERSION, NULL,
version, ZPROP_SRC_DEFAULT);
} else {
- spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_VERSION, NULL,
version, ZPROP_SRC_LOCAL);
}
- spa_prop_add_list(*nvp, ZPOOL_PROP_LOAD_GUID,
+ spa_prop_add_list(nv, ZPOOL_PROP_LOAD_GUID,
NULL, spa_load_guid(spa), src);
}
@@ -479,62 +473,62 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
* when opening pools before this version freedir will be NULL.
*/
if (pool->dp_free_dir != NULL) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_FREEING, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_FREEING, NULL,
dsl_dir_phys(pool->dp_free_dir)->dd_used_bytes,
src);
} else {
- spa_prop_add_list(*nvp, ZPOOL_PROP_FREEING,
+ spa_prop_add_list(nv, ZPOOL_PROP_FREEING,
NULL, 0, src);
}
if (pool->dp_leak_dir != NULL) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_LEAKED, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_LEAKED, NULL,
dsl_dir_phys(pool->dp_leak_dir)->dd_used_bytes,
src);
} else {
- spa_prop_add_list(*nvp, ZPOOL_PROP_LEAKED,
+ spa_prop_add_list(nv, ZPOOL_PROP_LEAKED,
NULL, 0, src);
}
}
- spa_prop_add_list(*nvp, ZPOOL_PROP_GUID, NULL, spa_guid(spa), src);
+ spa_prop_add_list(nv, ZPOOL_PROP_GUID, NULL, spa_guid(spa), src);
if (spa->spa_comment != NULL) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_COMMENT, spa->spa_comment,
+ spa_prop_add_list(nv, ZPOOL_PROP_COMMENT, spa->spa_comment,
0, ZPROP_SRC_LOCAL);
}
if (spa->spa_compatibility != NULL) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_COMPATIBILITY,
+ spa_prop_add_list(nv, ZPOOL_PROP_COMPATIBILITY,
spa->spa_compatibility, 0, ZPROP_SRC_LOCAL);
}
if (spa->spa_root != NULL)
- spa_prop_add_list(*nvp, ZPOOL_PROP_ALTROOT, spa->spa_root,
+ spa_prop_add_list(nv, ZPOOL_PROP_ALTROOT, spa->spa_root,
0, ZPROP_SRC_LOCAL);
if (spa_feature_is_enabled(spa, SPA_FEATURE_LARGE_BLOCKS)) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_MAXBLOCKSIZE, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_MAXBLOCKSIZE, NULL,
MIN(zfs_max_recordsize, SPA_MAXBLOCKSIZE), ZPROP_SRC_NONE);
} else {
- spa_prop_add_list(*nvp, ZPOOL_PROP_MAXBLOCKSIZE, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_MAXBLOCKSIZE, NULL,
SPA_OLD_MAXBLOCKSIZE, ZPROP_SRC_NONE);
}
if (spa_feature_is_enabled(spa, SPA_FEATURE_LARGE_DNODE)) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_MAXDNODESIZE, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_MAXDNODESIZE, NULL,
DNODE_MAX_SIZE, ZPROP_SRC_NONE);
} else {
- spa_prop_add_list(*nvp, ZPOOL_PROP_MAXDNODESIZE, NULL,
+ spa_prop_add_list(nv, ZPOOL_PROP_MAXDNODESIZE, NULL,
DNODE_MIN_SIZE, ZPROP_SRC_NONE);
}
if ((dp = list_head(&spa->spa_config_list)) != NULL) {
if (dp->scd_path == NULL) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_CACHEFILE,
+ spa_prop_add_list(nv, ZPOOL_PROP_CACHEFILE,
"none", 0, ZPROP_SRC_LOCAL);
} else if (strcmp(dp->scd_path, spa_config_path) != 0) {
- spa_prop_add_list(*nvp, ZPOOL_PROP_CACHEFILE,
+ spa_prop_add_list(nv, ZPOOL_PROP_CACHEFILE,
dp->scd_path, 0, ZPROP_SRC_LOCAL);
}
}
@@ -544,19 +538,13 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
* Get zpool property values.
*/
int
-spa_prop_get(spa_t *spa, nvlist_t **nvp)
+spa_prop_get(spa_t *spa, nvlist_t *nv)
{
objset_t *mos = spa->spa_meta_objset;
zap_cursor_t zc;
zap_attribute_t za;
dsl_pool_t *dp;
- int err;
-
- if (*nvp == NULL) {
- err = nvlist_alloc(nvp, NV_UNIQUE_NAME, KM_SLEEP);
- if (err)
- return (err);
- }
+ int err = 0;
dp = spa_get_dsl(spa);
dsl_pool_config_enter(dp, FTAG);
@@ -565,7 +553,7 @@ spa_prop_get(spa_t *spa, nvlist_t **nvp)
/*
* Get properties from the spa config.
*/
- spa_prop_get_config(spa, nvp);
+ spa_prop_get_config(spa, nv);
/* If no pool property object, no more prop to get. */
if (mos == NULL || spa->spa_pool_props_object == 0)
@@ -610,7 +598,7 @@ spa_prop_get(spa_t *spa, nvlist_t **nvp)
intval = za.za_first_integer;
}
- spa_prop_add_list(*nvp, prop, strval, intval, src);
+ spa_prop_add_list(nv, prop, strval, intval, src);
if (strval != NULL)
kmem_free(strval, ZFS_MAX_DATASET_NAME_LEN);
@@ -627,10 +615,10 @@ spa_prop_get(spa_t *spa, nvlist_t **nvp)
break;
}
if (prop != ZPOOL_PROP_INVAL) {
- spa_prop_add_list(*nvp, prop, strval, 0, src);
+ spa_prop_add_list(nv, prop, strval, 0, src);
} else {
src = ZPROP_SRC_LOCAL;
- spa_prop_add_user(*nvp, za.za_name, strval,
+ spa_prop_add_user(nv, za.za_name, strval,
src);
}
kmem_free(strval, za.za_num_integers);
@@ -644,11 +632,9 @@ spa_prop_get(spa_t *spa, nvlist_t **nvp)
out:
mutex_exit(&spa->spa_props_lock);
dsl_pool_config_exit(dp, FTAG);
- if (err && err != ENOENT) {
- nvlist_free(*nvp);
- *nvp = NULL;
+
+ if (err && err != ENOENT)
return (err);
- }
return (0);
}
diff --git a/sys/contrib/openzfs/module/zfs/zfs_ioctl.c b/sys/contrib/openzfs/module/zfs/zfs_ioctl.c
index 897335dd4e4f..3e2fb73b11ed 100644
--- a/sys/contrib/openzfs/module/zfs/zfs_ioctl.c
+++ b/sys/contrib/openzfs/module/zfs/zfs_ioctl.c
@@ -3022,7 +3022,6 @@ static const zfs_ioc_key_t zfs_keys_get_props[] = {
static int
zfs_ioc_pool_get_props(const char *pool, nvlist_t *innvl, nvlist_t *outnvl)
{
- nvlist_t *nvp = outnvl;
spa_t *spa;
char **props = NULL;
unsigned int n_props = 0;
@@ -3041,16 +3040,17 @@ zfs_ioc_pool_get_props(const char *pool, nvlist_t *innvl, nvlist_t *outnvl)
*/
mutex_enter(&spa_namespace_lock);
if ((spa = spa_lookup(pool)) != NULL) {
- error = spa_prop_get(spa, &nvp);
+ error = spa_prop_get(spa, outnvl);
if (error == 0 && props != NULL)
error = spa_prop_get_nvlist(spa, props, n_props,
- &nvp);
+ outnvl);
}
mutex_exit(&spa_namespace_lock);
} else {
- error = spa_prop_get(spa, &nvp);
+ error = spa_prop_get(spa, outnvl);
if (error == 0 && props != NULL)
- error = spa_prop_get_nvlist(spa, props, n_props, &nvp);
+ error = spa_prop_get_nvlist(spa, props, n_props,
+ outnvl);
spa_close(spa, FTAG);
}
From nobody Thu Sep 5 17:44:16 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X06Dh36zRz5WTKK;
Thu, 05 Sep 2024 17:44:20 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X06Dg0Hp7z4B8b;
Thu, 5 Sep 2024 17:44:18 +0000 (UTC)
(envelope-from cy.schubert@cschubert.com)
Authentication-Results: mx1.freebsd.org;
dkim=none;
dmarc=pass (policy=quarantine) header.from=cschubert.com;
spf=pass (mx1.freebsd.org: domain of cy.schubert@cschubert.com designates 3.97.99.33 as permitted sender) smtp.mailfrom=cy.schubert@cschubert.com
Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250])
by cmsmtp with ESMTPS
id mBW8sdGhfMArNmGWosBEn6; Thu, 05 Sep 2024 17:44:18 +0000
Received: from spqr.komquats.com ([70.66.152.170])
by cmsmtp with ESMTPSA
id mGWmsRfSg2M9qmGWns2hAg; Thu, 05 Sep 2024 17:44:18 +0000
X-Auth-User: cschuber
X-Authority-Analysis: v=2.4 cv=ce5xrWDM c=1 sm=1 tr=0 ts=66d9edf2
a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17
a=IkcTkHD0fZMA:10 a=EaEq8P2WXUwA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8
a=EkcXrb_YAAAA:8 a=qj0R9Y0jjNCr4ecJS1cA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10
a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTP id 3DE4D249;
Thu, 05 Sep 2024 10:44:16 -0700 (PDT)
Received: by slippy.cwsent.com (Postfix, from userid 1000)
id 247B0293; Thu, 05 Sep 2024 10:44:16 -0700 (PDT)
X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev
Reply-to: Cy Schubert <Cy.Schubert@cschubert.com>
From: Cy Schubert <Cy.Schubert@cschubert.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Stefan =?utf-8?Q?E=C3=9Fer?= <se@FreeBSD.org>
cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
Subject: Re: git: 12e0d316644a - main - vendor/bc: upgrade to version 7.0.0
In-reply-to: <202408261628.47QGSD1E072637@gitrepo.freebsd.org>
References: <202408261628.47QGSD1E072637@gitrepo.freebsd.org>
Comments: In-reply-to Stefan =?utf-8?Q?E=C3=9Fer?= <se@FreeBSD.org>
message dated "Mon, 26 Aug 2024 16:28:13 +0000."
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Date: Thu, 05 Sep 2024 10:44:16 -0700
Message-Id: <20240905174416.247B0293@slippy.cwsent.com>
X-CMAE-Envelope: MS4xfCZdruvzL/g9gwHGYxG1yRBR4wE7kLRcFcRJIAul+1EBsmaooV6D73dJ6uJuBtbJGlUP4sVeqo+FbcNVf+fIhQDGXFc2H4vp3kiLilySzczXbqvE3dVd
X5GqSkBkfuVWodYQmg3DQv9rfNP5QiTMwPM6Wnh3WRbO/5lvKpzZOnpjzLRMcdllJ08x1dg7BijUEVUivTM5bekcD7qiyZBIizxhOdQrnXA+PUwugtyBdCxv
1PAWTC2OfF/kXO/zvTrNAmrBvc8AnG2Fpg+oK37IHy/1Cpyx1lJ+iNUhjUv/hoSTtgFzxkL3qanjMEI/HndqYcZDvlV4lZedbN+lEur5JoE=
X-Spamd-Bar: ---
X-Spamd-Result: default: False [-3.55 / 15.00];
NEURAL_HAM_LONG(-1.00)[-1.000];
NEURAL_HAM_MEDIUM(-1.00)[-1.000];
NEURAL_HAM_SHORT(-0.95)[-0.955];
DMARC_POLICY_ALLOW(-0.50)[cschubert.com,quarantine];
MV_CASE(0.50)[];
R_SPF_ALLOW(-0.20)[+ip4:3.97.99.32/31];
RWL_MAILSPIKE_VERYGOOD(-0.20)[3.97.99.33:from];
RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.33:from];
MIME_GOOD(-0.10)[text/plain];
RCVD_VIA_SMTP_AUTH(0.00)[];
ARC_NA(0.00)[];
ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US];
TO_DN_SOME(0.00)[];
MIME_TRACE(0.00)[0:+];
REPLYTO_EQ_FROM(0.00)[];
R_DKIM_NA(0.00)[];
MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org];
FROM_EQ_ENVFROM(0.00)[];
FROM_HAS_DN(0.00)[];
HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com];
TO_MATCH_ENVRCPT_ALL(0.00)[];
RCVD_COUNT_THREE(0.00)[4];
RCVD_TLS_LAST(0.00)[];
RCPT_COUNT_THREE(0.00)[4]
X-Rspamd-Queue-Id: 4X06Dg0Hp7z4B8b
In message <202408261628.47QGSD1E072637@gitrepo.freebsd.org>, Stefan
=?utf-8?Q?
E=C3=9Fer?= writes:
> The branch main has been updated by se:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=12e0d316644a4f80f5f1f78cf07bd93d
> ef43b1ca
>
> commit 12e0d316644a4f80f5f1f78cf07bd93def43b1ca
> Author: Stefan Eßer <se@FreeBSD.org>
> AuthorDate: 2024-08-23 16:45:58 +0000
> Commit: Stefan Eßer <se@FreeBSD.org>
> CommitDate: 2024-08-26 16:27:29 +0000
>
> vendor/bc: upgrade to version 7.0.0
>
> This is a production release to fix three bugs, none of which
> affects well formed scripts on FreeBSD:
>
> The first bug is that bc/dc will exit on macOS when the terminal
> is resized.
>
> The second bug is that an array, which should only be a function
> parameter, was accepted as part of larger expressions.
>
> The third bug is that the value stack for dc was cleared on any error.
> However, this is not how other dc behave. To bring dc more in line
> with other implementations, this behavior was changed. This change is
> why this version is a new major version.
>
> (cherry picked from commit 54d20d67e2af28d948ce2df13feb039fa10900fc)
>
> MFC after: 3 days
This commit introduced a regression. Prior to this one could exit bc using
the EOF character defined by stty(1), default ^D. Now one needs to enter
the word quit instead of ^D.
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org
NTP: <cy@nwtime.org> Web: https://nwtime.org
e^(i*pi)+1=0
From nobody Thu Sep 5 19:55:23 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X097v2tJKz5TmSK;
Thu, 05 Sep 2024 19:55:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X097v2M6jz4bf5;
Thu, 5 Sep 2024 19:55:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725566123;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=pdlmA1ne06i3nv5jaFYfac3M+ZgwAzU9Y3MXtVXIwhM=;
b=C+daY4UG0IFJb3TZVF/JOiIHs22I7DXdZ8XzHmw7K/Stuz6HN/O4CszK82wgxvulNSZaW/
5OPjsSUPk1zyQ58PwgKvg531sFmYR1wDeRM9b38ixnYVFqzulA8SlD09FiJuZjYJwfF4b7
1L1ko8rEZeHoTEfQXJA3mhg+49K7NkdJbJt7BCp6BVAeZYejt3h0MeiLAWZUNStY6HxhLB
8DhBNOxWW2l2NkMjWfYJOKXK+yvTrXTdlD6lRtrO1/QhOrsErs2Z/AdY032qeCEj9UgZYJ
YuvYJnwiEX8Si1HxLyeI+mK0bwn9QLZ5jGd1PV+zx6mMXMk4g0Tlnc7Bc8dl9Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725566123; a=rsa-sha256; cv=none;
b=HQPHb5kQTq4j0ZqVS0TQrrmOCN49rkQkgLIw6h3SGs0Ejirm4xvsAxM2ajc10J+BRNVbl6
6wlm4LGMdcyFWwj3o00sRikxdKZHIXVN8dxyfmlF6wGLGmgO4WwgDWYlvRQqjoRhBlW94X
c/ovHSTb7RvijiKeylB4+88Re2nhBtGELSkdyXj4/mNTwq36flGIJMf5QJ6nQ8NBlrws9+
/WNbPX3PxN1/emC48zYZ1FHpoNZf/I3jNsNlqzmLyG2YsjEK8Qj7DgHM037woZ8fqxkSyg
Q9dUCvOMJhAWuIjn6pdq3IosT/fBiY7fK1eX+R7mVqyXkdIDx0gDW7O80hASww==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725566123;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=pdlmA1ne06i3nv5jaFYfac3M+ZgwAzU9Y3MXtVXIwhM=;
b=MFfOvrmODClG8WsLPryCuMnLljNn+G6HrrSWDZEQBVtjszdvZ1KjdMJF5g2So5femhjBBI
56Ay7H1qw6Vszifwzpo/nCEfay1vZ5N8Sm4cqCkxTNM1B83tstiXhQf0SOvq8UKUHEBUew
GOdFTYVvgybTnddx7/aBTvRgL0hhX7XfWxg1Hi3N61T7ctKIw5dvFcYsvZtGaY9g6bugBn
bVZF7P/Y12xNpLrR/eOEcr18qMcztR0mBEHbdG0Ms05Wy9zkr3xUucwnAb7FpODd8Z/uEt
g0RLEOs6xuQ4rI5I5zmhfKQv/QalMlNgEhTCoac3NucGmIC67XiAuMykmwOSjw==
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 4X097v1yr1zMMd;
Thu, 5 Sep 2024 19:55:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 485JtNGH095826;
Thu, 5 Sep 2024 19:55:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485JtNL1095823;
Thu, 5 Sep 2024 19:55:23 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 19:55:23 GMT
Message-Id: <202409051955.485JtNL1095823@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: git: ed4d2a54fc7a - main - rc: network.subr update consitency
with older change (v6/v4 order)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bz
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ed4d2a54fc7a0397c2042f496f176305ca03ebdd
Auto-Submitted: auto-generated
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=ed4d2a54fc7a0397c2042f496f176305ca03ebdd
commit ed4d2a54fc7a0397c2042f496f176305ca03ebdd
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-09-04 19:03:49 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-09-05 19:53:57 +0000
rc: network.subr update consitency with older change (v6/v4 order)
As of 1b5be7204eaeeaf58eefdebe5b308f90792c693b we setup parts of IPv6
before IPv4 if configured. For consistency change a case in ifn_start()
calling ipv6_up() before ipv4_up() and reverse in ifn_stop().
MFC after: 10 days
Reviewed by: zlei
Differential Revision: https://reviews.freebsd.org/D33426
---
libexec/rc/network.subr | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr
index 257643f48ba5..931fbec19a60 100644
--- a/libexec/rc/network.subr
+++ b/libexec/rc/network.subr
@@ -46,8 +46,8 @@ ifn_start()
ifscript_up ${ifn} && cfg=0
ifconfig_up ${ifn} && cfg=0
if ! noafif $ifn; then
- afexists inet && ipv4_up ${ifn} && cfg=0
afexists inet6 && ipv6_up ${ifn} && cfg=0
+ afexists inet && ipv4_up ${ifn} && cfg=0
fi
childif_create ${ifn} && cfg=0
@@ -67,8 +67,8 @@ ifn_stop()
[ -z "$ifn" ] && err 1 "ifn_stop called without an interface"
if ! noafif $ifn; then
- afexists inet6 && ipv6_down ${ifn} && cfg=0
afexists inet && ipv4_down ${ifn} && cfg=0
+ afexists inet6 && ipv6_down ${ifn} && cfg=0
fi
ifconfig_down ${ifn} && cfg=0
ifscript_down ${ifn} && cfg=0
From nobody Thu Sep 5 20:11:44 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X09Vm37Npz5Tp9S;
Thu, 05 Sep 2024 20:11: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 4X09Vm2fthz4gDS;
Thu, 5 Sep 2024 20:11:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725567104;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ML5Nv+WTEhfoCOVQaqVkElyMlUF5MwaVqb/AHBzJpDs=;
b=psBzTkO5pY7UDVzE1ZbgD4cxebT48oP/4w3mffg6A3Lu5XLyKIeurLOTCaJ2zV8Sz8Ha0/
6iU45rFzMDAF8AsKjes+uCPFRUTd6UX1yl+ZZRovJqi0Lmn/u9nlMBbuO0rcKDQHFQWGvb
9sNX7CRxRJscucpXjKVgfkK4m4dF0fCABC5+3LMvjZUed246+Ij4aDqWryD/lbCok7Ebij
xKQE5MZ7kppsPw/aohwr7gcYohF7HpA+7E4UoLlDHo4xTJ4ZXKzkT15XsDAgbX3lRyrNdL
qMyjFppr7B/6AsTDApJc187khSROSn4mDwYo82FCsvve2xZba3PR0rLp+2tsPA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725567104; a=rsa-sha256; cv=none;
b=LVzQyvjrSPpFsPxwIrM7DRRgUpl3OMYdDQURLGgQKv0/AXQWrtabvOms3ayzfanmoxueWh
dfjQfQVTfVOZw3VPqrY4p4XplEPsTXPn/TyGfuLf7w4j0O0Rqnz7DALgN3lWXHb7Z6eGzK
n/qRVwZ/PnsrBMArQKIPCPmJHpdowaF1KrBIMTBKvfkLQNlr5AkaIHkAolMLOCabQ6mug0
OlvonCP9eswVPH4uMVAra7pdFG5z5CLtM9i5rjsjAQmxQl3f8DH4pGMHLUO73zIkdHak0l
/oXc1i2OJ+4WRedLYs+f8VN8vSh0gzmMlxcalpAaycQQ6tAyyrdTBbgM3NAqOg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725567104;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ML5Nv+WTEhfoCOVQaqVkElyMlUF5MwaVqb/AHBzJpDs=;
b=RDZOPZrLfiK+8voNpJmI2XPcbm6kqIsVdFfMtQLK2FjIjPfZjpoLpAzfnZZpMv4FvCbpWj
Skq28cbxRn/9xRPYCdMcJVD6BC+CFsn1vtXcDJagTRp19Dfvg6HG3tEd3Z18UGeTnTN/Ml
WVMIuHYKnwzPKG+zGdfIq6WiHLE0EBn0A1KDBqUvzt6q8rZrMk4sGy1xuDs73zICQhwGGq
LDeelMamMLqjek+LnBvxfYAwCJs3/2M3Sv5taiwGmyrGi9QyK3OMEhoMLJj5FrCYcO3Rb8
WSWjQis+u4azVnRb9caLbKHlf8mbc4dGo7WXhGNhjbhikXk8Swv1ggPTvpKk5g==
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 4X09Vm2FM2zMSW;
Thu, 5 Sep 2024 20:11:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 485KBiAg024976;
Thu, 5 Sep 2024 20:11:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485KBixx024974;
Thu, 5 Sep 2024 20:11:44 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 20:11:44 GMT
Message-Id: <202409052011.485KBixx024974@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Dimitry Andric <dim@FreeBSD.org>
Subject: git: 157802238b5a - main - Add UPDATING note about running
make delete-old after libc++ 18 upgrade
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dim
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 157802238b5aa7722aff40317fe6d05f5c975d71
Auto-Submitted: auto-generated
The branch main has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=157802238b5aa7722aff40317fe6d05f5c975d71
commit 157802238b5aa7722aff40317fe6d05f5c975d71
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-09-05 19:55:44 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-09-05 19:58:51 +0000
Add UPDATING note about running make delete-old after libc++ 18 upgrade
PR: 279692
MFC after: 3 days
---
UPDATING | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/UPDATING b/UPDATING
index cffafdb5d247..1aae85df0a70 100644
--- a/UPDATING
+++ b/UPDATING
@@ -55,6 +55,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
own packages. If you use pkgbase, you should install the relevant
packages: FreeBSD-cron, FreeBSD-lp, or FreeBSD-ntp.
+20240406:
+ Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
+ been upgraded to 18.1.6. It is important that you run `make delete-old`
+ as described in the COMMON ITEMS section, otherwise several libc++
+ headers that are obsolete and need to be removed can cause compilation
+ errors in C++ programs.
+
20240205:
For dynamically linked programs, system calls are now made from
libsys rather than libc. No change in linkage is required as
From nobody Thu Sep 5 21:15:06 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0Bvt5MZkz5Tyb3;
Thu, 05 Sep 2024 21:15: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 4X0Bvt4Xjmz41bB;
Thu, 5 Sep 2024 21:15:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725570906;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=JhUfbwJqU46HzAAGsarMpzE+gkIdstL5nPEJJwz33/g=;
b=iKRxhx2PvL1ljq6cOfSy3ih+66/TkHAZNV+6yueMWEU9yIFG0/zM7wq6SfSLrw4LAtaJlA
0h6Bf7HVxVY00754K3UZh7wmY+AnsLEkPsFSMBWvZ07Py+h7d31DXabCTJuaG3ny/JVsGk
vvhVy6p9p15TFEUySosP7/mgViA2L8ZF8aE3iAfCpGjpq/NkUw8lJO19qJ5CRr25dJ9IZV
e4vjFD1Yn9Nikl2FAo/K4a56GnmyEXuALbyNHhOkvJfl1mUYmsHiq6ApuasIpoibP6I0ZC
HluqvupW/8IHBjBcJa4CaA/rmUAJO8M8FElRTzTg9XlmgxqYq+4VgazEVwX46w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725570906; a=rsa-sha256; cv=none;
b=xBYj/CMlf8Xmt3uKIPaR2XCSlG0jlPgZd84dmftHGR/NoCjS/4AYatA2O4TfWXzuWLFx8T
DCxaHOd02l07TNayDGXNsljT7Qp9xpz2kuWNuofSXqgJX+3huRhQipJcPWF6c438u+8+Jq
Vhxq7jd1p+zEJW9mojuJBpCYQKACesYP2mUpEJLcYbPcLp5i9NYX2Wgb5nHKeS5KWJ9pIV
mcr+RuHsdvrHCW3jefd33eWUTXcvPK43qqQQLSeQ//xhNamGoFqiZsBYaqUMWe7hT3bP6p
a2VV58HYyQfTgfA0A5D5b7HM2jv4FeISjuvoLYCnAxIpTuCcJGD7zKGgNuxQzA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725570906;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=JhUfbwJqU46HzAAGsarMpzE+gkIdstL5nPEJJwz33/g=;
b=GTmlxKn/z7uRATehE2PEJMMrp128fjhZ/KQBL2G+OMF4aXytLEhM7AytK+y6YwvVL4LVSJ
Bb7QHNyBOskFl6bduveav7gZjXQKQUIGS1LGCvhtSaMjh47mNXRAOP1J/Af2fl1C3kSfTt
0404rG7A/Ig18oKODeLTv/rYWbR4jz+KRsriJm8I1lfUCwTKeohMVJ3Q6n83Cca2C3QhZd
axqz2NMc/MgE88jk7w7js8ZTC/wmJ3RAPTfqjDvVXyWJPtBK45f6NDjRflNa2SU/a5VjmF
DwdMFSIJSWFVCNrYtMNZvwtWSEn3/l7tYLx5oBkwJF5M/mJJVK9PK01h2YNSjg==
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 4X0Bvt48tjzPTX;
Thu, 5 Sep 2024 21:15: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 485LF6cs032535;
Thu, 5 Sep 2024 21:15:06 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485LF6cE032532;
Thu, 5 Sep 2024 21:15:06 GMT
(envelope-from git)
Date: Thu, 5 Sep 2024 21:15:06 GMT
Message-Id: <202409052115.485LF6cE032532@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: bedfac1f026f - main - nvmf_tcp: Fully honor
kern.nvmf.tcp.max_transmit_data for C2H_DATA PDUs
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: bedfac1f026fa8e2e6572ca380d89d74a01d5def
Auto-Submitted: auto-generated
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=bedfac1f026fa8e2e6572ca380d89d74a01d5def
commit bedfac1f026fa8e2e6572ca380d89d74a01d5def
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-09-05 21:14:36 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-09-05 21:14:36 +0000
nvmf_tcp: Fully honor kern.nvmf.tcp.max_transmit_data for C2H_DATA PDUs
The previous version of tcp_send_controller_data avoided sending a
chain of multiple mbufs that exceeded the limit, but if an individual
mbuf was larger than the limit it was sent as a single, over-sized
PDU. Fix by using m_split() to split individual mbufs larger than the
limit.
Note that this is not a protocol error, per se, as there is no limit
on C2H_DATA PDU lengths (unlike the MAXH2CDATA parameter). This fix
just honors the administrative limit more faithfully. This case is
also very unlikely with the default limit of 256k.
Sponsored by: Chelsio Communications
---
sys/dev/nvmf/nvmf_tcp.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/sys/dev/nvmf/nvmf_tcp.c b/sys/dev/nvmf/nvmf_tcp.c
index 67d239b63faf..22275aaa835b 100644
--- a/sys/dev/nvmf/nvmf_tcp.c
+++ b/sys/dev/nvmf/nvmf_tcp.c
@@ -1784,7 +1784,6 @@ tcp_send_controller_data(struct nvmf_capsule *nc, uint32_t data_offset,
{
struct nvmf_tcp_qpair *qp = TQP(nc->nc_qpair);
struct nvme_sgl_descriptor *sgl;
- struct mbuf *n, *p;
uint32_t data_len;
bool last_pdu, last_xfer;
@@ -1813,21 +1812,29 @@ tcp_send_controller_data(struct nvmf_capsule *nc, uint32_t data_offset,
/* Queue one more C2H_DATA PDUs containing the data from 'm'. */
while (m != NULL) {
+ struct mbuf *n;
uint32_t todo;
- todo = m->m_len;
- p = m;
- n = p->m_next;
- while (n != NULL) {
- if (todo + n->m_len > qp->max_tx_data) {
- p->m_next = NULL;
- break;
- }
- todo += n->m_len;
- p = n;
+ if (m->m_len > qp->max_tx_data) {
+ n = m_split(m, qp->max_tx_data, M_WAITOK);
+ todo = m->m_len;
+ } else {
+ struct mbuf *p;
+
+ todo = m->m_len;
+ p = m;
n = p->m_next;
+ while (n != NULL) {
+ if (todo + n->m_len > qp->max_tx_data) {
+ p->m_next = NULL;
+ break;
+ }
+ todo += n->m_len;
+ p = n;
+ n = p->m_next;
+ }
+ MPASS(m_length(m, NULL) == todo);
}
- MPASS(m_length(m, NULL) == todo);
last_pdu = (n == NULL && last_xfer);
tcp_send_c2h_pdu(qp, nc->nc_sqe.cid, data_offset, m, todo,
From nobody Fri Sep 6 01:41:26 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0JqG4L6tz5V8wL;
Fri, 06 Sep 2024 01:41: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 4X0JqF0dhYz4l1Y;
Fri, 6 Sep 2024 01:41:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725586889;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=tprwn/dGl4NkAZXCBy5kmuRWVXX2/ZwWzc+uC0VfAeY=;
b=kSa75Cynrkwv9qRMsBMr6SspMia4fHTIOr7945StkFAB2fsmUUE8DTHO8kzvFundWyxdIx
JUIiKwgXPCr45mjwvRCGKnPHbEnW9qDVJeEidss1C2MRYOZ4ZalD6qOT57ATjCAiCmGR+e
m4EigLQJ9LO88B5nCaixCJEe51474MmrqXxO7EQpEDhwu49hjLKm1jaD3d3ytorbHXHIpz
iOA1HHJGEiuTY8d9oVaCAAjwxfbub4CMq5Wz+euK2UEUtjb/bt3qfMW6qFBoOsRnLTfw6o
zwY6DGz20u5G60xI5ISSjcWhkCt+olxVDy6e49zM+BrsbeFmKYuMjn6Vqstbrg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725586889; a=rsa-sha256; cv=none;
b=n2GGShdqRZiXVqQ2LHyNEnQxysWh/MltXDnLUXrAswyp5sYQR+KK6oJLd72w6sJBLtwJkw
TS1OrBMvCxPzcjQMUPE3c+akz2sCCG6Pf8YyHEGj23sXBZomOM4etf54y3UqUDk/JjD88L
OfrChtfCXMAIrluTcmJjSotKu1J8NJ2e7NO/AVkthaDDq2q8fW34om5DvGY9rC172aJK4L
Dl9wPj6qS4LG11ayy2ucVwn80jT4AhFxbC72anrAHyL3YHqvK05LGRVusNcAKdXvQlqUol
4ar1Ae3W8aXpKvh2NDGB7sxFVyZwN+1puS8tym1n9D7FFDcg+kAgUbLczZSg/w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725586889;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=tprwn/dGl4NkAZXCBy5kmuRWVXX2/ZwWzc+uC0VfAeY=;
b=skbZVlc+ol/skI2+4OAELXUpTS+iqCJHquJ5qTUhGwcklc1L28dndQerjGQ1mQ6+ij6QQC
FaIU7MncLISC9erHTbEkNtebY826le3Hr6IjIPbRSDGwfd9nXXgGoyhClW/3S3FVg2OTpv
0tB7iY1NmbaTVwKMDQhJrDwDHLqYosHMDYgEasGyt6vCgjJFd+b2oGUjy2837/P8GzFpk4
AX5zFKHUd0GAmAsP//qxWodkG+Y7e4ag9s3bn4X1SzGV2aH5FPShHmlbOS56LEosgiacH4
JqkEIqAw5lo+9CH+0WRblfPzjwrjQl0/U4CGO2WDmdeMiHu8TRpOIOtEX1zfRA==
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 4X0JqF0CvFzYLZ;
Fri, 6 Sep 2024 01:41: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 4861fSAX083551;
Fri, 6 Sep 2024 01:41:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4861fQXD083537;
Fri, 6 Sep 2024 01:41:26 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 01:41:26 GMT
Message-Id: <202409060141.4861fQXD083537@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Philip Paeps <philip@FreeBSD.org>
Subject: git: e273650f2c53 - main - contrib/tzdata: import tzdata
2024b
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: e273650f2c538034b45f78e670a89cbf333ab6db
Auto-Submitted: auto-generated
The branch main has been updated by philip:
URL: https://cgit.FreeBSD.org/src/commit/?id=e273650f2c538034b45f78e670a89cbf333ab6db
commit e273650f2c538034b45f78e670a89cbf333ab6db
Merge: bedfac1f026f 62ad5eff8053
Author: Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2024-09-06 01:37:36 +0000
Commit: Philip Paeps <philip@FreeBSD.org>
CommitDate: 2024-09-06 01:37:36 +0000
contrib/tzdata: import tzdata 2024b
Changes: https://github.com/eggert/tz/blob/2024b/NEWS
MFC after: 3 days
contrib/tzdata/CONTRIBUTING | 18 +-
contrib/tzdata/Makefile | 412 +++++++++++-----------
contrib/tzdata/NEWS | 124 ++++++-
contrib/tzdata/africa | 73 ++--
contrib/tzdata/antarctica | 58 ++--
contrib/tzdata/asia | 442 ++++++++++++------------
contrib/tzdata/australasia | 130 +++----
contrib/tzdata/backward | 15 +-
contrib/tzdata/backzone | 35 +-
contrib/tzdata/checknow.awk | 4 +-
contrib/tzdata/etcetera | 54 +--
contrib/tzdata/europe | 713 ++++++++++++++++++++++++---------------
contrib/tzdata/leap-seconds.list | 30 +-
contrib/tzdata/leapseconds | 8 +-
contrib/tzdata/northamerica | 145 +++++---
contrib/tzdata/southamerica | 486 +++++++++++++-------------
contrib/tzdata/theory.html | 214 ++++++++----
contrib/tzdata/version | 2 +-
contrib/tzdata/ziguard.awk | 32 +-
contrib/tzdata/zone.tab | 3 +-
contrib/tzdata/zone1970.tab | 3 +-
contrib/tzdata/zonenow.tab | 8 +-
22 files changed, 1768 insertions(+), 1241 deletions(-)
diff --cc contrib/tzdata/Makefile
index d48354c72df4,000000000000..0087b4596515
mode 100644,000000..100644
--- a/contrib/tzdata/Makefile
+++ b/contrib/tzdata/Makefile
@@@ -1,1361 -1,0 +1,1381 @@@
+# Make and install tzdb code and data.
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+# Request POSIX conformance; this must be the first non-comment line.
+.POSIX:
- # On older platforms you may need to scrounge for a POSIX-conforming 'make'.
- # For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or
- # /usr/xpg4/bin/make, not /usr/ccs/bin/make.
++# On older platforms you may need to scrounge for POSIX conformance.
++# For example, on Solaris 10 (2005) with Sun Studio 12 aka Sun C 5.9 (2007),
++# use 'PATH=/usr/xpg4/bin:$PATH make CC=c99'.
+
+# To affect how this Makefile works, you can run a shell script like this:
+#
+# #!/bin/sh
- # make CC='gcc -std=gnu11' "$@"
++# make CC='gcc -std=gnu23' "$@"
+#
- # This example script is appropriate for a pre-2017 GNU/Linux system
- # where a non-default setting is needed to support this package's use of C99.
++# This example script is appropriate for a circa 2024 GNU/Linux system
++# where a non-default setting enables this package's optional use of C23.
+#
+# Alternatively, you can simply edit this Makefile to tailor the following
+# macro definitions.
+
+###############################################################################
+# Start of macros that one plausibly might want to tailor.
+
+# Package name for the code distribution.
+PACKAGE= tzcode
+
+# Version number for the distribution, overridden in the 'tarballs' rule below.
+VERSION= unknown
+
+# Email address for bug reports.
+BUGEMAIL= tz@iana.org
+
+# DATAFORM selects the data format.
+# Available formats represent essentially the same data, albeit
+# possibly with minor discrepancies that users are not likely to notice.
+# To get new features and the best data right away, use:
+# DATAFORM= vanguard
+# To wait a while before using new features, to give downstream users
+# time to upgrade zic (the default), use:
+# DATAFORM= main
+# To wait even longer for new features, use:
+# DATAFORM= rearguard
+# Rearguard users might also want "ZFLAGS = -b fat"; see below.
+DATAFORM= main
+
+# Change the line below for your timezone (after finding the one you want in
+# one of the $(TDATA) source files, or adding it to a source file).
+# Alternatively, if you discover you've got the wrong timezone, you can just
+# 'zic -l -' to remove it, or 'zic -l rightzone' to change it.
+# Use the command
+# make zonenames
+# to get a list of the values you can use for LOCALTIME.
+
+LOCALTIME= Factory
+
- # The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ
++# The POSIXRULES macro controls interpretation of POSIX-like TZ
+# settings like TZ='EET-2EEST' that lack DST transition rules.
+# If POSIXRULES is '-', no template is installed; this is the default.
+# Any other value for POSIXRULES is obsolete and should not be relied on, as:
+# * It does not work correctly in popular implementations such as GNU/Linux.
+# * It does not work even in tzcode, except for historical timestamps
+# that precede the last explicit transition in the POSIXRULES file.
+# Hence it typically does not work for current and future timestamps.
+# If, despite the above, you want a template for handling these settings,
+# you can change the line below (after finding the timezone you want in the
+# one of the $(TDATA) source files, or adding it to a source file).
+# Alternatively, if you discover you've got the wrong timezone, you can just
+# 'zic -p -' to remove it, or 'zic -p rightzone' to change it.
+# Use the command
+# make zonenames
+# to get a list of the values you can use for POSIXRULES.
+
+POSIXRULES= -
+
+# Also see TZDEFRULESTRING below, which takes effect only
+# if POSIXRULES is '-' or if the template file cannot be accessed.
+
+
+# Installation locations.
+#
+# The defaults are suitable for Debian, except that if REDO is
+# posix_right or right_posix then files that Debian puts under
+# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
+# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
+# respectively. Problems with the Debian approach are discussed in
+# the commentary for the right_posix rule (below).
+
+# Destination directory, which can be used for staging.
+# 'make DESTDIR=/stage install' installs under /stage (e.g., to
+# /stage/etc/localtime instead of to /etc/localtime). Files under
+# /stage are not intended to work as-is, but can be copied by hand to
+# the root directory later. If DESTDIR is empty, 'make install' does
+# not stage, but installs directly into production locations.
+DESTDIR =
+
+# Everything is installed into subdirectories of TOPDIR, and used there.
+# TOPDIR should be empty (meaning the root directory),
+# or a directory name that does not end in "/".
+# TOPDIR should be empty or an absolute name unless you're just testing.
+TOPDIR =
+
+# The default local timezone is taken from the file TZDEFAULT.
+TZDEFAULT = $(TOPDIR)/etc/localtime
+
+# The subdirectory containing installed program and data files, and
+# likewise for installed files that can be shared among architectures.
+# These should be relative file names.
+USRDIR = usr
+USRSHAREDIR = $(USRDIR)/share
+
+# "Compiled" timezone information is placed in the "TZDIR" directory
+# (and subdirectories).
+# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
+TZDIR_BASENAME= zoneinfo
+TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
+
+# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
+BINDIR = $(TOPDIR)/$(USRDIR)/bin
+
+# The "zdump" command goes in:
+ZDUMPDIR = $(BINDIR)
+
+# The "zic" command goes in:
+ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
+
+# Manual pages go in subdirectories of. . .
+MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
+
+# Library functions are put in an archive in LIBDIR.
+LIBDIR = $(TOPDIR)/$(USRDIR)/lib
+
+
+# Types to try, as an alternative to time_t.
+TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL)
- TIME_T_ALTERNATIVES_HEAD = int_least64_t
- TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t
++TIME_T_ALTERNATIVES_HEAD = int_least64_t.ck
++TIME_T_ALTERNATIVES_TAIL = int_least32_t.ck uint_least32_t.ck \
++ uint_least64_t.ck
+
+# What kind of TZif data files to generate. (TZif is the binary time
+# zone data format that zic generates; see Internet RFC 8536.)
+# If you want only POSIX time, with time values interpreted as
+# seconds since the epoch (not counting leap seconds), use
+# REDO= posix_only
+# below. If you want only "right" time, with values interpreted
+# as seconds since the epoch (counting leap seconds), use
+# REDO= right_only
+# below. If you want both sets of data available, with leap seconds not
+# counted normally, use
+# REDO= posix_right
+# below. If you want both sets of data available, with leap seconds counted
+# normally, use
+# REDO= right_posix
+# below. POSIX mandates that leap seconds not be counted; for compatibility
+# with it, use "posix_only" or "posix_right". Use POSIX time on systems with
+# leap smearing; this can work better than unsmeared "right" time with
+# applications that are not leap second aware, and is closer to unsmeared
+# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error).
+
+REDO= posix_right
+
+# Whether to put an "Expires" line in the leapseconds file.
+# Use EXPIRES_LINE=1 to put the line in, 0 to omit it.
+# The EXPIRES_LINE value matters only if REDO's value contains "right".
+# If you change EXPIRES_LINE, remove the leapseconds file before running "make".
+# zic's support for the Expires line was introduced in tzdb 2020a,
+# and was modified in tzdb 2021b to generate version 4 TZif files.
+# EXPIRES_LINE defaults to 0 for now so that the leapseconds file
+# can be given to pre-2020a zic implementations and so that TZif files
+# built by newer zic implementations can be read by pre-2021b libraries.
+EXPIRES_LINE= 0
+
+# To install data in text form that has all the information of the TZif data,
+# (optionally incorporating leap second information), use
+# TZDATA_TEXT= tzdata.zi leapseconds
+# To install text data without leap second information (e.g., because
+# REDO='posix_only'), use
+# TZDATA_TEXT= tzdata.zi
+# To avoid installing text data, use
+# TZDATA_TEXT=
+
+TZDATA_TEXT= leapseconds tzdata.zi
+
+# For backward-compatibility links for old zone names, use
+# BACKWARD= backward
+# To omit these links, use
+# BACKWARD=
+
+BACKWARD= backward
+
+# If you want out-of-scope and often-wrong data from the file 'backzone',
+# but only for entries listed in the backward-compatibility file zone.tab, use
+# PACKRATDATA= backzone
+# PACKRATLIST= zone.tab
+# If you want all the 'backzone' data, use
+# PACKRATDATA= backzone
+# PACKRATLIST=
+# To omit this data, use
+# PACKRATDATA=
+# PACKRATLIST=
+
+PACKRATDATA=
+PACKRATLIST=
+
+# The name of a locale using the UTF-8 encoding, used during self-tests.
+# The tests are skipped if the name does not appear to work on this system.
+
+UTF8_LOCALE= en_US.utf8
+
+# Non-default libraries needed to link.
+# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0.
+LDLIBS=
+
+# Add the following to an uncommented "CFLAGS=" line as needed
+# to override defaults specified in the source code or by the system.
+# "-DFOO" is equivalent to "-DFOO=1".
+# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime
+# formats that generate only the last two digits of year numbers
+# -DEPOCH_LOCAL if the 'time' function returns local time not UT
+# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
+# than what POSIX specifies, assuming local time is UT.
+# For example, N is 252460800 on AmigaOS.
+# -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
++# on POSIX platforms predating POSIX.1-2024
+# -DHAVE_DECL_ENVIRON if <unistd.h> declares 'environ'
+# -DHAVE_DECL_TIMEGM=0 if <time.h> does not declare timegm
+# -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
+# -DHAVE__GENERIC=0 if _Generic does not work*
+# -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux),
+# -DHAVE_GETRANDOM=0 to avoid using getrandom
+# -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris),
+# where LDLIBS also needs to contain -lintl on some hosts;
+# -DHAVE_GETTEXT=0 to avoid using gettext
+# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares
- # ctime_r and asctime_r incompatibly with the POSIX standard
++# ctime_r and asctime_r incompatibly with POSIX.1-2017 and earlier
+# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
+# -DHAVE_INTTYPES_H=0 if <inttypes.h> does not work*+
+# -DHAVE_LINK=0 if your system lacks a link function
+# -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
+# -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
+# localtime_rz can make zdump significantly faster, but is nonstandard.
+# -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure.
+# -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
+# functions like 'link' or variables like 'tzname' required by POSIX
+# -DHAVE_SETENV=0 if your system lacks the setenv function
+# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+
+# -DHAVE_STDCKDINT_H=0 if neither <stdckdint.h> nor substitutes like
+# __builtin_add_overflow work*
+# -DHAVE_STDINT_H=0 if <stdint.h> does not work*+
+# -DHAVE_STRFTIME_L if <time.h> declares locale_t and strftime_l
+# -DHAVE_STRDUP=0 if your system lacks the strdup function
+# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+
+# -DHAVE_SYMLINK=0 if your system lacks the symlink function
+# -DHAVE_SYS_STAT_H=0 if <sys/stat.h> does not work*
+# -DHAVE_TZSET=0 if your system lacks a tzset function
+# -DHAVE_UNISTD_H=0 if <unistd.h> does not work*
+# -DHAVE_UTMPX_H=0 if <utmpx.h> does not work*
+# -Dlocale_t=XXX if your system uses XXX instead of locale_t
+# -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+
+# Typically it is better to use a later standard. For example,
+# with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'.
+# Even with -DPORT_TO_C89, the code needs at least one C99
+# feature (integers at least 64 bits wide) and maybe more.
+# -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers
+# with external linkage, e.g., applications cannot define 'localtime'.
+# -Dssize_t=long on hosts like MS-Windows that lack ssize_t
- # -DSUPPORT_C89 if the tzcode library should support C89 callers+
- # However, this might trigger latent bugs in C99-or-later callers.
++# -DSUPPORT_C89=0 if the tzcode library should not support C89 callers
++# Although -DSUPPORT_C89=0 might work around latent bugs in callers,
++# it does not conform to POSIX.
++# -DSUPPORT_POSIX2008 if the library should support older POSIX callers+
++# However, this might cause problems in POSIX.1-2024-or-later callers.
+# -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has
+# security implications and is not recommended for general use
+# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires;
+# not needed by the main-program tz code, which is single-threaded.
+# Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
+# -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
+# This is intended for internal use only; it mangles external names.
+# -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
+# -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
+# the default is system-supplied, typically "/usr/lib/locale"
+# -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
- # DST transitions for POSIX.1-2017-style TZ strings lacking them,
++# DST transitions for proleptic format TZ strings lacking them,
+# in the usual case where POSIXRULES is '-'. If not specified,
+# TZDEFRULESTRING defaults to US rules for future DST transitions.
+# This mishandles some past timestamps, as US DST rules have changed.
+# It also mishandles settings like TZ='EET-2EEST' for eastern Europe,
+# as Europe and US DST rules differ.
+# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255)
+# -DUNINIT_TRAP if reading uninitialized storage can cause problems
+# other than simply getting garbage data
+# -DUSE_LTZ=0 to build zdump with the system time zone library
+# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
+# -DZIC_BLOAT_DEFAULT=\"fat\" to default zic's -b option to "fat", and
+# similarly for "slim". Fat TZif files work around incompatibilities
+# and bugs in some TZif readers, notably older ones that
+# ignore or otherwise mishandle 64-bit data in TZif files;
+# however, fat TZif files may trigger bugs in newer TZif readers.
+# Slim TZif files are more efficient, and are the default.
+# -DZIC_MAX_ABBR_LEN_WO_WARN=3
+# (or some other number) to set the maximum time zone abbreviation length
+# that zic will accept without a warning (the default is 6)
+# -g to generate symbolic debugging info
+# -Idir to include from directory 'dir'
+# -O0 to disable optimization; other -O options to enable more optimization
+# -Uname to remove any definition of the macro 'name'
+# $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
+#
+# * Options marked "*" can be omitted if your compiler is C23 compatible.
+# * Options marked "+" are obsolescent and are planned to be removed
- # once the code assumes C99 or later, say in the year 2029.
++# once the code assumes C99 or later (say in the year 2029)
++# and POSIX.1-2024 or later (say in the year 2034).
+#
+# Select instrumentation via "make GCC_INSTRUMENT='whatever'".
+GCC_INSTRUMENT = \
+ -fsanitize=undefined -fsanitize-address-use-after-scope \
+ -fsanitize-undefined-trap-on-error -fstack-protector
+# Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow.
- GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \
++GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 \
+ $(GCC_INSTRUMENT) \
+ -Wall -Wextra \
+ -Walloc-size-larger-than=100000 -Warray-bounds=2 \
+ -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \
+ -Wdeclaration-after-statement -Wdouble-promotion \
- -Wduplicated-branches -Wduplicated-cond \
++ -Wduplicated-branches -Wduplicated-cond -Wflex-array-member-not-at-end \
+ -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \
+ -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \
- -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
++ -Wmissing-declarations -Wmissing-prototypes \
++ -Wmissing-variable-declarations -Wnested-externs \
+ -Wnull-dereference \
+ -Wold-style-definition -Woverlength-strings -Wpointer-arith \
+ -Wshadow -Wshift-overflow=2 -Wstrict-overflow \
+ -Wstrict-prototypes -Wstringop-overflow=4 \
+ -Wstringop-truncation -Wsuggest-attribute=cold \
+ -Wsuggest-attribute=const -Wsuggest-attribute=format \
+ -Wsuggest-attribute=malloc \
+ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \
- -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \
++ -Wtrampolines -Wundef -Wunused-macros -Wuse-after-free=3 \
+ -Wvariadic-macros -Wvla -Wwrite-strings \
- -Wno-address -Wno-format-nonliteral -Wno-sign-compare \
- -Wno-type-limits
++ -Wno-format-nonliteral -Wno-sign-compare
+#
+# If your system has a "GMT offset" field in its "struct tm"s
+# (or if you decide to add such a field in your system's "time.h" file),
+# add the name to a define such as
+# -DTM_GMTOFF=tm_gmtoff
+# to the end of the "CFLAGS=" line. If not defined, the code attempts to
+# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
+# Similarly, if your system has a "zone abbreviation" field, define
+# -DTM_ZONE=tm_zone
+# and define NO_TM_ZONE to suppress any guessing.
- # Although these two fields are not required by POSIX.1-2017,
- # POSIX 202x/D4 requires them and they are widely available
- # on GNU/Linux and BSD systems.
++# Although POSIX.1-2024 requires these fields and they are widely available
++# on GNU/Linux and BSD systems, some older systems lack them.
+#
+# The next batch of options control support for external variables
+# exported by tzcode. In practice these variables are less useful
+# than TM_GMTOFF and TM_ZONE. However, most of them are standardized.
+# #
+# # To omit or support the external variable "tzname", add one of:
+# # -DHAVE_TZNAME=0 # do not support "tzname"
+# # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library
+# # -DHAVE_TZNAME=2 # support and define "tzname"
- # # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later.
++# # to the "CFLAGS=" line. Although "tzname" is required by POSIX.1-1988
++# # and later, its contents are unspecified if you use a geographical TZ
++# # and the variable is planned to be removed in a future POSIX edition.
+# # If not defined, the code attempts to guess HAVE_TZNAME from other macros.
+# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause
+# # crashes when combined with some platforms' standard libraries,
+# # presumably due to memory allocation issues.
+# #
+# # To omit or support the external variables "timezone" and "daylight", add
+# # -DUSG_COMPAT=0 # do not support
+# # -DUSG_COMPAT=1 # support, and variables are defined by system library
+# # -DUSG_COMPAT=2 # support and define variables
+# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix
- # # Systems Group code and are required by POSIX.1-2008 and later (with XSI).
++# # Systems Group code and are required by POSIX.1-2008 and later (with XSI),
++# # although their contents are unspecified if you use a geographical TZ
++# # and the variables are planned to be removed in a future edition of POSIX.
+# # If not defined, the code attempts to guess USG_COMPAT from other macros.
+# #
+# # To support the external variable "altzone", add
+# # -DALTZONE=0 # do not support
+# # -DALTZONE=1 # support "altzone", which is defined by system library
+# # -DALTZONE=2 # support and define "altzone"
+# # to the end of the "CFLAGS=" line; although "altzone" appeared in
+# # System V Release 3.1 it has not been standardized.
+# # If not defined, the code attempts to guess ALTZONE from other macros.
+#
+# If you want functions that were inspired by early versions of X3J11's work,
+# add
+# -DSTD_INSPIRED
+# to the end of the "CFLAGS=" line. This arranges for the following
+# functions to be added to the time conversion library.
+# "offtime" is like "gmtime" except that it accepts a second (long) argument
+# that gives an offset to add to the time_t when converting it.
+# I.e., "offtime" is like calling "localtime_rz" with a fixed-offset zone.
+# "timelocal" is nearly equivalent to "mktime".
+# "timeoff" is like "timegm" except that it accepts a second (long) argument
+# that gives an offset to use when converting to a time_t.
+# I.e., "timeoff" is like calling "mktime_z" with a fixed-offset zone.
+# "posix2time" and "time2posix" are described in an included manual page.
+# X3J11's work does not describe any of these functions.
+# These functions may well disappear in future releases of the time
+# conversion package.
+#
+# If you don't want functions that were inspired by NetBSD, add
+# -DNETBSD_INSPIRED=0
+# to the end of the "CFLAGS=" line. Otherwise, the functions
+# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
+# time library, and if STD_INSPIRED is also defined to nonzero the functions
+# "posix2time_z" and "time2posix_z" are added as well.
+# The functions ending in "_z" (or "_rz") are like their unsuffixed
+# (or suffixed-by-"_r") counterparts, except with an extra first
+# argument of opaque type timezone_t that specifies the timezone.
+# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
+#
+# If you want to allocate state structures in localtime, add
+# -DALL_STATE
+# to the end of the "CFLAGS=" line. Storage is obtained by calling malloc.
+#
+# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
+# out by the National Institute of Standards and Technology
+# which claims to test C and POSIX conformance. If you want to pass PCTS, add
+# -DPCTS
+# to the end of the "CFLAGS=" line.
+#
+# If you want strict compliance with XPG4 as of 1994-04-09, add
+# -DXPG4_1994_04_09
+# to the end of the "CFLAGS=" line. This causes "strftime" to always return
+# 53 as a week number (rather than 52 or 53) for January days before
+# January's first Monday when a "%V" format is used and January 1
+# falls on a Friday, Saturday, or Sunday.
+#
+# POSIX says CFLAGS defaults to "-O 1".
+# Uncomment the following line and edit its contents as needed.
+
+#CFLAGS= -O 1
+
+
+# The name of a POSIX-like library archiver, its flags, C compiler,
+# linker flags, and 'make' utility. Ordinarily the defaults suffice.
- # The commented-out values are the defaults specified by POSIX.1-202x/D4.
++# The commented-out values are the defaults specified by POSIX.1-2024.
+#AR = ar
+#ARFLAGS = -rv
+#CC = c17
+#LDFLAGS =
+#MAKE = make
+
- # For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
- # submake command lines. The default is no leap seconds.
-
- LEAPSECONDS=
-
+# Where to fetch leap-seconds.list from.
+leaplist_URI = \
+ https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list
+# The file is generated by the IERS Earth Orientation Centre, in Paris.
+leaplist_TZ = Europe/Paris
+
+# The zic command and its arguments.
+
+zic= ./zic
+ZIC= $(zic) $(ZFLAGS)
+
+# To shrink the size of installed TZif files,
+# append "-r @N" to omit data before N-seconds-after-the-Epoch.
+# To grow the files and work around bugs in older applications,
+# possibly at the expense of introducing bugs in newer ones,
+# append "-b fat"; see ZIC_BLOAT_DEFAULT above.
+# See the zic man page for more about -b and -r.
+ZFLAGS=
+
+# How to use zic to install TZif files.
+
- ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
++ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)'
+
+# The name of a POSIX-compliant 'awk' on your system.
+# mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work.
+# Also, it is better (though not essential) if 'awk' supports UTF-8,
+# and unfortunately mawk and busybox awk do not support UTF-8.
+# Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems.
+AWK= awk
+
+# The full path name of a POSIX-compliant shell, preferably one that supports
+# the Korn shell's 'select' statement as an extension.
+# These days, Bash is the most popular.
+# It should be OK to set this to /bin/sh, on platforms where /bin/sh
+# lacks 'select' or doesn't completely conform to POSIX, but /bin/bash
+# is typically nicer if it works.
+KSHELL= /bin/bash
+
+# Name of curl <https://curl.haxx.se/>, used for HTML validation
+# and to fetch leap-seconds.list from upstream.
++# Set CURL=: to disable use of the Internet.
+CURL= curl
+
+# Name of GNU Privacy Guard <https://gnupg.org/>, used to sign distributions.
+GPG= gpg
+
+# This expensive test requires USE_LTZ.
+# To suppress it, define this macro to be empty.
+CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
+
+# SAFE_CHAR is a regular expression that matches a safe character.
+# Some parts of this distribution are limited to safe characters;
+# others can use any UTF-8 character.
+# For now, the safe characters are a safe subset of ASCII.
+# The caller must set the shell variable 'sharp' to the character '#',
+# since Makefile macros cannot contain '#'.
+# TAB_CHAR is a single tab character, in single quotes.
+TAB_CHAR= ' '
+SAFE_CHARSET1= $(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
+SAFE_CHARSET2= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
+SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~'
+SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
+SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]'
+
+# These non-alphabetic, non-ASCII printable characters are Latin-1,
+# and so are likely displayable even in editors like XEmacs 21
+# that have limited display capabilities.
+UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷
+# Non-ASCII non-letters that OK_CHAR allows, as these characters are
+# useful in commentary.
+UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)
+
+# Put this in a bracket expression to match spaces.
+s = [:space:]
+
+# OK_CHAR matches any character allowed in the distributed files.
+# This is the same as SAFE_CHAR, except that UNUSUAL_OK_CHARSET and
+# multibyte letters are also allowed so that commentary can contain a
+# few safe symbols and people's names and can quote non-English sources.
+# Other non-letters are limited to ASCII renderings for the
+# convenience of maintainers using XEmacs 21.5.34, which by default
+# mishandles Unicode characters U+0100 and greater.
+OK_CHAR= '[][:alpha:]$(UNUSUAL_OK_CHARSET)'$(SAFE_CHARSET)'-]'
+
+# SAFE_LINE matches a line of safe characters.
+# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
+# this is so that comments can contain non-ASCII characters.
+# OK_LINE matches a line of OK characters.
+SAFE_LINE= '^'$(SAFE_CHAR)'*$$'
+SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
+OK_LINE= '^'$(OK_CHAR)'*$$'
+
+# Flags to give 'tar' when making a distribution.
+# Try to use flags appropriate for GNU tar.
- GNUTARFLAGS= --format=pax --pax-option='delete=atime,delete=ctime' \
++GNUTARFLAGS= --format=pax --pax-option=delete=atime,delete=ctime \
+ --numeric-owner --owner=0 --group=0 \
+ --mode=go+u,go-w --sort=name
- TARFLAGS= `if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
- then echo $(GNUTARFLAGS); \
- else :; \
- fi`
++SETUP_TAR= \
++ export LC_ALL=C && \
++ if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; then \
++ TAR='tar $(GNUTARFLAGS)'; \
++ else \
++ TAR=tar; \
++ fi
+
+# Flags to give 'gzip' when making a distribution.
+GZIPFLAGS= -9n
+
+# When comparing .tzs files, use GNU diff's -F'^TZ=' option if supported.
+# This makes it easier to see which Zone has been affected.
- DIFF_TZS= diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \
- || echo ' -F^TZ=')
++SETUP_DIFF_TZS = \
++ if diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1; then \
++ DIFF_TZS='diff -u -F^TZ='; \
++ else \
++ DIFF_TZS='diff -u'; \
++ fi
+
+# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
+RANLIB= :
+
+# POSIX prohibits defining or using SHELL. However, csh users on systems
+# that use the user shell for Makefile commands may need to define SHELL.
+#SHELL= /bin/sh
+
+# End of macros that one plausibly might want to tailor.
+###############################################################################
+
+
+TZCOBJS= zic.o
- TZDOBJS= zdump.o localtime.o asctime.o strftime.o
- DATEOBJS= date.o localtime.o strftime.o asctime.o
++TZDOBJS= zdump.o localtime.o strftime.o
++DATEOBJS= date.o localtime.o strftime.o
+LIBSRCS= localtime.c asctime.c difftime.c strftime.c
+LIBOBJS= localtime.o asctime.o difftime.o strftime.o
+HEADERS= tzfile.h private.h
+NONLIBSRCS= zic.c zdump.c
+NEWUCBSRCS= date.c
+SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
+ tzselect.ksh workman.sh
+MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
+ tzfile.5 tzselect.8 zic.8 zdump.8
+MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \
+ time2posix.3.txt \
+ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
+ date.1.txt
+COMMON= calendars CONTRIBUTING LICENSE Makefile \
+ NEWS README SECURITY theory.html version
+WEB_PAGES= tz-art.html tz-how-to.html tz-link.html
- CHECK_WEB_PAGES=check_theory.html check_tz-art.html \
- check_tz-how-to.html check_tz-link.html
++CHECK_WEB_PAGES=theory.ck tz-art.ck tz-how-to.ck tz-link.ck
+DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
+PRIMARY_YDATA= africa antarctica asia australasia \
+ europe northamerica southamerica
+YDATA= $(PRIMARY_YDATA) etcetera
+NDATA= factory
+TDATA_TO_CHECK= $(YDATA) $(NDATA) backward
+TDATA= $(YDATA) $(NDATA) $(BACKWARD)
+ZONETABLES= zone.tab zone1970.tab zonenow.tab
+TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES)
+LEAP_DEPS= leapseconds.awk leap-seconds.list
+TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \
+ $(PACKRATDATA) $(PACKRATLIST)
+DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA) $(PACKRATLIST)
+DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \
+ leapseconds $(ZONETABLES)
+AWK_SCRIPTS= checklinks.awk checknow.awk checktab.awk leapseconds.awk \
+ ziguard.awk zishrink.awk
+MISC= $(AWK_SCRIPTS)
+TZS_YEAR= 2050
+TZS_CUTOFF_FLAG= -c $(TZS_YEAR)
+TZS= to$(TZS_YEAR).tzs
+TZS_NEW= to$(TZS_YEAR)new.tzs
+TZS_DEPS= $(YDATA) asctime.c localtime.c \
+ private.h tzfile.h zdump.c zic.c
+TZDATA_DIST = $(COMMON) $(DATA) $(MISC)
+# EIGHT_YARDS is just a yard short of the whole ENCHILADA.
+EIGHT_YARDS = $(TZDATA_DIST) $(DOCS) $(SOURCES) tzdata.zi
+ENCHILADA = $(EIGHT_YARDS) $(TZS)
+
+# Consult these files when deciding whether to rebuild the 'version' file.
+# This list is not the same as the output of 'git ls-files', since
+# .gitignore is not distributed.
+VERSION_DEPS= \
+ calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \
+ africa antarctica asctime.c asia australasia \
+ backward backzone \
+ checklinks.awk checknow.awk checktab.awk \
+ date.1 date.c difftime.c \
+ etcetera europe factory iso3166.tab \
+ leap-seconds.list leapseconds.awk localtime.c \
+ newctime.3 newstrftime.3 newtzset.3 northamerica \
+ private.h southamerica strftime.c theory.html \
+ time2posix.3 tz-art.html tz-how-to.html tz-link.html \
+ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
+ workman.sh zdump.8 zdump.c zic.8 zic.c \
+ ziguard.awk zishrink.awk \
+ zone.tab zone1970.tab zonenow.tab
+
+all: tzselect zic zdump libtz.a $(TABDATA) \
+ vanguard.zi main.zi rearguard.zi
+
+ALL: all date $(ENCHILADA)
+
+install: all $(DATA) $(REDO) $(MANS)
+ mkdir -p '$(DESTDIR)$(BINDIR)' \
+ '$(DESTDIR)$(ZDUMPDIR)' '$(DESTDIR)$(ZICDIR)' \
+ '$(DESTDIR)$(LIBDIR)' \
+ '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \
+ '$(DESTDIR)$(MANDIR)/man8'
+ $(ZIC_INSTALL) -l $(LOCALTIME) \
- `case '$(POSIXRULES)' in ?*) echo '-p';; esac \
- ` $(POSIXRULES) \
++ -p $(POSIXRULES) \
+ -t '$(DESTDIR)$(TZDEFAULT)'
+ cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.'
+ cp tzselect '$(DESTDIR)$(BINDIR)/.'
+ cp zdump '$(DESTDIR)$(ZDUMPDIR)/.'
+ cp zic '$(DESTDIR)$(ZICDIR)/.'
+ cp libtz.a '$(DESTDIR)$(LIBDIR)/.'
+ $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a'
+ cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.'
+ cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.'
+ cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.'
+
+INSTALL: ALL install date.1
+ mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1'
+ cp date '$(DESTDIR)$(BINDIR)/.'
+ cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.'
+
+# Calculate version number from git, if available.
+# Otherwise, use $(VERSION) unless it is "unknown" and there is already
+# a 'version' file, in which case reuse the existing 'version' contents
+# and append "-dirty" if the contents do not already end in "-dirty".
+version: $(VERSION_DEPS)
+ { (type git) >/dev/null 2>&1 && \
- V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
- --abbrev=7 --dirty` || \
- if test '$(VERSION)' = unknown && V=`cat $@`; then \
- case $$V in *-dirty);; *) V=$$V-dirty;; esac; \
++ V=$$(git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
++ --abbrev=7 --dirty) || \
++ if test '$(VERSION)' = unknown && read -r V <$@; then \
++ V=$${V%-dirty}-dirty; \
+ else \
+ V='$(VERSION)'; \
+ fi; } && \
+ printf '%s\n' "$$V" >$@.out
+ mv $@.out $@
+
+# These files can be tailored by setting BACKWARD, PACKRATDATA, PACKRATLIST.
+vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS)
+ $(AWK) \
- -v DATAFORM=`expr $@ : '\(.*\).zi'` \
++ -v DATAFORM=$(@:.zi=) \
+ -v PACKRATDATA='$(PACKRATDATA)' \
+ -v PACKRATLIST='$(PACKRATLIST)' \
+ -f ziguard.awk \
+ $(TDATA) $(PACKRATDATA) >$@.out
+ mv $@.out $@
+# This file has a version comment that attempts to capture any tailoring
+# via BACKWARD, DATAFORM, PACKRATDATA, PACKRATLIST, and REDO.
+tzdata.zi: $(DATAFORM).zi version zishrink.awk
- version=`sed 1q version` && \
++ read -r version <version && \
+ LC_ALL=C $(AWK) \
+ -v dataform='$(DATAFORM)' \
+ -v deps='$(DSTDATA_ZI_DEPS) zishrink.awk' \
+ -v redo='$(REDO)' \
+ -v version="$$version" \
+ -f zishrink.awk \
+ $(DATAFORM).zi >$@.out
+ mv $@.out $@
+
+tzdir.h:
+ printf '%s\n' >$@.out \
+ '#ifndef TZDEFAULT' \
+ '# define TZDEFAULT "$(TZDEFAULT)" /* default zone */' \
+ '#endif' \
+ '#ifndef TZDIR' \
+ '# define TZDIR "$(TZDIR)" /* TZif directory */' \
+ '#endif'
+ mv $@.out $@
+
+version.h: version
- VERSION=`cat version` && printf '%s\n' \
++ read -r VERSION <version && printf '%s\n' \
+ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \
+ "static char const TZVERSION[]=\"$$VERSION\";" \
+ 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \
+ >$@.out
+ mv $@.out $@
+
+zdump: $(TZDOBJS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
+
+zic: $(TZCOBJS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
+
+leapseconds: $(LEAP_DEPS)
+ $(AWK) -v EXPIRES_LINE=$(EXPIRES_LINE) \
+ -f leapseconds.awk leap-seconds.list >$@.out
+ mv $@.out $@
+
+# Awk script to extract a Git-style author from leap-seconds.list comments.
+EXTRACT_AUTHOR = \
+ author_line { sub(/^.[[:space:]]*/, ""); \
+ sub(/:[[:space:]]*/, " <"); \
+ printf "%s>\n", $$0; \
+ success = 1; \
+ exit \
+ } \
+ /Questions or comments to:/ { author_line = 1 } \
+ END { exit !success }
+
+# Fetch leap-seconds.list from upstream.
+fetch-leap-seconds.list:
+ $(CURL) -OR $(leaplist_URI)
+
+# Fetch leap-seconds.list from upstream and commit it to the local repository.
+commit-leap-seconds.list: fetch-leap-seconds.list
+ author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \
+ date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \
+ git commit --author="$$author" --date="$$date" -m'make $@' \
+ leap-seconds.list
+
- # Arguments to pass to submakes of install_data.
++# Arguments to pass to submakes.
+# They can be overridden by later submake arguments.
+INSTALLARGS = \
+ BACKWARD='$(BACKWARD)' \
+ DESTDIR='$(DESTDIR)' \
- LEAPSECONDS='$(LEAPSECONDS)' \
+ PACKRATDATA='$(PACKRATDATA)' \
+ PACKRATLIST='$(PACKRATLIST)' \
+ TZDEFAULT='$(TZDEFAULT)' \
+ TZDIR='$(TZDIR)' \
+ ZIC='$(ZIC)'
+
+INSTALL_DATA_DEPS = zic leapseconds tzdata.zi
+
- # 'make install_data' installs one set of TZif files.
- install_data: $(INSTALL_DATA_DEPS)
- $(ZIC_INSTALL) tzdata.zi
-
+posix_only: $(INSTALL_DATA_DEPS)
- $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data
++ $(ZIC_INSTALL) tzdata.zi
+
+right_only: $(INSTALL_DATA_DEPS)
- $(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \
- install_data
++ $(ZIC_INSTALL) -L leapseconds tzdata.zi
+
+# In earlier versions of this makefile, the other two directories were
+# subdirectories of $(TZDIR). However, this led to configuration errors.
+# For example, with posix_right under the earlier scheme,
+# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
+# but gmtime without leap seconds, which led to problems with applications
+# like sendmail that subtract gmtime from localtime.
+# Therefore, the other two directories are now siblings of $(TZDIR).
+# You must replace all of $(TZDIR) to switch from not using leap seconds
+# to using them, or vice versa.
+right_posix: right_only
+ rm -fr '$(DESTDIR)$(TZDIR)-leaps'
+ ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
+
+posix_right: posix_only
+ rm -fr '$(DESTDIR)$(TZDIR)-posix'
+ ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
+
+zones: $(REDO)
+
+# dummy.zd is not a real file; it is mentioned here only so that the
+# top-level 'make' does not have a syntax error.
+ZDS = dummy.zd
+# Rule used only by submakes invoked by the $(TZS_NEW) rule.
+# It is separate so that GNU 'make -j' can run instances in parallel.
+$(ZDS): zdump
- ./zdump -i $(TZS_CUTOFF_FLAG) '$(wd)/'$$(expr $@ : '\(.*\).zd') \
- >$@
++ ./zdump -i $(TZS_CUTOFF_FLAG) "$$PWD/$(@:.zd=)" >$@
+
+TZS_NEW_DEPS = tzdata.zi zdump zic
+$(TZS_NEW): $(TZS_NEW_DEPS)
+ rm -fr tzs$(TZS_YEAR).dir
+ mkdir tzs$(TZS_YEAR).dir
+ $(zic) -d tzs$(TZS_YEAR).dir tzdata.zi
+ $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \
+ tzdata.zi | LC_ALL=C sort >$@.out
- wd=`pwd` && \
- x=`$(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \
++ x=$$($(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \
+ tzdata.zi \
- | LC_ALL=C sort -t . -k 2,2` && \
++ | LC_ALL=C sort -t . -k 2,2) && \
+ set x $$x && \
+ shift && \
+ ZDS=$$* && \
- $(MAKE) wd="$$wd" TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \
++ $(MAKE) TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \
+ ZDS="$$ZDS" $$ZDS && \
+ sed 's,^TZ=".*\.dir/,TZ=",' $$ZDS >>$@.out
+ rm -fr tzs$(TZS_YEAR).dir
+ mv $@.out $@
+
- # If $(TZS) exists but 'make check_tzs' fails, a maintainer should inspect the
++# If $(TZS) exists but 'make tzs.ck' fails, a maintainer should inspect the
+# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
+$(TZS):
+ touch $@
+
+force_tzs: $(TZS_NEW)
+ cp $(TZS_NEW) $(TZS)
+
+libtz.a: $(LIBOBJS)
+ rm -f $@
+ $(AR) $(ARFLAGS) $@ $(LIBOBJS)
+ $(RANLIB) $@
+
+date: $(DATEOBJS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
+
+tzselect: tzselect.ksh version
- VERSION=`cat version` && sed \
++ read -r VERSION <version && sed \
+ -e "s'#!/bin/bash'#!"'$(KSHELL)'\' \
+ -e s\''\(AWK\)=[^}]*'\''\1=\'\''$(AWK)\'\'\' \
+ -e s\''\(PKGVERSION\)=.*'\''\1=\'\''($(PACKAGE)) \'\'\' \
+ -e s\''\(REPORT_BUGS_TO\)=.*'\''\1=\'\''$(BUGEMAIL)\'\'\' \
+ -e s\''\(TZDIR\)=[^}]*'\''\1=\'\''$(TZDIR)\'\'\' \
+ -e s\''\(TZVERSION\)=.*'\''\1=\'"'$$VERSION\\''" \
+ <$@.ksh >$@.out
+ chmod +x $@.out
+ mv $@.out $@
+
- check: check_back check_mild
- check_mild: check_character_set check_white_space check_links \
- check_name_lengths check_now \
- check_slashed_abbrs check_sorted \
- check_tables check_web check_ziguard check_zishrink check_tzs
++check: check_mild back.ck
++check_mild: check_web check_zishrink \
++ character-set.ck white-space.ck links.ck mainguard.ck \
++ name-lengths.ck now.ck slashed-abbrs.ck sorted.ck \
++ tables.ck ziguard.ck tzs.ck
+
+# True if UTF8_LOCALE does not work;
+# otherwise, false but with LC_ALL set to $(UTF8_LOCALE).
*** 638 LINES SKIPPED ***
From nobody Fri Sep 6 02:09:25 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0KRZ5NvDz5VCkZ;
Fri, 06 Sep 2024 02:09:30 +0000 (UTC)
(envelope-from philip@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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0KRZ3S7Mz4nf8;
Fri, 6 Sep 2024 02:09:30 +0000 (UTC)
(envelope-from philip@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725588570;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=DJMdQ/lTJ77rjilac5zERlZECiXvk4zAG8NU/l4Abl0=;
b=g+WV7YIzVErlSyWHanLylkiLdoCPpnX2zdDvi7aLdMnY4N9v9215V9S2MHxrrzd34tfQnX
StIB1dMsZLN6oqPPMp0uIauTZ4XTDZ++7HUzJwRrwOWCsZ3qVY/jCAXxFSRHv4pSomOSAY
frrd+vZ39ZCbt/x37BK3JEyhGKYDRFLzgN1jyoMKB2P6c5YXtVzCoJMCLkZs8qaPhmtAOG
XzHONkUQrPBA7OVVA6qMWtaI270FzizKrhzYIJEJh4yN7vu4dMR1dl++ffkWWtr+cHULFh
c4oyskmRb++sZ8E/WcvwZRyFcrziU8VQUz3hcGbCJvalvhIBtS+2H8p8El0agw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725588570; a=rsa-sha256; cv=none;
b=YvgC6BfODdwIIyL4+EnIteTzL41JK0bI3rDWVbB8bMaMubmvWwLWv47VMJvB2D7X5Lbt8w
7MNN4e1Ed1aKbDu8pXKX1yHs1PhDdMB4I/T1zCxFffWrXW/Rg760OgF6iHKqHWgGrpALEi
tHkowluPPRixSjPV+Lkvu/FhtRmPCWhwFoNvIC31dxPDS+o0c2ytol1PdFPWqkm4R7BJZJ
kkZ861JD0Gr+/KExNPm7Mo1MDQH7uGmIvnVGQo4eCwJ0Ouj1KGCpJ1m7Bj7ZsmGppDS3i9
7B/uWDfM0DuwE7N2cMOkHyv3kWlGOeiRZEWK0HD6a+0eU13KmDuZ3bZt1WgrUg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725588570;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=DJMdQ/lTJ77rjilac5zERlZECiXvk4zAG8NU/l4Abl0=;
b=YCcUgf5riIgOEOn++quVopjYWd9ZiFryEhh7Jj3s9iJEfKQCAuFErEj1utqRa0A1+shDN3
Odb4/BSY4kUjFa+6xLu2vRLAielrLgG9cgNhNWdqXDX/fuQ77iy1BKPA5+8D1k1LSAa7wh
AP3IkOVUPVNO0ERKNHC/rtfgqAgbWp7q8wKixZIFZ4a25rbB/wMr2xaE0wz+i6QMGiF/+t
y+HEZTwr9LmG4Nsa4UYuwS2nzYKRlq4rVfX5BMstsCtyF1ZHjGjp7Dbol3F1oIX3yacsve
u8AN00LyOyL5cobDbSyFq9h5tF7mc7RGG5TYavU0D1CDWe2VUnb+VPBJU4s4lg==
Received: from fauth1-smtp.messagingengine.com (fauth1-smtp.messagingengine.com [103.168.172.200])
(using TLSv1.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: philip/mail)
by smtp.freebsd.org (Postfix) with ESMTPSA id 4X0KRZ2YyXz1NrJ;
Fri, 6 Sep 2024 02:09:30 +0000 (UTC)
(envelope-from philip@freebsd.org)
Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47])
by mailfauth.phl.internal (Postfix) with ESMTP id B01BD120006E;
Thu, 5 Sep 2024 22:09:29 -0400 (EDT)
Received: from phl-mailfrontend-02 ([10.202.2.163])
by phl-compute-07.internal (MEProxy); Thu, 05 Sep 2024 22:09:29 -0400
X-ME-Sender: <xms:WWTaZhXUdbqr9qs7k2m9QlLnusf0goTIvvwhvGgDcOv4DYjl5SknwA>
<xme:WWTaZhlHCEIM4SDbxYGEL1IYqRvqvgK-DczEj4lrx2ZvS2uDHpdujPQPST_B76K8K
_s319rCkzhvgZerkIM>
X-ME-Received: <xmr:WWTaZtYT072MgOSz8KqhWpTMJPQTQGJEPxOcNhf8Bk4QZPrGozOWws5UeguygUgTBp1hRoUfFMOmpOOwecgc71bHq8EebRAbIA>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeitddgheegucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff
fokfgjfhggtgesthdtmhdtredttdenucfhrhhomheprfhhihhlihhpucfrrggvphhsuceo
phhhihhlihhpsehfrhgvvggsshgurdhorhhgqeenucggtffrrghtthgvrhhnpeevvdeihe
etgeehvdeivdejteejgeejgfehffekgfdvveeugeevkefhjeegffetgeenucffohhmrghi
nhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe
hmrghilhhfrhhomhepphhhihhlihhpodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhi
thihqdduudeiiedviedvgeekqddvfeehudektddtkedqphhhihhlihhppeepfhhrvggvsg
hsugdrohhrghesthhrohhusghlvgdrihhspdhnsggprhgtphhtthhopeefpdhmohguvgep
shhmthhpohhuthdprhgtphhtthhopehsrhgtqdgtohhmmhhithhtvghrshesfhhrvggvsg
hsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqdgrlhhlsehf
rhgvvggsshgurdhorhhgpdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqmh
grihhnsehfrhgvvggsshgurdhorhhg
X-ME-Proxy: <xmx:WWTaZkUi3ZiApJKTcsI_2G2rNm6bk4aYMZdPZyBEh-f3p6pEhw9D9w>
<xmx:WWTaZrlZ0Ww8LdysJsQ9e8RuWyYJ97gvMm2DQlOE6LVXm2BkcVDsmw>
<xmx:WWTaZhcGMhExenBj4wUjftntdBz6uRaWOEzPeEIzyUYTuhv-yrRqYg>
<xmx:WWTaZlHTlkU2T6hWC1Ab6U2yUKB88UEWjjusYAkKUT6xCoAR8V4Bzw>
<xmx:WWTaZlmMbzh5_JdJU4c99CS9DxK0Y3O0PPCPQpiF4o6_T7loEqR1UNqn>
Feedback-ID: ia691475d:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu,
5 Sep 2024 22:09:28 -0400 (EDT)
From: Philip Paeps <philip@freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
Subject: Re: git: e273650f2c53 - main - contrib/tzdata: import tzdata 2024b
Date: Fri, 06 Sep 2024 10:09:25 +0800
X-Mailer: MailMate (1.14r6059)
Message-ID: <4C1DCB9A-5437-4EB7-83EE-E444C8120E6C@freebsd.org>
In-Reply-To: <202409060141.4861fQXD083537@gitrepo.freebsd.org>
References: <202409060141.4861fQXD083537@gitrepo.freebsd.org>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; format=flowed
On 2024-09-06 09:41:26 (+0800), Philip Paeps wrote:
> commit e273650f2c538034b45f78e670a89cbf333ab6db
> Merge: bedfac1f026f 62ad5eff8053
> Author: Philip Paeps <philip@FreeBSD.org>
> AuthorDate: 2024-09-06 01:37:36 +0000
> Commit: Philip Paeps <philip@FreeBSD.org>
> CommitDate: 2024-09-06 01:37:36 +0000
>
> contrib/tzdata: import tzdata 2024b
>
> Changes: https://github.com/eggert/tz/blob/2024b/NEWS
>
> MFC after: 3 days
Since this upstream release only changes historical timestamps (before
April 2008), I won't ask the security-officer team to issue an erratum
for this update. I will merge the changes to the stable/X branches as
usual, and include them in the merge to releng/X branches for a future
update. (This will probably not be far off.)
Philip
From nobody Fri Sep 6 02:10:30 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0KSp0tLSz5VCT9
for <dev-commits-src-main@mlmmj.nyi.freebsd.org>; Fri, 06 Sep 2024 02:10:34 +0000 (UTC)
(envelope-from shawn.webb@hardenedbsd.org)
Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42])
(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 4X0KSm6fmSz4njx
for <dev-commits-src-main@freebsd.org>; Fri, 6 Sep 2024 02:10:32 +0000 (UTC)
(envelope-from shawn.webb@hardenedbsd.org)
Authentication-Results: mx1.freebsd.org;
dkim=pass header.d=hardenedbsd.org header.s=google header.b=UfXjPdEA;
dmarc=none;
spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::d42 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org
Received: by mail-io1-xd42.google.com with SMTP id ca18e2360f4ac-82a3022be9eso64466939f.3
for <dev-commits-src-main@freebsd.org>; Thu, 05 Sep 2024 19:10:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=hardenedbsd.org; s=google; t=1725588632; x=1726193432; darn=freebsd.org;
h=in-reply-to:content-disposition:mime-version:references:message-id
:subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to;
bh=mQOGOXPPnu9CpMkFeX/a21EcF6mX7LWE4UKf2/BIVqY=;
b=UfXjPdEAzzSBy5opNNUcFJh4nYzGzk9nERtUcFV0TnP5aDeSMWTtbQj/iylQwFF3DD
Jfmhace44dZMVxk5Ay4fBgDem0m8WYtkKrJzB+RZY9i7dZgV+zFoCE5bAYbMTBXYDsXm
L/zjN0gAOR4F5vJTdy9owgwt6w89fe3SwPh699e87pIXMgOP1SHTLJz637a8HP2ejdL7
m6rLZDysSLDs16OEtHQFCbfO1aeLY/SiF8v/JCgkDFmUvPBC7VEg2iJ5AaWLon4nad2X
2BCWgdKRWGDW/4yl6bdz7WTup5RmtR/VAIdNLvHnYYHJjc0/lA66f/e0B1T1Z0aldD3t
6/JA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1725588632; x=1726193432;
h=in-reply-to:content-disposition:mime-version:references:message-id
:subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=mQOGOXPPnu9CpMkFeX/a21EcF6mX7LWE4UKf2/BIVqY=;
b=d6Rg9BljDGAiDmzemfsLYgGemVEQ4eKNzT/UhWbU4ZLqyXmUbAbgIB+YRE82nuwfeO
OOYgPoRdmbG0U5HkkkAVW5miOAzOjcQgKVvE9FOaZ7DqiPvYQr+zPTBcz7irw/y/4Gjd
sE9YkZLQ7fChZEh/WKQfu7dDj//TxrpsM5kVJRcRfC7W8qWSkE2H66OeDROSw+j2inB7
7NhgcIW/LzLLav2cm6lhUGcQKFw5jJIuPRgJO2bd5u+r5w6PY0igGUjyHiPpf7OSxcZA
aw+ASdu3qV5gDbvH2tsebiUMC7WaM3z43ns6lt0WD6ztxf+MGClMqaohEYB9zOYN6hvl
MvEg==
X-Forwarded-Encrypted: i=1; AJvYcCW5KHgeCvnMZuSD7BLfC1l0Mx5oT49oh4IfpcGs42kAaPGWsSV05MZxiMRO3l7naLmQulqoEQC6LePgVQYHepz/FA2gsQ==@freebsd.org
X-Gm-Message-State: AOJu0Yw6JmiGRFXF9dBFR1YMPqTk6MU98cyJu+bc3mIHj5MT42ULbKWA
hgoYj5yiOVlNdYcfik/2Gshl8myVkfqSb0Q7x95SGviN6ilamwqx7nRXjFECmEM=
X-Google-Smtp-Source: AGHT+IGs2oS8XhhuB9VIdKlYHAdEaoQ8yrpYPMRuHRnRn0Z8atXS6OkZlh7SWF7pCrw7NfXudJGIYQ==
X-Received: by 2002:a05:6e02:1541:b0:39b:25dc:7bd6 with SMTP id e9e14a558f8ab-3a04f073206mr11966665ab.4.1725588631639;
Thu, 05 Sep 2024 19:10:31 -0700 (PDT)
Received: from mutt-hbsd (174-24-73-190.clsp.qwest.net. [174.24.73.190])
by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-39f6b33d6c9sm18768765ab.2.2024.09.05.19.10.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 05 Sep 2024 19:10:31 -0700 (PDT)
Date: Fri, 6 Sep 2024 02:10:30 +0000
From: Shawn Webb <shawn.webb@hardenedbsd.org>
To: Mark Johnston <markj@freebsd.org>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Subject: Re: git: e962b37bf0ff - main - bhyve: Do not enable PCI BAR decoding
if a boot ROM is present
Message-ID: <qkp2zbmykgwsbrxekut35rexlktypzg5oj2bbfslig7eksprpi@2lw5x47mtytp>
X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD
15.0-CURRENT-HBSD
X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
References: <202408191359.47JDxAbK026029@gitrepo.freebsd.org>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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-sha256;
protocol="application/pgp-signature"; boundary="g5khyvupkahmttj3"
Content-Disposition: inline
In-Reply-To: <202408191359.47JDxAbK026029@gitrepo.freebsd.org>
X-Spamd-Bar: -----
X-Spamd-Result: default: False [-5.08 / 15.00];
SIGNED_PGP(-2.00)[];
NEURAL_HAM_MEDIUM(-1.00)[-1.000];
NEURAL_HAM_LONG(-1.00)[-1.000];
NEURAL_HAM_SHORT(-0.98)[-0.979];
MID_RHS_NOT_FQDN(0.50)[];
R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c];
MIME_GOOD(-0.20)[multipart/signed,text/plain];
R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google];
ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US];
ARC_NA(0.00)[];
FROM_HAS_DN(0.00)[];
MIME_TRACE(0.00)[0:+,1:+,2:~];
MISSING_XM_UA(0.00)[];
RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::d42:from];
TO_DN_SOME(0.00)[];
RCVD_VIA_SMTP_AUTH(0.00)[];
DMARC_NA(0.00)[hardenedbsd.org];
MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org];
RCVD_COUNT_TWO(0.00)[2];
FROM_EQ_ENVFROM(0.00)[];
RCPT_COUNT_THREE(0.00)[4];
TO_MATCH_ENVRCPT_SOME(0.00)[];
RCVD_TLS_LAST(0.00)[];
PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org];
DKIM_TRACE(0.00)[hardenedbsd.org:+]
X-Rspamd-Queue-Id: 4X0KSm6fmSz4njx
--g5khyvupkahmttj3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hey Mark,
This commit seems to force me to now pass "-o pci.enable_bars=3Dtrue" to
all my VMs on amd64. I wonder if that might be a POLA violation. I
didn't realize that I needed to set that until I bisected the src
tree, looking for the commit that broke bhyve for me.
Is changing the default here really worth it for amd64? If so, I'm
thinking this should be in both RELNOTES and UPDATING. I now have to
propigate re-enabling this across my entire infrastructure.
Thanks,
--=20
Shawn Webb
Cofounder / Security Engineer
HardenedBSD
Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50
https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A=
4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
On Mon, Aug 19, 2024 at 01:59:10PM UTC, Mark Johnston wrote:
> The branch main has been updated by markj:
>=20
> URL: https://cgit.FreeBSD.org/src/commit/?id=3De962b37bf0ffe7f30f5b025b46=
ea49ba01c71f2f
>=20
> commit e962b37bf0ffe7f30f5b025b46ea49ba01c71f2f
> Author: Mark Johnston <markj@FreeBSD.org>
> AuthorDate: 2024-08-19 13:56:06 +0000
> Commit: Mark Johnston <markj@FreeBSD.org>
> CommitDate: 2024-08-19 13:56:06 +0000
>=20
> bhyve: Do not enable PCI BAR decoding if a boot ROM is present
> =20
> Let the boot ROM handle BAR initialization. This fixes a problem whe=
re
> u-boot's BAR remapping conflicts with some limitations in bhyve. See
> https://lists.freebsd.org/archives/freebsd-virtualization/2024-April/=
002103.html
> for a description of what goes wrong.
> =20
> The old behaviour can be restored by setting the pci.enable_bars
> configuration variable.
> =20
> Reviewed by: corvink, jhb
> Sponsored by: Innovate UK
> Differential Revision: https://reviews.freebsd.org/D45049
> ---
> usr.sbin/bhyve/bhyve_config.5 | 3 +++
> usr.sbin/bhyve/pci_emul.c | 27 ++++++++++++++++++++++++---
> 2 files changed, 27 insertions(+), 3 deletions(-)
>=20
> diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5
> index ebbb206cca9f..25185e2ef1b4 100644
> --- a/usr.sbin/bhyve/bhyve_config.5
> +++ b/usr.sbin/bhyve/bhyve_config.5
> @@ -157,6 +157,9 @@ Specify the keyboard layout name with the file name in
> This value only works when loaded with UEFI mode for VNC, and
> used a VNC client that don't support QEMU Extended Key Event
> Message (e.g. TightVNC).
> +.It Va pci.enable_bars Ta bool Ta Ta
> +Enable and map PCI BARs before executing any guest code.
> +This setting is false by default when using a boot ROM and true otherwis=
e.
> .It Va tpm.path Ta string Ta Ta
> Path to the host TPM device.
> This is typically /dev/tpm0.
> diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
> index 00e9138d3910..e066d6766f3c 100644
> --- a/usr.sbin/bhyve/pci_emul.c
> +++ b/usr.sbin/bhyve/pci_emul.c
> @@ -48,6 +48,7 @@
> =20
> #include "acpi.h"
> #include "bhyverun.h"
> +#include "bootrom.h"
> #include "config.h"
> #include "debug.h"
> #ifdef __amd64__
> @@ -853,6 +854,14 @@ pci_emul_alloc_bar(struct pci_devinst *pdi, int idx,=
enum pcibar_type type,
> TAILQ_INSERT_BEFORE(bar, new_bar, chain);
> }
> =20
> + /*
> + * Enable PCI BARs only if we don't have a boot ROM, i.e., bhyveload was
> + * used to load the initial guest image. Otherwise, we rely on the boot
> + * ROM to handle this.
> + */
> + if (!get_config_bool_default("pci.enable_bars", !bootrom_boot()))
> + return (0);
> +
> /*
> * pci_passthru devices synchronize their physical and virtual command
> * register on init. For that reason, the virtual cmd reg should be
> @@ -966,8 +975,19 @@ pci_emul_assign_bar(struct pci_devinst *const pdi, c=
onst int idx,
> pci_set_cfgdata32(pdi, PCIR_BAR(idx + 1), bar >> 32);
> }
> =20
> - if (type !=3D PCIBAR_ROM) {
> - register_bar(pdi, idx);
> + switch (type) {
> + case PCIBAR_IO:
> + if (porten(pdi))
> + register_bar(pdi, idx);
> + break;
> + case PCIBAR_MEM32:
> + case PCIBAR_MEM64:
> + case PCIBAR_MEMHI64:
> + if (memen(pdi))
> + register_bar(pdi, idx);
> + break;
> + default:
> + break;
> }
> =20
> return (0);
> @@ -1140,7 +1160,8 @@ pci_emul_init(struct vmctx *ctx, struct pci_devemu =
*pde, int bus, int slot,
> pci_set_cfgdata8(pdi, PCIR_INTLINE, 255);
> pci_set_cfgdata8(pdi, PCIR_INTPIN, 0);
> =20
> - pci_set_cfgdata8(pdi, PCIR_COMMAND, PCIM_CMD_BUSMASTEREN);
> + if (!get_config_bool_default("pci.enable_bars", !bootrom_boot()))
> + pci_set_cfgdata8(pdi, PCIR_COMMAND, PCIM_CMD_BUSMASTEREN);
> =20
> err =3D (*pde->pe_init)(pdi, fi->fi_config);
> if (err =3D=3D 0)
>=20
--g5khyvupkahmttj3
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmbaZIgACgkQ/y5nonf4
4fqYDQ//eMyzfZ4TVp20Zm7/sUsJh6YKTROAvwI0Lzt7H70FavlXkkUF1+L1qqTQ
J9xpLPlN8ee+24b7DcQh4Aad+JGSB0rc46fhDSlBx2RMkceiL+fvbVtPSNdSRfF6
qrpoShG0PKqR9hwINK8lqrRTT/SyF6g4AKh1n+mt9jEtJ9thj8QP53mLEYqiKukH
/Kg+grYL0QsmYJYI2LCPJBXSXFF+5IyOtmt6QVn+W2v0WTQr0OBtHIeKZNKv0/02
CJGjRRx0I5yt1aAXNGZJXwzICLbqeucuxf3+jaCo900fsIqSQK4QbVRufTkWcFvp
t0r2Piwi9TjaoOZpo61mdbN1k+2YXyQkXiKfVh6Os7Y4afBLLJb8v10d3EobqYXp
4B5atNWnAmbpB9TRaPM2LKsJyTzcDKSRFk2DHxM4Z0j0Jhr96K1U0DffuEL+Dokt
v5nHXSNDltnXQo9+iP4FIThJJEIStxXf20LoCZcwPOvg+llthwSMhLIOhwn9e+75
A77V3cV7/bNbu/0a47kwLNoyLMkBepTXkbBIME71EFYhO6StP5t+zLHWXbV3T0eM
X/ZcQspiOs5KYcOSP/XV0BJkgebqhokIioNI4MFothxP4Pqxc9xZPtBu98nnkt7v
ZBeGucp42vo1eyp2AEUrJVimI3P4vk6JVkLUJIs9rDQr5OxL+4M=
=CpdA
-----END PGP SIGNATURE-----
--g5khyvupkahmttj3--
From nobody Fri Sep 6 07:17:40 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0SH90YgGz5WC0J;
Fri, 06 Sep 2024 07:17: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 4X0SH904Jxz4KYk;
Fri, 6 Sep 2024 07:17:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725607061;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=euIRwqxLb1sq3IYquP8Ss7+nHFVbX5IuP6IjBpS6x8Q=;
b=T2QuJyHYyv8IhDP9+AC5IOelB3lHlEb27OQ3IK7UVjnhyhyUnceYQeA1qDU3j+XpM1x3Mx
xMA2f0KvX85wDIUcAVfriDQD0/6PewFB3LUNP98TlNVU/0UaieTPzLyxfWynY9IM0z2shk
ikW5EQcPLJt0E6ibVBVyvhQNIwB+3ryMQ9FXW7al60EYZyRsKaIdSVIFYsIG6ulc6Vu2NC
12LHotuVL9pT3gcvPAM0CBAZYj03vcnBWoZV0bPjtdnmFPsQyud74hzaXq30QG/i27Q5rc
A3eTJjswwjUyogwzP3eMRdY0MDMaEOFw3bTaj3Ghea6IumhuXNomLkhIf1PLrQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725607061; a=rsa-sha256; cv=none;
b=kugGIF8lQd/m6setUZigQ94njk8+MRLp0ees5MRhKJ7PCbrjA3dP+Mh0XBP+XcwkAp82U3
mDhCeT6n4iAXEkdNMIuTf+rpaIW6nZ+8vUAcTtL0pKc+/o3eRxxJ71bl8GKDDzgjZkxPOd
VzcEL5RK39LxrH3ke9iJLO4kN2w+qr/d/DYPYskYZBkg8Dpkgcjb71pNa28ZK4dO/AULQV
+6XBghhyJvLqiXhSmQVxGHwhlmqbZO8bRqsrlKknF/chaYW6zgr9jOwZ5jVyCnliuDoUzc
VcZiIgU+MHjD2JFkQeqLPaCX7TZGtYmA+SIfaY0MH5aZPo8xHBdrkvcaC8V9TQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725607061;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=euIRwqxLb1sq3IYquP8Ss7+nHFVbX5IuP6IjBpS6x8Q=;
b=nZVYLQfbnJ4TZt7V8FyoX9G3bwPdzTo3ZM+6NUwDqHW7kxCEEBeYD8vrdIWHVLHpiYypaj
brJsYMerzirD88BrleAR766osXop2ux1DFNglR2KnNO/iNTu2wHuUcyfDE8aWrhJVmJsaF
YeXxifXBdEO8XXfVyCN45IeGwTIblR5Wj8R6tzFYrTe2A+l1OoEOa8Mzp5g4xvUUb1nydX
ZqqUu/8XHAqcXUsMCzaLwdHgBjSBWOdm/9UYEU1YZ979IevXW7OP56KqMB7Jyv873ZAZSA
dlIGechLInJzcVVSoraXXJroDssab0Ug+KgQckgWKd4i4cPmFFj+hnZd8hP8og==
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 4X0SH86NXfzhBy;
Fri, 6 Sep 2024 07:17:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4867HeUs050415;
Fri, 6 Sep 2024 07:17:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4867HemL050412;
Fri, 6 Sep 2024 07:17:40 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 07:17:40 GMT
Message-Id: <202409060717.4867HemL050412@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Navdeep Parhar <np@FreeBSD.org>
Subject: git: 674cbf38f6d0 - main - cxgbe/t4_tom: Add synq entry
to the list before calling send_synack.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 674cbf38f6d0a0b307e52c4265da9f077606b035
Auto-Submitted: auto-generated
The branch main has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=674cbf38f6d0a0b307e52c4265da9f077606b035
commit 674cbf38f6d0a0b307e52c4265da9f077606b035
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2024-09-06 06:21:59 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2024-09-06 06:21:59 +0000
cxgbe/t4_tom: Add synq entry to the list before calling send_synack.
This fixes a panic where the peer's ack to the synack arrives on a
different queue and do_pass_establish tries to remove the synqe from
synqe_list before it has been added by do_pass_accept_req.
Reported by: Sony Arpita Das @ Chelsio
Fixes: 283333c0e329 cxgbe/t4_tom: Track all synq entries in a per-adapter list.
MFC after: 1 week
Sponsored by: Chelsio Communications
---
sys/dev/cxgbe/tom/t4_listen.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c
index f91d193c0fed..8a39218a55ba 100644
--- a/sys/dev/cxgbe/tom/t4_listen.c
+++ b/sys/dev/cxgbe/tom/t4_listen.c
@@ -1494,18 +1494,20 @@ found:
synqe->tid = tid;
synqe->syn = m;
m = NULL;
+ mtx_lock(&td->toep_list_lock);
+ TAILQ_INSERT_TAIL(&td->synqe_list, synqe, link);
+ mtx_unlock(&td->toep_list_lock);
if (send_synack(sc, synqe, opt0, opt2, tid) != 0) {
remove_tid(sc, tid, ntids);
m = synqe->syn;
synqe->syn = NULL;
+ mtx_lock(&td->toep_list_lock);
+ TAILQ_REMOVE(&td->synqe_list, synqe, link);
+ mtx_unlock(&td->toep_list_lock);
NET_EPOCH_EXIT(et);
REJECT_PASS_ACCEPT_REQ(true);
}
-
- mtx_lock(&td->toep_list_lock);
- TAILQ_INSERT_TAIL(&td->synqe_list, synqe, link);
- mtx_unlock(&td->toep_list_lock);
CTR6(KTR_CXGBE,
"%s: stid %u, tid %u, synqe %p, opt0 %#016lx, opt2 %#08x",
__func__, stid, tid, synqe, be64toh(opt0), be32toh(opt2));
From nobody Fri Sep 6 12:48:35 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0bcz3mWzz5Txpd;
Fri, 06 Sep 2024 12: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 4X0bcz294Lz49Cv;
Fri, 6 Sep 2024 12: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=1725626915;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sK2URFIkOHXsi8flcX1dTapbRpmNZG1hp1ARZOi0siA=;
b=MH+fhIA3FTUEgRRez8K26YOQiJtLey7SUgSfxLf7MFIDHEpjAThNQyQi541xLTp94Br24R
jFayE103W1q+Z7yaqnOCuhh/SHsfejzKmMP10AmgFmh7ArbcaK+O4c5Uilps8v8HW6zxuQ
hYrk1r73F+hi9IFc84yX5Lst/nYNBPgr290GwdT8hmJ77d0/AuMlE8dO7HdCeOi5afq3Bo
br4CMXeRNvqQwRwQGE/60MitMFWtKq/Dd2UWbNoGwCNHsSIf/DoOOBkxNYarbwV/13g+nR
dXqvRhXqSecpviczGeMUDFVPlGRjE5trDX5X9Qhk68WM5Dqf7DgsRubtUO4R7A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725626915; a=rsa-sha256; cv=none;
b=jzNjoFvWxtUDyIabFZzC1mhA6Dy5JIpGZGOzvAGktFktpGcOgNmlDkv+qRaKttNWjLiNhO
Kz64etpU8OYCgOixHdZT/yLatzfWNDcsPN5BsDrKQTJMHCvPwSp+AWdzWHBvkKywjMH2Ot
2GER5cYK0pf8Asz2LxU4KyrbNBrtabPGp6pnfYRUAYsLDBXgwdp80YEz65Oqpg/N5JqyXB
8Lz3XJSDZ1zEHEzXPvG2x+iJBwilQ0Br6oFJ1zWyeow2rouhRVOaMyLc3plDuzKWDA+1Ef
BNGhnZF0oOA4MC9IfDVMjHFL/cdVLw6y4ByfTxUQ3qvy2bXoaR3l4wq4D8OALA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725626915;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sK2URFIkOHXsi8flcX1dTapbRpmNZG1hp1ARZOi0siA=;
b=I3yuoy7N9iedIDzhXZFZG+D1POG68ecPttjDi6ln4Tk8IE03qp+WzT4W/J41nwTfrVlfLP
zIQGLIQE3vd6JK1AbFYZH+nDI/xgOPfT0F4BaMFr03p0/6RwRyBNBF2cxQEjaZBI+1av0j
Eppyc83BtH/TrIuxeaBXK24BKbpRVGf/yPDxwAOVX3Hrtt1SXKbgVJb/eB54vBslFXnDei
5XKLS80PngKx8QFVsBb/5oPlKRJ/TLI663i8y9HcsAHvGzW6JvUzogpH1tnpb3nuTzESnl
i706FmwYt+HWXla/8dWv7YrhyNTul3FuhDJHBVXFiSdaPfCwRKivXxKsWs+hpA==
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 4X0bcz185nzs7F;
Fri, 6 Sep 2024 12: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 486CmZNr013538;
Fri, 6 Sep 2024 12:48:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486CmZ7g013534;
Fri, 6 Sep 2024 12:48:35 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 12:48:35 GMT
Message-Id: <202409061248.486CmZ7g013534@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Tom Jones <thj@FreeBSD.org>
Subject: git: 390dc369efaa - main - pf: Add support for endpoint
independent NAT bindings for UDP
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: thj
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 390dc369efaaeca2802baf168ddbd7a40e3afcc8
Auto-Submitted: auto-generated
The branch main has been updated by thj:
URL: https://cgit.FreeBSD.org/src/commit/?id=390dc369efaaeca2802baf168ddbd7a40e3afcc8
commit 390dc369efaaeca2802baf168ddbd7a40e3afcc8
Author: Tom Jones <thj@FreeBSD.org>
AuthorDate: 2024-09-06 11:59:09 +0000
Commit: Tom Jones <thj@FreeBSD.org>
CommitDate: 2024-09-06 12:48:04 +0000
pf: Add support for endpoint independent NAT bindings for UDP
With Endpoint Independent NAT bindings for UDP flows from a NATed source
address are always mapped to the same ip:port pair on the NAT router.
This allows a client to connect to multiple external servers while
appearing as the same host and enables NAT traversal without requiring
the client to use a middlebox traversal protocol such as STUN or TURN.
Introduce the 'endpoint-independent' option to NAT rules to allow
configuration of endpoint independent without effecting existing
deployments.
This change satisfies REQ 1 and 3 of RFC 4787 also known as 'full cone'
NAT.
Using Endpoint Independent NAT changes NAT exhaustion behaviour it does
not introduce any additional security considerations compared to other
forms of NAT.
PR: 219803
Co-authored-by: Damjan Jovanovic <damjan.jov@gmail.com>
Co-authored-by: Naman Sood <mail@nsood.in>
Reviewed-by: kp
Sponsored-by: Tailscale
Sponsored-by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D11137
---
sbin/pfctl/parse.y | 12 ++-
sbin/pfctl/pfctl_parser.c | 2 +
sbin/pfctl/tests/files/pf1021.in | 1 +
sbin/pfctl/tests/files/pf1021.ok | 1 +
share/man/man4/pf.4 | 6 +-
share/man/man5/pf.conf.5 | 12 ++-
sys/net/pfvar.h | 49 +++++++++-
sys/netpfil/pf/pf.c | 195 ++++++++++++++++++++++++++++++++++++++-
sys/netpfil/pf/pf.h | 1 +
sys/netpfil/pf/pf_lb.c | 104 +++++++++++++++++----
tests/sys/netpfil/pf/nat.sh | 134 +++++++++++++++++++++++++++
11 files changed, 489 insertions(+), 28 deletions(-)
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 724ffefcd7d9..f54f24a14a7c 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -326,6 +326,7 @@ static struct pool_opts {
int marker;
#define POM_TYPE 0x01
#define POM_STICKYADDRESS 0x02
+#define POM_ENDPI 0x04
u_int8_t opts;
int type;
int staticport;
@@ -512,7 +513,7 @@ int parseport(char *, struct range *r, int);
%token UPPERLIMIT QUEUE PRIORITY QLIMIT HOGS BUCKETS RTABLE TARGET INTERVAL
%token DNPIPE DNQUEUE RIDENTIFIER
%token LOAD RULESET_OPTIMIZATION PRIO
-%token STICKYADDRESS MAXSRCSTATES MAXSRCNODES SOURCETRACK GLOBAL RULE
+%token STICKYADDRESS ENDPI MAXSRCSTATES MAXSRCNODES SOURCETRACK GLOBAL RULE
%token MAXSRCCONN MAXSRCCONNRATE OVERLOAD FLUSH SLOPPY PFLOW
%token TAGGED TAG IFBOUND FLOATING STATEPOLICY STATEDEFAULTS ROUTE SETTOS
%token DIVERTTO DIVERTREPLY BRIDGE_TO
@@ -4593,6 +4594,14 @@ pool_opt : BITMASK {
pool_opts.marker |= POM_STICKYADDRESS;
pool_opts.opts |= PF_POOL_STICKYADDR;
}
+ | ENDPI {
+ if (pool_opts.marker & POM_ENDPI) {
+ yyerror("endpoint-independent cannot be redefined");
+ YYERROR;
+ }
+ pool_opts.marker |= POM_ENDPI;
+ pool_opts.opts |= PF_POOL_ENDPI;
+ }
| MAPEPORTSET number '/' number '/' number {
if (pool_opts.mape.offset) {
yyerror("map-e-portset cannot be redefined");
@@ -6299,6 +6308,7 @@ lookup(char *s)
{ "dnqueue", DNQUEUE},
{ "drop", DROP},
{ "dup-to", DUPTO},
+ { "endpoint-independent", ENDPI},
{ "ether", ETHER},
{ "fail-policy", FAILPOLICY},
{ "fairq", FAIRQ},
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index e71b7b160495..a9416534626b 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -488,6 +488,8 @@ print_pool(struct pfctl_pool *pool, u_int16_t p1, u_int16_t p2,
}
if (pool->opts & PF_POOL_STICKYADDR)
printf(" sticky-address");
+ if (pool->opts & PF_POOL_ENDPI)
+ printf(" endpoint-independent");
if (id == PF_NAT && p1 == 0 && p2 == 0)
printf(" static-port");
if (pool->mape.offset > 0)
diff --git a/sbin/pfctl/tests/files/pf1021.in b/sbin/pfctl/tests/files/pf1021.in
new file mode 100644
index 000000000000..841b024157c6
--- /dev/null
+++ b/sbin/pfctl/tests/files/pf1021.in
@@ -0,0 +1 @@
+nat on vtnet1 inet from ! (vtnet1) to any -> (vtnet1) endpoint-independent
diff --git a/sbin/pfctl/tests/files/pf1021.ok b/sbin/pfctl/tests/files/pf1021.ok
new file mode 100644
index 000000000000..3b5b84e2e11b
--- /dev/null
+++ b/sbin/pfctl/tests/files/pf1021.ok
@@ -0,0 +1 @@
+nat on vtnet1 inet from ! (vtnet1) to any -> (vtnet1) round-robin endpoint-independent
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 9bfc75cb490d..3855d07faead 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd September 2, 2024
+.Dd September 6, 2024
.Dt PF 4
.Os
.Sh NAME
@@ -89,6 +89,10 @@ Should be power of 2.
Default value is 32768.
.It Va net.pf.rule_tag_hashsize
Size of the hash table that stores tags.
+.It Va net.pf.udpendpoint_hashsize
+Size of hash table that store UDP endpoint mappings.
+Should be power of 2.
+Default value is 32768.
.It Va net.pf.default_to_drop
This value overrides
.Cd "options PF_DEFAULT_TO_DROP"
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index f04b0799741e..5aa936d509ed 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -27,7 +27,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 24, 2024
+.Dd September 4, 2024
.Dt PF.CONF 5
.Os
.Sh NAME
@@ -2278,6 +2278,16 @@ from modifying the source port on TCP and UDP packets.
With
.Ar nat
rules, the
+.It Ar endpoint-independent
+With
+.Ar nat
+rules, the
+.Ar endpoint-independent
+option caues
+.Xr pf 4
+to always map connections from a UDP source address and port to the same
+NAT address and port.
+This feature implements "full-cone" NAT behavior.
.Ar map-e-portset
option enables the source port translation of MAP-E (RFC 7597) Customer Edge.
In order to make the host act as a MAP-E Customer Edge, setting up a tunneling
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 7b3c1c49696a..c123da37d2cb 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -940,6 +940,29 @@ struct pf_state_peer {
u_int8_t pad[1];
};
+/* Keep synced with struct pf_udp_endpoint. */
+struct pf_udp_endpoint_cmp {
+ struct pf_addr addr;
+ uint16_t port;
+ sa_family_t af;
+ uint8_t pad[1];
+};
+
+struct pf_udp_endpoint {
+ struct pf_addr addr;
+ uint16_t port;
+ sa_family_t af;
+ uint8_t pad[1];
+
+ struct pf_udp_mapping *mapping;
+ LIST_ENTRY(pf_udp_endpoint) entry;
+};
+
+struct pf_udp_mapping {
+ struct pf_udp_endpoint endpoints[2];
+ u_int refs;
+};
+
/* Keep synced with struct pf_state_key. */
struct pf_state_key_cmp {
struct pf_addr addr[2];
@@ -1069,6 +1092,7 @@ struct pf_kstate {
union pf_krule_ptr nat_rule;
struct pf_addr rt_addr;
struct pf_state_key *key[2]; /* addresses stack and wire */
+ struct pf_udp_mapping *udp_mapping;
struct pfi_kkif *kif;
struct pfi_kkif *orig_kif; /* The real kif, even if we're a floating state (i.e. if == V_pfi_all). */
struct pfi_kkif *rt_kif;
@@ -2124,17 +2148,28 @@ struct pf_idhash {
struct mtx lock;
};
+struct pf_udpendpointhash {
+ LIST_HEAD(, pf_udp_endpoint) endpoints;
+ /* refcont is synchronized on the source endpoint's row lock */
+ struct mtx lock;
+};
+
extern u_long pf_ioctl_maxcount;
VNET_DECLARE(u_long, pf_hashmask);
#define V_pf_hashmask VNET(pf_hashmask)
VNET_DECLARE(u_long, pf_srchashmask);
#define V_pf_srchashmask VNET(pf_srchashmask)
+VNET_DECLARE(u_long, pf_udpendpointhashmask);
+#define V_pf_udpendpointhashmask VNET(pf_udpendpointhashmask)
#define PF_HASHSIZ (131072)
#define PF_SRCHASHSIZ (PF_HASHSIZ/4)
+#define PF_UDPENDHASHSIZ (PF_HASHSIZ/4)
VNET_DECLARE(struct pf_keyhash *, pf_keyhash);
VNET_DECLARE(struct pf_idhash *, pf_idhash);
+VNET_DECLARE(struct pf_udpendpointhash *, pf_udpendpointhash);
#define V_pf_keyhash VNET(pf_keyhash)
#define V_pf_idhash VNET(pf_idhash)
+#define V_pf_udpendpointhash VNET(pf_udpendpointhash)
VNET_DECLARE(struct pf_srchash *, pf_srchash);
#define V_pf_srchash VNET(pf_srchash)
@@ -2209,6 +2244,8 @@ VNET_DECLARE(uma_zone_t, pf_state_z);
#define V_pf_state_z VNET(pf_state_z)
VNET_DECLARE(uma_zone_t, pf_state_key_z);
#define V_pf_state_key_z VNET(pf_state_key_z)
+VNET_DECLARE(uma_zone_t, pf_udp_mapping_z);
+#define V_pf_udp_mapping_z VNET(pf_udp_mapping_z)
VNET_DECLARE(uma_zone_t, pf_state_scrub_z);
#define V_pf_state_scrub_z VNET(pf_state_scrub_z)
@@ -2281,6 +2318,15 @@ extern struct pf_kstate *pf_find_state_all(
extern bool pf_find_state_all_exists(
const struct pf_state_key_cmp *,
u_int);
+extern struct pf_udp_mapping *pf_udp_mapping_find(struct pf_udp_endpoint_cmp
+ *endpoint);
+extern struct pf_udp_mapping *pf_udp_mapping_create(sa_family_t af,
+ struct pf_addr *src_addr, uint16_t src_port,
+ struct pf_addr *nat_addr, uint16_t nat_port);
+extern int pf_udp_mapping_insert(struct pf_udp_mapping
+ *mapping);
+extern void pf_udp_mapping_release(struct pf_udp_mapping
+ *mapping);
extern struct pf_ksrc_node *pf_find_src_node(struct pf_addr *,
struct pf_krule *, sa_family_t,
struct pf_srchash **, bool);
@@ -2574,7 +2620,8 @@ u_short pf_get_translation(struct pf_pdesc *, struct mbuf *,
struct pf_state_key **, struct pf_state_key **,
struct pf_addr *, struct pf_addr *,
uint16_t, uint16_t, struct pf_kanchor_stackframe *,
- struct pf_krule **);
+ struct pf_krule **,
+ struct pf_udp_mapping **udp_mapping);
struct pf_state_key *pf_state_key_setup(struct pf_pdesc *, struct mbuf *, int,
struct pf_addr *, struct pf_addr *, u_int16_t, u_int16_t);
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index f7fe75184efd..70220dda935e 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -283,6 +283,7 @@ VNET_DEFINE_STATIC(uma_zone_t, pf_sources_z);
uma_zone_t pf_mtag_z;
VNET_DEFINE(uma_zone_t, pf_state_z);
VNET_DEFINE(uma_zone_t, pf_state_key_z);
+VNET_DEFINE(uma_zone_t, pf_udp_mapping_z);
VNET_DEFINE(struct unrhdr64, pf_stateid);
@@ -330,7 +331,7 @@ static int pf_create_state(struct pf_krule *, struct pf_krule *,
struct pf_state_key *, struct mbuf *, int,
u_int16_t, u_int16_t, int *, struct pfi_kkif *,
struct pf_kstate **, int, u_int16_t, u_int16_t,
- int, struct pf_krule_slist *);
+ int, struct pf_krule_slist *, struct pf_udp_mapping *);
static int pf_state_key_addr_setup(struct pf_pdesc *, struct mbuf *,
int, struct pf_state_key_cmp *, int, struct pf_addr *,
int, struct pf_addr *, int);
@@ -493,22 +494,29 @@ MALLOC_DEFINE(M_PF_RULE_ITEM, "pf_krule_item", "pf(4) rule items");
VNET_DEFINE(struct pf_keyhash *, pf_keyhash);
VNET_DEFINE(struct pf_idhash *, pf_idhash);
VNET_DEFINE(struct pf_srchash *, pf_srchash);
+VNET_DEFINE(struct pf_udpendpointhash *, pf_udpendpointhash);
+VNET_DEFINE(struct pf_udpendpointmapping *, pf_udpendpointmapping);
SYSCTL_NODE(_net, OID_AUTO, pf, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"pf(4)");
VNET_DEFINE(u_long, pf_hashmask);
VNET_DEFINE(u_long, pf_srchashmask);
+VNET_DEFINE(u_long, pf_udpendpointhashmask);
VNET_DEFINE_STATIC(u_long, pf_hashsize);
#define V_pf_hashsize VNET(pf_hashsize)
VNET_DEFINE_STATIC(u_long, pf_srchashsize);
#define V_pf_srchashsize VNET(pf_srchashsize)
+VNET_DEFINE_STATIC(u_long, pf_udpendpointhashsize);
+#define V_pf_udpendpointhashsize VNET(pf_udpendpointhashsize)
u_long pf_ioctl_maxcount = 65535;
SYSCTL_ULONG(_net_pf, OID_AUTO, states_hashsize, CTLFLAG_VNET | CTLFLAG_RDTUN,
&VNET_NAME(pf_hashsize), 0, "Size of pf(4) states hashtable");
SYSCTL_ULONG(_net_pf, OID_AUTO, source_nodes_hashsize, CTLFLAG_VNET | CTLFLAG_RDTUN,
&VNET_NAME(pf_srchashsize), 0, "Size of pf(4) source nodes hashtable");
+SYSCTL_ULONG(_net_pf, OID_AUTO, udpendpoint_hashsize, CTLFLAG_VNET | CTLFLAG_RDTUN,
+ &VNET_NAME(pf_udpendpointhashsize), 0, "Size of pf(4) endpoint hashtable");
SYSCTL_ULONG(_net_pf, OID_AUTO, request_maxcount, CTLFLAG_RWTUN,
&pf_ioctl_maxcount, 0, "Maximum number of tables, addresses, ... in a single ioctl() call");
@@ -699,6 +707,17 @@ pf_hashsrc(struct pf_addr *addr, sa_family_t af)
return (h & V_pf_srchashmask);
}
+static inline uint32_t
+pf_hashudpendpoint(struct pf_udp_endpoint *endpoint)
+{
+ uint32_t h;
+
+ h = murmur3_32_hash32((uint32_t *)endpoint,
+ sizeof(struct pf_udp_endpoint_cmp)/sizeof(uint32_t),
+ V_pf_hashseed);
+ return (h & V_pf_udpendpointhashmask);
+}
+
#ifdef ALTQ
static int
pf_state_hash(struct pf_kstate *s)
@@ -1086,12 +1105,15 @@ pf_initialize(void)
struct pf_keyhash *kh;
struct pf_idhash *ih;
struct pf_srchash *sh;
+ struct pf_udpendpointhash *uh;
u_int i;
if (V_pf_hashsize == 0 || !powerof2(V_pf_hashsize))
V_pf_hashsize = PF_HASHSIZ;
if (V_pf_srchashsize == 0 || !powerof2(V_pf_srchashsize))
V_pf_srchashsize = PF_SRCHASHSIZ;
+ if (V_pf_udpendpointhashsize == 0 || !powerof2(V_pf_udpendpointhashsize))
+ V_pf_udpendpointhashsize = PF_UDPENDHASHSIZ;
V_pf_hashseed = arc4random();
@@ -1154,6 +1176,30 @@ pf_initialize(void)
for (i = 0, sh = V_pf_srchash; i <= V_pf_srchashmask; i++, sh++)
mtx_init(&sh->lock, "pf_srchash", NULL, MTX_DEF);
+
+ /* UDP endpoint mappings. */
+ V_pf_udp_mapping_z = uma_zcreate("pf UDP mappings",
+ sizeof(struct pf_udp_mapping), NULL, NULL, NULL, NULL,
+ UMA_ALIGN_PTR, 0);
+ V_pf_udpendpointhash = mallocarray(V_pf_udpendpointhashsize,
+ sizeof(struct pf_udpendpointhash), M_PFHASH, M_NOWAIT | M_ZERO);
+ if (V_pf_udpendpointhash == NULL) {
+ printf("pf: Unable to allocate memory for "
+ "udpendpoint_hashsize %lu.\n", V_pf_udpendpointhashsize);
+
+ V_pf_udpendpointhashsize = PF_UDPENDHASHSIZ;
+ V_pf_udpendpointhash = mallocarray(V_pf_udpendpointhashsize,
+ sizeof(struct pf_udpendpointhash), M_PFHASH, M_WAITOK | M_ZERO);
+ }
+
+ V_pf_udpendpointhashmask = V_pf_udpendpointhashsize - 1;
+ for (i = 0, uh = V_pf_udpendpointhash;
+ i <= V_pf_udpendpointhashmask;
+ i++, uh++) {
+ mtx_init(&uh->lock, "pf_udpendpointhash", NULL,
+ MTX_DEF | MTX_DUPOK);
+ }
+
/* ALTQ */
TAILQ_INIT(&V_pf_altqs[0]);
TAILQ_INIT(&V_pf_altqs[1]);
@@ -1187,10 +1233,12 @@ pf_cleanup(void)
struct pf_keyhash *kh;
struct pf_idhash *ih;
struct pf_srchash *sh;
+ struct pf_udpendpointhash *uh;
struct pf_send_entry *pfse, *next;
u_int i;
- for (i = 0, kh = V_pf_keyhash, ih = V_pf_idhash; i <= V_pf_hashmask;
+ for (i = 0, kh = V_pf_keyhash, ih = V_pf_idhash;
+ i <= V_pf_hashmask;
i++, kh++, ih++) {
KASSERT(LIST_EMPTY(&kh->keys), ("%s: key hash not empty",
__func__));
@@ -1209,6 +1257,15 @@ pf_cleanup(void)
}
free(V_pf_srchash, M_PFHASH);
+ for (i = 0, uh = V_pf_udpendpointhash;
+ i <= V_pf_udpendpointhashmask;
+ i++, uh++) {
+ KASSERT(LIST_EMPTY(&uh->endpoints),
+ ("%s: udp endpoint hash not empty", __func__));
+ mtx_destroy(&uh->lock);
+ }
+ free(V_pf_udpendpointhash, M_PFHASH);
+
STAILQ_FOREACH_SAFE(pfse, &V_pf_sendqueue, pfse_next, next) {
m_freem(pfse->pfse_m);
free(pfse, M_PFTEMP);
@@ -1218,6 +1275,7 @@ pf_cleanup(void)
uma_zdestroy(V_pf_sources_z);
uma_zdestroy(V_pf_state_z);
uma_zdestroy(V_pf_state_key_z);
+ uma_zdestroy(V_pf_udp_mapping_z);
}
static int
@@ -1807,6 +1865,123 @@ pf_find_state_all_exists(const struct pf_state_key_cmp *key, u_int dir)
return (false);
}
+struct pf_udp_mapping *
+pf_udp_mapping_create(sa_family_t af, struct pf_addr *src_addr, uint16_t src_port,
+ struct pf_addr *nat_addr, uint16_t nat_port)
+{
+ struct pf_udp_mapping *mapping;
+
+ mapping = uma_zalloc(V_pf_udp_mapping_z, M_NOWAIT | M_ZERO);
+ if (mapping == NULL)
+ return (NULL);
+ PF_ACPY(&mapping->endpoints[0].addr, src_addr, af);
+ mapping->endpoints[0].port = src_port;
+ mapping->endpoints[0].af = af;
+ mapping->endpoints[0].mapping = mapping;
+ PF_ACPY(&mapping->endpoints[1].addr, nat_addr, af);
+ mapping->endpoints[1].port = nat_port;
+ mapping->endpoints[1].af = af;
+ mapping->endpoints[1].mapping = mapping;
+ refcount_init(&mapping->refs, 1);
+ return (mapping);
+}
+
+int
+pf_udp_mapping_insert(struct pf_udp_mapping *mapping)
+{
+ struct pf_udpendpointhash *h0, *h1;
+ struct pf_udp_endpoint *endpoint;
+ int ret = EEXIST;
+
+ h0 = &V_pf_udpendpointhash[pf_hashudpendpoint(&mapping->endpoints[0])];
+ h1 = &V_pf_udpendpointhash[pf_hashudpendpoint(&mapping->endpoints[1])];
+ if (h0 == h1) {
+ PF_HASHROW_LOCK(h0);
+ } else if (h0 < h1) {
+ PF_HASHROW_LOCK(h0);
+ PF_HASHROW_LOCK(h1);
+ } else {
+ PF_HASHROW_LOCK(h1);
+ PF_HASHROW_LOCK(h0);
+ }
+
+ LIST_FOREACH(endpoint, &h0->endpoints, entry) {
+ if (bcmp(endpoint, &mapping->endpoints[0],
+ sizeof(struct pf_udp_endpoint_cmp)) == 0)
+ break;
+ }
+ if (endpoint != NULL)
+ goto cleanup;
+ LIST_FOREACH(endpoint, &h1->endpoints, entry) {
+ if (bcmp(endpoint, &mapping->endpoints[1],
+ sizeof(struct pf_udp_endpoint_cmp)) == 0)
+ break;
+ }
+ if (endpoint != NULL)
+ goto cleanup;
+ LIST_INSERT_HEAD(&h0->endpoints, &mapping->endpoints[0], entry);
+ LIST_INSERT_HEAD(&h1->endpoints, &mapping->endpoints[1], entry);
+ ret = 0;
+
+cleanup:
+ if (h0 != h1) {
+ PF_HASHROW_UNLOCK(h0);
+ PF_HASHROW_UNLOCK(h1);
+ } else {
+ PF_HASHROW_UNLOCK(h0);
+ }
+ return (ret);
+}
+
+void
+pf_udp_mapping_release(struct pf_udp_mapping *mapping)
+{
+ /* refcount is synchronized on the source endpoint's row lock */
+ struct pf_udpendpointhash *h0, *h1;
+
+ if (mapping == NULL)
+ return;
+
+ h0 = &V_pf_udpendpointhash[pf_hashudpendpoint(&mapping->endpoints[0])];
+ PF_HASHROW_LOCK(h0);
+ if (refcount_release(&mapping->refs)) {
+ LIST_REMOVE(&mapping->endpoints[0], entry);
+ PF_HASHROW_UNLOCK(h0);
+ h1 = &V_pf_udpendpointhash[pf_hashudpendpoint(&mapping->endpoints[1])];
+ PF_HASHROW_LOCK(h1);
+ LIST_REMOVE(&mapping->endpoints[1], entry);
+ PF_HASHROW_UNLOCK(h1);
+
+ uma_zfree(V_pf_udp_mapping_z, mapping);
+ } else {
+ PF_HASHROW_UNLOCK(h0);
+ }
+}
+
+
+struct pf_udp_mapping *
+pf_udp_mapping_find(struct pf_udp_endpoint_cmp *key)
+{
+ struct pf_udpendpointhash *uh;
+ struct pf_udp_endpoint *endpoint;
+
+ uh = &V_pf_udpendpointhash[pf_hashudpendpoint((struct pf_udp_endpoint*)key)];
+
+ PF_HASHROW_LOCK(uh);
+ LIST_FOREACH(endpoint, &uh->endpoints, entry) {
+ if (bcmp(endpoint, key, sizeof(struct pf_udp_endpoint_cmp)) == 0 &&
+ bcmp(endpoint, &endpoint->mapping->endpoints[0],
+ sizeof(struct pf_udp_endpoint_cmp)) == 0)
+ break;
+ }
+ if (endpoint == NULL) {
+ PF_HASHROW_UNLOCK(uh);
+ return (NULL);
+ }
+ refcount_acquire(&endpoint->mapping->refs);
+ PF_HASHROW_UNLOCK(uh);
+ return (endpoint->mapping);
+}
/* END state table stuff */
static void
@@ -2423,6 +2598,9 @@ pf_unlink_state(struct pf_kstate *s)
PF_HASHROW_UNLOCK(ih);
pf_detach_state(s);
+
+ pf_udp_mapping_release(s->udp_mapping);
+
/* pf_state_insert() initialises refs to 2 */
return (pf_release_staten(s, 2));
}
@@ -4686,6 +4864,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif,
u_int16_t bproto_sum = 0, bip_sum = 0;
u_int8_t icmptype = 0, icmpcode = 0;
struct pf_kanchor_stackframe anchor_stack[PF_ANCHOR_STACKSIZE];
+ struct pf_udp_mapping *udp_mapping = NULL;
PF_RULES_RASSERT();
@@ -4760,7 +4939,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif,
/* check packet for BINAT/NAT/RDR */
transerror = pf_get_translation(pd, m, off, kif, &nsn, &sk,
- &nk, saddr, daddr, sport, dport, anchor_stack, &nr);
+ &nk, saddr, daddr, sport, dport, anchor_stack, &nr, &udp_mapping);
switch (transerror) {
default:
/* A translation error occurred. */
@@ -5058,8 +5237,9 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif,
int action;
action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, off,
sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum,
- hdrlen, &match_rules);
+ hdrlen, &match_rules, udp_mapping);
if (action != PF_PASS) {
+ pf_udp_mapping_release(udp_mapping);
if (action == PF_DROP &&
(r->rule_flag & PFRULE_RETURN))
pf_return(r, nr, pd, sk, off, m, th, kif,
@@ -5075,6 +5255,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif,
uma_zfree(V_pf_state_key_z, sk);
uma_zfree(V_pf_state_key_z, nk);
+ pf_udp_mapping_release(udp_mapping);
}
/* copy back packet headers if we performed NAT operations */
@@ -5102,6 +5283,8 @@ cleanup:
uma_zfree(V_pf_state_key_z, sk);
uma_zfree(V_pf_state_key_z, nk);
+ pf_udp_mapping_release(udp_mapping);
+
return (PF_DROP);
}
@@ -5111,7 +5294,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a,
struct pf_state_key *sk, struct mbuf *m, int off, u_int16_t sport,
u_int16_t dport, int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm,
int tag, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen,
- struct pf_krule_slist *match_rules)
+ struct pf_krule_slist *match_rules, struct pf_udp_mapping *udp_mapping)
{
struct pf_kstate *s = NULL;
struct pf_ksrc_node *sn = NULL;
@@ -5328,6 +5511,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a,
return (PF_SYNPROXY_DROP);
}
+ s->udp_mapping = udp_mapping;
+
return (PF_PASS);
csfailed:
diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h
index d5ab4f03a96d..6370164cb291 100644
--- a/sys/netpfil/pf/pf.h
+++ b/sys/netpfil/pf/pf.h
@@ -129,6 +129,7 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE, PF_ADDR_DYNIFTL,
PF_ADDR_RANGE };
#define PF_POOL_TYPEMASK 0x0f
#define PF_POOL_STICKYADDR 0x20
+#define PF_POOL_ENDPI 0x40
#define PF_WSCALE_FLAG 0x80
#define PF_WSCALE_MASK 0x0f
diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c
index 6b0b95e9ce01..cdd68aaf5dab 100644
--- a/sys/netpfil/pf/pf_lb.c
+++ b/sys/netpfil/pf/pf_lb.c
@@ -62,7 +62,8 @@ static struct pf_krule *pf_match_translation(struct pf_pdesc *, struct mbuf *,
uint16_t, int, struct pf_kanchor_stackframe *);
static int pf_get_sport(sa_family_t, uint8_t, struct pf_krule *,
struct pf_addr *, uint16_t, struct pf_addr *, uint16_t, struct pf_addr *,
- uint16_t *, uint16_t, uint16_t, struct pf_ksrc_node **);
+ uint16_t *, uint16_t, uint16_t, struct pf_ksrc_node **,
+ struct pf_udp_mapping **);
#define mix(a,b,c) \
do { \
@@ -216,14 +217,47 @@ static int
pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r,
struct pf_addr *saddr, uint16_t sport, struct pf_addr *daddr,
uint16_t dport, struct pf_addr *naddr, uint16_t *nport, uint16_t low,
- uint16_t high, struct pf_ksrc_node **sn)
+ uint16_t high, struct pf_ksrc_node **sn,
+ struct pf_udp_mapping **udp_mapping)
{
struct pf_state_key_cmp key;
struct pf_addr init_addr;
+ struct pf_srchash *sh = NULL;
bzero(&init_addr, sizeof(init_addr));
+
+ MPASS(*udp_mapping == NULL);
+
+ /*
+ * If we are UDP and have an existing mapping we can get source port
+ * from the mapping. In this case we have to look up the src_node as
+ * pf_map_addr would.
+ */
+ if (proto == IPPROTO_UDP && (r->rpool.opts & PF_POOL_ENDPI)) {
+ struct pf_udp_endpoint_cmp udp_source;
+
+ bzero(&udp_source, sizeof(udp_source));
+ udp_source.af = af;
+ PF_ACPY(&udp_source.addr, saddr, af);
+ udp_source.port = sport;
+ *udp_mapping = pf_udp_mapping_find(&udp_source);
+ if (*udp_mapping) {
+ PF_ACPY(naddr, &(*udp_mapping)->endpoints[1].addr, af);
+ *nport = (*udp_mapping)->endpoints[1].port;
+ /* Try to find a src_node as per pf_map_addr(). */
+ if (*sn == NULL && r->rpool.opts & PF_POOL_STICKYADDR &&
+ (r->rpool.opts & PF_POOL_TYPEMASK) != PF_POOL_NONE)
+ *sn = pf_find_src_node(saddr, r, af, &sh, 0);
+ return (0);
+ } else {
+ *udp_mapping = pf_udp_mapping_create(af, saddr, sport, &init_addr, 0);
+ if (*udp_mapping == NULL)
+ return (1);
+ }
+ }
+
if (pf_map_addr(af, r, saddr, naddr, NULL, &init_addr, sn))
- return (1);
+ goto failed;
if (proto == IPPROTO_ICMP) {
if (*nport == htons(ICMP_ECHO)) {
@@ -250,6 +284,8 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r,
do {
PF_ACPY(&key.addr[1], naddr, key.af);
+ if (*udp_mapping)
+ PF_ACPY(&(*udp_mapping)->endpoints[1].addr, naddr, af);
/*
* port search; start random, step;
@@ -277,8 +313,16 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r,
} else if (low == high) {
key.port[1] = htons(low);
if (!pf_find_state_all_exists(&key, PF_IN)) {
- *nport = htons(low);
- return (0);
+ if (*udp_mapping != NULL) {
+ (*udp_mapping)->endpoints[1].port = htons(low);
+ if (pf_udp_mapping_insert(*udp_mapping) == 0) {
+ *nport = htons(low);
+ return (0);
+ }
+ } else {
+ *nport = htons(low);
+ return (0);
+ }
}
} else {
uint32_t tmp;
@@ -293,18 +337,35 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r,
cut = arc4random() % (1 + high - low) + low;
/* low <= cut <= high */
for (tmp = cut; tmp <= high && tmp <= 0xffff; ++tmp) {
- key.port[1] = htons(tmp);
- if (!pf_find_state_all_exists(&key, PF_IN)) {
- *nport = htons(tmp);
- return (0);
+ if (*udp_mapping != NULL) {
+ (*udp_mapping)->endpoints[1].port = htons(tmp);
+ if (pf_udp_mapping_insert(*udp_mapping) == 0) {
+ *nport = htons(tmp);
+ return (0);
+ }
+ } else {
+ key.port[1] = htons(tmp);
+ if (!pf_find_state_all_exists(&key, PF_IN)) {
+ *nport = htons(tmp);
+ return (0);
+ }
}
}
tmp = cut;
for (tmp -= 1; tmp >= low && tmp <= 0xffff; --tmp) {
- key.port[1] = htons(tmp);
- if (!pf_find_state_all_exists(&key, PF_IN)) {
- *nport = htons(tmp);
- return (0);
+ if (proto == IPPROTO_UDP &&
+ (r->rpool.opts & PF_POOL_ENDPI)) {
+ (*udp_mapping)->endpoints[1].port = htons(tmp);
+ if (pf_udp_mapping_insert(*udp_mapping) == 0) {
+ *nport = htons(tmp);
+ return (0);
+ }
+ } else {
+ key.port[1] = htons(tmp);
+ if (!pf_find_state_all_exists(&key, PF_IN)) {
+ *nport = htons(tmp);
+ return (0);
+ }
}
}
}
@@ -326,6 +387,10 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r,
return (1);
}
} while (! PF_AEQ(&init_addr, naddr, af) );
+
+failed:
+ uma_zfree(V_pf_udp_mapping_z, *udp_mapping);
+ *udp_mapping = NULL;
return (1); /* none available */
}
@@ -333,7 +398,7 @@ static int
pf_get_mape_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r,
struct pf_addr *saddr, uint16_t sport, struct pf_addr *daddr,
uint16_t dport, struct pf_addr *naddr, uint16_t *nport,
- struct pf_ksrc_node **sn)
+ struct pf_ksrc_node **sn, struct pf_udp_mapping **udp_mapping)
{
uint16_t psmask, low, highmask;
uint16_t i, ahigh, cut;
@@ -353,13 +418,13 @@ pf_get_mape_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r,
for (i = cut; i <= ahigh; i++) {
low = (i << ashift) | psmask;
if (!pf_get_sport(af, proto, r, saddr, sport, daddr, dport,
- naddr, nport, low, low | highmask, sn))
+ naddr, nport, low, low | highmask, sn, udp_mapping))
return (0);
}
for (i = cut - 1; i > 0; i--) {
low = (i << ashift) | psmask;
if (!pf_get_sport(af, proto, r, saddr, sport, daddr, dport,
- naddr, nport, low, low | highmask, sn))
+ naddr, nport, low, low | highmask, sn, udp_mapping))
return (0);
}
return (1);
@@ -597,7 +662,8 @@ pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off,
struct pf_state_key **skp, struct pf_state_key **nkp,
struct pf_addr *saddr, struct pf_addr *daddr,
uint16_t sport, uint16_t dport, struct pf_kanchor_stackframe *anchor_stack,
- struct pf_krule **rp)
+ struct pf_krule **rp,
+ struct pf_udp_mapping **udp_mapping)
{
struct pf_krule *r = NULL;
struct pf_addr *naddr;
@@ -661,7 +727,7 @@ pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off,
}
if (r->rpool.mape.offset > 0) {
if (pf_get_mape_sport(pd->af, pd->proto, r, saddr,
- sport, daddr, dport, naddr, nportp, sn)) {
+ sport, daddr, dport, naddr, nportp, sn, udp_mapping)) {
DPFPRINTF(PF_DEBUG_MISC,
("pf: MAP-E port allocation (%u/%u/%u)"
" failed\n",
@@ -672,7 +738,7 @@ pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off,
goto notrans;
}
} else if (pf_get_sport(pd->af, pd->proto, r, saddr, sport,
- daddr, dport, naddr, nportp, low, high, sn)) {
+ daddr, dport, naddr, nportp, low, high, sn, udp_mapping)) {
DPFPRINTF(PF_DEBUG_MISC,
("pf: NAT proxy port allocation (%u-%u) failed\n",
r->rpool.proxy_port[0], r->rpool.proxy_port[1]));
diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh
index 513abfa5e040..aaa49805c772 100644
--- a/tests/sys/netpfil/pf/nat.sh
+++ b/tests/sys/netpfil/pf/nat.sh
@@ -112,6 +112,139 @@ nested_anchor_body()
}
+atf_test_case "endpoint_independent" "cleanup"
+endpoint_independent_head()
+{
+ atf_set descr 'Test that a client behind NAT gets the same external IP:port for different servers'
+ atf_set require.user root
+}
+
+endpoint_independent_body()
+{
+ pft_init
+ filter="udp and dst port 1234" # only capture udp pings
+
+ epair_client=$(vnet_mkepair)
+ epair_nat=$(vnet_mkepair)
+ epair_server1=$(vnet_mkepair)
+ epair_server2=$(vnet_mkepair)
+ bridge=$(vnet_mkbridge)
+
+ vnet_mkjail nat ${epair_client}b ${epair_nat}a
+ vnet_mkjail client ${epair_client}a
+ vnet_mkjail server1 ${epair_server1}a
+ vnet_mkjail server2 ${epair_server2}a
+
+ ifconfig ${epair_server1}b up
+ ifconfig ${epair_server2}b up
+ ifconfig ${epair_nat}b up
+ ifconfig ${bridge} \
+ addm ${epair_server1}b \
+ addm ${epair_server2}b \
+ addm ${epair_nat}b \
+ up
+
+ jexec nat ifconfig ${epair_client}b 192.0.2.1/24 up
+ jexec nat ifconfig ${epair_nat}a 198.51.100.42/24 up
+ jexec nat sysctl net.inet.ip.forwarding=1
+
+ jexec client ifconfig ${epair_client}a 192.0.2.2/24 up
+ jexec client route add default 192.0.2.1
+
+ jexec server1 ifconfig ${epair_server1}a 198.51.100.32/24 up
+ jexec server2 ifconfig ${epair_server2}a 198.51.100.22/24 up
+
+ # Enable pf!
+ jexec nat pfctl -e
+
+ # validate non-endpoint independent nat rule behaviour
+ pft_set_rules nat \
+ "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a)"
+
+ jexec server1 tcpdump -i ${epair_server1}a -w ${PWD}/server1.pcap \
+ --immediate-mode $filter &
+ server1tcppid="$!"
+ jexec server2 tcpdump -i ${epair_server2}a -w ${PWD}/server2.pcap \
+ --immediate-mode $filter &
+ server2tcppid="$!"
+
+ # send out multiple packets
+ for i in $(seq 1 10); do
+ echo "ping" | jexec client nc -u 198.51.100.32 1234 -p 4242 -w 0
+ echo "ping" | jexec client nc -u 198.51.100.22 1234 -p 4242 -w 0
+ done
+
+ kill $server1tcppid
+ kill $server2tcppid
+
+ tuple_server1=$(tcpdump -r ${PWD}/server1.pcap | awk '{addr=$3} END {print addr}')
+ tuple_server2=$(tcpdump -r ${PWD}/server2.pcap | awk '{addr=$3} END {print addr}')
+
+ if [ -z $tuple_server1 ]
+ then
+ atf_fail "server1 did not receive connection from client (default)"
+ fi
+
+ if [ -z $tuple_server2 ]
+ then
+ atf_fail "server2 did not receive connection from client (default)"
+ fi
+
+ if [ "$tuple_server1" = "$tuple_server2" ]
+ then
+ echo "server1 tcpdump: $tuple_server1"
+ echo "server2 tcpdump: $tuple_server2"
+ atf_fail "Received same IP:port on server1 and server2 (default)"
+ fi
+
+ # validate endpoint independent nat rule behaviour
+ pft_set_rules nat \
+ "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a) endpoint-independent"
+
+ jexec server1 tcpdump -i ${epair_server1}a -w ${PWD}/server1.pcap \
+ --immediate-mode $filter &
+ server1tcppid="$!"
+ jexec server2 tcpdump -i ${epair_server2}a -w ${PWD}/server2.pcap \
+ --immediate-mode $filter &
+ server2tcppid="$!"
+
+ # send out multiple packets, sometimes one fails to go through
+ for i in $(seq 1 10); do
+ echo "ping" | jexec client nc -u 198.51.100.32 1234 -p 4242 -w 0
+ echo "ping" | jexec client nc -u 198.51.100.22 1234 -p 4242 -w 0
+ done
+
+ kill $server1tcppid
+ kill $server2tcppid
+
+ tuple_server1=$(tcpdump -r ${PWD}/server1.pcap | awk '{addr=$3} END {print addr}')
+ tuple_server2=$(tcpdump -r ${PWD}/server2.pcap | awk '{addr=$3} END {print addr}')
+
+ if [ -z $tuple_server1 ]
+ then
+ atf_fail "server1 did not receive connection from client (endpoint-independent)"
+ fi
+
+ if [ -z $tuple_server2 ]
+ then
+ atf_fail "server2 did not receive connection from client (endpoint-independent)"
+ fi
+
+ if [ ! "$tuple_server1" = "$tuple_server2" ]
+ then
+ echo "server1 tcpdump: $tuple_server1"
+ echo "server2 tcpdump: $tuple_server2"
+ atf_fail "Received different IP:port on server1 than server2 (endpoint-independent)"
+ fi
+}
+
+endpoint_independent_cleanup()
+{
+ pft_cleanup
+ rm -f server1.out
+ rm -f server2.out
+}
+
nested_anchor_cleanup()
*** 8 LINES SKIPPED ***
From nobody Fri Sep 6 13:10:14 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0c5z1C8Zz5V1mk;
Fri, 06 Sep 2024 13:10: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 4X0c5y6JJRz4DdG;
Fri, 6 Sep 2024 13:10:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725628214;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MAznI8AUkiihIE9xKEynlulGfyIigZBVQjlew8p+seo=;
b=gDL1SjW+D6ABR491US7zPPGbEZkxbzFHLByQgJ1vKWa4FahtPxFrkBffetDTidmdHWY4sk
hF/CAsJPxPDbHi08r+S3jW6/Keo9EL7HYVPVQ2h/9ilqbIYpQah1V8+w15KpnWcsc7ku9R
nRzJ5e3/YPGSGA5j4bdVYmou7/AC9RS0bz/QwaaV0I3qBN9X/mlGHttGLOgyDVZlQf66mH
q65Km25lQe5X0WeOdDgdCW09D108OohtI0LQC7Q+FqLlbOXR113UVXdsvN9yOZH3Puqh5c
Xo8bsRUE20hNTBqqdz58X9kGP6ajl9jiS+758GnItruTC9FhUMSh5QcW0MY2Fw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725628214; a=rsa-sha256; cv=none;
b=hMnjzGzS2nzO1ZTip57iRucCLNxshNJ5OH9W2dTKKdB1nHVrMUuKBW8BvRX/BANnoDF/NK
KMNgRW7KsV1nd09HAkxqMUw2fRZeulRD19ZqegNiW6tclLsCpL6Jb2sijkkj4RZJMydBkn
5GlHhcxvLEr7B4gopViDLPqLLyqvdCqnH3L6vuSBkukv4dHm2x7VbOT3FFTKWGpekyBR56
R7Er9Z39Ypj6vnsOAhMBEheZA1twGgVdC/5O6N4KHPd0JCOaaL1jT0YSH+CfsBmDoXFzIx
2KN35d9A7FnONsnAO+rlI+ai7SwQaxo1rNdgGIsaIyRk0xgI7uiRPAs+gbbbIw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725628214;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MAznI8AUkiihIE9xKEynlulGfyIigZBVQjlew8p+seo=;
b=Lcghg3/bWHUsl/P1vEf+4ryYXK7LdTtK3XNqjqUp1j+enDkzbDtFFQebvqiz3tp5vTc9Ay
h9wgcvX9jKSX8NxWuKmROfVTksHFfb0PsobI20vpC646AdH7C/5aWX18ZCe2zu6iy7UzxA
7TYAXbiQ+c/c9rwbdQm9B3CghTraxpraJ4MKXEKP9je2BL+0AeXgJ35G9WQwqoCeqI05K7
HXOnOtNKrD4qq/a9/LLu15IRO1w8bNUtBTT/3VO9V2w8bC+PAM6NDK8iBvbSIxLpMNkdaW
OLHv54A6FfaLSH2l5YrnL61M8nvW01ti5l2QpF9XZq8dY3AabkiDOB0Lk//lwA==
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 4X0c5y4VHWzsvF;
Fri, 6 Sep 2024 13:10: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 486DAEFM054830;
Fri, 6 Sep 2024 13:10:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486DAEVI054821;
Fri, 6 Sep 2024 13:10:14 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 13:10:14 GMT
Message-Id: <202409061310.486DAEVI054821@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Tom Jones <thj@FreeBSD.org>
Subject: git: e1b1984abb8b - main - pfctl: Add endpoint-independent
test to the list of tests
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: thj
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e1b1984abb8b673d43082660a5ae740741f85df6
Auto-Submitted: auto-generated
The branch main has been updated by thj:
URL: https://cgit.FreeBSD.org/src/commit/?id=e1b1984abb8b673d43082660a5ae740741f85df6
commit e1b1984abb8b673d43082660a5ae740741f85df6
Author: Tom Jones <thj@FreeBSD.org>
AuthorDate: 2024-09-06 13:06:57 +0000
Commit: Tom Jones <thj@FreeBSD.org>
CommitDate: 2024-09-06 13:09:12 +0000
pfctl: Add endpoint-independent test to the list of tests
Reviewed by: kp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46563
---
sbin/pfctl/tests/pfctl_test_list.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/sbin/pfctl/tests/pfctl_test_list.inc b/sbin/pfctl/tests/pfctl_test_list.inc
index 5d1717200759..1fd31de6ccc4 100644
--- a/sbin/pfctl/tests/pfctl_test_list.inc
+++ b/sbin/pfctl/tests/pfctl_test_list.inc
@@ -129,3 +129,4 @@ PFCTL_TEST(1017, "Ethernet rule with ridentifier and several labels")
PFCTL_TEST(1018, "Test dynamic address mask")
PFCTL_TEST(1019, "Test pflow option")
PFCTL_TEST(1020, "Test hashmark and semicolon comment")
+PFCTL_TEST(1021, "Endpoint-independent")
From nobody Fri Sep 6 13:37:45 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0cjk4fwGz5V5JD;
Fri, 06 Sep 2024 13:37:46 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0cjk3qd1z4LZq;
Fri, 6 Sep 2024 13:37:46 +0000 (UTC)
(envelope-from jhb@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725629866;
h=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=WWZLIk1g7myBak7I+MFgeirzlFapyisQo35LipsvT/c=;
b=ACgy+kA2rCz7jcfRxVz2FJuJaBEFTkRlBx+M2MUpQ6OxFjd+zJMMw+SFUVTL+fUxEtsdhe
XQw7CvVKCrKHGvyXqIxhAs5wTJ6TIZUJSdzRypBfyigOHrJylkf/TUQ1HBhaSZcwuW93ex
0Z9b/zQjRjRULhaHYyD7XLXFqv0xkXPlWP1Rpra/PPz04jIBHnj8MJ0NclX4M/opkbSZC2
8Shh/M+r+Rd7JmrRGAfXKJ405ZZNpnk+gJrOB8pT8TcI21bDpV5cbDB2jpd2JStuDA2efF
4apw6a8Hst16Dnqy6Rqdsm3pAN7Zi+LJIfdthEatMn6uiy51LoG6lt4kfdPnWw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725629866; a=rsa-sha256; cv=none;
b=v6Y8N3JArTxkfx7ZkKPzJpwdwHyy/uXMg56Jw2j7fVjKyy0pZXr4/U1H94LOkzSlPqEwr0
cG9aie55+f/w+SZtM2Gh6crUdNVS77JuBbBF1HZapFKs9atEiAoYCblJqSBN3SLyhP5e3X
KFQRHeB/AFLnuRkcN/V0pgn0+3R8j8wJYFGAOfZLGUK3b5W+DrvguEAhSN+qZUnprS9sB3
ZH2F7homJNFLs3ZHyQ0J6ZJLOuv8zCv1Kb5kKmtKihwVX7BQFK5Rn2A26lz+SeztqlKAdd
g9wlYM6xepxF+ZYm6BG3zvZx3qNGroo00e8Uu4vsuLZRRQsxFViuu/3LjcHGaA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725629866;
h=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=WWZLIk1g7myBak7I+MFgeirzlFapyisQo35LipsvT/c=;
b=CnWP6twhVyDBh32bkOStTRzITl4leiOVNtjigbZyOv7A4dR/zHgfGBZvj0mgG1sPTc4YI+
EkQADodDviZJQD/17wTf2doido8Sk4ZXfVLGZDOhaHCACGUzg2GTJ3WS6mSPusYGSeadvW
fyfJAUWTx4iHHyBFZupVA/RFk5e+4lHion7KQ4fhEdGfcIalB5NMplTgSTSvChiRomC6xU
476oyS+l3dj0AtWHx7HTez2ErWzLllfFKKHNgPesPur/kruLaXoThDCglgyBoxJf8qY0WK
8hbMmkXPk645fV4sSjV1bzq1C9hIInQNBbhM8K/iJgPTmGCZQ5vzXD17ucsyDg==
Received: from [IPV6:2601:5c0:4200:b830:e193:7c94:7b53:48b7] (unknown [IPv6:2601:5c0:4200:b830:e193:7c94:7b53:48b7])
(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 4X0cjk1hN6zPrW;
Fri, 6 Sep 2024 13:37:46 +0000 (UTC)
(envelope-from jhb@FreeBSD.org)
Message-ID: <7213e551-6be2-44b1-a8b6-55645c593c12@FreeBSD.org>
Date: Fri, 6 Sep 2024 09:37:45 -0400
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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: e962b37bf0ff - main - bhyve: Do not enable PCI BAR decoding
if a boot ROM is present
Content-Language: en-US
To: Shawn Webb <shawn.webb@hardenedbsd.org>, Mark Johnston <markj@freebsd.org>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
References: <202408191359.47JDxAbK026029@gitrepo.freebsd.org>
<qkp2zbmykgwsbrxekut35rexlktypzg5oj2bbfslig7eksprpi@2lw5x47mtytp>
From: John Baldwin <jhb@FreeBSD.org>
In-Reply-To: <qkp2zbmykgwsbrxekut35rexlktypzg5oj2bbfslig7eksprpi@2lw5x47mtytp>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
On 9/5/24 22:10, Shawn Webb wrote:
> Hey Mark,
>
> This commit seems to force me to now pass "-o pci.enable_bars=true" to
> all my VMs on amd64. I wonder if that might be a POLA violation. I
> didn't realize that I needed to set that until I bisected the src
> tree, looking for the commit that broke bhyve for me.
>
> Is changing the default here really worth it for amd64? If so, I'm
> thinking this should be in both RELNOTES and UPDATING. I now have to
> propigate re-enabling this across my entire infrastructure.
>
> Thanks,
That should only be true if you are using an older UEFI firmware that did
not program BARs. Are you seeing this on stock FreeBSD, and which version
of the UEFI ROM are you using?
--
John Baldwin
From nobody Fri Sep 6 15:12:43 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0fqP1QL5z5VJ1Q;
Fri, 06 Sep 2024 15:12:49 +0000 (UTC)
(envelope-from markjdb@gmail.com)
Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f])
(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 4X0fqN2wCgz4hrc;
Fri, 6 Sep 2024 15:12:48 +0000 (UTC)
(envelope-from markjdb@gmail.com)
Authentication-Results: mx1.freebsd.org;
none
Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-7a8130906faso142766985a.0;
Fri, 06 Sep 2024 08:12:48 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1725635567; x=1726240367; darn=freebsd.org;
h=in-reply-to:content-disposition:mime-version:references:message-id
:subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id
:reply-to;
bh=DXkjWK+M3EPZbadBK2bxnwETRVFmR4n4/ybsGNia/5c=;
b=jkL1kcP31y3+jZWWz2C54bNAsh2Bm+ttHpIFPoMzu9a2o9NTCbxv0wMti1hacxyj6J
Ha5NexAPa5DpN4m7Md7Ll0rZ/Ffu/UPTuBypgD5SMemQKJVd5VCxeR/L1hwCkJaxsTkB
41idb7GExH78xY6QiJ5/cgodBDgTSJfVhGLwcyE5OILW8rshhr1KizikcybjjqHsw5X6
/DQXKaMXX2UK5h+bg9LhvGNx+BLlls7cm6BbL4Wt5E889rnm266PCM7xxC1+llacGgFm
asnKiaJmLKtLlrtBJZZfQxE4jDACe3zjYPRTVpDpKdBuh/eA4GesgU9wWN+CG1eJZAmS
Cp8A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1725635567; x=1726240367;
h=in-reply-to:content-disposition:mime-version:references:message-id
:subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=DXkjWK+M3EPZbadBK2bxnwETRVFmR4n4/ybsGNia/5c=;
b=dIEsG1pX85vkoXxS+JQcZme1fReEERaFsOB3d5+eD+KW1QXHKlin/iYEJ3FcS/VoEC
IZtCh20WjAPmDhXNZBgzhQQf0cA2kz+HC0c5We57VpxSIlPOFXeggRK6rprOcviu7yER
Q6LyqSW0vwdpQnGZSQCt63rkgDwUyFcwTF75kwo7yQHfz6jEpqQa6R02j7KDWaOKgoAa
5Opng9psf2zyX9aEirCCvm2dA3nAOPQGgxEdQD2weK0PRB/gCxGtrVcIs3Niq/aCArZg
jOclGD3tpGKoJjoDV9LAAt/0uYV9clSve9Hjqn+7Jpgh0sh/VbuvCf1Tf88diPnZvi+B
yymg==
X-Forwarded-Encrypted: i=1; AJvYcCUQXwEmSCI9tySz0TYy9nkHuau4Ucz1mbbPYAf4+7VIUF51lR0vdXs/RqP0+iRS45Sndpq1yIyW1NcxKGPitSo=@freebsd.org, AJvYcCVtkYR/rcShsiLpAVR+Rlx09nI+NcrHIbd2XQ8IHH+U44yTDMPDSH0HhbRoTy0fnGubMsT03J6pfSb3Ax05/S8OraXN@freebsd.org, AJvYcCX1M71ituJoTskp2Iedhp/3k49Jqirlss1+U8tRppEna6vL1MO0OG1wTv2EIYKYZvgVvoue3CIIIN7Oz++YDMUs1Vwb8Ho=@freebsd.org
X-Gm-Message-State: AOJu0YyiluLvT4Lv5iwFp3bvAijY2OqTFMA5z/97fEzBnGId6+NLLcYI
2DQ2HiB/PANWDzIiARunkgHolJXsoukqGGe9Uormj5WDDllGDnVR6hIvEg==
X-Google-Smtp-Source: AGHT+IHgv4pTqWtjeao71Zi5QF90DaQqSyetH0r+P5UFTqYWHhRZwsdo/0qzWbJb2wbfQ8A5tEZacw==
X-Received: by 2002:a05:6214:2b9d:b0:6c5:de4:3edb with SMTP id 6a1803df08f44-6c5284f61c9mr31357606d6.29.1725635566509;
Fri, 06 Sep 2024 08:12:46 -0700 (PDT)
Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237])
by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6c5202de4b2sm17372836d6.58.2024.09.06.08.12.45
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 06 Sep 2024 08:12:45 -0700 (PDT)
Date: Fri, 6 Sep 2024 11:12:43 -0400
From: Mark Johnston <markj@freebsd.org>
To: John Baldwin <jhb@freebsd.org>
Cc: Shawn Webb <shawn.webb@hardenedbsd.org>, src-committers@freebsd.org,
dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject: Re: git: e962b37bf0ff - main - bhyve: Do not enable PCI BAR decoding
if a boot ROM is present
Message-ID: <Ztsb68pW9fCmCpZ5@nuc>
References: <202408191359.47JDxAbK026029@gitrepo.freebsd.org>
<qkp2zbmykgwsbrxekut35rexlktypzg5oj2bbfslig7eksprpi@2lw5x47mtytp>
<7213e551-6be2-44b1-a8b6-55645c593c12@FreeBSD.org>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-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: <7213e551-6be2-44b1-a8b6-55645c593c12@FreeBSD.org>
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]
X-Rspamd-Queue-Id: 4X0fqN2wCgz4hrc
On Fri, Sep 06, 2024 at 09:37:45AM -0400, John Baldwin wrote:
> On 9/5/24 22:10, Shawn Webb wrote:
> > Hey Mark,
> >
> > This commit seems to force me to now pass "-o pci.enable_bars=true" to
> > all my VMs on amd64. I wonder if that might be a POLA violation. I
> > didn't realize that I needed to set that until I bisected the src
> > tree, looking for the commit that broke bhyve for me.
> >
> > Is changing the default here really worth it for amd64? If so, I'm
> > thinking this should be in both RELNOTES and UPDATING. I now have to
> > propigate re-enabling this across my entire infrastructure.
> >
> > Thanks,
>
> That should only be true if you are using an older UEFI firmware that did
> not program BARs. Are you seeing this on stock FreeBSD, and which version
> of the UEFI ROM are you using?
Indeed, it'd be nice to see which bootcode and guest you're using. I
had tested bhyveload, edk2-bhyve and grub2-bhyve with this change
without problems, and wasn't planning to MFC. My hope was that this
wouldn't have any user-visible impact on amd64, but if that's not the
case, the default for pci.enable_bars may have to be flipped on amd64.
From nobody Fri Sep 6 15:25:01 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0g5V1VHHz5VKTY;
Fri, 06 Sep 2024 15:25:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0g5V12vVz4kB5;
Fri, 6 Sep 2024 15:25:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725636302;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=r4UkmLsLKzRT6KDH3fGop08kF/rPq+007PNEtrX/SEk=;
b=PVRHjgF1A3YQ68V3gk/I5fU1wIQOWDrfYvnyD4kWZZ590wvjNjjjbPK6Qs6zFHF8DBHV7g
ZC5GL7o3pp0pcqsqAEktL1cFGKPWKE5CKOA31tn94F9520qVhnHcUfewoXcdNwDdro/8G4
9IjvkF4gYBUxqpj04xx5i4tMrjODXOOvdQnWxpnShMUAVb0muKo+XmjUTFoDoHY7VAgVD4
fsLIE2BjOqg29yQNMYcOW9ZM7bZergDrrHpwTrWDsA7Pld8CbxTrPcrKiFNI/ZBrmbdpwO
cLMQxLtlubHob7+EG4an466HxTN30gofS6efxuGOu6L9b/sFmJZjcaBDjcRkBQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725636302; a=rsa-sha256; cv=none;
b=WDpygHKLNGlvSpKEpFQ6d4s1lKXgUFT/y/eQqsKtlC3JV65BO2JmHEoDWAE1g2KYLSznAw
EEHZN9gZsmTWgqt7gIFjc27OryRjECo7+iQs01Ml6RBP9uCuwA+2RjicGoGt9nmqjmJ1KC
pAufMi61wCkXmUGuhaslAoLWfrA8PsxILr7XwUdphPvIfgLjYJlNYxwPxEXJWruhpZSBdk
H1u3jU3YFR9ehB0CFvBBsMRl6G3ne4XBqQgoUUUPjl6WvwZ6A6Jjylu1rfwViMeT1N5EmA
4Wp9ubc+GFOYEvKQ7YVpb7Yuv0sFOJug+0EFlZaMW5ptr9+AO9c1QwtXX7Kl5w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725636302;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=r4UkmLsLKzRT6KDH3fGop08kF/rPq+007PNEtrX/SEk=;
b=h4ud5HLZ+w4DrV0NdvSOaK6/dhKXo+2I47qeXRg17kj2NvajFTRrP/LkoK96QMyEMPx/94
kquvwdiHuKJsvuiye2tUcvnAQNn0LnB7hbHYVLaG+FfRfHUieOq0G1cO3ZiM0Ntth49gcc
w0D6ZHM0kdRTXSatVYh53tlSRwRsmKAcqcJMU93eH2QvOzEpAmvyldZklP7b0ZMocesRj9
T3Yl9/ofNbiPLSWIzW4ITGLhwj87YcgQ8Y3OuLMFCU52NGfP4xaa43ZM/MZh+zF9jWBMuo
b/NaGo2QQz4Ac6hJaxhn6oWThmYdnEY+W7RX9fxTUQWpfZgZaVfdL/B3Er1Fkg==
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 4X0g5V0LH2zxCk;
Fri, 6 Sep 2024 15:25:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 486FP1X0085931;
Fri, 6 Sep 2024 15:25:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486FP1jZ085928;
Fri, 6 Sep 2024 15:25:01 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 15:25:01 GMT
Message-Id: <202409061525.486FP1jZ085928@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: bb2d016afb00 - main - flua: make the ucl module a
dynamic module
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: bb2d016afb009920f4bb2400c15a86e557b2d55a
Auto-Submitted: auto-generated
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=bb2d016afb009920f4bb2400c15a86e557b2d55a
commit bb2d016afb009920f4bb2400c15a86e557b2d55a
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-09-06 15:13:08 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-09-06 15:21:29 +0000
flua: make the ucl module a dynamic module
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D46569
---
lib/flua/Makefile | 1 +
lib/flua/libucl/Makefile | 17 +++++++++++++++++
libexec/flua/Makefile | 8 +-------
libexec/flua/linit_flua.c | 2 --
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/lib/flua/Makefile b/lib/flua/Makefile
index 769736039f7e..168d05f54674 100644
--- a/lib/flua/Makefile
+++ b/lib/flua/Makefile
@@ -1,4 +1,5 @@
SUBDIR+= libhash
SUBDIR+= libjail
+SUBDIR+= libucl
.include <bsd.subdir.mk>
diff --git a/lib/flua/libucl/Makefile b/lib/flua/libucl/Makefile
new file mode 100644
index 000000000000..7d2681b85fcb
--- /dev/null
+++ b/lib/flua/libucl/Makefile
@@ -0,0 +1,17 @@
+SHLIB_NAME= ucl.so
+SHLIBDIR= ${LIBDIR}/flua
+
+WARNS= 2
+
+UCLSRC?= ${SRCTOP}/contrib/libucl
+.PATH: ${UCLSRC}/lua
+SRCS+= lua_ucl.c
+CFLAGS+= \
+ -I${SRCTOP}/contrib/lua/src \
+ -I${SRCTOP}/lib/liblua \
+ -I${UCLSRC}/include \
+ -I${UCLSRC}/src \
+ -I${UCLSRC}/uthash
+LIBADD+= ucl
+
+.include <bsd.lib.mk>
diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile
index e324ca993711..c8206b94769d 100644
--- a/libexec/flua/Makefile
+++ b/libexec/flua/Makefile
@@ -4,7 +4,7 @@ LUASRC?= ${SRCTOP}/contrib/lua/src
.PATH: ${LUASRC}
PROG= flua
-WARNS?= 2
+WARNS?= 3
MAN= # No manpage; this is internal.
CWARNFLAGS.gcc+= -Wno-format-nonliteral
@@ -31,10 +31,4 @@ LIBADD+= edit
LDFLAGS+= -Wl,-E
.endif
-UCLSRC?= ${SRCTOP}/contrib/libucl
-.PATH: ${UCLSRC}/lua
-SRCS+= lua_ucl.c
-CFLAGS+= -I${UCLSRC}/include -I${UCLSRC}/src -I${UCLSRC}/uthash
-LIBADD+= ucl
-
.include <bsd.prog.mk>
diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c
index 1b7d83016cfe..4635970d1fd7 100644
--- a/libexec/flua/linit_flua.c
+++ b/libexec/flua/linit_flua.c
@@ -36,7 +36,6 @@
#include "lfs.h"
#include "lposix.h"
#include "lfbsd.h"
-#include "lua_ucl.h"
/*
** these libs are loaded by lua.c and are readily available to any Lua
@@ -61,7 +60,6 @@ static const luaL_Reg loadedlibs[] = {
{"posix.sys.stat", luaopen_posix_sys_stat},
{"posix.sys.utsname", luaopen_posix_sys_utsname},
{"posix.unistd", luaopen_posix_unistd},
- {"ucl", luaopen_ucl},
{"fbsd", luaopen_fbsd},
{NULL, NULL}
};
From nobody Fri Sep 6 15:29:14 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0gBM0X7Sz5VKvH;
Fri, 06 Sep 2024 15:29:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0gBL6nRpz4kr9;
Fri, 6 Sep 2024 15:29:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725636555;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=9UQBAlxnkRka7XcsBQcA/yG9dpuB9LyGzO59cx7WFDM=;
b=e1HLaInIdEQMCxK2SBM3MpK/ogwce77Y7MBdWpwdaEJpPdR9gr9MK0NQ+qeYeWz2P0LyuH
QB8DwfuIBvPail0WltIHJChwpwPAcBiQ0+fqgq8/Q6s7JD1T72Q42f+bMfsAGNfZDvgaCl
kLns5qEKN4HOOqWzKDo8tRai7YHR53s579MZS0SMZ7/atn6XT2jXITiwHmFPVtsUQuZj0u
CJ7kKQT69nTf6ZJOWnxhM7cmorMGoUFQpiNwF8o6Hz+n7l97kyV6zc2vcU9apH8qTwvxYo
xPcbH2DUQG9J7pKhFVXEpuVxopFfGw6Qvp4cKCX+iNmiSJyKF9mMGbTqiXwTmA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725636555; a=rsa-sha256; cv=none;
b=TFUA0DrRt4CSacPU6NQbPRHN4LhfD6OpNYwVuFQkkgxKJAvMYRwA+PF4pIVXEybXRTFUYB
k2iLhTI8dLg09bWxgsgCglzCUs02wW1BtQ/4hqUJQ0B/NWNl2rvMIIJcJ1s1SO5T2PFPA5
xRkp0QSZUGiLaLe1GiBAu7ABdCAHyM7McyeUpRAGLMcJKoP1c6nYwc6GjUZ17MWutZ4cHz
JjgNvWDSpRIwx6GyxAILRxJwEX5HkmCz7T8TEThOqH1NiapWHuKf9qEwa2tjwco0j9tlJP
R5Syi/4fRHvk446wA6o4jM3ZbqiA6yXrcKb1GTNMdX2IQ6Dlnze8VgQCjftOgQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725636555;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=9UQBAlxnkRka7XcsBQcA/yG9dpuB9LyGzO59cx7WFDM=;
b=SCoK49O5fcl6++nlFYKbHNeKot8O3+WyBpIaxu498Q+m96Zkoy42Hcfli1sfdiv4TAp4xd
o8MSMxfCm5D9rqYvYcd72e6s2lTnLDpS4tb6eOKz+4UQfdho0B1oe+z6n3ilzbgwRDhCBI
mvT1v3WGRejY9Wh24hulCGWpjw+acnT7mUYuVTxl2KUyOubz5N02yb1Echqm6zoOcXm4nu
j14mwSFMTGxPZL7ScuYQ3lD4fuR9NnUw80pndfFez702CFQNH30ZUxR0olMqoZrKUqfVmz
bI+Lwh+KJbDgZviyzUGsS3Qef2K4MUEKmrMisAj/ijJRA6JiavC/dPg3yT57RQ==
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 4X0gBL6MJnzxM4;
Fri, 6 Sep 2024 15:29: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 486FTEon086696;
Fri, 6 Sep 2024 15:29:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486FTEOa086693;
Fri, 6 Sep 2024 15:29:14 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 15:29:14 GMT
Message-Id: <202409061529.486FTEOa086693@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: de1d7d7b87cf - main - flua: add freebsd module
implementing kldload/kldunload
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: de1d7d7b87cfa31a1d6c7bcf1acd27de8139cab3
Auto-Submitted: auto-generated
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=de1d7d7b87cfa31a1d6c7bcf1acd27de8139cab3
commit de1d7d7b87cfa31a1d6c7bcf1acd27de8139cab3
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-09-06 09:00:50 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-09-06 15:25:54 +0000
flua: add freebsd module implementing kldload/kldunload
Reviewed by: markj, imp
Approved by: imp
Differential Revision: https://reviews.freebsd.org/D46558
---
etc/mtree/BSD.usr.dist | 4 +
lib/flua/libfreebsd/Makefile | 3 +
lib/flua/libfreebsd/sys/Makefile | 4 +
lib/flua/libfreebsd/sys/linker/Makefile | 12 +++
.../libfreebsd/sys/linker/freebsd.sys.linker.3lua | 67 +++++++++++++
.../libfreebsd/sys/linker/lua_freebsd_sys_linker.c | 104 +++++++++++++++++++++
6 files changed, 194 insertions(+)
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 13541aac1dd4..60d458f5d336 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -74,6 +74,10 @@
engines-3
..
flua
+ freebsd
+ sys
+ ..
+ ..
..
i18n
..
diff --git a/lib/flua/libfreebsd/Makefile b/lib/flua/libfreebsd/Makefile
new file mode 100644
index 000000000000..6ed0451055ff
--- /dev/null
+++ b/lib/flua/libfreebsd/Makefile
@@ -0,0 +1,3 @@
+SUBDIR+= sys
+
+.include <bsd.subdir.mk>
diff --git a/lib/flua/libfreebsd/sys/Makefile b/lib/flua/libfreebsd/sys/Makefile
new file mode 100644
index 000000000000..9f38294536f2
--- /dev/null
+++ b/lib/flua/libfreebsd/sys/Makefile
@@ -0,0 +1,4 @@
+SUBDIR+= linker
+
+.include <bsd.subdir.mk>
+
diff --git a/lib/flua/libfreebsd/sys/linker/Makefile b/lib/flua/libfreebsd/sys/linker/Makefile
new file mode 100644
index 000000000000..318cc5078b33
--- /dev/null
+++ b/lib/flua/libfreebsd/sys/linker/Makefile
@@ -0,0 +1,12 @@
+SHLIB_NAME= linker.so
+SHLIBDIR= ${LIBDIR}/flua/freebsd/sys
+
+SRCS+= lua_freebsd_sys_linker.c
+
+CFLAGS+= \
+ -I${SRCTOP}/contrib/lua/src \
+ -I${SRCTOP}/lib/liblua \
+
+MAN= freebsd.sys.linker.3lua
+
+.include <bsd.lib.mk>
diff --git a/lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua
new file mode 100644
index 000000000000..0ab8f185388a
--- /dev/null
+++ b/lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua
@@ -0,0 +1,67 @@
+.\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
+.\" Copyright (c) 2024, Baptiste Daroussin <bapt@FreeBSD.org>
+.\"
+.\" 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 September 6, 2024
+.Dt FREEBSD.SYS.LINKER 3lua
+.Os
+.Sh NAME
+.Nm freebsd.sys.linker
+.Nd Lua binding to
+.Fx 's
+Linker functions
+.Sh SYNOPSIS
+.Bd -literal
+local linker = require('freebsd.sys.linker')
+.Ed
+.Pp
+.Bl -tag -width XXXX -compact
+.It Dv fileid, err, errno = linker.kldload(name)
+.It Dv ok, err, errno = linker.kldunload(fileid|name)
+.El
+.Sh DESCRIPTION
+The
+.Nm
+module is a binding to the
+.Fx 's
+linker functions.
+List of functions:
+.Bl -tag -width XXXX
+.It Dv fileid, err = freebsd.sys.linker.kldload(name)
+Load the kernel module named
+.Fa name
+and return the identifier
+.Pq fileid
+as an interger.
+.It Dv ok, err, errno = freebsd.sys.linker.kldunload(fileid|name)
+Unload the kernel module identifier either by
+.Fa name
+as a string, or
+.Fa fileid
+as an integer.
+.El
+.Sh SEE ALSO
+.Xr kldload 2 ,
+.Xr kldunload 2
diff --git a/lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c b/lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c
new file mode 100644
index 000000000000..a2dc3b487525
--- /dev/null
+++ b/lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c
@@ -0,0 +1,104 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2024, Baptiste Daroussin <bapt@FreeBSD.org>
+ *
+ * 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+
+#include <sys/param.h>
+#include <sys/linker.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
+int luaopen_freebsd_sys_linker(lua_State *L);
+
+static int
+lua_kldload(lua_State *L)
+{
+ const char *name;
+ int ret;
+
+ name = luaL_checkstring(L, 1);
+ ret = kldload(name);
+ if (ret == -1) {
+ lua_pushnil(L);
+ lua_pushstring(L, strerror(errno));
+ lua_pushinteger(L, errno);
+ return (3);
+ }
+ lua_pushinteger(L, ret);
+ return (1);
+}
+
+static int
+lua_kldunload(lua_State *L)
+{
+ const char *name;
+ int ret, fileid;
+
+ if (lua_isinteger(L, 1)) {
+ fileid = lua_tointeger(L, 1);
+ } else {
+ name = luaL_checkstring(L, 1);
+ fileid = kldfind(name);
+ }
+ if (fileid == -1) {
+ lua_pushnil(L);
+ lua_pushstring(L, strerror(errno));
+ lua_pushinteger(L, errno);
+ return (3);
+ }
+ ret = kldunload(fileid);
+ lua_pushinteger(L, ret);
+ if (ret == -1) {
+ lua_pushnil(L);
+ lua_pushstring(L, strerror(errno));
+ lua_pushinteger(L, errno);
+ return (3);
+ }
+ lua_pushinteger(L, 0);
+ return (1);
+}
+
+#define REG_SIMPLE(n) { #n, lua_ ## n }
+static const struct luaL_Reg freebsd_sys_linker[] = {
+ REG_SIMPLE(kldload),
+ REG_SIMPLE(kldunload),
+ { NULL, NULL },
+};
+#undef REG_SIMPLE
+
+int
+luaopen_freebsd_sys_linker(lua_State *L)
+{
+ luaL_newlib(L, freebsd_sys_linker);
+
+ return (1);
+}
From nobody Fri Sep 6 15:38:57 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0gPY3Ssnz5VLn0;
Fri, 06 Sep 2024 15:38:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0gPY2lcrz4m0q;
Fri, 6 Sep 2024 15:38:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725637137;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xu00gblXCUssUxS/6Ur4hr1qgzZImfzVuYMy+kAAvV4=;
b=eGzT0aiojy+aApzgVJnIHI2AEBSZw2oiFYu7+MDkSVyNqMLbRjk/obHvFugho3IrErdOx9
RBH6jWvyRs33GfkeG/7/g1L/oNAe4hO0VvYqk1UpOTE66nfsef06xMfsjPX0RDOIaHq6Nr
lctaaQoY/GqAxWTEcnFLG4VMPjjkEAGXF1V++q2Qcec3gl26A2thPZ63oVYFya3FblXGAI
k6gsUYxYkQUQWYW6ks8fhkbKmNt+MCCdX7vzbO2KIVkSzjRXzi4WZclqpznGKbKvrL34ds
lQn5RpZe6/ClqKCXlDU4Qa0qfYlG7kKSfRsdK4eTlGE99c0f6idRZceqBNYBMw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725637137; a=rsa-sha256; cv=none;
b=lUtcPCWYBlumwbbWMLcKVkd3EU0KgMZlNN0rHgp3bboaDnW4K4PanjWHJwIYiIVHhwd0iS
SUMmuKG/BzXfnLBHwIF3nI4RYd0w7hBZAnltAyDjrMLq/n3RbYfBlvRP+k+G/fl/vTGDJ+
sAxCMPGDery9tczrDuG+qF7/5xSnohQ6bJwz40TQXeg8lAtrMKrlk0hhLTnNektqXX2COh
rsw47NCVMDIt8NYYO/y4ZcAAgbYpee4/Jx5+ooaIWlFUGW7qPTCKBks3CmrwnCgmL0zOHt
IY5kn9RRNGwuWax8YaHplITrJ9iZdnrWzcmDpbXuRll9H050rRe5hBENBVCwrA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725637137;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=xu00gblXCUssUxS/6Ur4hr1qgzZImfzVuYMy+kAAvV4=;
b=qE+OcLM3gsnLMt41/4YB22FO/6RpQjS/QyG9mvx860nL6zqZ3aeB2aoSdrUKS4lWywPqCh
zkv4Duugv4u3Lu2pC3pSb9SvwYfWRFjs4vy2aa36tmHMWc6HPNeDfAL+bCWvbIvPpJZ4Tg
pwpp94l3uUbuxZV+CzvMYI5Xe56HxlEbJyh1nLZSKuIFwNvqaIDwpdZhjJY+u0zKhFXTDE
dE6fV8lkoHr9UWJIY8h6KLoedbAXlsfLeLgmHpJdvxGvrzYKCv6psYNrIl0j3Wdjvchwrz
fxCuIs8WuT0FqYVgwZ2FzEyN/EO/lZy5I04vgW7JSHxtuKZXEwEraMGvNFD6kg==
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 4X0gPY2Ds3zxXL;
Fri, 6 Sep 2024 15:38: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 486FcvKD003441;
Fri, 6 Sep 2024 15:38:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486FcvBn003438;
Fri, 6 Sep 2024 15:38:57 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 15:38:57 GMT
Message-Id: <202409061538.486FcvBn003438@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: 705583b76f3f - main - freebsd.sys.linker: rename
source file
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 705583b76f3fba9e8c3cf77142e8ac84de721ac1
Auto-Submitted: auto-generated
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=705583b76f3fba9e8c3cf77142e8ac84de721ac1
commit 705583b76f3fba9e8c3cf77142e8ac84de721ac1
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-09-06 15:35:28 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-09-06 15:35:28 +0000
freebsd.sys.linker: rename source file
Suggested by: markj
---
lib/flua/libfreebsd/sys/linker/Makefile | 2 +-
lib/flua/libfreebsd/sys/linker/{lua_freebsd_sys_linker.c => linker.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/flua/libfreebsd/sys/linker/Makefile b/lib/flua/libfreebsd/sys/linker/Makefile
index 318cc5078b33..572b5949d2a1 100644
--- a/lib/flua/libfreebsd/sys/linker/Makefile
+++ b/lib/flua/libfreebsd/sys/linker/Makefile
@@ -1,7 +1,7 @@
SHLIB_NAME= linker.so
SHLIBDIR= ${LIBDIR}/flua/freebsd/sys
-SRCS+= lua_freebsd_sys_linker.c
+SRCS+= linker.c
CFLAGS+= \
-I${SRCTOP}/contrib/lua/src \
diff --git a/lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c b/lib/flua/libfreebsd/sys/linker/linker.c
similarity index 100%
rename from lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c
rename to lib/flua/libfreebsd/sys/linker/linker.c
From nobody Fri Sep 6 15:52:46 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0gjV5HqKz5VNFR;
Fri, 06 Sep 2024 15:52: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 4X0gjV4DlMz4pP4;
Fri, 6 Sep 2024 15:52:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725637966;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=BY+nnV/ZXyhyH15cKmXW6pKnUoHDTvWzxyOZ/kgBX40=;
b=yxYqHJk9dphKDcyegJCrbyADfCg7PPfPccOWILVvIG5r8HK3FyhQ5OGNVXo3235eaA5c/H
L1IWKbL+T+VpF9P7F+ZAsL6sr/QXFC0ADWcUL0PQSlhbHFGMb2Moc4hBC/ca8kHqGecSkq
1W6u/TlgtZeLV5/gDS2wfSoDyprYSEJns9PVCU/l21UfXyPKBy6i9NPMznkXKl45gOAHnB
xgf9LgSEIBn06FLWQYpbYzXkJdei+zN8ufiZs/STLehdeRI6DUvm0WofNroY2u/s64S49c
37nLnQQ5C0XIawfsIv3xCb/87qVsaXu3ejQqv+FtWiagkZ9RDV0N3IIWBcSuXg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725637966; a=rsa-sha256; cv=none;
b=Ik4KNHR2ynz7bCb2B82zAPKVA/fyXkmLhZqk0V0N76DmmSdEKDK7MNPc6SWPknuAV61FmW
+ssOKcgMWtcrM4l+dvRogG1MLhRS9A/0jpALJ/TP8cr+DR6P1oxQux1BCHcfUNtXu3ubIS
Tb5OPgeIc4Adr2W6eqw2YvMWoqqz5Xcn4kka0z4u3NiRa47UbCexIPgIS5IpoNKb2UFoai
ug6LiMAxn9cjgM+PsPQ5jpXD9LbqS+7Znb5URxagofmp3N+XEt1RMqg1cSHuz9KK4YOHfF
7mkbtJ7B7yFz1TUWuSlVr6j+2/0XBmOHylHoPzKH62QkqzdOHh4rX0H+wsOqKQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725637966;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=BY+nnV/ZXyhyH15cKmXW6pKnUoHDTvWzxyOZ/kgBX40=;
b=tEu20qeqtQrwKNqbEoxyd+WefEcQuz7UyVeKT1zxqCq4xSEkNx3Qx6K5LaccQLcI+misYJ
XyH6SiTXtEcZx/gF6OT5ONm3KvXMzyi9Ya13KO9azuAoDbL+RZELJtoLzYwVLeTvW4+ONB
AWiWtmQJCOF4ll15vtjfx8TSe7GAqk30lvVbyYlbBxjVTXmL5W3otq4FLNhq6ykrch7J+d
suKl5ieR6Hz2mN5Oxyt6v3EhgjDrfu8Hm5sa5UiwPzkZYDSKp1J3D5O40DYWzzL1Fln8vg
1ZJbYUJGJ5h74LcSxxUnfELLAbVrbucoGNxyrzfGlljyt7MsyOqUWnrgMW63sw==
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 4X0gjV3VmjzyH5;
Fri, 6 Sep 2024 15:52: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 486Fqks4036065;
Fri, 6 Sep 2024 15:52:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486FqkVv036062;
Fri, 6 Sep 2024 15:52:46 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 15:52:46 GMT
Message-Id: <202409061552.486FqkVv036062@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: df1323e023a4 - main - lua_ucl: make sure flua gets
build after libucl
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: df1323e023a40dea43e65b2460ff35126b5c62e8
Auto-Submitted: auto-generated
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=df1323e023a40dea43e65b2460ff35126b5c62e8
commit df1323e023a40dea43e65b2460ff35126b5c62e8
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-09-06 15:49:16 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-09-06 15:50:04 +0000
lua_ucl: make sure flua gets build after libucl
---
lib/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Makefile b/lib/Makefile
index ee5419ae0f93..8860bfeb1770 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -152,7 +152,7 @@ SUBDIR_DEPEND_nss_tacplus= libtacplus
.if !defined(COMPAT_LIBCOMPAT)
SUBDIR+= flua
-SUBDIR_DEPEND_flua= libjail
+SUBDIR_DEPEND_flua= libjail libucl
.endif
# NB: keep these sorted by MK_* knobs
From nobody Fri Sep 6 15:55:10 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0gmG2Nxgz5VNkB;
Fri, 06 Sep 2024 15:55:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0gmG1qf5z4qjk;
Fri, 6 Sep 2024 15:55:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725638110;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=UfPZEy6rVdhVcO9JXmzup/pcci0ILuh+W5R6sCBer2M=;
b=FGENEOjRA4I0DPZuNiKEZMr7MpCOba2jJ0eF38Urcq51jMmsDKvWJcfcSb+RLNbXtRjFFf
PDFmSm7AnNulf+ubCl7mvy79GAgJnbrWc0885+fxTEXIk8dp0Qj15fhKJ7cmUsk++B/Cdx
QtqjcFn38Aj1+0ns1TBE/yLUSP64eHLzGVCE9EAJtX+ovFbNmSAsLvr2CRMHAnbcxELZ0Q
O9oBRGFekou6iyOHi7PrzxJcw4+weNTjHQkGt8jZElpGi9xjdHwAVC9fjLc5NnOEdxnWxG
PQdmShkGzP0eOfzv68mSScDCkhrkReLopoLiOoeSW+H+PstmD9BDOMtkV4sLqw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725638110; a=rsa-sha256; cv=none;
b=oYYvI3ME3qOF2UG+9/XFWwMxOc65ps3YlnvL2Sc4FuAOZORP4nCHgcS6FuLs6yLs/W6aqk
EXjhiZlpKw0jLmiJrQ83s/ySDj4EgzeBHm1m9/R3xPdJMFKRBH2fernH/qb4zxCsPeFbRy
w68k3rn9EKSKj7pQTh/RtGtkUdR4E8nD66KTOpBFvv/+nNEs2UYZ2PVftVSTu8gnIcycmq
UTdgqaC+4Kb26DZTWIxtoRAXnVQdtHhBcACYqrkDlVAuFWu1I4kGjuYcDj/aL9lSicfhVS
VrXRHcKr4aw+QtiKz4XPlzEN4ZuPqqB5Tx9zI0S35hT9Wamc659kGaxrIZRpaQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725638110;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=UfPZEy6rVdhVcO9JXmzup/pcci0ILuh+W5R6sCBer2M=;
b=kEdmtArgM8k3ehTQPS51EY5ffyKz5QtN9cUJpGTBTp0kEmkMYuzllQ9QXmttm/zE4Xp5Ro
myRS2X9XR0mBwSBuZuLNBdGtQTlO0YKg7OnEeFIdW4B+81q97pqycblG7g7ZMitRVHOjhR
HQupJOgcHXS0CJk1rmgaD9kMCx6VVgBevms4+zuRBs+izVGCDyW/3rYm/BbnYRzI9oN2IV
Bb4Ht8Po7aKvCIC5Gx0AISBLcp3p4IDhqia0S1/YsUYyU+YGvB7gzl5YEFDGUzoeoCjaLZ
K8xVlW/ey+h8eJcxxMQUbU57F1S97P79NA+k53JUoHVB8+6KsuB9HRZ4jsJyuQ==
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 4X0gmG1RmMzy8l;
Fri, 6 Sep 2024 15:55: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 486FtABr036597;
Fri, 6 Sep 2024 15:55:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486FtA4v036594;
Fri, 6 Sep 2024 15:55:10 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 15:55:10 GMT
Message-Id: <202409061555.486FtA4v036594@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: 39667ed7adc0 - main - flua: hook libfreebsd to the
build
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 39667ed7adc055879fffb5107ab3ecf1b26ac1bc
Auto-Submitted: auto-generated
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=39667ed7adc055879fffb5107ab3ecf1b26ac1bc
commit 39667ed7adc055879fffb5107ab3ecf1b26ac1bc
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-09-06 15:52:08 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-09-06 15:52:08 +0000
flua: hook libfreebsd to the build
---
lib/flua/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/flua/Makefile b/lib/flua/Makefile
index 168d05f54674..d88e76f61062 100644
--- a/lib/flua/Makefile
+++ b/lib/flua/Makefile
@@ -1,3 +1,4 @@
+SUBDIR+= libfreebsd
SUBDIR+= libhash
SUBDIR+= libjail
SUBDIR+= libucl
From nobody Fri Sep 6 16:30:07 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0hXf05pGz5VS9J
for <dev-commits-src-main@mlmmj.nyi.freebsd.org>; Fri, 06 Sep 2024 16:30:10 +0000 (UTC)
(envelope-from shawn.webb@hardenedbsd.org)
Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144])
(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 4X0hXd5Cm4z3wmh
for <dev-commits-src-main@freebsd.org>; Fri, 6 Sep 2024 16:30:09 +0000 (UTC)
(envelope-from shawn.webb@hardenedbsd.org)
Authentication-Results: mx1.freebsd.org;
none
Received: by mail-il1-x144.google.com with SMTP id e9e14a558f8ab-39f4ec52c5fso7616505ab.2
for <dev-commits-src-main@freebsd.org>; Fri, 06 Sep 2024 09:30:09 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=hardenedbsd.org; s=google; t=1725640208; x=1726245008; darn=freebsd.org;
h=in-reply-to:content-disposition:mime-version:references:message-id
:subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to;
bh=BWBtd0RahNgfAz/bSoLOjQwlQejn87nqo7fg107rpGU=;
b=IjbG0li671CQbCfoC9yGQJWgx2KzhwzeWVzfxqg3v1ka0cN5HYl9q23Bl/GJP6HAiA
y9efSds/0M9vrT5uWk7orgEl/hclgzVH8jOe7mmZ16l6plCMyaQ3r3YHNf0Vnd9PQetO
jkMqUcu1RlXLCGl2U9UDGDGeL0j1/5aNXJJ+zkPxRQTSepU8rWW8l35jUSskSWUc8svl
wErDN5bCarkafgJYc7hB5hO0cSwGTwbCGHeWwEd64vu12q9iV1s7Vl0TAI1CZ6aYNLrR
BB1e9rwXVWTVG1ExIs5qpWElkyMKYM4OkIqTLXKeWamZX/5fdJomXTtHCgjq5BtVYLbR
PgdA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1725640208; x=1726245008;
h=in-reply-to:content-disposition:mime-version:references:message-id
:subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=BWBtd0RahNgfAz/bSoLOjQwlQejn87nqo7fg107rpGU=;
b=ti1eOLtMFz4zyALPfBsciJepPYG3CLLTEAmJqpD7zdi+xxkmq5v0+NqCNi1nuKy5/P
nlHomjtm09EvuC4YxbTAbZVYqGefMRZXtJfebA4xSCEgeR9Bwti5aLTLc7KIjyuWdQes
XY8WvZysPhBEmxLDUCUgDzySbxDvWzqij0+/YAFIQ49/++PDeLMVBWTCmjZ7xF2Xvam7
se6sdvcp5euJf9jG+VHbrOCbXBcqRUy7mVDn2ophEKECB4YlCHIOVtl2lfB3Jd7nk/6g
GldRGc2ABeZsZoNd5Yzzc4xFHtWQqS6WDrvp3y/IOg54AWXNeZB4C+EgfIaNtYFmuKxc
PuJg==
X-Forwarded-Encrypted: i=1; AJvYcCUcTx/KR/ismszpJVmXdNswqjpVPytLmKdf+2GEX7Mbcr889GVbLyJq+xtujYoqMYiFKpadhff7+3pT3ZB6a6/L15XRjg==@freebsd.org
X-Gm-Message-State: AOJu0YwjoKj0MBNaJCM04S4BNgxaL32eITJ852aFapf7Mg3hGpzUtmc4
nc5BNfx3yA2/l/tZYtTl+5k8UEDae7Rdb8oWYQ4Z5Tc3wkSfW5qfb+rQxmFdGqM=
X-Google-Smtp-Source: AGHT+IFezbs3C/3jwdpOIhp6k7q/zqx9s7ighlaunKm6QGmCgiZS2LLaHZhkPlpMZBRoeVqAf5xk9w==
X-Received: by 2002:a05:6e02:1aaa:b0:376:40b7:b6f3 with SMTP id e9e14a558f8ab-3a04f069b27mr42344065ab.2.1725640208272;
Fri, 06 Sep 2024 09:30:08 -0700 (PDT)
Received: from mutt-hbsd (174-24-73-190.clsp.qwest.net. [174.24.73.190])
by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4d08060c2e9sm601194173.22.2024.09.06.09.30.07
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 06 Sep 2024 09:30:07 -0700 (PDT)
Date: Fri, 6 Sep 2024 16:30:07 +0000
From: Shawn Webb <shawn.webb@hardenedbsd.org>
To: John Baldwin <jhb@freebsd.org>
Cc: Mark Johnston <markj@freebsd.org>, src-committers@freebsd.org,
dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject: Re: git: e962b37bf0ff - main - bhyve: Do not enable PCI BAR decoding
if a boot ROM is present
Message-ID: <spdohps7mmfirvxtxnv25nga5spycopqxol3vekfrptsmeo7p4@5jbif4bvvle2>
X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD
15.0-CURRENT-HBSD
X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
References: <202408191359.47JDxAbK026029@gitrepo.freebsd.org>
<qkp2zbmykgwsbrxekut35rexlktypzg5oj2bbfslig7eksprpi@2lw5x47mtytp>
<7213e551-6be2-44b1-a8b6-55645c593c12@FreeBSD.org>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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-sha256;
protocol="application/pgp-signature"; boundary="356w62jdouopvffy"
Content-Disposition: inline
In-Reply-To: <7213e551-6be2-44b1-a8b6-55645c593c12@FreeBSD.org>
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]
X-Rspamd-Queue-Id: 4X0hXd5Cm4z3wmh
--356w62jdouopvffy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, Sep 06, 2024 at 09:37:45AM UTC, John Baldwin wrote:
> On 9/5/24 22:10, Shawn Webb wrote:
> > Hey Mark,
> >=20
> > This commit seems to force me to now pass "-o pci.enable_bars=3Dtrue" to
> > all my VMs on amd64. I wonder if that might be a POLA violation. I
> > didn't realize that I needed to set that until I bisected the src
> > tree, looking for the commit that broke bhyve for me.
> >=20
> > Is changing the default here really worth it for amd64? If so, I'm
> > thinking this should be in both RELNOTES and UPDATING. I now have to
> > propigate re-enabling this across my entire infrastructure.
> >=20
> > Thanks,
>=20
> That should only be true if you are using an older UEFI firmware that did
> not program BARs. Are you seeing this on stock FreeBSD, and which version
> of the UEFI ROM are you using?
Ah, thanks for the hint, John! My UEFI edk2 bhyve package is years out
of date. I guess I need to pay more attention to what `pkg upgrade`
does NOT upgrade:
hbsd-laptop-02[shawn]:/home/shawn $ pkg info | grep bhyve
uefi-edk2-bhyve-g20210226_1,2 UEFI EDK2 firmware for bhyve
uefi-edk2-bhyve-devel-g20190424_1 UEFI-EDK2 firmware for bhyve
hbsd-laptop-02[shawn]:/home/shawn $ pkg search bhyve
edk2-bhyve-g202308_5 EDK2 Firmware for bhyve
I'm building some packages on my laptop right now. Once that finishes,
I'll go ahead and upgrade to the new package, retest, and report.
If this is indeed the problem (I suspect it is), I apologize for the
noise. Thanks, though, for the hint and the help. :-)
--=20
Shawn Webb
Cofounder / Security Engineer
HardenedBSD
Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50
https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A=
4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
--356w62jdouopvffy
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmbbLggACgkQ/y5nonf4
4foWixAApQ9bRIsO7C4qJN+yNDVB+abdJBefIB32wQezNwydBHM7/rw1157gnNg2
grXWYfv6SivyXhQw9ldGkWV+EKtV7XbIyxWOevxfZXTOBds15umE/wL0i+7ixq22
hJzA7V+U8eMsA4YGWUE5ZjOsZ7hPaMX5no7Zz5vm+kB2M487MPCLjrPvElynov+w
IHJ93L6diqtzSixRynSHJkfLPH45l+kklfAG9ovVrPtfjkHMJrg/7bki5b58LPU5
JudSO/MJM2/0MDwwc74QbkkOzWFuGaB2i/RcZe/VKBsXMs5t+nkmU4taxhpF+Yxz
VoIx8yc8m1p1ZKrfDONtA5SpPHhqf7iSEwd/RvoOZAD1TKYp02BBLg1tPK9mSCBq
/9OI9Oa1ZYRFRB+Ln1pfut4vRUm+s+SynoZ4pb4o8eEn+TbGJq4dF/sOCbi2lwwZ
edxFajIm/i1xcdHjFL2VqRqcALZFNzGdYBP8y+c1JQyYgFs+r3RNVStgd6XcqhOW
3KkazuDvxkuD/lfcAW7UVVdoqy5MEoTRCicF8LgRxCtT87QOx4yC9cS3dBue9Boq
LDqJkeKx6Y9gVRLtwwAKzcdNzS0fk9VAWjilqZBYn0hqHBK+92+mNL3T/S3NX2AZ
S+cgY4dljZ8i4Ake8YWXbpl9A6FdNLNY5xySObvz7V0r/CWgeMA=
=llO/
-----END PGP SIGNATURE-----
--356w62jdouopvffy--
From nobody Fri Sep 6 17:19:56 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0jf54c0rz5VXhW;
Fri, 06 Sep 2024 17:19: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 4X0jf52Nhlz47Qg;
Fri, 6 Sep 2024 17:19:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725643197;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0Q4JkzE8jPR5YdS/CwpVPgF2n9vfiQMKBGVY6y7zCVk=;
b=VH26Ksbpj6u5ZzwkV7j0PWsl6AGUWoZi4iZAKsa/EafhLeru6GrZwbTqAhpTPSJ4gRl70b
fuPFLZwNHUAx/NGWh+wvdCbqv4pIH7eAU6vUnv9kb2gtyqdqhcq9iiV0dTgOrC0qs/3q6h
EuEEUuhrmfGa7gqIdZkgtYj3CrhGqVJmO8lRYyNOFubFpNLazCLpxugS6rub1jxPkMR+lC
D6QNhrmQYrBMw9eVVCz6gQeVTfau71KsAsdQu73uE8MJdXJddZgSQlhkLfe17hJA/mVZ88
oqJP0qHlxFTR+PrFCC87CwNouhrxZI2Os5IqQ/Np8u91X/qCUoN8YmGDzNT4uA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725643197; a=rsa-sha256; cv=none;
b=VwvruKOhWyJy1k/kO+j2eOsoJIaoQxaCb+l8NRK9cL5e9ZRawRPVOfv/nEOUjLO52qdnra
dWk7bgTcjmwRadpzd4lWAWKcekgW0bAd3jsugEZ6nqJch7PhnO2Gj2BM+9Qk7BmfN5WUcS
09m6MbNbIlmsLBM8hgGfpGWJmvzZGrwUsEQLDd12oyljNagkbCh7gmn6Sm+mpfZ2CjLd29
H4u4khJ5DhWqJHvK4sE8ORwuzghwnaLuxgUmBhuLnro67Hfwk9oWVPQQ/0njIwIvBEzwNu
hjsm4QFt3qovjPjlE3O2Ag+3MjDAAk4B7dj+pZP8y1nnC4cIRdSiQwB0KAdbUg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725643197;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=0Q4JkzE8jPR5YdS/CwpVPgF2n9vfiQMKBGVY6y7zCVk=;
b=iSK6RXE0yE+3DXPVzgdS2Lpj0AGOfMvht4ddiAkbCU9VY2LG+gaMWi8RhLxbpMTv8D6EyF
NEhFjEAK0uGpe+QvGJ98HISGYkt3AHhArj3u1WDyy5AKtPtJyg5FckN9YMrFk+tJuF6cDs
Qq1GFkJ6UNVYmdukJf3gmwmH6/6oAeEdhBaanTYm60u1B45zxJuzdUFzj9do0QqMzEKktF
8z6NbNnxDUp/an18lKm/RW0BFnRGHjCL17HVK7K45n6ugz+XDlblFEHAVDJvziU4hZ//5O
wiICBtRGmVM6UFjf9jSlVPQkjwusDjp8hlaDR3+Ab3G4ohFeWocrIPojaIwTPQ==
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 4X0jf46mHcz10d2;
Fri, 6 Sep 2024 17:19: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 486HJuHf074902;
Fri, 6 Sep 2024 17:19:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486HJudP074899;
Fri, 6 Sep 2024 17:19:56 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 17:19:56 GMT
Message-Id: <202409061719.486HJudP074899@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 58f194223ab8 - main - ifnet: Add handling for toggling
IFF_ALLMULTI in ifhwioctl()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 58f194223ab8578269772a6874a8444e5e03afaf
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=58f194223ab8578269772a6874a8444e5e03afaf
commit 58f194223ab8578269772a6874a8444e5e03afaf
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-06 16:55:42 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-06 16:58:44 +0000
ifnet: Add handling for toggling IFF_ALLMULTI in ifhwioctl()
IFF_ALLMULTI has an associated activation counter and so needs special
treatment, like IFF_PROMISC. Introduce IFF_PALLMULTI, akin to
IFF_PPROMISC, which indicates that userspace requested allmulti mode,
and handle it specially in ifhwioctl().
Reviewed by: zlei, glebius
MFC after: 2 weeks
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D46524
---
sys/net/if.c | 16 ++++++++++++++--
sys/net/if.h | 2 +-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/sys/net/if.c b/sys/net/if.c
index 4458d710d826..ebad5c5d16e5 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -2611,7 +2611,12 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
(ifp->if_flags & IFF_UP) == 0) {
do_ifup = 1;
}
- /* See if permanently promiscuous mode bit is about to flip */
+
+ /*
+ * See if the promiscuous mode or allmulti bits are about to
+ * flip. They require special handling because in-kernel
+ * consumers may indepdently toggle them.
+ */
if ((ifp->if_flags ^ new_flags) & IFF_PPROMISC) {
if (new_flags & IFF_PPROMISC)
ifp->if_flags |= IFF_PROMISC;
@@ -2622,6 +2627,12 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
((new_flags & IFF_PPROMISC) ?
"enabled" : "disabled"));
}
+ if ((ifp->if_flags ^ new_flags) & IFF_PALLMULTI) {
+ if (new_flags & IFF_PALLMULTI)
+ ifp->if_flags |= IFF_ALLMULTI;
+ else if (ifp->if_amcount == 0)
+ ifp->if_flags &= ~IFF_ALLMULTI;
+ }
ifp->if_flags = (ifp->if_flags & IFF_CANTCHANGE) |
(new_flags &~ IFF_CANTCHANGE);
if (ifp->if_ioctl) {
@@ -3383,7 +3394,8 @@ int
if_allmulti(struct ifnet *ifp, int onswitch)
{
- return (if_setflag(ifp, IFF_ALLMULTI, 0, &ifp->if_amcount, onswitch));
+ return (if_setflag(ifp, IFF_ALLMULTI, IFF_PALLMULTI, &ifp->if_amcount,
+ onswitch));
}
struct ifmultiaddr *
diff --git a/sys/net/if.h b/sys/net/if.h
index 5c4b0637b25a..d54190f6ccf8 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -160,7 +160,7 @@ struct if_data {
#define IFF_STICKYARP 0x100000 /* (n) sticky ARP */
#define IFF_DYING 0x200000 /* (n) interface is winding down */
#define IFF_RENAMING 0x400000 /* (n) interface is being renamed */
-#define IFF_SPARE 0x800000
+#define IFF_PALLMULTI 0x800000 /* (n) user-requested allmulti mode */
#define IFF_NETLINK_1 0x1000000 /* (n) used by netlink */
/*
From nobody Fri Sep 6 17:19:57 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0jf63kSHz5VXq7;
Fri, 06 Sep 2024 17:19:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0jf6152Zz47Nj;
Fri, 6 Sep 2024 17:19:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725643198;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=faAjTBP6sTgkJrD9H3SuPsEZkGu2RdJJPC1HBqiWuMQ=;
b=QeQdTeFj1zrJ9dSILkYPKB9gW6a2Vw0ckPr5tsTqDLXJtKL/itBPbQmC0aGdbgz4BKVt+W
sVZSaMt16p8lwUNAY7xOYPw8oVhNVrUEFeWPLLPiBiNgP9BBCRoP1RqIgV6WK+czJ+gYcK
1Kj/YkUuFQJ8ru0rTaWAqhIrcPkyhsrHXLSkgsP5FOaeNxBr+9FJFRJCVv5OLT/Kp02LYu
lEu1aTyS5xFwHdPFdaiMkLqgkEFb03lcSruDk2bQOkH+CeDriKUnBxpqILOCxc1WcW51dI
j/JlrZqsVzML/SQblIE1lBCN8Zwl/7X/mj/dPqcjVp1sm02TtYPtTUdrN8L9Tw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725643198; a=rsa-sha256; cv=none;
b=VKDTXLIL3fb1N1mcgJeMb+1P6W4n1xPHWFU7V5jQLNj2Tun/35RauUHcwpTNlexPoYH3uK
29WcBCZ4WT3gsilwoUQKrNQSoIK6oGqd4II6/GsT7RVWPtmpSnBxdBUaSBher/DXD5m8ZG
ZQDPirUyq1HaBlsC6caz7SZ13ba89ZZjpfwgyKjpADvAkdfiqI+9NTjr4L+8Y/L0GcfBT4
oIR6L41oQ0BNu/G5PtxNFIQu0uYMkCFX/MYEr4IIpdOne4XyojdbBw9ieFDucRRpLj5lZf
jzrPzSZGX7EZWruYVliUPabbY6kRTe2tZ5uO8xGDTt7FvOrWgZLgzLW6C2uh/A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725643198;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=faAjTBP6sTgkJrD9H3SuPsEZkGu2RdJJPC1HBqiWuMQ=;
b=V93VRVxnQByn8iKscxDKgyu4v3MyY8/6QL9Fv9IgciqAhjZnRANm2E1Vjc0pSaQjjaICIt
58++9dLdwub8Sd8z3IGsa1Cv04z2pidVURC5Cp+c8HMWB+FIKkxkM3q+PiN4qSFBMjjLVW
xwLCrJ2LNHMaM0qlEb2deDA2GqkTuCxd9tovYcdC5EfUva8mpt10EamYqxYe2hEVTfi9kY
SdMKLJHXP1agrdxJAgWspZoY8lpNACkTMwo/leRwI8Q+aFj8C61YZ5PP6V9vPz3hdQbnFA
og9ISQN9plt3AKpNuWpKwn5WP5X0EgqZtohiFUagrUOudlg+g3jpzBpsHfmZ5w==
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 4X0jf60NKfz11J0;
Fri, 6 Sep 2024 17:19:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 486HJvfr074944;
Fri, 6 Sep 2024 17:19:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486HJvJ2074941;
Fri, 6 Sep 2024 17:19:57 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 17:19:57 GMT
Message-Id: <202409061719.486HJvJ2074941@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 00c9a6806c9c - main - ifconfig: Add an allmulti verb
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 00c9a6806c9cf3357b62f6708e5acd1ffd166613
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=00c9a6806c9cf3357b62f6708e5acd1ffd166613
commit 00c9a6806c9cf3357b62f6708e5acd1ffd166613
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-06 16:56:58 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-06 16:58:44 +0000
ifconfig: Add an allmulti verb
Similar to "promisc", this allows the IFF_ALLMULTI flag to be toggled
from userspace if it happens to be useful to disable multicast packet
filtering. One use-case is when implementing IPv6 neighbour discovery
over netmap.
Reviewed by: zlei, glebius
MFC after: 2 weeks
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D46525
---
sbin/ifconfig/ifconfig.8 | 4 ++++
sbin/ifconfig/ifconfig.c | 2 ++
sbin/ifconfig/ifconfig_netlink.c | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index c9861ccc6481..dfea59dfd229 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -502,6 +502,10 @@ Enable driver dependent debugging code; usually, this turns on
extra console error logging.
.It Fl debug
Disable driver dependent debugging code.
+.It Cm allmulti
+Enable promiscuous mode for multicast packets.
+.It Fl allmulti
+Disable promiscuous mode for multicast packets.
.It Cm promisc
Put interface into permanently promiscuous mode.
.It Fl promisc
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index e6ed9015b34b..a0680d09e54c 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -2078,6 +2078,8 @@ static struct cmd basic_cmds[] = {
DEF_CMD_ARG("descr", setifdescr),
DEF_CMD("-description", 0, unsetifdescr),
DEF_CMD("-descr", 0, unsetifdescr),
+ DEF_CMD("allmulti", IFF_PALLMULTI, setifflags),
+ DEF_CMD("-allmulti", IFF_PALLMULTI, clearifflags),
DEF_CMD("promisc", IFF_PPROMISC, setifflags),
DEF_CMD("-promisc", IFF_PPROMISC, clearifflags),
DEF_CMD("add", IFF_UP, notealias),
diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c
index 729d4ca56545..5a986e840d7f 100644
--- a/sbin/ifconfig/ifconfig_netlink.c
+++ b/sbin/ifconfig/ifconfig_netlink.c
@@ -77,7 +77,7 @@ static const char *IFFBITS[] = {
"STICKYARP", /* 20:0x100000 IFF_STICKYARP*/
"DYING", /* 21:0x200000 IFF_DYING*/
"RENAMING", /* 22:0x400000 IFF_RENAMING*/
- "NOGROUP", /* 23:0x800000 IFF_NOGROUP*/
+ "PALLMULTI", /* 23:0x800000 IFF_PALLMULTI*/
"LOWER_UP", /* 24:0x1000000 IFF_NETLINK_1*/
};
From nobody Fri Sep 6 18:05:19 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0kfR2d86z5VNKb;
Fri, 06 Sep 2024 18:05:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0kfR1q9Vz4KFN;
Fri, 6 Sep 2024 18:05:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725645919;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=kgoXlyZJxZN4oCUaviBbFO4E3JjI+ewWxKfeG/makM8=;
b=IwcTSjwlLMiLRWAdMH9SVWk5IsK+6FeYdsCVrEzifIXbhTXQigD5oTL3yo/MB/95UKIlkA
JTEPglp3s05cY/Y8RMo73W5XQ7TCLyjPkYh2HMaC5+pX5BkUYaUR6mzCYflaAL2xgVjxJy
6QY9RlP7SBPfVChcsCRB9ztdzyzneCzliTFAdjQtKzKwaey33B8BgSvx7nGBYMiSBTQd3q
bfg64ifp26P5vEdwGK+slLWgH+LjI1N+3bSmRZAaL3KOjMeIxJWMRMRzgCOJETJXeEk7F/
DFg1pwo7QYEuABaU2q7ZU8/RS83Wl3+Y/meQCNZoPPpS3Os7dItltR3faPVdyA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725645919; a=rsa-sha256; cv=none;
b=glxo9lgK/VRquO0HgK625sbj+4QNmdlmVk3bskU0aOVJ0Ldds3DJd6iB6clP5Ex+vQoZdB
mugU9qEAJ9j2TutrMEc6Eionq/k267wXGBXfWcaF9YI5UGt4G7YkWcdS6PIMe6O+CDAa49
NwWvA5VRTZlhNdkCleA9oqVSLm1paDhA9COjV9FT0gipUIp7L9Rp6/57FiBa4kRpEYjkOV
qzSL04WLbOGt5bXmLScJrRjeJT+DIEzkWMnJqSm9bnsJkEvPYT4u+wURrPG0nEJox1b1pK
k8E0JlFBKW8xPv+7owrO7nX2qwSeDpFun5BOBrp5EYZUSTodl3ar6nKfwCj6AA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725645919;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=kgoXlyZJxZN4oCUaviBbFO4E3JjI+ewWxKfeG/makM8=;
b=cPqAJqYjxkzUlNt2JxYULBi8ySA0GCXChevfLdFzOE6aeQGnXS8V6ZQDNAFmkU3H8rC9vJ
LitJBd5TZ+CUB17SQo/bBYPdvivZUtBJ6fInJDxWCDFBru0NF/MRrwqSAXm7naApQ3Fj9t
/1ZmyGMnlj9myaShNQ3JptwFAtrlfZreq1B5vRf2xct0ka9zKOoLa8/bvlcqfZf+D7p14q
QdF44DKRk16r7OIXOkUWtqh/zn2p7SeZi0AYpsP1KTSM2zfZAzaf/Lt43ZTXi8ftt7Aqy+
oGQXHXxOY61OomnvOM+k7pvIDmCOxXjVT1DZfsPufQpTljcBae8OqsqWIKBZkQ==
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 4X0kfR1QhGz12Xb;
Fri, 6 Sep 2024 18:05:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 486I5Jqa059698;
Fri, 6 Sep 2024 18:05:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486I5J8Z059695;
Fri, 6 Sep 2024 18:05:19 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:05:19 GMT
Message-Id: <202409061805.486I5J8Z059695@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mikhail Pchelin <misha@FreeBSD.org>
Subject: git: f5a58c2da239 - main - linux80211: fix default
deflink.rx_nss
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: misha
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f5a58c2da23930ee4870f2eb54788f4669b9aa33
Auto-Submitted: auto-generated
The branch main has been updated by misha:
URL: https://cgit.FreeBSD.org/src/commit/?id=f5a58c2da23930ee4870f2eb54788f4669b9aa33
commit f5a58c2da23930ee4870f2eb54788f4669b9aa33
Author: Mikhail Pchelin <misha@FreeBSD.org>
AuthorDate: 2024-09-06 18:04:52 +0000
Commit: Mikhail Pchelin <misha@FreeBSD.org>
CommitDate: 2024-09-06 18:04:52 +0000
linux80211: fix default deflink.rx_nss
Native Linux implementation sets this as a maximum between 1 and
ht/vht/eht rx SS'es, FreeBSD does the same, but uses 0 as a minimum,
which leads setting it to 0 if we're not in ht/vht case.
This 0 was breaking rtw89 driver, when it was trying to determine
SS number by subtracting 1 from rx_nss and passing the value to the
hardware.
After this patch rtw89 association and simple ping work reliably,
but more work is needed to make the driver robust with heavy traffic
(iperf3) and being long idle.
Reviewed by: bz
Approved by: bz
Sponsored by: Future Crew LLC
Differential Revision: https://reviews.freebsd.org/D46528
---
sys/compat/linuxkpi/common/src/linux_80211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
index a2791d20a727..ae765cda5781 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -347,7 +347,7 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN],
sta->deflink.smps_mode = IEEE80211_SMPS_OFF;
sta->deflink.bandwidth = IEEE80211_STA_RX_BW_20;
- sta->deflink.rx_nss = 0;
+ sta->deflink.rx_nss = 1;
ht_rx_nss = 0;
#if defined(LKPI_80211_HT)
From nobody Fri Sep 6 18:35:09 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lJs6y9Rz5VRmP;
Fri, 06 Sep 2024 18:35:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0lJs6TJ5z4VNp;
Fri, 6 Sep 2024 18:35:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647709;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Gjrs7eVHjCS3uj1Dtj7JSB/gZPLMwA3K1TShi/Cg7JA=;
b=WTIDHy2txV5ZCP+h9g+PGTrXLxkVOBRuWTIPW/8PG3o9TurjgCLDmcdlwW8w3RRwzgpEnd
NeNqdFuIWHSOTORij/EMlrOUWiuSo2RnMKTbUo5DSs27KNH8HHnYWzzUHsasfEqSG5win7
t8mkJ8hiyMeTf87mSdYsUC/ygdiikdEt4AowIiE1HmX/6jcKoeySexjdNqX7owt5DnHzTj
lZe8lSIo5j4THTGG+nu0+cfDbjINVOYh/yRfJy4AEmL0vswGya4+Uibb54b4RwEVNQBTMV
ZyEXXV6kZBSl4hZtx3Gr03VORh13r1Eh25ApWDrAzwMl6frs30j3kLGdR8Zehg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647709; a=rsa-sha256; cv=none;
b=S+p9475X3VVMCDIK4aArD05asIM+pr93SLLJXJEAm2/jim9rix8Rkx8TctiVOVNMWFbWR7
y9BaMUc13HkZ4zf96Wx3qi6bVFfD/brwoAl9Wn6ckajQNwXgNHakI1E2ULYEp2bcR+7lX5
j8L+5ezGgx8fRx1j1veta1I2MwGtp9MA+nu7mqtikCzxmL92PPggrbjzm85icJwVL0HngE
ur2XUizKClO6RPP8VWPFKpM7cnjiGuSdcSikzlF7P5DJwHIz2/FXOm5ILp2/Lpc8lz6vhM
0rjPlNaVk6Uyl3OLBnEzEfmTB7yWkkbC/F6n7ALg8xAbpFdrEgl6AiLUcYKPGg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647709;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Gjrs7eVHjCS3uj1Dtj7JSB/gZPLMwA3K1TShi/Cg7JA=;
b=fQGE1OFYBbOFaI0lkHmUW4r5b8KTcXpQxfll+IE4nSkdChiaOl4jFIBTyFov6LAi3pu0/r
ZxnvlervTz/oipZnF7o2l2ZasOuh0lgMSoaD7Zhx9+bR7dLbv4TqJkBltWGbU1D4ONSlcH
E/5jLHiAaJxzn09qJPNOqGIGCSw8RnPt2Sgw8gg6CKQ99jMsOUxJGs7OUCCNM9Y0dRLyKB
6xoZS06r7LP2ZCtPQzMo/TCpWGFv4LrXryiL3eojbf7S2hZlGbiH/8Ku8Mhqjzf8aUotu4
2RtzzQQmupkyn4Gv/t1WCvLstRunAl/wmByBVzMUmXmfS0OazzkggtfZHKrgiw==
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 4X0lJs62nTz137t;
Fri, 6 Sep 2024 18:35:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 486IZ9m4010544;
Fri, 6 Sep 2024 18:35:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZ9Fd010541;
Fri, 6 Sep 2024 18:35:09 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:09 GMT
Message-Id: <202409061835.486IZ9Fd010541@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 07d90ee0a621 - main - kvprintf(): Fix '+' conversion
handling
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad
commit 07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad
Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
AuthorDate: 2024-06-14 07:30:28 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:30 +0000
kvprintf(): Fix '+' conversion handling
For example, printf("%+i", 1) prints "+1". However, kvprintf() did
print just "1" for this example. According to PRINTF(3):
A sign must always be placed before a number produced by a signed
conversion.
For "%+r" radix conversions, keep the "+" handling as it is, since this
is a non-standard conversion. For "%+p" pointer conversions, continue
to ignore the sign modifier to be in line with libc.
This change allows to support the ' conversion modifier in the future.
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1310
---
sys/kern/subr_prf.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 4dc989e2d1f1..8ecabdec18d5 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -660,9 +660,9 @@ kvprintf(char const *fmt, void (*func)(int, void*), void *arg, int radix, va_lis
char *d;
const char *p, *percent, *q;
u_char *up;
- int ch, n;
+ int ch, n, sign;
uintmax_t num;
- int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot;
+ int base, lflag, qflag, tmp, width, ladjust, sharpflag, dot;
int cflag, hflag, jflag, tflag, zflag;
int bconv, dwidth, upper;
char padc;
@@ -690,7 +690,7 @@ kvprintf(char const *fmt, void (*func)(int, void*), void *arg, int radix, va_lis
PCHAR(ch);
}
percent = fmt - 1;
- qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0;
+ qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0;
sign = 0; dot = 0; bconv = 0; dwidth = 0; upper = 0;
cflag = 0; hflag = 0; jflag = 0; tflag = 0; zflag = 0;
reswitch: switch (ch = (u_char)*fmt++) {
@@ -701,7 +701,7 @@ reswitch: switch (ch = (u_char)*fmt++) {
sharpflag = 1;
goto reswitch;
case '+':
- sign = 1;
+ sign = '+';
goto reswitch;
case '-':
ladjust = 1;
@@ -771,7 +771,6 @@ reswitch: switch (ch = (u_char)*fmt++) {
case 'd':
case 'i':
base = 10;
- sign = 1;
goto handle_sign;
case 'h':
if (hflag) {
@@ -824,8 +823,10 @@ reswitch: switch (ch = (u_char)*fmt++) {
goto reswitch;
case 'r':
base = radix;
- if (sign)
+ if (sign) {
+ sign = 0;
goto handle_sign;
+ }
goto handle_nosign;
case 's':
p = va_arg(ap, char *);
@@ -862,13 +863,11 @@ reswitch: switch (ch = (u_char)*fmt++) {
goto handle_nosign;
case 'y':
base = 16;
- sign = 1;
goto handle_sign;
case 'z':
zflag = 1;
goto reswitch;
handle_nosign:
- sign = 0;
if (jflag)
num = va_arg(ap, uintmax_t);
else if (qflag)
@@ -907,11 +906,11 @@ handle_sign:
num = (signed char)va_arg(ap, int);
else
num = va_arg(ap, int);
-number:
- if (sign && (intmax_t)num < 0) {
- neg = 1;
+ if ((intmax_t)num < 0) {
+ sign = '-';
num = -(intmax_t)num;
}
+number:
p = ksprintn(nbuf, num, base, &n, upper);
tmp = 0;
if (sharpflag && num != 0) {
@@ -920,7 +919,7 @@ number:
else if (base == 16)
tmp += 2;
}
- if (neg)
+ if (sign)
tmp++;
if (!ladjust && padc == '0')
@@ -930,8 +929,8 @@ number:
if (!ladjust)
while (width-- > 0)
PCHAR(' ');
- if (neg)
- PCHAR('-');
+ if (sign)
+ PCHAR(sign);
if (sharpflag && num != 0) {
if (base == 8) {
PCHAR('0');
From nobody Fri Sep 6 18:35:10 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lJv0xGwz5VSCH;
Fri, 06 Sep 2024 18:35: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 4X0lJv0D89z4VWD;
Fri, 6 Sep 2024 18:35:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647711;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=iARwZMnzN5Wnsy+XbehcUFod9Ctt/VZqdAUIHY/Nf+U=;
b=SsT7aGYYk1lnJGNokoIVdki7VXvLfbSvd+LhECo8TYjNi1Hxxps39nvRHOh3EaLilsTD/y
qSCamx1k92ZEeJWNGglvh0E92lxzTStD43Rw0acckUhRtJ+XRtsbPH1cK1/6thKKOPRBd/
LhLeoBXXJ4tpIPalucBB1FYAioCoI1QjLsPWfiYodh8qLF4Ia+4dJ8UHbP5NsCV00nojtI
8SUzMlNlOYk2VNsmPtuwX2Ac2dq6/G3AKTx6IgkMlbnvzjlGLAGHC3YIqJuii5YG3j0p3u
FBL5IcOVRsH3vrVQfWLGZgwnvr6+pe+WD4+IhV4ucif6U9hjxS6w7SjhfxSBFQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647711; a=rsa-sha256; cv=none;
b=jZOj7J7v2A8D5N5uFr1qD1Dura77yXlR7qMrMRVvs1K6EKG6dBlZ3mB4H8weNzbOrzSYqM
JVv6Qb3TlJ4+IuvnRQ58Ysv+iV8WHonFzSpNIvhVecLI6muroia49R5DqiA/BlRSwwhctj
F1v2+Ar0LpTrXmCwGhpDYwtMAH3SoiQkRXVKu0Hvv3/xY4vPTb2Vt78687lKFAy7Nola+j
TXR/OqlkdcrF5GPCZfI/nIPlUTLAjhgc5t9XyBFVBzMblpLEALuAZvKgOrx8NDTB2Vr18j
rSS3IYmFMrXzEfffyF/Fq1KzlPXi8ctFdctfsfjzKcrJm+MMsAxukcKNBW1rHA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647711;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=iARwZMnzN5Wnsy+XbehcUFod9Ctt/VZqdAUIHY/Nf+U=;
b=t/JCASKwgSjSzEt6LQCUAG1sQST75qICZFeCCnPc4QHja6QngYw1EZmMC23FMsZ/Ca55vr
KkoP2VmbcFppjdxlw0fbiGt2kNdVui8/KHbSRXZ2IWN//IHKLUV0bpVeQeAw6IluFPhLgp
6q27m6zcYei7Wl0nkLw71NdWRHtF4fNydLA+fsVls7wRUSS5NLoRFuN2DflQVsk3sDwWOO
HK5/qcD6PuLKs6DxTWmV4cOu/hpyLXptC/kVBczwCH4BkDpl/uL6Gnlm51pLbpir9dKr+z
pE+QBjR9Ud4HIgKdctOpTlhW79VU0WvPbfc9e3NX7zG5TytnvSPm+ZiNeCzl0w==
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 4X0lJt6xXtz12r3;
Fri, 6 Sep 2024 18:35: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 486IZAdd010585;
Fri, 6 Sep 2024 18:35:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZAKU010582;
Fri, 6 Sep 2024 18:35:10 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:10 GMT
Message-Id: <202409061835.486IZAKU010582@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: e152944f1a16 - main - usb: increase USB_PORT_RESET_RECOVERY
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: e152944f1a16a4ff33b4e20b813ce4a54b884b90
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=e152944f1a16a4ff33b4e20b813ce4a54b884b90
commit e152944f1a16a4ff33b4e20b813ce4a54b884b90
Author: Ahmad Khalifa <ahmadkhalifa570@gmail.com>
AuthorDate: 2024-07-16 17:38:12 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:30 +0000
usb: increase USB_PORT_RESET_RECOVERY
10ms seems to be too strict for some configurations, so increase to
20ms.
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1327
---
sys/dev/usb/usb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index 3d00cda27d18..a6c3c8030c73 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -114,7 +114,7 @@ MALLOC_DECLARE(M_USBDEV);
/* Allow for marginal and non-conforming devices. */
#define USB_PORT_RESET_DELAY 50 /* ms */
#define USB_PORT_ROOT_RESET_DELAY 200 /* ms */
-#define USB_PORT_RESET_RECOVERY 10 /* ms */
+#define USB_PORT_RESET_RECOVERY 20 /* ms */
#define USB_PORT_POWERUP_DELAY 300 /* ms */
#define USB_PORT_RESUME_DELAY (20*2) /* ms */
#define USB_SET_ADDRESS_SETTLE 10 /* ms */
From nobody Fri Sep 6 18:35:12 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lJw45TCz5VRmR;
Fri, 06 Sep 2024 18:35:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0lJw1TL2z4Vkd;
Fri, 6 Sep 2024 18:35:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647712;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=8eZ9Re560QEK2MPuQnt13omPKvywCuSUoLRvKgfg54s=;
b=DXWE1GiMyqlrJe1o1lHJEgZj3Li+f4TvmBR0q1Lfj/Np1RJ+mnr4flDXPFjZbNrrK2R0+Y
mk3Id7Plv+9cJiE9OcNZeeebO07UFgCCkBK5GA259PQOJSUaQ1MgcMyeBEmO18WJM5dcN/
4+wBEQyUVmccW3uDJmcOOofDOa0kV0nacNuXlQTMo6rYgm5JNsKdJ15ZL9iWgL55dl4vtc
Vk/JH1QxgSD8irjHKQveYH27ebBTi02fMVVVjq9RoPdHH3cjvTtTSAXhKstHpujN/y/Jq1
c+OOx71hg0cZqklePEtsp9apazPUkNo2By6ScofVcy145cAwLjAtPtEhdZoz5g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647712; a=rsa-sha256; cv=none;
b=OSarWXVLXlrV7ybLjCqb041HsL9oLrU/JKECeCA3G7UDUKfSfLyIS3TZL7tBgctYZQGkgp
W5ixTE2ADfQsxNVFvuqSIVIw5DgBJDLpKmk6T41lqsGBiyk0aoUVJsPOUUj19fNAACHoU6
aJI7ZkqUmJgzB0sMYw/bEHY6ZE76XVBYPbuPG6YKcSWfDsQL1QwEhz4B0DsNQQpT1TAXSN
bd+NHCvxQ+TBmm7SYO6eSLGhXVd8Cmt5ubm36eZN094Qq3F05wfpPHuLLPcaN7k6mnQG22
jipAH7BLYPnEVaOoaVqERKssb9JJ0Ngw743cGHFfUeKH5Iy7glfesttnQCZV9Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647712;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=8eZ9Re560QEK2MPuQnt13omPKvywCuSUoLRvKgfg54s=;
b=LqIP1eAqc2kY6BWU1+EwyDrT7Z/Wyx8cSXXcExL6YhnFmVBMvGGC2yOv+dpPQ764dRqnsj
mIWSnLU9oCHUpxx1es/1zRMbVSB077QWkUPkbLC00U+VBZpiBndMHZlyqhGGwZxc1oXt2X
VncDZyhgO2fY0HGnetj6E8Ig6ByieE6TcNih3f27UJe0yEPMWlwcX8UajgRB4/+YCDwH5b
XjJNF7qEuLfMcm092+eHHFiBj0BbNtf5CmecYFBj9pvQtQJ1YzvDBxoy7TRY4Vn5tqh5UR
MTwK5K51iCNQ1r07GUuSstktDt6E2Gwi6HjUhixlha5qmMaq1jF3e/PA5dNj3A==
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 4X0lJw0pfcz12r4;
Fri, 6 Sep 2024 18:35: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 486IZCjX010633;
Fri, 6 Sep 2024 18:35:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZCNw010630;
Fri, 6 Sep 2024 18:35:12 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:12 GMT
Message-Id: <202409061835.486IZCNw010630@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 71978fa41f2b - main - du: Add version information to
libxo output
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 71978fa41f2be0ecce7cb10d30242d29d4ccd844
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=71978fa41f2be0ecce7cb10d30242d29d4ccd844
commit 71978fa41f2be0ecce7cb10d30242d29d4ccd844
Author: Bram <bram@cbbg.nl>
AuthorDate: 2024-07-24 20:01:56 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:30 +0000
du: Add version information to libxo output
Add version information to libxo output so that
libxo content consumers can track changes.
Reviewed by: imp, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1350
---
usr.bin/du/du.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 96ad7c037dfd..185a5cbe4465 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -55,6 +55,8 @@
#define UNITS_2 1
#define UNITS_SI 2
+#define DU_XO_VERSION "1"
+
static SLIST_HEAD(ignhead, ignentry) ignores;
struct ignentry {
char *mask;
@@ -259,6 +261,8 @@ main(int argc, char *argv[])
if ((fts = fts_open(argv, ftsoptions, NULL)) == NULL)
err(1, "fts_open");
+
+ xo_set_version(DU_XO_VERSION);
xo_open_container("disk-usage-information");
xo_open_list("paths");
while (errno = 0, (p = fts_read(fts)) != NULL) {
From nobody Fri Sep 6 18:35:13 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lJx3rBfz5VRmS;
Fri, 06 Sep 2024 18:35: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 4X0lJx1qtKz4Vqj;
Fri, 6 Sep 2024 18:35:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647713;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2hT/nz80Wjv0/nlyBSyPVXf5bpdyGRtYM9ZBgWkNfMQ=;
b=RSbrKgkbJnpVEiZRxyBWErnqVr8EKppudsKnbetFadKdzraDV87rY/o5R5yCAYFvm33aKS
kid88a+bHEeVLchsORDqU24cw8G6OIE+/DZcxGeFQV/Hg/aSQ7EygqImMYy8Ka4jatoaZh
7fTIGbkL2OmQ1vvEdLGut0aht0zC1oOU8KxOsChp/I2BjBqbkDo7sNbbCsN2pwTR7NlEfg
DvOfdnRr4nqy0sELRwJ5TmroIZqbAIc9l9F7hJ07zXjiIEZ47fk/evg4hsZC2aa5crycuO
98WXxi7oaEwbrDh42cmrBqKIDlQOBhxReEIn4pN9t9Su/Ie/3Dx04vl1Jh9IyA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647713; a=rsa-sha256; cv=none;
b=EsojDGV2jcCRaESBOhu98YFS+05LybOsmx2Rkd1OK1NBhSxKm+oEU4NmwMSK3LVv1+Akgw
rpoK6XSUeFOEyzxaS96YQJPC41pFrMt8B1/tKkxHRts8qByH1CNbvdXjRpPdba4R7mIA/E
NLDt6T07kR8HrLq1dxcU8yvKyQBYjroiUnExKwM10xnl9+tTM4twfTGCkGhzfEEIOfjCYy
6mJp75j/0Y0BUG++wdlgT5i4+NchvuYk3MUexNgYuKk6UE2hSRzcXfOlGTNjmtDXTnUzbS
ygrqDZWnIgdJd4TCh9RK1KOFjdqe0JM1d3gi/S3XTVfkP4LAGx17/kkki19vvg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647713;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=2hT/nz80Wjv0/nlyBSyPVXf5bpdyGRtYM9ZBgWkNfMQ=;
b=wz7+zB10if7suXBnGTyiPurdGV/TG0Y1mTmYrZiN4N3G4ANd1hmfyJ+fvAOL9ovO49Lxy+
iqGtYz/NQ/tLa1RA+G4Ttsmc3zZVYVQ4JUl/cd39Uhfz+dWw2USl1A5XjRsWseMqeSEybB
9NPfVw7/UktqDCKBHFFem3srxrKeFLnOO8xDBVOZr62mxOt5nUCbI6aY4qSh+gN2jBdAkt
ayMqUx4dMpMlx06tVGt+NTA/X9uzV+vxHQDqeXm4t3prCBlSLznL/PXZxXVYjf5fdXnbBS
+obs3G9WfSMxdRa2kHVNfe0GGy5490u7Spn9LRDtz+UxDokvOJjxBmZ/ZtzHLw==
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 4X0lJx1RN2z13HL;
Fri, 6 Sep 2024 18:35: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 486IZDGe010695;
Fri, 6 Sep 2024 18:35:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZDBO010692;
Fri, 6 Sep 2024 18:35:13 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:13 GMT
Message-Id: <202409061835.486IZDBO010692@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: a0d6f89e692a - main - lastlogin: Add version information
to libxo output
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a0d6f89e692a683fc7f558e9eb8a27d30069e949
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=a0d6f89e692a683fc7f558e9eb8a27d30069e949
commit a0d6f89e692a683fc7f558e9eb8a27d30069e949
Author: Bram <bram@cbbg.nl>
AuthorDate: 2024-07-26 19:34:08 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:30 +0000
lastlogin: Add version information to libxo output
Add version information to libxo output so that
libxo content consumers can track changes.
Reviewed by: imp, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1350
---
usr.sbin/lastlogin/lastlogin.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c
index a1dcde3f60bf..3a71693f7576 100644
--- a/usr.sbin/lastlogin/lastlogin.c
+++ b/usr.sbin/lastlogin/lastlogin.c
@@ -48,6 +48,8 @@ __RCSID("$NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $");
#include <libxo/xo.h>
+#define LASTLOGIN_XO_VERSION "1"
+
int main(int, char **);
static void output(struct utmpx *);
static void usage(void);
@@ -103,6 +105,7 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
+ xo_set_version(LASTLOGIN_XO_VERSION);
xo_open_container("lastlogin-information");
xo_open_list("lastlogin");
From nobody Fri Sep 6 18:35:14 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lJy5GzHz5VS0s;
Fri, 06 Sep 2024 18:35: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 4X0lJy3XNYz4VX0;
Fri, 6 Sep 2024 18:35:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647714;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=dmEHBlRzKFfLMZ9fQmPKo4pErqpJRzcRPUg1R+OdmzE=;
b=CiQiaskEY3urPuXrXBFjjPSQEz+45odnyvhdWx2526rv6xzdSQX/2d7wN7kRjCQ6roy1VK
bwTgBsAmGK9S2jKzVRqq2W4IlNlv4kDrlw3U8NKY55NBdCiJnZa8WNfdvKeIOheiZP9uqc
K+cH6P1S7/UE9EJ+BOqZ4SIH/4ddCwlJ0bn19QV22Dt33WSEcgZXPdQAU0eESeJNBmvATa
RPHoptzUMXl5hmQc6oBZBOKqY4sr+KOv3BXLCWzH4etVzBufNi4gY/ourxFnV9hfkK7qlg
q5W4QAJl+fBeKmH+e3g6AnZgseLql1yrflGwvYaARZEZeGwcQ1rO8JDVh3y3JQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647714; a=rsa-sha256; cv=none;
b=HDG+v/qbDYT+zO1n3jywAP1SNcq0Vg/Hf/qfEPXirXEZS7x9jKreMkbk2bE4J0GZwGg8Dq
taPy1t/UOQ3MkDLLI/XorejrOn5/agC9Q11zL5DkpDxacfc2+FO/+wt0AAGBtAqc2QW93A
WiA/92mAyMkCPjMlq7/ndlhKP1jZu1sLoUZ5S1KX5enROLHCF3l7FhweKS0oMoydvp4/0q
vmwKDDvInLgO6njipAUUUIejsDiHtBU1I69daYA4BWPFUzJX3wkXOFcanHedAtbDJIQZX+
3NLTemeJlLuAGie0+DZ2+r94+Gd5S2t91QeoK1WXa8lCoEL71MXBUGmCNE8l5g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647714;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=dmEHBlRzKFfLMZ9fQmPKo4pErqpJRzcRPUg1R+OdmzE=;
b=r4ecFUbgXtxIsFEoL8j0uWhTcojzFXwSA5omyYd9dAPpBtpP+/zej9wMcw0MF6jAgFZTZ2
IJ0nKXlsWtbWiplplf9sQ532qoUDxnZejdyJ34M/xjdJS1W8qNvUYXc9Nvhy/SsyZWtOUE
a2q4kSKKVVr9cPq5G40DNwc5/Qe2EMghLXHvhLqCXaeMLyOvYhpG4WNgKvpP2Sw0YPPwE+
A1HwWmlQAwr2N87cDIddClSnwBnVlBwwqUXeAwiDB1bbnTP2jql3k9gFX0DAt6f8VWW+fk
t2Qx9qWlu5x+kpud93IFQ2w5XXjKlSzgV7D1tkyGqM4oVxTeXIIhOQ8k0NnbIQ==
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 4X0lJy2QNLz12r5;
Fri, 6 Sep 2024 18:35: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 486IZECu010845;
Fri, 6 Sep 2024 18:35:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZEEB010842;
Fri, 6 Sep 2024 18:35:14 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:14 GMT
Message-Id: <202409061835.486IZEEB010842@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 31ac8806885f - main - iscsictl: Add version information
to libxo output
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 31ac8806885f22d6b3a3948a8f660ba0cf24e9cf
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=31ac8806885f22d6b3a3948a8f660ba0cf24e9cf
commit 31ac8806885f22d6b3a3948a8f660ba0cf24e9cf
Author: Bram <bram@cbbg.nl>
AuthorDate: 2024-07-26 19:35:06 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:30 +0000
iscsictl: Add version information to libxo output
Add version information to libxo output so that
libxo content consumers can track changes.
Reviewed by: imp, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1350
---
usr.bin/iscsictl/iscsictl.c | 1 +
usr.bin/iscsictl/iscsictl.h | 2 ++
2 files changed, 3 insertions(+)
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
index d95cb9a1c096..b75ff889a9a6 100644
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -746,6 +746,7 @@ main(int argc, char **argv)
if (argc < 0)
exit(1);
+ xo_set_version(ISCSICTL_XO_VERSION);
xo_open_container("iscsictl");
while ((ch = getopt(argc, argv, "AMRLac:d:e:i:n:p:rt:u:s:vw:")) != -1) {
diff --git a/usr.bin/iscsictl/iscsictl.h b/usr.bin/iscsictl/iscsictl.h
index 2ac17890bb57..3bc69e4877a9 100644
--- a/usr.bin/iscsictl/iscsictl.h
+++ b/usr.bin/iscsictl/iscsictl.h
@@ -38,6 +38,8 @@
#define DEFAULT_CONFIG_PATH "/etc/iscsi.conf"
#define DEFAULT_IQN "iqn.1994-09.org.freebsd:"
+#define ISCSICTL_XO_VERSION "1"
+
#define MAX_NAME_LEN 223
#define AUTH_METHOD_UNSPECIFIED 0
From nobody Fri Sep 6 18:35:15 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lJz68Hqz5VRkw;
Fri, 06 Sep 2024 18:35: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 4X0lJz3rP4z4VX7;
Fri, 6 Sep 2024 18:35:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647715;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=VnqZTyz7S/7U/o/WJB0+S01/lD1YfA2nrqpQYq+jYeY=;
b=BnaerrmxVo/6WQkRtZFxXiUUZVwujPjHc341BzX5Y2dUuTpzEFQpcMU0cR1zN2RtgSTMFC
79s7bFFl4ciz9dmO9xEM1z73ENJwu2+AHb0z64+I+x3KGID1D/2PsnAHKxL/zEGk3xfcMc
UW3lIRfq5hDlf3JmrWMg6Sf4xsODJYSW8I8gdVeJaQ+fyB5yUZmmmUu1fM66j6Rr9SrY42
mV1oAz3oMZTgWVi5JO5rV7XlTQeKuljivDrEHyVJ7bQzvku3h/0qxFV+AkI3oSyqCCip36
YqxmcItX5BtjxQwZfdR5abPEWH4DweVd9wGHhnJLjof1OHlrsykEelcHKkEiIg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647715; a=rsa-sha256; cv=none;
b=axLpL4Uv8fc+6H0+/Zsi9s3+6ibEZn0lKRPWWCy9B/Q7VXesnY/G9h8iJ/HJAKtNrvfFyG
dPDOGa1G1+bG5hEeT1Xp2SXSNW5mbbxaOi7hMVUentiqgl9lN8Rx1vxtjgb0TyA0oW3bO3
WVku5NK+VP/1WMe+6w95ESJUbMbbhRbuPMuD3M65cjW4yf+KvGKAR92/StlLu7OfONMPtp
EO12AbFxabpyL06lLEUBVYXn11/nIthNADtzbWajaxd0apx3GzjMKceMelN11hNK1BGoBg
+pZc00agGkJnfSTajzqBGPTIAbLwPg2OZ8X3ZCiSoQduyUFjUj/yFtE7JUnJSg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647715;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=VnqZTyz7S/7U/o/WJB0+S01/lD1YfA2nrqpQYq+jYeY=;
b=N8h4R30+k6uRRa/QsNLWI7d96y3sJ4nvOj90Uuzlc62bW2dliKDM2XallAsKGPLn3s4s46
QS+RVUdRMpBCLlN+slstDovlXiAQPjkSY9435ghYT08Of3uWhyaLwzs/ZbpPJ6ffr7hsh4
bh3WpCQmDPS6kTkZa6Yoo+tFfSSsNPV7ifndzfoDj+OZG7a3l3FuZFYobSzwu1JvYagXXq
dVcP0lwiel1hMzYElh2zesCnsjXI4hR0DXf7zozYBE28ARDUN1j8HFqe79FrabzKHEMc6j
GVWT/Uo/dHuWZhLDHk9rNAFromA7ywKSQ+G91pu75hFPBuVYX/W9RVFEIjC6kw==
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 4X0lJz3PMvz137v;
Fri, 6 Sep 2024 18:35: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 486IZFGt010923;
Fri, 6 Sep 2024 18:35:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZF3L010920;
Fri, 6 Sep 2024 18:35:15 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:15 GMT
Message-Id: <202409061835.486IZF3L010920@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 5321a3547912 - main - w: Add version information to
libxo output
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5321a3547912acbeea7eaea8ec3ed85f07537469
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=5321a3547912acbeea7eaea8ec3ed85f07537469
commit 5321a3547912acbeea7eaea8ec3ed85f07537469
Author: Bram <bram@cbbg.nl>
AuthorDate: 2024-07-26 19:35:57 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:31 +0000
w: Add version information to libxo output
Add version information to libxo output so that
libxo content consumers can track changes.
Reviewed by: imp, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1350
---
usr.bin/w/w.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 8bce6d8427e6..47899d0b38e0 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -108,6 +108,8 @@ static struct entry {
#define debugproc(p) *(&((struct kinfo_proc *)p)->ki_udata)
+#define W_XO_VERSION "1"
+
#define W_DISPUSERSIZE 10
#define W_DISPLINESIZE 8
#define W_MAXHOSTSIZE 40
@@ -317,6 +319,7 @@ main(int argc, char *argv[])
if (fromwidth > W_MAXHOSTSIZE)
fromwidth = W_MAXHOSTSIZE;
+ xo_set_version(W_XO_VERSION);
xo_open_container("uptime-information");
if (header || wcmd == 0) {
From nobody Fri Sep 6 18:35:16 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lK10HF9z5VS22;
Fri, 06 Sep 2024 18:35: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 4X0lK04lwXz4VjG;
Fri, 6 Sep 2024 18:35:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647716;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=e46m44dI77VChtm/w4W8dxUYl05lagZY2zakz3r7dY8=;
b=kxI88RTZtvmN0fO6TnnEAkAbZ3/7gimOBoNLryIoNh8g5QArSNir7z0qK1XosqSDwEXDVs
/qk7PFoumq+gLHFx/dFQQ0mBPVBczGXsaSggKFNJ14IFamiWqUEujC0iCAIkgF9zidOaFr
oxMn6lzgJrjWtuEP9KF8h6M4HeDZzTf1dnZrfe/ACjkvBZMc4WI3iEko1M20WNlIkdtrja
XbOE3CF+50Sy3riU7oDu821m48rR9BACseUrsu3gwf4gxx6YvJV7T3momD0zKqiOcJgrqq
R6nq77QdfG/qzIhYiG1mg1oAbKW8WR9IFUQxP5f5dcrMLMR15PyUo0KG4TnAwA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647716; a=rsa-sha256; cv=none;
b=qjIx34AEV7Ll4wH0QidXcU5YjnvzkFKOgAa8JU7rKF4ehVNVFvlT4IbNqbceYE/xoEVYsZ
SWxoF2vxSs4Epwp7FtnzIEr9codZS7LOBFn0jp9Nn76ZiLzlxmE5cigJGFEbjQQdyv+B2G
U6KJVVR9GffDQ8FDwMWfDxxOIQ/w4F1sJUPbOKUEk96/LWiuy3fooUqEIys6LAtVJ9gThY
q5i116xGYsvDBCz8Vvnlag5Fl1V4kpqoJmeTtCrKFfRa7FPn0SiF51OuTq7QDBsYeyRmJf
uRAtSTB/9Z4gbCcLBR27ksyjVmcIZgz0V0Zvd77wBpHmcbcFtiBPjkRvHPRKsA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647716;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=e46m44dI77VChtm/w4W8dxUYl05lagZY2zakz3r7dY8=;
b=m0i6ClJUsaHJtHgNLbGVbCbFjU9Y/wCasNNAMzU1OvrIfvdEvQS/w7JwxeQInebphpCjO8
Afp85t7HEqfeX/p19XghsGSjHNPlHlGxYUCcr6drTYSXY6xqY7Eie0KL/YPwhYBEJklguY
qPVGQF7jgDwFEafBrVhZn3E1RcZFAyVHSVq39+DvCLs0antmq+4wTcwNBxCImIocS1wp4D
u4aR7SXKfDqlXVE2oK/rpRTbIiRzsuI+6ezFgpum3opupc4XbLauxF3wd+QtcQenqcn/69
Z7Iz/dRnlq6NA6ae8HrgwSaPEmPpSSds/M1e+GFY1uQK5CENw0MKXPPG9AI5yQ==
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 4X0lK04N9yz137w;
Fri, 6 Sep 2024 18:35: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 486IZGq4010978;
Fri, 6 Sep 2024 18:35:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZG5i010975;
Fri, 6 Sep 2024 18:35:16 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:16 GMT
Message-Id: <202409061835.486IZG5i010975@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 6e6da538988a - main - wc: Add version information to
libxo output
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 6e6da538988a5edb5cc7437f8a8647a350800724
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=6e6da538988a5edb5cc7437f8a8647a350800724
commit 6e6da538988a5edb5cc7437f8a8647a350800724
Author: Bram <bram@cbbg.nl>
AuthorDate: 2024-07-26 19:36:18 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:31 +0000
wc: Add version information to libxo output
Add version information to libxo output so that
libxo content consumers can track changes.
Reviewed by: imp, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1350
---
usr.bin/wc/wc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 4e8a2d8a8b59..7b83412f3c42 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -51,6 +51,8 @@
#include <libcasper.h>
#include <casper/cap_fileargs.h>
+#define WC_XO_VERSION "1"
+
static const char *stdin_filename = "stdin";
static fileargs_t *fa;
@@ -132,6 +134,8 @@ main(int argc, char *argv[])
doline = doword = dochar = true;
stderr_handle = xo_create_to_file(stderr, XO_STYLE_TEXT, 0);
+
+ xo_set_version(WC_XO_VERSION);
xo_open_container("wc");
xo_open_list("file");
From nobody Fri Sep 6 18:35:17 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lK21Dywz5VSFg;
Fri, 06 Sep 2024 18:35: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 4X0lK15zssz4VgT;
Fri, 6 Sep 2024 18:35:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647717;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=SOBHlEICIGX7ZBLm8jYs/Od6NLI5PrWwAXGW4o2lTas=;
b=NknyjbkZ6iS85gDCXkeyRnzSg6VTJOFzEIvI1ze+ygvMCAPPowBtzK6aSxRAc8/YQgwE6F
LniiQZ3L8ZiMHADDw1oCtFYV0WTVi2rrHd90SsKwCkDNKcpWW2um/aGB/f2urlGiRQkT6L
d0m7Vpwk0Gw7xHrWNIaLcFKYbgY/Ss6vYZ6iYQwmVfiVv6aQaqRPoUna4F04vdnLfxyHbI
zDWRx4LXOvb/IlhZtuHL5rup8HUSpyheLp9h1x0odl5IUpCBzlt5nb3s1614F+ouDh3Hqi
TrWxEZskG5too0wtK8FOKuqngiG2A1rhpKsXQ7WTf93Xow5xdOE/ZESZJUDNgg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647717; a=rsa-sha256; cv=none;
b=maGWZ7mFawe2TjaIGQ2R1wi+GVJoZ+6eIBYBheTys4W1QnDc3vhHxbvDSh5InpLEMU9Q6M
6g93wYR7jBPHj5r7118uMKwifN1xdHMh0m+N5NHNRNqYiJKRXZF6BIsO2McYvoliZHDDLj
Rgl+TrMsaMX9Y+eSkb9QMAXjIe68qLGSdRZlrSc6CY0W8tPv8g1jMibET6GJLo3uric6Hf
kn4xb5ty/juu+eYfz8nf9/I8alUswnf6bCy0JMg9Txw+avVAJVhJS3V+B1aYQDYDrqzJbw
WsyI3WjSQltOyhhc2YeeL1i4APwZaQSdk/HyQetbwSqg1lhUDj9e7vSSSUUm8A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647717;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=SOBHlEICIGX7ZBLm8jYs/Od6NLI5PrWwAXGW4o2lTas=;
b=Hteai65kzM9Ca+NIiB7xids/i55iSOWvf4gxTGbDzwW5KhTJRLV1lnENAupbMuNXxdskPN
ZOGt2HGZXAE4qgud1iUhlBHqCHloUQ3xhRZPkB3RH9rIlo7RPUwKUDuLJEJVJvoP1n9dt4
+oOao22bZN40jst07wvndqxydr7faEVaTKyfVxEuVRcnRFw1gXlhGSML693bsdr5DoBUd+
C4/SwtJMhAXvSSSeQsnD/Vq+ty0S5bKoiSrgo57iX1TmDioeRXdknfbs9BY32jzdqely4U
gL4OfwUPcbO9apiMzdbDbG5CrvTmuzl8ljwQJ5nCH84jgametMsUrKiexkw65g==
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 4X0lK1527Tz12nQ;
Fri, 6 Sep 2024 18:35: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 486IZHNb011031;
Fri, 6 Sep 2024 18:35:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZHac011028;
Fri, 6 Sep 2024 18:35:17 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:17 GMT
Message-Id: <202409061835.486IZHac011028@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 5c4f64bded0e - main - netstat: Add version information
to libxo output
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5c4f64bded0eb9453dc84bcce9a74f64adf57739
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=5c4f64bded0eb9453dc84bcce9a74f64adf57739
commit 5c4f64bded0eb9453dc84bcce9a74f64adf57739
Author: Bram <bram@cbbg.nl>
AuthorDate: 2024-08-27 06:17:33 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:31 +0000
netstat: Add version information to libxo output
Add version information to libxo output so that
libxo content consumers can track changes.
Reviewed by: imp, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1350
---
usr.bin/netstat/main.c | 7 +++++++
usr.bin/netstat/netstat.h | 2 ++
2 files changed, 9 insertions(+)
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 2ed6eca4626e..6d19851b61fc 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -510,6 +510,7 @@ main(int argc, char *argv[])
#endif
if (iflag && !sflag) {
xo_open_container("statistics");
+ xo_set_version(NETSTAT_XO_VERSION);
intpr(NULL, af);
xo_close_container("statistics");
xo_finish();
@@ -517,6 +518,7 @@ main(int argc, char *argv[])
}
if (rflag) {
xo_open_container("statistics");
+ xo_set_version(NETSTAT_XO_VERSION);
if (sflag) {
if (live) {
kresolve_list(nl);
@@ -530,6 +532,7 @@ main(int argc, char *argv[])
}
if (oflag) {
xo_open_container("statistics");
+ xo_set_version(NETSTAT_XO_VERSION);
nhops_print(fib, af);
xo_close_container("statistics");
xo_finish();
@@ -537,6 +540,7 @@ main(int argc, char *argv[])
}
if (Oflag) {
xo_open_container("statistics");
+ xo_set_version(NETSTAT_XO_VERSION);
nhgrp_print(fib, af);
xo_close_container("statistics");
xo_finish();
@@ -547,6 +551,7 @@ main(int argc, char *argv[])
if (gflag) {
xo_open_container("statistics");
+ xo_set_version(NETSTAT_XO_VERSION);
if (sflag) {
if (af == AF_INET || af == AF_UNSPEC)
mrt_stats();
@@ -569,6 +574,7 @@ main(int argc, char *argv[])
if (tp) {
xo_open_container("statistics");
+ xo_set_version(NETSTAT_XO_VERSION);
printproto(tp, tp->pr_name, &first);
if (!first)
xo_close_list("socket");
@@ -578,6 +584,7 @@ main(int argc, char *argv[])
}
xo_open_container("statistics");
+ xo_set_version(NETSTAT_XO_VERSION);
if (af == AF_INET || af == AF_UNSPEC)
for (tp = protox; tp->pr_name; tp++)
printproto(tp, tp->pr_name, &first);
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index c41862d9fbdd..7ebfc5180f44 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -31,6 +31,8 @@
#include <sys/cdefs.h>
+#define NETSTAT_XO_VERSION "1"
+
#define satosin(sa) ((struct sockaddr_in *)(sa))
#define satosin6(sa) ((struct sockaddr_in6 *)(sa))
#define sin6tosa(sin6) ((struct sockaddr *)(sin6))
From nobody Fri Sep 6 18:35:18 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lK30TR3z5VRmh;
Fri, 06 Sep 2024 18:35:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0lK26xGWz4VtN;
Fri, 6 Sep 2024 18:35:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647719;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=lsn9bbPD0oCqJTB0ofW7wkRPVzauP33nxy2MDzS+hL4=;
b=EAEVOt4SGWQyMEVJzGfOb5UOOiEBIYDYT1YyYhj0/FWrJgKeLjSVGgcqpu68xI1p+mRl3b
n1M4QuRMajgy3gqRqD0tLZfyvIEAd8KYuGyzHZ3vksVw4KTeaAyeAyou1QnpE17MuM8QI+
eW9BQ1styhzy+dgcMBZQ1A+bm50vHV1vJAF7u2l4p+Mg4CItaKv4zjygaNZWNkNViLgPw6
2M0w/B6Cb9eQoTpX8KPBeK3aKMBJ2yS9waMuriwWj8WWaXhe3LNdty9o1MqY2guvCXpcTJ
y+s5MHZ3wSgMXqYPTT633gvPqZ6+VD4sFhBP4mfBWpwPBniuJ8QWjOcjC8QTwA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647719; a=rsa-sha256; cv=none;
b=O1ESOhyfNFxam5JkTR7IaVd6vzI0Jt5simtdCwnMnSTdiAtxq2UjOid1M/ZzTxMLBgI93D
ncz0V4K5JIgd2uC9trGUnLqky14J9REyoITqc5OS/EnNUmvu/oD+AK/gyrUwc6qoc6w3hV
3qa2NJI48qnrcwkbiOZ1kx29kdyfhiCkE4FWPVKbPxXc9DywSpUuJ6sJOrFHqcrSezy26v
vF2peW3wdyG9PVJ3LBOksm0aJf3ybpPrrmrN3txCQlNESExAsP0taR3UnWwldj3EsGuRsZ
GHDwRJaPaR1xRfoO0METjoRgmGscHPLxvffoifGYL+By9oNp9CecJiWLX5orIQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647719;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=lsn9bbPD0oCqJTB0ofW7wkRPVzauP33nxy2MDzS+hL4=;
b=VPoXPZA65Tj5J/Q/vsbA835JCqfpE01hSuhAwYEE+iz8pVe02qYC3zNij+eoXyYyDx9uit
dzfSskjqe1HqBlM0eF/n/hcx+bDAl23uTOSMkeWwLl4crg0uZI29McUi/E7FEi+SmwlhUn
VhVuqP94vjuky+SmeRWNk1RTFPYS29ygkHgnAU3qJA/5Lvnr02hcOQwerT4NcR6D79SYGY
+wzI9E4y83IYFnYzigxLfglU3LINI280/sLoIpFcnJEhZE2lDCM0IEwsqYtkZYfdsv1HVw
uTP7hpNWrL53UmDDVbm0Tt2AmbiUiq8X2bKsE4rrI/TfX4gssC3HWjwQ1odK7w==
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 4X0lK25ybtz12c0;
Fri, 6 Sep 2024 18:35: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 486IZIft011076;
Fri, 6 Sep 2024 18:35:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZItI011073;
Fri, 6 Sep 2024 18:35:18 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:18 GMT
Message-Id: <202409061835.486IZItI011073@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 1f882a583483 - main - adduser.8: update log location
+ spdx
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 1f882a5834836b43d4689efeefbc3109fc169363
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=1f882a5834836b43d4689efeefbc3109fc169363
commit 1f882a5834836b43d4689efeefbc3109fc169363
Author: Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-08-01 12:33:22 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:31 +0000
adduser.8: update log location + spdx
Closes: 280538
Fixes: cf8a18 (back out logging to /var/log/adduser)
MFC after: 3 days
Reported by: Herbert Baerschneider <herbert.baerschneider@protonmail.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1354
---
usr.sbin/adduser/adduser.8 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index ed67e21f9430..8ba623fedd9d 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -1,3 +1,6 @@
+.\"-
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
.\" Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
.\" All rights reserved.
.\" Copyright (c) 2002-2004 Michael Telahun Makonnen <mtm@FreeBSD.org>
@@ -427,7 +430,7 @@ message file for
.Nm
.It Pa /usr/share/skel
skeletal login directory
-.It Pa /var/log/adduser
+.It Pa /var/log/userlog
logfile for
.Nm
.El
From nobody Fri Sep 6 18:35:19 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lK42GDwz5VS17;
Fri, 06 Sep 2024 18:35: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 4X0lK40GT2z4Vtc;
Fri, 6 Sep 2024 18:35:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647720;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=IM6bPNUA0CodHAFR9gBi4RPZ8aWaZMa19Keuva0amsA=;
b=ZrXVWKdHldKdPaxq4+AMqve+ws4K+HXzFg7BS24T67tSxconXWpOxCQwOlNw3jJnjcIUuY
kGv/iHQmFYGNpDN/zmvsD36JFFoPJaPi48Q/h1MKfTQ467DzIs4dtYMkRXD5zi3/b3VyGz
Sv6jpgFPLFRx63L0JQjx195Q3GyptqULc37cKdvnWHmzS7kYFJsbFLiEFnlk+m+RqW+TFV
ZfWoLd+fHy131T8VDnL3K1Vh12EVEygO0bTYGwEoM6WrjJA3FyU/Tlzo+VxFAHDD2OfkBI
cYlSYe3pWfNwaO4yeUuRUjljsk8l6Q0XhW+M1rQ6YDkEQ/gIhWWMX0NPJtwJ0w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647720; a=rsa-sha256; cv=none;
b=Q4B1wrJMQr5m7e2b3og6gg+G8YfO1PM61v4Zy2ZOcNfcxEwP2hXeAtMHMVlZvIjYfwr0Ta
3qN0ALvk/xZBsfRpxcYmv6rxyT3n5k54WJplNZwAafyP9s1FvjUQLgm+a+RyycAkcBgqN3
GPUh8T1vA33d89HjGl9u6D3wSQoJ5El2DpwDsJa1Bd/zHa4FmqHGEzlkmJO0c9j123mb03
89Mhn7pYCqL9ZBji2x2kkbXslQAMW8BfJ/L50yK8lhzzwEruqCtzsOQr+9WnjcDYWVsxIT
hAvQdhMMbWaHoYWePVTeza3TjV29VIA4ZorPhlCnr4R/vjnVuT/ouiUldmbyaA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647720;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=IM6bPNUA0CodHAFR9gBi4RPZ8aWaZMa19Keuva0amsA=;
b=kzg00IGzQ1lOYTFzfOM9qHOHPHL+PZjyvw2HrQrlL5WcDEWaoghpL/W9ptlqDZCsKFjMky
AACa9RZaA51jHkLX2rtD9dEn3VeO2OMPoCk3Eat3UC8hhSngmlgzP4yXRKR0N1bAR0wmws
XLfLwqAFbs1yLZYQuSzavVw9o/SEgvLnwcuUjH9qQkhV5Ra6yWNSaN8jrggreLbTE6G92k
Qslg4nXyrXtwZ0J621VUnifHYDTetFZfFykUVYJLK84Y6vV6vV0cpgOf1162AG7LJt8pn0
T6OreOYquGO3YGAEKQ9l3TDwhNgF/Ku5xj1N/aU7ocmLKPopfWga4baQDgzElg==
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 4X0lK36zTGz12r6;
Fri, 6 Sep 2024 18:35:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 486IZJQI011130;
Fri, 6 Sep 2024 18:35:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZJxv011127;
Fri, 6 Sep 2024 18:35:19 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:19 GMT
Message-Id: <202409061835.486IZJxv011127@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 5d889e60c15c - main - amd64: move the right parenthesis
to the right place
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5d889e60c15ce7856cb9a9bc258dab8aaeb94efe
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=5d889e60c15ce7856cb9a9bc258dab8aaeb94efe
commit 5d889e60c15ce7856cb9a9bc258dab8aaeb94efe
Author: Wuyang Chung <wy-chung@outlook.com>
AuthorDate: 2024-08-02 06:44:38 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:31 +0000
amd64: move the right parenthesis to the right place
Reviewed by: imp, emaste
Pull Request: https://github.com/freebsd/freebsd-src/pull/1356
---
sys/amd64/amd64/machdep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 025c3c365de5..f4b3b9702e00 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1382,7 +1382,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
*/
for (x = 0; x < NGDT; x++) {
if (x != GPROC0_SEL && x != (GPROC0_SEL + 1) &&
- x != GUSERLDT_SEL && x != (GUSERLDT_SEL) + 1)
+ x != GUSERLDT_SEL && x != (GUSERLDT_SEL + 1))
ssdtosd(&gdt_segs[x], &gdt[x]);
}
gdt_segs[GPROC0_SEL].ssd_base = (uintptr_t)&pc->pc_common_tss;
From nobody Fri Sep 6 18:35:21 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lK52N4pz5VS2B;
Fri, 06 Sep 2024 18:35: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 4X0lK51YT4z4Vx7;
Fri, 6 Sep 2024 18:35:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647721;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=pYWR3CZOF+QBCyYylU+XkdfOXhnl2+m5oLwRG+w4RIA=;
b=Mw7E8knGM470+NZ7jP/+IKupT+C6x+35vQ5FDaFrFD2ihq6FrkUs2MtyOk1Nm4aW1Z7I0h
5OKCb/NlJdcjoJaSrFW7eF/7V/xjEfJz3wfFpLoEWPVdJ5nZkZ8fQ6eWnSUCLeEXXVrdnl
NOidfwzHf05jW+R6MVg3OkMbZrux3VENFAWyL8eXCmjRBNMpreBbbEGFTDKMiWrB5TANyE
OIMSG3SfSDAaHTb1vAlzUmNqHQbehbEMJ2H+yxaOvhvarSuLjMR1pdzx8VOWpGW20+EI2y
udglLHYtU5VzzqywncOZZLCfWr4qt8mztSPJbu1TrAZ2m8Yxg0IutoGM3s+2Mw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647721; a=rsa-sha256; cv=none;
b=w5bKwFBFMzOM+bgqekXSxXbXVKngxer+iHSwaLBx4Uyhs1S1EF0ZvmmEsOOgoNpWJYSQ8u
C8f/IdoGFJ1Yka88yxkfLPz//CTKhGqzamzFyUlDUM39l9Gsw3zwa8dsA6NIquI8ncGHa5
g/AHnHwfeJtTK/WS0EORHZiN/8NbdGfLP3CSaVAS9GrNgdGLzoaN5YjamzLaFZQ97Y0nXC
NbJh9kYTdUwUupNjSFax7A0M89GYiceUYzhqk8W94XgoYTOFevdxM4h8iYqVqxTYDdKOsD
T+xQAJlM8W4i6poPOgWU5fQsmXlj/I35w3phGqNcMnDkJ/qROvxZH6C+9NeLuw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647721;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=pYWR3CZOF+QBCyYylU+XkdfOXhnl2+m5oLwRG+w4RIA=;
b=ia4CWyPrviZEr0tfdH4fP0O9zj0cJJsw6LTEFk56qveGG8EhZSY8lVRtRgQblG5vHITcrD
HqfmomKuCatmF/CYIZou1chqyWAsGDAQPLyMjBop4KBzhDZ9wGgiih6+mp8WFaxkUw4wZG
8TzZh2CRaH0pAP8KwVPXyrM6J9/EwKYDjIHa44vb6jNIdcgKTSsebDZkHNb+Xs0UNeyvy7
2dNNNVpjuZC7cyhmjVRuyV7c0Px18BpjuprKJD4Bnf1Lr4ti+oDApxH2LYOh8iw98t5kJI
fuwrRvD/DV2iBqfMqiRyq8ONqbowdggTpQerUVjdyQfkiK1KDwUKmFlNogcicg==
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 4X0lK510Nbz12Z5;
Fri, 6 Sep 2024 18:35: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 486IZLKQ011193;
Fri, 6 Sep 2024 18:35:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZLRw011190;
Fri, 6 Sep 2024 18:35:21 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:21 GMT
Message-Id: <202409061835.486IZLRw011190@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 7b984d5043f2 - main - wsp: Allow the trackpad to be
used after a partially unreleased click.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 7b984d5043f2cab8ba05082366e48116e0d495a2
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=7b984d5043f2cab8ba05082366e48116e0d495a2
commit 7b984d5043f2cab8ba05082366e48116e0d495a2
Author: Joshua Rogers <Joshua@Joshua.Hu>
AuthorDate: 2024-05-27 15:46:29 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:31 +0000
wsp: Allow the trackpad to be used after a partially unreleased click.
This provides functionality for a click which is partially unreleased
and then allows the user to continue moving the mousepad as if were not
invoked as a full click
Signed-off-by: Joshua Rogers <Joshua@Joshua.Hu>
Reviewed by: imp, wulf
Pull Request: https://github.com/freebsd/freebsd-src/pull/1365
---
share/man/man4/wsp.4 | 5 +++++
sys/dev/usb/input/wsp.c | 10 ++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/share/man/man4/wsp.4 b/share/man/man4/wsp.4
index 39660a53ee9a..bcbbc1b8bb5d 100644
--- a/share/man/man4/wsp.4
+++ b/share/man/man4/wsp.4
@@ -65,6 +65,11 @@ Pointer sensitivity can be controlled using the sysctl tunable
Tap to left-click can be controlled using the sysctl tunable
.Nm hw.usb.wsp.enable_single_tap_clicks ,
set to 0 to disable single tap clicks or 1 to enable them (default).
+Movement on the trackpad following a partially-released click can be
+controlled using the sysctl tunable
+.Nm hw.usb.wsp.enable_single_tap_movement ,
+set to 0 to disable the movement on the trackpad until a full release
+or 1 to allow the continued movement (default).
Z-Axis sensitivity can be controlled using the sysctl tunable
.Nm hw.usb.wsp.z_factor .
Z-Axis inversion can be controlled using the sysctl tunable
diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c
index f1931c9e03c0..4527278295ca 100644
--- a/sys/dev/usb/input/wsp.c
+++ b/sys/dev/usb/input/wsp.c
@@ -99,6 +99,7 @@ static struct wsp_tuning {
int pressure_tap_threshold;
int scr_hor_threshold;
int enable_single_tap_clicks;
+ int enable_single_tap_movement;
}
wsp_tuning =
{
@@ -110,6 +111,7 @@ static struct wsp_tuning {
.pressure_tap_threshold = 120,
.scr_hor_threshold = 20,
.enable_single_tap_clicks = 1,
+ .enable_single_tap_movement = 1,
};
static void
@@ -123,6 +125,7 @@ wsp_runing_rangecheck(struct wsp_tuning *ptun)
WSP_CLAMP(ptun->pressure_tap_threshold, 1, 255);
WSP_CLAMP(ptun->scr_hor_threshold, 1, 255);
WSP_CLAMP(ptun->enable_single_tap_clicks, 0, 1);
+ WSP_CLAMP(ptun->enable_single_tap_movement, 0, 1);
}
SYSCTL_INT(_hw_usb_wsp, OID_AUTO, scale_factor, CTLFLAG_RWTUN,
@@ -141,6 +144,9 @@ SYSCTL_INT(_hw_usb_wsp, OID_AUTO, scr_hor_threshold, CTLFLAG_RWTUN,
&wsp_tuning.scr_hor_threshold, 0, "horizontal scrolling threshold");
SYSCTL_INT(_hw_usb_wsp, OID_AUTO, enable_single_tap_clicks, CTLFLAG_RWTUN,
&wsp_tuning.enable_single_tap_clicks, 0, "enable single tap clicks");
+SYSCTL_INT(_hw_usb_wsp, OID_AUTO, enable_single_tap_movement, CTLFLAG_RWTUN,
+ &wsp_tuning.enable_single_tap_movement, 0, "enable single tap movement");
+
/*
* Some tables, structures, definitions and constant values for the
@@ -1149,8 +1155,8 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
dx = sc->pos_x[0] - sc->pre_pos_x;
dy = sc->pos_y[0] - sc->pre_pos_y;
- /* Ignore movement during button is releasing */
- if (sc->ibtn != 0 && sc->sc_status.button == 0)
+ /* Optionally ignore movement during button is releasing */
+ if (tun.enable_single_tap_movement != 1 && sc->ibtn != 0 && sc->sc_status.button == 0)
dx = dy = 0;
/* Ignore movement if ntouch changed */
From nobody Fri Sep 6 18:35:23 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lK75py1z5VSCl;
Fri, 06 Sep 2024 18:35:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0lK73CfWz4W2x;
Fri, 6 Sep 2024 18:35:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647723;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=4GPeLNGwVptWUwbYD6083l/cCxlc+rBLkggcn1CNGPo=;
b=l5UNIyvMFQKs+Fo6IPv5x7giqlxE+mWyXT1WKQm6MLWCOjjgyOE68sFtjucFw5Rc92AaM+
BUDaoL0aIVIWbkAGLANlBdaBsv+lxmkTZa7PUbueIgS/c7SuLTnypzyvJ7RHN7SdkO7s5v
ERBiPGQAP5F/QRsv84A0mIgBi6537WqOxkdrp+0/v6EhPz2hIK6CXmygDA5PpJEsGGeym4
60BHrK30Zq4CTrwrOtdzG7f3dT4p6wHcJ9Gta+t7nDfHCKBnEy78OgD3tTEck/hodqsmCb
/ds23wjJ7iGeXfwjaxfqsyP9ZdFh/NWEgtlxFImipRXWZ+S7LRiBxDc8UPuMPw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647723; a=rsa-sha256; cv=none;
b=mkKE8tykvgpPwE0ejL4QVOJKdKbG1vT0Uk2uFEFGvakd2Tn95Ws+JdaauSCs++VSngRbmd
XZMXt6HAUduRMIFPSbZQXkHCFt/+KWh4xL+X7dtb4G7N43ChxrgzjvPTl9ZnaUN+V7xU9V
eVXXEbB+6yfimGnhxJjiNfTLANLngU6KsxfDWy3u3vi6jQukfuixYFDMFULmd2XxomfewJ
ReeVym1AtoTyUWhi7iyEbga3CWxkZ7XdD9dV9ndiUC+DErgKIKuFDAbKvLZrqc8qN+UBYx
jl4odbR/qC8DZks/MsSeDhYpCTX89xeG6HL3Z2Oll4f5u519xiB60s89ncVkAQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647723;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=4GPeLNGwVptWUwbYD6083l/cCxlc+rBLkggcn1CNGPo=;
b=ggVC8A6EbUxZNpioYCZMOVZmyzyaq3Ed1d3et3qUV2EBxmBU4oiD1uNks03nSyM7/Dyj3H
CirX3Eb3+AWVDoAY2hWunu+Jbkkv2EnH+PaerLNj0Kg2jzOcVt6CxSiLDld3uhtePr54Op
gaHoF+M5Y06wcOB1x2Fo+mmTa6ymDx4+YRssS9CahABddd+Lw8HNf6Xa1TBwVlp4XWzEFK
wwbVrjMHK3o/w4bRPdUoafPVvXXP8Vx7k6PzvILFB+eNuftY7ygcYhx9NSatnvbv5bfIvU
FYjgCHeb9/84MaaVCl346bJ0uEsnw9TBFTG/KC1PryLgCP4oFsatWMzmSuEIvg==
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 4X0lK72qTdz135G;
Fri, 6 Sep 2024 18:35:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 486IZNSZ011306;
Fri, 6 Sep 2024 18:35:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZNPj011303;
Fri, 6 Sep 2024 18:35:23 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:23 GMT
Message-Id: <202409061835.486IZNPj011303@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 8aef1cd698f1 - main - wsp: Use already-calculated
distance of fingers for comparison.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 8aef1cd698f177986ee4f51ff6f63ea7b0b35098
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=8aef1cd698f177986ee4f51ff6f63ea7b0b35098
commit 8aef1cd698f177986ee4f51ff6f63ea7b0b35098
Author: Joshua Rogers <Joshua@Joshua.Hu>
AuthorDate: 2024-06-10 19:03:24 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:31 +0000
wsp: Use already-calculated distance of fingers for comparison.
Also correctly use tun.max_double_tap_distance for maximum distance
of fingers for vertical scrolling.
Signed-off-by: Joshua Rogers <Joshua@Joshua.Hu>
Reviewed by: imp, wulf
Pull Request: https://github.com/freebsd/freebsd-src/pull/1365
---
sys/dev/usb/input/wsp.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c
index 708a26498361..a8d6c14c7421 100644
--- a/sys/dev/usb/input/wsp.c
+++ b/sys/dev/usb/input/wsp.c
@@ -1263,9 +1263,7 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
dx = dy = 0;
if (sc->dz_count == 0)
dz = (sc->dz_sum / tun.z_factor) * (tun.z_invert ? -1 : 1);
- if (sc->scr_mode == WSP_SCR_HOR ||
- abs(sc->pos_x[0] - sc->pos_x[1]) > tun.max_finger_area ||
- abs(sc->pos_y[0] - sc->pos_y[1]) > tun.max_finger_area)
+ if (sc->scr_mode == WSP_SCR_HOR || sc->distance > tun.max_double_tap_distance)
dz = 0;
}
if (ntouch == 3)
From nobody Fri Sep 6 18:35:22 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lK71Tvpz5VS2C;
Fri, 06 Sep 2024 18:35:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0lK62tqxz4Vsn;
Fri, 6 Sep 2024 18:35:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647722;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=HiI/DEk/tzzaRFm9KmAj849PtcDmzTa5GdB5Zu6Jz84=;
b=dHqsjYTTU9lTjq0yu4honNwOZtrZbbZNV6Os2xkK1kcmZSkMOJvh8O+GUSphUKIYDOXU4Y
pMHd5hEsV0+wCWu/ZlLef+n5MAhPiklDji/MfmRX59VqllKihopXjUaXUYStmKqAxmZSaP
g6XXjQykHMRGKDtNC1CUy1LAsCzKjM6Cf2vpTHHgD9j9N5lJSZ669SuizdPZ3RbLySsWku
ZWFnZQ1CiSIsIZN12oDsaoWbFJXL4KE/hySZ1eeAY53aIrswqvoP1/hy79Xzlod1TVaFdJ
wuaxyzgqzMSAyLqHsNO1GgL9jrtS41e4KXEnfqiE27/bmQJ0SLzTZHn1U1LXGA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647722; a=rsa-sha256; cv=none;
b=EN+KmzIr2nPHji2Di1COaBQGnH8ADyusUQHJSvScFl5CzgGvxPz7WOatSHGO+jOVcWbe6u
k8J2Mm2LJKO6U5Qt2sCbLUjd17jBGMnDohOC0zUURWNrS70EKC+Ui8HG8CemYq59pTf0UW
NHIJzyq2i0KF1LV0dxfuuTIHGwYVUYpwkP5CaP8g6nDdPmmx55o/B9i2QFe/IIE4ZOLyDh
sCtWCQ1+oY75FVA3wLEy7MSKu8PuEakaGMH7iZi4YVahdOG/YE0azmARkHOsEfELC2cdMV
AZ+qTBX8c+n7uEdhPpeHTpxecAeqAyAQi0b7zZkmNB0PKSm4sUZD5fPZuU05Ww==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647722;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=HiI/DEk/tzzaRFm9KmAj849PtcDmzTa5GdB5Zu6Jz84=;
b=V4lKsE8ezA5wM0DPY67zOciTzB1ffFVx0XXZWhgr59lJzKNvxiwIDu/JVcgoK4y+miH0/z
zxtQqBLH38LBNYoL28tazDr3xYleGRiAs+QQEN0bJ2EFRvyTdQrybhvBndFnhvrXsWTUnN
RES/BipIUD/dRfjfpna9aGzKd+jp4biNOkkMqPepvC4v2pfGXK81hP8UtzoHFHYiE/6XMJ
b0nbSx6Zrc+4PcutOHtU9E1oB8GF5qTQ9r2I0RIjDqmMR0PGFAoqr7vcql8f3CTcwWyU8n
SVRZBsFdZ9mbRVPj6uT+BHH6XcszQ832uOtR0drTVYe/VESsfR5sDGvmeEVemg==
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 4X0lK621jLz12nR;
Fri, 6 Sep 2024 18:35:22 +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 486IZMc3011254;
Fri, 6 Sep 2024 18:35:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZM4U011251;
Fri, 6 Sep 2024 18:35:22 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:22 GMT
Message-Id: <202409061835.486IZM4U011251@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 62cf43dda897 - main - wsp: Improve multi-finger
touchpad usage and allow more configurations
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 62cf43dda897f33bb80a20630f34bfe204cb97ee
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=62cf43dda897f33bb80a20630f34bfe204cb97ee
commit 62cf43dda897f33bb80a20630f34bfe204cb97ee
Author: Joshua Rogers <Joshua@Joshua.Hu>
AuthorDate: 2024-05-28 00:20:19 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:31 +0000
wsp: Improve multi-finger touchpad usage and allow more configurations
This patch allows scrolling with multiple fingers simultaneously, in
line with how wsp trackpads function on MacOS.
Two new tunables are added: hw.usb.wsp.max_finger_area and
hw.usb.wsp.max_double_tap_distance.
max_finger_area defines the maximum size which the driver registered an
object on trackpad as a finger.
Previously, this value was hardcoded as 1200, which was too low to
register thumb-clicks.
max_double_tap_distance defines the maximum distance between two
fingers which will register as a double-click.
Signed-off-by: Joshua Rogers <Joshua@Joshua.Hu>
Reviewed by: imp, wulf
Pull Request: https://github.com/freebsd/freebsd-src/pull/1365
---
share/man/man4/wsp.4 | 6 ++++
sys/dev/usb/input/wsp.c | 85 ++++++++++++++++++++++++++++++++-----------------
2 files changed, 62 insertions(+), 29 deletions(-)
diff --git a/share/man/man4/wsp.4 b/share/man/man4/wsp.4
index bcbbc1b8bb5d..83a4421fa2ff 100644
--- a/share/man/man4/wsp.4
+++ b/share/man/man4/wsp.4
@@ -70,6 +70,12 @@ controlled using the sysctl tunable
.Nm hw.usb.wsp.enable_single_tap_movement ,
set to 0 to disable the movement on the trackpad until a full release
or 1 to allow the continued movement (default).
+.Nm hw.usb.wsp.max_finger_area
+defines the maximum area on the trackpad which is registered as a
+finger (lower for greater palm detection).
+.Nm hw.usb.wsp.max_double_tap_distance
+defines the maximum distance between two finger clicks or taps which may
+register as a double-click.
Z-Axis sensitivity can be controlled using the sysctl tunable
.Nm hw.usb.wsp.z_factor .
Z-Axis inversion can be controlled using the sysctl tunable
diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c
index 4527278295ca..708a26498361 100644
--- a/sys/dev/usb/input/wsp.c
+++ b/sys/dev/usb/input/wsp.c
@@ -98,6 +98,8 @@ static struct wsp_tuning {
int pressure_untouch_threshold;
int pressure_tap_threshold;
int scr_hor_threshold;
+ int max_finger_area;
+ int max_double_tap_distance;
int enable_single_tap_clicks;
int enable_single_tap_movement;
}
@@ -110,6 +112,8 @@ static struct wsp_tuning {
.pressure_untouch_threshold = 10,
.pressure_tap_threshold = 120,
.scr_hor_threshold = 20,
+ .max_finger_area = 1900,
+ .max_double_tap_distance = 2500,
.enable_single_tap_clicks = 1,
.enable_single_tap_movement = 1,
};
@@ -123,6 +127,8 @@ wsp_runing_rangecheck(struct wsp_tuning *ptun)
WSP_CLAMP(ptun->pressure_touch_threshold, 1, 255);
WSP_CLAMP(ptun->pressure_untouch_threshold, 1, 255);
WSP_CLAMP(ptun->pressure_tap_threshold, 1, 255);
+ WSP_CLAMP(ptun->max_finger_area, 1, 2400);
+ WSP_CLAMP(ptun->max_double_tap_distance, 1, 16384);
WSP_CLAMP(ptun->scr_hor_threshold, 1, 255);
WSP_CLAMP(ptun->enable_single_tap_clicks, 0, 1);
WSP_CLAMP(ptun->enable_single_tap_movement, 0, 1);
@@ -140,6 +146,10 @@ SYSCTL_INT(_hw_usb_wsp, OID_AUTO, pressure_untouch_threshold, CTLFLAG_RWTUN,
&wsp_tuning.pressure_untouch_threshold, 0, "untouch pressure threshold");
SYSCTL_INT(_hw_usb_wsp, OID_AUTO, pressure_tap_threshold, CTLFLAG_RWTUN,
&wsp_tuning.pressure_tap_threshold, 0, "tap pressure threshold");
+SYSCTL_INT(_hw_usb_wsp, OID_AUTO, max_finger_area, CTLFLAG_RWTUN,
+ &wsp_tuning.max_finger_area, 0, "maximum finger area");
+SYSCTL_INT(_hw_usb_wsp, OID_AUTO, max_double_tap_distance, CTLFLAG_RWTUN,
+ &wsp_tuning.max_double_tap_distance, 0, "maximum double-finger click distance");
SYSCTL_INT(_hw_usb_wsp, OID_AUTO, scr_hor_threshold, CTLFLAG_RWTUN,
&wsp_tuning.scr_hor_threshold, 0, "horizontal scrolling threshold");
SYSCTL_INT(_hw_usb_wsp, OID_AUTO, enable_single_tap_clicks, CTLFLAG_RWTUN,
@@ -573,13 +583,13 @@ struct wsp_softc {
struct tp_finger *index[MAX_FINGERS]; /* finger index data */
int16_t pos_x[MAX_FINGERS]; /* position array */
int16_t pos_y[MAX_FINGERS]; /* position array */
+ int16_t pre_pos_x[MAX_FINGERS]; /* previous position array */
+ int16_t pre_pos_y[MAX_FINGERS]; /* previous position array */
u_int sc_touch; /* touch status */
#define WSP_UNTOUCH 0x00
#define WSP_FIRST_TOUCH 0x01
#define WSP_SECOND_TOUCH 0x02
#define WSP_TOUCHING 0x04
- int16_t pre_pos_x; /* previous position array */
- int16_t pre_pos_y; /* previous position array */
int dx_sum; /* x axis cumulative movement */
int dy_sum; /* y axis cumulative movement */
int dz_sum; /* z axis cumulative movement */
@@ -596,7 +606,6 @@ struct wsp_softc {
#define WSP_TAP_THRESHOLD 3
#define WSP_TAP_MAX_COUNT 20
int distance; /* the distance of 2 fingers */
-#define MAX_DISTANCE 2500 /* the max allowed distance */
uint8_t ibtn; /* button status in tapping */
uint8_t ntaps; /* finger status in tapping */
uint8_t scr_mode; /* scroll status in movement */
@@ -1040,13 +1049,35 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
sc->sc_status.obutton = sc->sc_status.button;
sc->sc_status.button = 0;
+ if (ntouch == 2) {
+ sc->distance = max(sc->distance, max(
+ abs(sc->pos_x[0] - sc->pos_x[1]),
+ abs(sc->pos_y[0] - sc->pos_y[1])));
+ }
+
if (ibt != 0) {
- if ((params->tp->caps & HAS_INTEGRATED_BUTTON) && ntouch == 2)
- sc->sc_status.button |= MOUSE_BUTTON3DOWN;
- else if ((params->tp->caps & HAS_INTEGRATED_BUTTON) && ntouch == 3)
- sc->sc_status.button |= MOUSE_BUTTON2DOWN;
- else
+ if (params->tp->caps & HAS_INTEGRATED_BUTTON) {
+ switch (ntouch) {
+ case 1:
+ sc->sc_status.button |= MOUSE_BUTTON1DOWN;
+ break;
+ case 2:
+ if (sc->distance < tun.max_double_tap_distance && abs(sc->dx_sum) < 5 &&
+ abs(sc->dy_sum) < 5)
+ sc->sc_status.button |= MOUSE_BUTTON3DOWN;
+ else
+ sc->sc_status.button |= MOUSE_BUTTON1DOWN;
+ break;
+ case 3:
+ sc->sc_status.button |= MOUSE_BUTTON2DOWN;
+ break;
+ default:
+ break;
+ }
+ } else {
sc->sc_status.button |= MOUSE_BUTTON1DOWN;
+ }
+
sc->ibtn = 1;
}
sc->intr_count++;
@@ -1055,7 +1086,7 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
switch (ntouch) {
case 1:
if (sc->index[0]->touch_major > tun.pressure_tap_threshold &&
- sc->index[0]->tool_major <= 1200)
+ sc->index[0]->tool_major <= tun.max_finger_area)
sc->ntaps = 1;
break;
case 2:
@@ -1073,11 +1104,7 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
break;
}
}
- if (ntouch == 2) {
- sc->distance = max(sc->distance, max(
- abs(sc->pos_x[0] - sc->pos_x[1]),
- abs(sc->pos_y[0] - sc->pos_y[1])));
- }
+
if (sc->index[0]->touch_major < tun.pressure_untouch_threshold &&
sc->sc_status.button == 0) {
sc->sc_touch = WSP_UNTOUCH;
@@ -1098,7 +1125,7 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
case 2:
DPRINTFN(WSP_LLEVEL_INFO, "sum_x=%5d, sum_y=%5d\n",
sc->dx_sum, sc->dy_sum);
- if (sc->distance < MAX_DISTANCE && abs(sc->dx_sum) < 5 &&
+ if (sc->distance < tun.max_double_tap_distance && abs(sc->dx_sum) < 5 &&
abs(sc->dy_sum) < 5) {
wsp_add_to_queue(sc, 0, 0, 0, MOUSE_BUTTON3DOWN);
DPRINTFN(WSP_LLEVEL_INFO, "RIGHT CLICK!\n");
@@ -1144,16 +1171,16 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
} else if (sc->index[0]->touch_major >= tun.pressure_touch_threshold &&
sc->sc_touch == WSP_FIRST_TOUCH) { /* ignore second touch */
sc->sc_touch = WSP_SECOND_TOUCH;
- DPRINTFN(WSP_LLEVEL_INFO, "Fist pre_x=%5d, pre_y=%5d\n",
- sc->pre_pos_x, sc->pre_pos_y);
+ DPRINTFN(WSP_LLEVEL_INFO, "First pre_x[0]=%5d, pre_y[0]=%5d\n",
+ sc->pre_pos_x[0], sc->pre_pos_y[0]);
} else {
if (sc->sc_touch == WSP_SECOND_TOUCH)
sc->sc_touch = WSP_TOUCHING;
if (ntouch != 0 &&
sc->index[0]->touch_major >= tun.pressure_touch_threshold) {
- dx = sc->pos_x[0] - sc->pre_pos_x;
- dy = sc->pos_y[0] - sc->pre_pos_y;
+ dx = sc->pos_x[0] - sc->pre_pos_x[0];
+ dy = sc->pos_y[0] - sc->pre_pos_y[0];
/* Optionally ignore movement during button is releasing */
if (tun.enable_single_tap_movement != 1 && sc->ibtn != 0 && sc->sc_status.button == 0)
@@ -1163,8 +1190,8 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
if (sc->o_ntouch != ntouch)
dx = dy = 0;
- /* Ignore unexpeted movement when typing */
- if (ntouch == 1 && sc->index[0]->tool_major > 1200)
+ /* Ignore unexpected movement when typing (palm detection) */
+ if (ntouch == 1 && sc->index[0]->tool_major > tun.max_finger_area)
dx = dy = 0;
if (sc->ibtn != 0 && ntouch == 1 &&
@@ -1173,8 +1200,8 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
dx = dy = 0;
if (ntouch == 2 && sc->sc_status.button != 0) {
- dx = sc->pos_x[sc->finger] - sc->pre_pos_x;
- dy = sc->pos_y[sc->finger] - sc->pre_pos_y;
+ dx = sc->pos_x[sc->finger] - sc->pre_pos_x[sc->finger];
+ dy = sc->pos_y[sc->finger] - sc->pre_pos_y[sc->finger];
/*
* Ignore movement of switch finger or
@@ -1237,8 +1264,8 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
if (sc->dz_count == 0)
dz = (sc->dz_sum / tun.z_factor) * (tun.z_invert ? -1 : 1);
if (sc->scr_mode == WSP_SCR_HOR ||
- abs(sc->pos_x[0] - sc->pos_x[1]) > MAX_DISTANCE ||
- abs(sc->pos_y[0] - sc->pos_y[1]) > MAX_DISTANCE)
+ abs(sc->pos_x[0] - sc->pos_x[1]) > tun.max_finger_area ||
+ abs(sc->pos_y[0] - sc->pos_y[1]) > tun.max_finger_area)
dz = 0;
}
if (ntouch == 3)
@@ -1262,12 +1289,12 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error)
sc->rdz = 0;
}
}
- sc->pre_pos_x = sc->pos_x[0];
- sc->pre_pos_y = sc->pos_y[0];
+ sc->pre_pos_x[0] = sc->pos_x[0];
+ sc->pre_pos_y[0] = sc->pos_y[0];
if (ntouch == 2 && sc->sc_status.button != 0) {
- sc->pre_pos_x = sc->pos_x[sc->finger];
- sc->pre_pos_y = sc->pos_y[sc->finger];
+ sc->pre_pos_x[sc->finger] = sc->pos_x[sc->finger];
+ sc->pre_pos_y[sc->finger] = sc->pos_y[sc->finger];
}
sc->o_ntouch = ntouch;
From nobody Fri Sep 6 18:35:24 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lK90MC8z5VS9J;
Fri, 06 Sep 2024 18:35: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 4X0lK85PHyz4W5G;
Fri, 6 Sep 2024 18:35:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647724;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=3INDcxAhBPilMelporugNULPgDuXzoMg91h08zK7KPo=;
b=Ph7qGthFdU5LdbXEgOqenVM2f9+smtqVSE7gVETYO4AzJVSsYcxBOhjGfjoSb5yT77/I7u
1s310HlcjJCcBSqidKPwipI9I+OmtbwUosvA7kQkApR9vdcRRUx2YCedKUBl6zwRU97e5l
i2GywUGOrZbN2bOKOzRsNNWdBWweW+07PmkXF4V03NI/ks0rsHLElNdqoxwm5QkHBD26x8
CNzvcA53WuFWmmSZhd9+yPXCxHp394PegVUeMhFKr75kP+7I4gXXhRhUaRtfx4fxrHDC2T
4y4X2YROOLKmpFc/9idl9VyxRWx6MX6RjoZw4efPOYB5Ugz0LZYxiCQvWkc9DQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647724; a=rsa-sha256; cv=none;
b=B022UJpJlOyI40vvwUs7Sp/+E/ryC/EktOi97a9YH38pobwBULiUYkEYLEb5ePjOHXHaRE
op5BiRi3PIbNnwQ9dG+KanYD61YTHhRICZIjW8cmHP5/0F4UmSrz42VPvnZXaMiacQR2rC
YDt0ISAN1PUsMvgbkrKMpamel6is9RUMXek4S+J9OoamMDYSI/imX3ejKjaC3rt909g2dM
NwpBx9z14XJjxj1GoUNfzD2WoQ26gofFzkJCl3Fu0+zjxCxtD3rM3p5YSBIKlGYjhchiQ6
7G3YMVBwzqVKOcUvg2iqvoxtoRyMvOYnzD8HbdEVIFKq3zHyzJLTff7bYYG6ww==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647724;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=3INDcxAhBPilMelporugNULPgDuXzoMg91h08zK7KPo=;
b=hu5y6y2pM2VXo9NHVwKfQkAsdXPG0Fccjnr6KMSNXVfmZQj2dc3pInD/g7sizO+meiVZG6
xraU/FJzbJ7xOIbhB2rc891s9hCP4ZAI16dRohDpzMCQ26tSrH2uTF07xIYsdZqpSs/bSO
C5dFUKLRuBSyN5mfI1mhDAYf6Z0TGPXJPuVPmDinhpE+uj8ifufVMAEo3omGDJ52PrLeQ8
DPHgrPqdxPqJd/83bQU44nz0mo4OWvMnlGfEMk9FYjNuG1pXnkp/rJBFyPAy0VXI6yUTXC
CVdaC89PY2d07hDZ/ccEsLKoB1HOXBiByD9D3Csc2rEB2Kdqz2UdZFMQLwEEiw==
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 4X0lK83wgwz135H;
Fri, 6 Sep 2024 18:35: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 486IZO4g011354;
Fri, 6 Sep 2024 18:35:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZOrs011351;
Fri, 6 Sep 2024 18:35:24 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:24 GMT
Message-Id: <202409061835.486IZOrs011351@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 66145c3829c1 - main - ntptime: Use time_t for tv_sec
related variables
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 66145c3829c1753f3b5fa303c4e36bba172be553
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=66145c3829c1753f3b5fa303c4e36bba172be553
commit 66145c3829c1753f3b5fa303c4e36bba172be553
Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
AuthorDate: 2024-08-09 02:57:47 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:32 +0000
ntptime: Use time_t for tv_sec related variables
The struct timespec tv_sec member is of type time_t. Make sure that all
variables related to this member are of the type time_t. This is important for
targets where long is a 32-bit type and time_t a 64-bit type.
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1373
---
sys/kern/kern_ntptime.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index d2a2761ed683..65746021028b 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -193,7 +193,7 @@ static l_fp pps_freq; /* scaled frequency offset (ns/s) */
static long pps_fcount; /* frequency accumulator */
static long pps_jitter; /* nominal jitter (ns) */
static long pps_stabil; /* nominal stability (scaled ns/s) */
-static long pps_lastsec; /* time at last calibration (s) */
+static time_t pps_lastsec; /* time at last calibration (s) */
static int pps_valid; /* signal watchdog counter */
static int pps_shift = PPS_FAVG; /* interval duration (s) (shift) */
static int pps_shiftmax = PPS_FAVGDEF; /* max interval duration (s) (shift) */
@@ -742,7 +742,8 @@ hardupdate(long offset /* clock offset (ns) */)
void
hardpps(struct timespec *tsp, long delta_nsec)
{
- long u_sec, u_nsec, v_nsec; /* temps */
+ long u_nsec, v_nsec; /* temps */
+ time_t u_sec;
l_fp ftemp;
NTP_LOCK();
From nobody Fri Sep 6 18:35:25 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKB0MNyz5VRl9;
Fri, 06 Sep 2024 18:35:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0lK956zFz4W1K;
Fri, 6 Sep 2024 18:35:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647725;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=aQ40fETIRKpXz5pjVe7X0T0gPkKyHWhAmYvo6krzGU0=;
b=EA08MzuMsMdmo8TOM0ztoDtz8FOXs1cEMeB9q2XpbAK8gOZYZ5+I4v43OOmba8zXYIICke
Qjch3yD0PbT448S5t7Y9ln2Vuc6Y/arrH5cHI4wZ2f6s79eCpc93STL6xo3TtKbhWYlWFc
N94knbKqovH7M8O1/j3owB+t504C8AFIywobC5Uhly0zUhOd1H7iO2iVK3Jfa4jICgAScm
fBUwGNle2cKlHd6t4eYGm8pqWX/j1rarG0M34U7vNMlmZ5C2jHb1Ju4pGoEpwKtgr5jTBN
52gm0TV1n68kNO+W4n+phUwJ7oyBerSK3V9QivZ+JffQx644w0X9Qe7CcfadJA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647725; a=rsa-sha256; cv=none;
b=CSzrkI1vNF6E4HzIrBF1wDEel6XzMTxX5K3C2ToVEsEZwkcF06Z6osTSbpHu+ASpTFuAq5
XXFP7bYI6PR01XfaZA54zLGkd7zo4vNbr8nHFzHa5uw7z+BCJ6UNuDthC+guhsVq+8tVfr
voEcRAa/debvivMkDO4OW5aZiWYNBwuU9tNhP0Gm+covWQ21g3m+vPTeKyxkypb2RzW00P
pgFLmVw8LtP8L1MXaCj8gfy6vd2iCTsoaVkD9qvxqUOtXvoYWwUTqxeA1aghjSX2neJ5Cz
s2jdKJvqgHPptEY5GgMdexQ2f4mtvHsFA+IuvHCC0iO7ZPFFfnTQZPkil94s4w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647725;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=aQ40fETIRKpXz5pjVe7X0T0gPkKyHWhAmYvo6krzGU0=;
b=c4N3QaMeyqcD2D7FU2YHvEyVdPv5oYnvKvqaYueKxZcqkatgvaike2+BHqhrC7/X0ASj5A
0DMQ29CX9fJ0q0zhAKP7sNOeuXWNgE9N+e/7u4UQgRlP0/z3pNODa4HfAPoCZ1tr2zHnVY
f+z94rn32wmp/j3qamiWJqJWdWA2UFyPQDkAdKO6GSsCQ5sU5vXbCA6ZiUaiIIrJGIPGVs
FcUQf7JmtU+zL4PjWn1Ipy9YIEnvYbcIzlpbGupR8OzM9DIFMWgepyyezX5pgOS/5DhPf4
168QM5HXwYFWvoew5yJlYxV2AoOwRm3nOILYP0sOE9u6vHfMgt3v/x0dDkM9wQ==
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 4X0lK94k1tz12Z6;
Fri, 6 Sep 2024 18:35: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 486IZPti011396;
Fri, 6 Sep 2024 18:35:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZPaw011393;
Fri, 6 Sep 2024 18:35:25 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:25 GMT
Message-Id: <202409061835.486IZPaw011393@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 327205407372 - main - ip6addrctl.8: Reference RFC
6724 instead
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 3272054073720172ebae9c2c5c75e656f72a6df1
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=3272054073720172ebae9c2c5c75e656f72a6df1
commit 3272054073720172ebae9c2c5c75e656f72a6df1
Author: Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2024-08-10 17:46:23 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:32 +0000
ip6addrctl.8: Reference RFC 6724 instead
Commit e695500d3cb945e62b4591cb68792601ed5c4b46 updated the policy table
to match RFC 6724, which obsoletes RFC 3484.
Add a reference to RFC 6724, and mark it up as a technical report (%R).
MFC after: 3 days
Signed-off-by: Jose Luis Duran <jlduran@gmail.com>
Reviewed by: imp, glebius
Pull Request: https://github.com/freebsd/freebsd-src/pull/1375
---
usr.sbin/ip6addrctl/ip6addrctl.8 | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8
index f50da59aa2bb..cf8f1db4a8bd 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.8
+++ b/usr.sbin/ip6addrctl/ip6addrctl.8
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd September 25, 2001
+.Dd August 10, 2024
.Dt IP6ADDRCTL 8
.Os
.\"
@@ -107,9 +107,12 @@ comments and are ignored.
.\"
.Sh SEE ALSO
.Rs
+.%A "Dave Thaler"
.%A "Richard Draves"
-.%T "Default Address Selection for IPv6"
-.%N RFC 3484
+.%A "Arifumi Matsumoto"
+.%A "Tim Chown"
+.%T "Default Address Selection for Internet Protocol Version 6 (IPv6)"
+.%R RFC 6724
.Re
.\"
.Sh HISTORY
From nobody Fri Sep 6 18:35:26 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKC07kTz5VSN0;
Fri, 06 Sep 2024 18:35: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 4X0lKB671Fz4VvT;
Fri, 6 Sep 2024 18:35:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647726;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=OuRDQMOjF53ZS0JM99NMaQ/yxUGWG48RT7DO5Q1aoEc=;
b=Dz2uFMaz/G6VpqfQMidwVJp14fQSW8JtsDrLfiV4qewQICzcy/qiBlhplxSRKHzshyogzT
g5jp5XNhnowZloJ7YrMX5mPbeVWl5/ymWAUXSx53kqo/7f6Q5gHHP2Ro5pnlEWiPmAChQn
PDwFNltaoTULxEXYTRYxM+HgTdNTenhMeGAdnUk9AbgCQaYwWJwiMviDiL+Or7b/RWAUc0
Dry+2GOI/BTwfNddJj9jM+6HeVohrr6dm6H6JMJonwJY9Bm6rr+jIZWwK2peFmUKasB2Oc
ctViQNzCvR/swgJpcDACshDQqmORPvlfpxfkNJvVJiMXvk1SsomwA24i6PZIFw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647726; a=rsa-sha256; cv=none;
b=gsKg1+KsOhzMtqRcy4OMLKUDWHNyKszdhitMP0lKTR5DivmXFw0n5ZWf2TpQCeScI6wkl1
a+Lkau+IZJASDrWDUu6IjnjceBHnR3PBiJbQq/y7haE/ZvpkxA3TDQ2lDXpMkNMruiAstm
p3kfv5zDUhn8lzkU3xcNRRFP69xQHB5C5fZW0yHegusyrP2Paulb0Ermreo436vAGOpDP1
P0W7aU5CDnzACt4sho1IHZ4945C8E4m7ppwqyE7LwFAPVgWUqwFbwKSJQcv8rigOwFsCNZ
K8eaM8l/re5VRb+An/32oeZM82s4rxQRKeJUA32OedC78VeyWhDMq18SNnSNUA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647726;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=OuRDQMOjF53ZS0JM99NMaQ/yxUGWG48RT7DO5Q1aoEc=;
b=DjVN4TThhOOkG+awAaSLMUA3Be08F2e1ALWDiSz0rs6sW6panxB3wvl2ghoDVtBuxvMtP8
pAQrN8mEU5FYWeKMKb1ht48BPQ5OxiUEQkRLCS9DuR9DXn6cXFPk53I8uWI8+oVwNSx2xs
wV7Svr+7R+0yODyaUGToS2CRMfz+EmqyP6/fYR/5frNWGLx+kENPBGe7AAEn7i+11hsMzJ
G6Isl3t9GU8r4jEqToPmAdZ7hiOcSPM6Jb0IwA6GqvwRrr3P6FSSfw40HARwyBHdROUqcW
v706y7dzZRp33uwg4pXtko7qyZFdMAC3JmdHF2RKOAzG0dDsvSwDbtjcjGVT1Q==
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 4X0lKB5lBHz12nS;
Fri, 6 Sep 2024 18:35: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 486IZQAT011441;
Fri, 6 Sep 2024 18:35:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZQSM011438;
Fri, 6 Sep 2024 18:35:26 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:26 GMT
Message-Id: <202409061835.486IZQSM011438@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 6bfbfc8f4fdc - main - ip6addrctl: Update the sample
configuration file
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 6bfbfc8f4fdc6ccd200541ef738a90d1be3c1ab7
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=6bfbfc8f4fdc6ccd200541ef738a90d1be3c1ab7
commit 6bfbfc8f4fdc6ccd200541ef738a90d1be3c1ab7
Author: Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2024-08-11 03:06:12 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:32 +0000
ip6addrctl: Update the sample configuration file
Update the sample ip6addrctl.conf.sample file to match the default
policy, currently based on RFC 6724.
MFC after: 3 days
Signed-off-by: Jose Luis Duran <jlduran@gmail.com>
Reviewed by: imp, glebius
Pull Request: https://github.com/freebsd/freebsd-src/pull/1375
---
usr.sbin/ip6addrctl/ip6addrctl.conf.sample | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.conf.sample b/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
index edcf77553f14..59c1f3db47e0 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
+++ b/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
@@ -1,11 +1,15 @@
-# default policy table based on RFC 3484.
+# default policy table based on RFC 6724.
# usage: ip6addrctl install path_to_this_file
#
#
#Format:
#Prefix Precedence Label
-::1/128 50 0
-::/0 40 1
-2002::/16 30 2
-::/96 20 3
-::ffff:0:0/96 10 4
+::1/128 50 0
+::/0 40 1
+::ffff:0:0/96 35 4
+2002::/16 30 2
+2001::/32 5 5
+fc00::/7 3 13
+::/96 1 3
+fec0::/10 1 11
+3ffe::/16 1 12
From nobody Fri Sep 6 18:35:28 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKF2Rjgz5VSG4;
Fri, 06 Sep 2024 18:35: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 4X0lKF10hGz4WK4;
Fri, 6 Sep 2024 18:35:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647729;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=9hlYznCwqeGiKqUQ8Z0xvQHyaNgLbye0aaAdzmrTqfY=;
b=oe5ea/mJ7GIjQOrcNxQDpzwrqmG6y12QyuT88ZVK6eNKJpvRUM4Wohtv//qdybjqOQWZoI
ePP+yQZY5IiKcIReGWM5daMycVNRGVg62vWlljRdMZLcKAOSZBXwnR0p58MODu1c6bwgnt
OFT5mALtHTMl6OcpeDYsjQf+iSGk8iQhySfNPFF0bzyPz8JH2+GEVtTR4WHO/3cHHf9ZTG
sozaWTXm9mxa0TL1iH5TmLG+2d6/XDqwimgZPke66tsbqvKL4jEFDAzN99XlzqzAUbIOSC
JFdIp3knvrUqVlWh+MZjk8g9kOGBNzxYvdMwO6zfmKT5fx8QkjR5ZEP2I4VorA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647729; a=rsa-sha256; cv=none;
b=XKT/aIZLoD/P8Ju7YeG82taY3yrUe+i4kAitdF0Z7EpmbvPQybDVJNyr9kUC+G3y/0s1uD
QL6yhzgtRLofK4NVpNw4cq0POKJ4QYFKG5W7vLxDnjCcPYNCNWdnDWXxVyOROK2ZHwTwu4
pyxf/ButO/HeZAABxcbFhxPmaNwQKsfIflTSvDnDM8KfFanG6cUDATrwxHAV1X1vY0damj
+xrIv2wy1/B9aXQUz0RR+7+2Jr84c8cdKump/HTxK3kopgjKQI7kxXVWs7+eLhVM3oXMfu
7XbeoS47vApmt4Vckw9lOQC9oClptzUUryxPn39Zug8eIckdNvwULUWeJwJgLg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647729;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=9hlYznCwqeGiKqUQ8Z0xvQHyaNgLbye0aaAdzmrTqfY=;
b=FhKtFRARcZnrlNwo6goKzCUinDqCRgKojl+Kc+qPGtZH5Z9pwEGpwrvuie/Y7Filf5CUpd
ndmsaAPS+ClSM3fd/Ky2U5mb0M4KckL18UlJefZ3Cct1eifr26QT6e0Eii5yLs4jWPe/5H
wNvZ6uQHbbZFZF+pkbgyRx90mMp41eLxyAKY/35G6qUtNpe3b2KRp8YquaXDZNpCv+ORnr
a20KCXjNiES0dhfbtUrBExu4C5VQ4B+zafmBsvQbgGI+tL+1nEdduyAwRZc7LqQBmf/0Qm
l6+Q2s+EMoht+Wmm31wy6PLITe5kA6REwi6Fod7wlnCA/jMOrPzkuqzVeXmV3g==
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 4X0lKF0chsz12c1;
Fri, 6 Sep 2024 18:35: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 486IZSYj011519;
Fri, 6 Sep 2024 18:35:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZSvc011516;
Fri, 6 Sep 2024 18:35:28 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:28 GMT
Message-Id: <202409061835.486IZSvc011516@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 7b9c9f8004b1 - main - cross-build: fix fake_sysctl/tzsetup
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 7b9c9f8004b17cda071537c9b2fdd259eec27d2a
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=7b9c9f8004b17cda071537c9b2fdd259eec27d2a
commit 7b9c9f8004b17cda071537c9b2fdd259eec27d2a
Author: Val Packett <val@packett.cool>
AuthorDate: 2024-08-11 02:11:25 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:32 +0000
cross-build: fix fake_sysctl/tzsetup
The error was always returned, even after handling the sysctl, breaking
installworld under Linux.
Sponsored by: https://www.patreon.com/valpackett
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1376
---
tools/build/cross-build/fake_sysctl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/build/cross-build/fake_sysctl.c b/tools/build/cross-build/fake_sysctl.c
index 4f1b271f3858..c4e40ebb9e72 100644
--- a/tools/build/cross-build/fake_sysctl.c
+++ b/tools/build/cross-build/fake_sysctl.c
@@ -53,6 +53,7 @@ __freebsd_sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
errx(EX_USAGE, "kern.vm_guest is read-only");
strlcpy(oldp, "none", *oldlenp);
*oldlenp = strlen("none");
+ return (0);
}
errx(EX_USAGE, "fatal: unknown sysctl %s\n", name);
}
From nobody Fri Sep 6 18:35:27 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKD40Hlz5VS9T;
Fri, 06 Sep 2024 18:35: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 4X0lKC6pvfz4WGC;
Fri, 6 Sep 2024 18:35:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647728;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=j1Yql7a3jx2NQzc4VC4qPmnYIhpyW4xw2QIdyxwq4Mg=;
b=UwbVWHLmKAG8x6+vr0TMWGNLx3gBVGwJ9oEHKSEbHku8pFCJWDEBeQX18NRtdLVmUzYE4K
l7f4B/B7RjbDg3iKaP6EymXcOS5yaa/je6YKcBbiQ1epGx8xLKFUUFwQX/hJxjo574iyCG
y4VfGhgOwYxN6kh4GWbFNxVWvXRILIm4HqUS7t1IQjsVMKXU+ZQm4nFwnuochSr7BildK8
qe30W598Nl1VGuWrHGnFzFB1zruNYk9b2DGuKnd29hR7itAoGwWx1VJXJAZBIW1/ul9+DV
hxJ3/8LXR9KjX52Da4SCMbVJiyPDp7rEdy1+H7xYbUMMX7KofK5xMw9HHqv3Pg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647728; a=rsa-sha256; cv=none;
b=pXoHhUOzGUt9s7/G3piPMWrbLIMX1emdTGyLif/qrWh87O8uRBT2U4Td5W1P2plaIACcHI
I+dVnzMx366JJ0k2SxGMOJ544Kcf0brqk2gGcEaRrtH41gh85sNI4T9LUuWSoZatMwtSrY
iFofE8uJZ/JTnjr7OuzJ5mpaonN5/xk1jeUEayTuVpoLT6eS27UfTgzGpeBYx6K9P5p0yb
9uZHUzqA1f3F4Qkq/uPCNxqDgYWzeuwHboiX/MJbrzv4jPAMgNq4rJPiApVmmYW72mqIY+
59wc8DD/zCj6qivPT2IkjHBT2e28FwKK5nPSO/WrYq8JuDiZqDjL9OgcNmhzGg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647728;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=j1Yql7a3jx2NQzc4VC4qPmnYIhpyW4xw2QIdyxwq4Mg=;
b=jgQRYQtNq4lphyLrpVTqEL0l01BmvJ+MWtqQOLZ1qMsCC+/wBf40CB+VncU5vlF796mKs9
WqqnDNk0bj3WbA6FQPXdc3RGKPVIKk/uugLqsFcvoFnLKjDGik4Nf4Zs+J4Tz3izfEWQWj
ZWC1oSp/3s8Pj74O+hM5vHsm3dXLprMx6CCJBMv7I0U/B17L2LAQu/eG8nNQR+g0RCGsZC
6DB+o18dW0pMDL1YzS62bXwBpcbronh4Lf+EPlv2BSq0K8W092lpT/5cNJ7I7Y++Ykwf3C
TEmk+7GVDVvo+Xc5VZvfW+RZFvZqidhpFBfFcR5J+dCqXMc7IIcPKKTOVnqDtQ==
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 4X0lKC6Pghz12KM;
Fri, 6 Sep 2024 18:35: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 486IZRlf011482;
Fri, 6 Sep 2024 18:35:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZRlk011479;
Fri, 6 Sep 2024 18:35:27 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:27 GMT
Message-Id: <202409061835.486IZRlk011479@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 9cb98ab7ceeb - main - getaddrinfo.{1,3}: Cross-reference
ip6addrctl(8)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 9cb98ab7ceeb97b70a4891a4a3a21372158ccf24
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=9cb98ab7ceeb97b70a4891a4a3a21372158ccf24
commit 9cb98ab7ceeb97b70a4891a4a3a21372158ccf24
Author: Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2024-08-22 14:19:44 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:32 +0000
getaddrinfo.{1,3}: Cross-reference ip6addrctl(8)
Reviewed by: imp, glebius
Pull Request: https://github.com/freebsd/freebsd-src/pull/1375
---
lib/libc/net/getaddrinfo.3 | 3 ++-
usr.bin/getaddrinfo/getaddrinfo.1 | 3 ++-
usr.sbin/ip6addrctl/ip6addrctl.8 | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 271ef8a0102b..634786a8bd12 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -480,7 +480,8 @@ freeaddrinfo(res0);
.Xr hosts 5 ,
.Xr resolv.conf 5 ,
.Xr services 5 ,
-.Xr hostname 7
+.Xr hostname 7 ,
+.Xr ip6addrctl 8
.Rs
.%A R. Gilligan
.%A S. Thomson
diff --git a/usr.bin/getaddrinfo/getaddrinfo.1 b/usr.bin/getaddrinfo/getaddrinfo.1
index ff99cd1ea1ee..fa9e8adce6a2 100644
--- a/usr.bin/getaddrinfo/getaddrinfo.1
+++ b/usr.bin/getaddrinfo/getaddrinfo.1
@@ -171,7 +171,8 @@ stream inet tcp 199.233.217.249 80
.Xr nsswitch.conf 5 ,
.Xr protocols 5 ,
.Xr resolv.conf 5 ,
-.Xr services 5
+.Xr services 5 ,
+.Xr ip6addrctl 8
.Sh HISTORY
The
.Nm
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8
index cf8f1db4a8bd..50245cef91ea 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.8
+++ b/usr.sbin/ip6addrctl/ip6addrctl.8
@@ -106,6 +106,8 @@ comments and are ignored.
.Ex -std
.\"
.Sh SEE ALSO
+.Xr getaddrinfo 1 ,
+.Xr getaddrinfo 3
.Rs
.%A "Dave Thaler"
.%A "Richard Draves"
From nobody Fri Sep 6 18:35:30 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKG3GBTz5VSKv;
Fri, 06 Sep 2024 18:35: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 4X0lKG29GPz4W4L;
Fri, 6 Sep 2024 18:35:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647730;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=QXDhzmn1INb0PwDGYXl0e20PaTI2yGdFF14e6nSjtAY=;
b=Su2lL/g8KMo07m/Pw2EZBOOwhS8M2gZxQ9hHcZdd6uNb3z9DDCN4Vt2ovPNN94vGdG07Ed
D4CqrJiXoss/4ZrRAw5rVGVAadi5WrgCP74oDwH7F7IwgiBpmA1jxCkTrxZj6J09zYKdRm
wppudV7YosCzw8JRlVrf3L4+gl4jd7qFJ1sQJHvRnYoOVu9ZSyGAdAUCVPq86FUeXSyq7K
ZOVE/Hlt8tSVxV5Ogz2JVYC0l2sFlqb5u0uiMrcVOE3PFTOJgGRftdFyfJjhQLKNRbUnvm
/RVinSWAjz4ggVz+FI/t7gnd1MElsjbRGSKcubhdBFVgGIYfv6K1J3q/7lXtOQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647730; a=rsa-sha256; cv=none;
b=gz4eLHuNICRxIW0mNkye6AZOM1RQ9nScwEqno0vP8Bx6uhjpl90jDvsAenrR7QRUen0nLf
XHBeKrI2a/HtPWZMsW/6vedSGfrb8kJ7cClaHIgnoQ4FeWY42IvF6BLfpHFZ6mMUyI657b
pHLy3Qp3rcGrAWn7LIom6O30Aaj/3iW+PRAOwQRLTItOKKPwK3N7VBWbp6CrzvVdezfEZI
/w6Ul9mc5z92wzACmVIx2LzggtqsN5bOjwZATqCtP/Lzl/x6zC+l/8YxNmvKQFuvMjiPnC
QVHyn0Ak/eNlE/Zx9wd04jO5gBBX/7xWSfG0XvDaK/3nN4EWTEl7yqXCeliaQQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647730;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=QXDhzmn1INb0PwDGYXl0e20PaTI2yGdFF14e6nSjtAY=;
b=iXFHy+Hd3pDDpyza2gSQh16OopMup1sGqTCwZhCx5QD80v9mlGG0clmYR0PKM4bB7tAGVH
iP57W+2PfOoERzvaBBMLUYF7ZXmZaU+nLFyEH0C1xVKkr5YeoH/cpgP5juPZEAOfqBIEzq
kgkeSLfFsWV6F0Pk6aEJYJh1qBN2hMV5CMT56TFmCs+PxuODew9AOXUwOEnXIlHUyd862B
zcewrM6qsslIHPf4BBCTxK5bVQznUkTbzXWu51jFZctTQzMwHMN/4tn23XkYUMpB/CT/f4
MayPXMEIsyOH0Do5RaC3hAXZs6nnMz5B9qI9nq6wkPwXOLFbKvBGiy9I2DVAYg==
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 4X0lKG1mMCz137x;
Fri, 6 Sep 2024 18:35: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 486IZU9s011570;
Fri, 6 Sep 2024 18:35:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZU4l011567;
Fri, 6 Sep 2024 18:35:30 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:30 GMT
Message-Id: <202409061835.486IZU4l011567@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 7e3b6b249f54 - main - diskless.8: show in `apropos
pxe` + tag SPDX
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 7e3b6b249f54f5b22eae14dfa48ef7891bc4eac1
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=7e3b6b249f54f5b22eae14dfa48ef7891bc4eac1
commit 7e3b6b249f54f5b22eae14dfa48ef7891bc4eac1
Author: Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-08-12 03:07:42 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:32 +0000
diskless.8: show in `apropos pxe` + tag SPDX
MFC after: 3 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1378
---
share/man/man8/diskless.8 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 8839e27e11ba..cc49854ae850 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -1,3 +1,6 @@
+.\"-
+.\" SPDX-License-Identifier: BSD-3-Clause
+.\"
.\" Copyright (c) 1994 Gordon W. Ross, Theo de Raadt
.\" Updated by Luigi Rizzo, Robert Watson
.\" All rights reserved.
@@ -24,12 +27,12 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 3, 2020
+.Dd August 11, 2024
.Dt DISKLESS 8
.Os
.Sh NAME
.Nm diskless
-.Nd booting a system over the network
+.Nd booting a system over the network with PXE
.Sh DESCRIPTION
The ability to boot a machine over the network is useful for
.Em diskless
From nobody Fri Sep 6 18:35:31 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKH6F8Nz5VRlV;
Fri, 06 Sep 2024 18:35: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 4X0lKH4Dzlz4W9w;
Fri, 6 Sep 2024 18:35:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647731;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ZhGV2I8tVu8QLdHBzSpBP3+rq1YR+hIrx7buhitt8OE=;
b=TYkCcWQPYOYQJfaWJbtCfyvhb7z5PD9I+Wxsie0VEkbV0kMHA3GuXevB+PJIQOLcRS4iZO
vBPvPSvvsLERavny1TQgxqZjokZGOiHm6oIdzp1UfIPzI3VM+tSDo5y0R8FWqc+kHdleJt
IVYkhV9sZQWhrmG9xPVoNjlmaPVuhf84SUkc61mchrv9a/o6NjiJmC3SSclvcDhPkWhd/k
Di+u8nUDh7COAZ6ytm5Yt4DLzClwfG2AkgpKHKUsSnefeR+R2dSE/QMxhsb1wmbzvTc7za
FFtt4R8BN/S7Txi8g+cp1pihv2jHRqF9usugIBXVk9rx1enkHcOdzS0l+H+XyQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647731; a=rsa-sha256; cv=none;
b=e+3i6EfNgEJuftysmKnPbLhH6tDh6fkcrZkguQyS5LktIS/2bw2iPCtdKQyRTHAEq4Ydsa
6tVnNWuW3ofoQWVkcIeWwcQACiIxjRVzJzfH/WIW0sHFGQz0hOkuwZlNc04TbRoG/7mqy4
acFbUh063lnhE+YvO/idXSDXUksrsJET73wJTiCQV1sQ8Syh/hMW0ph9IKPi9cId6Vtj25
GzigZ9oN/dBrqwmP6favf1lntVpvoYpv0WG2lENSIxtSb8INUVCTihbg9zEGqf4TLMX/Xc
kaQlPd0V2bN/TuOMr7KtaMLihTwDN1uBClGntGkd3t3oBN+KAfrCe54XlqrvGw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647731;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ZhGV2I8tVu8QLdHBzSpBP3+rq1YR+hIrx7buhitt8OE=;
b=jzPxBooiJLMrCeHvwWQSY1r4BpJITG4B0G4Oh1xWZy6WwRv3rh9Bl7TMAJZZPEuGveUXhx
abrhztW72Cg7oz+Egl7b+lw+OYJMtUpR6jKmIpXrgLQc3/Jtf6w23TaeCCFEOEvN36PR6c
AWrCUmfyuHQT2jPZ3WPgN+MxCpGdLe8CIr/MqxmbGICz1Vfi+A4aiabDnFQ0VkondhqFd5
bREhTsCfrnRzwnCCn1KffIPhGv+Rc/7tR0ru7OuzCz8qWMUdDEEw/5/yg2zJ8aWA76JP//
AZupfuv13jt/5YCvxHyON+EEVy+nHiERcJmNKEu+AE+NxGviMr5t9NCPmujAvg==
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 4X0lKH2qXhz12nT;
Fri, 6 Sep 2024 18:35: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 486IZVFe011612;
Fri, 6 Sep 2024 18:35:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZVav011609;
Fri, 6 Sep 2024 18:35:31 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:31 GMT
Message-Id: <202409061835.486IZVav011609@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 0d8effbd6e45 - main - growfs.8: align and alphabetize
options
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 0d8effbd6e45643154c90942f210b7f7a6ecc61d
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=0d8effbd6e45643154c90942f210b7f7a6ecc61d
commit 0d8effbd6e45643154c90942f210b7f7a6ecc61d
Author: Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-08-12 09:39:03 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:32 +0000
growfs.8: align and alphabetize options
MFC after: 3 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1379
---
sbin/growfs/growfs.8 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index 9a6076017c74..9b619613f30e 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -61,16 +61,11 @@ The
.Nm
utility extends the size of the file system on the specified special file.
The following options are available:
-.Bl -tag -width indent
+.Bl -tag -width "-s size"
.It Fl N
.Dq Test mode .
Causes the new file system parameters to be printed out without actually
enlarging the file system.
-.It Fl y
-Causes
-.Nm
-to assume yes
-as the answer to all operator questions.
.It Fl s Ar size
Determines the
.Ar size
@@ -87,6 +82,11 @@ This value defaults to the size of the raw partition specified in
(in other words,
.Nm
will enlarge the file system to the size of the entire partition).
+.It Fl y
+Causes
+.Nm
+to assume yes
+as the answer to all operator questions.
.El
.Sh EXIT STATUS
Exit status is 0 on success, and >= 1 on errors.
From nobody Fri Sep 6 18:35:32 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKJ6KDqz5VS9j;
Fri, 06 Sep 2024 18:35: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 4X0lKJ4Zqvz4WGw;
Fri, 6 Sep 2024 18:35:32 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647732;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=OtycRkr5Ewd5Rx4AKKdR5yo/+K7k+aW7tUpB4Jf91KY=;
b=TeTFJdWFozcqbeR7otnMv2Tclpgm2ttrjovVASJSWvxVBxvUwxJcrU+2mEbu4YRfbEgulZ
lr1QJuvpJJb/cA+O+PcWtFqLYStIkzS/DAb34Y93+dBokmzwUaEXVJuXQr5QuQeYYjWpgT
SLJnzsi31/16rtE/qmBhyiMgyOrea3QEGNLUFPvz4ARTf/yRC5cEDOM7a37z8q8qu94GEt
8a23GCQvwdROpf5In+XvvNlNb/G6JHzhw+es9P3o3Hhh7EFDFV96vAk1v4fyzqrQK/qA1F
1hJp5Bt8tV8JwqNZM4qJmmpuGvI7S05SewWO7jBnJ8G2FbwJ8NM3i+wjl2a8MQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647732; a=rsa-sha256; cv=none;
b=coOK1gRTs2JooKdSwBO43U+QUJpDvrNkjUHeUJ7e2poo1zqka2AIoNaWcYQXrDhK7gux53
RaaKd0/3tXd1x0+1hS3mW2aWWw2yj9edWolCyVXx6bpMmY+CRT98C6E/xSLJMLF0Ided/N
q4JSpCL86nVULMJMV0T+eH9Ac5w4+GO/h9Fp+PeC3Om4nyFse0nSUT0xnbyp1Goiea73Zf
jh0ctSKp4eUpL7+VT21CU8aX3Yc3jOXZfUgh2KV/hwin5RUb3sVvedUXo7xZc9GfDS6ifp
DFQqYj0SKbM5pweNuq7ziptmsJyuyIcpWMoycM6MyMPskoEJ3xrx2X8gvN1D9A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647732;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=OtycRkr5Ewd5Rx4AKKdR5yo/+K7k+aW7tUpB4Jf91KY=;
b=yv+rtNUhUwd9mtBoKR0n+MhwkMCqt3RxMAkt3v6jaL2OMWt8IKbggoTJ23HJVe1KvmgmXp
HNa9fZ+QOp8ZLgIuREZcNcte+ksNPcKjkdVPjyr5pCAw+RbE6IiOb45qAfWzjjvtxSaOSM
qXVSrlCKczLV6EVmCV5e0DfrxwFn5HgRu5uKjtUxmJkrMAXNv2jTsmbzLzPQxiFA335wBD
dnfQMxAVXNu7SUX3L4xe6O7oMrepDx0r0X2cJeZCKA+UVBY0cq1CibRCde6LCGJj8fu2dX
WhX3dNgjGg1r2YvtkZ3fIsVfD/ye3au94tu2mDKbHe6cu7NZNuV/tf5noVsBSQ==
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 4X0lKJ3tHDz12KN;
Fri, 6 Sep 2024 18:35: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 486IZWWd011657;
Fri, 6 Sep 2024 18:35:32 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZWkZ011654;
Fri, 6 Sep 2024 18:35:32 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:32 GMT
Message-Id: <202409061835.486IZWkZ011654@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: a5770eb54f7d - main - geom.8: minor cleanup (markup,
spdx, gsched)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a5770eb54f7d13717098b5c34cc2dd51d2772021
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=a5770eb54f7d13717098b5c34cc2dd51d2772021
commit a5770eb54f7d13717098b5c34cc2dd51d2772021
Author: Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-08-12 09:59:21 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:33 +0000
geom.8: minor cleanup (markup, spdx, gsched)
Fixes: 86c06f (Remove GEOM_SCHED class and gsched)
MFC after: 3 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1380
---
sbin/geom/core/geom.8 | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index 124ea0f2be11..7f0f0b2911b3 100644
--- a/sbin/geom/core/geom.8
+++ b/sbin/geom/core/geom.8
@@ -1,3 +1,6 @@
+.\"-
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
.\" Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
.\" All rights reserved.
.\"
@@ -27,7 +30,7 @@
.Os
.Sh NAME
.Nm geom
-.Nd "universal control utility for GEOM classes"
+.Nd universal control utility for GEOM classes
.Sh SYNOPSIS
.Nm
.Ar class
@@ -66,7 +69,7 @@ which can be used for existing
.Nm
unaware classes.
Here is the list of standard commands:
-.Bl -tag -width ".Cm status"
+.Bl -tag -width indent
.It Cm help
List all available commands for the given class.
.It Cm list
@@ -74,7 +77,7 @@ Print detailed information (within the given class) about all geoms
(if no additional arguments were specified) or the given geoms.
This command is only available if the given class exists in the kernel.
Additional options include:
-.Bl -tag -width ".Fl a"
+.Bl -tag -width "-a"
.It Fl a
Print information for geoms without providers.
.El
@@ -84,9 +87,11 @@ Print general information (within the given class) about all geoms
This command is only available if the given class exists in the kernel.
.Pp
Additional options include:
-.Bl -tag -width ".Fl s"
+.Bl -tag -width "-s"
.It Fl a
-When used with -g, print status for geoms without providers.
+When used with
+.Fl g ,
+print status for geoms without providers.
.It Fl g
Report statuses for geoms instead of providers.
.It Fl s
@@ -107,7 +112,7 @@ kernel module.
.El
.Pp
Additional options include:
-.Bl -tag -width ".Cm status"
+.Bl -tag -width indent
.It Fl p Ar provider-name
Print detailed information about the geom which provides
.Ar provider-name .
@@ -170,7 +175,7 @@ VIRSTOR
.Sh ENVIRONMENT
The following environment variables affect the execution of
.Nm :
-.Bl -tag -width ".Ev GEOM_LIBRARY_PATH"
+.Bl -tag -width "GEOM_LIBRARY_PATH"
.It Ev GEOM_LIBRARY_PATH
Specifies the path where shared libraries are stored instead of
.Pa /lib/geom/ .
@@ -213,7 +218,6 @@ geom md unload
.Xr gnop 8 ,
.Xr gpart 8 ,
.Xr graid3 8 ,
-.Xr gsched 8 ,
.Xr gshsec 8 ,
.Xr gstripe 8 ,
.Xr gunion 8 ,
From nobody Fri Sep 6 18:35:33 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKL0jJqz5VSQN;
Fri, 06 Sep 2024 18:35: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 4X0lKK5FQSz4WTs;
Fri, 6 Sep 2024 18:35:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647733;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=r6fh95SYuXEnlm3t7X91CCcwCSfGVuqxj56okX4s+40=;
b=UoyCTJMKWT3IW8nWTifRcMUWxtGaWDlTMRNJUuQLE1N+Ocy57dNoY+G3Cdfp8UyjVvHKd/
m9/T+l4wv31HTGXnmJyibpX6/+OgiEXjliDTg/lmb2Ux+RGw+vSWHVj8wIpaIRIRr840lx
599905zD/hjNoUQjl4Kxusllw4vuRtY53AbXViBAKjkMbVl3D24g+9nypNaEG5BwtXQUDY
j/oAkD3nLrSDCqfTGn1/IYkkBT6b0Eq9Gc8HDrvuoqttRr9hZM/Ik+L+4rupRGohm6PvjE
LjdGCs7VVjXJUHJ729cQMnENetje8Gpc+MUR5UNqAMTdS5CdBe2+duiAo0PJXw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647733; a=rsa-sha256; cv=none;
b=sW0xMoexW5VcpkZAcU/lvRTNpcG8FbihrmEuFKBrgd8TFDZcmPSKEBvTosinISOhD4zKqZ
GGHDfyvKBZynpefYXhTiepqQ15IDvRxkJgFLkps/NQiO1Yc7NrF0y1ffH8vcPm5bJaYRL+
DFm+sSUQaKQ0SDlZqSWwDstHRWcUmRWjySgdIXA6/iuU776gpuy4uahBSvxq+MwMMLoGY6
m4yLoiL4BNOuQSmUcUf2zDs329c2F7lzCui87iTsxx1wZzfzze7NPGHw/9PogmJ8pAhErh
ZWFF2ahxyXcYX4nzkQFzopbNm4bYO7bvH3aYF4ircdgvr/3GlhyrGPpN4FG0sA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647733;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=r6fh95SYuXEnlm3t7X91CCcwCSfGVuqxj56okX4s+40=;
b=Mf+hXl0fUYdIaza/p3x/KCVJRQeT9Vletx6X+eIy35i4PGqT1K1TjsqM57eldtkFMeTvjD
LYZdUQqWY/FZldjSea0kOAXcXKua4ugP2oVhtyvLRRVEtyiiPYQJ+yXVKZ4hU1D66QSpIw
oE3S+HGo51B9Ct5yxjfefetyfb7VT9cE9zXXGaVPwsk+LzbFwwGjvkaZebHSO1RqWQw6/g
a7WYHs4u2g3KUq+h2BBpYd2qRoymcSZtTuIhoAgsOs7l57jkrTlBEtQPL1yxet60mO0M9Y
lcNzrrOz7LBm4BzBYtLCOn6hsUjp0UO0v11/orEDr1iGrkPmz7MZS99zXebVXw==
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 4X0lKK4qs9z13HP;
Fri, 6 Sep 2024 18:35: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 486IZXk1011704;
Fri, 6 Sep 2024 18:35:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZXxE011701;
Fri, 6 Sep 2024 18:35:33 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:33 GMT
Message-Id: <202409061835.486IZXxE011701@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: fe830c3bdbb8 - main - UPDATING: increase visibility
of footnotes
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: fe830c3bdbb80545711d49b5bd6fd4ec28ed9f8e
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=fe830c3bdbb80545711d49b5bd6fd4ec28ed9f8e
commit fe830c3bdbb80545711d49b5bd6fd4ec28ed9f8e
Author: Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-08-14 01:33:07 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:33 +0000
UPDATING: increase visibility of footnotes
MFC after: 3 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1382
---
UPDATING | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/UPDATING b/UPDATING
index 1aae85df0a70..01fbf9a30946 100644
--- a/UPDATING
+++ b/UPDATING
@@ -2022,6 +2022,8 @@ COMMON ITEMS:
make -DALWAYS_CHECK_MAKE buildkernel KERNCONF=YOUR_KERNEL_HERE
make -DALWAYS_CHECK_MAKE installkernel KERNCONF=YOUR_KERNEL_HERE
+ If you are running kernel modules from ports, see FOOTNOTE [1].
+
To test a kernel once
---------------------
If you just want to boot a kernel once (because you are not sure
@@ -2038,8 +2040,7 @@ COMMON ITEMS:
<make sure you have good level 0 dumps>
make buildworld
make buildkernel KERNCONF=YOUR_KERNEL_HERE
- make installkernel KERNCONF=YOUR_KERNEL_HERE
- [1]
+ make installkernel KERNCONF=YOUR_KERNEL_HERE [1]
<reboot in single user> [3]
etcupdate -p [5]
make installworld
@@ -2057,7 +2058,7 @@ COMMON ITEMS:
<make sure you have good level 0 dumps>
<boot into -stable>
make buildworld
- make buildkernel KERNCONF=YOUR_KERNEL_HERE
+ make buildkernel KERNCONF=YOUR_KERNEL_HERE [1]
<maybe newfs current's root partition>
<mount current's root partition on directory ${CURRENT_ROOT}>
make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC
@@ -2076,8 +2077,7 @@ COMMON ITEMS:
<make sure you have good level 0 dumps>
make buildworld [9]
make buildkernel KERNCONF=YOUR_KERNEL_HERE [8]
- make installkernel KERNCONF=YOUR_KERNEL_HERE
- [1]
+ make installkernel KERNCONF=YOUR_KERNEL_HERE [1]
<reboot in single user> [3]
etcupdate -p [5]
make installworld
@@ -2097,8 +2097,10 @@ COMMON ITEMS:
messages there. If in doubt, please track -stable which has
much fewer pitfalls.
- [1] If you have third party modules, such as vmware, you should disable
- them at this point so they don't crash your system on
+FOOTNOTES:
+
+ [1] If you have third party modules, such as drm-kmod or vmware, you
+ should disable them at this point so they don't crash your system on
reboot. Alternatively, you should rebuild all the modules you have in
your system and install them as well. If you are running -current, you
should seriously consider placing all sources to all the modules for
From nobody Fri Sep 6 18:35:35 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKN1Fwlz5VSQR;
Fri, 06 Sep 2024 18:35:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0lKM6kdlz4WXW;
Fri, 6 Sep 2024 18:35:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647735;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=fW4DfKaS8N28A+eRgZwzoJ8F3LrsIWDh7gg4Qrl4Bm0=;
b=hY6eJW8QE0oFx09kRTl5zMU/ChiP1gHKwerqmneZSV3xYaK/d+7NF+vDbjZssCROkvldr7
WnckfvqYlY4eZ1UQQdoMDW0WCouhFiAkTEqOwM2X4SYA0wDFHPEvXqewzuM74W0f4x9mAn
ELmubz2n4ZaibBaOcrGAQGqQfqr3HxaI1f98vt3wcGRhj8EL5CcY18wfHMgg1pJx28HxIz
1bt2GJFY8u8b+sZauTYwXx/5xLC8ZqBIK7rojKCf5Qfs88YAmI5wPKqBtFJwA98SGzz9dl
PiU7VnxMy66mPsp8QyuNfd8UWPudBJ/d2Sj1syECbe/GZ986S9P4j7eQrIObxQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647735; a=rsa-sha256; cv=none;
b=RH5j8HUSNkw3GsJGhStByKWgLXJrwEcLO+K+y5Gs2ExO5yA7rdlGwlqwXKGGB/IRIdFe05
rgno48VdIqAKsx4+pH2t8dg7DKJn/rAHIYzO4jXMiSBGUK/wD2uoJeXVJLtya/d+Mt2pBe
jGAkGlEHl9ZtVABZyrNDqVxrluocG2CHYYZCMa62aOIQsWaGTws28XqIhxShBein6cEyV6
2y0UD/PqWTDT+RqRuP3kbDyDyYwVzFqj6Glo1e7t4fUGMwPuDUCvHbotkM9RavY71gY6G3
kOtWcCFsGM8QQaPkqLQrUSSim3hSiHLfKxdz4/q6vvw3omtV5GcpQwFeWS+nbg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647735;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=fW4DfKaS8N28A+eRgZwzoJ8F3LrsIWDh7gg4Qrl4Bm0=;
b=PTU9U825ULlylLFjHgXYWpZawIN3ur7xMJssa8lMUSkV4bNW5neFX98nTZ3P4BFAqCz34y
3A4XX+zBjC2IKCUu6ngnpzA+j0c7Oo87WXILCvGynLQVReVa1ZYGpY/ap2JPBU8p53C4Ms
kxJ85GCKcnOz0NkVUdAoEbyCuKwDBCTfRGOG9PwmzhTr1EyjvULyITIAmKcxtGNE6DG5S1
N7Vb4IcU59Lqa4lhvMhmqwg047Pna3c92TTtV7UJx/wnhgDGxmYa2B2ZdScuCFC/TQ2Io6
PKbngw65HFnwxpw8D4XVfjkOkBeiucQDpDeP2f9uBdHZ8QHkddG9qJ7TFWuCcA==
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 4X0lKM6L1yz12Z7;
Fri, 6 Sep 2024 18:35: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 486IZZoj011813;
Fri, 6 Sep 2024 18:35:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZZiC011810;
Fri, 6 Sep 2024 18:35:35 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:35 GMT
Message-Id: <202409061835.486IZZiC011810@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 5e6bef460d9d - main - Fix "version introduced" in two
manual pages
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 5e6bef460d9dc3a1ef567f9602b04a252b554b67
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=5e6bef460d9dc3a1ef567f9602b04a252b554b67
commit 5e6bef460d9dc3a1ef567f9602b04a252b554b67
Author: Tom Hukins <tom@FreeBSD.org>
AuthorDate: 2024-08-17 20:15:50 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:33 +0000
Fix "version introduced" in two manual pages
Signed-off-by: Tom Hukins <tom@FreeBSD.org>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1385
---
share/man/man4/acpi_ged.4 | 2 +-
share/man/man4/gve.4 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/share/man/man4/acpi_ged.4 b/share/man/man4/acpi_ged.4
index c87c7b3e97c9..98baabdde796 100644
--- a/share/man/man4/acpi_ged.4
+++ b/share/man/man4/acpi_ged.4
@@ -53,7 +53,7 @@ This may generate optionally ACPI notify for another device.
The
.Nm
device driver first appeared in
-.Fx 14.0 .
+.Fx 13.3 .
.Sh AUTHORS
.An -nosplit
The
diff --git a/share/man/man4/gve.4 b/share/man/man4/gve.4
index 54e59b86108b..95c125507bd5 100644
--- a/share/man/man4/gve.4
+++ b/share/man/man4/gve.4
@@ -208,7 +208,7 @@ Please email gvnic-drivers@google.com with the specifics of the issue encountere
The
.Nm
device driver first appeared in
-.Fx 14.0 .
+.Fx 13.3 .
.Sh AUTHORS
The
.Nm
From nobody Fri Sep 6 18:35:38 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKQ31XPz5VSGJ;
Fri, 06 Sep 2024 18:35: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 4X0lKQ1bgbz4WY5;
Fri, 6 Sep 2024 18:35:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647738;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=KT+HP03IIc7RXBzCLcXA1xCicEiF7XcQs3DTbGurAAg=;
b=FBO8iJD5gnCquUnwBiuXdxg8s3RIg/c4QBGt5XlA33Rsm3Fi9jGbXSKLu3+JWAwfGZq7n+
12jVzEVgM8EzzMMPULquJg3HJT3Yfdq1ZSN2jxmpzFZkmkKtKezkKYTOvvpmCWvNarzFz/
lwnGM23po7HS5xo0Sbb4AfhHzBymE8D6/9ridW9cfsupD7Aadqgms2Igxiw+VEzOtglOie
6WaVECW/q8Y13lFQBf/AMGgsJLoZ2cLi1/BIwKmqYAh9+w854kN8nRkJU4WdK29ZAZkkXh
8vDxQWzDKLZlpZGXzml9ph/Feu0VMkTr8yBiiHqKgbc0tXKjNH6b58/qAKcHBw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647738; a=rsa-sha256; cv=none;
b=voEnq6KRP3Xpz2n4p05uYnc8umLEeqywMrv+lxzmBEWWhoMWqyTocbotFG2buzwl1LAy06
OJ85Id0eoYi7MxROEHJVp751yXO6gYDz+6HmAPEuAuUPxcAlOcFRzvdu9qiAWXfTJcIbaT
lIjWFyDGIPc6JDaEZYClmaYFtobSuNi85ILsi+kZ7nCD82Bf5pd8PqTkmkIqeYXPDEDIPg
EDuzG12j9i1iHf762i9aRhqwIf2TnmIim3/oxpRH/PaShK/IwoBLUMdvgMMER291Bu1INv
xSCz9EoqP14og7RDoczk0JMmYOFPHWpQiReNt2UffnrThj1YeF44Mv7vl8aPow==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647738;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=KT+HP03IIc7RXBzCLcXA1xCicEiF7XcQs3DTbGurAAg=;
b=gofXVymqH0c9UYG7xmUYlOMZVkKXDgIc89hbmwZgleaMyNV82YPrm2kQSRsDggZU/KCpod
f2zQ3xgPe/foHWYwr88JqNH6W4ko+WMVA8m0+5+DVFuu1SVy8gMU26QZsJbDLV/v7Z2HQf
/D34iFs4D3wHRDRHe1ppX8c1boILvJ2Ot3x7ggKcTSEVn9lbQbg6t7CsOSOPeNzmZSUdRT
QC/eBQSXeQ69o8W/N1tSwWnMg980GlWKZGqMdv7TFrYzt8JsSEASGOMFNOtl3qwHPwQRJ+
xJ/a8IkgKB18qmxKuh4UUWr3LGVrzVMWM+gsNebMa2Yg5DZqTuWiAC5Ge1hISw==
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 4X0lKQ1DFzz135J;
Fri, 6 Sep 2024 18:35: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 486IZcBB011891;
Fri, 6 Sep 2024 18:35:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZcHT011888;
Fri, 6 Sep 2024 18:35:38 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:38 GMT
Message-Id: <202409061835.486IZcHT011888@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 2b7f2890a812 - main - dummynet: fix pie
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 2b7f2890a812eb09dccaa8069483566a3b292338
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=2b7f2890a812eb09dccaa8069483566a3b292338
commit 2b7f2890a812eb09dccaa8069483566a3b292338
Author: Franco Fichtner <franco@opnsense.org>
AuthorDate: 2024-07-29 14:38:00 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:33 +0000
dummynet: fix pie
Since 26b9e1f07fa codel was fixed but traffic was not flowing for
pie too. Apply the same fix.
MFC after: 1 week
Sponsored by: OPNsense
Differential Revision: https://reviews.freebsd.org/D46182
Also see: https://redmine.pfsense.org/issues/13996
Also see: https://forum.opnsense.org/index.php?topic=41827.0
Reviewed by: imp, markj
Pull Request: https://github.com/freebsd/freebsd-src/pull/1390
---
sys/netpfil/ipfw/dn_sched_fq_pie.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys/netpfil/ipfw/dn_sched_fq_pie.c b/sys/netpfil/ipfw/dn_sched_fq_pie.c
index 632bfd4b7152..06700b0f93af 100644
--- a/sys/netpfil/ipfw/dn_sched_fq_pie.c
+++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c
@@ -744,6 +744,9 @@ pie_enqueue(struct fq_pie_flow *q, struct mbuf* m, struct fq_pie_si *si)
}
if (t != DROP) {
+ if (m->m_pkthdr.rcvif != NULL)
+ m_rcvif_serialize(m);
+
mq_append(&q->mq, m);
fq_update_stats(q, si, len, 0);
return 0;
From nobody Fri Sep 6 18:35:36 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0lKP5ksKz5VSJ7;
Fri, 06 Sep 2024 18:35: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 4X0lKP0z5Xz4WSN;
Fri, 6 Sep 2024 18:35:37 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725647737;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=pKCpINCa1gbJbWjJeVDymlhmLpQJxxnYGHL2BTedaRM=;
b=Rwl/5H63YQyFm3bQyn0/MHteV9rNiCWntddf7vmhxt+1y42HFsDRMv7bViWGhc8pmd0hEi
VMIzQxmOvEf+wnpHEKZXcgC/TP1zr9WOpCNUrUvVL6NghdovVzGwAmKGC3leMpfQQNp+xC
KZCxArZiMAOIIolaoxbntUsiebn4TpSKy8nsGL04g/7nf88E+3f5khxpT9HP95E/oeY6eA
sZpKDP7WylIL0x5lJ1WZFBrwBIcU57A3c1QnYhRel3ntFFF7yjXoL5tOvbH2C/VHqrEks3
gB1k9s9STG68ivqGuvAeLdnfY6sCnwTGOTDSuShEP6Ul9lGI9PTxgN8qqcwjtw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725647737; a=rsa-sha256; cv=none;
b=pluukDcGkevs/9v0RM5WXw8JjA1oLT/9IcrOeIbBoYLOnknDjHSpmEA2ZmUD8BFuzikgj6
xNtgX1/vq7r1Azpd8aPp4rLwCLK1rYT/n0iB3t4/+xd7kjVkv9dmP/D56Z6jE3zpUYgeAy
u2cGNz7jT0R5ejC0OgUXoQPEJml8DMRWiBhB1pQlTG+4bSLeBREZEy2rwrJpUCj3mzUWoB
ELF6Oli60HsmxlCv9bCIvnhMUUNjPoSxrQqpYndoGuQReL1RuArELgnBvn16V99ok9CTj/
7P9orT7k0ISwoxPNQkkPxp+m48knRsyVDUuPgVY7ej//HGl7YRwSJZreWnmTcA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725647737;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=pKCpINCa1gbJbWjJeVDymlhmLpQJxxnYGHL2BTedaRM=;
b=W4E+NqojrLheyC8EVybOgpqq8BNYbnzaSlXFsH9JHKXr2Bs/jU6PNpqG+k/qC9y/HOsZGv
SWvVq4V6fSnU3GsxeF52EWNStln0rUZi2lhPqAPm1vkkb2X+4ZyTVDJlsZwOQT9jJaYkv/
IWYmCw5tmtvUVxq84gRfzziMGWqpx5kEyOPTnwF1TWVNrxuiL5Fv5kSRTEtLtUyUIdUqeR
UK6fZRC25DzSCi/G4szMAE1g5CeA759sd2uDU86ioYVWjTnOS0SBkxMQahrhaZ+WmMNYCH
66P3C4c2iNyb0/uDcR5K7PW9F2Tv+LtUMix89mjQa/uiPPph1Cr1rOz/FAlj1A==
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 4X0lKP0DNnz12nW;
Fri, 6 Sep 2024 18:35: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 486IZaOU011855;
Fri, 6 Sep 2024 18:35:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486IZaO0011852;
Fri, 6 Sep 2024 18:35:36 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 18:35:36 GMT
Message-Id: <202409061835.486IZaO0011852@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 3f0efe05432b - main - libefivar: Fix AcpiEx print
logic
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 3f0efe05432b1633991114ca4ca330102a561959
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=3f0efe05432b1633991114ca4ca330102a561959
commit 3f0efe05432b1633991114ca4ca330102a561959
Author: Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2024-08-20 11:58:00 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-09-06 18:34:33 +0000
libefivar: Fix AcpiEx print logic
Add logic that checks if the code doesn't overflow
ACPI_EXTENDED_HID_DEVICE_PATH node when searching for optional
strings. If the string is not provided in the device path node
default value of "\0" is used.
Upstream PR: https://bugzilla.tianocore.org/show_bug.cgi?id=4555
Obtained from: https://github.com/tianocore/edk2/commit/96ed60dfd7d4818a532216d64ee87b13fae5c726
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1388
---
lib/libefivar/efivar-dp-format.c | 72 +++++++++++++++++++++++++---------------
1 file changed, 45 insertions(+), 27 deletions(-)
diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c
index d97603c41dcb..72e024470a11 100644
--- a/lib/libefivar/efivar-dp-format.c
+++ b/lib/libefivar/efivar-dp-format.c
@@ -478,23 +478,41 @@ DevPathToTextAcpiEx (
)
{
ACPI_EXTENDED_HID_DEVICE_PATH *AcpiEx;
- CHAR8 *HIDStr;
- CHAR8 *UIDStr;
- CHAR8 *CIDStr;
char HIDText[11];
char CIDText[11];
-
- AcpiEx = DevPath;
- HIDStr = (CHAR8 *)(((UINT8 *)AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
- UIDStr = HIDStr + AsciiStrLen (HIDStr) + 1;
- CIDStr = UIDStr + AsciiStrLen (UIDStr) + 1;
+ UINTN CurrentLength;
+ CHAR8 *CurrentPos;
+ UINTN NextStringOffset;
+ CHAR8 *Strings[3];
+ UINT8 HidStrIndex;
+ UINT8 UidStrIndex;
+ UINT8 CidStrIndex;
+ UINT8 StrIndex;
+
+ HidStrIndex = 0;
+ UidStrIndex = 1;
+ CidStrIndex = 2;
+ AcpiEx = DevPath;
+ Strings[HidStrIndex] = NULL;
+ Strings[UidStrIndex] = NULL;
+ Strings[CidStrIndex] = NULL;
+ CurrentLength = sizeof (ACPI_EXTENDED_HID_DEVICE_PATH);
+ CurrentPos = (CHAR8 *)(((UINT8 *)AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));
+ StrIndex = 0;
+ while (CurrentLength < AcpiEx->Header.Length[0] && StrIndex < ARRAY_SIZE (Strings)) {
+ Strings[StrIndex] = CurrentPos;
+ NextStringOffset = AsciiStrLen (CurrentPos) + 1;
+ CurrentLength += NextStringOffset;
+ CurrentPos += NextStringOffset;
+ StrIndex++;
+ }
if (DisplayOnly) {
if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A03) ||
((EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A03) && (EISA_ID_TO_NUM (AcpiEx->HID) != 0x0A08)))
{
- if (AcpiEx->UID == 0) {
- UefiDevicePathLibCatPrint (Str, "PciRoot(%s)", UIDStr);
+ if (Strings[UidStrIndex] != NULL) {
+ UefiDevicePathLibCatPrint (Str, "PciRoot(%s)", Strings[UidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "PciRoot(0x%x)", AcpiEx->UID);
}
@@ -503,8 +521,8 @@ DevPathToTextAcpiEx (
}
if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A08) || (EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A08)) {
- if (AcpiEx->UID == 0) {
- UefiDevicePathLibCatPrint (Str, "PcieRoot(%s)", UIDStr);
+ if (Strings[UidStrIndex] != NULL) {
+ UefiDevicePathLibCatPrint (Str, "PcieRoot(%s)", Strings[UidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "PcieRoot(0x%x)", AcpiEx->UID);
}
@@ -535,7 +553,10 @@ DevPathToTextAcpiEx (
(AcpiEx->CID >> 16) & 0xFFFF
);
- if ((*HIDStr == '\0') && (*CIDStr == '\0') && (*UIDStr != '\0')) {
+ if (((Strings[HidStrIndex] != NULL) && (*Strings[HidStrIndex] == '\0')) &&
+ ((Strings[CidStrIndex] != NULL) && (*Strings[CidStrIndex] == '\0')) &&
+ ((Strings[UidStrIndex] != NULL) && (*Strings[UidStrIndex] != '\0')))
+ {
//
// use AcpiExp()
//
@@ -544,7 +565,7 @@ DevPathToTextAcpiEx (
Str,
"AcpiExp(%s,0,%s)",
HIDText,
- UIDStr
+ Strings[UidStrIndex]
);
} else {
UefiDevicePathLibCatPrint (
@@ -552,28 +573,25 @@ DevPathToTextAcpiEx (
"AcpiExp(%s,%s,%s)",
HIDText,
CIDText,
- UIDStr
+ Strings[UidStrIndex]
);
}
} else {
if (DisplayOnly) {
- //
- // display only
- //
- if (AcpiEx->HID == 0) {
- UefiDevicePathLibCatPrint (Str, "AcpiEx(%s,", HIDStr);
+ if (Strings[HidStrIndex] != NULL) {
+ UefiDevicePathLibCatPrint (Str, "AcpiEx(%s,", Strings[HidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "AcpiEx(%s,", HIDText);
}
- if (AcpiEx->CID == 0) {
- UefiDevicePathLibCatPrint (Str, "%s,", CIDStr);
+ if (Strings[CidStrIndex] != NULL) {
+ UefiDevicePathLibCatPrint (Str, "%s,", Strings[CidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "%s,", CIDText);
}
- if (AcpiEx->UID == 0) {
- UefiDevicePathLibCatPrint (Str, "%s)", UIDStr);
+ if (Strings[UidStrIndex] != NULL) {
+ UefiDevicePathLibCatPrint (Str, "%s)", Strings[UidStrIndex]);
} else {
UefiDevicePathLibCatPrint (Str, "0x%x)", AcpiEx->UID);
}
@@ -584,9 +602,9 @@ DevPathToTextAcpiEx (
HIDText,
CIDText,
AcpiEx->UID,
- HIDStr,
- CIDStr,
- UIDStr
+ Strings[HidStrIndex] != NULL ? Strings[HidStrIndex] : '\0',
+ Strings[CidStrIndex] != NULL ? Strings[CidStrIndex] : '\0',
+ Strings[UidStrIndex] != NULL ? Strings[UidStrIndex] : '\0'
);
}
}
From nobody Fri Sep 6 20:53:41 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0pNr53qSz5Vy1b;
Fri, 06 Sep 2024 20:53:48 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0pNr32b8z43vb;
Fri, 6 Sep 2024 20:53:48 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from tom.home (kib@localhost [127.0.0.1] (may be forged))
by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 486KrfSp014035;
Fri, 6 Sep 2024 23:53:44 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 486KrfSp014035
Received: (from kostik@localhost)
by tom.home (8.18.1/8.18.1/Submit) id 486KrfOI014034;
Fri, 6 Sep 2024 23:53:41 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f
Date: Fri, 6 Sep 2024 23:53:41 +0300
From: Konstantin Belousov <kostikbel@gmail.com>
To: Warner Losh <imp@freebsd.org>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Subject: Re: git: 07d90ee0a621 - main - kvprintf(): Fix '+' conversion
handling
Message-ID: <Zttr1UzRKtHz_6o5@kib.kiev.ua>
References: <202409061835.486IZ9Fd010541@gitrepo.freebsd.org>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-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: <202409061835.486IZ9Fd010541@gitrepo.freebsd.org>
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,
NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1
X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]
X-Rspamd-Queue-Id: 4X0pNr32b8z43vb
On Fri, Sep 06, 2024 at 06:35:09PM +0000, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad
>
> commit 07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad
> Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
> AuthorDate: 2024-06-14 07:30:28 +0000
> Commit: Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-09-06 18:34:30 +0000
>
> kvprintf(): Fix '+' conversion handling
>
> For example, printf("%+i", 1) prints "+1". However, kvprintf() did
> print just "1" for this example. According to PRINTF(3):
>
> A sign must always be placed before a number produced by a signed
> conversion.
>
> For "%+r" radix conversions, keep the "+" handling as it is, since this
> is a non-standard conversion. For "%+p" pointer conversions, continue
> to ignore the sign modifier to be in line with libc.
>
> This change allows to support the ' conversion modifier in the future.
>
> Reviewed by: imp
> Pull Request: https://github.com/freebsd/freebsd-src/pull/1310
> ---
> sys/kern/subr_prf.c | 27 +++++++++++++--------------
> 1 file changed, 13 insertions(+), 14 deletions(-)
Again, isn't rtld_printf needs the same change?
From nobody Fri Sep 6 20:55:21 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0pQn42z6z5VyGt;
Fri, 06 Sep 2024 20:55:29 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0pQn0Stjz44Xl;
Fri, 6 Sep 2024 20:55:28 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from tom.home (kib@localhost [127.0.0.1] (may be forged))
by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 486KtLwx014113;
Fri, 6 Sep 2024 23:55:25 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 486KtLwx014113
Received: (from kostik@localhost)
by tom.home (8.18.1/8.18.1/Submit) id 486KtLI3014112;
Fri, 6 Sep 2024 23:55:21 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f
Date: Fri, 6 Sep 2024 23:55:21 +0300
From: Konstantin Belousov <kostikbel@gmail.com>
To: Warner Losh <imp@freebsd.org>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Subject: Re: git: 5d889e60c15c - main - amd64: move the right parenthesis to
the right place
Message-ID: <ZttsOYOKyRtSPY0c@kib.kiev.ua>
References: <202409061835.486IZJxv011127@gitrepo.freebsd.org>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-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: <202409061835.486IZJxv011127@gitrepo.freebsd.org>
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,
NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1
X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]
X-Rspamd-Queue-Id: 4X0pQn0Stjz44Xl
On Fri, Sep 06, 2024 at 06:35:19PM +0000, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=5d889e60c15ce7856cb9a9bc258dab8aaeb94efe
>
> commit 5d889e60c15ce7856cb9a9bc258dab8aaeb94efe
> Author: Wuyang Chung <wy-chung@outlook.com>
> AuthorDate: 2024-08-02 06:44:38 +0000
> Commit: Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-09-06 18:34:31 +0000
>
> amd64: move the right parenthesis to the right place
>
> Reviewed by: imp, emaste
> Pull Request: https://github.com/freebsd/freebsd-src/pull/1356
> ---
> sys/amd64/amd64/machdep.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
> index 025c3c365de5..f4b3b9702e00 100644
> --- a/sys/amd64/amd64/machdep.c
> +++ b/sys/amd64/amd64/machdep.c
> @@ -1382,7 +1382,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
> */
> for (x = 0; x < NGDT; x++) {
> if (x != GPROC0_SEL && x != (GPROC0_SEL + 1) &&
> - x != GUSERLDT_SEL && x != (GUSERLDT_SEL) + 1)
> + x != GUSERLDT_SEL && x != (GUSERLDT_SEL + 1))
> ssdtosd(&gdt_segs[x], &gdt[x]);
> }
> gdt_segs[GPROC0_SEL].ssd_base = (uintptr_t)&pc->pc_common_tss;
The moved parenthesis are not needed at all, and should be removed
according to style. Same for the () in the previous line.
From nobody Fri Sep 6 21:14:49 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0psL5Fdjz5W0Q9
for <dev-commits-src-main@mlmmj.nyi.freebsd.org>; Fri, 06 Sep 2024 21:15:02 +0000 (UTC)
(envelope-from wlosh@bsdimp.com)
Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a])
(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 4X0psL3NVDz46G5
for <dev-commits-src-main@freebsd.org>; Fri, 6 Sep 2024 21:15:02 +0000 (UTC)
(envelope-from wlosh@bsdimp.com)
Authentication-Results: mx1.freebsd.org;
none
Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2054e22ce3fso24499995ad.2
for <dev-commits-src-main@freebsd.org>; Fri, 06 Sep 2024 14:15:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1725657301; x=1726262101; darn=freebsd.org;
h=cc:to:subject:message-id:date:from:in-reply-to:references
:mime-version:from:to:cc:subject:date:message-id:reply-to;
bh=HzIzFTq9mDk4msVPgceO6acp7BBqMvQFAOj2TI3rMm0=;
b=TWPd0OjnaczrjLuae4AMRU4kBkDiGI5kv9Gtapdvz1bl0Kpp1PdPvbyVw2K//lrlLA
Gf+uFyelbjWPXaVwk2oUuzOeo0jkBH4h3uIxCyQaIZq2S1X1U8qWTqioH1ex9m7nNMuJ
ef3q5r35fAnsdvctZyekVg8HTzChVZiMkFmMInK7WhLJlKyJQDZ6sfQcDldBWkO/lpCT
NHibZWLPkXlXRVHOpD+ofQuQaOMeEc0O6SxJ+/H/SIZefY7pY7wrbvqZQ5w0RO8jWKy5
NtYrq+vdnYNk/QeXlWTdooeW+Cbm8LbfWpu4trXGi6Bl4IXUjMDYpSfNJZu0n9Iq7GZo
Ha5w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1725657301; x=1726262101;
h=cc:to:subject:message-id:date:from:in-reply-to:references
:mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=HzIzFTq9mDk4msVPgceO6acp7BBqMvQFAOj2TI3rMm0=;
b=EyLX1i/k4YPEIr/Qpyuia8/Dg91e0bm8z0W52OUNHs/2iH74uoolJhmvJes6j62G/T
123spYDOj3Torf2JI84WX6FamqKjyvwIpyeWgOpNWDyquc7YwSiIVT3s/mjAE8wWn7qj
FYYavoSwI/OwtoWaVcjz8aV9HQVF5qaPfOSohIW77cUgfXMc0qRR1ldgXWyQL9GXt8PO
NxvZ1ZpbI/VyZIjJJK71NeRcpqUzhSXI6y4Bb6PzaTEKBX5yOvSOoJyfd5+ScgXpbG/E
aWQ8ieC4ALTwu7ihwLwWChlb35hoNsChDINbK8EtgzvzUONBTDK+pEo8l6IXVypcU30v
EwXA==
X-Forwarded-Encrypted: i=1; AJvYcCWRDFYRk23YpNJUtMgbTNXWxaYXnMRcfSqYTgyGBoZy3QVhVa2RotMycrl1KthcPZx2DDJPoEAxuOnEksfw/3eSro1KYg==@freebsd.org
X-Gm-Message-State: AOJu0YxmG5RooOGk0ye8+5y7dmzv7zj9vC0raIjupaAN+URD/Gkd1unw
JQiLs0PoxDIRTBEXghX5cnlhCHyRi/L1R9dERJeEskE63BpO/CURlwLpNyHM4M0eTiUk2f9AYlS
ZY7MuahXHb0fJg/KwqFyLgD2SUa4e6SHUBty0bA==
X-Google-Smtp-Source: AGHT+IFUiiYiCI0xQiZJqVT65qJSjrYo4TD99r6QWO2KbKHq3W6i/wFkkHuOSRStiYFwyPTNkWdwOe5F3oXq+v71Ih0=
X-Received: by 2002:a17:90a:f493:b0:2da:5edd:c165 with SMTP id
98e67ed59e1d1-2dad50e8866mr4731925a91.30.1725657301017; Fri, 06 Sep 2024
14:15:01 -0700 (PDT)
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
References: <202409061835.486IZ9Fd010541@gitrepo.freebsd.org> <Zttr1UzRKtHz_6o5@kib.kiev.ua>
In-Reply-To: <Zttr1UzRKtHz_6o5@kib.kiev.ua>
From: Warner Losh <imp@bsdimp.com>
Date: Fri, 6 Sep 2024 15:14:49 -0600
Message-ID: <CANCZdfrrQ0eeHPU9qJdvin-daXphHBbExUiuLe0Wq1t_R0rtPg@mail.gmail.com>
Subject: Re: git: 07d90ee0a621 - main - kvprintf(): Fix '+' conversion handling
To: Konstantin Belousov <kostikbel@gmail.com>
Cc: Warner Losh <imp@freebsd.org>, src-committers@freebsd.org,
dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Content-Type: multipart/alternative; boundary="0000000000006e8382062179e610"
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]
X-Rspamd-Queue-Id: 4X0psL3NVDz46G5
--0000000000006e8382062179e610
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
On Fri, Sep 6, 2024 at 2:53=E2=80=AFPM Konstantin Belousov <kostikbel@gmail=
.com>
wrote:
> On Fri, Sep 06, 2024 at 06:35:09PM +0000, Warner Losh wrote:
> > The branch main has been updated by imp:
> >
> > URL:
> https://cgit.FreeBSD.org/src/commit/?id=3D07d90ee0a62110e5161bb0b8a3a0b1b=
9d2beabad
> >
> > commit 07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad
> > Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
> > AuthorDate: 2024-06-14 07:30:28 +0000
> > Commit: Warner Losh <imp@FreeBSD.org>
> > CommitDate: 2024-09-06 18:34:30 +0000
> >
> > kvprintf(): Fix '+' conversion handling
> >
> > For example, printf("%+i", 1) prints "+1". However, kvprintf() did
> > print just "1" for this example. According to PRINTF(3):
> >
> > A sign must always be placed before a number produced by a signed
> > conversion.
> >
> > For "%+r" radix conversions, keep the "+" handling as it is, since
> this
> > is a non-standard conversion. For "%+p" pointer conversions,
> continue
> > to ignore the sign modifier to be in line with libc.
> >
> > This change allows to support the ' conversion modifier in the
> future.
> >
> > Reviewed by: imp
> > Pull Request: https://github.com/freebsd/freebsd-src/pull/1310
> > ---
> > sys/kern/subr_prf.c | 27 +++++++++++++--------------
> > 1 file changed, 13 insertions(+), 14 deletions(-)
> Again, isn't rtld_printf needs the same change?
>
This time I don't think so. I'll double check though. I'd checked when this
came in. Thanks for the reminder.
--0000000000006e8382062179e610
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">=
<div dir=3D"ltr" class=3D"gmail_attr">On Fri, Sep 6, 2024 at 2:53=E2=80=AFP=
M Konstantin Belousov <<a href=3D"mailto:kostikbel@gmail.com">kostikbel@=
gmail.com</a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=
=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding=
-left:1ex">On Fri, Sep 06, 2024 at 06:35:09PM +0000, Warner Losh wrote:<br>
> The branch main has been updated by imp:<br>
> <br>
> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D07d90ee0a621=
10e5161bb0b8a3a0b1b9d2beabad" rel=3D"noreferrer" target=3D"_blank">https://=
cgit.FreeBSD.org/src/commit/?id=3D07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad<=
/a><br>
> <br>
> commit 07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad<br>
> Author:=C2=A0 =C2=A0 =C2=A0Sebastian Huber <<a href=3D"mailto:sebas=
tian.huber@embedded-brains.de" target=3D"_blank">sebastian.huber@embedded-b=
rains.de</a>><br>
> AuthorDate: 2024-06-14 07:30:28 +0000<br>
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br>
> CommitDate: 2024-09-06 18:34:30 +0000<br>
> <br>
>=C2=A0 =C2=A0 =C2=A0kvprintf(): Fix '+' conversion handling<br>
>=C2=A0 =C2=A0 =C2=A0<br>
>=C2=A0 =C2=A0 =C2=A0For example, printf("%+i", 1) prints &quo=
t;+1".=C2=A0 However, kvprintf() did<br>
>=C2=A0 =C2=A0 =C2=A0print just "1" for this example.=C2=A0 Ac=
cording to PRINTF(3):<br>
>=C2=A0 =C2=A0 =C2=A0<br>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0A sign must always be placed before a number=
produced by a signed<br>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0conversion.<br>
>=C2=A0 =C2=A0 =C2=A0<br>
>=C2=A0 =C2=A0 =C2=A0For "%+r" radix conversions, keep the &qu=
ot;+" handling as it is, since this<br>
>=C2=A0 =C2=A0 =C2=A0is a non-standard conversion.=C2=A0 For "%+p&q=
uot; pointer conversions, continue<br>
>=C2=A0 =C2=A0 =C2=A0to ignore the sign modifier to be in line with libc=
.<br>
>=C2=A0 =C2=A0 =C2=A0<br>
>=C2=A0 =C2=A0 =C2=A0This change allows to support the ' conversion =
modifier in the future.<br>
>=C2=A0 =C2=A0 =C2=A0<br>
>=C2=A0 =C2=A0 =C2=A0Reviewed by: imp<br>
>=C2=A0 =C2=A0 =C2=A0Pull Request: <a href=3D"https://github.com/freebsd=
/freebsd-src/pull/1310" rel=3D"noreferrer" target=3D"_blank">https://github=
.com/freebsd/freebsd-src/pull/1310</a><br>
> ---<br>
>=C2=A0 sys/kern/subr_prf.c | 27 +++++++++++++--------------<br>
>=C2=A0 1 file changed, 13 insertions(+), 14 deletions(-)<br>
Again, isn't rtld_printf needs the same change?<br></blockquote><div><b=
r></div><div>This time I don't think so. I'll double check though. =
I'd checked when this came in. Thanks for the reminder.=C2=A0</div></di=
v></div>
--0000000000006e8382062179e610--
From nobody Fri Sep 6 21:47:08 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0qZb3Gm2z5W3mt;
Fri, 06 Sep 2024 21:47:19 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4X0qZZ0zlZz4CmM;
Fri, 6 Sep 2024 21:47:18 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Authentication-Results: mx1.freebsd.org;
none
Received: from tom.home (kib@localhost [127.0.0.1] (may be forged))
by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 486Ll8BI016346;
Sat, 7 Sep 2024 00:47:11 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 486Ll8BI016346
Received: (from kostik@localhost)
by tom.home (8.18.1/8.18.1/Submit) id 486Ll80R016345;
Sat, 7 Sep 2024 00:47:08 +0300 (EEST)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f
Date: Sat, 7 Sep 2024 00:47:08 +0300
From: Konstantin Belousov <kostikbel@gmail.com>
To: Warner Losh <imp@bsdimp.com>
Cc: Warner Losh <imp@freebsd.org>, src-committers@freebsd.org,
dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject: Re: git: 07d90ee0a621 - main - kvprintf(): Fix '+' conversion
handling
Message-ID: <Ztt4XCQtc_MFcM4m@kib.kiev.ua>
References: <202409061835.486IZ9Fd010541@gitrepo.freebsd.org>
<Zttr1UzRKtHz_6o5@kib.kiev.ua>
<CANCZdfrrQ0eeHPU9qJdvin-daXphHBbExUiuLe0Wq1t_R0rtPg@mail.gmail.com>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CANCZdfrrQ0eeHPU9qJdvin-daXphHBbExUiuLe0Wq1t_R0rtPg@mail.gmail.com>
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,
NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1
X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]
X-Rspamd-Queue-Id: 4X0qZZ0zlZz4CmM
On Fri, Sep 06, 2024 at 03:14:49PM -0600, Warner Losh wrote:
> On Fri, Sep 6, 2024 at 2:53 PM Konstantin Belousov <kostikbel@gmail.com>
> wrote:
>
> > On Fri, Sep 06, 2024 at 06:35:09PM +0000, Warner Losh wrote:
> > > The branch main has been updated by imp:
> > >
> > > URL:
> > https://cgit.FreeBSD.org/src/commit/?id=07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad
> > >
> > > commit 07d90ee0a62110e5161bb0b8a3a0b1b9d2beabad
> > > Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
> > > AuthorDate: 2024-06-14 07:30:28 +0000
> > > Commit: Warner Losh <imp@FreeBSD.org>
> > > CommitDate: 2024-09-06 18:34:30 +0000
> > >
> > > kvprintf(): Fix '+' conversion handling
> > >
> > > For example, printf("%+i", 1) prints "+1". However, kvprintf() did
> > > print just "1" for this example. According to PRINTF(3):
> > >
> > > A sign must always be placed before a number produced by a signed
> > > conversion.
> > >
> > > For "%+r" radix conversions, keep the "+" handling as it is, since
> > this
> > > is a non-standard conversion. For "%+p" pointer conversions,
> > continue
> > > to ignore the sign modifier to be in line with libc.
> > >
> > > This change allows to support the ' conversion modifier in the
> > future.
> > >
> > > Reviewed by: imp
> > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1310
> > > ---
> > > sys/kern/subr_prf.c | 27 +++++++++++++--------------
> > > 1 file changed, 13 insertions(+), 14 deletions(-)
> > Again, isn't rtld_printf needs the same change?
> >
>
> This time I don't think so. I'll double check though. I'd checked when this
> came in. Thanks for the reminder.
It would be weird if not needed, rtld_printf.c was a copy of subr_prf.c.
From nobody Fri Sep 6 23:42:27 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0t7R64fqz5WFlT;
Fri, 06 Sep 2024 23:42: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 4X0t7R3sJJz4X4S;
Fri, 6 Sep 2024 23:42:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725666147;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=+W1sd+I0yn8+4KMARD5e1WUk5tS3lJao6YLTdQ8RDks=;
b=HJlMbJv/ljXg1Brh3hVMbARv5vbpH4aU2mBXOLRm/NVVR6rcdHL/QMxquaUjySDXF9QE3C
HOscxlbusF/zqKCIttZvAgAeX/9j2LYIrVu/rjToAwISvlJamwRs9kvphUnb9kS+VoX5A5
1FVdn5/RG24IAQOvVT4H+sAP4jOyEAqOhGsj0j3yR2ZePQRdggyA1ICm3waGKSm7VhpNdu
ZVDeQS0jUJ0IaGx/31eNcOQ8m1VwDPtXrlxNZz1T8434NimkmCKD3/15CTARmZZd/L4AhL
TnG7IIQUV+54RqEDdsjgAM/SzXJXpbyGXAT3vWBmC5X2nz69jhGCbeMrXIg6bg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725666147; a=rsa-sha256; cv=none;
b=Ol5BHV1SquhT2xloWK1zGK9F4U2prkjCSxWIOqmblX/q18guQ+0e2Bzmzv3SpMkoyL8Mxp
C4jcm9mrs2Cc0qklnRpZq1TGH1tEjF2kGHHNJqj2JnKaau1MGjxbc7xRFdk9P7WRuI+8lb
jBc52k8q4/4h9OScZWvAGXGePLd7FDFsw9Azvlik7sZe3wD9QuMk29SL61APjUfE8s3V40
JtrwIk+VeJHd0tn9Vz/a7UU2Ag1aZGMxZq0q9gOOslOgRBymQ+9gF9nunuNOxvWbXLC5UQ
U3nh8VMnfyQSSEQFzKzP9rygYtzAT8zVfh2MydpOg/QtoyeEnqyX8fMQJ8g1Bg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725666147;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=+W1sd+I0yn8+4KMARD5e1WUk5tS3lJao6YLTdQ8RDks=;
b=kMHIYPYYbghsbae9ruotJYaoabPsevdht7dxnPQ30TXGkuDxGmq92qhg4bK7Paz1HiB4Vk
woozmcKwtfF+uJ8mECKf6hlyKvog14fKW68EAzJd4VB0xkrXEp3Z9OU8E3DuKdCxN4575f
FtkjIkMZMyQSLACFU0xnVrqhGxhvKnmO+M9GIu/XfMqvLYRZJX16JEVMOrfnylzy0UxuAd
JopliyGGTXXYR0+Ll4yMicqOYP1H7AQcgb+L8+JsaRe927xkoc7jk9bFqnhljUqRkfBLCg
oj9gHGUkqhvkJXvjbbupnlh2njBTxgplcb0L8U+9DGaHqP46kYyVrtNDng9VfQ==
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 4X0t7R3TJZz1BWm;
Fri, 6 Sep 2024 23:42: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 486NgR3F038266;
Fri, 6 Sep 2024 23:42:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 486NgR7O038243;
Fri, 6 Sep 2024 23:42:27 GMT
(envelope-from git)
Date: Fri, 6 Sep 2024 23:42:27 GMT
Message-Id: <202409062342.486NgR7O038243@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Rick Macklem <rmacklem@FreeBSD.org>
Subject: git: 3df987c99d11 - main - mountd: Add check for "=" after
exports(5) options
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 3df987c99d1194a0e43a84853e934aa0c0ab09db
Auto-Submitted: auto-generated
The branch main has been updated by rmacklem:
URL: https://cgit.FreeBSD.org/src/commit/?id=3df987c99d1194a0e43a84853e934aa0c0ab09db
commit 3df987c99d1194a0e43a84853e934aa0c0ab09db
Author: Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2024-09-06 23:41:12 +0000
Commit: Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2024-09-06 23:41:12 +0000
mountd: Add check for "=" after exports(5) options
Some exports(5) options take a "=arg" component that provides an
argument value for the option. Others do not.
Without this patch, if "=arg" was provided for an option that did
not take an argument value, the "=arg" was simply ignored.
This could result in confusion w.r.t. what was being exported,
as noted by the Problem Report.
This patch adds a check for "=arg" for the options that do not
take an argument value and fails the exports line if one is found.
PR: 281003
MFC after: 2 weeks
---
usr.sbin/mountd/mountd.c | 44 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 40 insertions(+), 4 deletions(-)
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index 00293909614e..00309ed58136 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -2825,7 +2825,7 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
{
char *cpoptarg, *cpoptend;
char *cp, *endcp, *cpopt, savedc, savedc2;
- int allflag, usedarg;
+ int allflag, usedarg, fnd_equal;
savedc2 = '\0';
cpopt = *cpp;
@@ -2836,14 +2836,18 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
while (cpopt && *cpopt) {
allflag = 1;
usedarg = -2;
+ fnd_equal = 0;
if ((cpoptend = strchr(cpopt, ','))) {
*cpoptend++ = '\0';
- if ((cpoptarg = strchr(cpopt, '=')))
+ if ((cpoptarg = strchr(cpopt, '='))) {
*cpoptarg++ = '\0';
+ fnd_equal = 1;
+ }
} else {
- if ((cpoptarg = strchr(cpopt, '=')))
+ if ((cpoptarg = strchr(cpopt, '='))) {
*cpoptarg++ = '\0';
- else {
+ fnd_equal = 1;
+ } else {
*cp = savedc;
nextfield(&cp, &endcp);
**endcpp = '\0';
@@ -2856,6 +2860,10 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
}
}
if (!strcmp(cpopt, "ro") || !strcmp(cpopt, "o")) {
+ if (fnd_equal == 1) {
+ syslog(LOG_ERR, "= after op: %s", cpopt);
+ return (1);
+ }
*exflagsp |= MNT_EXRDONLY;
} else if (cpoptarg && (!strcmp(cpopt, "maproot") ||
!(allflag = strcmp(cpopt, "mapall")) ||
@@ -2894,15 +2902,31 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
usedarg++;
opt_flags |= OP_NET;
} else if (!strcmp(cpopt, "alldirs")) {
+ if (fnd_equal == 1) {
+ syslog(LOG_ERR, "= after op: %s", cpopt);
+ return (1);
+ }
opt_flags |= OP_ALLDIRS;
} else if (!strcmp(cpopt, "public")) {
+ if (fnd_equal == 1) {
+ syslog(LOG_ERR, "= after op: %s", cpopt);
+ return (1);
+ }
*exflagsp |= MNT_EXPUBLIC;
} else if (!strcmp(cpopt, "webnfs")) {
+ if (fnd_equal == 1) {
+ syslog(LOG_ERR, "= after op: %s", cpopt);
+ return (1);
+ }
*exflagsp |= (MNT_EXPUBLIC|MNT_EXRDONLY|MNT_EXPORTANON);
opt_flags |= OP_MAPALL;
} else if (cpoptarg && !strcmp(cpopt, "index")) {
ep->ex_indexfile = strdup(cpoptarg);
} else if (!strcmp(cpopt, "quiet")) {
+ if (fnd_equal == 1) {
+ syslog(LOG_ERR, "= after op: %s", cpopt);
+ return (1);
+ }
opt_flags |= OP_QUIET;
} else if (cpoptarg && !strcmp(cpopt, "sec")) {
if (parsesec(cpoptarg, ep))
@@ -2910,10 +2934,22 @@ do_opt(char **cpp, char **endcpp, struct exportlist *ep, struct grouplist *grp,
opt_flags |= OP_SEC;
usedarg++;
} else if (!strcmp(cpopt, "tls")) {
+ if (fnd_equal == 1) {
+ syslog(LOG_ERR, "= after op: %s", cpopt);
+ return (1);
+ }
*exflagsp |= MNT_EXTLS;
} else if (!strcmp(cpopt, "tlscert")) {
+ if (fnd_equal == 1) {
+ syslog(LOG_ERR, "= after op: %s", cpopt);
+ return (1);
+ }
*exflagsp |= (MNT_EXTLS | MNT_EXTLSCERT);
} else if (!strcmp(cpopt, "tlscertuser")) {
+ if (fnd_equal == 1) {
+ syslog(LOG_ERR, "= after op: %s", cpopt);
+ return (1);
+ }
*exflagsp |= (MNT_EXTLS | MNT_EXTLSCERT |
MNT_EXTLSCERTUSER);
} else {
From nobody Sat Sep 7 02:18:09 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X0xb60wY2z5WW8L;
Sat, 07 Sep 2024 02:18: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 4X0xb60MR0z4rfx;
Sat, 7 Sep 2024 02:18:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725675490;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=zMbaUpBtGj1vVhAwTL6Al6g9yLAbsTdW26RDO5W5dXk=;
b=iBR8iZImNIQ4Zj5mE5I0xF2pwdbOps7GWKOSWMtgijaVvP7Jtj2EfG0QtcWw6RVNLlS+bL
J91brFzJgFkTmGd9SssMKiji9cZi4Gmxrr2LI+01EQBysRfKZ2n9y8+8gBPTu9Zc0+qwEQ
XxfOumnVMJi5f7KUk2rVUZCuDcAe/q1SCqskfQPkmc8t9PJTWg5Jli84dPk7bcc1VGpTGw
MOKRgAhjKiqKE9jdXYSBgCnbXXSMFQwBW+6b4CjS87SVh4GE/FLUe5qHy0mZW22/6S+sJD
0qtDvsB6S70L4pwPVzfxxpohZGmF7c0xUW8MgJfoAXMYuA24pEbBrA4p1aXuaA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725675490; a=rsa-sha256; cv=none;
b=vTLlhojPuQEKHuRxaARtfzydoa1c9GENwoZMGKNlEuO5+b7pK6cGFKvdP2QudaCr0z//qB
zrQdUqDyxl2/APzXz41X53zmSmjND/hb0WhaTezj605Xp0egfqnsMpbjqFsXYE14Ja/Y5u
cT2o43MTJMWHFnWBCpolYmQBsFxZhkXVHgikdbAacemn5wgSJAzcEl2oiNq1yyIoDeQRcp
SMMN33FV5qg4ht2WmsCn1+0VhQmFPF62gXBiyEF9SaRq9o53sdlWAY1N3nJ0CakAxIKMib
cXzZjCFrxTheoy7j8e7scJVxuWz9IrZQcGvZoxwlExhF5zJvjyy9rRORebYUGw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725675490;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=zMbaUpBtGj1vVhAwTL6Al6g9yLAbsTdW26RDO5W5dXk=;
b=MYlbMYH0DnQYsD3gr4M2DWKmlmwyOwpzM7+PZcvHW1tBRlN4Keq6BtbOLdaGSMhGnIppse
T7to2r0b1MLgwhKFRejV1S8nOeZLmXG9+qGB+im992boCml0gsF9FLQa4WU7cDaLhoKBm5
1fyKfa5UClkcbf7GZFXcds1EkPMjyxj6iyLyFDlqbZcJH+4e98MpA3wQ4pTRdDJ8zNLUnZ
gsYQVGfQpk+tpQQ9xTS2dbQeN8ebAdar3E8Rr7MVjR6UmK6dDPd3f+04h4VEyuh8nOAfn2
hpZdhm5q0NVZ/3iYXrIa2gL7UENWQaqKfDMAk3FThGKxElalG8ou/QaEdxoxjw==
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 4X0xb5725gzGkJ;
Sat, 7 Sep 2024 02:18:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4872I9B1093829;
Sat, 7 Sep 2024 02:18:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4872I9nh093826;
Sat, 7 Sep 2024 02:18:09 GMT
(envelope-from git)
Date: Sat, 7 Sep 2024 02:18:09 GMT
Message-Id: <202409070218.4872I9nh093826@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Eugene Grosbein <eugen@FreeBSD.org>
Subject: git: 7a6309fdc794 - main - fetch(1): suppress "Not Modified"
in quiet mode
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: eugen
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 7a6309fdc79427b0a7a5c3876daba150d946ae22
Auto-Submitted: auto-generated
The branch main has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=7a6309fdc79427b0a7a5c3876daba150d946ae22
commit 7a6309fdc79427b0a7a5c3876daba150d946ae22
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2024-09-07 02:14:23 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2024-09-07 02:14:23 +0000
fetch(1): suppress "Not Modified" in quiet mode
"fetch -qi" should skip printing "Not Modified" for successful
http(s) request. Still print it by default (v_level == 1).
MFC after: 1 week
---
usr.bin/fetch/fetch.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index 05c0211ead49..8b3ccbd3ab98 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -582,16 +582,17 @@ again:
if (sigalrm || sigint)
goto signal;
if (f == NULL) {
- warnx("%s: %s", URL, fetchLastErrString);
- if (i_flag && (strcmp(url->scheme, SCHEME_HTTP) == 0 ||
- strcmp(url->scheme, SCHEME_HTTPS) == 0) &&
- fetchLastErrCode == FETCH_OK &&
+ if (i_flag && *is_http && fetchLastErrCode == FETCH_OK &&
strcmp(fetchLastErrString, "Not Modified") == 0) {
/* HTTP Not Modified Response, return OK. */
+ if (v_level > 0)
+ warnx("%s: %s", URL, fetchLastErrString);
r = 0;
goto done;
- } else
+ } else {
+ warnx("%s: %s", URL, fetchLastErrString);
goto failure;
+ }
}
if (sigint)
goto signal;
From nobody Sat Sep 7 11:31:36 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X19sh5rh9z5VXCm;
Sat, 07 Sep 2024 11:31:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X19sh5MnJz4l3h;
Sat, 7 Sep 2024 11: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=1725708696;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=dtBkrMKcKPNanB5NobYpyiLnf5bLlnqsRChUVWv4riU=;
b=Wm/XBBsnYx9wSj/uHFMgJSR+ljzoFr/oa4SBDseqp/NCnyYHWbZ7ZdOnsCEmHP9Kyl9Okg
i+onOtnvQ6mdrqhkU673/VTFDCTywEKCkHBeNz0NnLZ/x3+HrgMqARU8Vyph/AMuF+O5co
sBK/vMj98PCJprZ18/82JBnTPdVPGUnFVRkJufCpUYtP5Gry9zY85dn/nXGNxcPk8Lf7VE
lVSjpCbcYg5YYorvnl2n4vGcDA+pWdvaLHd3qjJibeG/PGXWJjHoOJBZQxyettVrIj26zY
CzGvzmdAOJN6c3D93O6u6KGREMzr+Amje/PyKDkSyLECKTUGf4bWJz4712MgHA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725708696; a=rsa-sha256; cv=none;
b=f7KNigi0ISE/P6W9lCcq324XSCQpw+4g4Qm/tY28yNnqCXffoWE/+BRG4em2XV87boMWJe
k6aok8OHDUcSayCuNGqUvtVaLi/LdoQat2VHhJUrgT5CCTBq/tLc3FQpV3jZZIf5maQBO5
5DHno/PPRiI8TnaAmY1Ph+YZkHA5lXq96bdxxZ1QFZQXEbPhpMqLN90M3FQGjlgmZ9SO/E
UR1lesF/Qs+SSPxT1nJa+NNtYc6tiqSJQqSMBsrvVvLjDK1Kie/sHagIB+2jmNtc/2pe7R
aidWEggqhd/fSV6vmpmZZqORnMy2GIMCzAI6xxzm6gq0pC7zo6771IQwZOi6bQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725708696;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=dtBkrMKcKPNanB5NobYpyiLnf5bLlnqsRChUVWv4riU=;
b=kdvsAondYFnfUUH74F0vBZw8gkFOoE/6D1HnQlBevVbhBcnZyRFCanzC9OwI+/GKkjOW6z
v0/U04GPmKfjgRSK0Eg+crvlITpSblUphsTqdMsuQ4CxHmIBoj2qSG5ogfeN2PN+HOKoF9
dQmsTaqrDJDG6OgFl3DK3VIgTupJ1cZ+EjABUfJj4UBf1INDGAWUXr4s1MiCYfwtActfSQ
GqN9EMGtNHf0csYn4eY2Slca8l7dxlT9QV0AckPXg698iWI5efu2Mq9BesZqwGbSNIYK7a
I9h08k9x7Gykfs3b3qF+1K/qk35eW3oGLqJvXpfcKIKYGqBmo0epqwWl13ly8Q==
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 4X19sh4zQnzZM6;
Sat, 7 Sep 2024 11: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 487BVaK8042104;
Sat, 7 Sep 2024 11: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 487BVaDL042101;
Sat, 7 Sep 2024 11:31:36 GMT
(envelope-from git)
Date: Sat, 7 Sep 2024 11:31:36 GMT
Message-Id: <202409071131.487BVaDL042101@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: 5daafa2c2301 - main - flua: fix buildworld from a
clean room
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 5daafa2c2301ad6d5ee0ade9a31ac2c463694a21
Auto-Submitted: auto-generated
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=5daafa2c2301ad6d5ee0ade9a31ac2c463694a21
commit 5daafa2c2301ad6d5ee0ade9a31ac2c463694a21
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-09-07 11:25:43 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-09-07 11:25:43 +0000
flua: fix buildworld from a clean room
now that the flua ucl module is built the lib directory, it is being
build at a moment where it cannot link yet to libucl, push libucl in
the _prebuild_libs to ensure it is present in a path to be linked
against at the time the lua ucl module is being built.
While here, remove libucl from boostrap as a dependence of flua as it is
not needed anymore now that flua ucl module is dynamically loadable.
---
Makefile.inc1 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index a4e2889004b7..edff60cc17ac 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2513,8 +2513,8 @@ ${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend}
# 13.0-CURRENT cycle, thus needs to be built on -older releases and stable
# branches.
.if ${BOOTSTRAPPING} < 1300059
-${_bt}-libexec/flua: ${_bt}-lib/liblua ${_bt}-lib/libucl
-_flua= lib/liblua lib/libucl libexec/flua
+${_bt}-libexec/flua: ${_bt}-lib/liblua
+_flua= lib/liblua libexec/flua
.endif
# r245440 mtree -N support added
@@ -3236,7 +3236,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
lib/libxo \
${_secure_lib_libcrypto} ${_secure_lib_libssl} \
- ${_lib_libldns} ${_secure_lib_libssh}
+ ${_lib_libldns} ${_secure_lib_libssh} \
+ lib/libucl
.if ${MK_DIALOG} != "no"
_prebuild_libs+= gnu/lib/libdialog
From nobody Sat Sep 7 12:24:01 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1C2949rtz5V9M1;
Sat, 07 Sep 2024 12:24:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X1C293gL1z4r0m;
Sat, 7 Sep 2024 12:24:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725711841;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ISXM6/CCqypMTmzfqQ+tqTDNsYPuFa3/QHcB9MTz4E4=;
b=pY16KuMBtitsDKWOf7jmK67NTHZJbM80h3WSfOqC04wl9dgeouS0hCi1EkdwADSY/gEjaR
dH+RelaJJQBklZ3//6ZsrFr5XEHWxA7OojVdffdBgDfajomOjXQWP9nxyJ4ptc/PiMkyOk
3DVU+ydeN3nr/OapcxehqPV1Knox1Ec4PIEo66/05WZducBdsOK0sY1u15HgYLsEyZQWk/
ZwmMiKf4Huxj1OmCiix1CG5wh2aVcSKT87GbyOoIlp8vLrQdYzRyGyxBFPVfR3nR5U5Ab7
gHyF0RuYh+DM7FH0HBo+y8zNj/mNOhxipHC61sgtHCuC27pwq6sPIiEjmvQfMw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725711841; a=rsa-sha256; cv=none;
b=HLJJyCqIpRRLeOnAXWr4GkbwdCWY/4qE+cqmXa2RkEW5C7E8VGqhEJDz+pSVrCzJY/pbzi
2ffFmVd4AAPu8Q53mm0hYy2BQ5OqyDbcRs5gPntnYmNlr9RMrAJxRdy+Hx+gfODx9Zevm3
iwwtOqe1cQzcQ9qM+XLR5iHaDf/35xcSFzZwcPLStenf5jsII1QCBP7m8hFaeElmFv28Ie
v5ZSgzxJ4DBL0okFUjmWmvqprk3+YtUoFNjAECWQNlLn/6iOYotL59GGChhPGPt7hq3BMT
Jv8G2IqfPZcA7S9nFDDx9K6zYcEeREymHiKv4ocHHr8KhYh6+Iyr0BsfPc7ZZQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725711841;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=ISXM6/CCqypMTmzfqQ+tqTDNsYPuFa3/QHcB9MTz4E4=;
b=lL/3mGY1e8fTDgPZFk+ZFelsq6aJ80xoqO5Gm6n6qqw4X4qVb/wnI3tg45HETrnAMNvt0w
LUTOdPm5ZA31q9Pm0D/bCStKGEO8iOJeyHVVC6DwlIRIVNZ/88palm0hjo1SofmqbDHQDS
zrQqibDssc9lJor/6okSnMhz8B8MR7xF/sN/GPJmy2GU+b9fiEqDCGbt99Uav4Sd0qBfiH
v48amANVDHVvDTuB261nyK5BJ84Es1avwXzNJqVvxvj8vsRWbLuYI9xe1YSqSE8/DyV7UX
XQ2k7xLE7CwxvFYE6b51KroO/c0+zzT0ixnE7Y9xlPHD2EOFIWjIGyZPvdoPvQ==
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 4X1C2930GRzbXb;
Sat, 7 Sep 2024 12:24: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 487CO1ih029671;
Sat, 7 Sep 2024 12:24:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 487CO19b029668;
Sat, 7 Sep 2024 12:24:01 GMT
(envelope-from git)
Date: Sat, 7 Sep 2024 12:24:01 GMT
Message-Id: <202409071224.487CO19b029668@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: 9f0f4e23a584 - main - prebuild_libs: register libucl
dependency on libm
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 9f0f4e23a584b5aa965aae774bb2dc1e5892d24a
Auto-Submitted: auto-generated
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=9f0f4e23a584b5aa965aae774bb2dc1e5892d24a
commit 9f0f4e23a584b5aa965aae774bb2dc1e5892d24a
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-09-07 12:19:33 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-09-07 12:20:47 +0000
prebuild_libs: register libucl dependency on libm
Reported by: Rainer Hurling <rhurlin@gwdg.de>
---
Makefile.inc1 | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.inc1 b/Makefile.inc1
index edff60cc17ac..ec1db75234b2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3292,6 +3292,7 @@ _generic_libs+= ${_DIR}
lib/libtacplus__L: lib/libmd__L lib/libpam/libpam__L
lib/libxo__L: lib/libutil__L
+lib/libucl__L: lib/msun__L
.if ${MK_CDDL} != "no"
_cddl_lib_libumem= cddl/lib/libumem
From nobody Sat Sep 7 13:46:30 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1DsL3lgQz5VNdR;
Sat, 07 Sep 2024 13:46: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 4X1DsL3XTCz43QZ;
Sat, 7 Sep 2024 13:46:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725716790;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=qtAEj7MGblLhZA3eZ75jqyotl1wuFHYySQJjwR3HbCw=;
b=Bwj5YNZ3Syhavxd5YI1FDnVFdrJSsQeCuI41m9BaFeTEaApqQsPsZkeToANEnKeziowtDJ
IVP4QAd45FsTpaM/Gj94a3hXWBy5/yd8kjYy6YcXkmWvcv5ihrUNI/wKLvBrkHbPUXTeYB
evfoZKAnWhybSqDQCR1sUp+hVchTlKePF3KTisCVhhIcSh19yzCMViDJvYKDcd2kyhS6nr
JlObYz0gXc3eNuiIqIxLJyznC2Z/NHosdWSBPS+BSFqzsOgROQj2UdL6wqOG2nv5aqJgS2
OzKhnAWpaVvaYGPMFaENK7F6jmq1YH/dwDJdjtbvG77SXugJsxJnsXWcA9mPVA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725716790; a=rsa-sha256; cv=none;
b=hTKO9D/IOlebSvwA28t1j0KZTdmWCI4pMUtBBNQ7NH4M5socpN6W0f/beDQIkCpQNNMB4A
L3NFDHomJU9q3lFe739NOR2zYv5zeMFsfv4Fojd39BueToh7WRrVH7ksA6jJ69fa21vA8I
juJyyTsoTf7JV+cBWjwdbWYZZ4iAtqhUc7pQEbFkoNq2KpitlEJvOGLlDtlBSATxamuF5x
XAr+8e2acKMnTQ3wVoIcstRW+O6tmBkZO9xqn6AzQXE/UCfMP6/IiNcvwPX0l3d4fI+2g/
vctESmOTdbecMZ3oi8kCGvkViIEU4tgBwnOksVXY2Da+b9u5Ba2aT7eP5KAzMQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725716790;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=qtAEj7MGblLhZA3eZ75jqyotl1wuFHYySQJjwR3HbCw=;
b=YY9ufXVufu5W/9J9JbMdHl7e60tvwCzgc4Ob/3HgUN8b7cE5j46q1On0qHf63IpGpq/Cpe
jRBB7jqXcgsnbP6bYA+SlZZZNsHFfW3zPEBlvZ301vIkjk4zKLAyJ8q/JP35ckVeOIKrjC
zw94brjAOcYqfoUBEFyVvwwjQp7+rZMtdMhbgE5dY7ER+hRv1orAwJTZC2P74Akw/PTVk+
+7gUSMl1Ufr9fV0UDlVdWJ27Jy5oM1gt8Pr/UVETgj5kAmgr67awCRIrC3woHZvxc1674K
uELTpePkq+IZPWDHztZCqUONFT3c1KEQ18oQdXpyg0VP/ijaM5VPeC5UAseGmg==
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 4X1DsL30vjzdGt;
Sat, 7 Sep 2024 13:46: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 487DkUJx065146;
Sat, 7 Sep 2024 13:46:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 487DkUw6065143;
Sat, 7 Sep 2024 13:46:30 GMT
(envelope-from git)
Date: Sat, 7 Sep 2024 13:46:30 GMT
Message-Id: <202409071346.487DkUw6065143@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?= <des@FreeBSD.org>
Subject: git: a979394afeb5 - main - Update tzcode to 2024b.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a979394afeb5c20fc58c5f5b005d51eb8f92f666
Auto-Submitted: auto-generated
The branch main has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=a979394afeb5c20fc58c5f5b005d51eb8f92f666
commit a979394afeb5c20fc58c5f5b005d51eb8f92f666
Merge: 9f0f4e23a584 e66ca70de4da
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-09-07 13:46:13 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2024-09-07 13:46:13 +0000
Update tzcode to 2024b.
MFC after: 3 weeks
Sponsored by: Klara, Inc.
Reviewed by: philip
Differential Revision: https://reviews.freebsd.org/D46565
contrib/tzcode/CONTRIBUTING | 18 +-
contrib/tzcode/Makefile | 412 +++++++++++++++++++++++--------------------
contrib/tzcode/NEWS | 124 ++++++++++++-
contrib/tzcode/asctime.c | 19 +-
contrib/tzcode/localtime.c | 87 ++-------
contrib/tzcode/newctime.3 | 102 ++++++-----
contrib/tzcode/newstrftime.3 | 30 ++--
contrib/tzcode/newtzset.3 | 66 +++++--
contrib/tzcode/private.h | 114 +++++++-----
contrib/tzcode/theory.html | 214 ++++++++++++++--------
contrib/tzcode/tz-art.html | 5 +
contrib/tzcode/tz-link.html | 113 +++++++-----
contrib/tzcode/tzfile.5 | 38 ++--
contrib/tzcode/tzfile.h | 8 +-
contrib/tzcode/tzselect.ksh | 125 ++++++-------
contrib/tzcode/version | 2 +-
contrib/tzcode/workman.sh | 3 +-
contrib/tzcode/zdump.c | 10 +-
contrib/tzcode/zic.8 | 52 +++---
contrib/tzcode/zic.c | 31 ++--
20 files changed, 926 insertions(+), 647 deletions(-)
diff --cc contrib/tzcode/Makefile
index d48354c72df4,000000000000..0087b4596515
mode 100644,000000..100644
--- a/contrib/tzcode/Makefile
+++ b/contrib/tzcode/Makefile
@@@ -1,1361 -1,0 +1,1381 @@@
+# Make and install tzdb code and data.
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+# Request POSIX conformance; this must be the first non-comment line.
+.POSIX:
- # On older platforms you may need to scrounge for a POSIX-conforming 'make'.
- # For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or
- # /usr/xpg4/bin/make, not /usr/ccs/bin/make.
++# On older platforms you may need to scrounge for POSIX conformance.
++# For example, on Solaris 10 (2005) with Sun Studio 12 aka Sun C 5.9 (2007),
++# use 'PATH=/usr/xpg4/bin:$PATH make CC=c99'.
+
+# To affect how this Makefile works, you can run a shell script like this:
+#
+# #!/bin/sh
- # make CC='gcc -std=gnu11' "$@"
++# make CC='gcc -std=gnu23' "$@"
+#
- # This example script is appropriate for a pre-2017 GNU/Linux system
- # where a non-default setting is needed to support this package's use of C99.
++# This example script is appropriate for a circa 2024 GNU/Linux system
++# where a non-default setting enables this package's optional use of C23.
+#
+# Alternatively, you can simply edit this Makefile to tailor the following
+# macro definitions.
+
+###############################################################################
+# Start of macros that one plausibly might want to tailor.
+
+# Package name for the code distribution.
+PACKAGE= tzcode
+
+# Version number for the distribution, overridden in the 'tarballs' rule below.
+VERSION= unknown
+
+# Email address for bug reports.
+BUGEMAIL= tz@iana.org
+
+# DATAFORM selects the data format.
+# Available formats represent essentially the same data, albeit
+# possibly with minor discrepancies that users are not likely to notice.
+# To get new features and the best data right away, use:
+# DATAFORM= vanguard
+# To wait a while before using new features, to give downstream users
+# time to upgrade zic (the default), use:
+# DATAFORM= main
+# To wait even longer for new features, use:
+# DATAFORM= rearguard
+# Rearguard users might also want "ZFLAGS = -b fat"; see below.
+DATAFORM= main
+
+# Change the line below for your timezone (after finding the one you want in
+# one of the $(TDATA) source files, or adding it to a source file).
+# Alternatively, if you discover you've got the wrong timezone, you can just
+# 'zic -l -' to remove it, or 'zic -l rightzone' to change it.
+# Use the command
+# make zonenames
+# to get a list of the values you can use for LOCALTIME.
+
+LOCALTIME= Factory
+
- # The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ
++# The POSIXRULES macro controls interpretation of POSIX-like TZ
+# settings like TZ='EET-2EEST' that lack DST transition rules.
+# If POSIXRULES is '-', no template is installed; this is the default.
+# Any other value for POSIXRULES is obsolete and should not be relied on, as:
+# * It does not work correctly in popular implementations such as GNU/Linux.
+# * It does not work even in tzcode, except for historical timestamps
+# that precede the last explicit transition in the POSIXRULES file.
+# Hence it typically does not work for current and future timestamps.
+# If, despite the above, you want a template for handling these settings,
+# you can change the line below (after finding the timezone you want in the
+# one of the $(TDATA) source files, or adding it to a source file).
+# Alternatively, if you discover you've got the wrong timezone, you can just
+# 'zic -p -' to remove it, or 'zic -p rightzone' to change it.
+# Use the command
+# make zonenames
+# to get a list of the values you can use for POSIXRULES.
+
+POSIXRULES= -
+
+# Also see TZDEFRULESTRING below, which takes effect only
+# if POSIXRULES is '-' or if the template file cannot be accessed.
+
+
+# Installation locations.
+#
+# The defaults are suitable for Debian, except that if REDO is
+# posix_right or right_posix then files that Debian puts under
+# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
+# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
+# respectively. Problems with the Debian approach are discussed in
+# the commentary for the right_posix rule (below).
+
+# Destination directory, which can be used for staging.
+# 'make DESTDIR=/stage install' installs under /stage (e.g., to
+# /stage/etc/localtime instead of to /etc/localtime). Files under
+# /stage are not intended to work as-is, but can be copied by hand to
+# the root directory later. If DESTDIR is empty, 'make install' does
+# not stage, but installs directly into production locations.
+DESTDIR =
+
+# Everything is installed into subdirectories of TOPDIR, and used there.
+# TOPDIR should be empty (meaning the root directory),
+# or a directory name that does not end in "/".
+# TOPDIR should be empty or an absolute name unless you're just testing.
+TOPDIR =
+
+# The default local timezone is taken from the file TZDEFAULT.
+TZDEFAULT = $(TOPDIR)/etc/localtime
+
+# The subdirectory containing installed program and data files, and
+# likewise for installed files that can be shared among architectures.
+# These should be relative file names.
+USRDIR = usr
+USRSHAREDIR = $(USRDIR)/share
+
+# "Compiled" timezone information is placed in the "TZDIR" directory
+# (and subdirectories).
+# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
+TZDIR_BASENAME= zoneinfo
+TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
+
+# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
+BINDIR = $(TOPDIR)/$(USRDIR)/bin
+
+# The "zdump" command goes in:
+ZDUMPDIR = $(BINDIR)
+
+# The "zic" command goes in:
+ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
+
+# Manual pages go in subdirectories of. . .
+MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
+
+# Library functions are put in an archive in LIBDIR.
+LIBDIR = $(TOPDIR)/$(USRDIR)/lib
+
+
+# Types to try, as an alternative to time_t.
+TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL)
- TIME_T_ALTERNATIVES_HEAD = int_least64_t
- TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t
++TIME_T_ALTERNATIVES_HEAD = int_least64_t.ck
++TIME_T_ALTERNATIVES_TAIL = int_least32_t.ck uint_least32_t.ck \
++ uint_least64_t.ck
+
+# What kind of TZif data files to generate. (TZif is the binary time
+# zone data format that zic generates; see Internet RFC 8536.)
+# If you want only POSIX time, with time values interpreted as
+# seconds since the epoch (not counting leap seconds), use
+# REDO= posix_only
+# below. If you want only "right" time, with values interpreted
+# as seconds since the epoch (counting leap seconds), use
+# REDO= right_only
+# below. If you want both sets of data available, with leap seconds not
+# counted normally, use
+# REDO= posix_right
+# below. If you want both sets of data available, with leap seconds counted
+# normally, use
+# REDO= right_posix
+# below. POSIX mandates that leap seconds not be counted; for compatibility
+# with it, use "posix_only" or "posix_right". Use POSIX time on systems with
+# leap smearing; this can work better than unsmeared "right" time with
+# applications that are not leap second aware, and is closer to unsmeared
+# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error).
+
+REDO= posix_right
+
+# Whether to put an "Expires" line in the leapseconds file.
+# Use EXPIRES_LINE=1 to put the line in, 0 to omit it.
+# The EXPIRES_LINE value matters only if REDO's value contains "right".
+# If you change EXPIRES_LINE, remove the leapseconds file before running "make".
+# zic's support for the Expires line was introduced in tzdb 2020a,
+# and was modified in tzdb 2021b to generate version 4 TZif files.
+# EXPIRES_LINE defaults to 0 for now so that the leapseconds file
+# can be given to pre-2020a zic implementations and so that TZif files
+# built by newer zic implementations can be read by pre-2021b libraries.
+EXPIRES_LINE= 0
+
+# To install data in text form that has all the information of the TZif data,
+# (optionally incorporating leap second information), use
+# TZDATA_TEXT= tzdata.zi leapseconds
+# To install text data without leap second information (e.g., because
+# REDO='posix_only'), use
+# TZDATA_TEXT= tzdata.zi
+# To avoid installing text data, use
+# TZDATA_TEXT=
+
+TZDATA_TEXT= leapseconds tzdata.zi
+
+# For backward-compatibility links for old zone names, use
+# BACKWARD= backward
+# To omit these links, use
+# BACKWARD=
+
+BACKWARD= backward
+
+# If you want out-of-scope and often-wrong data from the file 'backzone',
+# but only for entries listed in the backward-compatibility file zone.tab, use
+# PACKRATDATA= backzone
+# PACKRATLIST= zone.tab
+# If you want all the 'backzone' data, use
+# PACKRATDATA= backzone
+# PACKRATLIST=
+# To omit this data, use
+# PACKRATDATA=
+# PACKRATLIST=
+
+PACKRATDATA=
+PACKRATLIST=
+
+# The name of a locale using the UTF-8 encoding, used during self-tests.
+# The tests are skipped if the name does not appear to work on this system.
+
+UTF8_LOCALE= en_US.utf8
+
+# Non-default libraries needed to link.
+# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0.
+LDLIBS=
+
+# Add the following to an uncommented "CFLAGS=" line as needed
+# to override defaults specified in the source code or by the system.
+# "-DFOO" is equivalent to "-DFOO=1".
+# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime
+# formats that generate only the last two digits of year numbers
+# -DEPOCH_LOCAL if the 'time' function returns local time not UT
+# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
+# than what POSIX specifies, assuming local time is UT.
+# For example, N is 252460800 on AmigaOS.
+# -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
++# on POSIX platforms predating POSIX.1-2024
+# -DHAVE_DECL_ENVIRON if <unistd.h> declares 'environ'
+# -DHAVE_DECL_TIMEGM=0 if <time.h> does not declare timegm
+# -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
+# -DHAVE__GENERIC=0 if _Generic does not work*
+# -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux),
+# -DHAVE_GETRANDOM=0 to avoid using getrandom
+# -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris),
+# where LDLIBS also needs to contain -lintl on some hosts;
+# -DHAVE_GETTEXT=0 to avoid using gettext
+# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares
- # ctime_r and asctime_r incompatibly with the POSIX standard
++# ctime_r and asctime_r incompatibly with POSIX.1-2017 and earlier
+# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
+# -DHAVE_INTTYPES_H=0 if <inttypes.h> does not work*+
+# -DHAVE_LINK=0 if your system lacks a link function
+# -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
+# -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
+# localtime_rz can make zdump significantly faster, but is nonstandard.
+# -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure.
+# -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
+# functions like 'link' or variables like 'tzname' required by POSIX
+# -DHAVE_SETENV=0 if your system lacks the setenv function
+# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+
+# -DHAVE_STDCKDINT_H=0 if neither <stdckdint.h> nor substitutes like
+# __builtin_add_overflow work*
+# -DHAVE_STDINT_H=0 if <stdint.h> does not work*+
+# -DHAVE_STRFTIME_L if <time.h> declares locale_t and strftime_l
+# -DHAVE_STRDUP=0 if your system lacks the strdup function
+# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+
+# -DHAVE_SYMLINK=0 if your system lacks the symlink function
+# -DHAVE_SYS_STAT_H=0 if <sys/stat.h> does not work*
+# -DHAVE_TZSET=0 if your system lacks a tzset function
+# -DHAVE_UNISTD_H=0 if <unistd.h> does not work*
+# -DHAVE_UTMPX_H=0 if <utmpx.h> does not work*
+# -Dlocale_t=XXX if your system uses XXX instead of locale_t
+# -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+
+# Typically it is better to use a later standard. For example,
+# with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'.
+# Even with -DPORT_TO_C89, the code needs at least one C99
+# feature (integers at least 64 bits wide) and maybe more.
+# -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers
+# with external linkage, e.g., applications cannot define 'localtime'.
+# -Dssize_t=long on hosts like MS-Windows that lack ssize_t
- # -DSUPPORT_C89 if the tzcode library should support C89 callers+
- # However, this might trigger latent bugs in C99-or-later callers.
++# -DSUPPORT_C89=0 if the tzcode library should not support C89 callers
++# Although -DSUPPORT_C89=0 might work around latent bugs in callers,
++# it does not conform to POSIX.
++# -DSUPPORT_POSIX2008 if the library should support older POSIX callers+
++# However, this might cause problems in POSIX.1-2024-or-later callers.
+# -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has
+# security implications and is not recommended for general use
+# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires;
+# not needed by the main-program tz code, which is single-threaded.
+# Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
+# -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
+# This is intended for internal use only; it mangles external names.
+# -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
+# -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
+# the default is system-supplied, typically "/usr/lib/locale"
+# -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
- # DST transitions for POSIX.1-2017-style TZ strings lacking them,
++# DST transitions for proleptic format TZ strings lacking them,
+# in the usual case where POSIXRULES is '-'. If not specified,
+# TZDEFRULESTRING defaults to US rules for future DST transitions.
+# This mishandles some past timestamps, as US DST rules have changed.
+# It also mishandles settings like TZ='EET-2EEST' for eastern Europe,
+# as Europe and US DST rules differ.
+# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255)
+# -DUNINIT_TRAP if reading uninitialized storage can cause problems
+# other than simply getting garbage data
+# -DUSE_LTZ=0 to build zdump with the system time zone library
+# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
+# -DZIC_BLOAT_DEFAULT=\"fat\" to default zic's -b option to "fat", and
+# similarly for "slim". Fat TZif files work around incompatibilities
+# and bugs in some TZif readers, notably older ones that
+# ignore or otherwise mishandle 64-bit data in TZif files;
+# however, fat TZif files may trigger bugs in newer TZif readers.
+# Slim TZif files are more efficient, and are the default.
+# -DZIC_MAX_ABBR_LEN_WO_WARN=3
+# (or some other number) to set the maximum time zone abbreviation length
+# that zic will accept without a warning (the default is 6)
+# -g to generate symbolic debugging info
+# -Idir to include from directory 'dir'
+# -O0 to disable optimization; other -O options to enable more optimization
+# -Uname to remove any definition of the macro 'name'
+# $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
+#
+# * Options marked "*" can be omitted if your compiler is C23 compatible.
+# * Options marked "+" are obsolescent and are planned to be removed
- # once the code assumes C99 or later, say in the year 2029.
++# once the code assumes C99 or later (say in the year 2029)
++# and POSIX.1-2024 or later (say in the year 2034).
+#
+# Select instrumentation via "make GCC_INSTRUMENT='whatever'".
+GCC_INSTRUMENT = \
+ -fsanitize=undefined -fsanitize-address-use-after-scope \
+ -fsanitize-undefined-trap-on-error -fstack-protector
+# Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow.
- GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \
++GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 \
+ $(GCC_INSTRUMENT) \
+ -Wall -Wextra \
+ -Walloc-size-larger-than=100000 -Warray-bounds=2 \
+ -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \
+ -Wdeclaration-after-statement -Wdouble-promotion \
- -Wduplicated-branches -Wduplicated-cond \
++ -Wduplicated-branches -Wduplicated-cond -Wflex-array-member-not-at-end \
+ -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \
+ -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \
- -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
++ -Wmissing-declarations -Wmissing-prototypes \
++ -Wmissing-variable-declarations -Wnested-externs \
+ -Wnull-dereference \
+ -Wold-style-definition -Woverlength-strings -Wpointer-arith \
+ -Wshadow -Wshift-overflow=2 -Wstrict-overflow \
+ -Wstrict-prototypes -Wstringop-overflow=4 \
+ -Wstringop-truncation -Wsuggest-attribute=cold \
+ -Wsuggest-attribute=const -Wsuggest-attribute=format \
+ -Wsuggest-attribute=malloc \
+ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \
- -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \
++ -Wtrampolines -Wundef -Wunused-macros -Wuse-after-free=3 \
+ -Wvariadic-macros -Wvla -Wwrite-strings \
- -Wno-address -Wno-format-nonliteral -Wno-sign-compare \
- -Wno-type-limits
++ -Wno-format-nonliteral -Wno-sign-compare
+#
+# If your system has a "GMT offset" field in its "struct tm"s
+# (or if you decide to add such a field in your system's "time.h" file),
+# add the name to a define such as
+# -DTM_GMTOFF=tm_gmtoff
+# to the end of the "CFLAGS=" line. If not defined, the code attempts to
+# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
+# Similarly, if your system has a "zone abbreviation" field, define
+# -DTM_ZONE=tm_zone
+# and define NO_TM_ZONE to suppress any guessing.
- # Although these two fields are not required by POSIX.1-2017,
- # POSIX 202x/D4 requires them and they are widely available
- # on GNU/Linux and BSD systems.
++# Although POSIX.1-2024 requires these fields and they are widely available
++# on GNU/Linux and BSD systems, some older systems lack them.
+#
+# The next batch of options control support for external variables
+# exported by tzcode. In practice these variables are less useful
+# than TM_GMTOFF and TM_ZONE. However, most of them are standardized.
+# #
+# # To omit or support the external variable "tzname", add one of:
+# # -DHAVE_TZNAME=0 # do not support "tzname"
+# # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library
+# # -DHAVE_TZNAME=2 # support and define "tzname"
- # # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later.
++# # to the "CFLAGS=" line. Although "tzname" is required by POSIX.1-1988
++# # and later, its contents are unspecified if you use a geographical TZ
++# # and the variable is planned to be removed in a future POSIX edition.
+# # If not defined, the code attempts to guess HAVE_TZNAME from other macros.
+# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause
+# # crashes when combined with some platforms' standard libraries,
+# # presumably due to memory allocation issues.
+# #
+# # To omit or support the external variables "timezone" and "daylight", add
+# # -DUSG_COMPAT=0 # do not support
+# # -DUSG_COMPAT=1 # support, and variables are defined by system library
+# # -DUSG_COMPAT=2 # support and define variables
+# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix
- # # Systems Group code and are required by POSIX.1-2008 and later (with XSI).
++# # Systems Group code and are required by POSIX.1-2008 and later (with XSI),
++# # although their contents are unspecified if you use a geographical TZ
++# # and the variables are planned to be removed in a future edition of POSIX.
+# # If not defined, the code attempts to guess USG_COMPAT from other macros.
+# #
+# # To support the external variable "altzone", add
+# # -DALTZONE=0 # do not support
+# # -DALTZONE=1 # support "altzone", which is defined by system library
+# # -DALTZONE=2 # support and define "altzone"
+# # to the end of the "CFLAGS=" line; although "altzone" appeared in
+# # System V Release 3.1 it has not been standardized.
+# # If not defined, the code attempts to guess ALTZONE from other macros.
+#
+# If you want functions that were inspired by early versions of X3J11's work,
+# add
+# -DSTD_INSPIRED
+# to the end of the "CFLAGS=" line. This arranges for the following
+# functions to be added to the time conversion library.
+# "offtime" is like "gmtime" except that it accepts a second (long) argument
+# that gives an offset to add to the time_t when converting it.
+# I.e., "offtime" is like calling "localtime_rz" with a fixed-offset zone.
+# "timelocal" is nearly equivalent to "mktime".
+# "timeoff" is like "timegm" except that it accepts a second (long) argument
+# that gives an offset to use when converting to a time_t.
+# I.e., "timeoff" is like calling "mktime_z" with a fixed-offset zone.
+# "posix2time" and "time2posix" are described in an included manual page.
+# X3J11's work does not describe any of these functions.
+# These functions may well disappear in future releases of the time
+# conversion package.
+#
+# If you don't want functions that were inspired by NetBSD, add
+# -DNETBSD_INSPIRED=0
+# to the end of the "CFLAGS=" line. Otherwise, the functions
+# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
+# time library, and if STD_INSPIRED is also defined to nonzero the functions
+# "posix2time_z" and "time2posix_z" are added as well.
+# The functions ending in "_z" (or "_rz") are like their unsuffixed
+# (or suffixed-by-"_r") counterparts, except with an extra first
+# argument of opaque type timezone_t that specifies the timezone.
+# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
+#
+# If you want to allocate state structures in localtime, add
+# -DALL_STATE
+# to the end of the "CFLAGS=" line. Storage is obtained by calling malloc.
+#
+# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
+# out by the National Institute of Standards and Technology
+# which claims to test C and POSIX conformance. If you want to pass PCTS, add
+# -DPCTS
+# to the end of the "CFLAGS=" line.
+#
+# If you want strict compliance with XPG4 as of 1994-04-09, add
+# -DXPG4_1994_04_09
+# to the end of the "CFLAGS=" line. This causes "strftime" to always return
+# 53 as a week number (rather than 52 or 53) for January days before
+# January's first Monday when a "%V" format is used and January 1
+# falls on a Friday, Saturday, or Sunday.
+#
+# POSIX says CFLAGS defaults to "-O 1".
+# Uncomment the following line and edit its contents as needed.
+
+#CFLAGS= -O 1
+
+
+# The name of a POSIX-like library archiver, its flags, C compiler,
+# linker flags, and 'make' utility. Ordinarily the defaults suffice.
- # The commented-out values are the defaults specified by POSIX.1-202x/D4.
++# The commented-out values are the defaults specified by POSIX.1-2024.
+#AR = ar
+#ARFLAGS = -rv
+#CC = c17
+#LDFLAGS =
+#MAKE = make
+
- # For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
- # submake command lines. The default is no leap seconds.
-
- LEAPSECONDS=
-
+# Where to fetch leap-seconds.list from.
+leaplist_URI = \
+ https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list
+# The file is generated by the IERS Earth Orientation Centre, in Paris.
+leaplist_TZ = Europe/Paris
+
+# The zic command and its arguments.
+
+zic= ./zic
+ZIC= $(zic) $(ZFLAGS)
+
+# To shrink the size of installed TZif files,
+# append "-r @N" to omit data before N-seconds-after-the-Epoch.
+# To grow the files and work around bugs in older applications,
+# possibly at the expense of introducing bugs in newer ones,
+# append "-b fat"; see ZIC_BLOAT_DEFAULT above.
+# See the zic man page for more about -b and -r.
+ZFLAGS=
+
+# How to use zic to install TZif files.
+
- ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
++ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)'
+
+# The name of a POSIX-compliant 'awk' on your system.
+# mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work.
+# Also, it is better (though not essential) if 'awk' supports UTF-8,
+# and unfortunately mawk and busybox awk do not support UTF-8.
+# Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems.
+AWK= awk
+
+# The full path name of a POSIX-compliant shell, preferably one that supports
+# the Korn shell's 'select' statement as an extension.
+# These days, Bash is the most popular.
+# It should be OK to set this to /bin/sh, on platforms where /bin/sh
+# lacks 'select' or doesn't completely conform to POSIX, but /bin/bash
+# is typically nicer if it works.
+KSHELL= /bin/bash
+
+# Name of curl <https://curl.haxx.se/>, used for HTML validation
+# and to fetch leap-seconds.list from upstream.
++# Set CURL=: to disable use of the Internet.
+CURL= curl
+
+# Name of GNU Privacy Guard <https://gnupg.org/>, used to sign distributions.
+GPG= gpg
+
+# This expensive test requires USE_LTZ.
+# To suppress it, define this macro to be empty.
+CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
+
+# SAFE_CHAR is a regular expression that matches a safe character.
+# Some parts of this distribution are limited to safe characters;
+# others can use any UTF-8 character.
+# For now, the safe characters are a safe subset of ASCII.
+# The caller must set the shell variable 'sharp' to the character '#',
+# since Makefile macros cannot contain '#'.
+# TAB_CHAR is a single tab character, in single quotes.
+TAB_CHAR= ' '
+SAFE_CHARSET1= $(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
+SAFE_CHARSET2= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
+SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~'
+SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
+SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]'
+
+# These non-alphabetic, non-ASCII printable characters are Latin-1,
+# and so are likely displayable even in editors like XEmacs 21
+# that have limited display capabilities.
+UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷
+# Non-ASCII non-letters that OK_CHAR allows, as these characters are
+# useful in commentary.
+UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)
+
+# Put this in a bracket expression to match spaces.
+s = [:space:]
+
+# OK_CHAR matches any character allowed in the distributed files.
+# This is the same as SAFE_CHAR, except that UNUSUAL_OK_CHARSET and
+# multibyte letters are also allowed so that commentary can contain a
+# few safe symbols and people's names and can quote non-English sources.
+# Other non-letters are limited to ASCII renderings for the
+# convenience of maintainers using XEmacs 21.5.34, which by default
+# mishandles Unicode characters U+0100 and greater.
+OK_CHAR= '[][:alpha:]$(UNUSUAL_OK_CHARSET)'$(SAFE_CHARSET)'-]'
+
+# SAFE_LINE matches a line of safe characters.
+# SAFE_SHARP_LINE is similar, except any OK character can follow '#';
+# this is so that comments can contain non-ASCII characters.
+# OK_LINE matches a line of OK characters.
+SAFE_LINE= '^'$(SAFE_CHAR)'*$$'
+SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
+OK_LINE= '^'$(OK_CHAR)'*$$'
+
+# Flags to give 'tar' when making a distribution.
+# Try to use flags appropriate for GNU tar.
- GNUTARFLAGS= --format=pax --pax-option='delete=atime,delete=ctime' \
++GNUTARFLAGS= --format=pax --pax-option=delete=atime,delete=ctime \
+ --numeric-owner --owner=0 --group=0 \
+ --mode=go+u,go-w --sort=name
- TARFLAGS= `if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
- then echo $(GNUTARFLAGS); \
- else :; \
- fi`
++SETUP_TAR= \
++ export LC_ALL=C && \
++ if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; then \
++ TAR='tar $(GNUTARFLAGS)'; \
++ else \
++ TAR=tar; \
++ fi
+
+# Flags to give 'gzip' when making a distribution.
+GZIPFLAGS= -9n
+
+# When comparing .tzs files, use GNU diff's -F'^TZ=' option if supported.
+# This makes it easier to see which Zone has been affected.
- DIFF_TZS= diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \
- || echo ' -F^TZ=')
++SETUP_DIFF_TZS = \
++ if diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1; then \
++ DIFF_TZS='diff -u -F^TZ='; \
++ else \
++ DIFF_TZS='diff -u'; \
++ fi
+
+# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
+RANLIB= :
+
+# POSIX prohibits defining or using SHELL. However, csh users on systems
+# that use the user shell for Makefile commands may need to define SHELL.
+#SHELL= /bin/sh
+
+# End of macros that one plausibly might want to tailor.
+###############################################################################
+
+
+TZCOBJS= zic.o
- TZDOBJS= zdump.o localtime.o asctime.o strftime.o
- DATEOBJS= date.o localtime.o strftime.o asctime.o
++TZDOBJS= zdump.o localtime.o strftime.o
++DATEOBJS= date.o localtime.o strftime.o
+LIBSRCS= localtime.c asctime.c difftime.c strftime.c
+LIBOBJS= localtime.o asctime.o difftime.o strftime.o
+HEADERS= tzfile.h private.h
+NONLIBSRCS= zic.c zdump.c
+NEWUCBSRCS= date.c
+SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
+ tzselect.ksh workman.sh
+MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
+ tzfile.5 tzselect.8 zic.8 zdump.8
+MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \
+ time2posix.3.txt \
+ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
+ date.1.txt
+COMMON= calendars CONTRIBUTING LICENSE Makefile \
+ NEWS README SECURITY theory.html version
+WEB_PAGES= tz-art.html tz-how-to.html tz-link.html
- CHECK_WEB_PAGES=check_theory.html check_tz-art.html \
- check_tz-how-to.html check_tz-link.html
++CHECK_WEB_PAGES=theory.ck tz-art.ck tz-how-to.ck tz-link.ck
+DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
+PRIMARY_YDATA= africa antarctica asia australasia \
+ europe northamerica southamerica
+YDATA= $(PRIMARY_YDATA) etcetera
+NDATA= factory
+TDATA_TO_CHECK= $(YDATA) $(NDATA) backward
+TDATA= $(YDATA) $(NDATA) $(BACKWARD)
+ZONETABLES= zone.tab zone1970.tab zonenow.tab
+TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES)
+LEAP_DEPS= leapseconds.awk leap-seconds.list
+TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \
+ $(PACKRATDATA) $(PACKRATLIST)
+DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA) $(PACKRATLIST)
+DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \
+ leapseconds $(ZONETABLES)
+AWK_SCRIPTS= checklinks.awk checknow.awk checktab.awk leapseconds.awk \
+ ziguard.awk zishrink.awk
+MISC= $(AWK_SCRIPTS)
+TZS_YEAR= 2050
+TZS_CUTOFF_FLAG= -c $(TZS_YEAR)
+TZS= to$(TZS_YEAR).tzs
+TZS_NEW= to$(TZS_YEAR)new.tzs
+TZS_DEPS= $(YDATA) asctime.c localtime.c \
+ private.h tzfile.h zdump.c zic.c
+TZDATA_DIST = $(COMMON) $(DATA) $(MISC)
+# EIGHT_YARDS is just a yard short of the whole ENCHILADA.
+EIGHT_YARDS = $(TZDATA_DIST) $(DOCS) $(SOURCES) tzdata.zi
+ENCHILADA = $(EIGHT_YARDS) $(TZS)
+
+# Consult these files when deciding whether to rebuild the 'version' file.
+# This list is not the same as the output of 'git ls-files', since
+# .gitignore is not distributed.
+VERSION_DEPS= \
+ calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \
+ africa antarctica asctime.c asia australasia \
+ backward backzone \
+ checklinks.awk checknow.awk checktab.awk \
+ date.1 date.c difftime.c \
+ etcetera europe factory iso3166.tab \
+ leap-seconds.list leapseconds.awk localtime.c \
+ newctime.3 newstrftime.3 newtzset.3 northamerica \
+ private.h southamerica strftime.c theory.html \
+ time2posix.3 tz-art.html tz-how-to.html tz-link.html \
+ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
+ workman.sh zdump.8 zdump.c zic.8 zic.c \
+ ziguard.awk zishrink.awk \
+ zone.tab zone1970.tab zonenow.tab
+
+all: tzselect zic zdump libtz.a $(TABDATA) \
+ vanguard.zi main.zi rearguard.zi
+
+ALL: all date $(ENCHILADA)
+
+install: all $(DATA) $(REDO) $(MANS)
+ mkdir -p '$(DESTDIR)$(BINDIR)' \
+ '$(DESTDIR)$(ZDUMPDIR)' '$(DESTDIR)$(ZICDIR)' \
+ '$(DESTDIR)$(LIBDIR)' \
+ '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \
+ '$(DESTDIR)$(MANDIR)/man8'
+ $(ZIC_INSTALL) -l $(LOCALTIME) \
- `case '$(POSIXRULES)' in ?*) echo '-p';; esac \
- ` $(POSIXRULES) \
++ -p $(POSIXRULES) \
+ -t '$(DESTDIR)$(TZDEFAULT)'
+ cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.'
+ cp tzselect '$(DESTDIR)$(BINDIR)/.'
+ cp zdump '$(DESTDIR)$(ZDUMPDIR)/.'
+ cp zic '$(DESTDIR)$(ZICDIR)/.'
+ cp libtz.a '$(DESTDIR)$(LIBDIR)/.'
+ $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a'
+ cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.'
+ cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.'
+ cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.'
+
+INSTALL: ALL install date.1
+ mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1'
+ cp date '$(DESTDIR)$(BINDIR)/.'
+ cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.'
+
+# Calculate version number from git, if available.
+# Otherwise, use $(VERSION) unless it is "unknown" and there is already
+# a 'version' file, in which case reuse the existing 'version' contents
+# and append "-dirty" if the contents do not already end in "-dirty".
+version: $(VERSION_DEPS)
+ { (type git) >/dev/null 2>&1 && \
- V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
- --abbrev=7 --dirty` || \
- if test '$(VERSION)' = unknown && V=`cat $@`; then \
- case $$V in *-dirty);; *) V=$$V-dirty;; esac; \
++ V=$$(git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
++ --abbrev=7 --dirty) || \
++ if test '$(VERSION)' = unknown && read -r V <$@; then \
++ V=$${V%-dirty}-dirty; \
+ else \
+ V='$(VERSION)'; \
+ fi; } && \
+ printf '%s\n' "$$V" >$@.out
+ mv $@.out $@
+
+# These files can be tailored by setting BACKWARD, PACKRATDATA, PACKRATLIST.
+vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS)
+ $(AWK) \
- -v DATAFORM=`expr $@ : '\(.*\).zi'` \
++ -v DATAFORM=$(@:.zi=) \
+ -v PACKRATDATA='$(PACKRATDATA)' \
+ -v PACKRATLIST='$(PACKRATLIST)' \
+ -f ziguard.awk \
+ $(TDATA) $(PACKRATDATA) >$@.out
+ mv $@.out $@
+# This file has a version comment that attempts to capture any tailoring
+# via BACKWARD, DATAFORM, PACKRATDATA, PACKRATLIST, and REDO.
+tzdata.zi: $(DATAFORM).zi version zishrink.awk
- version=`sed 1q version` && \
++ read -r version <version && \
+ LC_ALL=C $(AWK) \
+ -v dataform='$(DATAFORM)' \
+ -v deps='$(DSTDATA_ZI_DEPS) zishrink.awk' \
+ -v redo='$(REDO)' \
+ -v version="$$version" \
+ -f zishrink.awk \
+ $(DATAFORM).zi >$@.out
+ mv $@.out $@
+
+tzdir.h:
+ printf '%s\n' >$@.out \
+ '#ifndef TZDEFAULT' \
+ '# define TZDEFAULT "$(TZDEFAULT)" /* default zone */' \
+ '#endif' \
+ '#ifndef TZDIR' \
+ '# define TZDIR "$(TZDIR)" /* TZif directory */' \
+ '#endif'
+ mv $@.out $@
+
+version.h: version
- VERSION=`cat version` && printf '%s\n' \
++ read -r VERSION <version && printf '%s\n' \
+ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \
+ "static char const TZVERSION[]=\"$$VERSION\";" \
+ 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \
+ >$@.out
+ mv $@.out $@
+
+zdump: $(TZDOBJS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
+
+zic: $(TZCOBJS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
+
+leapseconds: $(LEAP_DEPS)
+ $(AWK) -v EXPIRES_LINE=$(EXPIRES_LINE) \
+ -f leapseconds.awk leap-seconds.list >$@.out
+ mv $@.out $@
+
+# Awk script to extract a Git-style author from leap-seconds.list comments.
+EXTRACT_AUTHOR = \
+ author_line { sub(/^.[[:space:]]*/, ""); \
+ sub(/:[[:space:]]*/, " <"); \
+ printf "%s>\n", $$0; \
+ success = 1; \
+ exit \
+ } \
+ /Questions or comments to:/ { author_line = 1 } \
+ END { exit !success }
+
+# Fetch leap-seconds.list from upstream.
+fetch-leap-seconds.list:
+ $(CURL) -OR $(leaplist_URI)
+
+# Fetch leap-seconds.list from upstream and commit it to the local repository.
+commit-leap-seconds.list: fetch-leap-seconds.list
+ author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \
+ date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \
+ git commit --author="$$author" --date="$$date" -m'make $@' \
+ leap-seconds.list
+
- # Arguments to pass to submakes of install_data.
++# Arguments to pass to submakes.
+# They can be overridden by later submake arguments.
+INSTALLARGS = \
+ BACKWARD='$(BACKWARD)' \
+ DESTDIR='$(DESTDIR)' \
- LEAPSECONDS='$(LEAPSECONDS)' \
+ PACKRATDATA='$(PACKRATDATA)' \
+ PACKRATLIST='$(PACKRATLIST)' \
+ TZDEFAULT='$(TZDEFAULT)' \
+ TZDIR='$(TZDIR)' \
+ ZIC='$(ZIC)'
+
+INSTALL_DATA_DEPS = zic leapseconds tzdata.zi
+
- # 'make install_data' installs one set of TZif files.
- install_data: $(INSTALL_DATA_DEPS)
- $(ZIC_INSTALL) tzdata.zi
-
+posix_only: $(INSTALL_DATA_DEPS)
- $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data
++ $(ZIC_INSTALL) tzdata.zi
+
+right_only: $(INSTALL_DATA_DEPS)
- $(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \
- install_data
++ $(ZIC_INSTALL) -L leapseconds tzdata.zi
+
+# In earlier versions of this makefile, the other two directories were
+# subdirectories of $(TZDIR). However, this led to configuration errors.
+# For example, with posix_right under the earlier scheme,
+# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
+# but gmtime without leap seconds, which led to problems with applications
+# like sendmail that subtract gmtime from localtime.
+# Therefore, the other two directories are now siblings of $(TZDIR).
+# You must replace all of $(TZDIR) to switch from not using leap seconds
+# to using them, or vice versa.
+right_posix: right_only
+ rm -fr '$(DESTDIR)$(TZDIR)-leaps'
+ ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
+
+posix_right: posix_only
+ rm -fr '$(DESTDIR)$(TZDIR)-posix'
+ ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
+
+zones: $(REDO)
+
+# dummy.zd is not a real file; it is mentioned here only so that the
+# top-level 'make' does not have a syntax error.
+ZDS = dummy.zd
+# Rule used only by submakes invoked by the $(TZS_NEW) rule.
+# It is separate so that GNU 'make -j' can run instances in parallel.
+$(ZDS): zdump
- ./zdump -i $(TZS_CUTOFF_FLAG) '$(wd)/'$$(expr $@ : '\(.*\).zd') \
- >$@
++ ./zdump -i $(TZS_CUTOFF_FLAG) "$$PWD/$(@:.zd=)" >$@
+
+TZS_NEW_DEPS = tzdata.zi zdump zic
+$(TZS_NEW): $(TZS_NEW_DEPS)
+ rm -fr tzs$(TZS_YEAR).dir
+ mkdir tzs$(TZS_YEAR).dir
+ $(zic) -d tzs$(TZS_YEAR).dir tzdata.zi
+ $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \
+ tzdata.zi | LC_ALL=C sort >$@.out
- wd=`pwd` && \
- x=`$(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \
++ x=$$($(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \
+ tzdata.zi \
- | LC_ALL=C sort -t . -k 2,2` && \
++ | LC_ALL=C sort -t . -k 2,2) && \
+ set x $$x && \
+ shift && \
+ ZDS=$$* && \
- $(MAKE) wd="$$wd" TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \
++ $(MAKE) TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \
+ ZDS="$$ZDS" $$ZDS && \
+ sed 's,^TZ=".*\.dir/,TZ=",' $$ZDS >>$@.out
+ rm -fr tzs$(TZS_YEAR).dir
+ mv $@.out $@
+
- # If $(TZS) exists but 'make check_tzs' fails, a maintainer should inspect the
++# If $(TZS) exists but 'make tzs.ck' fails, a maintainer should inspect the
+# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
+$(TZS):
+ touch $@
+
+force_tzs: $(TZS_NEW)
+ cp $(TZS_NEW) $(TZS)
+
+libtz.a: $(LIBOBJS)
+ rm -f $@
+ $(AR) $(ARFLAGS) $@ $(LIBOBJS)
+ $(RANLIB) $@
+
+date: $(DATEOBJS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
+
+tzselect: tzselect.ksh version
- VERSION=`cat version` && sed \
++ read -r VERSION <version && sed \
+ -e "s'#!/bin/bash'#!"'$(KSHELL)'\' \
+ -e s\''\(AWK\)=[^}]*'\''\1=\'\''$(AWK)\'\'\' \
+ -e s\''\(PKGVERSION\)=.*'\''\1=\'\''($(PACKAGE)) \'\'\' \
+ -e s\''\(REPORT_BUGS_TO\)=.*'\''\1=\'\''$(BUGEMAIL)\'\'\' \
+ -e s\''\(TZDIR\)=[^}]*'\''\1=\'\''$(TZDIR)\'\'\' \
+ -e s\''\(TZVERSION\)=.*'\''\1=\'"'$$VERSION\\''" \
+ <$@.ksh >$@.out
+ chmod +x $@.out
+ mv $@.out $@
+
- check: check_back check_mild
- check_mild: check_character_set check_white_space check_links \
- check_name_lengths check_now \
- check_slashed_abbrs check_sorted \
- check_tables check_web check_ziguard check_zishrink check_tzs
++check: check_mild back.ck
++check_mild: check_web check_zishrink \
++ character-set.ck white-space.ck links.ck mainguard.ck \
++ name-lengths.ck now.ck slashed-abbrs.ck sorted.ck \
++ tables.ck ziguard.ck tzs.ck
+
+# True if UTF8_LOCALE does not work;
+# otherwise, false but with LC_ALL set to $(UTF8_LOCALE).
+UTF8_LOCALE_MISSING = \
+ { test ! '$(UTF8_LOCALE)' \
*** 2742 LINES SKIPPED ***
From nobody Sat Sep 7 14:45:49 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1G9n6F4gz5VX8V;
Sat, 07 Sep 2024 14:45:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X1G9n4bf0z49ly;
Sat, 7 Sep 2024 14:45:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725720349;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gP8Po2srj8elH+ldD5DwjavXJuZickPYhAWECXu+g+4=;
b=flt/sX6w773PbtuVvwQm3rkp41qRuRQ39LmhWmVk4/3Y+TdXMZqRFyGpNw47+h6ZmDjfKh
uKXp0h1Mf4TA7L+ePSkqfAXU8hunmBXcCex/UK4x5o7dPugCbjLg0olFSnO3UxNdwP491G
9558Mzo+DZCGiTFVXz6J4K16zJaPhWn4eA2Y5mL1Qs3auZXl4Iyk/sZ+6tmRKW9wJMDOu+
uNDok6c1N35k9VUWG855Hes6k0PWkU4KffGmFFmwtCw/xrXofADKz+1oIdN8l4U9GMowy7
DaFcMU/MCuvH3UowPB5zDA+ohJPOSBmRE/I0LIbkf0OzMVd7v3rOKV+YQuX4fw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725720349; a=rsa-sha256; cv=none;
b=U7TantZnAyFXcb9c+dahAcfe1VbTA1wUFAYjllTAGwUZzl8reoSL85J+jOm150iBg52vgc
4mS6x/KrVYhopxNHIdkVl9M11xqCnbPPH+nJWxiw8Fgh1HAFdeHnwQygiv9AKvnAG2Y4xO
1+ak5hnuUp/x0kQOwd21AGACxcqdruNYr+K78qsfPvzQ7rm+13OkjEPY4gSi5NEZN18ZoQ
TIpwchO7hAyi0V01DEQoQItu+k6+pJ32yYkw4nDy5TgXvqmMpU3NVYc5asW/IF7OJ7rieF
xrGM87nRx3lkqK+6xyfD35TYC9ydGfxeTvwdCZIX8qUON9EOk7oCncnomg7XBw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725720349;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gP8Po2srj8elH+ldD5DwjavXJuZickPYhAWECXu+g+4=;
b=TGxY0I9NzPJJUDI7MCCxgAcNtiSdK63EGfYJVQtAEduT9X9SegfHHazyHkbYWTe61qhTLQ
RYuBpfZFVC8oot0YpwNQxSXmQgXfZjh6zpslItYH3qVdpP+TRUHLiGkK5iV4dz9PfKBoar
4EeymXHhIVCgfzRP+0KML+ce3+vqboH20qWLSgqGWTfUwAA4+JzWRSVyNi6WtUd22OAmP9
7bARvoAeFllhSl5XSDduRMROJLw1EAmnMvAZvkK+FeLIIWRoIxNHKMHzLd5zKSjQ39VkQo
C5eSu2k7KBNV/7uiCfy3jMpU8IUL9wB1iT+ZpcLyHHi37tNgVfYit2AvzNBsCQ==
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 4X1G9n4Bqpzg3n;
Sat, 7 Sep 2024 14:45: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 487EjnL1068434;
Sat, 7 Sep 2024 14:45:49 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 487Ejn6T068431;
Sat, 7 Sep 2024 14:45:49 GMT
(envelope-from git)
Date: Sat, 7 Sep 2024 14:45:49 GMT
Message-Id: <202409071445.487Ejn6T068431@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: a6c8ab4f4549 - main - src.conf.5: Regenerate
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a6c8ab4f45496d0e7e49ef8ae0c44f39caefd1fa
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=a6c8ab4f45496d0e7e49ef8ae0c44f39caefd1fa
commit a6c8ab4f45496d0e7e49ef8ae0c44f39caefd1fa
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-07 14:44:51 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-07 14:44:51 +0000
src.conf.5: Regenerate
---
share/man/man5/src.conf.5 | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index afdf3ee51619..267351309f93 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd August 20, 2024
+.Dd September 7, 2024
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -349,6 +349,8 @@ When set, it enforces these options:
.Va WITHOUT_LOADER_ZFS
.It
.Va WITHOUT_ZFS
+.It
+.Va WITHOUT_ZFS_TESTS
.El
.It Va WITHOUT_CLANG
Do not build the Clang C/C++ compiler during the regular phase of the build.
@@ -459,6 +461,8 @@ When set, it enforces these options:
.Va WITHOUT_UNBOUND
.It
.Va WITHOUT_ZFS
+.It
+.Va WITHOUT_ZFS_TESTS
.El
.Pp
When set, these options are also in effect:
@@ -1416,6 +1420,8 @@ When set, it enforces these options:
.Va WITHOUT_UNBOUND
.It
.Va WITHOUT_ZFS
+.It
+.Va WITHOUT_ZFS_TESTS
.El
.Pp
When set, these options are also in effect:
@@ -1695,6 +1701,8 @@ When set, it enforces these options:
.Bl -item -compact
.It
.Va WITHOUT_DTRACE_TESTS
+.It
+.Va WITHOUT_ZFS_TESTS
.El
.Pp
When set, these options are also in effect:
@@ -1850,6 +1858,14 @@ or
.Xr zfs 8 .
Also disable ZFS support in utilities and libraries which implement
ZFS-specific functionality.
+When set, it enforces these options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_ZFS_TESTS
+.El
+.It Va WITHOUT_ZFS_TESTS
+Do not build and install the legacy ZFS test suite.
.It Va WITHOUT_ZONEINFO
Do not build the timezone database.
When set, it enforces these options:
From nobody Sat Sep 7 19:40:18 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1Njb2mDWz5WQcX;
Sat, 07 Sep 2024 19:40:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X1Njb0mC9z4qMX;
Sat, 7 Sep 2024 19:40:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725738019;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Cma5EbQpnKK4H3I1RM3W5uzmr3ld/EU2ug4OwhonNkU=;
b=hKHlbnO/m/VcCj6pPmtMNFNzZ+7XpKlwI//NL2XLqSD97/MPlY7NcORLRHpovMIYCB7I1I
+8ASsXfNAbIH8B21TYCvUw0m319qzl3MBNXiis0EKmeIOnQ68CWPUjxXiql9g7u3TVC0kH
360IdXC4y0LeMTvz4U+f0rNJithizbwzkDvej7xZy77MvADoFzXkJo+Gg1ZianAxNudjlQ
ab96cNEi07vJeu8CGE338T84ACkt9bFYYi6d7ONZWmVxSctdmo0L8WhU9k7eNegLbIPxpr
qxKm0YTowN15gmeoZmJ2QjqsztRTod9KCR8zhHeo6CQApADOI6A8CYEWFa32IA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725738019; a=rsa-sha256; cv=none;
b=MetAYvfs4ngku5ea1EJjfJGNqXxrr8VOb7O7MXBnLyi0q4CEvySRCGb1j6anlYs/qjxFTc
0gik0KVGniJERNoDeLHrUbBV45ouHLe73aiR67wrx+W5rN6MBl1qlHKK9JFcpLeDUMfPQ8
H5tR1bpoye2Brx8hDb81rfW19VXPo8/vVm4dL/2U6kkaXqjwwg/a1+2TLEEpKHe2P3Fau5
6tcD+t4vZxgjdU8GghhFr0kNHJOB7mA1iiZKgygM9pRhZnS2/0IJ6UMDFSpKOruh7077ln
rbjkhqg29gCvK147kBAM/Sw/FQNd1IGzqWRp3g356v0ObMYZW4ybqT8k7iVpuw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725738019;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=Cma5EbQpnKK4H3I1RM3W5uzmr3ld/EU2ug4OwhonNkU=;
b=nBSfCvMI1v31G97Y8WIlCvu7yOoTbUFoQxJzpG/kJykjb7HMaUzUqDn+vjBexJE4egcYTZ
3J0K3OpiF2obGlN4o1EcABo6kD3lwW6PMnMjOlqv3GGcmXRyaaHkIhLkHI2zHTYXcF1Hef
tXLlpN4eaVoFJMizcZhkc4g8yaOPuvY+UahbBmjhxHbkLWD8buUV7DobJrlutyU+CpliLy
fugFYqXhpgVRYpe6K+jB7sjyI6/2tMSnVwgoWQXFCVMdA6B2JL7rwZOvtwehV6WEicppay
riWV9wGm7OY79CLTn9asoIsox7jTHFJIi3omYRbHVGo8bv+L4F8U4vljjqPNhA==
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 4X1Njb09JQzpMl;
Sat, 7 Sep 2024 19:40:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 487JeIrY080743;
Sat, 7 Sep 2024 19:40:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 487JeIlX080740;
Sat, 7 Sep 2024 19:40:18 GMT
(envelope-from git)
Date: Sat, 7 Sep 2024 19:40:18 GMT
Message-Id: <202409071940.487JeIlX080740@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: a700bef1e4ee - main - netbsd-tests: Update a test
case to chase grep symlink handling changes
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a700bef1e4ee3e6f4e1a86a374bf9b4044f69a70
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=a700bef1e4ee3e6f4e1a86a374bf9b4044f69a70
commit a700bef1e4ee3e6f4e1a86a374bf9b4044f69a70
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-07 19:39:49 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-07 19:39:49 +0000
netbsd-tests: Update a test case to chase grep symlink handling changes
This test case verifies that grep detects symlink loops when traversing
a directory hierarchy.
Fixes: fc12c191c087 ("grep: Default to -p instead of -S.")
Reviewed by: ngie, jhb
Reported by: Jenkins
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D46544
---
contrib/netbsd-tests/usr.bin/grep/t_grep.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
index d2539a8250de..b1412a7a0715 100755
--- a/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
+++ b/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
@@ -81,7 +81,7 @@ recurse_symlink_body()
atf_check -o file:"$(atf_get_srcdir)/d_recurse_symlink.out" \
-e file:"$(atf_get_srcdir)/d_recurse_symlink.err" \
- grep -r string test
+ grep -rS string test
}
atf_test_case word_regexps
From nobody Sat Sep 7 23:45:20 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1V8K1Jckz5V4wY;
Sat, 07 Sep 2024 23:45: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 4X1V8K0nSLz4P5X;
Sat, 7 Sep 2024 23:45:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725752721;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MYCp34HEFux4vsV5H44OrEbvDAXU813a4c1WszQXWsM=;
b=jTGoU03qXX1zDDWviN432fXOBidlz/gwIkoV/0FjJIHhvhpuTF4tARbP+fWL3xkiBhrcZD
2N/GGwrPNbAFOnYN6yc+pEf1qS2goPvpjhSGnujFv/SHpL1omWAu8Y32cV8PmIuh+2GDeo
EL7yJyYWdsIw44ljTbMxY37cuAegMhsu3NTgMb0IVOJPF8idgsY4whPeZvdN/6Nmxazsyo
IudZC16yBOOzw7kP7wrXym1L1pRcHZzjQW61wq1kigxPQPxe0+rjpr+IEmQy/suxw4Dg0t
N2C3TCIZnXZ0RZqVkFxlpViAli0Ecfs/TpTrq3hGWR6rN4dM6Jmsue7zSjYyJg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725752721; a=rsa-sha256; cv=none;
b=JheKyHLXg5MPx2QK/0PnOL3+2QM7/MiZP/c+u/Yp+z1ghJN38kRmKDStXS6Ktk2h0ub5wE
ne7Y+07LlIf0B221f6EEK46ZSNsMc3shupgueyLFvJLKemmjcOSuiBSVCXDIdcp4Q1N1ss
2207IP4C6Cft9GTrJ7Fn3UrtgFdU3NYcSrebLq9k+MkU20W5Ss+t/XHFCeg+RPNFhjJO/s
7JMwibWMThRY9ObjeiRSuJF4ZtV/MV6V9nyytGcdEiU9WXYS31jvrSk99qQEIY85121cE+
wF30HLQiBCNt26HJURQGFhgWihthz0ks6Ds+CJlw2J/wJFcnAhMfAsGSC99gzQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725752721;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MYCp34HEFux4vsV5H44OrEbvDAXU813a4c1WszQXWsM=;
b=bHav+dRN7QFMyl22vWPPghts3c71bBL0wKNcXrIsJkTYlbELHihzmUBapyKz/Y7beec1k3
MdQkq4NTdGRoixZBzQ1b5NFVxIMIc7nbCb7Ynr3dr4J/Frmdc+tZpFLF0rt6tyMKuQfP7j
GLIyLBl3nJpEwFlhzDI3YDwFWWOX/14A9WyxgdzDLeUOEv6p1FlM+LltcMR7v/NqfnJCHF
Tj1wv03YHvvvTkeR7UsTFaqKgSYxGTlLCkKLA96NUIDoE3nUDmBjw0TZC/FeQ0zvL0ijyR
VK3avh44nxn4OEbj64LeieIpOrex1ryuMWjsV2gWdRvnvlBeCKI231w1c0tzAg==
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 4X1V8K0Nmpzwnl;
Sat, 7 Sep 2024 23:45: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 487NjK4Z094605;
Sat, 7 Sep 2024 23:45:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 487NjKt0094602;
Sat, 7 Sep 2024 23:45:20 GMT
(envelope-from git)
Date: Sat, 7 Sep 2024 23:45:20 GMT
Message-Id: <202409072345.487NjKt0094602@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: 4086a0635d38 - main - openssl: Update upgrade
instructions.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4086a0635d38d5e6ca29684c2ea2e927f8866e32
Auto-Submitted: auto-generated
The branch main has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=4086a0635d38d5e6ca29684c2ea2e927f8866e32
commit 4086a0635d38d5e6ca29684c2ea2e927f8866e32
Author: Gordon Tetlow <gordon@FreeBSD.org>
AuthorDate: 2024-09-07 23:45:05 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-09-07 23:45:05 +0000
openssl: Update upgrade instructions.
Update download locations.
Remove references to FREEBSD-Xlist.
Remove reference to the fips module that has been removed.
---
crypto/openssl/FREEBSD-upgrade | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/crypto/openssl/FREEBSD-upgrade b/crypto/openssl/FREEBSD-upgrade
index 76943efdbde6..ebe2d85bd8f7 100644
--- a/crypto/openssl/FREEBSD-upgrade
+++ b/crypto/openssl/FREEBSD-upgrade
@@ -9,14 +9,14 @@
01) Switch to the vendor branch:
$ cd src/freebsd/main
- $ git worktree add ../vendor/openssl-X.Y freebsd/vendor/openssl-X.Y
+ $ git worktree add -b vendor/openssl-X.Y ../vendor/openssl-X.Y freebsd/vendor/openssl-X.Y
$ cd ../vendor/openssl-X.Y
02) Download the latest OpenSSL tarball and signature from the official
website (https://www.openssl.org/source/).
- $ (cd .. && fetch https://openssl.org/source/openssl-X.Y.Z.tar.gz)
- $ (cd .. && fetch https://openssl.org/source/openssl-X.Y.Z.tar.gz.asc)
+ $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz)
+ $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz.asc)
03) Verify the signature:
@@ -24,11 +24,11 @@
04) Unpack the OpenSSL tarball to the parent directory:
- $ tar -x -X FREEBSD-Xlist -f ../openssl-X.Y.Z.tar.gz -C ..
+ $ tar xf ../openssl-X.Y.Z.tar.gz -C ..
05) Copy to the vendor branch:
- $ rsync --exclude FREEBSD.* --delete -av ../openssl-X.Y.Z/* .
+ $ rsync --exclude .git --delete -av ../openssl-X.Y.Z/ .
06) Take care of added / deleted files:
@@ -112,19 +112,11 @@
16) Build and install world, reboot, test.
-17) Test the legacy and fips providers as well: (here with "test" as the password)
+17) Test the legacy provider as well: (here with "test" as the password)
$ echo test | openssl rc4 -provider legacy -e -a -pbkdf2
enter RC4 encryption password:
Verifying - enter RC4 encryption password:
U2FsdGVkX1+JvhqxLMOvlxvTi1/h
- # openssl fipsinstall -out /etc/ssl/fipsmodule.cnf -module /usr/lib/ossl-modules/fips.so
- INSTALL PASSED
- # vi /etc/ssl/openssl.cnf
- [enable the FIPS module]
- # echo test | openssl aes-256-cbc -provider fips -e -a -pbkdf2
- U2FsdGVkX19lTexiYsnMX83ZLSojBOFwv7GB0Plhgmw=
-
18) Commit and hope you did not miss anything.
-
From nobody Sun Sep 8 04:32:18 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1cWW25Smz5VqdJ;
Sun, 08 Sep 2024 04:32:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X1cWW1n40z43pv;
Sun, 8 Sep 2024 04:32:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725769943;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=VJFtF5NxhztgC7sHQGXK9VUl6QTGwc+rk6zKdpFCSu0=;
b=K0S4bcupKqOZkhaC8cVT52W024Z0H0G3wL7ZktTi++J6FFSiXa+hBctnY6NSHKZrzutr56
L3DOcNZtHqTXe6wxBXpo9Y+r9pXVVnld2nlzxMoWhkys2HCUmgOjCzCw28ZWhB1BT2WRfK
3SFn1QrkxrL4zLXBTgBfiHI485QGJuBOQjXT7dYL6Wu+K5bxuiQ15xcpiFpdRrQur64ZEm
N0Q/ULWyOYC1D3QAFrvWMtgHjRvUK2Kc5BmovTHJyKw1PxfR05W3binyKrH8hIBarAAUH7
NitlHt/tZVCxzNrYos124wzemorl+uCqqBMKuCPPFPpwWt+Dt4I4wFcoGaXTTQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725769943; a=rsa-sha256; cv=none;
b=JJO4wrwKoOcQoQprFHRrAKs7oPZ7qTrNHjsHk819xJCkxCc20lwbDLL4mGP3VFGOif1Li8
GwgzSDM+8LwXa6j9t0vkppyg8LMI2dCAeHkrXQ5yu0apG4MVqcNpdyxQvTngvjmbs9AFM1
55mRisMWscX8FVSj/hqMegb1STALBEO+sEan4I2j4zzdNa0fl+YAxPkpWhcySSH1fvU2oN
/kpMUh51U/+ccIfTkSIph6QCw+qHjWh2VJwOeyQcRgmpkMVKaTg/QffCiUZ1nKiKDq7FUP
y92/GZdVBg7AI1HQfmplApxghRuZyWqaZs3A96Y/9NHoM7S9kEpWnwLV6aY1XA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725769943;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=VJFtF5NxhztgC7sHQGXK9VUl6QTGwc+rk6zKdpFCSu0=;
b=ySvTb/06sHwHH2JNwLw5wadLIPVkznqgL4rQrJvcomTIgj6Se2vugdQTOorwe/bsQFBwQM
Fjfv+fr6KfhBVLNFdechQnz6UDQBj57NdDh8Y3xtLRc9OjEjl9jrSxTLlApSUHYlcfLaDN
4zyiXvxLiUALN4bXNMcgwNOFBtPgaFianXFNfb3ZiJyPdC2Bz4RN1FLnU0HUGd7UAV2emE
yiTDii/S+4902Jiotk1DT4Tp92f7+e/Z1zWpSeMK8atcJbVPTx2Kdec8z3QV9+bYF+fMNz
t9ov4ByYEshqyqKmZHnLJB/6qViAqjSn4Dx4oVhzZNevngP2Cro1Uft2jG2jIA==
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 4X1cWW1N1Kz147g;
Sun, 8 Sep 2024 04:32:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4884WNoE086326;
Sun, 8 Sep 2024 04:32:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4884WIAX086311;
Sun, 8 Sep 2024 04:32:18 GMT
(envelope-from git)
Date: Sun, 8 Sep 2024 04:32:18 GMT
Message-Id: <202409080432.4884WIAX086311@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Enji Cooper <ngie@FreeBSD.org>
Subject: git: a7148ab39c03 - main - openssl: Import OpenSSL 3.0.15.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ngie
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: a7148ab39c03abd4d1a84997c70bf96f15dd2a09
Auto-Submitted: auto-generated
The branch main has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=a7148ab39c03abd4d1a84997c70bf96f15dd2a09
commit a7148ab39c03abd4d1a84997c70bf96f15dd2a09
Merge: 4086a0635d38 108164cf95d9
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2024-09-08 04:30:17 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2024-09-08 04:31:22 +0000
openssl: Import OpenSSL 3.0.15.
This release incorporates the following bug fixes and mitigations:
- Fixed possible denial of service in X.509 name checks ([CVE-2024-6119])
- Fixed possible buffer overread in SSL_select_next_proto() ([CVE-2024-5535])
Release notes can be found at:
https://openssl-library.org/news/openssl-3.0-notes/index.html
Co-authored-by: gordon
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D46602
Merge commit '108164cf95d9594884c2dcccba2691335e6f221b'
crypto/openssl/CHANGES.md | 34 ++
crypto/openssl/CONTRIBUTING.md | 6 +-
crypto/openssl/Configurations/10-main.conf | 36 ++
crypto/openssl/Configurations/15-ios.conf | 2 +-
crypto/openssl/Configure | 10 +-
crypto/openssl/FAQ.md | 6 -
crypto/openssl/INSTALL.md | 4 +-
crypto/openssl/NEWS.md | 15 +
crypto/openssl/VERSION.dat | 4 +-
crypto/openssl/apps/cms.c | 4 +-
crypto/openssl/apps/dgst.c | 9 +-
crypto/openssl/apps/lib/opt.c | 4 +-
crypto/openssl/apps/lib/s_cb.c | 3 +-
crypto/openssl/apps/smime.c | 4 +-
crypto/openssl/crypto/aes/asm/aesp8-ppc.pl | 147 ++++--
crypto/openssl/crypto/aes/build.info | 4 +
crypto/openssl/crypto/asn1/a_d2i_fp.c | 5 +-
crypto/openssl/crypto/asn1/a_mbstr.c | 14 +-
crypto/openssl/crypto/asn1/a_strex.c | 11 +-
crypto/openssl/crypto/asn1/a_verify.c | 4 +-
crypto/openssl/crypto/asn1/tasn_fre.c | 8 +-
crypto/openssl/crypto/bio/bf_readbuff.c | 7 +-
crypto/openssl/crypto/bio/bio_addr.c | 12 +-
crypto/openssl/crypto/cmp/cmp_vfy.c | 4 +-
crypto/openssl/crypto/conf/conf_def.c | 4 +-
crypto/openssl/crypto/conf/conf_lib.c | 5 +-
crypto/openssl/crypto/conf/conf_sap.c | 4 +-
crypto/openssl/crypto/context.c | 4 +-
crypto/openssl/crypto/ec/ecdsa_ossl.c | 12 +-
crypto/openssl/crypto/engine/eng_table.c | 8 +-
crypto/openssl/crypto/evp/ctrl_params_translate.c | 5 +-
crypto/openssl/crypto/evp/digest.c | 4 +-
crypto/openssl/crypto/evp/names.c | 36 +-
crypto/openssl/crypto/evp/pmeth_lib.c | 11 +-
crypto/openssl/crypto/o_str.c | 6 +-
crypto/openssl/crypto/pkcs12/p12_crt.c | 17 +-
crypto/openssl/crypto/pkcs7/pk7_doit.c | 45 +-
crypto/openssl/crypto/property/property.c | 55 +-
crypto/openssl/crypto/rand/randfile.c | 13 +-
crypto/openssl/crypto/rsa/rsa_oaep.c | 4 +-
crypto/openssl/crypto/x509/v3_utl.c | 2 +-
crypto/openssl/crypto/x509/x_name.c | 6 +-
crypto/openssl/doc/HOWTO/certificates.txt | 2 +-
crypto/openssl/doc/fingerprints.txt | 3 -
crypto/openssl/doc/man1/openssl-enc.pod.in | 13 +-
.../doc/man1/openssl-passphrase-options.pod | 24 +-
crypto/openssl/doc/man1/openssl-s_client.pod.in | 8 +-
crypto/openssl/doc/man1/openssl-s_server.pod.in | 7 +-
.../doc/man1/openssl-verification-options.pod | 4 +-
crypto/openssl/doc/man3/ASN1_INTEGER_new.pod | 3 +-
crypto/openssl/doc/man3/ASYNC_WAIT_CTX_new.pod | 5 +-
crypto/openssl/doc/man3/BIO_ADDR.pod | 3 +-
crypto/openssl/doc/man3/BIO_ADDRINFO.pod | 4 +-
crypto/openssl/doc/man3/BIO_f_base64.pod | 26 +-
crypto/openssl/doc/man3/BIO_meth_new.pod | 4 +-
crypto/openssl/doc/man3/BN_add.pod | 22 +-
crypto/openssl/doc/man3/BN_generate_prime.pod | 5 +-
crypto/openssl/doc/man3/BN_set_bit.pod | 9 +-
crypto/openssl/doc/man3/BUF_MEM_new.pod | 3 +-
crypto/openssl/doc/man3/CRYPTO_THREAD_run_once.pod | 12 +-
crypto/openssl/doc/man3/CTLOG_STORE_new.pod | 4 +-
crypto/openssl/doc/man3/CTLOG_new.pod | 4 +-
crypto/openssl/doc/man3/CT_POLICY_EVAL_CTX_new.pod | 5 +-
crypto/openssl/doc/man3/DH_meth_new.pod | 4 +-
crypto/openssl/doc/man3/DSA_SIG_new.pod | 3 +-
crypto/openssl/doc/man3/DSA_meth_new.pod | 4 +-
crypto/openssl/doc/man3/ECDSA_SIG_new.pod | 3 +-
crypto/openssl/doc/man3/ENGINE_add.pod | 5 +-
crypto/openssl/doc/man3/EVP_ASYM_CIPHER_free.pod | 4 +-
crypto/openssl/doc/man3/EVP_CIPHER_meth_new.pod | 3 +-
crypto/openssl/doc/man3/EVP_DigestInit.pod | 10 +-
crypto/openssl/doc/man3/EVP_EncodeInit.pod | 4 +-
crypto/openssl/doc/man3/EVP_EncryptInit.pod | 19 +-
crypto/openssl/doc/man3/EVP_KEM_free.pod | 3 +-
crypto/openssl/doc/man3/EVP_KEYEXCH_free.pod | 4 +-
crypto/openssl/doc/man3/EVP_KEYMGMT.pod | 3 +-
crypto/openssl/doc/man3/EVP_MD_meth_new.pod | 3 +-
crypto/openssl/doc/man3/EVP_PKEY_ASN1_METHOD.pod | 4 +-
crypto/openssl/doc/man3/EVP_PKEY_meth_new.pod | 4 +-
crypto/openssl/doc/man3/EVP_RAND.pod | 4 +-
crypto/openssl/doc/man3/EVP_SIGNATURE.pod | 4 +-
crypto/openssl/doc/man3/HMAC.pod | 4 +-
crypto/openssl/doc/man3/MD5.pod | 15 +-
crypto/openssl/doc/man3/NCONF_new_ex.pod | 4 +-
crypto/openssl/doc/man3/OCSP_REQUEST_new.pod | 3 +-
crypto/openssl/doc/man3/OCSP_cert_to_id.pod | 3 +-
crypto/openssl/doc/man3/OCSP_response_status.pod | 3 +-
crypto/openssl/doc/man3/OPENSSL_LH_COMPFUNC.pod | 4 +-
crypto/openssl/doc/man3/OPENSSL_init_crypto.pod | 3 +-
crypto/openssl/doc/man3/OPENSSL_malloc.pod | 5 +-
crypto/openssl/doc/man3/OPENSSL_secure_malloc.pod | 8 +-
crypto/openssl/doc/man3/OSSL_CMP_CTX_new.pod | 8 +-
crypto/openssl/doc/man3/OSSL_CMP_SRV_CTX_new.pod | 3 +-
crypto/openssl/doc/man3/OSSL_CMP_validate_msg.pod | 9 +-
crypto/openssl/doc/man3/OSSL_DECODER.pod | 3 +-
crypto/openssl/doc/man3/OSSL_DECODER_CTX.pod | 3 +-
.../doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod | 4 +-
crypto/openssl/doc/man3/OSSL_ENCODER.pod | 3 +-
crypto/openssl/doc/man3/OSSL_ENCODER_CTX.pod | 3 +-
crypto/openssl/doc/man3/OSSL_HTTP_REQ_CTX.pod | 3 +-
crypto/openssl/doc/man3/OSSL_LIB_CTX.pod | 4 +-
crypto/openssl/doc/man3/OSSL_PARAM_BLD.pod | 3 +-
crypto/openssl/doc/man3/OSSL_PARAM_dup.pod | 3 +-
crypto/openssl/doc/man3/OSSL_SELF_TEST_new.pod | 3 +-
crypto/openssl/doc/man3/OSSL_STORE_INFO.pod | 3 +-
crypto/openssl/doc/man3/OSSL_STORE_LOADER.pod | 23 +-
crypto/openssl/doc/man3/OSSL_STORE_SEARCH.pod | 3 +-
.../openssl/doc/man3/PEM_read_bio_PrivateKey.pod | 6 +-
crypto/openssl/doc/man3/RAND_set_DRBG_type.pod | 4 +-
crypto/openssl/doc/man3/RSA_meth_new.pod | 4 +-
crypto/openssl/doc/man3/SCT_new.pod | 8 +-
.../doc/man3/SSL_CTX_set_alpn_select_cb.pod | 28 +-
.../openssl/doc/man3/SSL_CTX_set_cipher_list.pod | 4 +-
.../doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod | 8 +-
crypto/openssl/doc/man3/TS_RESP_CTX_new.pod | 3 +-
crypto/openssl/doc/man3/X509V3_get_d2i.pod | 3 +-
crypto/openssl/doc/man3/X509_LOOKUP.pod | 3 +-
crypto/openssl/doc/man3/X509_LOOKUP_meth_new.pod | 3 +-
crypto/openssl/doc/man3/X509_STORE_new.pod | 3 +-
crypto/openssl/doc/man3/X509_dup.pod | 2 +-
crypto/openssl/doc/man3/X509_new.pod | 7 +-
crypto/openssl/doc/man3/d2i_X509.pod | 6 +-
crypto/openssl/doc/man7/EVP_KEYEXCH-DH.pod | 11 +-
crypto/openssl/doc/man7/EVP_PKEY-DH.pod | 62 +--
crypto/openssl/doc/man7/ossl_store.pod | 9 +-
crypto/openssl/fuzz/bignum.c | 9 +-
crypto/openssl/include/crypto/aes_platform.h | 4 +-
crypto/openssl/include/crypto/bn.h | 2 +-
crypto/openssl/include/openssl/tls1.h | 4 +-
crypto/openssl/providers/fips-sources.checksums | 18 +-
crypto/openssl/providers/fips.checksum | 2 +-
.../implementations/encode_decode/decode_der2key.c | 35 +-
.../openssl/providers/implementations/rands/drbg.c | 5 +
crypto/openssl/ssl/bio_ssl.c | 4 +-
crypto/openssl/ssl/ssl_lib.c | 63 ++-
crypto/openssl/ssl/ssl_sess.c | 34 +-
crypto/openssl/ssl/statem/extensions.c | 14 +-
crypto/openssl/ssl/statem/extensions_clnt.c | 29 +-
crypto/openssl/ssl/statem/extensions_srvr.c | 34 +-
crypto/openssl/ssl/statem/statem_lib.c | 6 +-
crypto/openssl/ssl/t1_lib.c | 2 +
crypto/openssl/test/build.info | 6 +-
crypto/openssl/test/crltest.c | 65 ++-
crypto/openssl/test/endecode_test.c | 22 +-
crypto/openssl/test/evp_byname_test.c | 40 ++
crypto/openssl/test/evp_extra_test.c | 21 +
crypto/openssl/test/helpers/handshake.c | 8 +-
crypto/openssl/test/hexstr_test.c | 11 +-
crypto/openssl/test/prov_config_test.c | 9 +-
crypto/openssl/test/provider_fallback_test.c | 14 +-
crypto/openssl/test/provider_internal_test.c | 4 +-
crypto/openssl/test/provider_test.c | 3 +-
crypto/openssl/test/recipes/03-test_fipsinstall.t | 44 +-
crypto/openssl/test/recipes/04-test_conf.t | 3 +-
.../recipes/04-test_conf_data/oversized_line.cnf | 3 +
.../recipes/04-test_conf_data/oversized_line.txt | 4 +
crypto/openssl/test/recipes/25-test_eai_data.t | 2 +-
crypto/openssl/test/recipes/30-test_evp_byname.t | 16 +
.../test/recipes/30-test_evp_data/evppkey_dsa.txt | 6 +-
.../recipes/30-test_evp_data/evppkey_ecdsa.txt | 3 +-
.../30-test_evp_data/evppkey_rsa_common.txt | 3 +-
crypto/openssl/test/recipes/70-test_npn.t | 73 +++
crypto/openssl/test/ssl-tests/08-npn.cnf | 553 ++++++++++++---------
crypto/openssl/test/ssl-tests/08-npn.cnf.in | 37 +-
crypto/openssl/test/ssl-tests/09-alpn.cnf | 66 ++-
crypto/openssl/test/ssl-tests/09-alpn.cnf.in | 35 +-
crypto/openssl/test/sslapitest.c | 370 +++++++++++++-
crypto/openssl/util/check-format-commit.sh | 171 +++++++
crypto/openssl/util/check-format-test-negatives.c | 5 +-
crypto/openssl/util/check-format.pl | 13 +-
crypto/openssl/util/perl/OpenSSL/Test/Utils.pm | 18 +-
crypto/openssl/util/perl/TLSProxy/Message.pm | 11 +-
crypto/openssl/util/perl/TLSProxy/NextProto.pm | 54 ++
crypto/openssl/util/perl/TLSProxy/Proxy.pm | 3 +-
174 files changed, 2312 insertions(+), 812 deletions(-)
diff --cc crypto/openssl/CONTRIBUTING.md
index fec6616e21fe,000000000000..cced15347d05
mode 100644,000000..100644
--- a/crypto/openssl/CONTRIBUTING.md
+++ b/crypto/openssl/CONTRIBUTING.md
@@@ -1,112 -1,0 +1,112 @@@
+HOW TO CONTRIBUTE TO OpenSSL
+============================
+
+Please visit our [Getting Started] page for other ideas about how to contribute.
+
- [Getting Started]: <https://www.openssl.org/community/getting-started.html>
++ [Getting Started]: <https://openssl-library.org/community/getting-started>
+
+Development is done on GitHub in the [openssl/openssl] repository.
+
+ [openssl/openssl]: <https://github.com/openssl/openssl>
+
+To request a new feature, ask a question, or report a bug,
+please open an [issue on GitHub](https://github.com/openssl/openssl/issues).
+
+To submit a patch or implement a new feature, please open a
+[pull request on GitHub](https://github.com/openssl/openssl/pulls).
+If you are thinking of making a large contribution,
+open an issue for it before starting work, to get comments from the community.
+Someone may be already working on the same thing,
+or there may be special reasons why a feature is not implemented.
+
+To make it easier to review and accept your pull request, please follow these
+guidelines:
+
+ 1. Anything other than a trivial contribution requires a [Contributor
+ License Agreement] (CLA), giving us permission to use your code.
+ If your contribution is too small to require a CLA (e.g., fixing a spelling
+ mistake), then place the text "`CLA: trivial`" on a line by itself below
+ the rest of your commit message separated by an empty line, like this:
+
+ ```
+ One-line summary of trivial change
+
+ Optional main body of commit message. It might contain a sentence
+ or two explaining the trivial change.
+
+ CLA: trivial
+ ```
+
+ It is not sufficient to only place the text "`CLA: trivial`" in the GitHub
+ pull request description.
+
+ [Contributor License Agreement]: <https://www.openssl.org/policies/cla.html>
+
+ To amend a missing "`CLA: trivial`" line after submission, do the following:
+
+ ```
+ git commit --amend
+ # add the line, save and quit the editor
+ git push -f [<repository> [<branch>]]
+ ```
+
+ 2. All source files should start with the following text (with
+ appropriate comment characters at the start of each line and the
+ year(s) updated):
+
+ ```
+ Copyright 20xx-20yy The OpenSSL Project Authors. All Rights Reserved.
+
+ Licensed under the Apache License 2.0 (the "License"). You may not use
+ this file except in compliance with the License. You can obtain a copy
+ in the file LICENSE in the source distribution or at
+ https://www.openssl.org/source/license.html
+ ```
+
+ 3. Patches should be as current as possible; expect to have to rebase
+ often. We do not accept merge commits, you will have to remove them
+ (usually by rebasing) before it will be acceptable.
+
+ 4. Code provided should follow our [coding style] and [documentation policy]
+ and compile without warnings.
+ There is a [Perl tool](util/check-format.pl) that helps
+ finding code formatting mistakes and other coding style nits.
+ Where `gcc` or `clang` is available, you should use the
+ `--strict-warnings` `Configure` option. OpenSSL compiles on many varied
+ platforms: try to ensure you only use portable features.
+ Clean builds via GitHub Actions are required. They are started automatically
+ whenever a PR is created or updated by committers.
+
- [coding style]: https://www.openssl.org/policies/technical/coding-style.html
- [documentation policy]: https://openssl.org/policies/technical/documentation-policy.html
++ [coding style]: https://openssl-library.org/policies/technical/coding-style/
++ [documentation policy]: https://openssl-library.org/policies/technical/documentation-policy/
+
+ 5. When at all possible, code contributions should include tests. These can
+ either be added to an existing test, or completely new. Please see
+ [test/README.md](test/README.md) for information on the test framework.
+
+ 6. New features or changed functionality must include
+ documentation. Please look at the `.pod` files in `doc/man[1357]` for
+ examples of our style. Run `make doc-nits` to make sure that your
+ documentation changes are clean.
+
+ 7. For user visible changes (API changes, behaviour changes, ...),
+ consider adding a note in [CHANGES.md](CHANGES.md).
+ This could be a summarising description of the change, and could
+ explain the grander details.
+ Have a look through existing entries for inspiration.
+ Please note that this is NOT simply a copy of git-log one-liners.
+ Also note that security fixes get an entry in [CHANGES.md](CHANGES.md).
+ This file helps users get more in-depth information of what comes
+ with a specific release without having to sift through the higher
+ noise ratio in git-log.
+
+ 8. For larger or more important user visible changes, as well as
+ security fixes, please add a line in [NEWS.md](NEWS.md).
+ On exception, it might be worth adding a multi-line entry (such as
+ the entry that announces all the types that became opaque with
+ OpenSSL 1.1.0).
+ This file helps users get a very quick summary of what comes with a
+ specific release, to see if an upgrade is worth the effort.
+
+ 9. Guidelines how to integrate error output of new crypto library modules
+ can be found in [crypto/err/README.md](crypto/err/README.md).
diff --cc crypto/openssl/test/evp_byname_test.c
index 000000000000,e16e27a3a5ec..e16e27a3a5ec
mode 000000,100644..100644
--- a/crypto/openssl/test/evp_byname_test.c
+++ b/crypto/openssl/test/evp_byname_test.c
diff --cc crypto/openssl/test/recipes/04-test_conf_data/oversized_line.cnf
index 000000000000,08988a2e0f1d..08988a2e0f1d
mode 000000,100644..100644
--- a/crypto/openssl/test/recipes/04-test_conf_data/oversized_line.cnf
+++ b/crypto/openssl/test/recipes/04-test_conf_data/oversized_line.cnf
diff --cc crypto/openssl/test/recipes/04-test_conf_data/oversized_line.txt
index 000000000000,c15b654300c7..c15b654300c7
mode 000000,100644..100644
--- a/crypto/openssl/test/recipes/04-test_conf_data/oversized_line.txt
+++ b/crypto/openssl/test/recipes/04-test_conf_data/oversized_line.txt
diff --cc crypto/openssl/test/recipes/30-test_evp_byname.t
index 000000000000,d06e874fe927..d06e874fe927
mode 000000,100644..100644
--- a/crypto/openssl/test/recipes/30-test_evp_byname.t
+++ b/crypto/openssl/test/recipes/30-test_evp_byname.t
diff --cc crypto/openssl/test/recipes/70-test_npn.t
index 000000000000,f82e71af6aca..f82e71af6aca
mode 000000,100644..100644
--- a/crypto/openssl/test/recipes/70-test_npn.t
+++ b/crypto/openssl/test/recipes/70-test_npn.t
diff --cc crypto/openssl/util/check-format-commit.sh
index 000000000000,7e712dc48cf6..7e712dc48cf6
mode 000000,100755..100755
--- a/crypto/openssl/util/check-format-commit.sh
+++ b/crypto/openssl/util/check-format-commit.sh
diff --cc crypto/openssl/util/perl/TLSProxy/NextProto.pm
index 000000000000,0e1834754667..0e1834754667
mode 000000,100644..100644
--- a/crypto/openssl/util/perl/TLSProxy/NextProto.pm
+++ b/crypto/openssl/util/perl/TLSProxy/NextProto.pm
From nobody Sun Sep 8 04:36:12 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1cbx0wcGz5Vr0C;
Sun, 08 Sep 2024 04:36: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 4X1cbw5DT2z44H1;
Sun, 8 Sep 2024 04:36:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725770172;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sdkSQf5Sav8RGS7176qX99vNy9oVFSxYkq274vmqv+I=;
b=hcu3oR6TuWnW6EpyiQjY+6EWyz84S66JuT3sMgw7iUkxHadQaq1fBJ/XWIUe5xL+wydhgt
mIk2xUE8BK+WWRqXeZF8gQZKxsOsZa+eAlqJCUakqyGbkE+5cDP3rk3Aol29Vr/xjqeoUY
6lbqRO0hjJOiW9V+oGujRoxLrUGWMLgqZD02h5Riekyzi4hLBvL+/y7vvIzkMt4krBMNzQ
iYeWYeGSqePCFprZUpi9UG5kzpPKLsDgrfuXJAF+eMFBs7FZMVuxLjdYnw3u/CgUPgp1Je
tVk+k2SeQpUrKJFGLf18TgY9ifMNqPq5G6iPRzq5TZ2tBtdE4AEGFAIGbA6Orw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725770172; a=rsa-sha256; cv=none;
b=PRcNHu6CkFrgZj0w2AC6y2cICForaHeV7865yoh85k2wjMq1KdB3rSGzsQUNnZGKc+16XD
w6ZeWuEvytcJZVvGmB64sMbaYrazvF2EeaOTP97pcCQ3U9hOjRLSIUEY5IhnfC4T0bT6Ee
9saltWU3mGNGbJLC1HqnvgKXTqWlGb4tGC7Qs0QZI75ezYDKdSqoM8ejhDRcB8/5yZf78c
ttH0PZT7xekz+ZSXt6HHvPCkzUiibIA5OGwLTEoy1YkeMzQPHncoiIA7kM5oaxpLVRh+zr
8Ya2N0BA+VlulK+68bAKXTCiRWunyQxCZCE310AJL3NergMR+/IbECJxQ1w8sw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725770172;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=sdkSQf5Sav8RGS7176qX99vNy9oVFSxYkq274vmqv+I=;
b=aoZooQptU+oZcINt8BSfpftvZirc0F0vaCGJI6C1+sBNBubbZ9bum5dkyeYyXzeVn9ieSl
/ecg9UXdFSbiDt/rw/iQpcjdTnxYDXM3LNtr2GDirnEQsvQ7Ei/RNra53jkN1Crt7QwJzs
nHvehLOf3mDxIno5cvf7OlVnKblZTUxjZR65dG0u9T/cWbRRY8ATVGgboz6RdOB8U+YSJQ
TtwlPmuge/+THmZ/UfoyDq7eKjIlNUWzXznNbNd3PIdERd4jdQ9BIHzbYVElFN0E0ZQyEC
7hCLD77zQ4INyyI+IPQUcq/Ucro+RRFeF6nCOLtdwzhowY84DNNy8Lkgj+meRQ==
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 4X1cbw4XsSz14g1;
Sun, 8 Sep 2024 04:36: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 4884aCEl087013;
Sun, 8 Sep 2024 04:36:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4884aCF7087010;
Sun, 8 Sep 2024 04:36:12 GMT
(envelope-from git)
Date: Sun, 8 Sep 2024 04:36:12 GMT
Message-Id: <202409080436.4884aCF7087010@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Enji Cooper <ngie@FreeBSD.org>
Subject: git: cc717b574d7f - main - Update config/build info for
OpenSSL 3.0.15
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ngie
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: cc717b574d7faa2e0b2de1a985076286cef74187
Auto-Submitted: auto-generated
The branch main has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=cc717b574d7faa2e0b2de1a985076286cef74187
commit cc717b574d7faa2e0b2de1a985076286cef74187
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2024-09-08 04:34:18 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2024-09-08 04:34:18 +0000
Update config/build info for OpenSSL 3.0.15
This is a companion commit to the OpenSSL 3.0.15 update.
`opensslv.h` was regenerated via the following process:
```
cd crypto/openssl
./config
git reset --hard
gmake include/openssl/opensslv.h
```
`Makefile.inc` has been updated to match.
MFC after: 1 week
MFC with: a7148ab39c03abd4d1a84997c70bf96f15dd2a09
Differential Revision: https://reviews.freebsd.org/D46603
---
crypto/openssl/include/openssl/opensslv.h | 10 +++++-----
secure/lib/libcrypto/Makefile.inc | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h
index 537144b32e97..dd0aece423cd 100644
--- a/crypto/openssl/include/openssl/opensslv.h
+++ b/crypto/openssl/include/openssl/opensslv.h
@@ -29,7 +29,7 @@ extern "C" {
*/
# define OPENSSL_VERSION_MAJOR 3
# define OPENSSL_VERSION_MINOR 0
-# define OPENSSL_VERSION_PATCH 14
+# define OPENSSL_VERSION_PATCH 15
/*
* Additional version information
@@ -74,21 +74,21 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.0.14"
-# define OPENSSL_FULL_VERSION_STR "3.0.14"
+# define OPENSSL_VERSION_STR "3.0.15"
+# define OPENSSL_FULL_VERSION_STR "3.0.15"
/*
* SECTION 3: ADDITIONAL METADATA
*
* These strings are defined separately to allow them to be parsable.
*/
-# define OPENSSL_RELEASE_DATE "4 Jun 2024"
+# define OPENSSL_RELEASE_DATE "3 Sep 2024"
/*
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.14 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15 3 Sep 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 16a2c15bc962..e7072213d509 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -1,8 +1,8 @@
.include <bsd.own.mk>
# OpenSSL version used for manual page generation
-OPENSSL_VER= 3.0.14
-OPENSSL_DATE= 2024-06-04
+OPENSSL_VER= 3.0.15
+OPENSSL_DATE= 2024-09-03
LCRYPTO_SRC= ${SRCTOP}/crypto/openssl
LCRYPTO_DOC= ${LCRYPTO_SRC}/doc
From nobody Sun Sep 8 16:45:59 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1wnz5X07z5VPNK;
Sun, 08 Sep 2024 16:45: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 4X1wnz4zBBz4SSF;
Sun, 8 Sep 2024 16:45:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725813959;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=FQcXruEPDwdyYgeCA9VtFdILtqu0E+vp1XD3CBtFVrM=;
b=cWdc0FoCxVoOxH0Gxyup8Br6azTINmD5ZrpYJLnmCnubgdqbW47mDNbK4omCjGEEPNZGDn
c+lV5gAejQZE2UlBgeBOD470HyroREQZQ0cq4FcEoT88crYB4AqL4K6cdHqjakQ3Uyc8jn
q+f6Fak7HVb85RY+ySx9fG3U6f63FK8KSUYtDKY+Fll7N24o5pW8ZAbaT0pCR7NVfZMzse
Wf/aXoT0mDH2aveink8GPvtq8HOOZCq5vRUF8uxz/aXbwbQhcQjxpY4zlCsJmcsB99xBzI
3mAVxxVMe94I7NkL9ufTizqzmlWAwfkc+pJ59yMOqy1/up8j7WzF6e2YJD+0LQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725813959; a=rsa-sha256; cv=none;
b=GrpZbpyXKyP4g8t6zno5JHa97FzKitBo4zky6kM16E7DFVjsG28ZjK3RQD1fxMtNnn1dCk
ujSnHgeq0fBi7s7MfhkaSEmXjWaUULxyhmfWeN0hgW/w/ZG2wjM4/Z3xhoGNP+iEY89tQB
OQAUuCkS221Jof+5OeNzXQ2RU1cqGVV1eu/KMNRZc2Re5viQ3QWLEOqBN50LVGN0e7jm7J
6qjW4+dA0nB3J02n5fE+S+SfoN5JKcAlDrHtzJuAmOHzr/GBDwc+UlRwY5ulAaip2yohvN
xCPWBgxUC4e1zMz0YigWV+TIeNmJ7vgYIuhgWPuz8z8WG3jR+GgNmSTofIxuKg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725813959;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=FQcXruEPDwdyYgeCA9VtFdILtqu0E+vp1XD3CBtFVrM=;
b=C5lMzsdkFa4E1/RPGxipwKuDHk1NiXW+y2eyq6fitP/61+Hh6kgsIIWodudZmPCcqPUs5l
BsRLp2XktuSvs+jJ2oGsr3NPFctw0AKmGtcI2wOhqwgOw/06owuYGIEsRwZOp28SCwR/Gf
wfId3IW90NVZuLoRZwwHKNBlrYHqQ/d0kDbQXzehmZuTSlSuIp/+l7fxs4/lxePj5FOzU8
fgKEBh2SbTijO+UzzLKiwf8BhjSUvJZKZnN6VAGPk/Czaxu1LDYOqqK/80HybOmPtucsqh
GsbZBmGeHqSyPtqM+lYgd0eCYJG4bdPpIx86JSs9D4g8IEpMyVKj/zMDCSnyFw==
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 4X1wnz4ZVWzRdR;
Sun, 8 Sep 2024 16:45: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 488GjxSI022913;
Sun, 8 Sep 2024 16:45:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488Gjxun022911;
Sun, 8 Sep 2024 16:45:59 GMT
(envelope-from git)
Date: Sun, 8 Sep 2024 16:45:59 GMT
Message-Id: <202409081645.488Gjxun022911@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: cab90be6a580 - main - openssl: Remove the specific
version numbers from the instructions.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: cab90be6a580a23351d46324550a0323dc9cf7de
Auto-Submitted: auto-generated
The branch main has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=cab90be6a580a23351d46324550a0323dc9cf7de
commit cab90be6a580a23351d46324550a0323dc9cf7de
Author: Gordon Tetlow <gordon@FreeBSD.org>
AuthorDate: 2024-09-08 16:45:31 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-09-08 16:45:31 +0000
openssl: Remove the specific version numbers from the instructions.
---
crypto/openssl/FREEBSD-upgrade | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/openssl/FREEBSD-upgrade b/crypto/openssl/FREEBSD-upgrade
index ebe2d85bd8f7..86e65e8e07dd 100644
--- a/crypto/openssl/FREEBSD-upgrade
+++ b/crypto/openssl/FREEBSD-upgrade
@@ -15,8 +15,8 @@
02) Download the latest OpenSSL tarball and signature from the official
website (https://www.openssl.org/source/).
- $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz)
- $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz.asc)
+ $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-X.Y.Z/openssl-X.Y.Z.tar.gz)
+ $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-X.Y.Z/openssl-X.Y.Z.tar.gz.asc)
03) Verify the signature:
From nobody Sun Sep 8 17:59:45 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1yR60Ymcz5VZrj;
Sun, 08 Sep 2024 17:59: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 4X1yR56rk5z4jFP;
Sun, 8 Sep 2024 17: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=1725818386;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=z0kIndkGz/WdDW7FVrDcmo/VI9TdB2UwGVUkZYFqKoE=;
b=b49F2PUtfE7buWXips4CPi9B8xdE4BmFS4PnmXpUJckZ7XTaOrCw3y0OwWGL8vJVVfMFyE
3hGsYcFg7br/9dghURLhbkMz68LeYvt1o+JeLNbE87qH25S5V2Vu38FUybS85BkbWoG9C8
KVpZxFz0cFvMxKqdZCxUL2s0A8NV78LaFHDj8CZPnIeTcVjP02YMdvkE0FJpxn58PYPIHt
rVrrarovHcxgDmeOgCo5gEPx5NLjXYo4lwLQCx8FLKIODas9YMysYg4qbeo/HVRWrjo7D4
V8RoH1lDLgKhO/knIedmcY5lt84mfKjMSxHOjZntLmhQWwa4zdhkCjJTI5zT3A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725818386; a=rsa-sha256; cv=none;
b=G8q7PUtkdu7p3imzw5tn/sUiHLbA5qwALjqSP6dSmU3VEjuM8tIbPWs9D7rkyWqT8462mz
IpBDcPQpuvvgM+LfeGBP0I/bMND7m4xfGUaXsBGeWnQMaeokL3AlbO/YrjdAeMlPReCQvz
fMh6cNMqKqSdAmZ7twF5se7U8dY9+uH9nlOb0AcTKtWoLAOkCoZPlHky5iVsqGC49zxhoV
wxS8KKqNnycNsbo7lbcjZ1kzB2mzp6OPzst65r3ti5p1sQmmtfX1n11fcrFaqTsmoSBK9g
7Be3Ou9oyncYURKBpkQ4MI4mRVyV/sA1d9k9kQrqD5klcSxDojZGwvdaAw80+A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725818386;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=z0kIndkGz/WdDW7FVrDcmo/VI9TdB2UwGVUkZYFqKoE=;
b=PC5R8ydu59vsD3/slPMXtOyxpC6IC66LMt4Y/UBgVDyuSTvdE3WvjfuCrbBUFV4hloK5sw
Aq4d2N808wsdHHXIoKNbYZxX0vPwY6HC82EUvkbUwDhIhMXyKFeT85YSPVWGNymVPQZ1sd
prvuF7yze+czu8biCJtbizzk+ovYKW04eIJBYOzpkML7IirJJITnR3ZXeBZ5Uv7eAqVsEG
qSvNpR0del0eRMn3fa5hQ3p2LiEePQqq4kYJKPZvqXBsmdbeZ/ExCPqCoWKMWxgFqDKPs6
T/mt9uCTq3T6iLftwnOcAFPTLzY2GH/QYNUhVZxYQZ33yEEPiEI70kkmjWUnyQ==
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 4X1yR56RrnzTPm;
Sun, 8 Sep 2024 17: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 488Hxjup043798;
Sun, 8 Sep 2024 17:59:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488HxjIQ043795;
Sun, 8 Sep 2024 17:59:45 GMT
(envelope-from git)
Date: Sun, 8 Sep 2024 17:59:45 GMT
Message-Id: <202409081759.488HxjIQ043795@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: a05decec2d19 - main - if_ovpn tests: allow these tests
to run in parallel
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: a05decec2d194821f8bf5c8f2ae72063de0c87a8
Auto-Submitted: auto-generated
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=a05decec2d194821f8bf5c8f2ae72063de0c87a8
commit a05decec2d194821f8bf5c8f2ae72063de0c87a8
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-09-06 16:47:06 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-09-08 17:56:20 +0000
if_ovpn tests: allow these tests to run in parallel
Now that kyua can isolate tests in their own vnets we can run these tests in
parallel.
Reviewed by: markj
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D46600
---
tests/sys/net/if_ovpn/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/sys/net/if_ovpn/Makefile b/tests/sys/net/if_ovpn/Makefile
index 823ad06e76ee..85746226e122 100644
--- a/tests/sys/net/if_ovpn/Makefile
+++ b/tests/sys/net/if_ovpn/Makefile
@@ -6,8 +6,8 @@ TESTSDIR= ${TESTSBASE}/sys/net/if_ovpn
.if ${MK_PF} != "no"
ATF_TESTS_SH+= if_ovpn
-# Tests reuse jail names and so cannot run in parallel.
-TEST_METADATA.if_ovpn+= is_exclusive=true
+TEST_METADATA.if_ovpn+= execenv="jail"
+TEST_METADATA.if_ovpn+= execenv_jail_params="vnet allow.raw_sockets"
.endif
ATF_TESTS_C+= if_ovpn_c
From nobody Sun Sep 8 17:59:46 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1yR72zjSz5VZxc;
Sun, 08 Sep 2024 17:59: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 4X1yR713HLz4jTC;
Sun, 8 Sep 2024 17:59:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725818387;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=hYz4rO6RnE84q3LMh/LWHyqwalT8KQr/SgWoZNaiTlU=;
b=TxL5fH0buddw0P6jzRNa1u6e6sazdFoHnG7Q2nfhOtxOlFWR9JOJAhFzpLeR6ru26YKT5A
ib2wxhthyea31jXmfiuLPI6Ubo28u2U7U5HDVI07iv2nZXy9reB9EnXAllKSkoNI72YZAF
KFWCzoFBP9Jfatwx0MVONiY02sLtLt0r9zYFjy3w0LXDk7fVB+oQY9qij/I8cK6K0LYBvp
FX+5WKI0Rt9eSMlMoruq4eUBS3gM8t2iW9cdQsjcUDlvyuPg7k8E0vfs51lZ7xzuC6c+9Q
VI6iNaTE9pt/T8Ur9GIPy+Q8+DFhLdmqU6qib5Ir3C4MQDYD9Cgor/x7a47kHg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725818387; a=rsa-sha256; cv=none;
b=gYzFx51X4NHLV9T8EkEtF1P3RepMvyjRUW4HtIEeEJDxz3UwmnTtSrkx27OLRsHl9Z2XRd
QQX0GlVszMqFq+3pmIOGzOx4Esq6DM0Myda6KRxbLPXRBL1CiaH7FMucml1Zfq0ZFsBqWk
a9YFPXJn+Jj2vnaeu0eWv0hJzRgLczi5DbJv3S8IFa26pX68r/8qnCeyRIzL/6ADVPY+dY
j4Llyjy/GHYgyU1PVK2sffG8GXEE2bRQW7HA/ATevOHYkKEHfLfM5Oj62/sLUkKe2v2ILz
3/466pGFmBE66uFSw+AChrwrA/b1Yzfuk+gpS1scyxOdp4ibKs8t5cX/B30EQw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725818387;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=hYz4rO6RnE84q3LMh/LWHyqwalT8KQr/SgWoZNaiTlU=;
b=GIdLQq+hR+vJe7uNJlehB8lASJIMvuGODDLURhmtpEDMUMWD7qv9SSmOycDClYm69Z7Wqq
xO+2zoEZGAtNXLKuGNYU3VXobKAfY86H9nuJ1x4I99F+qOlxD6Wkr3MY8s98LXBMu+dmTk
z3Y8q8IZlw1rrng93/yvwt8m2fvh7u4Go1dPQp2nq5HqgBVjOAV9drRMLHbvnvHTPwhAB0
dBUT6PC+WUnHeayn9/5PZPUmW53BdC3rhnZAO4/U+7z2uR8joe0pEUQVFaJbCU3l0nJ7ZW
QJcLEvxQYGvlyZgsVj2Vpgbp/b+4ojP5B63y1dmPzcLddvxHSbhtwCPpm45VDw==
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 4X1yR70fT6zTcH;
Sun, 8 Sep 2024 17:59: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 488HxksX043849;
Sun, 8 Sep 2024 17:59:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488Hxk9h043846;
Sun, 8 Sep 2024 17:59:46 GMT
(envelope-from git)
Date: Sun, 8 Sep 2024 17:59:46 GMT
Message-Id: <202409081759.488Hxk9h043846@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 550133f1d488 - main - pf: ensure we exit net_epoch
if pf_keth_anchor_nvcopyout() fails
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-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: 550133f1d48882418d4ef6205020b8e06cfd23ec
Auto-Submitted: auto-generated
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=550133f1d48882418d4ef6205020b8e06cfd23ec
commit 550133f1d48882418d4ef6205020b8e06cfd23ec
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-09-06 14:47:27 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-09-08 17:56:20 +0000
pf: ensure we exit net_epoch if pf_keth_anchor_nvcopyout() fails
Reviewed by: markj
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D46599
---
sys/netpfil/pf/pf_ioctl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 64086bf08871..8d18da6cf0db 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -2951,8 +2951,10 @@ DIOCGETETHRULES_error:
NET_EPOCH_ENTER(et);
PF_RULES_RUNLOCK();
nvl = pf_keth_rule_to_nveth_rule(rule);
- if (pf_keth_anchor_nvcopyout(rs, rule, nvl))
+ if (pf_keth_anchor_nvcopyout(rs, rule, nvl)) {
+ NET_EPOCH_EXIT(et);
ERROUT(EBUSY);
+ }
NET_EPOCH_EXIT(et);
if (nvl == NULL)
ERROUT(ENOMEM);
From nobody Sun Sep 8 19:43:36 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X20l017FPz5Vwcc
for <dev-commits-src-main@mlmmj.nyi.freebsd.org>; Sun, 08 Sep 2024 19:43:40 +0000 (UTC)
(envelope-from shawn.webb@hardenedbsd.org)
Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42])
(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 4X20kz1qvDz4D2N
for <dev-commits-src-main@freebsd.org>; Sun, 8 Sep 2024 19:43:39 +0000 (UTC)
(envelope-from shawn.webb@hardenedbsd.org)
Authentication-Results: mx1.freebsd.org;
dkim=pass header.d=hardenedbsd.org header.s=google header.b=F7PXuGIp;
dmarc=none;
spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::d42 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org
Received: by mail-io1-xd42.google.com with SMTP id ca18e2360f4ac-82cdadeeb2eso39446739f.2
for <dev-commits-src-main@freebsd.org>; Sun, 08 Sep 2024 12:43:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=hardenedbsd.org; s=google; t=1725824618; x=1726429418; darn=freebsd.org;
h=in-reply-to:content-disposition:mime-version:references:message-id
:subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to;
bh=J6KwfeD0oXaojneNKnuqFwywfEpZ/gp5d+aMWVjj8IU=;
b=F7PXuGIpn5OwWmZTfYw3WQceU8VYgCLfudKuMW66ueWaa5+QdcxsWioBp+z/eWyqrx
7g4S/aVaMb5x4i3mlgGy9bCnjAdtUwSfDYDyf+SukBv8chhhkN1t8GFcEpWVkDVpjEpc
8IcePvmCQWmfTOqh+CJ/80BNw4utZNVzk+4nbkPVRkoy0PtZyS3tHEqKaHZyvQcrCM6B
hfAMu8dRm3qFBy3pJRL8FRYGqO1IHibXIqZdVOLhjYO6X8MdDxUPp/ru5zMr4j181qSa
rVZdXyqNkfRY0ZYLdRjkhQMaCfNZheYxpTXK1wYLwRYT0sQftTcAsFARUuz04OZFfOMY
wolg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1725824618; x=1726429418;
h=in-reply-to:content-disposition:mime-version:references:message-id
:subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=J6KwfeD0oXaojneNKnuqFwywfEpZ/gp5d+aMWVjj8IU=;
b=C5O84TfVEZeNbcNhDcNqTepU2T8XaVurB6LDfofqOfykhk10Ps69VJxz9e7hz9MlyJ
KL8v5RQmhGeC4qdxsPoXAjhpdvlep1l5qWwSRQvses1aOgwEUG3SxQd4w8LGn9h5Qq64
aEui3RPoyyzmpM4wOKqzU//Ks8RZd6vFXrheMBe/dGXcHZwpYrbnfFJVzkuFRSLCvac5
4nRDjq4QStOKE0S4x534u3nnmtstL6OKHLfmkLilFYsLBYcitqQChxZdc4LtY0UcHITA
ccdrAcoA3kpLMHEKKNSVN7wfKa7sCi2hvKsF5J+DwCnAsq6LIZTrBXJRZWxSBIyp9nIh
2yEg==
X-Forwarded-Encrypted: i=1; AJvYcCUeG28FqoyXZ8sTN97r73TGtBgYXknHrAsaGNjb+S9o8/OH76n1S1kKsPs+xcODmFm/ODjrLKnA9f7He83yXiHR/2vOnA==@freebsd.org
X-Gm-Message-State: AOJu0YwQnA9XaHWMZpvF0mE4f2/IwLWKudwPGGtEk5BK/xRX0SjbmMcU
IMQ83WYnW8wVnqwX/XXMxR6vDECi4OlPa7ArMWMCjTUOwiGlyx9B6abVIKlr0/9n+LJHIWv8s8z
Lf1gTHg==
X-Google-Smtp-Source: AGHT+IGSpn8o1k9NfZH7WInrlyPvcn3YcUUmDvUhdq1QtqlXUtfoRn2xWizdOzuOw91rlfRxLercDg==
X-Received: by 2002:a05:6602:1607:b0:82a:309c:488f with SMTP id ca18e2360f4ac-82a962131b6mr660144439f.12.1725824617743;
Sun, 08 Sep 2024 12:43:37 -0700 (PDT)
Received: from mutt-hbsd (174-24-73-190.clsp.qwest.net. [174.24.73.190])
by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4d094562512sm763555173.60.2024.09.08.12.43.37
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 08 Sep 2024 12:43:37 -0700 (PDT)
Date: Sun, 8 Sep 2024 19:43:36 +0000
From: Shawn Webb <shawn.webb@hardenedbsd.org>
To: John Baldwin <jhb@freebsd.org>
Cc: Mark Johnston <markj@freebsd.org>, src-committers@freebsd.org,
dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject: Re: git: e962b37bf0ff - main - bhyve: Do not enable PCI BAR decoding
if a boot ROM is present
Message-ID: <jzmieezb3tr2ub24lv6ijak57omugwh5zgxvhzvwrknxhnu3yq@fdy6jze3rhlv>
X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD
15.0-CURRENT-HBSD
X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
References: <202408191359.47JDxAbK026029@gitrepo.freebsd.org>
<qkp2zbmykgwsbrxekut35rexlktypzg5oj2bbfslig7eksprpi@2lw5x47mtytp>
<7213e551-6be2-44b1-a8b6-55645c593c12@FreeBSD.org>
<spdohps7mmfirvxtxnv25nga5spycopqxol3vekfrptsmeo7p4@5jbif4bvvle2>
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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-sha256;
protocol="application/pgp-signature"; boundary="d3c3vavkuh42wyjl"
Content-Disposition: inline
In-Reply-To: <spdohps7mmfirvxtxnv25nga5spycopqxol3vekfrptsmeo7p4@5jbif4bvvle2>
X-Spamd-Bar: -----
X-Spamd-Result: default: False [-5.08 / 15.00];
SIGNED_PGP(-2.00)[];
NEURAL_HAM_MEDIUM(-1.00)[-1.000];
NEURAL_HAM_LONG(-1.00)[-1.000];
NEURAL_HAM_SHORT(-0.98)[-0.977];
MID_RHS_NOT_FQDN(0.50)[];
R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c];
MIME_GOOD(-0.20)[multipart/signed,text/plain];
R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google];
ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US];
ARC_NA(0.00)[];
FROM_HAS_DN(0.00)[];
MIME_TRACE(0.00)[0:+,1:+,2:~];
MISSING_XM_UA(0.00)[];
RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::d42:from];
TO_DN_SOME(0.00)[];
RCVD_VIA_SMTP_AUTH(0.00)[];
DMARC_NA(0.00)[hardenedbsd.org];
MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org];
RCVD_COUNT_TWO(0.00)[2];
FROM_EQ_ENVFROM(0.00)[];
RCPT_COUNT_FIVE(0.00)[5];
TO_MATCH_ENVRCPT_SOME(0.00)[];
RCVD_TLS_LAST(0.00)[];
PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org];
DKIM_TRACE(0.00)[hardenedbsd.org:+]
X-Rspamd-Queue-Id: 4X20kz1qvDz4D2N
--d3c3vavkuh42wyjl
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, Sep 06, 2024 at 04:30:07PM UTC, Shawn Webb wrote:
> On Fri, Sep 06, 2024 at 09:37:45AM UTC, John Baldwin wrote:
> > On 9/5/24 22:10, Shawn Webb wrote:
> > > Hey Mark,
> > >=20
> > > This commit seems to force me to now pass "-o pci.enable_bars=3Dtrue"=
to
> > > all my VMs on amd64. I wonder if that might be a POLA violation. I
> > > didn't realize that I needed to set that until I bisected the src
> > > tree, looking for the commit that broke bhyve for me.
> > >=20
> > > Is changing the default here really worth it for amd64? If so, I'm
> > > thinking this should be in both RELNOTES and UPDATING. I now have to
> > > propigate re-enabling this across my entire infrastructure.
> > >=20
> > > Thanks,
> >=20
> > That should only be true if you are using an older UEFI firmware that d=
id
> > not program BARs. Are you seeing this on stock FreeBSD, and which vers=
ion
> > of the UEFI ROM are you using?
>=20
> Ah, thanks for the hint, John! My UEFI edk2 bhyve package is years out
> of date. I guess I need to pay more attention to what `pkg upgrade`
> does NOT upgrade:
>=20
> hbsd-laptop-02[shawn]:/home/shawn $ pkg info | grep bhyve
> uefi-edk2-bhyve-g20210226_1,2 UEFI EDK2 firmware for bhyve
> uefi-edk2-bhyve-devel-g20190424_1 UEFI-EDK2 firmware for bhyve
>=20
> hbsd-laptop-02[shawn]:/home/shawn $ pkg search bhyve
> edk2-bhyve-g202308_5 EDK2 Firmware for bhyve
>=20
> I'm building some packages on my laptop right now. Once that finishes,
> I'll go ahead and upgrade to the new package, retest, and report.
>=20
> If this is indeed the problem (I suspect it is), I apologize for the
> noise. Thanks, though, for the hint and the help. :-)
The issue was indeed the out-of-date EDK2 UEFI firmware. Sorry for the
noise, but thank you very much for the hint!
--=20
Shawn Webb
Cofounder / Security Engineer
HardenedBSD
Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50
https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A=
4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
--d3c3vavkuh42wyjl
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmbd/mAACgkQ/y5nonf4
4fq+Sg//eq8ePmxbzQh8ANFUeX6/XdsLYeorRytMRaoea0ZnKfey+H0X+/pRDTkz
NLbfmwKDf2PmpLCVODwPpP4b8D+yhTlV87eTqFfb32xa+uptTXHeXnFkb7JTy3wm
GqJHOPAcI033voDo9ch7hFVxPOpGaBIMVjUXlsJz/u+8M3JPTWWIM+LBz1+O6mQB
L/jE2NcbVdwoocljz+mlAwK7mfaQPcckAWHf5Sy/eP55cMyKdH1glfhcRRW90HRS
U/E0+dLD5bwbsSpHj4yArp/7nYwcMjqbB5FZX7hloTpvRq1XLxFkTxKP0SUZwWtA
r0pAg9LxSVOPar3hchPpg8Wbvs+0FxE0CnaE2mVmD99VxAaUQFuKmPYhij6xvWlo
WL9ifridoKKQePczhFUW+dLXG3ev56bFDzGIjIlWbeusPGjI0Z1POa5YV8LYE/q+
ltKFVwyHDIGUJFB1HJIc6QAshExp8tYoBG1jxR4n8zDUBLR2ETuFAZF6dc4fZ/LA
p5G8HuiEOQJgzHzb6zKlOwE2jsc9W/yTBU42ng4OUdAgaL7+/YhfZdEUk7g/Y48P
DYLAcOPWYnah53HF2QnJ8Z96jyXdjorJtdkOpUHCYpEk0mLWeL92WxBe2A+HSSJz
Z/BAttQC84RGi3EBru5iiA8vs/u/kgszdRaHFJtxH8k0nnj9bPs=
=sUwR
-----END PGP SIGNATURE-----
--d3c3vavkuh42wyjl--
From nobody Sun Sep 8 20:50:52 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X22DY0vKmz5W5Qs;
Sun, 08 Sep 2024 20: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 4X22DY0Q5vz4LXh;
Sun, 8 Sep 2024 20: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=1725828653;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=w9eYiLxI+yHEeY+7gY2/YVuRk24NR6StRmD4F5I5Nps=;
b=Z2Hi9PnT6Ep9XdIBbcIortX2AVZKxWQVThI/7vI3UIa23pnoUCnsxbtIDYITvG+DIj3f69
BNaQxAa8yfpuZFVu59lDPk4wR6l1lbjUpJXRH73lIS8LQVmZYHQNJatxz11B7vaReIL06S
l4k6FL/c+BHyUztDvoMP4mbd0GtZJCGOQrFNXLDjfvPJ3I4hBa018tMPoSCIXpoo8euVOr
ZddhSkEEYS8v2dBfZotHfccR4Yt+37p9y9p6khDUlDeOAcPCy8fdTr1oMbWcPrz6X1ZzXL
1kwXUlBpaiNW18DdCp8M/cCTWNA6Cqe/j7HpQKdHk8zx7A3gKNdML9BxybNlGg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725828653; a=rsa-sha256; cv=none;
b=Xtqkc5YM0Afx9ZExTF9gMcHesoIfbrXpcfQabV7VS2pCGvDWqK6MBfY8+KAhBZ6vGiPuTH
9Drjs5nGzV/Ohlge9KGYBQbrL/srLeWyIF8hjTNRgp3Mn0Zr7zop2kntuxq3sc1J95VsZ4
bdGeu+nQma1YCsHov2Ch2K+uTZEJXHVy0pMEFd84/ICrrLEF+UvA9t0AarScAnBL+qEuvJ
Oi1khGvV3tfILzjKoJvy3QXubE9b6WsfaP3WoAwbOcJmsQlfvVDscOMhGCI5A78ts9issz
/Ig/G9cRt6V++K+m3/24R3000k42BFkohfjmaJqpOyKFiXrRrQMCfkIk+R26XA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725828653;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=w9eYiLxI+yHEeY+7gY2/YVuRk24NR6StRmD4F5I5Nps=;
b=Kfq4o/Ze28IQfm7Ud0qCn0lQ4007QDn5Nz8tRnPZbVhXdgvVZ9hVAR4ERxMJNC0/d/WZGe
vS4SabJaTDM1AVZE670YW5iCh+dEeohgOdu/VEm/rkXU+yURrvl6OeNWlyZdIR6bP+stJR
Xv8ubzKFX/iuZXJiA+RBM/MAP9m9GY9bkc5ZTqhVrW7aMnk8+ElywOc/jbSCNe84xR4WRk
kG2PTWnsuEU8Ek6KjqZU8vyUZHMRX65TIxTyFv5LDwDK4WNErRkj4NsE7xXYvx94Uscvb+
zhXNgS4HgEpm5Z/m9pEy1f879HtqKd3xR2RthA1XNxk/0TUhertnJXWqj5gk9A==
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 4X22DX75C9zZXP;
Sun, 8 Sep 2024 20: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 488Koqh8079351;
Sun, 8 Sep 2024 20: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 488Koqi4079348;
Sun, 8 Sep 2024 20:50:52 GMT
(envelope-from git)
Date: Sun, 8 Sep 2024 20:50:52 GMT
Message-Id: <202409082050.488Koqi4079348@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alan Somers <asomers@FreeBSD.org>
Subject: git: 967b3685a44e - main - nfs: spellcheck a comment
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: asomers
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 967b3685a44e6a6b0d154c0954d48c6a117e91e6
Auto-Submitted: auto-generated
The branch main has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=967b3685a44e6a6b0d154c0954d48c6a117e91e6
commit 967b3685a44e6a6b0d154c0954d48c6a117e91e6
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-09-08 20:47:52 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2024-09-08 20:50:27 +0000
nfs: spellcheck a comment
[skip ci]
---
sys/fs/nfs/nfs_commonsubs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index f0469958a43f..47ab4958f9c5 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -3437,7 +3437,7 @@ tryagain:
/*
* If an '@' is found and the domain name matches, search for
* the name with dns stripped off.
- * Mixed case alpahbetics will match for the domain name, but
+ * Mixed case alphabetics will match for the domain name, but
* all upper case will not.
*/
if (cnt == 0 && i < len && i > 0 &&
From nobody Sun Sep 8 21:57:22 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X23jH1qW9z5WFvC;
Sun, 08 Sep 2024 21:57:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X23jH0tTbz4b32;
Sun, 8 Sep 2024 21:57:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725832643;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=C8cjnwXGWa23WGbMtJx/wHPJzAeoJOaxxF3ozGa6SeY=;
b=EcxJpFagiYrHhrZfSNi7R2QHrTARO/35RJGLoZMBdjMShmN7YB5stR5SAwUIqtMLLwkTmv
IbaaDyuCx1wKio/GVErXcwcpwvLij1PXvtCsZ09pRlwd+FPcCs2XAsXnRzyww53Jx/5sZt
YewLvSNjEZ9ISN4q6Cpnsy/OEoj4pHobdOow+VyUC9CDGIqwgSiZ5hTmQ8+Oe+hqKlfiys
kw3TIj5gZ/LTwRoWz4R88cfxAKmZmbkjJQAY73TxEE/yMn5tME1Dz+KGbGsIjBiC1yuixp
oUWrLw7KuV4OsoKm8/v0ZHgEDU7IKV93ihXEHWVloSsBNndNIbLPm2BOxQUqbQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725832643; a=rsa-sha256; cv=none;
b=KebE3cGkXHODAzaWIJlemVlsExk9zXqcdZ38b6H9PtwLzPnRzqgaM7vP1aNay13XbqTp4K
NgheHLLE6RTCSOhqPIU+9yw/jGS3QiEUC9Kxan4YEQTSZa7YtIJPfynN09tSrasFyWxEkx
iXKkCwNMUy6WvyFKEIGNh3abTsS2Oo+gqzDZUuxaBpKodwfLJb4ZXAgvFjdHpjE5d0bnz0
B7u3bmnN2HDND+s2qxjD4YA1J5gwIu5yF0I4rAODa7ecPFMjuuPIIcBGCZyOHscrddTgjw
KAjc531DxUoYqb6ve69r/HV89Q+YvGUkJ4zpnEjesKwM1gP79GO1wXbRQET5QQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725832643;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=C8cjnwXGWa23WGbMtJx/wHPJzAeoJOaxxF3ozGa6SeY=;
b=cEGVnQ3Txnpf6xcaU4qih2/VuO9EYTwwjn87dCJxXq/oGuBW08rPHAaBdiAX2qC25nq3cN
8ETWisc2+gbHUOsTbGby/ZgWSJPw30KNb90dtf7QDtby7mWkPZjXHGhn/noniHrr18/jmD
TswcyQRFnBiHIPDGHAJExQJHZL0wM2UqAlpFV9psS5RcFtSlgA7ca+t2PFtFH8tC0cqEvx
V7svcUPnnWTPplmX4/A3eODc/oZJGjN7qS62fs2/vQkHSqUNitzc7+2vI6ggi+wHJJ25dx
c6EIZ/1rDZ+yVIqTi3DAxaQ87LzGgWPOukQTNhpOEGS9eETBItBNsW0S6yOp6Q==
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 4X23jH0TQSzcRb;
Sun, 8 Sep 2024 21:57:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 488LvMGZ089422;
Sun, 8 Sep 2024 21:57:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488LvMne089419;
Sun, 8 Sep 2024 21:57:22 GMT
(envelope-from git)
Date: Sun, 8 Sep 2024 21:57:22 GMT
Message-Id: <202409082157.488LvMne089419@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alan Somers <asomers@FreeBSD.org>
Subject: git: f93a50d69df2 - main - fusefs: fix an uninitialized
memory access in fuse_vnop_deallocate
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: asomers
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f93a50d69df2e996ff1d4f793d0dcb9de655ebdc
Auto-Submitted: auto-generated
The branch main has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=f93a50d69df2e996ff1d4f793d0dcb9de655ebdc
commit f93a50d69df2e996ff1d4f793d0dcb9de655ebdc
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-09-08 21:50:40 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2024-09-08 21:50:40 +0000
fusefs: fix an uninitialized memory access in fuse_vnop_deallocate
If the FUSE_GETATTR issued to query a file's size during
fuse_vnop_deallocate failed for any reason, then fuse_vnop_deallocate
would attempt to destroy an uninitialized fuse_dispatcher struct, with a
crash the likely result. This bug only affects FUSE file systems that
implement FUSE_FALLOCATE, and is unlikely to be seen on those that don't
disable attribute caching.
Reported by: Coverity Scan
CID: 1505308
MFC after: 2 weeks
---
sys/fs/fuse/fuse_vnops.c | 2 +-
tests/sys/fs/fusefs/fallocate.cc | 51 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
index bf272ab706da..30993441bd72 100644
--- a/sys/fs/fuse/fuse_vnops.c
+++ b/sys/fs/fuse/fuse_vnops.c
@@ -3075,8 +3075,8 @@ fuse_vnop_deallocate(struct vop_deallocate_args *ap)
false);
}
-out:
fdisp_destroy(&fdi);
+out:
if (closefufh)
fuse_filehandle_close(vp, fufh, curthread, cred);
diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate.cc
index ff5e3eb4f4bb..a05760207648 100644
--- a/tests/sys/fs/fusefs/fallocate.cc
+++ b/tests/sys/fs/fusefs/fallocate.cc
@@ -310,6 +310,57 @@ TEST_F(Fspacectl, erofs)
leak(fd);
}
+/*
+ * If FUSE_GETATTR fails when determining the size of the file, fspacectl
+ * should fail gracefully. This failure mode is easiest to trigger when
+ * attribute caching is disabled.
+ */
+TEST_F(Fspacectl, getattr_fails)
+{
+ const char FULLPATH[] = "mountpoint/some_file.txt";
+ const char RELPATH[] = "some_file.txt";
+ Sequence seq;
+ struct spacectl_range rqsr;
+ const uint64_t ino = 42;
+ const uint64_t fsize = 2000;
+ int fd;
+
+ expect_lookup(RELPATH, ino, S_IFREG | 0644, fsize, 1, 0);
+ expect_open(ino, 0, 1);
+ EXPECT_CALL(*m_mock, process(
+ ResultOf([](auto in) {
+ return (in.header.opcode == FUSE_GETATTR &&
+ in.header.nodeid == ino);
+ }, Eq(true)),
+ _)
+ ).Times(1)
+ .InSequence(seq)
+ .WillOnce(Invoke(ReturnImmediate([](auto i __unused, auto& out) {
+ SET_OUT_HEADER_LEN(out, attr);
+ out.body.attr.attr.ino = ino;
+ out.body.attr.attr.mode = S_IFREG | 0644;
+ out.body.attr.attr.size = fsize;
+ out.body.attr.attr_valid = 0;
+ })));
+ EXPECT_CALL(*m_mock, process(
+ ResultOf([](auto in) {
+ return (in.header.opcode == FUSE_GETATTR &&
+ in.header.nodeid == ino);
+ }, Eq(true)),
+ _)
+ ).InSequence(seq)
+ .WillOnce(ReturnErrno(EIO));
+
+ fd = open(FULLPATH, O_RDWR);
+ ASSERT_LE(0, fd) << strerror(errno);
+ rqsr.r_offset = 500;
+ rqsr.r_len = 1000;
+ EXPECT_EQ(-1, fspacectl(fd, SPACECTL_DEALLOC, &rqsr, 0, NULL));
+ EXPECT_EQ(EIO, errno);
+
+ leak(fd);
+}
+
TEST_F(Fspacectl, ok)
{
const char FULLPATH[] = "mountpoint/some_file.txt";
From nobody Sun Sep 8 23:29:18 2024
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X25lM1Zxcz5WTpx;
Sun, 08 Sep 2024 23:29:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4X25lM0x23z4m45;
Sun, 8 Sep 2024 23:29:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1725838159;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=G8OOqOlbdFlU0q1nHqfT/YtgGk/It2DxdPVTwFIcnIw=;
b=ce7P4HVmyZbiWMsH8Jyp5wOJcby93Shp2VvzR7/xBznzQ2Ia7UTQ7wuhcDHDk+gmOH3ApB
xse8ltG+rAM59QVVpiPdDMv+7zp7gKflLnj1KuAb00gs51+/Rx/NR/8IcZkleS24oQWYJs
zcGlCgUUzx4r6M4T1LBIcBh7fKzRDufXeQEw/AhA1S4iDK2GW6Q0SfvliAJIAYiSB6MmUU
2Hi8VliTxeD7xWpRrA/bZLbrize7WDQb+GHc4KHIhk9BD0dgXbeGfecPDgIvMEU55zfZUL
3mUebOLdLj5fiOtbdVamKpmJ1FkONWZewEzIjBd/ltR/F0o9fm082lpMCdbs4A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725838159; a=rsa-sha256; cv=none;
b=KlVJxR1FGdg1JJBHUbvRLxfufbDV7DF378vsZ406WOdKq7XGskNuJ8bN7Lv7qa/PTrDb/o
0WNFTtT3e3rHJ9SYxlwm8Vq2+lqQKCLhXclVe4Y9s+0pDbXzoeSPFjD7U8gc9FejzdVPDz
lfWYwffhZnnA6lA1GpAcuAJ1FQiUI9pjl7IxSs/JbPgpVoieNR7hUv7OlgELEGattObnQx
ML9+4/FV38bipqXwVD9CsIEAy7vio1+HvyBL2/RDekQibRXSGOsivGyPCyk3+8NeYpIa9m
4V0xd4GD2bDynkDnBCUaCr6qQJDbusiKL+KQOEtJYu9UpVDlbMKmcFIDXtGJlw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1725838159;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=G8OOqOlbdFlU0q1nHqfT/YtgGk/It2DxdPVTwFIcnIw=;
b=DbOYKlbU5G5utCMw3VDZKElPoNAKmApiMt/CnNQuFNqZylNUDa4vZ7Bavq9tc2NO4BT1dB
/AhYSjIohfDe/6ryKtg7g1M6GvmB9cvGi64W2juepa2BgTtkrK011dGQaM95kc5YI/h0Cf
/uwMj9BxC7Ej4g7bnxH7pqHUW2NJ89tAgr1/xgW1LHtj36sCuPqGZ2YOe4/khspeCLuRUY
d4eotMq3w6cI6Lo+bpZzI3vBCkINsLyYFB2a75Cs5tLsnqBnCy3Ha/5f19eR3jqzV1PFgp
xx4IDJkS7elF8TBYdxAzgBg28GzFvQt+khZzV5rBB0tj2aMeJzgylmpEpiYWMQ==
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 4X25lM0Vl9zfwQ;
Sun, 8 Sep 2024 23:29:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 488NTIYn042470;
Sun, 8 Sep 2024 23:29:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488NTIxr042467;
Sun, 8 Sep 2024 23:29:18 GMT
(envelope-from git)
Date: Sun, 8 Sep 2024 23:29:18 GMT
Message-Id: <202409082329.488NTIxr042467@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alan Somers <asomers@FreeBSD.org>
Subject: git: 44328abfb7ac - main - nfscl: fix uninitialized memory
in nfsv4_loadattr
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: asomers
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 44328abfb7aca8150b07b83ff502c9185677e3fb
Auto-Submitted: auto-generated
The branch main has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=44328abfb7aca8150b07b83ff502c9185677e3fb
commit 44328abfb7aca8150b07b83ff502c9185677e3fb
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2024-09-08 20:42:38 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2024-09-08 23:28:33 +0000
nfscl: fix uninitialized memory in nfsv4_loadattr
When processing an RPC response that did not include any Owner
attribute, nfsv4_loadattr would return na_uid and na_gid uninitialized.
The uninitialized values could then make their way into the NFS
attribute cache via nfscl_loadattrcache.
PR: 281279
Reported by: KMSAN
MFC after: 2 weeks
Reviewed by: rmacklem
Sponsored by: Axcient
---
sys/fs/nfs/nfs_commonsubs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index 47ab4958f9c5..90b30f462106 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -1322,6 +1322,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
* Just set default values to some of the important ones.
*/
if (nap != NULL) {
+ VATTR_NULL(&nap->na_vattr);
nap->na_type = VREG;
nap->na_mode = 0;
nap->na_rdev = (NFSDEV_T)0;